Merge pull request #30 from reaaLx/vote-menus

add working vote menu files
efinst0rm · Aug 22, 2022 · 66642f1 · 66642f1
2 parents 6ba0b94 + cbd79e7
commit 66642f1
Show file tree

Hide file tree

Showing 7 changed files with 1,351 additions and 868 deletions.
diff --git a/iw4x/iw4x_00/default_mp_controls.cfg b/iw4x/iw4x_00/default_mp_controls.cfg
@@ -61,8 +61,12 @@ bind y	"chatmodeteam"
 //bind z	"+talk"
 //bind x	"openscriptmenu ingame changeweapon"
 
+// MULTIPLAYER VOTE CONTROLS
+bind F1 "vote yes"
+bind F2 "vote no"
+
 // CLIENT ENVIRONMENT COMMANDS
 bind F12	"screenshotJPEG"
 
 // Default controller bindings
-exec default_mp_controller.cfg
+exec default_mp_controller.cfg
diff --git a/iw4x/iw4x_00/ui_mp/controls_multi.menu b/iw4x/iw4x_00/ui_mp/controls_multi.menu
@@ -1,70 +1,73 @@
-#include "ui/menudef.h"
-#include "ui_mp/main.inc"
-#include "ui_mp/pc_options.inc"
-
-#define MENU_NAME									"controls_multi"
-#define MENU_TITLE									"@MENU_CHAT"
-
-#undef CHOICE_GROUP
-#define CHOICE_GROUP								MENU_NAME
-
-#define CLOSE_MENUS \
-	close "main_controls"; \
-	close "main_options"; \
-	close "options_control_defaults"; \
-	close "options_graphics"; \
-	close "options_graphics_defaults"; \
-	close "options_graphics_texture"; \
-	close "options_multi"; \
-	close "options_voice"; \
-	close "pc_options_actions"; \
-	close "pc_options_advanced_video"; \
-	close "pc_options_audio"; \
-	close "pc_options_controls"; \
-	close "pc_options_game"; \
-	close "pc_options_look"; \
-	close "pc_options_movement"; \
-	close "pc_options_multi"; \
-	close "pc_options_video"; \
-	close "pc_options_voice";
-
-#define ON_MENU_OPEN \
-	CLOSE_MENUS										\
-	setLocalVarBool									"ui_hideBack" (1); \
-	setLocalVarBool									ui_hint_display 0;
-
-#define ON_MENU_CLOSE \
-	setLocalVarBool									"ui_hideBack" (0); \
-	open											"pc_options_controls";
-
-#define ON_MENU_ESC \
-	close											self;
-
-menuDef
-{
-	name											MENU_NAME
-	rect											0 0 640 480
-	foreColor										CHOICE_TEXTCOLOR
-	focusColor										CHOICE_TEXTCOLOR
-	blurWorld										7
-
-	MENU_ON_OPEN(ON_MENU_OPEN)
-	MENU_ON_CLOSE(ON_MENU_CLOSE)
-	MENU_ON_ESC(ON_MENU_ESC)
-
-	#define BACKGROUND_PC_OPTIONS
-	#define BACKGROUND_IW4
-	#define DISABLE_SIDEBAR
-	#define BACKGROUND_FULL
-	#include "ui_mp/bg.inc"
-
-	PC_OPTIONS_SECTION_TITLE(MENU_TITLE)
-
-	PC_OPTIONS_KEYBINDING(0, "@MENU_TEXT_CHAT", "chatmodepublic")
-	PC_OPTIONS_KEYBINDING(1, "@MENU_TEXT_TEAM_CHAT", "chatmodeteam")
-	PC_OPTIONS_KEYBINDING(2, "@MENU_QUICK_CHAT", "mp_QuickMessage")
-
-	PC_OPTIONS_KEYBINDSTATUS
-
-	ITEM_BUTTON_BACK(ON_MENU_ESC)
+#include "ui/menudef.h"
+#include "ui_mp/main.inc"
+#include "ui_mp/pc_options.inc"
+
+#define MENU_NAME									"controls_multi"
+#define MENU_TITLE									"@MENU_CHAT"
+
+#undef CHOICE_GROUP
+#define CHOICE_GROUP								MENU_NAME
+
+#define CLOSE_MENUS \
+	close "main_controls"; \
+	close "main_options"; \
+	close "options_control_defaults"; \
+	close "options_graphics"; \
+	close "options_graphics_defaults"; \
+	close "options_graphics_texture"; \
+	close "options_multi"; \
+	close "options_voice"; \
+	close "pc_options_actions"; \
+	close "pc_options_advanced_video"; \
+	close "pc_options_audio"; \
+	close "pc_options_controls"; \
+	close "pc_options_game"; \
+	close "pc_options_look"; \
+	close "pc_options_movement"; \
+	close "pc_options_multi"; \
+	close "pc_options_video"; \
+	close "pc_options_voice";
+
+#define ON_MENU_OPEN \
+	CLOSE_MENUS										\
+	setLocalVarBool									"ui_hideBack" (1); \
+	setLocalVarBool									ui_hint_display 0;
+
+#define ON_MENU_CLOSE \
+	setLocalVarBool									"ui_hideBack" (0); \
+	open											"pc_options_controls";
+
+#define ON_MENU_ESC \
+	close											self;
+
+menuDef
+{
+	name											MENU_NAME
+	rect											0 0 640 480
+	foreColor										CHOICE_TEXTCOLOR
+	focusColor										CHOICE_TEXTCOLOR
+	blurWorld										7
+
+	MENU_ON_OPEN(ON_MENU_OPEN)
+	MENU_ON_CLOSE(ON_MENU_CLOSE)
+	MENU_ON_ESC(ON_MENU_ESC)
+
+	#define BACKGROUND_PC_OPTIONS
+	#define BACKGROUND_IW4
+	#define DISABLE_SIDEBAR
+	#define BACKGROUND_FULL
+	#include "ui_mp/bg.inc"
+
+	PC_OPTIONS_SECTION_TITLE(MENU_TITLE)
+
+	PC_OPTIONS_KEYBINDING(0, "@MENU_TEXT_CHAT", "chatmodepublic")
+	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)
 }
diff --git a/iw4x/iw4x_00/ui_mp/scriptmenus/callvote.menu b/iw4x/iw4x_00/ui_mp/scriptmenus/callvote.menu
@@ -0,0 +1,57 @@
+#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 "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)
+
+		ITEM_BUTTON_BACK(close "self")
+	}
+}
diff --git a/iw4x/iw4x_00/ui_mp/scriptmenus/changegametype.menu b/iw4x/iw4x_00/ui_mp/scriptmenus/changegametype.menu
@@ -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 "voteTypeMap";
+			}
+        }
+	}
+}