vote: add menus

pull/3/head
FutureRave 2022-11-30 23:45:48 +00:00
parent 137bbc4b98
commit e185e7ad72
No known key found for this signature in database
GPG Key ID: 22F9079C86CFAB31
6 changed files with 504 additions and 23 deletions

View File

@ -2,11 +2,11 @@
#include "ui_mp/main.inc"
#include "ui_mp/pc_options.inc"
#define MENU_NAME "controls_multi"
#define MENU_TITLE "@MENU_CHAT"
#define MENU_NAME "controls_multi"
#define MENU_TITLE "@MENU_CHAT"
#undef CHOICE_GROUP
#define CHOICE_GROUP MENU_NAME
#define CHOICE_GROUP MENU_NAME
#define CLOSE_MENUS \
close "main_controls"; \
@ -29,16 +29,16 @@
close "pc_options_voice";
#define ON_MENU_OPEN \
CLOSE_MENUS \
setLocalVarBool "ui_hideBack" (1); \
setLocalVarBool ui_hint_display 0;
CLOSE_MENUS \
setLocalVarBool "ui_hideBack" (1); \
setLocalVarBool ui_hint_display 0;
#define ON_MENU_CLOSE \
setLocalVarBool "ui_hideBack" (0); \
open "pc_options_controls";
setLocalVarBool "ui_hideBack" (0); \
open "pc_options_controls";
#define ON_MENU_ESC \
close self;
close self;
menuDef
{
@ -64,6 +64,9 @@ menuDef
PC_OPTIONS_KEYBINDING(1, "@MENU_TEXT_TEAM_CHAT", "chatmodeteam")
PC_OPTIONS_KEYBINDING(2, "@MENU_QUICK_CHAT", "mp_QuickMessage")
PC_OPTIONS_KEYBINDING( 4, "@MENU_VOTE_YES", "vote yes")
PC_OPTIONS_KEYBINDING( 5, "@MENU_VOTE_NO", "vote no")
PC_OPTIONS_KEYBINDSTATUS
ITEM_BUTTON_BACK(ON_MENU_ESC)

View File

@ -0,0 +1,58 @@
#include "ui/menudef.h"
#include "ui_mp/main.inc"
#define MENU_NAME "callvote"
#define MENU_TITLE "@MPUI_CALLVOTE"
#define MENU_SECTION_TITLE ""
#undef CHOICE_GROUP
#define CHOICE_GROUP MENU_NAME
{
menuDef
{
name MENU_NAME
rect 0 0 640 480
foreColor CHOICE_TEXTCOLOR
focusColor CHOICE_TEXTCOLOR
blurWorld 7
onEsc
{
close "self";
open "class";
}
#define BACKGROUND_PC_OPTIONS
#define BACKGROUND_IW4
#define SIDEBAR_RIGHT
#include "ui_mp/bg.inc"
itemDef
{
rect 0 0 272 28 1 1
decoration
visible 1
forecolor 1 1 1 1
textfont 9
textalign 6
textalignx -60
textscale 0.5
text MENU_TITLE
}
#define CHOICE_Y(i) (28 + (i * 20))
#define CHOICE_ORIGIN(i) -64 CHOICE_Y(i)
#define CHOICE_RECT(i) CHOICE_ORIGIN(i) 336 20 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
#define HR_ORIGIN(i) 0 (CHOICE_Y(i) - 0.5)
#define HR_RECT(i) HR_ORIGIN(i) 216 1 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
MENU_CHOICE_BUTTON_VIS(0, "button_1", "@MP_VOTE_MAPRESTART", exec "cmd callvote map_restart"; close self;, ;, 1)
MENU_CHOICE_BUTTON_VIS(1, "button_2", "@MP_VOTE_NEXTMAP", exec "cmd callvote map_rotate"; close self;, ;, 1)
MENU_CHOICE_BUTTON_VIS(2, "button_3", "@MENU_CHANGE_MAP", open "changemap"; close "changegametype"; close "kickplayer"; close self;, ;, 1)
MENU_CHOICE_BUTTON_VIS(3, "button_4", "Change Gametype", open "changegametype"; close "changemap"; close "kickplayer"; close self;, ;, 1)
MENU_CHOICE_BUTTON_VIS(4, "button_5", "@MPUI_KICK_PLAYER", open "kickplayer"; close "changemap"; close "changegametype"; close self;, ;, 1)
ITEM_BUTTON_BACK(close "self")
}
}

View File

@ -0,0 +1,125 @@
#include "ui/menudef.h"
#include "ui_mp/main.inc"
#define MENU_NAME "changegametype"
#define MENU_TITLE "@MPUI_CALLVOTE"
#define MENU_SECTION_TITLE ""
#undef CHOICE_GROUP
#define CHOICE_GROUP MENU_NAME
{
menuDef
{
name MENU_NAME
rect 0 0 640 480
foreColor CHOICE_TEXTCOLOR
focusColor CHOICE_TEXTCOLOR
blurWorld 7
onEsc
{
close "self";
open "class";
}
#define BACKGROUND_PC_OPTIONS
#define BACKGROUND_IW4
#define SIDEBAR_RIGHT
#include "ui_mp/bg.inc"
itemDef
{
rect 0 0 272 28 1 1
decoration
visible 1
forecolor 1 1 1 1
textfont 9
textalign 6
textalignx -60
textscale 0.5
text MENU_TITLE
}
#define CHOICE_Y(i) (28 + (i * 20))
#define CHOICE_ORIGIN(i) -64 CHOICE_Y(i)
#define CHOICE_RECT(i) CHOICE_ORIGIN(i) 336 20 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
#define HR_ORIGIN(i) 0 (CHOICE_Y(i) - 0.5)
#define HR_RECT(i) HR_ORIGIN(i) 216 1 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
MENU_CHOICE_BUTTON_VIS(0, "button_1", "@MP_VOTE_MAPRESTART", exec "cmd callvote map_restart"; close self;, ;, 1)
MENU_CHOICE_BUTTON_VIS(1, "button_2", "@MP_VOTE_NEXTMAP", exec "cmd callvote map_rotate"; close self;, ;, 1)
MENU_CHOICE_BUTTON_VIS(2, "button_3", "@MENU_CHANGE_MAP", open "changemap"; close "changegametype"; close "kickplayer"; close "callvote";, ;, 1)
MENU_CHOICE_BUTTON_VIS(3, "button_4", "Change Gametype", open "changegametype"; close "changemap"; close "kickplayer"; close "callvote";, ;, 1)
MENU_CHOICE_BUTTON_VIS(4, "button_5", "@MPUI_KICK_PLAYER", open "kickplayer"; close "changemap"; close "changegametype"; close "callvote";, ;, 1)
#undef CHOICE_Y
#undef CHOICE_ORIGIN
#undef CHOICE_RECT
#include "ui_mp/pc_options.inc"
PC_OPTIONS_SECTION_TITLE("Change Gametype")
ITEM_BUTTON_BACK(close "self")
itemDef
{
name "maplist2"
rect 275 42 300 270 1 1
forecolor 1 1 1 1
style 1
type ITEM_TYPE_LISTBOX
border 1
bordersize 1
bordercolor 1 1 1 0.15
outlinecolor 1 1 1 0.2
textscale 0.375
textfont 3
textalignx 6
visible 1
feeder FEEDER_GAMEMODES
elementtype LISTBOX_TEXT
elementwidth 120
elementheight 24
columns 1 2 190 25
mouseEnter
{
setitemcolor "maplist2";
bordercolor 1 1 1 0.55;
}
mouseExit
{
setitemcolor "maplist2";
bordercolor 1 1 1 0.15;
}
}
itemDef
{
rect 275 312 320 20 1 1
style 1
forecolor 1 1 1 1
background "menu_setting_selection_bar"
type 1
textfont 3
textalign 6
textalignx -55
textscale 0.375
text "@MPUI_CALL_VOTE"
visible 1
onFocus
{
play "mouse_over";
setItemColor self backcolor 0 0 0 1;
}
leaveFocus
{
setItemColor self backcolor 0 0 0 0;
}
action
{
close "self";
uiScript "voteGame";
}
}
}
}

View File

@ -0,0 +1,127 @@
#include "ui/menudef.h"
#include "ui_mp/main.inc"
#define MENU_NAME "changemap"
#define MENU_TITLE "@MPUI_CALLVOTE"
#define MENU_SECTION_TITLE ""
#undef CHOICE_GROUP
#define CHOICE_GROUP MENU_NAME
{
menuDef
{
name MENU_NAME
rect 0 0 640 480
foreColor CHOICE_TEXTCOLOR
focusColor CHOICE_TEXTCOLOR
blurWorld 7
onEsc
{
close "self";
open "class";
}
#define BACKGROUND_PC_OPTIONS
#define BACKGROUND_IW4
#define SIDEBAR_RIGHT
#include "ui_mp/bg.inc"
itemDef
{
rect 0 0 272 28 1 1
decoration
visible 1
forecolor 1 1 1 1
textfont 9
textalign 6
textalignx -60
textscale 0.5
text MENU_TITLE
}
#define CHOICE_Y(i) (28 + (i * 20))
#define CHOICE_ORIGIN(i) -64 CHOICE_Y(i)
#define CHOICE_RECT(i) CHOICE_ORIGIN(i) 336 20 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
#define HR_ORIGIN(i) 0 (CHOICE_Y(i) - 0.5)
#define HR_RECT(i) HR_ORIGIN(i) 216 1 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
MENU_CHOICE_BUTTON_VIS(0, "button_1", "@MP_VOTE_MAPRESTART", exec "cmd callvote map_restart"; close self;, ;, 1)
MENU_CHOICE_BUTTON_VIS(1, "button_2", "@MP_VOTE_NEXTMAP", exec "cmd callvote map_rotate"; close self;, ;, 1)
MENU_CHOICE_BUTTON_VIS(2, "button_3", "@MENU_CHANGE_MAP", open "changemap"; close "changegametype"; close "kickplayer"; close "callvote";, ;, 1)
MENU_CHOICE_BUTTON_VIS(3, "button_4", "Change Gametype", open "changegametype"; close "changemap"; close "kickplayer"; close "callvote";, ;, 1)
MENU_CHOICE_BUTTON_VIS(4, "button_5", "@MPUI_KICK_PLAYER", open "kickplayer"; close "changemap"; close "changegametype"; close "callvote";, ;, 1)
#undef CHOICE_Y
#undef CHOICE_ORIGIN
#undef CHOICE_RECT
#include "ui_mp/pc_options.inc"
PC_OPTIONS_SECTION_TITLE("@MENU_CHANGE_MAP")
ITEM_BUTTON_BACK(close "self")
itemDef
{
name "maplist"
visible 1
rect 275 42 300 270 1 1
forecolor 1 1 1 1
style 1
type ITEM_TYPE_LISTBOX
textscale 0.375
textfont 3
elementtype LISTBOX_TEXT
elementwidth 120
elementheight 24
textalignx 6
textaligny -1
forecolor 1 1 1 1
border 1
bordersize 1
bordercolor 1 1 1 0.15
outlinecolor 1 1 1 0.2
feeder FEEDER_ALLMAPS
columns 1 2 190 25
mouseEnter
{
setitemcolor "maplist";
bordercolor 1 1 1 0.55;
}
mouseExit
{
setitemcolor "maplist";
bordercolor 1 1 1 0.15;
}
}
itemDef
{
rect 275 312 320 20 1 1
style 1
forecolor 1 1 1 1
background "menu_setting_selection_bar"
type 1
textfont 3
textalign 6
textalignx -55
textscale 0.375
text "@MPUI_CALL_VOTE"
visible 1
onFocus
{
play "mouse_over";
setItemColor self backcolor 0 0 0 1;
}
leaveFocus
{
setItemColor self backcolor 0 0 0 0;
}
action
{
close "self";
uiScript "voteMap";
}
}
}
}

View File

@ -450,6 +450,16 @@
}
}
itemDef
{
rect 0 68 216 1 1 1
decoration
visible 1
style 3
forecolor 1 1 1 0.65
background "gradient_fadein"
textscale 0.55
}
itemDef
{
name "game_options"
rect -64 68 336 20 1 1
@ -490,16 +500,6 @@
}
}
itemDef
{
rect 0 88 216 1 1 1
decoration
visible 1
style 3
forecolor 1 1 1 0.65
background "gradient_fadein"
textscale 0.55
}
itemDef
{
name "game_options"
rect -64 88 336 20 1 1
@ -561,6 +561,7 @@
{
play "mouse_click";
close self;
open "muteplayer";
uiScript "CreateCurrentServerFavorite";
}
onFocus
@ -583,7 +584,7 @@
}
itemDef
{
name "game_endgame"
name "game_callvote"
rect -64 128 336 20 1 1
visible 1
group "mw2_button"
@ -596,6 +597,47 @@
textalign 6
textalignx -60
textscale 0.375
disabled when(!dvarBool("g_allowvote"))
text "@MPUI_CALL_VOTE"
action
{
play "mouse_click";
close self;
open "callvote";
}
onFocus
{
play "mouse_over";
if ( dvarstring( "gameMode" ) != "mp" )
{
setItemColor "mw2_button" backcolor 0 0 0 0;
}
setItemColor self backcolor 0 0 0 1;
setLocalVarBool "ui_menuAButton" ( 1 );
setLocalVarFloat "ui_popupYPos" ( getfocuseditemy( ) );
}
leaveFocus
{
setItemColor self backcolor 0 0 0 "0.0";
setLocalVarString "ui_hint_text" ( "@NULL_EMPTY" );
setLocalVarBool "ui_menuAButton" ( 0 );
}
}
itemDef
{
name "game_endgame"
rect -64 148 336 20 1 1
visible 1
group "mw2_button"
style 1
forecolor 1 1 1 1
disablecolor 0.6 0.55 0.55 1
background "menu_button_selection_bar"
type 1
textfont 3
textalign 6
textalignx -60
textscale 0.375
text "@MENU_END_GAME"
visible when ( !( dvarbool( "onlinegame" ) && !dvarbool( "xblive_privatematch" ) ) && ( dvarbool( "sv_running" ) ) )
action
@ -624,7 +666,7 @@
itemDef
{
name "game_leavegame"
rect -64 128 336 20 1 1
rect -64 148 336 20 1 1
visible 1
group "mw2_button"
style 1

View File

@ -0,0 +1,126 @@
#include "ui/menudef.h"
#include "ui_mp/main.inc"
#define MENU_NAME "kickplayer"
#define MENU_TITLE "@MPUI_CALLVOTE"
#define MENU_SECTION_TITLE ""
#undef CHOICE_GROUP
#define CHOICE_GROUP MENU_NAME
{
menuDef
{
name MENU_NAME
rect 0 0 640 480
foreColor CHOICE_TEXTCOLOR
focusColor CHOICE_TEXTCOLOR
blurWorld 7
onEsc
{
close "self";
open "class";
}
#define BACKGROUND_PC_OPTIONS
#define BACKGROUND_IW4
#define SIDEBAR_RIGHT
#include "ui_mp/bg.inc"
itemDef
{
rect 0 0 272 28 1 1
decoration
visible 1
forecolor 1 1 1 1
textfont 9
textalign 6
textalignx -60
textscale 0.5
text MENU_TITLE
}
#define CHOICE_Y(i) (28 + (i * 20))
#define CHOICE_ORIGIN(i) -64 CHOICE_Y(i)
#define CHOICE_RECT(i) CHOICE_ORIGIN(i) 336 20 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
#define HR_ORIGIN(i) 0 (CHOICE_Y(i) - 0.5)
#define HR_RECT(i) HR_ORIGIN(i) 216 1 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
MENU_CHOICE_BUTTON_VIS(0, "button_1", "@MP_VOTE_MAPRESTART", exec "cmd callvote map_restart"; close self;, ;, 1)
MENU_CHOICE_BUTTON_VIS(1, "button_2", "@MP_VOTE_NEXTMAP", exec "cmd callvote map_rotate"; close self;, ;, 1)
MENU_CHOICE_BUTTON_VIS(2, "button_3", "@MENU_CHANGE_MAP", open "changemap"; close "changegametype"; close "kickplayer"; close self;, ;, 1)
MENU_CHOICE_BUTTON_VIS(3, "button_4", "Change Gametype", open "changegametype"; close "changemap"; close "kickplayer"; close self;, ;, 1)
MENU_CHOICE_BUTTON_VIS(4, "button_5", "@MPUI_KICK_PLAYER", open "kickplayer"; close "changemap"; close "changegametype"; close self;, ;, 1)
#undef CHOICE_Y
#undef CHOICE_ORIGIN
#undef CHOICE_RECT
#include "ui_mp/pc_options.inc"
PC_OPTIONS_SECTION_TITLE("@MPUI_KICK_PLAYER")
ITEM_BUTTON_BACK(close "self")
itemDef
{
name "maplist"
visible 1
rect 275 42 300 270 1 1
forecolor 1 1 1 1
style 1
type ITEM_TYPE_LISTBOX
textscale 0.375
textfont 3
elementtype LISTBOX_TEXT
elementwidth 120
elementheight 24
textalignx 6
border 1
bordersize 1
bordercolor 1 1 1 0.15
outlinecolor 1 1 1 0.2
feeder FEEDER_PLAYER_LIST
columns 1 2 190 25
mouseEnter
{
setitemcolor "maplist";
bordercolor 1 1 1 0.55;
}
mouseExit
{
setitemcolor "maplist";
bordercolor 1 1 1 0.15;
}
}
itemDef
{
rect 275 312 320 20 1 1
style 1
forecolor 1 1 1 1
background "menu_setting_selection_bar"
type 1
textfont 3
textalign 6
textalignx -55
textscale 0.375
text "@MPUI_CALL_VOTE"
visible 1
onFocus
{
play "mouse_over";
setItemColor self backcolor 0 0 0 1;
}
leaveFocus
{
setItemColor self backcolor 0 0 0 0;
}
action
{
close "self";
uiScript "voteKick";
}
}
}
}