From 8c85d996183b63e10c5c323a7e2e6af07ef91bb4 Mon Sep 17 00:00:00 2001 From: Tomi Isoaho Date: Fri, 13 Aug 2010 14:57:27 +0000 Subject: [PATCH] Tons of UI changes incl. a fully functional server browser, new key binds and callvote map_restart. --- reaction/code/game/g_cmds.c | 6 +- reaction/code/ui/ui_main.c | 10 +- reaction/code/ui/ui_shared.c | 98 ++-- reaction/uifiles/connect.menu | 49 +- reaction/uifiles/controls.menu | 22 +- reaction/uifiles/createfavorite.menu | 294 ++++++---- reaction/uifiles/createserver.menu | 801 ++++++++++++-------------- reaction/uifiles/credit.menu | 57 +- reaction/uifiles/findplayer.menu | 193 ++++++- reaction/uifiles/ingame.menu | 57 +- reaction/uifiles/ingame.txt | 28 +- reaction/uifiles/ingame_about.menu | 11 +- reaction/uifiles/ingame_callvote.menu | 625 ++++++++++---------- reaction/uifiles/ingame_item.menu | 550 +++++------------- reaction/uifiles/ingame_join.menu | 216 +++++++ reaction/uifiles/ingame_join_dm.menu | 130 +++++ reaction/uifiles/ingame_tkok.menu | 107 ++++ reaction/uifiles/ingame_weapon.menu | 618 +++++--------------- reaction/uifiles/joinserver.menu | 92 ++- reaction/uifiles/main.menu | 12 +- reaction/uifiles/options.menu | 10 + reaction/uifiles/password.menu | 4 +- reaction/uifiles/replacements.menu | 4 +- reaction/uifiles/serverinfo.menu | 109 +++- reaction/uifiles/setup.menu | 2 +- reaction/uifiles/shared.h | 150 ++++- reaction/uifiles/specify.menu | 405 ++++++------- 27 files changed, 2442 insertions(+), 2218 deletions(-) diff --git a/reaction/code/game/g_cmds.c b/reaction/code/game/g_cmds.c index 338733eb..c3d637a4 100644 --- a/reaction/code/game/g_cmds.c +++ b/reaction/code/game/g_cmds.c @@ -2088,6 +2088,8 @@ void Cmd_CallVote_f(gentity_t * ent) } if (!Q_stricmp(arg1, "cyclemap")) { + //TTI - adding "map_restart" + } else if (!Q_stricmp(arg1, "map_restart")) { //Makro - adding "timelimit X" } else if (!Q_stricmp(arg1, "timelimit")) { } else if (!Q_stricmp(arg1, "map")) { @@ -2102,13 +2104,13 @@ void Cmd_CallVote_f(gentity_t * ent) } else if (!Q_stricmp(arg1, "clearscores")) { } else { trap_SendServerCommand(ent - g_entities, "print \"^1Invalid vote command.\n\""); - trap_SendServerCommand(ent - g_entities,"print \"Valid vote commands are: cyclemap, map , g_gametype , game , kick , clientkick , clearscores, resetmatch and timelimit .\n\""); + trap_SendServerCommand(ent - g_entities,"print \"Valid vote commands are: cyclemap, map_restart, map , g_gametype , game , kick , clientkick , clearscores, resetmatch and timelimit .\n\""); return; } } else { trap_SendServerCommand(ent - g_entities, "print \"^1Invalid vote command.\n\""); trap_SendServerCommand(ent - g_entities, - "print \"Valid vote commands are: cyclemap, map , g_gametype , game , kick , clientkick and timelimit .\n\""); + "print \"Valid vote commands are: cyclemap, map_restart, map , g_gametype , game , kick , clientkick and timelimit .\n\""); return; } } diff --git a/reaction/code/ui/ui_main.c b/reaction/code/ui/ui_main.c index 6f0f6b1e..ffe1bf95 100644 --- a/reaction/code/ui/ui_main.c +++ b/reaction/code/ui/ui_main.c @@ -2259,7 +2259,10 @@ static char team1Name[128], team2Name[128]; static void UI_RQ3_DrawJoinTeam(rectDef_t * rect, float scale, vec4_t color, int num, int textStyle) { //char *text = va("Team %i", num); - Text_Paint(rect->x, rect->y, scale, color, (num == 1) ? team1Name : team2Name, 0, 0, 0, textStyle, qfalse); + if (rect->hasVectors) + Text_PaintAngled(rect->x, rect->y, rect->u, rect->v, scale, color, (num == 1) ? team1Name : team2Name, 0, 0, 0, textStyle, qfalse); + else + Text_Paint(rect->x, rect->y, scale, color, (num == 1) ? team1Name : team2Name, 0, 0, 0, textStyle, qfalse); } static void UI_DrawTeamMember(rectDef_t * rect, float scale, vec4_t color, qboolean blue, int num, int textStyle) @@ -2929,7 +2932,10 @@ static void UI_DrawAllMapsSelection(rectDef_t * rect, float scale, vec4_t color, int map = (net) ? ui_currentNetMap.integer : ui_currentMap.integer; if (map >= 0 && map < uiInfo.mapCount) { - Text_Paint(rect->x, rect->y, scale, color, uiInfo.mapList[map].mapName, 0, 0, 0, textStyle, qfalse); + if (rect->hasVectors) + Text_PaintAngled(rect->x, rect->y, rect->u, rect->v, scale, color, uiInfo.mapList[map].mapName, 0, 0, 0, textStyle, qfalse); + else + Text_Paint(rect->x, rect->y, scale, color, uiInfo.mapList[map].mapName, 0, 0, 0, textStyle, qfalse); } } diff --git a/reaction/code/ui/ui_shared.c b/reaction/code/ui/ui_shared.c index bd004141..e4ba78e1 100644 --- a/reaction/code/ui/ui_shared.c +++ b/reaction/code/ui/ui_shared.c @@ -4978,64 +4978,80 @@ static bind_t g_bindings[] = { //Makro - 3rd column was filled with -1; adding secondary binds // - also, fixed the tabbing //Makro - using scores instead of +scores - {"scores", K_TAB, -1, -1, -1}, + //TTI - LuGia told me that +scores is an industry standard -> changing back + {"+scores", K_TAB, -1, -1, -1}, //Makro - button2 was enter {"+button2", -1, -1, -1, -1}, - {"+speed", K_SHIFT, -1, -1, -1}, - {"+forward", K_UPARROW, 'w', -1, -1}, - {"+back", K_DOWNARROW, 's', -1, -1}, - {"+moveleft", ',', 'a', -1, -1}, - {"+moveright", '.', 'd', -1, -1}, - {"+moveup", K_SPACE, -1, -1, -1}, - {"+movedown", 'c', -1, -1, -1}, - {"+left", K_LEFTARROW, -1, -1, -1}, - {"+right", K_RIGHTARROW, -1, -1, -1}, - {"+strafe", K_ALT, -1, -1, -1}, - {"+lookup", K_PGDN, -1, -1, -1}, - {"+lookdown", K_DEL, -1, -1, -1}, - {"+mlook", '/', -1, -1, -1}, - {"centerview", K_END, -1, -1, -1}, + {"+speed", K_CTRL, -1, -1, -1}, + {"+forward", 'w', K_UPARROW, -1, -1}, + {"+back", 's', K_DOWNARROW, -1, -1}, + {"+moveleft", 'a', K_LEFTARROW, -1, -1}, + {"+moveright", 'd', K_RIGHTARROW, -1, -1}, + {"+moveup", K_MOUSE2, K_SPACE, -1, -1}, + {"+movedown", K_SHIFT, K_MOUSE4, -1, -1}, + {"+left", -1, -1, -1, -1}, + {"+right", -1, -1, -1, -1}, + {"+strafe", -1, -1, -1, -1}, + {"+lookup", -1, -1, -1, -1}, + {"+lookdown", -1, -1, -1, -1}, + {"+mlook", -1, -1, -1, -1}, + {"centerview", -1, -1, -1, -1}, {"+zoom", -1, -1, -1, -1}, //Blaze: Reaction Weapon binds //Jbravo: order is important. - {"weapon 1", '1', -1, -1, -1}, - {"weapon 2", '2', -1, -1, -1}, - {"weapon 3", '3', -1, -1, -1}, - {"weapon 4", '4', -1, -1, -1}, - {"weapon 5", '5', -1, -1, -1}, - {"weapon 6", '6', -1, -1, -1}, - {"weapon 7", '7', -1, -1, -1}, - {"weapon 8", '8', -1, -1, -1}, - {"weapon 9", '9', -1, -1, -1}, - {"+attack", K_CTRL, K_MOUSE1, -1, -1}, - {"weapprev", '[', -1, -1, -1}, - {"weapnext", ']', 'q', -1, -1}, +/* + {"weapon 1", -1, -1, -1, -1}, + {"weapon 2", -1, -1, -1, -1}, + {"weapon 3", -1, -1, -1, -1}, + {"weapon 4", -1, -1, -1, -1}, + {"weapon 5", -1, -1, -1, -1}, + {"weapon 6", -1, -1, -1, -1}, + {"weapon 7", -1, -1, -1, -1}, + {"weapon 8", -1, -1, -1, -1}, + {"weapon 9", -1, -1, -1, -1}, +*/ + {"use Combat Knife", '1', -1, -1, -1}, + {"use MK23 Pistol", '2', -1, -1, -1}, + {"use Dual MK23 Pistols", '3', -1, -1, -1}, + {"use M3 Super 90 Assault Shotgun", -1, -1, -1, -1}, + {"use MP5/10 Submachinegun", -1, -1, -1, -1}, + {"use Handcannon", -1, -1, -1, -1}, + {"use Sniper Rifle", -1, -1, -1, -1}, + {"use M4 Assault Rifle", -1, -1, -1, -1}, + {"use M26 Fragmentation Grenade", '5', -1, -1, -1}, + {"use Slashing Combat Knife", -1, -1, -1, -1}, + {"use Throwing Combat Knife", -1, -1, -1, -1}, + {"+attack", K_MOUSE1, -1, -1, -1}, + {"weapprev", K_MWHEELUP, K_PGUP, -1, -1}, + {"weapnext", K_MWHEELDOWN, K_PGDN, -1, -1}, //Makro - button3 was mouse3 - {"+button3", -1, -1, -1, -1}, + {"+button3", 'g', -1, -1, -1}, {"messagemode", 't', -1, -1, -1}, - {"messagemode2", -1, -1, -1, -1}, + {"messagemode2", 'y', -1, -1, -1}, {"messagemode3", -1, -1, -1, -1}, {"messagemode4", -1, -1, -1, -1}, - {"bandage", 'b', -1, -1, -1}, + {"bandage", 'c', -1, -1, -1}, //reload {"+button5", 'r', -1, -1, -1}, - {"weapon", K_MOUSE3, -1, -1, -1}, + {"weapon", 'z', K_MOUSE3, -1, -1}, + {"unzoom", 'q', -1, -1, -1}, {"opendoor", K_ENTER, -1, -1, -1}, //TTI: replacing "dropweapon" with the newer "drop weapon", the same goes for "dropitem" - {"drop weapon", 'x', -1, -1, -1}, - {"drop item", 'z', -1, -1, -1}, - {"irvision", 'v', -1, -1, -1}, + {"drop weapon", 'c', -1, -1, -1}, + {"drop item", 'v', -1, -1, -1}, + {"drop case", 'x', -1, -1, -1}, + {"irvision", 'i', -1, -1, -1}, //Makro - this one was missing - {"use special", 'e', -1, -1, -1}, + {"use special", '4', -1, -1, -1}, //Makro - for the weapon/item, join, presets and tkok menus - {"ui_RQ3_loadout", 'l', -1, -1, -1}, - {"ui_RQ3_joinTeam", 'j', -1, -1, -1}, - {"ui_RQ3_presets", -1, -1, -1, -1}, + {"ui_RQ3_loadout", K_F1, -1, -1, -1}, + {"ui_RQ3_joinTeam", K_F2, -1, -1, -1}, + {"ui_RQ3_presets", K_F4, -1, -1, -1}, {"ui_RQ3_tkok", -1, -1, -1, -1}, - {"screenshot", -1, -1, -1, -1}, - {"screenshotJPEG", K_F12, -1, -1, -1}, + {"screenshot", K_F11, -1, -1, -1}, + {"screenshotJPEG", -1, -1, -1, -1}, //TTI: more binds - {"drop case", -1, -1, -1, -1}, + {"+wstats", K_F3, -1, -1, -1}, {"+voiprecord", -1, -1, -1, -1} }; diff --git a/reaction/uifiles/connect.menu b/reaction/uifiles/connect.menu index a2a5c9a6..087281d6 100644 --- a/reaction/uifiles/connect.menu +++ b/reaction/uifiles/connect.menu @@ -37,52 +37,9 @@ //-------------------------------------------- - //Boomstick logo - - itemDef { - style WINDOW_STYLE_SHADER - rect 280 288 120 120 - anglevectors 9 -81 - background UI_ASSETS"/logo" - forecolor 1 1 1 0.2 - decoration - visible 1 - } - - // REACTION QUAKE 3 VERSION 3.3 // - - itemdef { - group main - subgroup "main_title" - text "REACTION QUAKE 3 v3.3" - forecolor 0 0 .05 1 - style WINDOW_STYLE_EMPTY - textalign ITEM_ALIGN_CENTER - textscale .4 - textalignx 120 - textaligny 24 - rect 108 144 240 36 - anglevectors 9 -81 - visible 1 - autowrapped - decoration - } - - itemDef { - group main - alignrect "main_title" ITEM_ALIGN_LEFT 0 20 240 36 - style WINDOW_STYLE_EMPTY - textalign ITEM_ALIGN_CENTER - textscale .275 - textalignx 120 - textaligny 24 - forecolor 0 0 0.05 1 - text "(c) 2000-2005 Boomstick Studios\n\n\n\n\n" - "www.reactionquake3.com" - autowrapped - visible 1 - decoration - } + __BOOMSTICK_LOGO__ + __REACTION_VERSION__ + __REACTION_COPYRIGHT__ //Dark overlay diff --git a/reaction/uifiles/controls.menu b/reaction/uifiles/controls.menu index 15aac7ec..019b9b70 100644 --- a/reaction/uifiles/controls.menu +++ b/reaction/uifiles/controls.menu @@ -40,7 +40,7 @@ setitemcolor hints forecolor HINT_COLOR 1 ; hide hints ; ACTIVATE_TAB(1) ; } - onClose { uiScript saveControls ; open _prev } + onClose { uiScript saveControls ; uiScript update ui_mousePitch ; open _prev } onEsc { close _self } onOpenSpecial { @@ -305,55 +305,55 @@ Group # 3 - Shoot END_OPTION - BEGIN_OPTION("MK23 Pistol", "weapon 1", ITEM_TYPE_BIND, 5, 3) + BEGIN_OPTION("MK23 Pistol", "use MK23 Pistol", ITEM_TYPE_BIND, 5, 3) OPTION_BELOW("gr3_ctrl4") ASSIGN_HINT("keyBindStatus") END_OPTION - BEGIN_OPTION("M3 Assault Shotgun", "weapon 2", ITEM_TYPE_BIND, 6, 3) + BEGIN_OPTION("M3 Assault Shotgun", "use M3 Super 90 Assault Shotgun", ITEM_TYPE_BIND, 6, 3) OPTION_BELOW("gr3_ctrl5") ASSIGN_HINT("keyBindStatus") END_OPTION - BEGIN_OPTION("MP5/10 Sub", "weapon 3", ITEM_TYPE_BIND, 7, 3) + BEGIN_OPTION("MP5/10 Sub", "use MP5/10 Submachinegun", ITEM_TYPE_BIND, 7, 3) OPTION_BELOW("gr3_ctrl6") ASSIGN_HINT("keyBindStatus") END_OPTION - BEGIN_OPTION("Handcannon", "weapon 4", ITEM_TYPE_BIND, 8, 3) + BEGIN_OPTION("Handcannon", "use Handcannon", ITEM_TYPE_BIND, 8, 3) OPTION_BELOW("gr3_ctrl7") ASSIGN_HINT("keyBindStatus") END_OPTION - BEGIN_OPTION("SSG Sniper Rifle", "weapon 5", ITEM_TYPE_BIND, 9, 3) + BEGIN_OPTION("SSG Sniper Rifle", "use Sniper Rifle", ITEM_TYPE_BIND, 9, 3) OPTION_BELOW("gr3_ctrl8") ASSIGN_HINT("keyBindStatus") END_OPTION - BEGIN_OPTION("M4 Assault Rifle", "weapon 6", ITEM_TYPE_BIND, 10, 3) + BEGIN_OPTION("M4 Assault Rifle", "use M4 Assault Rifle", ITEM_TYPE_BIND, 10, 3) OPTION_BELOW("gr3_ctrl9") ASSIGN_HINT("keyBindStatus") END_OPTION - BEGIN_OPTION("Dual MK23 Pistols", "weapon 7", ITEM_TYPE_BIND, 11, 3) + BEGIN_OPTION("Dual MK23 Pistols", "use Dual MK23 Pistols", ITEM_TYPE_BIND, 11, 3) OPTION_BELOW("gr3_ctrl10") ASSIGN_HINT("keyBindStatus") END_OPTION - BEGIN_OPTION("Combat Knife", "weapon 8", ITEM_TYPE_BIND, 12, 3) + BEGIN_OPTION("Combat Knife", "use Combat Knife", ITEM_TYPE_BIND, 12, 3) OPTION_BELOW("gr3_ctrl11") ASSIGN_HINT("keyBindStatus") END_OPTION - BEGIN_OPTION("M26 Grenade", "weapon 9", ITEM_TYPE_BIND, 13, 3) + BEGIN_OPTION("M26 Grenade", "use M26 Fragmentation Grenade", ITEM_TYPE_BIND, 13, 3) OPTION_BELOW("gr3_ctrl12") ASSIGN_HINT("keyBindStatus") END_OPTION @@ -417,7 +417,7 @@ Group # 4 - Misc END_OPTION - BEGIN_OPTION("Show Scores", "scores", ITEM_TYPE_BIND, 9, 4) + BEGIN_OPTION("Show Scores", "+scores", ITEM_TYPE_BIND, 9, 4) OPTION_BELOW("gr4_ctrl8") ASSIGN_HINT("keyBindStatus") END_OPTION diff --git a/reaction/uifiles/createfavorite.menu b/reaction/uifiles/createfavorite.menu index 2828bd94..e64ee797 100644 --- a/reaction/uifiles/createfavorite.menu +++ b/reaction/uifiles/createfavorite.menu @@ -1,122 +1,180 @@ #include "ui/menudef.h" + +#define FADEIN_TIME 125 +#define BACK_COLOR1 .85 .9 .85 1 +#define BACK_COLOR2 .95 .95 .98 1 + +#define ANGLES -3 -93 + { - // CREATE FAVORITE POPUP MENU // + // CREATE FAVORITE POPUP MENU // - menuDef { - name "createfavorite_popmenu" - visible 0 - fullscreen 0 - rect 170 200 300 80 - focusColor RQ3_MAIN_FOCUSCOLOR // Menu focus color for text and items - style WINDOW_STYLE_EMPTY - border 1 - popup - onOpen { play "sound/misc/menu1.wav" ; setfocus nameEntry } - onESC { close "createfavorite_popmenu" ; open joinserver } - - itemDef { - name window - rect 0 0 300 68 - style WINDOW_STYLE_FILLED - border 1 - borderSize 1 - bordercolor Ig_Window_BorderColor - backcolor Ig_Window_Color - shadowStyle 1 - visible 1 - decoration - } - - // NAME // - - itemDef { - text "Name:" - style 0 - textscale .25 - rect 0 8 80 20 - textalign ITEM_ALIGN_LEFT - textalignx 16 - textaligny 16 - forecolor 1 1 1 1 - visible 1 - decoration - } - - itemDef { - name nameEntry - style WINDOW_STYLE_FILLED - text "" - textalign ITEM_ALIGN_LEFT - textalignx 4 - textaligny 14 - maxPaintChars 17 - textscale .225 - type ITEM_TYPE_EDITFIELD - cvar "ui_favoriteName" - rect 80 8 160 20 - border 1 - bordersize 1 - bordercolor .25 .25 .25 1 - forecolor 1 1 1 1 - backcolor 1 1 1 .1 - visible 1 - onfocus { setcolor backcolor 1 1 1 .2 ; } - leavefocus { setcolor backcolor 1 1 1 .1 ; } - } - - // ADDRESS // - - itemDef { - text "Address:" - style 0 - textscale .25 - rect 0 36 80 20 - textalign ITEM_ALIGN_LEFT - textalignx 16 - textaligny 16 - forecolor 1 1 1 1 - visible 1 - decoration - } - - itemDef { - name addressEntry - style WINDOW_STYLE_FILLED - text "" - textalign ITEM_ALIGN_LEFT - textalignx 4 - textaligny 14 - maxPaintChars 17 - textscale .225 - type ITEM_TYPE_EDITFIELD - cvar "ui_favoriteAddress" - rect 80 36 160 20 - border 1 - bordersize 1 - bordercolor .25 .25 .25 1 - forecolor 1 1 1 1 - backcolor 1 1 1 .1 - visible 1 - onfocus { setcolor backcolor 1 1 1 .2 ; } - leavefocus { setcolor backcolor 1 1 1 .1 ; } - } - - // Add // - - itemDef { - shortcutKey "A" - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_BUTTON - rect 256 12 32 16 - textscale .25 - textalign ITEM_ALIGN_CENTER - textalignx 16 - textaligny 10 - forecolor 1 1 1 1 - text "Add" - visible 1 - action { uiScript "CreateFavorite" ; close "createfavorite_popmenu" ; open joinserver } - } - - } + menuDef { + name "createfavorite_popmenu" + visible 0 + fullscreen 0 + rect 248 200 288 152 + anglevectors ANGLES + focusColor .25 .25 .5 1 + popup + style WINDOW_STYLE_EMPTY + onOpen { + //setrandomitemcolor postit forecolor 2 BACK_COLOR1 BACK_COLOR2 ; + setitemcolor window forecolor 5 5 5 0 ; + timefade window forecolor 5 5 5 1 0 FADEIN_TIME ; + play "sound/ui/whoosh3.wav" ; + setQuitText confirm ; + setfocus nameEntry + } + onESC { close _self ; open _prev } + onOOBClick { close _self ; open _prev } + + itemDef { + renderpoint + name "postit" + menuAnchor + group window + style WINDOW_STYLE_SHADER + background UI_ASSETS"/paper_1" + forecolor 1 1 .92 1 + //backcolor .94 .94 .82 1 + rect -8 -4 320 176 + anglevectors ANGLES + visible 1 + decoration + } + + // TITLE // + + itemdef { + renderpoint + name "title" + text "Add to Favorites:" + forecolor .6 .0 .0 1 + style WINDOW_STYLE_EMPTY + textalign ITEM_ALIGN_LEFT + textalignx 4 + textaligny 24 + textscale RQ3_MAIN_TEXTSIZE + alignrect postit ITEM_ALIGN_LEFT 32 24 240 36 + visible 1 + autowrapped + decoration + } + + // NAME // + + itemDef { + renderpoint + name "name" + text "Name:" + style 0 + decoration + textscale .25 + alignrect title ITEM_ALIGN_LEFT -8 32 52 20 + textalign ITEM_ALIGN_LEFT + textalignx 20 + textaligny 16 + forecolor 0 0 .15 1 + visible 1 + } + + itemDef { + name "name_dots" + text "........................................" + style 0 + decoration + textscale .25 + alignrect name ITEM_ALIGN_LEFT 80 2 168 20 + textalign ITEM_ALIGN_LEFT + textalignx 4 + textaligny 19 + forecolor 0 0 .15 1 + visible 1 + } + + itemDef { + name "nameEntry" + style WINDOW_STYLE_EMPTY + text "" + textalign ITEM_ALIGN_LEFT + textalignx 4 + textaligny 14 + maxchars 99 + maxPaintChars 15 + textscale .25 + type ITEM_TYPE_EDITFIELD + cvar "ui_favoriteName" + alignrect name_dots ITEM_ALIGN_LEFT 0 0 168 20 + forecolor 0 0 .15 1 + backcolor 1 0 0 .5 + visible 1 + } + + // ADDRESS // + + itemDef { + renderpoint + name "address" + text "Address:" + style 0 + decoration + textscale .25 + alignrect name ITEM_ALIGN_LEFT 0 24 52 20 + textalign ITEM_ALIGN_LEFT + textalignx 20 + textaligny 16 + forecolor 0 0 .15 1 + visible 1 + } + + itemDef { + name "address_dots" + text "........................................" + style 0 + decoration + textscale .25 + alignrect address ITEM_ALIGN_LEFT 80 2 168 20 + textalign ITEM_ALIGN_LEFT + textalignx 4 + textaligny 19 + forecolor 0 0 .15 1 + visible 1 + } + + itemDef { + name "addressEntry" + style WINDOW_STYLE_EMPTY + text "" + textalign ITEM_ALIGN_LEFT + textalignx 4 + textaligny 14 + maxPaintChars 15 + maxChars 99 + textscale .25 + type ITEM_TYPE_EDITFIELD + cvar "ui_favoriteAddress" + alignrect address_dots ITEM_ALIGN_LEFT 0 0 168 20 + forecolor 0 0 .15 1 + backcolor 1 0 0 .5 + visible 1 + } + + // OK // + + itemDef { + text "^_O^_K" + shortcutKey "O" + type ITEM_TYPE_BUTTON + textscale .25 + style WINDOW_STYLE_EMPTY + alignrect address_dots ITEM_ALIGN_LEFT 136 24 32 20 + textalign 1 + textalignx 12 + textaligny 16 + forecolor 0 0 .15 1 + visible 1 + action { play "sound/ui/whoosh3.wav" ; uiScript CreateFavorite ; close _self ; open joinserver } + } + } } diff --git a/reaction/uifiles/createserver.menu b/reaction/uifiles/createserver.menu index 304b66df..2127a8b9 100644 --- a/reaction/uifiles/createserver.menu +++ b/reaction/uifiles/createserver.menu @@ -19,143 +19,143 @@ //#define LINE_WIDTH 240 { - menuDef { - renderpoint - name "createserver" - visible MENU_FALSE // Visible on open - //fullScreen MENU_FALSE - focusColor RQ3_MAIN_FOCUSCOLOR // Menu focus color for text and items - rect 144 8 332 426 - anglevectors ANGLES - style WINDOW_STYLE_EMPTY - //style WINDOW_STYLE_FILLED - //backcolor 0 0 0 1 - popup - - onOOBClick { close _self ; open _prev } - onOpen { play "sound/ui/whoosh3.wav" ; uiScript "loadArenas" ; - setitemcolor hints forecolor HINT_COLOR 1 ; hide "hints" ; - ACTIVATE_TAB(1) ; - } - onEsc { close _self } + menuDef { + renderpoint + name "createserver" + visible MENU_FALSE // Visible on open + //fullScreen MENU_FALSE + focusColor RQ3_MAIN_FOCUSCOLOR // Menu focus color for text and items + rect 144 8 332 426 + anglevectors ANGLES + style WINDOW_STYLE_EMPTY + //style WINDOW_STYLE_FILLED + //backcolor 0 0 0 1 + popup + + onOOBClick { close _self ; open _prev } + onOpen { play "sound/ui/whoosh3.wav" ; uiScript "loadArenas" ; + setitemcolor hints forecolor HINT_COLOR 1 ; hide "hints" ; + ACTIVATE_TAB(1) ; + } + onEsc { close _self } - onOpenSpecial { - //normal items - setItemColor "fade_fore_alpha" forecolor 5 5 5 0 ; - timeFade "fade_fore_alpha" forecolor 5 5 5 1 0 FADEIN_TIME ; - //icon - special alpha - setItemColor "icon" forecolor 5 5 5 0 ; - timeFade "icon" forecolor 5 5 5 ICON_ALPHA 0 FADEIN_TIME ; - //line - special alpha; using backcolor - setItemColor "line" backcolor 5 5 5 0 ; - timeFade "line" backcolor 5 5 5 LINE_ALPHA 0 FADEIN_TIME ; - } + onOpenSpecial { + //normal items + setItemColor "fade_fore_alpha" forecolor 5 5 5 0 ; + timeFade "fade_fore_alpha" forecolor 5 5 5 1 0 FADEIN_TIME ; + //icon - special alpha + setItemColor "icon" forecolor 5 5 5 0 ; + timeFade "icon" forecolor 5 5 5 ICON_ALPHA 0 FADEIN_TIME ; + //line - special alpha; using backcolor + setItemColor "line" backcolor 5 5 5 0 ; + timeFade "line" backcolor 5 5 5 LINE_ALPHA 0 FADEIN_TIME ; + } - itemDef { - name "paper" - menuAnchor - subgroup "fade_fore_alpha" - style WINDOW_STYLE_SHADER - background UI_ASSETS"/paper_1" - forecolor MENUCOLOR_MOD 1 - rect 0 -16 360 500 - anglevectors ANGLES - visible 1 - decoration - } + itemDef { + name "paper" + menuAnchor + subgroup "fade_fore_alpha" + style WINDOW_STYLE_SHADER + background UI_ASSETS"/paper_1" + forecolor MENUCOLOR_MOD 1 + rect 0 -16 360 500 + anglevectors ANGLES + visible 1 + decoration + } - //Title + //Title - itemdef { - renderpoint - name "title" - subgroup "fade_fore_alpha" - text "Host a game:" - forecolor .0 .0 .1 1 - style WINDOW_STYLE_EMPTY - textalign ITEM_ALIGN_LEFT - textalignx 4 - textaligny 24 - textscale RQ3_MAIN_TEXTSIZE - alignRect paper ITEM_ALIGN_LEFT 28 44 480 20 - visible 1 - autowrapped - decoration - } + itemDef { + renderpoint + name "title" + subgroup "fade_fore_alpha" + text "Host a game:" + forecolor .0 .0 .1 1 + style WINDOW_STYLE_EMPTY + textalign ITEM_ALIGN_LEFT + textalignx 4 + textaligny 24 + textscale RQ3_MAIN_TEXTSIZE + alignRect paper ITEM_ALIGN_LEFT 28 44 480 20 + visible 1 + autowrapped + decoration + } - //Line + //Line - itemDef { - name "line" - style WINDOW_STYLE_FILLED - backcolor .25 .25 .25 LINE_ALPHA - alignrect "title" ITEM_ALIGN_LEFT 0 56 LINE_WIDTH 2 - visible 1 - decoration - } + itemDef { + name "line" + style WINDOW_STYLE_FILLED + backcolor .25 .25 .25 LINE_ALPHA + alignrect "title" ITEM_ALIGN_LEFT 0 56 LINE_WIDTH 2 + visible 1 + decoration + } - //Icon used to be here + //Icon used to be here - itemdef { - name icon - background UI_ASSETS"/icons/rq3-menu-start.tga" - forecolor 1 1 1 ICON_ALPHA - //rect 336 12 32 32 - alignrect "line" ITEM_ALIGN_RIGHT 0 -32 32 32 - style WINDOW_STYLE_SHADER - visible 0 - decoration - } + itemDef { + name icon + background UI_ASSETS"/icons/rq3-menu-start.tga" + forecolor 1 1 1 ICON_ALPHA + //rect 336 12 32 32 + alignrect "line" ITEM_ALIGN_RIGHT 0 -32 32 32 + style WINDOW_STYLE_SHADER + visible 0 + decoration + } - // GO // + // GO // - itemdef { - name "btn_run,allgroups,group3" - subgroup "fade_fore_alpha" - text "> ^_G^_O <" - shortcutKey "G" - forecolor .5 0 0 1 - type ITEM_TYPE_BUTTON - style WINDOW_STYLE_EMPTY - textalign ITEM_ALIGN_RIGHT - textscale .25 - textalignx 36 - textaligny 14 - alignRect line ITEM_ALIGN_RIGHT 0 -28 40 24 - visible 1 - autowrapped - action { uiScript StartServer } - } + itemDef { + name "btn_run,allgroups,group3" + subgroup "fade_fore_alpha" + text "> ^_G^_O <" + shortcutKey "G" + forecolor .5 0 0 1 + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + textalign ITEM_ALIGN_RIGHT + textscale .25 + textalignx 36 + textaligny 14 + alignRect line ITEM_ALIGN_RIGHT 0 -28 40 24 + visible 1 + autowrapped + action { uiScript StartServer } + } - //map + //map - ADD_TAB( - "^_1^_. Map.", - "M", 1, "group2,group3", - alignrect "title" ITEM_ALIGN_LEFT 2 32 36 20 - ) - ADD_HINT("hint_tab1", "Step 1 : map selection", "group2,group3") + ADD_TAB( + "^_1^_. Map.", + "M", 1, "group2,group3", + alignrect "title" ITEM_ALIGN_LEFT 2 32 36 20 + ) + ADD_HINT("hint_tab1", "Step 1 : map selection", "group2,group3") - //Gameplay + //Gameplay - ADD_TAB( - "^_2^_.Gameplay.", - "G", 2, "group1,group3", - alignrect "tab1" ITEM_ALIGN_LEFT 40 0 56 16 - ) - ADD_HINT("hint_tab2", "Step 2 : gameplay options", "group1,group3") + ADD_TAB( + "^_2^_.Gameplay.", + "G", 2, "group1,group3", + alignrect "tab1" ITEM_ALIGN_LEFT 40 0 56 16 + ) + ADD_HINT("hint_tab2", "Step 2 : gameplay options", "group1,group3") - //Advanced + //Advanced - ADD_TAB( - "^_3^_.Advanced.", - "A", 3, "group1,group2", - alignrect "tab2" ITEM_ALIGN_LEFT 64 0 56 16 - ) - ADD_HINT("hint_tab3", "Final step : configure advanced options", "group1,group2") + ADD_TAB( + "^_3^_.Advanced.", + "A", 3, "group1,group2", + alignrect "tab2" ITEM_ALIGN_LEFT 64 0 56 16 + ) + ADD_HINT("hint_tab3", "Final step : configure advanced options", "group1,group2") /* ========================================================== @@ -164,160 +164,127 @@ Group # 1 ========================================================== */ - // Map list // + // Map list // - itemdef { - name "maplist" - subgroup "fade_fore_alpha,group1,allgroups" - LISTBOX_STYLE(.225, 8) - alignrect "line" ITEM_ALIGN_RIGHT 4 88 128 200 - feeder FEEDER_ALLMAPS - visible 1 - columns 1 2 140 22 - ASSIGN_HINT("hint_maps") - } + itemDef { + name "maplist" + subgroup "fade_fore_alpha,group1,allgroups" + LISTBOX_STYLE(.225, 8) + alignrect "line" ITEM_ALIGN_RIGHT 4 88 128 200 + feeder FEEDER_ALLMAPS + visible 1 + columns 1 2 140 22 + ASSIGN_HINT("hint_maps") + } - ADD_HINT("hint_maps", "Select a map", "group1") + ADD_HINT("hint_maps", "Select a map", "group1") - - - //Title - - //itemdef { - // renderpoint - // name "static" - // subgroup "fade_fore_alpha,group1,allgroups" - // text "Map:" - // forecolor .0 .0 .1 1 - // style WINDOW_STYLE_EMPTY - // textalign ITEM_ALIGN_LEFT - // textalignx 8 - // textaligny 4 - // textscale .225 - // alignRect "postit" ITEM_ALIGN_LEFT 28 20 100 32 - // visible 1 - // decoration - //} - - - itemdef { - name "map_preview" - //group "fade_fore_alpha" - subgroup "fade_fore_alpha,group1,allgroups" - rect -16 204 120 90 - anglevectors 7 -83 - ownerdraw UI_STARTMAPCINEMATIC - style WINDOW_STYLE_EMPTY - decoration - visible 1 - } + itemDef { + name "map_preview" + //group "fade_fore_alpha" + subgroup "fade_fore_alpha,group1,allgroups" + rect -16 204 120 90 + anglevectors 7 -83 + ownerdraw UI_STARTMAPCINEMATIC + style WINDOW_STYLE_EMPTY + decoration + visible 1 + } - itemDef { - renderpoint - name "polaroid" - group "fade_fore_alpha,group1,allgroups" - style WINDOW_STYLE_SHADER - background UI_ASSETS"/polaroid" - alignrect "map_preview" ITEM_ALIGN_CENTER 0 -23 160 160 - visible 1 - decoration - } + itemDef { + renderpoint + name "polaroid" + group "fade_fore_alpha,group1,allgroups" + style WINDOW_STYLE_SHADER + background UI_ASSETS"/polaroid" + alignrect "map_preview" ITEM_ALIGN_CENTER 0 -23 160 160 + visible 1 + decoration + } -/* - itemDef { - renderpoint - name "border" - subgroup "fade_fore_alpha,group1,allgroups" - style WINDOW_STYLE_SHADER - background UI_ASSETS"/polaroid" - alignrect map_preview ITEM_ALIGN_LEFT -4 -3 128 96 - //anglevectors -4 -96 - decoration - } -*/ - // Host name + // Host name - itemdef { - name "host_caption" - group "fade_fore_alpha,group1,allgroups" - style 0 - text "Host Name:" - alignrect "line" ITEM_ALIGN_LEFT 16 36 208 20 - textscale .225 - textalign 0 - textalignx 4 - textaligny 16 - forecolor OPTION_COLOR - visible 1 - decoration - } + itemDef { + name "host_caption" + group "fade_fore_alpha,group1,allgroups" + style 0 + text "Host Name:" + alignrect "line" ITEM_ALIGN_LEFT 16 36 208 20 + textscale .225 + textalign 0 + textalignx 4 + textaligny 16 + forecolor OPTION_COLOR + visible 1 + decoration + } - itemdef { - name "host_dots" - group "fade_fore_alpha,group1,allgroups" - style 0 - text ".............................................." - alignrect "host_caption" ITEM_ALIGN_RIGHT 0 0 168 20 - textscale .225 - textalign ITEM_ALIGN_RIGHT - textalignx 198 - textaligny 20 - forecolor OPTION_COLOR - visible 1 - decoration - } + itemDef { + name "host_dots" + group "fade_fore_alpha,group1,allgroups" + style 0 + text ".............................................." + alignrect "host_caption" ITEM_ALIGN_RIGHT 0 0 168 20 + textscale .225 + textalign ITEM_ALIGN_RIGHT + textalignx 198 + textaligny 20 + forecolor OPTION_COLOR + visible 1 + decoration + } - itemdef { - //name "host_field" - //BEGIN_SIMPLE_OPTION(1, 1) - name "allgroups,group1,gr1_ctrl1,fade_alpha" - group "fade_fore_alpha,group1,allgroups" - alignrect "host_caption" ITEM_ALIGN_RIGHT -32 0 168 20 - type ITEM_TYPE_EDITFIELD - style 0 - text "" - cvar "sv_hostname" - backcolor 0 0 0 .1 - forecolor 0 0 0 1 - outlinecolor 0 0 1 .5 - border 0 - textstyle 0 - maxChars 32 - maxPaintChars 18 - textscale .225 - textalign 0 - textalignx 4 - textaligny 16 - visible 1 - ASSIGN_HINT("hint_hostname") - } + itemDef { + //name "host_field" + name "allgroups,group1,gr1_ctrl1,fade_alpha" + group "fade_fore_alpha,group1,allgroups" + alignrect "host_caption" ITEM_ALIGN_RIGHT -32 0 168 20 + type ITEM_TYPE_EDITFIELD + style 0 + text "" + cvar "sv_hostname" + backcolor 0 0 0 .1 + forecolor 0 0 0 1 + outlinecolor 0 0 1 .5 + border 0 + textstyle 0 + maxChars 32 + maxPaintChars 18 + textscale .225 + textalign 0 + textalignx 4 + textaligny 16 + visible 1 + ASSIGN_HINT("hint_hostname") + } - ADD_HINT("hint_hostname", "Specifies the name of the server as shown in the server browser", "group1") + ADD_HINT("hint_hostname", "Specifies the name of the server as shown in the server browser", "group1") - // Gametype + // Gametype - itemdef { - name "gametype_caption" - group "fade_fore_alpha,group1,allgroups" - style 0 - text "Gametype:" - alignrect "host_caption" ITEM_ALIGN_LEFT 0 24 208 20 - textscale .225 - textalign 0 - textalignx 4 - textaligny 16 - forecolor OPTION_COLOR - visible 1 - decoration - } + itemdef { + name "gametype_caption" + group "fade_fore_alpha,group1,allgroups" + style 0 + text "Gametype:" + alignrect "host_caption" ITEM_ALIGN_LEFT 0 24 208 20 + textscale .225 + textalign 0 + textalignx 4 + textaligny 16 + forecolor OPTION_COLOR + visible 1 + decoration + } - BEGIN_OPTION("Gametype", "g_gametype", ITEM_TYPE_MULTI, 2, 1) - alignrect "gametype_caption" ITEM_ALIGN_RIGHT -28 2 160 20 - text "" - ownerdraw UI_NETGAMETYPE - ASSIGN_HINT("hint_gametype") - END_OPTION - ADD_HINT("hint_gametype", "Sets the general mode of gameplay", "group1") + //BEGIN_OPTION("Gametype", "g_gametype", ITEM_TYPE_MULTI, 2, 1) + BEGIN_SIMPLE_OPTION(2, 1) + alignrect "gametype_caption" ITEM_ALIGN_RIGHT -28 2 160 20 + text "" + ownerdraw UI_NETGAMETYPE + ASSIGN_HINT("hint_gametype") + END_OPTION + ADD_HINT("hint_gametype", "Sets the general mode of gameplay", "group1") /* ========================================================== @@ -326,36 +293,36 @@ Group # 2 ========================================================== */ - //Max players + //Max players BEGIN_OPTION("Maximum Players", "sv_maxclients", ITEM_TYPE_NUMERICFIELD, 1, 2) - //alignrect "line" ITEM_ALIGN_CENTER 56 32 112 VSIZE - alignrect "line" ITEM_ALIGN_CENTER 56 44 112 VSIZE - maxChars 4 - ASSIGN_HINT("hint_maxclients") + //alignrect "line" ITEM_ALIGN_CENTER 56 32 112 VSIZE + alignrect "line" ITEM_ALIGN_CENTER 56 44 112 VSIZE + maxChars 4 + ASSIGN_HINT("hint_maxclients") END_OPTION ADD_HINT("hint_maxclients", "The maximum number of players allowed on your server at once", "group2") - // Time limit + // Time limit BEGIN_OPTION("Time Limit", "timelimit", ITEM_TYPE_NUMERICFIELD, 2, 2) - OPTION_BELOW("gr2_ctrl1") - maxChars 4 - ASSIGN_HINT("hint_time") + OPTION_BELOW("gr2_ctrl1") + maxChars 4 + ASSIGN_HINT("hint_time") END_OPTION ADD_HINT("hint_time", "Sets the amount of time in minutes that each map will take (Set to 0 for no limit)", "group2") - // Gametype-specific options + // Gametype-specific options - // Deathmatch - // Frag limit + // Deathmatch + // Frag limit BEGIN_OPTION("Frag Limit", "fraglimit", ITEM_TYPE_NUMERICFIELD, 3, 2) - OPTION_BELOW("gr2_ctrl2") - maxChars 4 - ASSIGN_HINT("hint_frag") - cvarTest "ui_actualNetGameType" - showCvar { "0" } + OPTION_BELOW("gr2_ctrl2") + maxChars 4 + ASSIGN_HINT("hint_frag") + cvarTest "ui_actualNetGameType" + showCvar { "0" } END_OPTION ADD_HINT("hint_frag", "Sets the amount of frags needed to win (Set to 0 for no limit)", "group2") @@ -364,63 +331,63 @@ Group # 2 // Capture limit BEGIN_OPTION("Capture Limit", "capturelimit", ITEM_TYPE_NUMERICFIELD, 4, 2) - OPTION_BELOW("gr2_ctrl2") - maxChars 4 - ASSIGN_HINT("hint_capture") - cvarTest "ui_actualNetGameType" - showCvar { "5" } + OPTION_BELOW("gr2_ctrl2") + maxChars 4 + ASSIGN_HINT("hint_capture") + cvarTest "ui_actualNetGameType" + showCvar { "5" } END_OPTION ADD_HINT("hint_capture", "Sets the number of briefcase captures that must be reached to win", "group2") // Force join BEGIN_OPTION("Force Join", "g_teamautojoin", ITEM_TYPE_YESNO, 5, 2) - //kind YESNO_ICON_RIGHT - OPTION_BELOW("gr2_ctrl4") - ASSIGN_HINT("hint_autojoin") - cvarTest "ui_actualNetGameType" - showCvar { "5" } + //kind YESNO_ICON_RIGHT + OPTION_BELOW("gr2_ctrl4") + ASSIGN_HINT("hint_autojoin") + cvarTest "ui_actualNetGameType" + showCvar { "5" } END_OPTION ADD_HINT("hint_autojoin", "Force players to automatically join a team on connect", "group2") // Even teams BEGIN_OPTION("Even Teams", "g_teamforcebalance", ITEM_TYPE_YESNO, 6, 2) - //kind YESNO_ICON_RIGHT - OPTION_BELOW("gr2_ctrl5") - ASSIGN_HINT("hint_even") - cvarTest "ui_actualNetGameType" - showCvar { "5" } + //kind YESNO_ICON_RIGHT + OPTION_BELOW("gr2_ctrl5") + ASSIGN_HINT("hint_even") + cvarTest "ui_actualNetGameType" + showCvar { "5" } END_OPTION ADD_HINT("hint_even", "Force team balancing", "group2") // Friendly fire BEGIN_OPTION("Friendly Fire", "g_friendlyfire", ITEM_TYPE_MULTI, 7, 2) - OPTION_BELOW("gr2_ctrl6") - cvarFloatList { - "Off" 0 - "Off/knockback" 2 - "On" 1 - } - ASSIGN_HINT("hint_ff") - cvarTest "ui_actualNetGameType" - showCvar { "5" } + OPTION_BELOW("gr2_ctrl6") + cvarFloatList { + "Off" 0 + "Off/knockback" 2 + "On" 1 + } + ASSIGN_HINT("hint_ff") + cvarTest "ui_actualNetGameType" + showCvar { "5" } END_OPTION ADD_HINT("hint_ff", "Determines if players can damage their own teammates", "group2") // Bandolier grenades BEGIN_OPTION("Bandolier Grenades", "g_RQ3_tgren", ITEM_TYPE_MULTI, 8, 2) - OPTION_BELOW("gr2_ctrl7") - cvarFloatList { - "1" 1 - "2" 2 - "None" 0 - } - ASSIGN_HINT("hint_tgren") - cvarTest "ui_actualNetGameType" - showCvar { "5" } + OPTION_BELOW("gr2_ctrl7") + cvarFloatList { + "1" 1 + "2" 2 + "None" 0 + } + ASSIGN_HINT("hint_tgren") + cvarTest "ui_actualNetGameType" + showCvar { "5" } END_OPTION ADD_HINT("hint_tgren", "Sets the number of grenades that come with the bandolier", "group2") @@ -429,72 +396,72 @@ Group # 2 // Frag limit BEGIN_OPTION("Frag Limit", "fraglimit", ITEM_TYPE_NUMERICFIELD, 9, 2) - OPTION_BELOW("gr2_ctrl2") - maxChars 4 - ASSIGN_HINT("hint_frag") - cvarTest "ui_actualNetGameType" - showCvar { "3" } + OPTION_BELOW("gr2_ctrl2") + maxChars 4 + ASSIGN_HINT("hint_frag") + cvarTest "ui_actualNetGameType" + showCvar { "3" } END_OPTION // Force join BEGIN_OPTION("Force Join", "g_teamautojoin", ITEM_TYPE_YESNO, 10, 2) - //kind YESNO_ICON_RIGHT - OPTION_BELOW("gr2_ctrl9") - ASSIGN_HINT("hint_autojoin") - cvarTest "ui_actualNetGameType" - showCvar { "3" } + //kind YESNO_ICON_RIGHT + OPTION_BELOW("gr2_ctrl9") + ASSIGN_HINT("hint_autojoin") + cvarTest "ui_actualNetGameType" + showCvar { "3" } END_OPTION // Even teams BEGIN_OPTION("Even Teams", "g_teamforcebalance", ITEM_TYPE_YESNO, 11, 2) - //kind YESNO_ICON_RIGHT - OPTION_BELOW("gr2_ctrl10") - ASSIGN_HINT("hint_even") - cvarTest "ui_actualNetGameType" - showCvar { "3" } + //kind YESNO_ICON_RIGHT + OPTION_BELOW("gr2_ctrl10") + ASSIGN_HINT("hint_even") + cvarTest "ui_actualNetGameType" + showCvar { "3" } END_OPTION // Friendly fire - + BEGIN_OPTION("Friendly Fire", "g_friendlyfire", ITEM_TYPE_MULTI, 12, 2) - OPTION_BELOW("gr2_ctrl11") - cvarFloatList { - "Off" 0 - "Off/knockback" 2 - "On" 1 - } - ASSIGN_HINT("hint_ff") - cvarTest "ui_actualNetGameType" - showCvar { "3" } + OPTION_BELOW("gr2_ctrl11") + cvarFloatList { + "Off" 0 + "Off/knockback" 2 + "On" 1 + } + ASSIGN_HINT("hint_ff") + cvarTest "ui_actualNetGameType" + showCvar { "3" } END_OPTION // Bandolier grenades BEGIN_OPTION("Bandolier Grenades", "g_RQ3_tgren", ITEM_TYPE_MULTI, 13, 2) - OPTION_BELOW("gr2_ctrl12") - cvarFloatList { - "1" 1 - "2" 2 - "None" 0 - } - ASSIGN_HINT("hint_tgren") - cvarTest "ui_actualNetGameType" - showCvar { "3" } + OPTION_BELOW("gr2_ctrl12") + cvarFloatList { + "1" 1 + "2" 2 + "None" 0 + } + ASSIGN_HINT("hint_tgren") + cvarTest "ui_actualNetGameType" + showCvar { "3" } END_OPTION // Team Deathmatch Mode BEGIN_OPTION("TeamDM Mode", "g_RQ3_tdmMode", ITEM_TYPE_MULTI, 14, 2) - OPTION_BELOW("gr2_ctrl13") - cvarFloatList { - "Classic" 0 - "TP Style" 1 - } - ASSIGN_HINT("hint_tdm_mode") - cvarTest "ui_actualNetGameType" - showCvar { "3" } + OPTION_BELOW("gr2_ctrl13") + cvarFloatList { + "Classic" 0 + "TP Style" 1 + } + ASSIGN_HINT("hint_tdm_mode") + cvarTest "ui_actualNetGameType" + showCvar { "3" } END_OPTION ADD_HINT("hint_tdm_mode", "Toggles TP/DM Style weapon/item selection", "group2") @@ -502,71 +469,71 @@ Group # 2 // Round limit BEGIN_OPTION("Round Limit", "g_RQ3_roundlimit", ITEM_TYPE_NUMERICFIELD, 15, 2) - OPTION_BELOW("gr2_ctrl2") - maxChars 4 - ASSIGN_HINT("hint_rounds") - cvarTest "ui_actualNetGameType" - showCvar { "4" } + OPTION_BELOW("gr2_ctrl2") + maxChars 4 + ASSIGN_HINT("hint_rounds") + cvarTest "ui_actualNetGameType" + showCvar { "4" } END_OPTION ADD_HINT("hint_rounds", "The map will end when one of the teams wins this many rounds", "group2") // Round time limit - + BEGIN_OPTION("Round Time Limit", "g_RQ3_roundTimeLimit", ITEM_TYPE_NUMERICFIELD, 16, 2) - OPTION_BELOW("gr2_ctrl15") - maxChars 4 - ASSIGN_HINT("hint_roundtime") - cvarTest "ui_actualNetGameType" - showCvar { "4" } + OPTION_BELOW("gr2_ctrl15") + maxChars 4 + ASSIGN_HINT("hint_roundtime") + cvarTest "ui_actualNetGameType" + showCvar { "4" } END_OPTION ADD_HINT("hint_roundtime", "Each round will end after this many minutes", "group2") - + // Force join BEGIN_OPTION("Force Join", "g_teamautojoin", ITEM_TYPE_YESNO, 17, 2) - //kind YESNO_ICON_RIGHT - OPTION_BELOW("gr2_ctrl16") - ASSIGN_HINT("hint_autojoin") - cvarTest "ui_actualNetGameType" - showCvar { "4" } + //kind YESNO_ICON_RIGHT + OPTION_BELOW("gr2_ctrl16") + ASSIGN_HINT("hint_autojoin") + cvarTest "ui_actualNetGameType" + showCvar { "4" } END_OPTION // Even teams BEGIN_OPTION("Even Teams", "g_teamforcebalance", ITEM_TYPE_YESNO, 18, 2) - //kind YESNO_ICON_RIGHT - OPTION_BELOW("gr2_ctrl17") - ASSIGN_HINT("hint_even") - cvarTest "ui_actualNetGameType" - showCvar { "4" } + //kind YESNO_ICON_RIGHT + OPTION_BELOW("gr2_ctrl17") + ASSIGN_HINT("hint_even") + cvarTest "ui_actualNetGameType" + showCvar { "4" } END_OPTION // Friendly fire BEGIN_OPTION("Friendly Fire", "g_friendlyfire", ITEM_TYPE_MULTI, 19, 2) - OPTION_BELOW("gr2_ctrl18") - cvarFloatList { - "Off" 0 - "Off/knockback" 2 - "On" 1 - } - ASSIGN_HINT("hint_ff") - cvarTest "ui_actualNetGameType" - showCvar { "4" } + OPTION_BELOW("gr2_ctrl18") + cvarFloatList { + "Off" 0 + "Off/knockback" 2 + "On" 1 + } + ASSIGN_HINT("hint_ff") + cvarTest "ui_actualNetGameType" + showCvar { "4" } END_OPTION // Bandolier grenades BEGIN_OPTION("Bandolier Grenades", "g_RQ3_tgren", ITEM_TYPE_MULTI, 20, 2) - OPTION_BELOW("gr2_ctrl19") - cvarFloatList { - "1" 1 - "2" 2 - "None" 0 - } - ASSIGN_HINT("hint_tgren") - cvarTest "ui_actualNetGameType" - showCvar { "4" } + OPTION_BELOW("gr2_ctrl19") + cvarFloatList { + "1" 1 + "2" 2 + "None" 0 + } + ASSIGN_HINT("hint_tgren") + cvarTest "ui_actualNetGameType" + showCvar { "4" } END_OPTION @@ -581,69 +548,67 @@ Group # 3 // Pure server BEGIN_OPTION("Pure Server", "sv_pure", ITEM_TYPE_YESNO, 1, 3) - kind YESNO_ICON_RIGHT - //alignrect "line" ITEM_ALIGN_CENTER 56 32 112 VSIZE - alignrect "line" ITEM_ALIGN_CENTER 56 44 112 VSIZE - ASSIGN_HINT("hint_pure") + kind YESNO_ICON_RIGHT + //alignrect "line" ITEM_ALIGN_CENTER 56 32 112 VSIZE + alignrect "line" ITEM_ALIGN_CENTER 56 44 112 VSIZE + ASSIGN_HINT("hint_pure") END_OPTION ADD_HINT("hint_pure", "Enable Pure Server to ensure that the content on client machines match the content on your server", "group3") // Allow download BEGIN_OPTION("Allow Download", "sv_allowdownload", ITEM_TYPE_YESNO, 2, 3) - kind YESNO_ICON_RIGHT - OPTION_BELOW("gr3_ctrl1") - ASSIGN_HINT("hint_download") + kind YESNO_ICON_RIGHT + OPTION_BELOW("gr3_ctrl1") + ASSIGN_HINT("hint_download") END_OPTION ADD_HINT("hint_download", "Allows clients to download missing content from the server", "group3") // Allow voting BEGIN_OPTION("Allow Voting", "g_allowvote", ITEM_TYPE_YESNO, 3, 3) - kind YESNO_ICON_RIGHT - OPTION_BELOW("gr3_ctrl2") - ASSIGN_HINT("hint_vote") + kind YESNO_ICON_RIGHT + OPTION_BELOW("gr3_ctrl2") + ASSIGN_HINT("hint_vote") END_OPTION ADD_HINT("hint_vote", "Allows players to call votes for map changes, restarting games, and other options", "group3") // Password BEGIN_OPTION("Require Password", "g_needpass", ITEM_TYPE_YESNO, 4, 3) - kind YESNO_ICON_RIGHT - OPTION_BELOW("gr3_ctrl3") - ASSIGN_HINT("hint_needpass") + kind YESNO_ICON_RIGHT + OPTION_BELOW("gr3_ctrl3") + ASSIGN_HINT("hint_needpass") END_OPTION ADD_HINT("hint_needpass", "Specifies whether the password is needed in order to connect to your server", "group3") BEGIN_OPTION("Password", "g_password", ITEM_TYPE_EDITFIELD, 5, 3) - OPTION_BELOW("gr3_ctrl4") - maxChars 32 - maxPaintChars 12 - ASSIGN_HINT("hint_pass") + OPTION_BELOW("gr3_ctrl4") + maxChars 32 + maxPaintChars 12 + ASSIGN_HINT("hint_pass") END_OPTION ADD_HINT("hint_pass", "Sets a password for the server", "group3") // Synchronous clients BEGIN_OPTION("Synchronous Clients", "g_synchronousclients", ITEM_TYPE_YESNO, 6, 3) - kind YESNO_ICON_RIGHT - OPTION_BELOW("gr3_ctrl5") - ASSIGN_HINT("hint_sync") + kind YESNO_ICON_RIGHT + OPTION_BELOW("gr3_ctrl5") + ASSIGN_HINT("hint_sync") END_OPTION ADD_HINT("hint_sync", "Toggles synchronization of all clients to allow demo recording on the server", "group3") // VoIP BEGIN_OPTION("VoIP", "sv_voip", ITEM_TYPE_YESNO, 7, 3) - kind YESNO_ICON_RIGHT - OPTION_BELOW("gr3_ctrl6") - ASSIGN_HINT("hint_voip") + kind YESNO_ICON_RIGHT + OPTION_BELOW("gr3_ctrl6") + ASSIGN_HINT("hint_voip") END_OPTION ADD_HINT("hint_voip", "Enable server-side VoIP support", "group3") - -} - + } } diff --git a/reaction/uifiles/credit.menu b/reaction/uifiles/credit.menu index 0f26f63f..4c46fc5f 100644 --- a/reaction/uifiles/credit.menu +++ b/reaction/uifiles/credit.menu @@ -59,60 +59,11 @@ //-------------------------------------------- -//============= -// Buttons -//============= + __BOOMSTICK_LOGO__ + __REACTION_VERSION__ + __REACTION_COPYRIGHT__ - //Boomstick logo - - itemDef { - style WINDOW_STYLE_SHADER - rect 276 288 120 120 - anglevectors 9 -81 - background UI_ASSETS"/logo" - forecolor 1 1 1 0.2 - decoration - visible 1 - } - - // REACTION QUAKE 3 VERSION 3.3 // - - itemdef { - group main - subgroup "main_title" - //text "REACTION QUAKE 3 v3.3" - text "REACTION v1.0" - forecolor 0 0 .05 1 - style WINDOW_STYLE_EMPTY - textalign ITEM_ALIGN_CENTER - textscale .4 - textalignx 120 - textaligny 24 - rect 108 144 240 36 - anglevectors 9 -81 - visible 1 - autowrapped - decoration - } - - itemDef { - group main - //rect 100 100 440 280 - alignrect "main_title" ITEM_ALIGN_LEFT 0 20 240 36 - style WINDOW_STYLE_EMPTY - textalign ITEM_ALIGN_CENTER - textscale .275 - textalignx 120 - textaligny 24 - forecolor 0 0 0.05 1 - text "(c) 2000-2009 Boomstick Studios\n\n\n\n\n" - "www.rq3.com" - autowrapped - visible 1 - decoration - } - //Timed items @@ -1948,7 +1899,7 @@ textalignx 220 textaligny 80 text "THIS HAS BEEN A BOOMSTICK STUDIOS\nPRODUCTION\n\n" - "Copyright 2000 - 2009" + "Copyright 2000 - 2010" autowrapped visible 1 decoration diff --git a/reaction/uifiles/findplayer.menu b/reaction/uifiles/findplayer.menu index a445a344..9bafe175 100644 --- a/reaction/uifiles/findplayer.menu +++ b/reaction/uifiles/findplayer.menu @@ -1,5 +1,196 @@ #include "ui/menudef.h" +#define FADEIN_TIME 125 +#define BACK_COLOR1 .85 .9 .85 1 +#define BACK_COLOR2 .95 .95 .98 1 + +#define ANGLES 5 -85 + +{ + // FIND PLAYER POPUP MENU // + + menuDef { + name "findplayer_popmenu" + visible 0 + fullscreen 0 + rect 200 200 340 264 + anglevectors ANGLES + focusColor .25 .25 .5 1 + popup + style WINDOW_STYLE_EMPTY + onOpen { + //setitemcolor window forecolor 5 5 5 0 ; + //timefade window forecolor 5 5 5 1 0 FADEIN_TIME ; + play "sound/ui/whoosh3.wav" ; + uiScript FindPlayer ; + setfocus nameEntry + } + onESC { close _self ; open joinserver } + onOOBClick { close _self ; open joinserver } + + itemDef { + renderpoint + name "postit" + menuAnchor + group window + style WINDOW_STYLE_SHADER + background UI_ASSETS"/paper_1" + forecolor 1 1 .92 1 + rect -8 -12 380 320 + anglevectors ANGLES + visible 1 + decoration + } + + // TITLE // + + itemdef { + renderpoint + name "title" + text "Find a player:" + forecolor .6 .0 .0 1 + style WINDOW_STYLE_EMPTY + textalign ITEM_ALIGN_LEFT + textalignx 4 + textaligny 24 + textscale RQ3_MAIN_TEXTSIZE + alignrect postit ITEM_ALIGN_LEFT 32 24 240 36 + visible 1 + autowrapped + decoration + } + + // PLAYER NAME // + + itemDef { + renderpoint + name "name" + text "Name:" + style 0 + decoration + textscale .25 + alignrect title ITEM_ALIGN_LEFT -8 32 52 20 + textalign ITEM_ALIGN_LEFT + textalignx 20 + textaligny 16 + forecolor 0 0 .15 1 + visible 1 + } + + itemDef { + name "name_dots" + text "........................................" + style 0 + decoration + textscale .25 + alignrect name ITEM_ALIGN_LEFT 80 2 168 20 + textalign ITEM_ALIGN_LEFT + textalignx 4 + textaligny 19 + forecolor 0 0 .15 1 + visible 1 + } + + itemDef { + name "nameEntry" + style WINDOW_STYLE_EMPTY + text "" + textalign ITEM_ALIGN_LEFT + textalignx 4 + textaligny 14 + maxchars 20 + maxPaintChars 15 + textscale .25 + type ITEM_TYPE_EDITFIELD + cvar "ui_findPlayer" + alignrect name_dots ITEM_ALIGN_LEFT 0 0 168 20 + forecolor 0 0 .15 1 + backcolor 1 0 0 .5 + visible 1 + } + + // SERVER LIST // + + itemDef { + name "list" + type ITEM_TYPE_LISTBOX + alignrect name ITEM_ALIGN_LEFT 12 40 276 120 + LISTBOX_STYLE(.225, 8) + style WINDOW_STYLE_FILLED + elementtype LISTBOX_TEXT + elementwidth 160 + elementheight 20 + textscale .2 + textalign ITEM_ALIGN_LEFT + textalignx 8 + textaligny 14 + feeder FEEDER_FINDPLAYER + forecolor 0 0 0 1 + visible 1 + } + + // SERVER INFO // + + itemDef { + text "^_S^_erver info..." + shortcutKey "S" + type ITEM_TYPE_BUTTON + textscale .25 + style WINDOW_STYLE_EMPTY + alignrect list ITEM_ALIGN_LEFT 0 128 80 20 + textalign 1 + textalignx 40 + textaligny 16 + forecolor 0 0 .15 1 + visible 1 + action { play "sound/ui/whoosh3.wav" ; open "serverinfo_popmenu" } + } + + // FIND // + + itemDef { + text "^_F^_ind" + shortcutKey "F" + type ITEM_TYPE_BUTTON + textscale .25 + style WINDOW_STYLE_EMPTY + alignrect name_dots ITEM_ALIGN_LEFT 176 0 32 20 + textalign 1 + textalignx 16 + textaligny 16 + forecolor 0 0 .15 1 + visible 1 + action { play "sound/ui/whoosh3.wav" ; ui_script FindPlayer } + } + + // JOIN // + + itemDef { + text "> ^_J^_oin <" + shortcutKey "J" + type ITEM_TYPE_BUTTON + textscale .25 + style WINDOW_STYLE_EMPTY + alignrect list ITEM_ALIGN_LEFT 228 128 48 20 + textalign 1 + textalignx 24 + textaligny 16 + forecolor .5 0 0 1 + visible 1 + /* + style WINDOW_STYLE_FILLED + backcolor 0 0 0 .6 + */ + action { play "sound/ui/whoosh3.wav" ; ui_script FoundPlayerJoinServer } + } + } +} + + + +#if 0 +#include "ui/menudef.h" + { // Find Player Popup Menu // @@ -181,4 +372,4 @@ } } - +#endif diff --git a/reaction/uifiles/ingame.menu b/reaction/uifiles/ingame.menu index ec4cf735..4e071bdb 100644 --- a/reaction/uifiles/ingame.menu +++ b/reaction/uifiles/ingame.menu @@ -1,5 +1,7 @@ #include "ui/menudef.h" +#define ANGLES 2 -88 +#define FADEIN_TIME 125 { menuDef { @@ -10,8 +12,12 @@ rect 0 0 640 480 focusColor RQ3_MAIN_FOCUSCOLOR disableColor .5 .5 .5 1 - //onOpen { hide confirm ; play "sound/ui/whoosh3.wav" ; setfocus "btn-about" ; } - onOpen { play "sound/ui/whoosh3.wav" ; setfocus "btn-about" ; } + onOpen { + setitemcolor window forecolor 5 5 5 0 ; + timefade window forecolor 5 5 5 1 0 FADEIN_TIME ; + play "sound/ui/whoosh3.wav" ; + setfocus "btn_about" ; + } itemdef { name "ig-overlay" @@ -24,6 +30,31 @@ decoration } + itemdef { + name "clipboard" + type ITEM_TYPE_MODEL + asset_model UI_ASSETS"/models/clipboard/clipboard.md3" + rect 0 0 640 480 + model_fovx 40 + model_fovy 30 + model_origin 34 2.6 -0.25 + model_angles 90 -88 270 + visible 1 + decoration + } + + itemDef { + renderpoint + name "paper" + style WINDOW_STYLE_SHADER + background UI_ASSETS"/paper_1" + forecolor MENUCOLOR_SETUP 1 + rect 96 48 320 420 + anglevectors ANGLES + visible 0 + decoration + } + itemDef { name "ig-logo" group background @@ -35,7 +66,7 @@ decoration } - +/* itemDef { renderpoint name "postit2" @@ -50,6 +81,7 @@ visible 1 decoration } +*/ //Restart @@ -62,7 +94,7 @@ forecolor 0 0 0 1 textaligny 20 textscale UI_MAIN_TEXTSIZE - alignrect "postit2" ITEM_ALIGN_LEFT 32 8 120 24 + alignrect "paper" ITEM_ALIGN_LEFT 32 160 120 24 //alignrect "postit2" ITEM_ALIGN_LEFT $evalfloat(UI_MINX + 32) 8 120 24 type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY @@ -81,7 +113,7 @@ forecolor 0 0 0 1 textaligny 20 textscale UI_MAIN_TEXTSIZE - alignrect "btn_restart" ITEM_ALIGN_LEFT 0 20 120 24 + alignrect "btn_restart" ITEM_ALIGN_LEFT 0 24 120 24 type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY visible 1 @@ -98,7 +130,7 @@ forecolor 0 0 0 1 textaligny 20 textscale UI_MAIN_TEXTSIZE - alignrect "btn_mainmenu" ITEM_ALIGN_LEFT 0 20 120 24 + alignrect "btn_mainmenu" ITEM_ALIGN_LEFT 0 24 120 24 type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY visible 1 @@ -108,7 +140,7 @@ - +/* itemDef { renderpoint name "postit" @@ -123,6 +155,7 @@ visible 1 decoration } +*/ //About @@ -135,7 +168,7 @@ forecolor 0 0 0 1 textaligny 20 textscale UI_MAIN_TEXTSIZE - alignrect "postit" ITEM_ALIGN_LEFT 32 8 120 24 + alignrect "paper" ITEM_ALIGN_LEFT 32 40 120 24 type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY visible 1 @@ -152,7 +185,7 @@ forecolor 0 0 0 1 textaligny 20 textscale UI_MAIN_TEXTSIZE - alignrect "btn_about" ITEM_ALIGN_LEFT 0 20 120 24 + alignrect "btn_about" ITEM_ALIGN_LEFT 0 24 120 24 type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY visible 1 @@ -169,7 +202,7 @@ forecolor 0 0 0 1 textaligny 20 textscale UI_MAIN_TEXTSIZE - alignrect "btn_options" ITEM_ALIGN_LEFT 0 20 120 24 + alignrect "btn_options" ITEM_ALIGN_LEFT 0 24 120 24 type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY visible 1 @@ -186,13 +219,13 @@ forecolor 0 0 0 1 textaligny 20 textscale UI_MAIN_TEXTSIZE - alignrect "btn_ignore" ITEM_ALIGN_LEFT 0 20 120 24 + alignrect "btn_ignore" ITEM_ALIGN_LEFT 0 24 120 24 type ITEM_TYPE_BUTTON style WINDOW_STYLE_EMPTY visible 1 cvartest "g_allowVote" showCvar { "1" } - action { open ingame_vote } + action { open ingame_callvote } } } diff --git a/reaction/uifiles/ingame.txt b/reaction/uifiles/ingame.txt index 3ace806b..84601053 100644 --- a/reaction/uifiles/ingame.txt +++ b/reaction/uifiles/ingame.txt @@ -1,31 +1,27 @@ { // MENU DEFS // - loadMenu { "ui/ingame.menu" } - //loadMenu { "ui/ingame_devmode.menu" } - loadMenu { "ui/ingame_vote.menu" } - loadMenu { "ui/ingame_tkok.menu" } + loadMenu { "ui/ingame.menu" } loadMenu { "ui/ingame_about.menu" } - //loadMenu { "ui/ingame_voip.menu" } - + loadMenu { "ui/ingame_ignore.menu" } + //loadMenu { "ui/ingame_vote.menu" } + loadMenu { "ui/ingame_callvote.menu" } + loadMenu { "ui/ingame_setup.menu" } + loadMenu { "ui/ingame_join.menu" } loadMenu { "ui/ingame_join_dm.menu" } - - loadMenu { "ui/ingame_setup.menu" } - - //loadMenu { "ui/ingame_player.menu" } loadMenu { "ui/ingame_weapon.menu" } loadMenu { "ui/ingame_item.menu" } - loadMenu { "ui/ingame_ignore.menu" } - //loadMenu { "ui/ingame_addbot.menu" } - loadMenu { "ui/ingame_callvote.menu" } + loadMenu { "ui/ingame_tkok.menu" } + //loadMenu { "ui/ingame_player.menu" } + //loadMenu { "ui/ingame_addbot.menu" } //loadMenu { "ui/ingame_matchmode.menu" } //loadMenu { "ui/ingame_matchmode_captain.menu" } //loadMenu { "ui/ingame_matchmode_referee.menu" } //loadMenu { "ui/ingame_matchmode_settings.menu" } + //loadMenu { "ui/ingame_devmode.menu" } - //loadMenu { "ui/ingame_presets.menu" } - //loadMenu { "ui/ingame_presets_edit.menu" } - + loadMenu { "ui/ingame_presets.menu" } + loadMenu { "ui/ingame_presets_edit.menu" } } diff --git a/reaction/uifiles/ingame_about.menu b/reaction/uifiles/ingame_about.menu index 3565700f..f85e6bc5 100644 --- a/reaction/uifiles/ingame_about.menu +++ b/reaction/uifiles/ingame_about.menu @@ -1,5 +1,5 @@ #include "ui/menudef.h" -#define ANGLES -4 -96 +#define ANGLES -4 -94 { menuDef { @@ -7,7 +7,6 @@ name "ingame_about" visible MENU_FALSE // Visible on open fullscreen 0 - onOOBClick { close _self ; open _prev } // this closes the window if it gets a click out of the rectangle rect 168 72 340 264 disableColor .5 .5 .5 1 focusColor RQ3_MAIN_FOCUSCOLOR // Menu focus color for text and items @@ -17,7 +16,7 @@ style WINDOW_STYLE_EMPTY popup - onOOBClick { close _self ; open _prev } + onOOBClick { close _self ; open _prev } // this closes the window if it gets a click out of the rectangle onOpen { play "sound/ui/whoosh3.wav" ; uiScript "refreshIngameServerInfo" } onEsc { close _self ; open _prev } @@ -48,7 +47,7 @@ //Title - itemdef { + itemDef { renderpoint name "title,fade_alpha" text "Server info:" @@ -81,7 +80,7 @@ textaligny 12 textscale .225 backcolor 0 0 .75 .25 - action { play "sound/misc/menu1.wav" ; setCvar ui_RQ3_ingameDetails 1 ; + action { play "sound/ui/whoosh3.wav" ; setCvar ui_RQ3_ingameDetails 1 ; uiScript "refreshIngameServerInfo" ; setfocus view_details } visible 1 } @@ -101,7 +100,7 @@ textaligny 12 textscale .225 backcolor 0 0 .75 .25 - action { play "sound/misc/menu1.wav" ; setCvar ui_RQ3_ingameDetails 0 ; + action { play "sound/ui/whoosh3.wav" ; setCvar ui_RQ3_ingameDetails 0 ; uiScript "refreshIngameServerInfo" ; setfocus view_summary } visible 1 } diff --git a/reaction/uifiles/ingame_callvote.menu b/reaction/uifiles/ingame_callvote.menu index 94135d78..18aca136 100644 --- a/reaction/uifiles/ingame_callvote.menu +++ b/reaction/uifiles/ingame_callvote.menu @@ -1,350 +1,325 @@ #include "ui/menudef.h" +#include "ui/tabs.h" -#define SECCOLOR1 1 1 1 0 -#define SECCOLOR2 1 1 1 .2 +//////////////////////////////////// +// +// CONSTANTS +// +// + + +#define OPTION_COLOR 0 0 .1 1 +#define Tab_Color1 0 0 0 1 +#define Tab_Color2 0 0 .5 1 +#define VSPACE 16 +#define VSIZE 16 +#define ICON_ALPHA 0.5 +#define LINE_ALPHA 0.2 +#define FADEIN_TIME 125 +#define HINT_COLOR .25 .25 .25 +#define HINT_FADE_TIME 125 +#define TAB_HEIGHT 20 +#define LINE_WIDTH 300 + + +//////////////////////////////////// +// +// MENU DEFINITION +// +// { - //----------------// - // CALL VOTE MENU // - //----------------// - menuDef { - name "ingame_callvote" - visible 0 - fullscreen 0 - //outOfBoundsClick // this closes the window if it gets a click out of the rectangle - onOOBClick { close _self ; open _prev } - rect 320 64 288 212 - focusColor 1 .75 0 1 // Menu focus color for text and items - style WINDOW_STYLE_EMPTY - shadowStyle 1 - border 0 - onOpen { uiScript loadVoteArenas ; hide grpcallVote ; show map ; - setitemcolor grpSections backcolor SECCOLOR1; - timeFade sectionMap backColor SECCOLOR2 0 250 ; - setfocus sectionMap } + name "ingame_callvote" + visible MENU_FALSE // Visible on open + focusColor RQ3_MAIN_FOCUSCOLOR // Menu focus color for text and items + rect 120 112 344 264 + anglevectors 3 -87 + style WINDOW_STYLE_EMPTY + popup + + onOOBClick { close _self } + onOpen { + play "sound/ui/whoosh3.wav" ; + uiScript loadVoteArenas ; + setitemcolor hints forecolor HINT_COLOR 1 ; hide "hints" ; + ACTIVATE_TAB(1) ; + } + + onClose { open _prev } + onEsc { close _self } + + onOpenSpecial { + //normal items + setItemColor "fade_alpha" forecolor 5 5 5 0 ; + timeFade "fade_alpha" forecolor 5 5 5 1 0 FADEIN_TIME ; + //icon - special alpha + setItemColor "icon" forecolor 5 5 5 0 ; + timeFade "icon" forecolor 5 5 5 ICON_ALPHA 0 FADEIN_TIME ; + //line - special alpha; using backcolor + setItemColor "line" backcolor 5 5 5 0 ; + timeFade "line" backcolor 5 5 5 LINE_ALPHA 0 FADEIN_TIME ; + } + + itemDef { + name "paper,fade_alpha" + style WINDOW_STYLE_SHADER + background UI_ASSETS"/paper_1" + forecolor MENUCOLOR_OPTIONS 1 + rect -8 -16 380 320 + anglevectors 3 -87 + visible 1 + menuAnchor + decoration + } + + itemDef { + renderpoint + name "title,fade_alpha" + text "Call a vote:" + forecolor .6 .0 .0 1 + style WINDOW_STYLE_EMPTY + textalign ITEM_ALIGN_LEFT + textalignx 4 + textaligny 24 + textscale RQ3_MAIN_TEXTSIZE + alignrect paper ITEM_ALIGN_LEFT 32 32 240 36 + visible 1 + autowrapped + decoration + } -//Window + //Line - itemDef { - rect 0 0 72 212 - style WINDOW_STYLE_FILLED - backcolor Ig_Window_Color - visible 1 - border 1 - bordersize 1 - bordercolor Ig_Window_BorderColor - decoration - } + itemDef { + name "line,fade_alpha" + style WINDOW_STYLE_FILLED + backcolor .25 .25 .25 LINE_ALPHA + alignrect "title" ITEM_ALIGN_LEFT 0 48 LINE_WIDTH 2 + visible 1 + decoration + } - itemDef { - rect 71 0 215 212 - style WINDOW_STYLE_FILLED - backcolor Ig_Window_Color - visible 1 - border 1 - bordersize 1 - bordercolor Ig_Window_BorderColor - decoration - } + /////////////////////////////////////////////////////////// + // + // Sub-options + // + // - itemDef { - rect 169 1 120 24 - style WINDOW_STYLE_SHADER - background "ui/assets/rq3-ingame-title" - visible 1 - decoration - } + // Map + ADD_TAB( + "^_M^_ap.", + "M", 1, "group2,group3", + alignrect "title" ITEM_ALIGN_LEFT 2 28 28 TAB_HEIGHT + ) + ADD_HINT("hint_tab1", "Call a vote for a map change", "group2,group3") - itemDef { - rect 169 1 120 24 - style WINDOW_STYLE_EMPTY - forecolor Ig_Window_TitleColor - textstyle ITEM_TEXTSTYLE_NORMAL - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 24 - textaligny 16 - text "Call vote" - visible 1 - decoration - } +//--------------------------------------------------------- -//Sub-sections + // Gametype - itemDef { - name sectionMap - group grpSections - text "Map. 1" - shortcutKey "1" - type ITEM_TYPE_BUTTON - textscale .225 - style WINDOW_STYLE_FILLED - rect 0 44 72 16 - textalign ITEM_ALIGN_RIGHT - textalignx 64 - textaligny 12 - textstyle ITEM_TEXTSTYLE_SHADOWED - border 1 - bordersize 1 - bordercolor Ig_Window_BorderColor - forecolor Ig_Sub_TextColor - backcolor SECCOLOR1 - visible 1 - action { play "sound/misc/menu1.wav" ; hide grpCallVote ; show map ; - setitemcolor grpSections backcolor SECCOLOR1; - timeFadeSelf backColor SECCOLOR2 0 250 } - } + ADD_TAB( + "^_G^_ametype.", + "G", 2, "group1,group3", + alignrect "tab1" ITEM_ALIGN_RIGHT -58 0 58 TAB_HEIGHT + ) + ADD_HINT("hint_tab2", "Call a vote for a gametype change", "group1,group3") - itemDef { - name sectionKick - group grpSections - text "Kick. 2" - shortcutKey "2" - type ITEM_TYPE_BUTTON - textscale .225 - style WINDOW_STYLE_FILLED - rect 0 68 72 16 - textalign ITEM_ALIGN_RIGHT - textalignx 64 - textaligny 12 - textstyle ITEM_TEXTSTYLE_SHADOWED - border 1 - bordersize 1 - bordercolor Ig_Window_BorderColor - forecolor Ig_Sub_TextColor - backcolor SECCOLOR1 - visible 1 - action { play "sound/misc/menu1.wav" ; hide grpCallVote ; show kick ; - setitemcolor grpSections backcolor SECCOLOR1; - timeFadeSelf backColor SECCOLOR2 0 250 } - } +//--------------------------------------------------------- - itemDef { - name sectionType - group grpSections - text "Type. 3" - shortcutKey "3" - type ITEM_TYPE_BUTTON - textscale .225 - style WINDOW_STYLE_FILLED - rect 0 92 72 16 - textalign ITEM_ALIGN_RIGHT - textalignx 64 - textaligny 12 - textstyle ITEM_TEXTSTYLE_SHADOWED - border 1 - bordersize 1 - bordercolor Ig_Window_BorderColor - forecolor Ig_Sub_TextColor - backcolor SECCOLOR1 - visible 1 - action { play "sound/misc/menu1.wav" ; hide grpCallVote ; show type ; - setitemcolor grpSections backcolor SECCOLOR1; - timeFadeSelf backColor SECCOLOR2 0 250 } - } + // Kick -//======================= + ADD_TAB( + "^_K^_ick.", + "K", 3, "group1,group2", + alignrect "tab2" ITEM_ALIGN_RIGHT -30 0 32 TAB_HEIGHT + ) + ADD_HINT("hint_tab3", "Call a vote to kick a player from the server", "group1,group2") - // NEW MAP // +/* +========================================================== - itemDef { - name map - group grpCallVote - text "New Map:" - ownerdraw UI_ALLMAPS_SELECTION - textscale .225 - rect 84 32 80 20 - textalign ITEM_ALIGN_LEFT - textalignx 4 - textaligny 14 - forecolor 1 1 1 1 - decoration - visible 0 - } +Group # 1 - Map - itemDef { - name map - group grpCallVote - rect 84 52 188 124 - type ITEM_TYPE_LISTBOX - style WINDOW_STYLE_FILLED - elementwidth 120 - elementheight 15 - textscale .225 - elementtype LISTBOX_TEXT - feeder FEEDER_ALLMAPS - border 1 - bordercolor .25 .25 .25 1 - forecolor 1 1 1 1 - backcolor 0 0 0 .25 - outlinecolor .75 .75 1 .25 - visible 0 - } +========================================================== +*/ + + itemDef { + text "Call a vote for" + name "hint_map,allgroups,group1,hints,fade_alpha" + group "fade_fore_alpha,group1,allgroups" + ownerdraw UI_ALLMAPS_SELECTION + autowrapped + forecolor HINT_COLOR 1 + textalign ITEM_ALIGN_LEFT + textalignx 6 + textaligny 10 + textscale .2 + alignrect "line" ITEM_ALIGN_LEFT 0 8 288 40 + style WINDOW_STYLE_EMPTY + visible 0 + decoration + } + + // Map list // + + itemDef { + name "maplist" + subgroup "fade_fore_alpha,group1,allgroups" + LISTBOX_STYLE(.225, 8) + alignrect "line" ITEM_ALIGN_LEFT 4 32 188 124 + feeder FEEDER_ALLMAPS + visible 1 + columns 1 2 140 25 + ASSIGN_HINT("hint_tab1") + } + + itemDef { + name "allgroups,group1,gr1_ctrl3,fade_alpha" + //name "vote_next" + group "fade_fore_alpha,group1,allgroups" + alignrect "paper" ITEM_ALIGN_LEFT 240 112 68 14 + text "> ^_N^_ext map <" + shortcutKey "N" + style WINDOW_STYLE_EMPTY + forecolor OPTION_COLOR + textalignx 0 + textaligny 12 + textscale .225 + visible 1 + type ITEM_TYPE_BUTTON + action { play "sound/ui/whoosh3.wav" ; exec "cmd callvote cyclemap" ; uiScript closeingame } + ASSIGN_HINT("hint_next") + } + + itemDef { + name "vote_restart" + subgroup "fade_fore_alpha,group1,allgroups" + alignrect "paper" ITEM_ALIGN_LEFT 240 128 84 14 + text "> ^_R^_estart map <" + shortcutKey "R" + style WINDOW_STYLE_EMPTY + forecolor OPTION_COLOR + textalignx 0 + textaligny 12 + textscale .225 + visible 1 + type ITEM_TYPE_BUTTON + action { play "sound/ui/whoosh3.wav" ; exec "cmd callvote map_restart" ; uiScript closeingame } + ASSIGN_HINT("hint_restart") + } + + itemDef { + name "vote_map" + subgroup "fade_fore_alpha,group1,allgroups" + alignrect "paper" ITEM_ALIGN_LEFT 240 224 36 14 + text "> ^_O^_K <" + shortcutKey "O" + style WINDOW_STYLE_EMPTY + forecolor .5 0 0 1 + textalignx 0 + textaligny 12 + textscale .225 + visible 1 + type ITEM_TYPE_BUTTON + action { play "sound/ui/whoosh3.wav" ; uiScript voteMap ; uiScript closeingame } + ASSIGN_HINT("hint_map") + } + + ADD_HINT("hint_next", "Call a vote to change to the next map in rotation", "group1") + ADD_HINT("hint_restart", "Call a vote to restart the current map", "group1") - // Scrollbar separator // +/* +========================================================== - itemDef { - name map - group grpCallVote - rect 254 52 18 124 - style WINDOW_STYLE_EMPTY - border 1 - borderSize 1 - bordercolor .25 .25 .25 1 - visible 0 - decoration - } +Group # 2 - Gametype - itemDef { - name map - group grpCallVote - text "Next Map" - shortcutKey "N" - textscale .225 - rect 84 180 80 20 - type 1 - textalign ITEM_ALIGN_LEFT - textalignx 4 - textaligny 14 - forecolor 1 1 1 1 - visible 0 - action { play "sound/misc/menu1.wav" ; exec "cmd callvote cyclemap" ; uiScript closeingame } - } +========================================================== +*/ - itemDef { - name map - text "OK" - shortcutKey "O" - type 1 - textscale .225 - group grpCallVote - style WINDOW_STYLE_FILLED - rect 224 180 48 20 - textalign 1 - textalignx 24 - textaligny 14 - border 1 - bordersize 1 - backcolor Ig_Sub_Color1 - forecolor Ig_Sub_TextColor - bordercolor Ig_Sub_BorderColor1 - visible 0 - action { play "sound/misc/menu1.wav" ; uiScript voteMap ; uiScript closeingame } - onFocus { setcolor backcolor Ig_Sub_Color2 ; setcolor bordercolor Ig_Sub_BorderColor2 } - leaveFocus { setcolor backcolor Ig_Sub_Color1 ; setcolor bordercolor Ig_Sub_BorderColor1 } - } - // KICK PLAYER // + //BEGIN_OPTION("Gametype", "g_gametype", ITEM_TYPE_MULTI, 1, 2) + BEGIN_SIMPLE_OPTION(1, 2) + alignrect "line" ITEM_ALIGN_LEFT 56 44 156 VSIZE + //type ITEM_TYPE_MULTI + text "" + ownerdraw UI_NETGAMETYPE + ASSIGN_HINT("hint_tab2") + END_OPTION + + itemDef { + name "btn_game,allgroups,group2" + subgroup "fade_fore_alpha" + alignrect "line" ITEM_ALIGN_LEFT 228 46 36 16 + text "> ^_O^_K <" + shortcutKey "O" + style WINDOW_STYLE_EMPTY + forecolor .5 0 0 1 + textalignx 0 + textaligny 12 + textscale .225 + visible 1 + type ITEM_TYPE_BUTTON + action { play "sound/ui/whoosh3.wav" ; uiScript voteGame ; uiScript closeingame } + ASSIGN_HINT("hint_tab2") + } + + itemDef { + name "gametype_dots" + group "fade_fore_alpha,group2,allgroups" + style 0 + text ".............................................." + alignrect "gr2_ctrl1" ITEM_ALIGN_LEFT 0 0 168 20 + textscale .225 + textalign ITEM_ALIGN_LEFT + textaligny 20 + forecolor OPTION_COLOR + visible 1 + decoration + } + +/* +========================================================== - itemDef { - name kick - group grpCallVote - text "Kick Player:" - textscale .225 - rect 84 32 80 20 - textalign ITEM_ALIGN_LEFT - textalignx 4 - textaligny 14 - forecolor 1 1 1 1 - visible 0 - decoration - } - - itemDef { - name kick - group grpCallVote - rect 84 52 188 124 - style WINDOW_STYLE_FILLED - type ITEM_TYPE_LISTBOX - elementwidth 120 - elementheight 15 - textscale .225 - elementtype LISTBOX_TEXT - feeder FEEDER_PLAYER_LIST - border 1 - bordercolor .25 .25 .25 1 - forecolor 1 1 1 1 - backcolor 0 0 0 .25 - outlinecolor .75 .75 1 .25 - visible 0 - } - - // Scrollbar separator // - - itemDef { - name kick - group grpCallVote - rect 254 52 18 124 - style WINDOW_STYLE_EMPTY - border 1 - borderSize 1 - bordercolor .25 .25 .25 1 - visible 0 - decoration - } - - itemDef { - name kick - text "OK" - shortcutKey "O" - type 1 - textscale .225 - group grpCallVote - style WINDOW_STYLE_FILLED - rect 224 180 48 20 - textalign 1 - textalignx 24 - textaligny 14 - border 1 - bordersize 1 - backcolor Ig_Sub_Color1 - forecolor Ig_Sub_TextColor - bordercolor Ig_Sub_BorderColor1 - visible 0 - action { play "sound/misc/menu1.wav" ; uiScript voteKick ; uiScript closeingame } - onFocus { setcolor backcolor Ig_Sub_Color2 ; setcolor bordercolor Ig_Sub_BorderColor2 } - leaveFocus { setcolor backcolor Ig_Sub_Color1 ; setcolor bordercolor Ig_Sub_BorderColor1 } - } - - // Game Type // - - itemDef { - name type - group grpCallVote - text "Gametype:" - style 0 - textscale .225 - ownerdraw UI_NETGAMETYPE - rect 84 76 188 20 - textalign ITEM_ALIGN_RIGHT - textalignx 80 - textaligny 12 - forecolor 1 1 1 1 - visible 0 - } - - itemDef { - name type - text "OK" - shortcutKey "O" - type 1 - textscale .225 - group grpCallVote - style WINDOW_STYLE_FILLED - rect 224 180 48 20 - textalign 1 - textalignx 24 - textaligny 14 - border 1 - bordersize 1 - backcolor Ig_Sub_Color1 - forecolor Ig_Sub_TextColor - bordercolor Ig_Sub_BorderColor1 - visible 0 - action { play "sound/misc/menu1.wav" ; uiScript voteGame ; uiScript closeingame } - onFocus { setcolor backcolor Ig_Sub_Color2 ; setcolor bordercolor Ig_Sub_BorderColor2 } - leaveFocus { setcolor backcolor Ig_Sub_Color1 ; setcolor bordercolor Ig_Sub_BorderColor1 } - } +Group # 3 - Kick -} +========================================================== +*/ + itemDef { + //name "playerlist" + name "allgroups,group3,gr3_ctrl1,fade_alpha" + subgroup "fade_fore_alpha" + LISTBOX_STYLE(.225, 8) + alignrect "line" ITEM_ALIGN_LEFT 4 32 188 124 + feeder FEEDER_PLAYER_LIST + visible 1 + ASSIGN_HINT("hint_tab3") + /* + type ITEM_TYPE_LISTBOX + style WINDOW_STYLE_FILLED + elementwidth 192 + elementheight 15 + textscale .2 + elementtype LISTBOX_TEXT + forecolor 0 0 0 1 + */ + } + + itemDef { + name "btn_kick,allgroups,group3" + subgroup "fade_fore_alpha" + alignrect "paper" ITEM_ALIGN_LEFT 240 224 36 14 + text "> ^_O^_K <" + shortcutKey "O" + style WINDOW_STYLE_EMPTY + forecolor .5 0 0 1 + textalignx 0 + textaligny 12 + textscale .225 + visible 1 + type ITEM_TYPE_BUTTON + action { play "sound/ui/whoosh3.wav" ; uiScript voteKick ; uiScript closeingame } + ASSIGN_HINT("hint_tab3") + } + + } } diff --git a/reaction/uifiles/ingame_item.menu b/reaction/uifiles/ingame_item.menu index 2ae47cf9..20630a7f 100644 --- a/reaction/uifiles/ingame_item.menu +++ b/reaction/uifiles/ingame_item.menu @@ -1,405 +1,155 @@ #include "ui/menudef.h" +#define ANGLES 3 -87 + +#define ITEM_OPTION(ITEM, ITEM_ID, ITEM_TEXT, ITEM_KEY, BELOW)\ + itemDef { \ + name ITEM \ + ownerdrawFlag UI_SHOW_ITEM##ITEM_ID \ + type ITEM_TYPE_BUTTON \ + text ITEM_TEXT \ + shortcutKey ITEM_KEY \ + alignrect BELOW ITEM_ALIGN_LEFT 0 18 192 16 \ + style WINDOW_STYLE_EMPTY \ + textalign ITEM_ALIGN_LEFT \ + textalignx 8 \ + textaligny 14 \ + textscale .225 \ + forecolor 0 0 .1 1 \ + visible 1 \ + onFocus { hide items ; show "it_"ITEM"" } \ + action { exec "choose "ITEM"" ; close _self ; close ingame_weapon } \ + } \ + itemDef { \ + name ITEM \ + ownerdrawFlag UI_SHOW_ITEM##ITEM_ID \ + ownerdrawFlag UI_SHOW_TOGGLE \ + type ITEM_TYPE_TEXT \ + text ITEM_TEXT \ + alignrect BELOW ITEM_ALIGN_LEFT 0 18 192 16 \ + style WINDOW_STYLE_EMPTY \ + textalign ITEM_ALIGN_LEFT \ + textalignx 8 \ + textaligny 14 \ + textscale .225 \ + forecolor 0 0 .1 .2 \ + visible 1 \ + decoration \ + } + +#define ITEM_PREVIEW(ITEM, FILE, ORIGIN, FOV, ROTATION, ANGLES)\ + itemDef { \ + name "it_"ITEM \ + group items \ + alignrect "preview" ITEM_ALIGN_CENTER 2 -16 128 136 \ + style WINDOW_STYLE_EMPTY \ + type ITEM_TYPE_MODEL \ + asset_model FILE \ + model_origin ORIGIN \ + model_fovx FOV \ + model_fovy FOV \ + model_rotation ROTATION \ + model_angles ANGLES \ + decoration \ + visible 0 \ + } { + // ITEM SELECTION MENU // - menuDef { - name "ingame_item" - visible 0 - fullscreen 0 - //outOfBoundsClick // this closes the window if it gets a click out of the rectangle - onOOBClick { close _self } - rect 80 64 264 176 - focusColor 1 .75 0 1 // Menu focus color for text and items - style WINDOW_STYLE_EMPTY - shadowStyle 1 - border 0 - onOpen { play "sound/misc/menu1.wav" ; setFocus kevlar ; uiScript "updateItemBans" } - onEsc { play "sound/misc/menu2.wav" ; close ingame_item } - -//Window - - itemdef { - rect 0 0 264 176 - style WINDOW_STYLE_FILLED - backcolor Ig_Window_Color - visible 1 - border 1 - bordersize 1 - bordercolor Ig_Window_BorderColor - decoration - } - - itemdef { - rect 145 1 120 24 - style WINDOW_STYLE_SHADER - background "ui/assets/rq3-ingame-title" - visible 1 - decoration - } - - itemdef { - rect 145 1 120 24 - style WINDOW_STYLE_EMPTY - forecolor Ig_Window_TitleColor - textstyle ITEM_TEXTSTYLE_NORMAL - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 24 - textaligny 16 - text "Choose item" - visible 1 - decoration - } - -//Items - - itemdef { - shortcutKey "1" - ownerdrawFlag UI_SHOW_ITEM1 - name "kevlar" - rect 120 48 128 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_BUTTON - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "1. Kevlar Vest" - forecolor 1 1 1 1 - visible 1 - onFocus { hide items ; show "it_kevlar" } - action { play "sound/misc/menu1.wav" ; exec "choose kevlar" ; close ingame_item } - } - - itemdef { - ownerdrawFlag UI_SHOW_ITEM1 - ownerdrawFlag UI_SHOW_TOGGLE - name "kevlar" - rect 120 48 128 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_TEXT - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "1. Kevlar Vest" - forecolor .5 .5 .5 .5 - visible 1 - decoration - } - - - itemdef { - shortcutKey "2" - ownerdrawFlag UI_SHOW_ITEM2 - name "laser" - rect 120 68 128 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_BUTTON - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "2. Lasersight" - forecolor 1 1 1 1 - visible 1 - onFocus { hide items ; show "it_laser" } - action { play "sound/misc/menu1.wav" ; exec "choose laser" ; close ingame_item } - } - - itemdef { - ownerdrawFlag UI_SHOW_ITEM2 - ownerdrawFlag UI_SHOW_TOGGLE - name "laser" - rect 120 68 128 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_TEXT - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "2. Lasersight" - forecolor .5 .5 .5 .5 - visible 1 - decoration - } - - - itemdef { - name "slippers" - ownerdrawFlag UI_SHOW_ITEM3 - shortcutKey "3" - rect 120 88 128 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_BUTTON - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "3. Stealth Slippers" - forecolor 1 1 1 1 - visible 1 - onFocus { hide items ; show "it_slippers" } - action { play "sound/misc/menu1.wav" ; exec "choose slippers" ; close ingame_item } - } - - itemdef { - name "slippers" - ownerdrawFlag UI_SHOW_ITEM3 - ownerdrawFlag UI_SHOW_TOGGLE - rect 120 88 128 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_TEXT - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "3. Stealth Slippers" - forecolor .5 .5 .5 .5 - visible 1 - decoration - } - - - itemdef { - shortcutKey "4" - ownerdrawFlag UI_SHOW_ITEM4 - name "silencer" - rect 120 108 128 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_BUTTON - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "4. Silencer" - forecolor 1 1 1 1 - visible 1 - onFocus { hide items ; show "it_silencer" } - action { play "sound/misc/menu1.wav" ; exec "choose silencer" ; close ingame_item } - } - - itemdef { - ownerdrawFlag UI_SHOW_ITEM4 - ownerdrawFlag UI_SHOW_TOGGLE - name "silencer" - rect 120 108 128 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_TEXT - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "4. Silencer" - forecolor .5 .5 .5 .5 - visible 1 - decoration - } - - - itemdef { - name "bandolier" - ownerdrawFlag UI_SHOW_ITEM5 - shortcutKey "5" - rect 120 128 128 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_BUTTON - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "5. Bandolier" - forecolor 1 1 1 1 - visible 1 - onFocus { hide items ; show "it_bandolier" } - action { play "sound/misc/menu1.wav" ; exec "choose bandolier" ; close ingame_item } - } - - itemdef { - name "bandolier" - ownerdrawFlag UI_SHOW_ITEM5 - ownerdrawFlag UI_SHOW_TOGGLE - rect 120 128 128 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_TEXT - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "5. Bandolier" - forecolor .5 .5 .5 .5 - visible 1 - decoration - } - - - itemdef { - name "helmet" - ownerdrawFlag UI_SHOW_ITEM6 - shortcutKey "6" - rect 120 148 128 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_BUTTON - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "6. Kevlar Helmet" - forecolor 1 1 1 1 - visible 1 - onFocus { hide items ; show "it_helmet" } - action { play "sound/misc/menu1.wav" ; exec "choose helmet" ; close ingame_item } - } - - itemdef { - name "helmet" - ownerdrawFlag UI_SHOW_ITEM6 - ownerdrawFlag UI_SHOW_TOGGLE - rect 120 148 128 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_TEXT - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "6. Kevlar Helmet" - forecolor .5 .5 .5 .5 - visible 1 - decoration - } - - -//Item preview -//Background - - itemdef { - name it_background - rect 16 48 96 96 - style WINDOW_STYLE_SHADER - background "ui/assets/rq3-ingame-loadout" - border 1 - bordersize 1 - bordercolor Ig_Window_BorderColor - //backcolor .75 .75 .75 1 - decoration - visible 1 - } - -//Items - - itemdef { - name it_kevlar - group items - rect 16 48 96 96 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_MODEL - asset_model "models/items/kevlar.md3" - model_origin 28 0 0 - model_fovx 60 - model_fovy 60 - //textscale .75 - model_rotation 10 - model_angles 270 0 90 - decoration - visible 0 - } - - itemdef { - name it_laser - group items - rect 16 48 96 96 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_MODEL - asset_model "models/items/laser.md3" - model_origin 24 15 0 - model_fovx 40 - model_fovy 40 - //textscale .75 - model_rotation 10 - model_angles 270 75 90 - decoration - visible 0 - } - - itemdef { - name it_silencer - group items - rect 16 48 96 96 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_MODEL - asset_model "models/items/silencer.md3" - model_origin 20 0 0 - model_fovx 40 - model_fovy 40 - //textscale .75 - model_rotation 10 - model_angles 270 105 90 - decoration - visible 0 - } - - itemdef { - name it_slippers - group items - rect 16 48 96 96 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_MODEL - asset_model "models/items/slippers.md3" - model_origin 20 0 0 - model_fovx 60 - model_fovy 60 - //textscale .75 - model_rotation 10 - model_angles 270 0 90 - decoration - visible 0 - } - - itemdef { - name it_bandolier - group items - rect 16 48 96 96 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_MODEL - asset_model "models/items/bandolier.md3" - model_origin 20 0 0 - model_fovx 60 - model_fovy 60 - //textscale .75 - model_rotation 10 - model_angles 270 0 90 - decoration - visible 0 - } - - itemdef { - name it_helmet - group items - rect 16 48 96 96 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_MODEL - asset_model "models/items/helmet.md3" - model_origin 30 0 0 - model_fovx 20 - model_fovy 20 - //textscale .75 - model_rotation 10 - model_angles 180 0 0 - decoration - visible 0 - } - -} + menuDef { + name "ingame_item" + visible 0 + fullscreen 0 + rect 4 32 340 264 + anglevectors ANGLES + focusColor .25 .25 .5 1 + popup + style WINDOW_STYLE_EMPTY + onOpen { + //setitemcolor window forecolor 5 5 5 0 ; + //timefade window forecolor 5 5 5 1 0 FADEIN_TIME ; + play "sound/ui/whoosh3.wav" ; + uiScript "updateItemBans" ; + setfocus kevlar + } + onESC { play "sound/ui/whoosh3.wav" ; close _self ; close ingame_weapon } + onOOBClick { play "sound/ui/whoosh3.wav" ; close _self ; open _prev } + + itemDef { + renderpoint + name "paper" + menuAnchor + group window + style WINDOW_STYLE_SHADER + background UI_ASSETS"/paper_1" + forecolor 1 1 .92 1 + //forecolor .87 .92 .95 1 + rect -8 -12 380 320 + anglevectors ANGLES + visible 1 + decoration + } + + // TITLE // + + itemDef { + renderpoint + name "title" + text "Choose item:" + //forecolor .6 .0 .0 1 + forecolor .0 .0 .1 1 + style WINDOW_STYLE_EMPTY + textalign ITEM_ALIGN_LEFT + textalignx 0 + textaligny 12 + textscale RQ3_MAIN_TEXTSIZE + alignrect paper ITEM_ALIGN_LEFT 36 36 240 36 + visible 1 + autowrapped + decoration + + //style WINDOW_STYLE_FILLED + //backcolor 0 0 0 .6 + } + + itemDef { + name "preview" + background UI_ASSETS"/replacement-back.tga" + rect 192 56 120 120 + anglevectors 1 -89 + decoration + visible 1 + style WINDOW_STYLE_SHADER + } + + // ITEMS // + + // order by: item, item id, description, shortcut key, previous element + ITEM_OPTION("kevlar", 1, "^_1^_. Kevlar Vest", "1", "title") + ITEM_OPTION("laser", 2, "^_2^_. Lasersight", "2", "kevlar") + ITEM_OPTION("slippers", 3, "^_3^_. Stealth Slippers", "3", "laser") + ITEM_OPTION("silencer", 4, "^_4^_. Silencer", "4", "slippers") + ITEM_OPTION("bandolier", 5, "^_5^_. Bandolier", "5", "silencer") + ITEM_OPTION("helmet", 6, "^_6^_. Kevlar Helmet", "6", "bandolier") + + // PREVIEWS // + + // order by: item, file, origin xyz, fov, rotation, angles xyz + ITEM_PREVIEW("kevlar", "models/items/kevlar.md3", 28 0 2, 80, 10, 250 0 90) + ITEM_PREVIEW("laser", "models/items/laser.md3", 24 15 0, 40, 10, 270 75 90) + ITEM_PREVIEW("slippers", "models/items/slippers.md3", 20 0 2, 90, 10, 270 0 90) + ITEM_PREVIEW("silencer", "models/items/silencer.md3", 20 0 0, 60, 10, 270 105 90) + ITEM_PREVIEW("bandolier", "models/items/bandolier.md3", 20 0 2, 70, 10, 270 0 24) + ITEM_PREVIEW("helmet", "models/items/helmet.md3", 30 0 0, 30, 10, 180 5 0) + + itemDef { + renderpoint + name "polaroid" + style WINDOW_STYLE_SHADER + background UI_ASSETS"/polaroid" + alignrect "preview" ITEM_ALIGN_CENTER 0 -23 160 160 + visible 1 + decoration + } + } } diff --git a/reaction/uifiles/ingame_join.menu b/reaction/uifiles/ingame_join.menu index d91813f4..c9b25d0d 100644 --- a/reaction/uifiles/ingame_join.menu +++ b/reaction/uifiles/ingame_join.menu @@ -1,4 +1,219 @@ #include "ui/menudef.h" +#define FADEIN_TIME 125 +#define ANGLES -4 -94 + +{ + menuDef { + name "ingame_join" + visible 0 + fullscreen 0 + rect 40 32 232 272 + anglevectors ANGLES + focusColor RQ3_MAIN_FOCUSCOLOR + popup + style WINDOW_STYLE_EMPTY + onOpen { + play "sound/ui/whoosh3.wav" ; + uiScript "updateJoinTeamNames" + setitemcolor window forecolor 5 5 5 0 ; + timefade window forecolor 5 5 5 1 0 FADEIN_TIME + } + onESC { play "sound/ui/whoosh3.wav" ; close _self } + onOOBClick { play "sound/ui/whoosh3.wav" ; close _self } + + itemDef { + renderpoint + name "paper" + menuAnchor + group window + style WINDOW_STYLE_SHADER + background UI_ASSETS"/paper_1" + //background UI_ASSETS"/post_it" + //forecolor 1 1 .92 1 + forecolor .92 .97 1 1 + rect -4 -12 192 256 + //rect -16 0 180 152 + anglevectors ANGLES + visible 1 + decoration + } + + // TITLE // + + itemDef { + renderpoint + name "title" + text "Join team:" + forecolor .6 .0 .0 1 + //forecolor .0 .0 .1 1 + style WINDOW_STYLE_EMPTY + textalign ITEM_ALIGN_LEFT + textalignx 0 + textaligny 12 + textscale RQ3_MAIN_TEXTSIZE + alignrect paper ITEM_ALIGN_LEFT 28 36 240 36 + visible 1 + autowrapped + decoration + } + + // BUTTONS // + + // Team 1 // + + itemDef { + name team + text "^_1^_." + ownerDraw UI_RQ3_JOINTEAM1 + shortcutKey "1" + alignrect title ITEM_ALIGN_LEFT 0 32 128 14 + style WINDOW_STYLE_EMPTY + textalign ITEM_ALIGN_LEFT + textalignx 8 + textaligny 12 + textscale .225 + forecolor 0 0 .1 1 + visible 1 + /* + style WINDOW_STYLE_FILLED + backcolor 0 0 0 .6 + */ + action { play "sound/ui/whoosh3.wav" ; exec "cmd team red" ; uiScript "weapAfterJoin" ; uiScript closeingame } + } + + itemDef { + name team1 + text "" + cvar "ui_RQ3_teamCount1" + type ITEM_TYPE_NUMERICFIELD + style WINDOW_STYLE_EMPTY + alignrect title ITEM_ALIGN_LEFT 104 32 32 14 + textalign ITEM_ALIGN_LEFT + textalignx 8 + textaligny 12 + textscale .225 + forecolor 0 0 .1 .6 + visible 1 + decoration + /* + style WINDOW_STYLE_FILLED + backcolor 0 0 0 .6 + */ + } + + // Team 2 // + + itemDef { + name team + text "^_2^_." + ownerDraw UI_RQ3_JOINTEAM2 + shortcutKey "2" + alignrect title ITEM_ALIGN_LEFT 0 48 128 14 + style WINDOW_STYLE_EMPTY + textalign ITEM_ALIGN_LEFT + textalignx 8 + textaligny 12 + textscale .225 + forecolor 0 0 .1 1 + visible 1 + /* + style WINDOW_STYLE_FILLED + backcolor 0 0 0 .6 + */ + action { play "sound/ui/whoosh3.wav" ; exec "cmd team blue" ; uiScript "weapAfterJoin" ; uiScript closeingame } + } + + itemDef { + name team2 + text "" + cvar "ui_RQ3_teamCount2" + type ITEM_TYPE_NUMERICFIELD + style WINDOW_STYLE_EMPTY + alignrect title ITEM_ALIGN_LEFT 104 48 32 14 + textalign ITEM_ALIGN_LEFT + textalignx 8 + textaligny 12 + textscale .225 + forecolor 0 0 .1 .6 + visible 1 + decoration + /* + style WINDOW_STYLE_FILLED + backcolor 0 0 0 .6 + */ + } + + // Auto Team // + + itemDef { + name team + text "^_A^_uto-assign" + shortcutKey "A" + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + textstyle ITEM_TEXTSTYLE_NORMAL + alignrect title ITEM_ALIGN_LEFT 0 64 128 14 + textalign ITEM_ALIGN_LEFT + textalignx 8 + textaligny 12 + textscale .225 + forecolor 0 0 .1 1 + visible 1 + action { play "sound/ui/whoosh3.wav" ; exec "cmd team auto" ; uiScript "weapAfterJoin" ; uiScript closeingame } + /* + style WINDOW_STYLE_FILLED + backcolor 0 0 0 .6 + */ + } + + itemDef { + name team + text "^_S^_pectators" + shortcutKey "S" + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + textstyle ITEM_TEXTSTYLE_NORMAL + alignrect title ITEM_ALIGN_LEFT 0 96 128 14 + textalign ITEM_ALIGN_LEFT + textalignx 8 + textaligny 12 + textscale .225 + forecolor 0 0 .1 1 + visible 1 + action { play "sound/ui/whoosh3.wav" ; exec "cmd team s" ; uiScript closeingame } + /* + style WINDOW_STYLE_FILLED + backcolor 0 0 0 .6 + */ + } + + itemDef { + name team3 + text "" + cvar "ui_RQ3_numSpectators" + type ITEM_TYPE_NUMERICFIELD + style WINDOW_STYLE_EMPTY + alignrect title ITEM_ALIGN_LEFT 104 96 32 14 + textalign ITEM_ALIGN_LEFT + textalignx 8 + textaligny 12 + textscale .225 + forecolor 0 0 .1 .6 + visible 1 + decoration + /* + style WINDOW_STYLE_FILLED + backcolor 0 0 0 .6 + */ + } + } +} + + + + +#if 0 +#include "ui/menudef.h" { @@ -185,3 +400,4 @@ } } +#endif \ No newline at end of file diff --git a/reaction/uifiles/ingame_join_dm.menu b/reaction/uifiles/ingame_join_dm.menu index cc45e16d..f00c6581 100644 --- a/reaction/uifiles/ingame_join_dm.menu +++ b/reaction/uifiles/ingame_join_dm.menu @@ -1,4 +1,133 @@ #include "ui/menudef.h" +#define FADEIN_TIME 125 +#define ANGLES -4 -94 + +{ + menuDef { + name "ingame_join_dm" + visible 0 + fullscreen 0 + rect 40 32 232 272 + anglevectors ANGLES + focusColor RQ3_MAIN_FOCUSCOLOR + popup + style WINDOW_STYLE_EMPTY + onOpen { + play "sound/ui/whoosh3.wav" ; + setitemcolor window forecolor 5 5 5 0 ; + timefade window forecolor 5 5 5 1 0 FADEIN_TIME + } + onESC { play "sound/ui/whoosh3.wav" ; close _self } + onOOBClick { play "sound/ui/whoosh3.wav" ; close _self } + + itemDef { + renderpoint + name "paper" + menuAnchor + group window + style WINDOW_STYLE_SHADER + background UI_ASSETS"/paper_1" + forecolor .92 .97 1 1 + rect -4 -12 192 256 + anglevectors ANGLES + visible 1 + decoration + } + + // TITLE // + + itemDef { + renderpoint + name "title" + text "Join game:" + forecolor .6 .0 .0 1 + style WINDOW_STYLE_EMPTY + textalign ITEM_ALIGN_LEFT + textalignx 0 + textaligny 12 + textscale RQ3_MAIN_TEXTSIZE + alignrect paper ITEM_ALIGN_LEFT 28 36 240 36 + visible 1 + autowrapped + decoration + } + + // BUTTONS // + + // Players // + + itemDef { + name team + text "^_P^_layers" + shortcutKey "P" + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + textstyle ITEM_TEXTSTYLE_NORMAL + alignrect title ITEM_ALIGN_LEFT 0 32 128 14 + textalign ITEM_ALIGN_LEFT + textalignx 8 + textaligny 12 + textscale .225 + forecolor 0 0 .1 1 + visible 1 + action { play "sound/ui/whoosh3.wav" ; exec "cmd team red" ; uiScript closeingame } + } + + itemDef { + name team1 + text "" + cvar "ui_RQ3_teamCount1" + type ITEM_TYPE_NUMERICFIELD + style WINDOW_STYLE_EMPTY + alignrect title ITEM_ALIGN_LEFT 104 32 32 14 + textalign ITEM_ALIGN_LEFT + textalignx 8 + textaligny 12 + textscale .225 + forecolor 0 0 .1 .6 + visible 1 + decoration + } + + // Spectators // + + itemDef { + name team + text "^_S^_pectators" + shortcutKey "S" + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + textstyle ITEM_TEXTSTYLE_NORMAL + alignrect title ITEM_ALIGN_LEFT 0 48 128 14 + textalign ITEM_ALIGN_LEFT + textalignx 8 + textaligny 12 + textscale .225 + forecolor 0 0 .1 1 + visible 1 + action { play "sound/ui/whoosh3.wav" ; exec "cmd team s" ; uiScript closeingame } + } + + itemDef { + name team3 + text "" + cvar "ui_RQ3_numSpectators" + type ITEM_TYPE_NUMERICFIELD + style WINDOW_STYLE_EMPTY + alignrect title ITEM_ALIGN_LEFT 104 48 32 14 + textalign ITEM_ALIGN_LEFT + textalignx 8 + textaligny 12 + textscale .225 + forecolor 0 0 .1 .6 + visible 1 + decoration + } + } +} + +#if 0 +#include "ui/menudef.h" { @@ -121,3 +250,4 @@ } } } +#endif \ No newline at end of file diff --git a/reaction/uifiles/ingame_tkok.menu b/reaction/uifiles/ingame_tkok.menu index 514ecca4..d230bd0f 100644 --- a/reaction/uifiles/ingame_tkok.menu +++ b/reaction/uifiles/ingame_tkok.menu @@ -1,5 +1,111 @@ #include "ui/menudef.h" +#define FADEIN_TIME 125 +#define BACK_COLOR1 .85 .9 .85 1 +#define BACK_COLOR2 .95 .95 .98 1 + +#define ANGLES -3 -93 + +{ + // FORGIVE TEAMKILL // + + menuDef { + name "ingame_tkok" + visible 0 + fullscreen 0 + rect 248 2 224 116 + anglevectors ANGLES + focusColor .25 .25 .5 1 + popup + style WINDOW_STYLE_EMPTY + onOpen { + //setrandomitemcolor postit forecolor 2 BACK_COLOR1 BACK_COLOR2 ; + setitemcolor window forecolor 5 5 5 0 ; + timefade window forecolor 5 5 5 1 0 FADEIN_TIME ; + play "sound/ui/whoosh3.wav" ; + //setfocus addressEntry + } + onESC { play "sound/ui/whoosh3.wav" ; close _self } + onOOBClick { play "sound/ui/whoosh3.wav" ; close _self } + + itemDef { + renderpoint + name "postit" + menuAnchor + group window + style WINDOW_STYLE_SHADER + background UI_ASSETS"/paper_1" + forecolor 1 1 .92 1 + //backcolor .94 .94 .82 1 + rect -8 -4 248 136 + anglevectors ANGLES + visible 1 + decoration + } + + // TITLE // + + itemdef { + renderpoint + name "title" + text "Forgive the last teammate who killed you?" + forecolor .6 .0 .0 1 + style WINDOW_STYLE_EMPTY + textalign ITEM_ALIGN_LEFT + textalignx 4 + textaligny 24 + textscale RQ3_MAIN_TEXTSIZE + alignrect postit ITEM_ALIGN_LEFT 24 16 192 36 + visible 1 + autowrapped + decoration + } + + // YES // + + itemDef { + name yes + group window + text "^_Y^_ES" + shortcutKey "Y" + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + backcolor 0 0 0 .1 + textscale .25 + alignrect "title" ITEM_ALIGN_LEFT 20 56 32 16 + textalign ITEM_ALIGN_CENTER + textalignx 16 + textaligny 12 + forecolor 0 0 .15 1 + visible 1 + action { play "sound/ui/whoosh3.wav" ; exec "tkok" ; uiScript closeingame } + } + + // NO // + + itemDef { + name no + group window + text "^_N^_O" + shortcutKey "N" + type ITEM_TYPE_BUTTON + style WINDOW_STYLE_EMPTY + backcolor 0 0 0 .1 + textscale .25 + alignrect "title" ITEM_ALIGN_RIGHT 20 56 32 16 + textalign ITEM_ALIGN_CENTER + textalignx 16 + textaligny 12 + forecolor 0 0 .15 1 + visible 1 + action { play "sound/ui/whoosh3.wav" ; uiScript closeingame } + } + } +} + +#if 0 +#include "ui/menudef.h" + { menudef { @@ -123,3 +229,4 @@ } } +#endif \ No newline at end of file diff --git a/reaction/uifiles/ingame_weapon.menu b/reaction/uifiles/ingame_weapon.menu index c8c1ebd1..34ed40d6 100644 --- a/reaction/uifiles/ingame_weapon.menu +++ b/reaction/uifiles/ingame_weapon.menu @@ -1,469 +1,159 @@ #include "ui/menudef.h" +#define ANGLES 2 -88 + +#define ITEM_OPTION(ITEM, ITEM_ID, ITEM_TEXT, ITEM_KEY, BELOW)\ + itemDef { \ + name ITEM \ + ownerdrawFlag UI_SHOW_WEAP##ITEM_ID \ + type ITEM_TYPE_BUTTON \ + text ITEM_TEXT \ + shortcutKey ITEM_KEY \ + alignrect BELOW ITEM_ALIGN_LEFT 0 18 192 16 \ + style WINDOW_STYLE_EMPTY \ + textalign ITEM_ALIGN_LEFT \ + textalignx 8 \ + textaligny 14 \ + textscale .225 \ + forecolor 0 0 .1 1 \ + visible 1 \ + onFocus { hide weapons ; show "wp_"ITEM"" } \ + action { exec "choose "ITEM"" ; open ingame_item } \ + } \ + itemDef { \ + name ITEM \ + ownerdrawFlag UI_SHOW_WEAP##ITEM_ID \ + ownerdrawFlag UI_SHOW_TOGGLE \ + type ITEM_TYPE_TEXT \ + text ITEM_TEXT \ + alignrect BELOW ITEM_ALIGN_LEFT 0 18 192 16 \ + style WINDOW_STYLE_EMPTY \ + textalign ITEM_ALIGN_LEFT \ + textalignx 8 \ + textaligny 14 \ + textscale .225 \ + forecolor 0 0 .1 .2 \ + visible 1 \ + decoration \ + } + +#define ITEM_PREVIEW(ITEM, FILE, ORIGIN, FOV, ROTATION, ANGLES)\ + itemDef { \ + name "wp_"ITEM \ + group weapons \ + alignrect "preview" ITEM_ALIGN_CENTER 2 -16 128 136 \ + style WINDOW_STYLE_EMPTY \ + type ITEM_TYPE_MODEL \ + asset_model FILE \ + model_origin ORIGIN \ + model_fovx FOV \ + model_fovy FOV \ + model_rotation ROTATION \ + model_angles ANGLES \ + decoration \ + visible 0 \ + } { + // WEAPON SELECTION MENU // - menuDef { - name "ingame_weapon" - visible 0 - fullscreen 0 - //outOfBoundsClick // this closes the window if it gets a click out of the rectangle - onOOBClick { close _self } - rect 80 64 344 208 - focusColor 1 .75 0 1 // Menu focus color for text and items - style WINDOW_STYLE_EMPTY - shadowStyle 1 - border 0 - onOpen { play "sound/misc/menu1.wav" ; setFocus mp5 ; uiScript "updateItemBans" } - onEsc { play "sound/misc/menu2.wav" ; close ingame_weapon } - -//Window - - itemdef { - rect 0 0 344 208 - style WINDOW_STYLE_FILLED - backcolor Ig_Window_Color - visible 1 - border 1 - bordersize 1 - bordercolor Ig_Window_BorderColor - decoration - } - - itemdef { - rect 225 1 120 24 - style WINDOW_STYLE_SHADER - background "ui/assets/rq3-ingame-title" - visible 1 - decoration - } - - itemdef { - rect 225 1 120 24 - style WINDOW_STYLE_EMPTY - forecolor Ig_Window_TitleColor - textstyle ITEM_TEXTSTYLE_NORMAL - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 24 - textaligny 16 - text "Choose weapon" - visible 1 - decoration - } - -//Weapons - - itemdef { - shortcutKey "1" - ownerdrawFlag UI_SHOW_WEAP1 - name "mp5" - rect 152 48 160 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_BUTTON - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "1. MP5/10 Submachinegun" - forecolor 1 1 1 1 - visible 1 - onFocus { hide weapons ; show "wp_mp5" } - action { exec "choose mp5" ; close ingame_weapon ; open ingame_item } - } - - itemdef { - ownerdrawFlag UI_SHOW_WEAP1 - ownerdrawFlag UI_SHOW_TOGGLE - name "mp5" - rect 152 48 160 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_TEXT - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "1. MP5/10 Submachinegun" - forecolor .5 .5 .5 .5 - visible 1 - decoration - } - - - itemdef { - name "m3" - shortcutKey "2" - ownerdrawFlag UI_SHOW_WEAP2 - rect 152 68 160 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_BUTTON - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "2. M3 Super 90 Assault Shotgun" - forecolor 1 1 1 1 - visible 1 - onFocus { hide weapons ; show "wp_m3" } - action { exec "choose m3" ; close ingame_weapon ; open ingame_item } - } - - itemdef { - name "m3" - ownerdrawFlag UI_SHOW_WEAP2 - ownerdrawFlag UI_SHOW_TOGGLE - rect 152 68 160 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_TEXT - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "2. M3 Super 90 Assault Shotgun" - forecolor .5 .5 .5 .5 - visible 1 - decoration - } - - - itemdef { - name "hc" - ownerdrawFlag UI_SHOW_WEAP3 - shortcutKey "3" - rect 152 88 160 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_BUTTON - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "3. Handcannon" - forecolor 1 1 1 1 - visible 1 - onFocus { hide weapons ; show "wp_hc" } - action { exec "choose hc" ; close ingame_weapon ; open ingame_item } - } - - itemdef { - name "hc" - ownerdrawFlag UI_SHOW_WEAP3 - ownerdrawFlag UI_SHOW_TOGGLE - rect 152 88 160 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_TEXT - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "3. Handcannon" - forecolor .5 .5 .5 .5 - visible 1 - decoration - } - - - itemdef { - name "sniper" - ownerdrawFlag UI_SHOW_WEAP4 - shortcutKey "4" - rect 152 108 160 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_BUTTON - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "4. Sniper Rifle" - forecolor 1 1 1 1 - visible 1 - onFocus { hide weapons ; show "wp_sniper" } - action { exec "choose sniper" ; close ingame_weapon ; open ingame_item } - } - - itemdef { - name "sniper" - ownerdrawFlag UI_SHOW_WEAP4 - ownerdrawFlag UI_SHOW_TOGGLE - rect 152 108 160 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_TEXT - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "4. Sniper Rifle" - forecolor .5 .5 .5 .5 - visible 1 - decoration - } - - - itemdef { - name "m4" - ownerdrawFlag UI_SHOW_WEAP5 - shortcutKey "5" - rect 152 128 160 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_BUTTON - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "5. M4 Assault Rifle" - forecolor 1 1 1 1 - visible 1 - onFocus { hide weapons ; show "wp_m4" } - action { exec "choose m4" ; close ingame_weapon ; open ingame_item } - } - - itemdef { - name "m4" - ownerdrawFlag UI_SHOW_WEAP5 - ownerdrawFlag UI_SHOW_TOGGLE - rect 152 128 160 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_TEXT - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "5. M4 Assault Rifle" - forecolor .5 .5 .5 .5 - visible 1 - decoration - } - - - itemdef { - name "knives" - ownerdrawFlag UI_SHOW_WEAP6 - shortcutKey "6" - rect 152 148 160 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_BUTTON - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "6. Combat Knives" - forecolor 1 1 1 1 - visible 1 - onFocus { hide weapons ; show "wp_knives" } - action { exec "choose knives" ; close ingame_weapon ; open ingame_item } - } - - itemdef { - name "knives" - ownerdrawFlag UI_SHOW_WEAP6 - ownerdrawFlag UI_SHOW_TOGGLE - rect 152 148 160 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_TEXT - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "6. Combat Knives" - forecolor .5 .5 .5 .5 - visible 1 - decoration - } - - - itemdef { - name "akimbo" - ownerdrawFlag UI_SHOW_WEAP7 - shortcutKey "7" - rect 152 168 160 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_BUTTON - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "7. Dual Mk23 Pistols" - forecolor 1 1 1 1 - visible 1 - onFocus { hide weapons ; show "wp_akimbo" } - action { exec "choose akimbo" ; close ingame_weapon ; open ingame_item } - } - - itemdef { - name "akimbo" - ownerdrawFlag UI_SHOW_WEAP7 - ownerdrawFlag UI_SHOW_TOGGLE - rect 152 168 160 16 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_TEXT - textstyle ITEM_TEXTSTYLE_SHADOWED - textscale .225 - textalign ITEM_ALIGN_LEFT - textalignx 8 - textaligny 12 - text "7. Dual Mk23 Pistols" - forecolor .5 .5 .5 .5 - visible 1 - decoration - } - -//Weapon preview -//Background - - itemdef { - name wp_background - rect 16 48 128 136 - style WINDOW_STYLE_SHADER - background "ui/assets/rq3-ingame-loadout" - model_angle 90 - border 1 - bordersize 1 - bordercolor Ig_Window_BorderColor - //backcolor .5 .5 .5 .4 - decoration - visible 1 - } - -//Weapons - - itemdef { - name wp_mp5 - group weapons - rect 16 48 128 136 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_MODEL - asset_model "models/weapons2/mp5/mp5.md3" - model_origin 8 0 0 - model_fovx 60 - model_fovy 60 - model_rotation 10 - model_angles 90 0 0 - decoration - visible 0 - } - - itemdef { - name wp_m3 - group weapons - rect 16 48 128 136 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_MODEL - asset_model "models/weapons2/m3/m3.md3" - model_origin 28 6 0 - model_fovx 60 - model_fovy 60 - model_rotation 10 - model_angles 270 0 0 - decoration - visible 0 - } - - itemdef { - name wp_hc - group weapons - rect 16 48 128 136 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_MODEL - asset_model "models/weapons2/handcannon/handcannon.md3" - model_origin 16 -4 0 - model_fovx 60 - model_fovy 60 - model_rotation 10 - model_angles 90 0 0 - decoration - visible 0 - } - - itemdef { - name wp_sniper - group weapons - rect 16 48 128 136 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_MODEL - asset_model "models/weapons2/ssg3000/ssg3000.md3" - model_origin 28 6 0 - model_fovx 60 - model_fovy 60 - model_rotation 10 - model_angle 270 - decoration - visible 1 - } - - itemdef { - name wp_m4 - group weapons - rect 16 48 128 136 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_MODEL - asset_model "models/weapons2/m4/m4.md3" - model_origin 18 -2 0 - model_fovx 60 - model_fovy 60 - model_rotation 10 - model_angle 90 - decoration - visible 0 - } - - itemdef { - name wp_knives - group weapons - rect 16 48 128 136 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_MODEL - asset_model "models/weapons2/knife/knife.md3" - model_origin -4 0 0 - model_fovx 60 - model_fovy 60 - model_rotation 10 - model_angles 180 0 15 - decoration - visible 1 - } - - itemdef { - name wp_akimbo - group weapons - rect 24 48 128 136 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_MODEL - asset_model "models/weapons2/mk23/mk23.md3" - model_origin 0 0 1 - model_fovx 90 - model_fovy 90 - model_rotation 10 - model_angle 90 - decoration - visible 1 - } - - itemdef { - name wp_akimbo - group weapons - rect 24 48 128 136 - style WINDOW_STYLE_EMPTY - type ITEM_TYPE_MODEL - asset_model "models/weapons2/mk23/mk23.md3" - model_origin 0 2 -3 - model_fovx 90 - model_fovy 90 - model_rotation 10 - model_angles 90 180 0 - decoration - visible 1 - } - -} + menuDef { + name "ingame_weapon" + visible 0 + fullscreen 0 + rect 20 20 340 264 + anglevectors ANGLES + focusColor .25 .25 .5 1 + popup + style WINDOW_STYLE_EMPTY + onOpen { + //setitemcolor window forecolor 5 5 5 0 ; + //timefade window forecolor 5 5 5 1 0 FADEIN_TIME ; + play "sound/ui/whoosh3.wav" ; + uiScript "updateItemBans" ; + setfocus mp5 + } + onESC { play "sound/ui/whoosh3.wav" ; close _self } + onOOBClick { play "sound/ui/whoosh3.wav" ; close _self } + + itemDef { + renderpoint + name "paper" + menuAnchor + group window + style WINDOW_STYLE_SHADER + background UI_ASSETS"/paper_1" + forecolor .9 .9 .82 1 + //forecolor .78 .82 .86 1 + rect -8 -12 380 320 + anglevectors ANGLES + visible 1 + decoration + } + + // TITLE // + + itemDef { + renderpoint + name "title" + text "Choose weapon:" + //forecolor .6 .0 .0 1 + forecolor .0 .0 .1 1 + style WINDOW_STYLE_EMPTY + textalign ITEM_ALIGN_LEFT + textalignx 0 + textaligny 12 + textscale RQ3_MAIN_TEXTSIZE + alignrect paper ITEM_ALIGN_LEFT 36 36 240 36 + visible 1 + autowrapped + decoration + + //style WINDOW_STYLE_FILLED + //backcolor 0 0 0 .6 + } + + itemDef { + name "preview" + background UI_ASSETS"/replacement-back.tga" + rect 192 80 120 120 + anglevectors 1 -89 + decoration + visible 1 + style WINDOW_STYLE_SHADER + } + + // WEAPONS // + + // order by: weapon, weapon id, description, shortcut key, previous element + ITEM_OPTION("mp5", 1, "^_1^_. MP5/10 Submachinegun", "1", "title") + ITEM_OPTION("m3", 2, "^_2^_. M3 Super 90 Assault Shotgun", "2", "mp5") + ITEM_OPTION("hc", 3, "^_3^_. Handcannon", "3", "m3") + ITEM_OPTION("sniper", 4, "^_4^_. Sniper Rifle", "4", "hc") + ITEM_OPTION("m4", 5, "^_5^_. M4 Assault Rifle", "5", "sniper") + ITEM_OPTION("knives", 6, "^_6^_. Combat Knives", "6", "m4") + ITEM_OPTION("akimbo", 7, "^_7^_. Dual Mk23 Pistols", "7", "knives") + + // PREVIEWS // + + // order by: weapon, file, origin xyz, fov, rotation, angles xyz + ITEM_PREVIEW("mp5", "models/weapons2/mp5/mp5.md3", 8 0 0, 60, 10, 90 -5 0) + ITEM_PREVIEW("m3", "models/weapons2/m3/m3.md3", 28 0 2, 60, 10, 270 22 0) + ITEM_PREVIEW("hc", "models/weapons2/handcannon/handcannon.md3", 20 0 2, 60, 10, 90 25 0) + ITEM_PREVIEW("sniper", "models/weapons2/ssg3000/ssg3000.md3", 28 0 3, 60, 10, 270 25 0) + ITEM_PREVIEW("m4", "models/weapons2/m4/m4.md3", 18 0 2, 60, 10, 90 25 0) + ITEM_PREVIEW("knives", "models/weapons2/knife/knife.md3", 1 0 1, 60, 10, 180 0 15) + // 2 pistols! + ITEM_PREVIEW("akimbo", "models/weapons2/mk23/mk23.md3", 5 0 2, 90, 10, 90 0 0) + ITEM_PREVIEW("akimbo", "models/weapons2/mk23/mk23.md3", 5 2 -2, 90, 10, 90 180 0) + + itemDef { + renderpoint + name "polaroid" + style WINDOW_STYLE_SHADER + background UI_ASSETS"/polaroid" + alignrect "preview" ITEM_ALIGN_CENTER 0 -23 160 160 + visible 1 + decoration + } + } } diff --git a/reaction/uifiles/joinserver.menu b/reaction/uifiles/joinserver.menu index 5b83a0a0..7e9161a7 100644 --- a/reaction/uifiles/joinserver.menu +++ b/reaction/uifiles/joinserver.menu @@ -85,7 +85,7 @@ style WINDOW_STYLE_EMPTY popup - onOOBClick { close _self ; open _prev } + onOOBClick { close _self ; open main } onOpen { play "sound/ui/whoosh3.wav" ; uiScript "UpdateFilter" ; setitemcolor hints forecolor HINT_COLOR 1 ; hide "hints" ; } @@ -204,6 +204,46 @@ text "Click to enter a password to join a private server" } + BEGIN_HINT(Hint_Specify) + text "Click to specify a server to connect to" + } + + BEGIN_HINT(Hint_Find) + text "Click to find a specific player" + } + + BEGIN_HINT(Hint_AddFavorite) + text "Click to add the selected server to the Favorites list" + } + + BEGIN_HINT(Hint_DelFavorite) + text "Click to delete the selected favorite" + } + + BEGIN_HINT(Hint_NewFavorite) + text "Click to specify a new favorite" + } + + BEGIN_HINT(Hint_Source) + text "Select the source from which to search for servers" + } + + BEGIN_HINT(Hint_NewList) + text "Click to reload the list from the selected source, whether it is Local, Internet or Favorites" + } + + BEGIN_HINT(Hint_RefreshList) + text "Click to refresh the current server list" + } + + BEGIN_HINT(Hint_ServerEmpty) + text "Enable to show empty servers on the list" + } + + BEGIN_HINT(Hint_ServerFull) + text "Enable to show full servers on the list" + } + // column headers // BEGIN_HINT(Hint_Col1) @@ -252,28 +292,28 @@ // ROW 1 // - BEGIN_BUTTON(1, 1, "Server ^_i^_nfo") + BEGIN_BUTTON(1, 1, "^_S^_erver info...") action { open "serverinfo_popmenu" } - shortcutKey "I" + shortcutKey "S" ASSIGN_HINT(Hint_ServerInfo) } - BEGIN_BUTTON(1, 2, "^_P^_assword") + BEGIN_BUTTON(1, 2, "^_P^_assword...") action { open "password_popmenu" } shortcutKey "P" ASSIGN_HINT(Hint_Password) } - BEGIN_BUTTON(1, 3, "^_S^_pecify") + BEGIN_BUTTON(1, 3, "^_C^_onnect to...") action { open "specify_popmenu" } - shortcutKey "S" - ASSIGN_HINT(SelectServer2) + shortcutKey "C" + ASSIGN_HINT(Hint_Specify) } - BEGIN_BUTTON(1, 4, "^_F^_ind player") - action { open "specify_popmenu" } + BEGIN_BUTTON(1, 4, "^_F^_ind a player...") + action { open "findplayer_popmenu" } shortcutKey "F" - ASSIGN_HINT(SelectServer2) + ASSIGN_HINT(Hint_Find) } @@ -281,28 +321,28 @@ // ROW 2 // BEGIN_BUTTON(2, 1, "^_A^_dd Favorite") - action { play "sound/misc/menu1.wav" ; uiScript AddFavorite ; uiScript UpdateFilter } + action { play "sound/ui/whoosh3.wav" ; uiScript AddFavorite ; uiScript UpdateFilter } shortcutKey "A" - ASSIGN_HINT(SelectServer2) + ASSIGN_HINT(Hint_AddFavorite) } BEGIN_BUTTON(2, 2, "^_D^_el. Favorite") - action { play "sound/misc/menu1.wav" ; uiScript DeleteFavorite ; uiScript UpdateFilter } + action { play "sound/ui/whoosh3.wav" ; uiScript DeleteFavorite ; uiScript UpdateFilter } shortcutKey "D" - ASSIGN_HINT(SelectServer2) + ASSIGN_HINT(Hint_DelFavorite) } - BEGIN_BUTTON(2, 3, "^_N^_ew Favorite") + BEGIN_BUTTON(2, 3, "^_N^_ew Favorite...") action { open "createfavorite_popmenu" } shortcutKey "N" - ASSIGN_HINT(SelectServer2) + ASSIGN_HINT(Hint_NewFavorite) } BEGIN_CONTROL(2, 4, "") ownerdraw UI_NETSOURCE textalignx 6 - action { play "sound/misc/menu1.wav" } - ASSIGN_HINT(SelectServer2) + action { play "sound/ui/whoosh3.wav" } + ASSIGN_HINT(Hint_Source) } @@ -310,33 +350,33 @@ // ROW 3 // BEGIN_BUTTON(3, 1, "^_G^_et New List") - action { play "sound/misc/menu1.wav" ; uiScript RefreshServers } + action { play "sound/ui/whoosh3.wav" ; uiScript RefreshServers } shortcutKey "G" - ASSIGN_HINT(SelectServer2) + ASSIGN_HINT(Hint_NewList) } BEGIN_BUTTON(3, 2, "^_R^_efresh List") - action { play "sound/misc/menu1.wav" ; uiScript RefreshFilter } + action { play "sound/ui/whoosh3.wav" ; uiScript RefreshFilter } shortcutKey "R" - ASSIGN_HINT(SelectServer2) + ASSIGN_HINT(Hint_RefreshList) } BEGIN_CONTROL(3, 3, "View ^_E^_mpty:") type ITEM_TYPE_YESNO cvar "ui_browserShowEmpty" textalignx 8 - action { play "sound/misc/menu1.wav" ; uiScript RefreshFilter } + action { play "sound/ui/whoosh3.wav" ; uiScript RefreshFilter } shortcutKey "V" - ASSIGN_HINT(SelectServer2) + ASSIGN_HINT(Hint_ServerEmpty) } BEGIN_CONTROL(3, 4, "^_V^_iew Full:") type ITEM_TYPE_YESNO cvar "ui_browserShowFull" textalignx 8 - action { play "sound/misc/menu1.wav" ; uiScript RefreshFilter } + action { play "sound/ui/whoosh3.wav" ; uiScript RefreshFilter } shortcutKey "V" - ASSIGN_HINT(SelectServer2) + ASSIGN_HINT(Hint_ServerFull) } diff --git a/reaction/uifiles/main.menu b/reaction/uifiles/main.menu index 41a870eb..47ecc750 100644 --- a/reaction/uifiles/main.menu +++ b/reaction/uifiles/main.menu @@ -66,17 +66,7 @@ //-------------------------------------------- - //Boomstick logo - - itemDef { - style WINDOW_STYLE_SHADER - rect 276 288 120 120 - anglevectors 9 -81 - background UI_ASSETS"/logo" - forecolor 1 1 1 0.2 - decoration - visible 1 - } + __BOOMSTICK_LOGO__ //Join server diff --git a/reaction/uifiles/options.menu b/reaction/uifiles/options.menu index 1e9eac88..9fba3d94 100644 --- a/reaction/uifiles/options.menu +++ b/reaction/uifiles/options.menu @@ -474,7 +474,17 @@ Group # 3 - SSG Crosshair // Next // +/* + BEGIN_OPTION(3, 7, "^_N^_ext",) + OPTION_BELOW("gr3_ctrl4") + action { uiScript nextSSGCrosshair 1 instant } + shortcutKey "N" + ASSIGN_HINT("hint_ssgnext") + } + ADD_HINT("hint_ssgnext", "Select the next SSG crosshair", "group3") + +*/ } } diff --git a/reaction/uifiles/password.menu b/reaction/uifiles/password.menu index 792d4073..f5700f8f 100644 --- a/reaction/uifiles/password.menu +++ b/reaction/uifiles/password.menu @@ -76,7 +76,7 @@ alignrect password ITEM_ALIGN_LEFT 80 2 120 20 textalign ITEM_ALIGN_LEFT textalignx 4 - textaligny 16 + textaligny 19 forecolor 0 0 .15 1 visible 1 } @@ -113,7 +113,7 @@ textaligny 16 forecolor 0 0 .15 1 visible 1 - action { play "sound/misc/menu1.wav" ; close password_popmenu ; open joinserver } + action { play "sound/ui/whoosh3.wav" ; close password_popmenu ; open joinserver } } diff --git a/reaction/uifiles/replacements.menu b/reaction/uifiles/replacements.menu index bb56921f..46d5c2c2 100644 --- a/reaction/uifiles/replacements.menu +++ b/reaction/uifiles/replacements.menu @@ -301,8 +301,8 @@ name "ammo_tip" group "fade_fore_alpha,group3,allgroups" style 0 - text "Select ammo type you\n" - "want to replace:" + text "Select an ammo type\n" + "you want to replace:" autowrapped alignrect "line" ITEM_ALIGN_LEFT 4 48 208 20 textscale .225 diff --git a/reaction/uifiles/serverinfo.menu b/reaction/uifiles/serverinfo.menu index 2a1fda46..7661c5e0 100644 --- a/reaction/uifiles/serverinfo.menu +++ b/reaction/uifiles/serverinfo.menu @@ -1,4 +1,111 @@ #include "ui/menudef.h" +#define ANGLES -3 -93 + +{ + menuDef { + renderpoint + name "serverinfo_popmenu" + visible MENU_FALSE // Visible on open + fullscreen 0 + rect 168 72 340 264 + disableColor .5 .5 .5 1 + focusColor RQ3_MAIN_FOCUSCOLOR // Menu focus color for text and items + anglevectors ANGLES + style WINDOW_STYLE_EMPTY + popup + + onOOBClick { close _self ; open _prev } // this closes the window if it gets a click out of the rectangle + onOpen { play "sound/ui/whoosh3.wav" ; uiScript ServerStatus } + onEsc { close _self ; open _prev } + + onOpenSpecial { + //normal items + setItemColor "fade_fore_alpha" forecolor 5 5 5 0 ; + timeFade "fade_fore_alpha" forecolor 5 5 5 1 0 FADEIN_TIME ; + //icon - special alpha + setItemColor "icon" forecolor 5 5 5 0 ; + timeFade "icon" forecolor 5 5 5 ICON_ALPHA 0 FADEIN_TIME ; + //line - special alpha; using backcolor + setItemColor "line" backcolor 5 5 5 0 ; + timeFade "line" backcolor 5 5 5 LINE_ALPHA 0 FADEIN_TIME ; + } + + itemDef { + renderpoint + name "paper,fade_alpha" + menuAnchor + style WINDOW_STYLE_SHADER + background UI_ASSETS"/paper_1" + forecolor MENUCOLOR_REPLACEMENTS 1 + rect -8 -16 380 320 + anglevectors ANGLES + visible 1 + decoration + } + + //Title + + itemdef { + renderpoint + name "title,fade_alpha" + text "Server info:" + forecolor .6 .0 .0 1 + style WINDOW_STYLE_EMPTY + textalign ITEM_ALIGN_LEFT + textalignx 4 + textaligny 24 + textscale RQ3_MAIN_TEXTSIZE + alignrect paper ITEM_ALIGN_LEFT 32 32 240 36 + visible 1 + autowrapped + decoration + } + + //Refresh button + + itemDef { + name "refresh" + alignrect title ITEM_ALIGN_LEFT 148 12 136 20 + style WINDOW_STYLE_EMPTY + textalign ITEM_ALIGN_LEFT + text "> ^_R^_efresh" + forecolor 0 0 0 1 + shortcutKey "R" + type ITEM_TYPE_BUTTON + textalignx 4 + textaligny 12 + textscale .225 + backcolor 0 0 .75 .25 + action { play "sound/ui/whoosh3.wav" ; uiScript "ServerStatus" } + visible 1 + } + + + itemDef { + alignrect title ITEM_ALIGN_LEFT 12 32 272 184 + type ITEM_TYPE_LISTBOX + LISTBOX_STYLE(.225, 8) + style WINDOW_STYLE_FILLED + elementwidth 280 + elementheight 15 + textscale .2 + elementtype LISTBOX_TEXT + feeder FEEDER_SERVERSTATUS + columns 4 4 40 20 + 40 40 10 + 80 40 10 + 120 20 20 + forecolor 0 0 0 1 + visible 1 + } + } +} + + + + +#if 0 +#include "ui/menudef.h" { // Server Information Popup Menu // @@ -104,4 +211,4 @@ } } - +#endif diff --git a/reaction/uifiles/setup.menu b/reaction/uifiles/setup.menu index 1b143a68..a8b22e8d 100644 --- a/reaction/uifiles/setup.menu +++ b/reaction/uifiles/setup.menu @@ -73,7 +73,7 @@ itemdef { text "Configure Reaction to suit your\n" - "unique needs" + "individual needs" autowrapped subgroup "fade_fore_alpha" forecolor .25 .25 .25 1 diff --git a/reaction/uifiles/shared.h b/reaction/uifiles/shared.h index 989ac1d3..9e291815 100644 --- a/reaction/uifiles/shared.h +++ b/reaction/uifiles/shared.h @@ -1,17 +1,57 @@ -//-------------------------------------------- - - // Common stuff // - +#define __BOOMSTICK_LOGO__ \ + itemDef { \ + style WINDOW_STYLE_SHADER \ + rect 276 288 120 120 \ + anglevectors 9 -81 \ + background UI_ASSETS"/logo" \ + forecolor 1 1 1 0.2 \ + decoration \ + visible 1 \ + } +#define __REACTION_VERSION__ \ + itemdef { \ + group main \ + subgroup "main_title" \ + text "REACTION v1.0" \ + forecolor 0 0 .05 1 \ + style WINDOW_STYLE_EMPTY \ + textalign ITEM_ALIGN_CENTER \ + textscale .4 \ + textalignx 120 \ + textaligny 24 \ + rect 108 144 240 36 \ + anglevectors 9 -81 \ + visible 1 \ + autowrapped \ + decoration \ + } //Copyright +#define __REACTION_COPYRIGHT__ \ + itemDef { \ + group main \ + alignrect "main_title" ITEM_ALIGN_LEFT 0 20 240 36 \ + style WINDOW_STYLE_EMPTY \ + textalign ITEM_ALIGN_CENTER \ + textscale .275 \ + textalignx 120 \ + textaligny 24 \ + forecolor 0 0 0.05 1 \ + text "(c) 2000-2010 Boomstick Studios\n\n\n\n\n" \ + "http://www.rq3.com" \ + autowrapped \ + visible 1 \ + decoration \ + } + itemDef { name "copyright,_common_" autowrapped text "Reaction v1.0\n" - "Copyright (c) 2000 - 2009 Boomstick Studios\n" + "Copyright (c) 2000 - 2010 Boomstick Studios\n" "Quake III Arena (c) 1999 - 2000 id Software Inc." //style 0 textstyle 3 @@ -26,6 +66,13 @@ decoration } +//-------------------------------------------- + + // Common stuff // + + + + //Logo itemDef { @@ -77,16 +124,10 @@ name "_common_" type ITEM_TYPE_MODEL asset_model UI_ASSETS"/models/phone2/phone.md3" - //rect 0 0 640 480 rect -216 -316 640 640 - //model_fovx 40 - //model_fovy 30 model_fovx 40 model_fovy 40 - //style WINDOW_STYLE_FILLED - //backcolor 0 0 0 1 model_origin 20 0 0 - //model_angles 90 34 280 model_angles 90 34 296 visible 1 decoration @@ -113,7 +154,7 @@ // KEYS // - +/* itemDef { name "_common_" type 1 @@ -124,10 +165,37 @@ visible 1 decoration } + */ + + itemdef { + name "_common_" + type ITEM_TYPE_MODEL + asset_model UI_ASSETS"/models/keys/keys.md3" + rect 372 220 256 192 + model_fovx 40 + model_fovy 30 + model_origin 110 0 0 + model_angles 97 -83 270 + visible 1 + decoration + } + + + // BAKING SODA !!! // + + itemDef { + name "_common_" + type 1 + background "ui/assets/snowblind.tga" + rect 476 182 256 192 + style WINDOW_STYLE_SHADER + visible 1 + decoration + } // PEN // - +/* itemdef { name "_common_" type ITEM_TYPE_MODEL @@ -142,19 +210,23 @@ visible 1 decoration } +*/ + // ROLLED DOLLAR BILL // -/* itemdef { - style WINDOW_STYLE_SHADER - forecolor .75 .75 .75 1 - background UI_ASSETS"/gun_shadow.tga" - rect 216 572 360 260 - anglevectors 156 66 + name "_common_" + type ITEM_TYPE_MODEL + asset_model UI_ASSETS"/models/dollar/dollar1.md3" + rect 0 0 640 480 + model_fovx 40 + model_fovy 30 + model_origin 27 -6 1 + model_angles 65 313 270 visible 1 decoration } -*/ + // GUN // @@ -170,7 +242,20 @@ decoration } - + // WRINKLED DOLLAR // + + itemdef { + name "_common_" + type ITEM_TYPE_MODEL + asset_model UI_ASSETS"/models/dollar/dollar2.md3" + rect 168 -64 640 480 + model_fovx 40 + model_fovy 30 + model_origin 27 -6 1 + model_angles 120 270 270 + visible 1 + decoration + } // BOTTLE // @@ -178,12 +263,7 @@ name "_common_" type ITEM_TYPE_MODEL asset_model UI_ASSETS"/models/bottle/bottle.md3" - //rect 0 0 640 480 rect 236 -80 640 640 - //model_fovx 40 - //model_fovy 30 - //style WINDOW_STYLE_FILLED - //backcolor 0 0 0 1 model_fovx 40 model_fovy 40 model_origin 50 0 12 @@ -193,4 +273,22 @@ decoration } + // WRINKLED DOLLAR 2 // + + itemdef { + name "_common_" + type ITEM_TYPE_MODEL + asset_model UI_ASSETS"/models/dollar/dollar2.md3" + rect 144 -40 640 480 + model_fovx 40 + model_fovy 30 + //style WINDOW_STYLE_FILLED + //backcolor 0 0 0 1 + model_origin 27 -6 1 + model_angles 106 80 270 + visible 1 + decoration + } + + //-------------------------------------------- diff --git a/reaction/uifiles/specify.menu b/reaction/uifiles/specify.menu index dc2b2d2d..85f13972 100644 --- a/reaction/uifiles/specify.menu +++ b/reaction/uifiles/specify.menu @@ -1,130 +1,5 @@ #include "ui/menudef.h" -{ - // SPECIFY ADDRESS POPUP MENU // - - menuDef { - name "specify_popmenu2" - visible 0 - fullscreen 0 - rect 170 200 300 80 - //outOfBoundsClick // this closes the window if it gets a click out of the rectangle - onOOBClick { close _self ; open _prev } - focusColor RQ3_MAIN_FOCUSCOLOR // Menu focus color for text and items - style WINDOW_STYLE_EMPTY - border 1 - popup - onOpen { play "sound/misc/menu1.wav" ; setfocus addressEntry } - onESC { close specify_popmenu ; open joinserver } - - itemDef { - name window - rect 0 0 300 60 - style WINDOW_STYLE_FILLED - border 1 - borderSize 1 - bordercolor Ig_Window_BorderColor - backcolor Ig_Window_Color - shadowStyle 1 - visible 1 - decoration - } - - // ADDRESS // - - itemDef { - text "Address:" - style 0 - textscale .25 - rect 0 8 80 20 - textalign ITEM_ALIGN_LEFT - textalignx 16 - textaligny 16 - forecolor 1 1 1 1 - visible 1 - decoration - } - - itemDef { - name addressEntry - style WINDOW_STYLE_FILLED - text "" - textalign ITEM_ALIGN_LEFT - textalignx 4 - textaligny 14 - maxPaintChars 18 - textscale .225 - type ITEM_TYPE_EDITFIELD - cvar "ui_RQ3_joinAddress" - rect 12 28 180 20 - border 1 - bordersize 1 - bordercolor .25 .25 .25 1 - forecolor 1 1 1 1 - backcolor 1 1 1 .1 - visible 1 - onfocus { setcolor backcolor 1 1 1 .2 ; } - leavefocus { setcolor backcolor 1 1 1 .1 ; } - } - - // PORT // - - itemDef { - text "Port:" - style 0 - textscale .25 - rect 188 8 40 20 - textalign ITEM_ALIGN_LEFT - textalignx 16 - textaligny 16 - forecolor 1 1 1 1 - visible 1 - decoration - } - - itemDef { - name portEntry - style WINDOW_STYLE_FILLED - text "" - textalign ITEM_ALIGN_LEFT - textalignx 4 - textaligny 14 - maxPaintChars 7 - maxChars 7 - textscale .225 - type ITEM_TYPE_NUMERICFIELD - cvar "ui_RQ3_joinPort" - rect 200 28 48 20 - border 1 - bordersize 1 - bordercolor .25 .25 .25 1 - forecolor 1 1 1 1 - backcolor 1 1 1 .1 - visible 1 - onfocus { setcolor backcolor 1 1 1 .2 ; } - leavefocus { setcolor backcolor 1 1 1 .1 ; } - } - - // GO // - - itemDef { - shortcutKey "G" - style WINDOW_STYLE_SHADER - background UI_ASSETS"/icons/rq3-menu-go.tga" - type ITEM_TYPE_BUTTON - rect 260 30 32 16 - visible 1 - onfocus { setbackground UI_ASSETS"/icons/rq3-menu-go-focus-anim" } - leavefocus { setbackground UI_ASSETS"/icons/rq3-menu-go.tga" } - action { play "sound/misc/menu1.wav" ; uiScript joinSpecifiedServer } - } - - } -} - - -#include "ui/menudef.h" - #define FADEIN_TIME 125 #define BACK_COLOR1 .85 .9 .85 1 #define BACK_COLOR2 .95 .95 .98 1 @@ -132,115 +7,177 @@ #define ANGLES -2 -92 { - // SPECIFY SERVER POPUP MENU // + // SPECIFY SERVER POPUP MENU // - menuDef { - name "specify_popmenu" - visible 0 - fullscreen 0 - rect 260 192 300 80 - anglevectors ANGLES - focusColor .25 .25 .5 1 - popup - style WINDOW_STYLE_EMPTY - //onOpen { transition window 0 50 300 0 0 0 300 100 10 4 } - //onClose { transition window 0 0 300 100 0 50 300 0 10 4 } - onOpen { - //setrandomitemcolor postit forecolor 2 BACK_COLOR1 BACK_COLOR2 ; - setitemcolor window forecolor 5 5 5 0 ; - timefade window forecolor 5 5 5 1 0 FADEIN_TIME ; - play "sound/ui/whoosh3.wav" ; - setQuitText confirm ; - setfocus no + menuDef { + name "specify_popmenu" + visible 0 + fullscreen 0 + rect 248 200 288 152 + anglevectors ANGLES + focusColor .25 .25 .5 1 + popup + style WINDOW_STYLE_EMPTY + onOpen { + //setrandomitemcolor postit forecolor 2 BACK_COLOR1 BACK_COLOR2 ; + setitemcolor window forecolor 5 5 5 0 ; + timefade window forecolor 5 5 5 1 0 FADEIN_TIME ; + play "sound/ui/whoosh3.wav" ; + //setQuitText confirm ; + setfocus addressEntry + } + onESC { close _self ; open _prev } + onOOBClick { close _self ; open _prev } + + itemDef { + renderpoint + name "postit" + menuAnchor + group window + style WINDOW_STYLE_SHADER + background UI_ASSETS"/paper_1" + forecolor 1 1 .92 1 + //backcolor .94 .94 .82 1 + rect -8 -4 320 176 + anglevectors ANGLES + visible 1 + decoration + } + + // TITLE // + + itemdef { + renderpoint + name "title" + text "Join the specified server:" + forecolor .6 .0 .0 1 + style WINDOW_STYLE_EMPTY + textalign ITEM_ALIGN_LEFT + textalignx 4 + textaligny 24 + textscale RQ3_MAIN_TEXTSIZE + alignrect postit ITEM_ALIGN_LEFT 32 24 240 36 + visible 1 + autowrapped + decoration + } + + // ADDRESS // + + itemDef { + renderpoint + name "address" + text "Address:" + style 0 + decoration + textscale .25 + alignrect title ITEM_ALIGN_LEFT -8 32 52 20 + textalign ITEM_ALIGN_LEFT + textalignx 20 + textaligny 16 + forecolor 0 0 .15 1 + visible 1 + } + + itemDef { + name "address_dots" + text "........................................" + style 0 + decoration + textscale .25 + alignrect address ITEM_ALIGN_LEFT 80 2 168 20 + textalign ITEM_ALIGN_LEFT + textalignx 4 + textaligny 19 + forecolor 0 0 .15 1 + visible 1 + } + + itemDef { + name "addressEntry" + style WINDOW_STYLE_EMPTY + text "" + textalign ITEM_ALIGN_LEFT + textalignx 4 + textaligny 14 + maxchars 20 + maxPaintChars 15 + textscale .25 + type ITEM_TYPE_EDITFIELD + cvar "ui_RQ3_joinAddress" + alignrect address_dots ITEM_ALIGN_LEFT 0 0 168 20 + forecolor 0 0 .15 1 + backcolor 1 0 0 .5 + visible 1 + } + + // PORT // + + itemDef { + renderpoint + name "port" + text "Port:" + style 0 + decoration + textscale .25 + alignrect address ITEM_ALIGN_LEFT 0 24 52 20 + textalign ITEM_ALIGN_LEFT + textalignx 20 + textaligny 16 + forecolor 0 0 .15 1 + visible 1 + } + + itemDef { + name "port_dots" + text ".........." + style 0 + decoration + textscale .25 + alignrect address ITEM_ALIGN_LEFT 80 24 56 20 + textalign ITEM_ALIGN_LEFT + textalignx 4 + textaligny 19 + forecolor 0 0 .15 1 + visible 1 + } + + itemDef { + name "portEntry" + style WINDOW_STYLE_EMPTY + text "" + textalign ITEM_ALIGN_LEFT + textalignx 4 + textaligny 14 + maxPaintChars 7 + maxChars 7 + textscale .25 + type ITEM_TYPE_NUMERICFIELD + cvar "ui_RQ3_joinPort" + alignrect port_dots ITEM_ALIGN_LEFT 0 0 56 20 + forecolor 0 0 .15 1 + backcolor 1 0 0 .5 + visible 1 + } + + // GO // + + itemDef { + //text "^_O^_K" + //shortcutKey "O" + text "> ^_G^_O <" + shortcutKey "G" + type ITEM_TYPE_BUTTON + textscale .25 + style WINDOW_STYLE_EMPTY + alignrect port_dots ITEM_ALIGN_LEFT 124 24 40 20 + textalign 1 + textalignx 20 + textaligny 16 + //forecolor 0 0 .15 1 + forecolor .5 0 0 1 + visible 1 + action { play "sound/ui/whoosh3.wav" ; uiScript joinSpecifiedServer } + } } - //onOpen { play "sound/misc/menu1.wav" ; setfocus passwordEntry } - //onESC { close password_popmenu ; open joinserver } - onESC { close _self ; open _prev } - onOOBClick { close _self ; open _prev } - - - itemDef { - renderpoint - name "postit" - menuAnchor - group window - style WINDOW_STYLE_SHADER - //style WINDOW_STYLE_FILLED - background UI_ASSETS"/paper_1" - forecolor 1 1 .92 1 - //backcolor .94 .94 .82 1 - rect -8 0 300 88 - anglevectors ANGLES - visible 1 - decoration - } - - // PASSWORD // - - itemDef { - renderpoint - name password - text "Address:" - style 0 - decoration - textscale .25 - alignrect postit ITEM_ALIGN_LEFT 16 24 52 20 - textalign ITEM_ALIGN_LEFT - textalignx 20 - textaligny 16 - forecolor 0 0 .15 1 - visible 1 - } - - itemDef { - name password_dots - text "............................" - style 0 - decoration - textscale .25 - alignrect password ITEM_ALIGN_LEFT 80 2 120 20 - textalign ITEM_ALIGN_LEFT - textalignx 4 - textaligny 16 - forecolor 0 0 .15 1 - visible 1 - } - - itemDef { - name passwordEntry - style WINDOW_STYLE_EMPTY - text "" - textalign ITEM_ALIGN_LEFT - textalignx 4 - textaligny 14 - maxchars 20 - maxPaintChars 10 - textscale .25 - type ITEM_TYPE_EDITFIELD - cvar "password" - alignrect password_dots ITEM_ALIGN_LEFT 0 0 120 20 - forecolor 0 0 .15 1 - backcolor 1 0 0 .5 - visible 1 - } - - // OK // - - itemDef { - text "^_O^_K" - shortcutKey "O" - type ITEM_TYPE_BUTTON - textscale .25 - style WINDOW_STYLE_EMPTY - alignrect passwordEntry ITEM_ALIGN_LEFT 140 0 60 20 - textalign 1 - textalignx 8 - textaligny 16 - forecolor 0 0 .15 1 - visible 1 - action { play "sound/misc/menu1.wav" ; close password_popmenu ; open joinserver } - } - - - } }