Add localized string for vote

Revert "add working vote menu files"

iw4x/iw4x_00/default_mp.cfg

@@ -7,18 +7,5 @@ exec default_mp_gamesettings.cfg
 
 exec default_filter.cfg
 
-
-
-// ==== all of below should be moved to code ====
-
-set cl_voice 0
-
 // PC - default server settings:
 set scr_game_allowkillcam	1
-
-// disabled - why is this different on PC?
-
-//set ui_buildLocation -60 460 
-// looks better than default
-//set ui_buildLocation -30 20
-set ui_buildLocation -20 15

iw4x/iw4x_00/default_mp_controls.cfg

@@ -58,10 +58,13 @@ bind `			"toggleconsole"
 bind t	"chatmodepublic"
 bind b "mp_QuickMessage" //nightvision is on n now
 bind y	"chatmodeteam"
-//bind z	"+talk"
+bind z	"+talk"
 //bind x	"openscriptmenu ingame changeweapon"
 
 // CLIENT ENVIRONMENT COMMANDS
+bind F1		"vote yes"
+bind F2		"vote no"
+bind F4		"+scores"
 bind F12	"screenshotJPEG"
 
 // Default controller bindings

iw4x/iw4x_00/localizedstrings/iw4x_english.str

@@ -322,6 +322,9 @@ LANG_ENGLISH		"When should the friend status notifications be displayed?"
 REFERENCE			MPUI_DESC_OPTIONS
 LANG_ENGLISH		"Set your game options."
 
+REFERENCE			MPUI_ENABLE_VOICE_CHAT
+LANG_ENGLISH		"Enable Voice Chat"
+
 REFERENCE			MPUI_DESC_QUIT
 LANG_ENGLISH		"Quit the game."
 
@@ -472,6 +475,12 @@ LANG_ENGLISH		"FOV: "
 REFERENCE			MENU_FOV_HINT_PC
 LANG_ENGLISH		"An increased Field of View (FOV), may result in poor performance on older computers."
 
+REFERENCE			MPUI_RULES_AIMASSIST
+LANG_ENGLISH		"Aim Assist"
+
+REFERENCE			MPUI_RULES_VOICECHAT
+LANG_ENGLISH		"Voice Chat"
+
 REFERENCE			MENU_8X
 LANG_ENGLISH		"8x"
 
@@ -955,6 +964,9 @@ LANG_ENGLISH		"Juiced"
 REFERENCE			SPLASHES_COMBATHIGH_DESC
 LANG_ENGLISH		"Move faster for a few seconds after spawning."
 
+REFERENCE			MENU_CHANGE_GAMETYPE
+LANG_ENGLISH		"Change Gametype"
+
 REFERENCE			MENU_GAMEPAD
 LANG_ENGLISH		"Gamepad"
 
@@ -1030,4 +1042,7 @@ LANG_ENGLISH		"^2&&1  ^7Flip icon vertically"
 REFERENCE			FONT_ICON_MODIFIER_LIST_BIG
 LANG_ENGLISH		"^2&&1  ^7Bigger icon"
 
+REFERENCE			GAME_NOTONROTATION
+LANG_ENGLISH		"This map or gamemode is not part of the server rotation"
+
 ENDMARKER

iw4x/iw4x_00/maps/mp/mp_strike.gsc

@@ -0,0 +1,30 @@
+main()
+{
+	maps\mp\mp_strike_precache::main();
+	maps\mp\mp_strike_fx::main();
+	maps\createart\mp_strike_art::main();
+	maps\mp\_load::main();
+	
+	maps\mp\_compass::setupMiniMap( "compass_map_mp_strike" );
+
+	AmbientPlay( "ambient_mp_strike" );
+
+	game["attackers"] = "allies";
+	game["defenders"] = "axis";
+
+	SetDvar( "compassmaxrange", "1900" );
+	SetDvar( "r_specularcolorscale", "1.86" );
+	
+	thread BreakGlass();
+}
+
+BreakGlass()
+{
+	level waittill( "connected" );
+	glass = getGlassArray( "brokenglass01" );
+	
+	foreach( piece in glass )
+	{
+		destroyGlass( piece );
+	}
+}

iw4x/iw4x_00/ui_mp/joinserver.inc

@@ -244,8 +244,10 @@ itemDef
 
 #define TAB_BORDER_COLOR											0.1 0.1 0.12 0.5
 
-#define PASSWORD_WIDTH												20
+#define PASSWORD_WIDTH												30
-#define MATCHTYPE_WIDTH												PASSWORD_WIDTH
+#define MATCHTYPE_WIDTH												20
+#define AIMASSIST_WIDTH												20
+#define VOICECHAT_WIDTH												20
 #define SERVER_WIDTH												208
 #define MAP_WIDTH													70
 #define PLAYERS_WIDTH												50
@@ -262,9 +264,11 @@ itemDef
 #define TABLE_POS_X													0
 #define TABLE_POS_Y													42
 
-#define PASSWORD_POS_X												TABLE_POS_X
+#define PASSWORD_POS_X												(TABLE_POS_X + 5)
 #define MATCHTYPE_POS_X												(TABLE_POS_X + PASSWORD_WIDTH + 2)
-#define SERVER_POS_X												(MATCHTYPE_POS_X + MATCHTYPE_WIDTH + 2)
+#define AIMASSIST_POS_X												(MATCHTYPE_POS_X + MATCHTYPE_WIDTH + 2)
+#define VOICECHAT_POS_X												(AIMASSIST_POS_X + AIMASSIST_WIDTH + 2)
+#define SERVER_POS_X												(VOICECHAT_POS_X + VOICECHAT_WIDTH + 2)
 #define MAP_POS_X													(SERVER_POS_X + SERVER_WIDTH + 2)
 #define PLAYERS_POS_X												(MAP_POS_X + MAP_WIDTH + 2)
 #define TYPE_POS_X													(PLAYERS_POS_X + PLAYERS_WIDTH + 2)
@@ -319,6 +323,8 @@ itemDef
 
 #define PASSWORD_ORIGIN												PASSWORD_POS_X			(TABLE_POS_Y + 2)
 #define MATCHTYPE_ORIGIN											MATCHTYPE_POS_X			(TABLE_POS_Y + 2)
+#define AIMASSIST_ORIGIN											AIMASSIST_POS_X			(TABLE_POS_Y + 2)
+#define VOICECHAT_ORIGIN											VOICECHAT_POS_X			(TABLE_POS_Y + 2)
 #define SERVER_ORIGIN												SERVER_POS_X			(TABLE_POS_Y + 2)
 #define MAP_ORIGIN													MAP_POS_X				(TABLE_POS_Y + 2)
 #define PLAYERS_ORIGIN												PLAYERS_POS_X			(TABLE_POS_Y + 2)
@@ -328,6 +334,8 @@ itemDef
 
 #define PASSWORD_RECT												PASSWORD_ORIGIN			PASSWORD_WIDTH		TABLE_HEIGHT		HORIZONTAL_ALIGN_SUBLEFT VERTICAL_ALIGN_TOP
 #define MATCHTYPE_RECT												MATCHTYPE_ORIGIN		MATCHTYPE_WIDTH		TABLE_HEIGHT		HORIZONTAL_ALIGN_SUBLEFT VERTICAL_ALIGN_TOP
+#define AIMASSIST_RECT												AIMASSIST_ORIGIN		AIMASSIST_WIDTH		TABLE_HEIGHT		HORIZONTAL_ALIGN_SUBLEFT VERTICAL_ALIGN_TOP
+#define VOICECHAT_RECT												VOICECHAT_ORIGIN		VOICECHAT_WIDTH		TABLE_HEIGHT		HORIZONTAL_ALIGN_SUBLEFT VERTICAL_ALIGN_TOP
 #define SERVER_RECT													SERVER_ORIGIN			SERVER_WIDTH		TABLE_HEIGHT		HORIZONTAL_ALIGN_SUBLEFT VERTICAL_ALIGN_TOP
 #define MAP_RECT													MAP_ORIGIN				MAP_WIDTH			TABLE_HEIGHT		HORIZONTAL_ALIGN_SUBLEFT VERTICAL_ALIGN_TOP
 #define PLAYERS_RECT												PLAYERS_ORIGIN			PLAYERS_WIDTH		TABLE_HEIGHT		HORIZONTAL_ALIGN_SUBLEFT VERTICAL_ALIGN_TOP
@@ -355,6 +363,8 @@ MENU_BACKGROUND_FRAME_DROP_SHADOW(TABLE_POS_X, (TABLE_POS_Y + TABLE_HEIGHT), TAB
 	}
 
 PREPROC_COLUMN_SEPERATOR_LINE("lineMatchtype", (MATCHTYPE_POS_X - 2) (TABLE_POS_Y + 2))
+PREPROC_COLUMN_SEPERATOR_LINE("lineAimAssist", (AIMASSIST_POS_X - 2) (TABLE_POS_Y + 2))
+PREPROC_COLUMN_SEPERATOR_LINE("lineVoiceChat", (VOICECHAT_POS_X - 2) (TABLE_POS_Y + 2))
 PREPROC_COLUMN_SEPERATOR_LINE("lineServer", (SERVER_POS_X - 2) (TABLE_POS_Y + 2))
 PREPROC_COLUMN_SEPERATOR_LINE("lineMap", (MAP_POS_X - 2) (TABLE_POS_Y + 2))
 PREPROC_COLUMN_SEPERATOR_LINE("linePlayers", (PLAYERS_POS_X - 2) (TABLE_POS_Y + 2))
@@ -378,8 +388,10 @@ itemDef
 	elementWidth													120
 	elementHeight													16
 //	numcols			xpos							xwidth					textlen			alignment
-	columns 8		(PASSWORD_POS_X + 1)			16						20				1
+	columns 10		(PASSWORD_POS_X + 1)			16						10				1
 					(MATCHTYPE_POS_X - 2)			16						10				1
+					(AIMASSIST_POS_X - 2)			16						10				1
+					(VOICECHAT_POS_X - 2)			16						10				1
 					(SERVER_POS_X + 1)				SERVER_WIDTH			38				0
 					(MAP_POS_X + 1)					MAP_WIDTH				25				0
 					(PLAYERS_POS_X + 1)				PLAYERS_WIDTH			10				0
@@ -412,6 +424,8 @@ itemDef
 		setItemColor												grpTabs foreColor 1 0.8 0.4 1;
 		setItemColor												passwordicon foreColor 1 1.0 0.5 1;
 		setItemColor												matchtypeicon foreColor 1 1 1 1;
+		setItemColor												aimassisticon foreColor 1 1 1 1;
+		setItemColor												voicechaticon foreColor 1 1 1 1;
 	}
 }
 itemDef
@@ -420,7 +434,7 @@ itemDef
 	rect															PASSWORD_ORIGIN 16 16 HORIZONTAL_ALIGN_SUBLEFT VERTICAL_ALIGN_TOP
 	origin															2 2
 	style															WINDOW_STYLE_SHADER
-	background														"hud_server_locked"
+	background														"cardicon_locked"
 	decoration
 	visible															1
 }
@@ -441,6 +455,8 @@ itemDef
 		setItemColor												grpTabs foreColor 1 0.8 0.4 1;
 		setItemColor												matchtypeicon foreColor 1 1.0 0.5 1;
 		setItemColor												passwordicon foreColor 1 1 1 1;
+		setItemColor												aimassisticon foreColor 1 1 1 1;
+		setItemColor												voicechaticon foreColor 1 1 1 1;
 	}
 }
 itemDef
@@ -454,6 +470,68 @@ itemDef
 	visible															1
 }
 
+itemDef
+{
+	name															"aimassist"
+	group															grpTabs
+	rect															AIMASSIST_RECT
+	type															ITEM_TYPE_BUTTON
+	style															WINDOW_STYLE_FILLED
+	foreColor														1 0.8 0.4 1
+	visible															1
+	action
+	{
+		play														CHOICE_CLICK_SOUND;
+		uiScript													"ServerSort" 2;
+		setItemColor												grpTabs foreColor 1 0.8 0.4 1;
+		setItemColor												aimassisticon foreColor 1 1.0 0.5 1;
+		setItemColor												passwordicon foreColor 1 1 1 1;
+		setItemColor												matchtypeicon foreColor 1 1 1 1;
+		setItemColor												voicechaticon foreColor 1 1 1 1;
+	}
+}
+itemDef
+{
+	name															"aimassisticon"
+	rect															AIMASSIST_ORIGIN 16 16 HORIZONTAL_ALIGN_SUBLEFT VERTICAL_ALIGN_TOP
+	origin															0 2
+	style															WINDOW_STYLE_SHADER
+	background														"cardicon_headshot"
+	decoration
+	visible															1
+}
+
+itemDef
+{
+	name															"voicechat"
+	group															grpTabs
+	rect															VOICECHAT_RECT
+	type															ITEM_TYPE_BUTTON
+	style															WINDOW_STYLE_FILLED
+	foreColor														1 0.8 0.4 1
+	visible															1
+	action
+	{
+		play														CHOICE_CLICK_SOUND;
+		uiScript													"ServerSort" 3;
+		setItemColor												grpTabs foreColor 1 0.8 0.4 1;
+		setItemColor												voicechaticon foreColor 1 1.0 0.5 1;
+		setItemColor												passwordicon foreColor 1 1 1 1;
+		setItemColor												matchtypeicon foreColor 1 1 1 1;
+		setItemColor												aimassisticon foreColor 1 1 1 1;
+	}
+}
+itemDef
+{
+	name															"voicechaticon"
+	rect															VOICECHAT_ORIGIN 16 16 HORIZONTAL_ALIGN_SUBLEFT VERTICAL_ALIGN_TOP
+	origin															0 2
+	style															WINDOW_STYLE_SHADER
+	background														"talkingicon"
+	decoration
+	visible															1
+}
+
 itemDef
 {
 	name															"server"
@@ -470,10 +548,12 @@ itemDef
 	action
 	{
 		play														CHOICE_CLICK_SOUND;
-		uiScript													"ServerSort" 2;
+		uiScript													"ServerSort" 4;
 		setItemColor												grpTabs foreColor 1 0.8 0.4 1;
 		setItemColor												matchtypeicon foreColor 1 1 1 1;
 		setItemColor												passwordicon foreColor 1 1 1 1;
+		setItemColor												aimassisticon foreColor 1 1 1 1;
+		setItemColor												voicechaticon foreColor 1 1 1 1;
 		setitemColor												self foreColor 1 1.0 0.5 1;
 	}
 }
@@ -494,10 +574,12 @@ itemDef
 	action
 	{
 		play														CHOICE_CLICK_SOUND;
-		uiScript													"ServerSort" 3;
+		uiScript													"ServerSort" 5;
 		setItemColor												grpTabs foreColor 1 0.8 0.4 1;
 		setItemColor												matchtypeicon foreColor 1 1 1 1;
 		setItemColor												passwordicon foreColor 1 1 1 1;
+		setItemColor												aimassisticon foreColor 1 1 1 1;
+		setItemColor												voicechaticon foreColor 1 1 1 1;
 		setitemColor												self foreColor 1 1.0 0.5 1;
 	}
 }
@@ -518,10 +600,12 @@ itemDef
 	action
 	{
 		play														CHOICE_CLICK_SOUND;
-		uiScript													"ServerSort" 4;
+		uiScript													"ServerSort" 6;
 		setItemColor												grpTabs foreColor 1 0.8 0.4 1;
 		setItemColor												matchtypeicon foreColor 1 1 1 1;
 		setItemColor												passwordicon foreColor 1 1 1 1;
+		setItemColor												aimassisticon foreColor 1 1 1 1;
+		setItemColor												voicechaticon foreColor 1 1 1 1;
 		setitemColor												self foreColor 1 1.0 0.5 1;
 	}
 }
@@ -542,10 +626,12 @@ itemDef
 	action
 	{
 		play														CHOICE_CLICK_SOUND;
-		uiScript													"ServerSort" 5;
+		uiScript													"ServerSort" 7;
 		setItemColor												grpTabs foreColor 1 0.8 0.4 1;
 		setItemColor												matchtypeicon foreColor 1 1 1 1;
 		setItemColor												passwordicon foreColor 1 1 1 1;
+		setItemColor												aimassisticon foreColor 1 1 1 1;
+		setItemColor												voicechaticon foreColor 1 1 1 1;
 		setitemColor												self foreColor 1 1.0 0.5 1;
 	}
 }
@@ -566,10 +652,12 @@ itemDef
 	action
 	{
 		play														CHOICE_CLICK_SOUND;
-		uiScript													"ServerSort" 6;
+		uiScript													"ServerSort" 8;
 		setItemColor												grpTabs foreColor 1 0.8 0.4 1;
 		setItemColor												matchtypeicon foreColor 1 1 1 1;
 		setItemColor												passwordicon foreColor 1 1 1 1;
+		setItemColor												aimassisticon foreColor 1 1 1 1;
+		setItemColor												voicechaticon foreColor 1 1 1 1;
 		setitemColor												self foreColor 1 1.0 0.5 1;
 	}
 }
@@ -590,10 +678,12 @@ itemDef
 	action
 	{
 		play														CHOICE_CLICK_SOUND;
-		uiScript													"ServerSort" 7;
+		uiScript													"ServerSort" 9;
 		setItemColor												grpTabs foreColor 1 0.8 0.4 1;
 		setItemColor												matchtypeicon foreColor 1 1 1 1;
 		setItemColor												passwordicon foreColor 1 1 1 1;
+		setItemColor												aimassisticon foreColor 1 1 1 1;
+		setItemColor												voicechaticon foreColor 1 1 1 1;
 		setitemColor												self foreColor 1 1.0 0.5 1;
 	}
 }

iw4x/iw4x_00/ui_mp/main_text.menu

@@ -101,7 +101,8 @@
 		MENU_CHOICE_BUTTON_VIS(10, button_10, "@MENU_SP_CREDITS_CAPS", open iw4x_credits;, "@NULL_EMPTY", 1)
 		MENU_CHOICE_BUTTON_VIS(11, button_11, "@MENU_VISIT_WEBSITE_CAPS", uiScript "visitWebsite", "@NULL_EMPTY", 1)
 		MENU_CHOICE_HORIZONTAL_LINE_VIS(12, 1)
-		MENU_CHOICE_BUTTON_VIS(12, button_12, "@MENU_QUIT_CAPS", open quit_popmenu;, "@MPUI_DESC_QUIT", 1)
+		MENU_CHOICE_BUTTON_VIS(12, button_12, "@MENU_MAIN_MENU_CAPS", open single_popmenu;, "@MENU_SP_DESC_SINGLEPLAYER", 1)
+		MENU_CHOICE_BUTTON_VIS(13, button_13, "@MENU_QUIT_CAPS", open quit_popmenu;, "@MPUI_DESC_QUIT", 1)
 
 		ITEM_BUTTON_FRIENDS(-250)
 
@@ -143,7 +144,7 @@
 		itemDef
 		{
 			name					"hint_area"
-			rect					0 400 215 18 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
+			rect					0 380 215 18 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
 			foreColor				1 1 1 0.65
 			textAlign				6
 			textScale				CHOICE_TEXTSIZE

iw4x/iw4x_00/ui_mp/pc_options_audio.menu

@@ -78,4 +78,7 @@ menuDef
 
 	PC_OPTIONS_DVARSLIDER_RAW(0, "@MENU_MASTER_VOLUME", "snd_volume", 0, 1, 0, ;, ;, ;, when(0), 1, 1)
 	PC_OPTIONS_STRLIST_RAW(1, "@MENU_SPEAKER_CONFIG", "ui_outputConfig", {"@MENU_WINDOWS_DEFAULT"; "Windows default"; "@MENU_MONO"; "Mono"; "@MENU_STEREO"; "Stereo"; "@MENU_FOUR_SPEAKERS"; "4 speakers"; "@MENU_FIVE_ONE_SPEAKERS"; "5.1 speakers"}, setLocalVarBool "ui_showAudioApply" (1);, ;, when((dvarBool("cl_ingame") || dvarBool("sv_running") || inlobby())), 1)
+	PC_OPTIONS_SEPERATOR(1)
+	PC_OPTIONS_DVARYESNO(2, "@MPUI_ENABLE_VOICE_CHAT", "cl_voice", ;, when(0))
+	PC_OPTIONS_KEYBINDING(3, "@MENU_VOICE_CHAT_BUTTON", "+talk")
 }

iw4x/iw4x_00/ui_mp/scriptmenus/class.menu

@@ -451,7 +451,47 @@
 		}
 		itemDef
 		{
-			rect 0 68 216 1 1 1
+			name "game_options"
+			rect -64 68 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 "@MPUI_MUTE_PLAYERS"
+			action
+			{
+				play "mouse_click";
+				close self;
+				open "muteplayer";
+			}
+			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
+		{
+			rect 0 88 216 1 1 1
 			decoration
 			visible 1
 			style 3
@@ -462,7 +502,7 @@
 		itemDef
 		{
 			name "game_options"
-			rect -64 68 336 20 1 1
+			rect -64 88 336 20 1 1
 			visible 1
 			group "mw2_button"
 			style 1
@@ -503,7 +543,7 @@
 		itemDef
 		{
 			name "game_options"
-			rect -64 88 336 20 1 1
+			rect -64 108 336 20 1 1
 			visible 1
 			group "mw2_button"
 			style 1
@@ -515,14 +555,12 @@
 			textalign 6
 			textalignx -60
 			textscale 0.375
-			//text "@MPUI_MUTE_PLAYERS"
 			disabled when(dvarBool("party_host"))
 			text "@MENU_ADD_TO_FAVORITES"
 			action
 			{
 				play "mouse_click";
 				close self;
-				//open "muteplayer";
 				uiScript "CreateCurrentServerFavorite";
 			}
 			onFocus
@@ -546,7 +584,7 @@
 		itemDef
 		{
 			name "game_endgame"
-			rect -64 108 336 20 1 1
+			rect -64 128 336 20 1 1
 			visible 1
 			group "mw2_button"
 			style 1
@@ -586,7 +624,7 @@
 		itemDef
 		{
 			name "game_leavegame"
-			rect -64 108 336 20 1 1
+			rect -64 128 336 20 1 1
 			visible 1
 			group "mw2_button"
 			style 1

iw4x/iw4x_00/ui_mp/serverinfo_popmenu.menu

@@ -206,8 +206,8 @@ menuDef
 	SV_INFO_FIELD(1, "@MPUI_MAX_CLIENTS", dvarString("uiSi_MaxClients"))
 	SV_INFO_FIELD(2, "@MPUI_IS_PRIVATE", dvarString("uiSi_isPrivate"))
 	SV_INFO_FIELD(3, "@MPUI_RULES_HARDCORE", dvarString("uiSi_Hardcore"))
-	SV_INFO_FIELD(4, "@MPUI_RULES_KILLCAM", dvarString("uiSi_KillCam"))
+	SV_INFO_FIELD(4, "@MPUI_RULES_AIMASSIST", dvarString("uiSi_aimAssist"))
-	SV_INFO_FIELD(5, "@MPUI_RULES_FRIENDLY_FIRE", dvarString("uiSi_ffType"))
+	SV_INFO_FIELD(5, "@MPUI_RULES_VOICECHAT", dvarString("uiSi_voiceChat"))
 	SV_INFO_FIELD(6, "@MPUI_MOD", dvarString("uiSi_ModName"))
 
 	SV_INFO_MAP_PREVIEW_VIS(("loadscreen_mp_bonusmaps"), when(dvarString("uiSi_MapName") == ""))