diff options
| -rw-r--r-- | ui/tremulous.txt | 2 | ||||
| -rw-r--r-- | ui/tremulous_humanarmoury.menu | 123 |
2 files changed, 102 insertions, 23 deletions
diff --git a/ui/tremulous.txt b/ui/tremulous.txt index b38f6b24..297fc36f 100644 --- a/ui/tremulous.txt +++ b/ui/tremulous.txt @@ -9,8 +9,6 @@ loadMenu { "ui/tremulous_humanbuild.menu" } loadMenu { "ui/tremulous_humanarmoury.menu" } - loadMenu { "ui/tremulous_humanarmourybuy.menu" } - loadMenu { "ui/tremulous_humanarmourysell.menu" } loadMenu { "ui/tremulous_alienbank.menu" } loadMenu { "ui/tremulous_humanbank.menu" } diff --git a/ui/tremulous_humanarmoury.menu b/ui/tremulous_humanarmoury.menu index a2ee4237..29123c85 100644 --- a/ui/tremulous_humanarmoury.menu +++ b/ui/tremulous_humanarmoury.menu @@ -7,15 +7,20 @@ visible 0 fullscreen 0 outOfBoundsClick - rect 256 208 128 64 + rect 44 111 544 247 focusColor 1 .75 0 1 style 1 popup + onOpen + { + uiScript LoadHumanArmouryBuys; + uiScript LoadHumanArmourySells + } itemDef { name window - rect 0 0 128 64 + rect 0 0 544 247 style WINDOW_STYLE_FILLED backcolor 0 0 0 1 visible 1 @@ -28,45 +33,121 @@ itemDef { - name humanarmoury - text "Buy..." + name "buylist" + rect 8 8 136 231 + type ITEM_TYPE_LISTBOX + style WINDOW_STYLE_EMPTY + elementwidth 120 + elementheight 20 + textscale .33 + elementtype LISTBOX_TEXT + feeder FEEDER_TREMHUMANARMOURYBUY + border 1 + bordercolor 0.5 0.5 0.5 0.5 + forecolor 1 1 1 1 + backcolor 0.2 0.2 0.2 1 + outlinecolor 0.1 0.1 0.1 0.5 + visible 1 + } + + itemDef + { + name "selllist" + rect 400 8 136 231 + type ITEM_TYPE_LISTBOX + style WINDOW_STYLE_EMPTY + elementwidth 120 + elementheight 20 + textscale .33 + elementtype LISTBOX_TEXT + feeder FEEDER_TREMHUMANARMOURYSELL + border 1 + bordercolor 0.5 0.5 0.5 0.5 + forecolor 1 1 1 1 + backcolor 0.2 0.2 0.2 1 + outlinecolor 0.1 0.1 0.1 0.5 + visible 1 + } + + itemDef + { + name infopane + ownerdraw UI_HBUYINFOPANE + textstyle ITEM_TEXTSTYLE_NORMAL + style WINDOW_STYLE_EMPTY + rect 152 8 240 204 + textscale .33 + textalignx 6 + textaligny 12 + border 1 + bordercolor 0.5 0.5 0.5 0.5 + forecolor 1 1 1 1 + backcolor 0.2 0.2 0.2 1 + outlinecolor 0.1 0.1 0.1 0.5 + visible 1 + decoration + } + + itemDef + { + name "Close" + text "Close" type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY - rect 8 8 56 56 + rect 254 218 50 21 textalign ITEM_ALIGN_LEFT - textalignx 12 - textaligny 32 + textalignx 3 + textaligny 18 textscale .4 forecolor 1 1 1 1 - backcolor 0.0784314 0.14902 0.32549 .25 + backcolor .5 0 0 .25 visible 1 action { - play "sound/misc/menu1.wav"; - close tremulous_humanarmoury; - open tremulous_humanarmourybuy + play "sound/misc/menu4.wav"; + close tremulous_humanarmoury } } - + itemDef { - name humanarmoury - text "Sell..." + name "Buy" + text "Buy >" type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY - rect 64 8 56 56 + rect 152 218 50 21 textalign ITEM_ALIGN_LEFT - textalignx 12 - textaligny 32 + textalignx 12.5 + textaligny 18 textscale .4 forecolor 1 1 1 1 - backcolor 0.0784314 0.14902 0.32549 .25 + backcolor .5 0 0 .25 visible 1 action { - play "sound/misc/menu3.wav"; - close tremulous_humanarmoury; - open tremulous_humanarmourysell + play "sound/misc/menu1.wav"; + uiScript BuyFromArmoury + } + } + + itemDef + { + name "Sell" + text "< Sell" + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + rect 344 218 50 21 + textalign ITEM_ALIGN_LEFT + textalignx 3.8 + textaligny 18 + textscale .4 + forecolor 1 1 1 1 + backcolor .5 0 0 .25 + visible 1 + action + { + play "sound/misc/menu1.wav"; + uiScript SellToArmoury } } } |