fix: add missing localized strings

Co-authored-by: Louvenarde <louve@louve.systems>
Co-authored-by: Roxanne <roxanne@thegamebakers.com>

.github/workflows/release.yml

@@ -8,10 +8,13 @@ jobs:
     name: Create GitHub Release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v3.3.0
         with:
           fetch-depth: 1
-      - run: 'bash ${GITHUB_WORKSPACE}/scripts/release.sh'
+      - name: Create ZIP archive
+        run: './scripts/release.sh'
+        shell: bash
+ 
       - uses: marvinpinto/action-automatic-releases@latest
         with:
           repo_token: '${{ secrets.GITHUB_TOKEN }}'

iw4x/iw4x_00/bots.txt

@@ -1,18 +1,18 @@
-/dev/../
-/dev/console
-/dev/full
-/dev/random
-/dev/sdb
-/dev/sr0
-/dev/tty0
-/dev/urandom
-Diamante
-Doctor
-Dss0
-Jimbo
-Laupetin
-Louvenarde
-lsb_release -a
-Lunarion
-RektInator
-Snake
+/dev/../,BOT
+/dev/console,BOT
+/dev/full,BOT
+/dev/random,BOT
+/dev/sdb,BOT
+/dev/sr0,BOT
+/dev/tty0,BOT
+/dev/urandom,BOT
+Diamante,BOT
+Doctor,BOT
+Dss0,BOT
+Jimbo,BOT
+Laupetin,BOT
+Louvenarde,BOT
+lsb_release -a,BOT
+Lunarion,BOT
+RektInator,BOT
+Snake,BOT

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

@@ -196,6 +196,9 @@ LANG_ENGLISH		"The Only Easy Day... Was Yesterday"
 REFERENCE			MPUI_NUKED
 LANG_ENGLISH		"Nuketown"
 
+REFERENCE			MPUI_IW4_TEST_MAP
+LANG_ENGLISH		"IW4 Test Map"
+
 REFERENCE			MPUI_DESC_MAP_NUKED
 LANG_ENGLISH		"A deserted nuke testing facility used in the Cold War."
 
@@ -271,6 +274,9 @@ LANG_ENGLISH		"x2 Bonus!"
 REFERENCE			SPLASHES_TEAM_ASSIST
 LANG_ENGLISH		"Team Assist!"
 
+REFERENCE			MENU_NATIVECURSOR
+LANG_ENGLISH		"Display native cursor"
+
 REFERENCE			MENU_MODS
 LANG_ENGLISH		"Mods"
 
@@ -322,6 +328,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 +481,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 +970,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 +1048,100 @@ 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"
+
+REFERENCE			MENU_LOADING_MAPS
+LANG_ENGLISH		"Loading map selection..."
+
+REFERENCE			MPUI_SEATOWN
+LANG_ENGLISH		"Seatown"
+
+REFERENCE			MPUI_RESISTANCE
+LANG_ENGLISH		"Resistance"
+
+REFERENCE			MPUI_ARKADEN
+LANG_ENGLISH		"Arkaden"
+
+REFERENCE			MPUI_HARDHAT
+LANG_ENGLISH		"Hardhat"
+
+REFERENCE			MPUI_MISSION
+LANG_ENGLISH		"Mission"
+
+REFERENCE			MPUI_VILLAGE
+LANG_ENGLISH		"Village"
+
+REFERENCE			MPUI_DOME
+LANG_ENGLISH		"Dome"
+
+REFERENCE			MPUI_LOCKDOWN
+LANG_ENGLISH		"Lockdown"
+
+REFERENCE			MPUI_UNDERGROUND
+LANG_ENGLISH		"Underground"
+
+REFERENCE			MPUI_DESC_MAP_UNDERGROUND
+LANG_ENGLISH		"Small subway station. Fast paced action both inside and out."
+
+REFERENCE			MPUI_DESC_MAP_MISSION
+LANG_ENGLISH		"African colonial settlement. Fight to control the center."
+
+REFERENCE			MPUI_DESC_MAP_VILLAGE
+LANG_ENGLISH		"Large African village. Great for all game modes."
+
+REFERENCE			MPUI_DESC_MAP_DOME
+LANG_ENGLISH		"Small outpost in the desert. Fast and frantic action."
+
+REFERENCE			MPUI_DESC_MAP_HARDHAT
+LANG_ENGLISH		"A small construction site. Fast paced, close quarter action."
+
+REFERENCE			MPUI_DESC_MAP_ARKADEN
+LANG_ENGLISH		"Medium sized German mall. Intense Search & Destroy games."
+
+REFERENCE			MPUI_DESC_MAP_RESISTANCE
+LANG_ENGLISH		"Parisian district. Great for Domination and Kill Confirmed."
+
+REFERENCE			MPUI_DESC_MAP_SEATOWN
+LANG_ENGLISH		"A coastal town.  Narrow streets bring hectic, close encounters."
+
+REFERENCE			MPUI_DESC_MAP_LOCKDOWN
+LANG_ENGLISH		"European city center. Great for Team Defender."
+
+REFERENCE			PATCH_DLC1
+LANG_ENGLISH		"Stimulus maps"
+
+REFERENCE			PATCH_DESC_DLC1
+LANG_ENGLISH		"The Modern Warfare 2 Stimulus Package delivers additional action-packed multiplayer maps, including brand-new battlegrounds and legendary fan-favorites from Call of Duty 4: Modern Warfare."
+
+REFERENCE			PATCH_DLC2
+LANG_ENGLISH		"Resurgence maps"
+
+REFERENCE			PATCH_DESC_DLC2
+LANG_ENGLISH		"The best-selling first-person action game of all time gets even bigger with more epic new multiplayer content! The Modern Warfare 2 Resurgence Pack delivers five incredible new multiplayer maps. Take the action to exciting new locations, then battle across legendary landscapes from Call of Duty 4: Modern Warfare."
+
+REFERENCE			PATCH_IW4X_DLC
+LANG_ENGLISH		"IW4x Classics"
+
+REFERENCE			PATCH_DESC_IW4X_DLC
+LANG_ENGLISH		"Original IW4x DLC containing several maps from Call Of Duty: Online"
+
+REFERENCE			PATCH_COD4_DLC
+LANG_ENGLISH		"Call Of Duty 4 Pack"
+
+REFERENCE			PATCH_DESC_COD4_DLC
+LANG_ENGLISH		"Call Of Duty 4 maps ported to IW4x by the team"
+
+REFERENCE			PATCH_MW3_DLC
+LANG_ENGLISH		"Modern Warfare 3 Pack"
+
+REFERENCE			PATCH_DESC_MW3_DLC
+LANG_ENGLISH		"Modern Warfare 3 maps ported to IW4x by the team"
+
+REFERENCE			CUSTOM_MAPS_DLC
+LANG_ENGLISH		"Custom maps"
+
+REFERENCE			DESC_CUSTOM_MAPS_DLC
+LANG_ENGLISH		"Downloaded maps that are placed in the /usermaps subfolder"
+
 ENDMARKER

iw4x/iw4x_00/maps/animated_models/foliage_tree_palm_bushy_3.gsc

@@ -1,12 +0,0 @@
-#include common_scripts\utility;
-
-#using_animtree( "animated_props" );
-main()
-{
-	if( !isdefined ( level.anim_prop_models ) )
-		level.anim_prop_models = [];
-
-	model = "foliage_tree_palm_bushy_3";
-
-	level.anim_prop_models[ model ] = "palmtree_tall3_sway_tropical";
-}

iw4x/iw4x_00/maps/createfx/mp_bloc_fx.gsc

@@ -4,93 +4,6 @@
 
 main()
 {	
-
-	/*
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( 1075.8, -5820.69, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( -1653.67, -5368.75, 396.635 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( 3051.45, -6605.11, 304.969 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( -344.3, -6547.2, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( -669.6, -3669.6, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( -107.2, -5224.7, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( 2612.1, -5740.3, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( 4908.1, -7834.4, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( 1411.6, -8023.9, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( 4899.7, -6132.9, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( 4114.7, -8103.2, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( -3121.6, -5982.4, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( -3836.9, -4272.9, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	
-	ent = createOneshotEffect( "snow_light" );
-	ent.v[ "origin" ] = ( -2246.9, -3003.3, 408.498 );
-	ent.v[ "angles" ] = ( 270, 0, 0 );
-	ent.v[ "fxid" ] = "snow_light";
-	ent.v[ "delay" ] = -15;
-	*/
-	
 	ent = createOneshotEffect( "hallway_smoke" );
 	ent.v[ "origin" ] = ( 1550.76, -4958.51, 189.125 );
 	ent.v[ "angles" ] = ( 358, 180, 180 );

iw4x/iw4x_00/maps/mp/iw4_credits.gsc

@@ -2,20 +2,14 @@
 
 main()
 {
-
- 
 	maps\mp\_load::main();
 
-
-
- 
 	game[ "attackers" ] = "allies";
 	game[ "defenders" ] = "axis";
 
 	maps\mp\_compass::setupMiniMap( "compass_map_hunted" );
 	setdvar( "compassmaxrange", "4000" );
 
- 
 	array_thread( getentarray( "compassTriggers", "targetname" ), ::compass_triggers_think );
 
 }
@@ -25,11 +19,10 @@ self_delete()
 	self delete();
 }
 
-
 compass_triggers_think()
 {
 	assertex( isdefined( self.script_noteworthy ), "compassTrigger at " + self.origin + " needs to have a script_noteworthy with the name of the minimap to use" );
-        while( true )
+	while ( true )
 	{
 		wait( 1 );
 		self waittill( "trigger" );
@@ -40,11 +33,13 @@ compass_triggers_think()
 createSpawnpoint( classname, origin, yaw )
 {
 	spawnpoint = spawn( "script_origin", origin );
-        spawnpoint.angles = (0,yaw,0);
+	spawnpoint.angles = ( 0, yaw, 0 );
 
 	if ( !isdefined( level.extraspawnpoints ) )
 		level.extraspawnpoints = [];
+
 	if ( !isdefined( level.extraspawnpoints[classname] ) )
 		level.extraspawnpoints[classname] = [];
+
 	level.extraspawnpoints[classname][ level.extraspawnpoints[classname].size ] = spawnpoint;
 }

iw4x/iw4x_00/maps/mp/mp_farm.gsc

@@ -4,16 +4,14 @@ main()
 	maps\createart\mp_farm_art::main();
 	maps\mp\_load::main();
 
-	maps\mp\_compass::setupMiniMap("compass_map_mp_farm");
+	maps\mp\_compass::setupMiniMap( "compass_map_mp_farm" );
 
-	//setExpFog(300, 1400, 0.5, 0.5, 0.5, 1.0, 0);
-	ambientPlay("ambient_farm");
-	//VisionSetNaked( "mp_farm" );
+	ambientPlay( "ambient_farm" );
 
 	game["attackers"] = "allies";
 	game["defenders"] = "axis";
 
-	setdvar( "r_specularcolorscale", "5" );
+	setdvar( "r_specularcolorscale", 1.279588 ); // Set by iw3xport
 
 	setdvar("compassmaxrange","2000");
 }

iw4x/iw4x_00/maps/mp/mp_firingrange.d3dbsp.ents

@@ -934,38 +934,6 @@
 "script_specialopsname" "mp_firingrange"
 "spawnflags" "1"
 }
-// open the metal door
-/*{
-"model" "*23"
-"origin" "993 -30 33"
-"classname" "script_brushmodel"
-"script_specialopsname" "coop_survival_mp_firingrange"
-}
-{
-"model" "*24"
-"origin" "1033 -11 33"
-"classname" "script_brushmodel"
-"script_specialopsname" "mp_firingrange"
-}
-{
-"model" "*25"
-"origin" "906 -60 33"
-"classname" "script_brushmodel"
-"script_specialopsname" "coop_survival_mp_firingrange"
-"spawnflags" "1"
-}
-{
-"model" "*26"
-"origin" "910 -61 33"
-"classname" "script_brushmodel"
-"script_noteworthy" "hdrportal"
-}
-{
-"model" "*27"
-"origin" "1941 2231 18"
-"classname" "script_brushmodel"
-"script_noteworthy" "hdrportal"
-}*/
 {
 "gndLt" "5352548a01"
 "ltOrigin" "1743 2422.5 -20.2041"
@@ -1826,19 +1794,6 @@
 "spawnflags" "1"
 }
 {
-"gndLt" "1a16150000"
-"ltOrigin" "-420.117 767.141 -32.7392"
-"angles" "0 185.2 0"
-"classname" "script_model"
-"targetname" "destructible_toy"
-"model" "dest_propanetanks_02_d0"
-"origin" "-420.8 766.8 -48"
-"csv_include" "destructible_propane_tanks02"
-"destructible_type" "toy_propane_tanks_02"
-"sound_csv_include" "destruct_oxygen_tank"
-"destructibledef" "dest_propanetanks_02"
-}
-{
 "gndLt" "231f1d0000"
 "ltOrigin" "-536.4 933.9 -20.8741"
 "angles" "0 13 0"

iw4x/iw4x_00/maps/mp/mp_firingrange.gsc

@@ -11,11 +11,14 @@ main()
 	
 	maps\mp\_explosive_barrels::main();
 
+	game[ "attackers" ] = "axis";
+	game[ "defenders" ] = "allies";
+	
 	ambientPlay( "ambient_mp_estate" );
 	
 	maps\mp\_compass::setupMiniMap("compass_map_mp_firingrange");
 	
-	setdvar ( "r_diffusecolorscale", "1.5");
+	setDvar ( "r_diffusecolorscale", "1.5");
 
 	/****** GET ENTITIES ******/
 	//TRIGGERS
@@ -157,13 +160,13 @@ main()
 triggerCheck(target)
 {
 	self endon("game_ended");
-	while(1)
+	while (1)
 	{
 		self waittill("trigger", player);
 
 		//If the target is close enough to the player to cause a possible issue, tell the target to go back the other direction.
 		distance = Distance(target.origin, self.origin);
-		if(distance <= 90)
+		if (distance <= 90)
 		{
 			if( isDefined(target.triggeroff))
 				target.triggeroff = false; //Stop the target.

iw4x/iw4x_00/maps/mp/mp_shipment.gsc

@@ -5,9 +5,10 @@ main()
 	maps\createfx\mp_shipment_fx::main();
 	maps\mp\_load::main();
 	
-	maps\mp\_compass::setupMiniMap("compass_map_mp_shipment");
+	maps\mp\_compass::setupMiniMap( "compass_map_mp_shipment" );
 	
-	ambientPlay("ambient_trainer_ext2"); //TODO: get proper ambient
+	// TODO: get proper ambient
+	ambientPlay("ambient_trainer_ext2");
 
 	game["attackers"] = "axis";
 	game["defenders"] = "allies";
@@ -15,151 +16,5 @@ main()
 	setdvar( "r_specularcolorscale", "1.7" );
 	setdvar( "r_diffusecolorscale", "1.3" );
 
-	setdvar("compassmaxrange","1400");
-	
-	level thread deleteChaModels();
-}
-
-deleteChaModels()
-{	
-	count = 0;
-	count2 = 0;
-	count3 = 0;
-	globalIntermission = getEntArray ( "mp_global_intermission", "targetname" );
-	dmSpawns = getEntArray ( "mp_dm_spawn", "targetname" );
-	domSpawns = getEntArray ( "mp_dom_spawn", "targetname" );
-	tdmSpawns = getEntArray ( "mp_tdm_spawn", "targetname" );
-
-	// ---- DEFINING GAMETYPE OBJECTS ----
-	
-	universalExploderAB = getEntArray ( "exploder", "targetname" );
-	
-	// - CTF -
-	flagRemoveAllies = getEntArray ( "ctf_flag_allies", "targetname" );
-	flagTrigRemoveAllies = getEntArray ( "ctf_trig_allies", "targetname" );
-	flagZoneRemoveAllies = getEntArray ( "ctf_zone_allies", "targetname" );
-	flagRemoveAxis = getEntArray ( "ctf_flag_axis", "targetname" );
-	flagTrigRemoveAxis = getEntArray ( "ctf_trig_axis", "targetname" );
-	flagZoneRemoveAxis = getEntArray ( "ctf_zone_axis", "targetname" );
-	
-	// - DD -
-	ddbombzonesTouchAB = getEntArray ( "dd_bombzone", "targetname" );
-	ddbombzonesModelA = getEntArray ( "pf408_auto1", "targetname" ) ;
-	ddbombzonesTrigA = getEntArray ( "pf408_auto2", "targetname" );
-	ddbombzonesModelB = getEntArray ( "pf409_auto1", "targetname" ) ;
-	ddbombzonesTrigB = getEntArray ( "pf409_auto2", "targetname" );
-	ddbombzonesCollA = getEntArray ( "dd_bombzone_clip_a", "targetname" );
-	ddbombzonesCollB = getEntArray ( "dd_bombzone_clip_b", "targetname" );
-	
-	// - Dom -
-	flagPrimary = getEntArray ( "flag_primary", "targetname" );
-	flagDescriptor = getEntArray ("flag_descriptor", "targetname" );
-	
-	// - Sab -
-	sabbombzonesColl = getEntArray ( "sab_bomb_col", "targetname" );
-	sabbombzonesTouchAllies = getEntArray ( "sab_bomb_allies", "targetname" );
-	sabbombzonesDefuseAllies = getEntArray ( "sab_bomb_defuse_allies", "targetname" );
-	sabbombzonesSiteModelAllies = getEntArray ( "pf397_auto1", "targetname" );
-	sabbombzonesTouchAxis = getEntArray ( "sab_bomb_axis", "targetname" );
-	sabbombzonesDefuseAxis = getEntArray ( "sab_bomb_defuse_axis", "targetname" );
-	sabbombzonesSiteModelAxis = getEntArray ( "pf398_auto1", "targetname" );
-	
-	// - SnD -
-	bombzonesTouchAB = getEntArray ( "bombzone", "targetname" );
-	bombzonesCollAB = getEntArray ( "bomb_col", "targetname" );
-	bombzonesModelA = getEntArray ( "pf393_auto1", "targetname" );
-	bombzonesTrigA = getEntArray ( "pf393_auto2", "targetname" );
-	bombzonesModelB = getEntArray ( "pf394_auto1", "targetname" );
-	bombzonesTrigB = getEntArray ( "pf394_auto2", "targetname" );
-	bombzonesBrief = getEntArray ( "sd_bomb", "targetname" );
-	bombzonesBriefTrig = getEntArray ( "sd_bomb_pickup_trig", "targetname" );
-	
-	// ---- DELETING GAMETYPE OBJECTS ----
-	
-	foreach( ent in dmSpawns )
-	{
-		count2++;
-		if (count2 > 7)
-		{
-			dmSpawns[count2] Delete();
-		}
-	}
-	
-	flagRemoveAllies[0] Delete();
-	flagTrigRemoveAllies[0] Delete();
-	flagZoneRemoveAllies[0] Delete();
-	flagRemoveAxis[0] Delete();
-	flagTrigRemoveAxis[0] Delete();
-	flagZoneRemoveAxis[0] Delete();
-	foreach( ent in domSpawns )
-	{
-		count++;
-		if (count > 7)
-		{
-			domSpawns[count] Delete();
-		}
-	}
-	
-	ddbombzonesTouchAB[0] Delete();
-	ddbombzonesTouchAB[1] Delete();
-	ddbombzonesModelA[0] Delete();
-	ddbombzonesTrigA[0] Delete();
-	ddbombzonesModelB[0] Delete();
-	ddbombzonesTrigB[0] Delete();
-	universalExploderAB[8] Delete();
-	universalExploderAB[9] Delete();
-	ddbombzonesCollA[0] Delete();
-	ddbombzonesCollB[0] Delete();
-	
-	flagPrimary[0] Delete();
-	flagPrimary[1] Delete();
-	flagPrimary[2] Delete();
-	flagDescriptor[0] Delete();
-	flagDescriptor[1] Delete();
-	flagDescriptor[2] Delete();
-	
-	sabbombzonesColl[0] Delete();
-	sabbombzonesColl[1] Delete();
-	sabbombzonesTouchAllies[0] Delete();
-	sabbombzonesDefuseAllies[0] Delete();
-	sabbombzonesSiteModelAllies[0] Delete();
-	sabbombzonesTouchAxis[0] Delete();
-	sabbombzonesDefuseAxis[0] Delete();
-	sabbombzonesSiteModelAxis[0] Delete();
-	universalExploderAB[4] Delete();
-	universalExploderAB[5] Delete();
-	
-	bombzonesTouchAB[0] Delete();
-	bombzonesTouchAB[1] Delete();
-	universalExploderAB[0] Delete();
-	universalExploderAB[1] Delete();
-	bombzonesCollAB[0] Delete();
-	bombzonesCollAB[1] Delete();
-	bombzonesModelA[0] Delete();
-	bombzonesModelB[0] Delete();
-	bombzonesTrigA[0] Delete();
-	bombzonesTrigB[0] Delete();
-	bombzonesBrief[0] Delete();
-	bombzonesBriefTrig[0] Delete();
-	
-	foreach( ent in tdmSpawns )
-	{
-		count3++;
-		if (count3 > 7)
-		{
-			tdmSpawns[count3] Delete();
-		}
-	}
-	
-	
-	// - Removing the barrels -
-	
-	chaRemove = getEntArray ( "cha", "targetname" );
-	
-	foreach( ent in chaRemove )
-	{
-		ent Delete();
-	}
-	
-	globalIntermission[0] Delete();
+	setdvar( "compassmaxrange", "1400" );
 }

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/mp/basemaps.arena

@@ -336,62 +336,10 @@
     useteamzones "true"
     environment  "urban"
 }
-/*
-{
-    map          "gulag"
-    longname     "MPUI_GULAG"
-    gametype     "dm dom sd sab war koth oneflag arena dd vip ctf gtnw oitc gg ss conf cranked infected tdef"
-    description  "MPUI_DESC_MAP_GULAG"
-    mapimage     "preview_mp_gulag"
-    mapoverlay   "compass_overlay_map_blank"
-    allieschar   "seals_udt"
-    axischar     "opforce_arctic"
-    useteamzones "true"
-    environment  "urban"
-}
 
-{
-    map          "invasion"
-    longname     "BurgerTown"
-    gametype     "dm dom sd sab war koth oneflag arena dd vip ctf gtnw oitc gg ss conf cranked infected tdef"
-    description  ""
-    mapimage     "preview_invasion"
-    mapoverlay   "compass_overlay_map_blank"
-    allieschar   "us_army"
-    axischar     "opforce_composite"
-    useteamzones "true"
-    environment  "urban"
-}
-
-{
-    map          "so_ghillies"
-    longname     "Pripyat"
-    gametype     "dm dom sd sab war koth oneflag arena dd vip ctf gtnw oitc gg ss conf cranked infected tdef"
-    description  ""
-    mapimage     "preview_so_ghillies"
-    mapoverlay   "compass_overlay_map_blank"
-    allieschar   "socom_141_forest"
-    axischar     "opforce_airborne"
-    useteamzones "true"
-    environment  "forest"
-}
-
-{
-    map          "contingency"
-    longname     "Contingency"
-    gametype     "dm dom sd sab war koth oneflag arena dd vip ctf gtnw oitc gg ss conf cranked infected tdef"
-    description  ""
-    mapimage     "preview_mp_contingency"
-    mapoverlay   "compass_overlay_map_blank"
-    allieschar   "seals_udt"
-    axischar     "opforce_arctic"
-    useteamzones "true"
-    environment  "urban"
-}
-*/
 {
     map          "iw4_credits"
-    longname     "IW4 Test Map"
+    longname     "MPUI_IW4_TEST_MAP"
     gametype     "dm dom sd sab war koth oneflag arena dd vip ctf gtnw oitc gg ss conf cranked infected tdef"
     description  ""
     mapimage     "preview_iw4_credits"
@@ -615,77 +563,227 @@
 {
     map           "mp_backlot"
     longname      "MPUI_BACKLOT"
-    gametype     "dm war sab sab2 dom sd sd2 hc koth"
+    gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
     description   "MPUI_DESC_MAP_BACKLOT"
     mapimage      "preview_mp_backlot"
-    mapoverlay   "compass_overlay_map_blank"
+    mapoverlay    "compass_overlay_map_blank "
     allieschar    "us_army"
     axischar      "opforce_composite"
-    useteamzones "true"
     environment   "desert"
 }
 
 {
     map           "mp_farm"
     longname      "MPUI_FARM"
-    gametype     "dm war sab sab2 dom sd sd2 hc koth"
+    gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
     description   "MPUI_DESC_MAP_FARM"
     mapimage      "preview_mp_farm"
-    mapoverlay   "compass_overlay_map_blank"
-    allieschar   "us_army"
+    mapoverlay    "compass_overlay_map_blank "
+    allieschar    "socom_141_forest"
     axischar      "opforce_airborne"
-    useteamzones "true"
     environment   "forest"
 }
 
 {
     map           "mp_countdown"
     longname      "MPUI_COUNTDOWN"
-    gametype     "dm war sab sab2 dom sd sd2 hc koth"
+    gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
     description   "MPUI_DESC_MAP_COUNTDOWN"
     mapimage      "preview_mp_countdown"
-    mapoverlay   "compass_overlay_map_blank"
+    mapoverlay    "compass_overlay_map_blank "
     allieschar    "us_army"
-    axischar     "opforce_airborne"
-    useteamzones "true"
-    environment  "urban"
+    axischar      "opforce_composite"
+    environment   "forest"
 }
 
 {
     map           "mp_pipeline"
     longname      "MPUI_PIPELINE"
-    gametype     "dm war sab sab2 dom sd sd2 hc koth"
+    gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
     description   "MPUI_DESC_MAP_PIPELINE"
     mapimage      "preview_mp_pipeline"
-    mapoverlay   "compass_overlay_map_blank"
-    allieschar   "us_army"
+    mapoverlay    "compass_overlay_map_blank "
+    allieschar    "socom_141_forest"
     axischar      "opforce_airborne"
-    useteamzones "true"
     environment   "forest"
 }
 
 {
     map           "mp_crash_snow"
     longname      "MPUI_CRASH_SNOW"
-    gametype     "dm war sab sab2 dom sd sd2 hc koth"
+    gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
     description   "MPUI_DESC_MAP_CRASH_SNOW"
     mapimage      "preview_mp_crash_snow"
-    mapoverlay   "compass_overlay_map_blank"
+    mapoverlay    "compass_overlay_map_blank "
     allieschar    "socom_141_arctic"
     axischar      "opforce_arctic"
-    useteamzones "true"
     environment   "arctic"
 }
 
 {
     map           "mp_carentan"
     longname      "MPUI_CARENTAN"
-    gametype     "dm war sab sab2 dom sd sd2 hc koth"
+    gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
     description   "MPUI_DESC_MAP_CARENTAN"
     mapimage      "preview_mp_carentan"
-    mapoverlay   "compass_overlay_map_blank"
-    allieschar   "us_army"
+    mapoverlay    "compass_overlay_map_blank "
+    allieschar    "seals_udt"
     axischar      "opforce_airborne"
-    useteamzones "true"
     environment   "urban"
 }
+
+{
+    map           "mp_showdown"
+    longname      "MPUI_SHOWDOWN"
+    gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+    description   "MPUI_DESC_MAP_SHOWDOWN"
+    mapimage      "preview_mp_showdown"
+    mapoverlay    "compass_overlay_map_blank "
+    allieschar    "us_army"
+    axischar      "opforce_composite"
+    environment   "desert"
+}
+
+{
+    map           "mp_convoy"
+    longname      "MPUI_CONVOY"
+    gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+    description   "MPUI_DESC_MAP_CONVOY"
+    mapimage      "preview_mp_convoy"
+    mapoverlay    "compass_overlay_map_blank "
+    allieschar    "us_army"
+    axischar      "opforce_composite"
+    environment   "desert"
+}
+
+{
+    map           "mp_citystreets"
+    longname      "MPUI_CITYSTREETS"
+    gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+    description   "MPUI_DESC_MAP_CITYSTREETS"
+    mapimage      "preview_mp_citystreets"
+    mapoverlay    "compass_overlay_map_blank "
+    allieschar    "us_army"
+    axischar      "opforce_composite"
+    environment   "urban"
+}
+
+{
+    map           "mp_broadcast"
+    longname      "MPUI_BROADCAST"
+    gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+    description   "MPUI_DESC_MAP_BROADCAST"
+    mapimage      "preview_mp_broadcast"
+    mapoverlay    "compass_overlay_map_blank "
+    allieschar    "us_army"
+    axischar      "opforce_composite"
+    environment   "desert"
+}
+
+{
+  map           "mp_alpha"
+  longname      "MPUI_LOCKDOWN"
+  gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+  description   "MPUI_DESC_MAP_LOCKDOWN"
+  mapimage      "preview_mp_alpha"
+  mapoverlay    "compass_overlay_map_blank "
+  allieschar    "us_army"
+  axischar      "socom_141_forest"
+  environment   "urban"
+}
+
+{
+  map           "mp_underground"
+  longname      "MPUI_UNDERGROUND"
+  gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+  description   "MPUI_DESC_MAP_UNDERGROUND"
+  mapimage      "preview_mp_underground"
+  mapoverlay    "compass_overlay_map_blank "
+  allieschar    "us_army"
+  axischar      "opforce_airborne"
+  environment   "urban"
+}
+
+{
+  map           "mp_bravo"
+  longname      "MPUI_MISSION"
+  gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+  description   "MPUI_DESC_MAP_MISSION"
+  mapimage      "preview_mp_bravo"
+  mapoverlay    "compass_overlay_map_blank "
+  allieschar    "socom_141_forest"
+  axischar      "militia"
+  environment   "forest"
+}
+
+{
+  map           "mp_village"
+  longname      "MPUI_VILLAGE"
+  gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+  description   "MPUI_DESC_MAP_VILLAGE"
+  mapimage      "preview_mp_village"
+  mapoverlay    "compass_overlay_map_blank "
+  allieschar    "socom_141_forest"
+  axischar      "militia"
+  environment   "forest"
+}
+
+{
+  map           "mp_seatown"
+  longname      "MPUI_SEATOWN"
+  gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+  description   "MPUI_DESC_MAP_SEATOWN"
+  mapimage      "preview_mp_seatown"
+  mapoverlay    "compass_overlay_map_blank "
+  allieschar    "socom_141_desert"
+  axischar      "militia"
+  environment   "desert"
+}
+
+{
+  map           "mp_plaza2"
+  longname      "MPUI_ARKADEN"
+  gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+  description   "MPUI_DESC_MAP_ARKADEN"
+  mapimage      "preview_mp_plaza2"
+  mapoverlay    "compass_overlay_map_blank "
+  allieschar    "seals_udt"
+  axischar      "opforce_airborne"
+  environment   "urban"
+}
+
+{
+  map           "mp_paris"
+  longname      "MPUI_RESISTANCE"
+  gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+  description   "MPUI_DESC_MAP_RESISTANCE"
+  mapimage      "preview_mp_paris"
+  mapoverlay    "compass_overlay_map_blank "
+  allieschar    "socom_141_forest"
+  axischar      "opforce_airborne"
+  environment   "urban"
+}
+
+{
+  map           "mp_hardhat"
+  longname      "MPUI_HARDHAT"
+  gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+  description   "MPUI_DESC_MAP_HARDHAT"
+  mapimage      "preview_mp_hardhat"
+  mapoverlay    "compass_overlay_map_blank "
+  allieschar    "us_army"
+  axischar      "opforce_airborne"
+  environment   "forest"
+}
+
+{
+  map           "mp_dome"
+  longname      "MPUI_DOME"
+  gametype      "dm war sab sab2 dom sd sd2 hc thc ctf koth dd oneflag gtnw"
+  description   "MPUI_DESC_MAP_DOME"
+  mapimage      "preview_mp_dome"
+  mapoverlay    "compass_overlay_map_blank "
+  allieschar    "socom_141_desert"
+  axischar      "opforce_composite"
+  environment   "desert"
+}

iw4x/iw4x_00/scripts/_aimassist.gsc

@@ -4,8 +4,6 @@
 // Put this file in your scripts folder.
 // ========================================================
 
-#include maps\mp\_utility;
-
 init()
 {
 	aimAssistAllowed = getDvarInt("sv_allowAimAssist");

iw4x/iw4x_00/ui_mp/controls_multi.menu

@@ -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)

iw4x/iw4x_00/ui_mp/createserver.menu

@@ -303,7 +303,8 @@ menuDef
 
 	MENU_CHOICE_HORIZONTAL_LINE(1)
 	
-	MENU_CHOICE_BUTTON(1, button_1, "@MENU_CHANGE_MAP_CAPS", open "settings_map", "@NULL_EMPTY")
+	MENU_CHOICE_BUTTON_VIS(1, button_1, "@MENU_LOADING_MAPS", "", "@NULL_EMPTY", when(dvarint("g_loadingInitialZones") != 0))
+	MENU_CHOICE_BUTTON_VIS(1, button_1, "@MENU_CHANGE_MAP_CAPS", open "settings_map", "@NULL_EMPTY", when(dvarint("g_loadingInitialZones") == 0))
 	MENU_CHOICE_BUTTON(2, button_2, "@MENU_CHANGE_GAME_MODE_CAPS", open "settings_gametype", "@NULL_EMPTY")
 	MENU_CHOICE_BUTTON_VIS(3, button_3, "@MENU_CHANGE_GAME_RULES_CAPS", ACTION_RULES, "@NULL_EMPTY", when(dvarString(ui_gametype) != "arena" && dvarString(ui_gametype) != "oneflag"))
 	MENU_CHOICE_DBUTTON_VIS(3, button_3, "@MENU_CHANGE_GAME_RULES_CAPS", "@NULL_EMPTY", when(dvarString(ui_gametype) == "arena" || dvarString(ui_gametype) == "oneflag"))

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 MATCHTYPE_WIDTH												PASSWORD_WIDTH
+#define PASSWORD_WIDTH												30
+#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.inc

@@ -472,3 +472,312 @@
 		dvar										"party_statusString" \
 		visible										when (inLobby()) \
 	}
+
+#ifndef CHOICE_SIZE_X
+#define CHOICE_SIZE_X 280
+#endif
+
+#ifndef CHOICE_SIZE_Y
+#define CHOICE_SIZE_Y 20
+#endif
+
+#ifndef CHOICE_GROUP
+#define CHOICE_GROUP ""
+#endif
+
+#ifndef CHOICE_TEXTSIZE
+#define CHOICE_TEXTSIZE TEXTSIZE_SMALL
+#endif
+
+#ifndef CHOICE_TEXTFONT
+#define CHOICE_TEXTFONT 3
+#endif
+
+#ifndef CHOICE_TEXTCOLOR
+#define CHOICE_TEXTCOLOR  1 1 1 1
+#endif
+
+#ifndef CHOICE_TEXTSTYLE
+#define CHOICE_TEXTSTYLE 0
+#endif
+
+#ifndef CHOICE_STYLE
+#define CHOICE_STYLE 1
+#endif
+
+#ifndef CHOICE_TEXTALIGN
+#define	CHOICE_TEXTALIGN ITEM_ALIGN_TOP_RIGHT
+#endif
+
+#ifndef CHOICE_TEXT_OFFSET_X
+#define CHOICE_TEXT_OFFSET_X -4
+#endif
+
+#ifndef CHOICE_TEXT_OFFSET_Y
+#define CHOICE_TEXT_OFFSET_Y 0
+#endif
+
+#ifndef CHOICE_TEXTCOLOR_DISABLED
+#define CHOICE_TEXTCOLOR_DISABLED 1 1 1 0.5
+#endif
+
+#ifndef CHOICE_BACKCOLOR
+#define CHOICE_BACKCOLOR 0 0 0 1
+#endif
+
+#ifndef CHOICE_TEXTCOLOR_CAPT
+#define CHOICE_TEXTCOLOR_CAPT CHOICE_TEXTCOLOR
+#endif
+
+#ifndef CHOICE_X_START
+#define CHOICE_X_START -64
+#endif
+
+#ifndef CHOICE_X_SPACING
+#define CHOICE_X_SPACING 250
+#endif
+
+#ifndef CHOICE_Y_START
+#define CHOICE_Y_START 82
+#endif
+
+#ifndef CHOICE_Y_SPACING
+#define CHOICE_Y_SPACING 20
+#endif
+
+#ifndef CHOICE_Y_COUNT
+#define CHOICE_Y_COUNT 20
+#endif
+
+#ifndef CHOICE_HORIZONTAL_ALIGN
+#define CHOICE_HORIZONTAL_ALIGN HORIZONTAL_ALIGN_LEFT
+#endif
+
+#ifndef CHOICE_VERTICAL_ALIGN
+#define CHOICE_VERTICAL_ALIGN VERTICAL_ALIGN_TOP
+#endif
+
+#ifndef CHOICE_FOCUS_SOUND
+#define CHOICE_FOCUS_SOUND "mouse_over"
+#endif
+
+#ifndef CHOICE_SEP_OFFSET_X
+#define CHOICE_SEP_OFFSET_X 64
+#endif
+
+#ifndef CHOICE_SEP_OFFSET_Y
+#define CHOICE_SEP_OFFSET_Y 0
+#endif
+
+#ifndef CHOICE_SEP_WIDTH
+#define CHOICE_SEP_WIDTH 216
+#endif
+
+#ifndef CHOICE_SEP_SPACING
+#define CHOICE_SEP_SPACING 0
+#endif
+
+#ifndef CHOICE_SEP_BACKGROUND
+#define	CHOICE_SEP_BACKGROUND "line_horizontal"
+#endif
+
+#ifndef HIGHTLIGHT_BACKCOLOR
+#define HIGHTLIGHT_BACKCOLOR CHOICE_BACKCOLOR
+#endif
+
+#ifndef CHOICE_SEP_COLOR
+#define CHOICE_SEP_COLOR 1 1 1 0.65
+#endif
+
+#ifndef NEW_X_OFFSET
+#define NEW_X_OFFSET 0
+#endif
+
+#ifndef NEW_Y_OFFSET
+#define NEW_Y_OFFSET 0
+#endif
+
+#ifndef NEWSTICKER_SPEED
+#define NEWSTICKER_SPEED 20
+#endif
+
+#ifndef CHOICE_HIGHLIGHT
+#define CHOICE_HIGHLIGHT "menu_button_selection_bar"
+#endif
+		
+#ifndef CHOICE_DVAR_TEXTALIGN
+#define CHOICE_DVAR_TEXTALIGN 8
+#endif
+
+#ifndef CHOICE_DVAR_OFFSET_X
+#define CHOICE_DVAR_OFFSET_X 225
+#endif
+
+#ifndef CHOICE_DVAR_OFFSET_Y
+#define CHOICE_DVAR_OFFSET_Y 0
+#endif
+
+#ifndef CHOICE_GETFOCUSEDITEMY
+#define CHOICE_GETFOCUSEDITEMY setLocalVarFloat "ui_popupYPos" ( getfocuseditemy( ) );
+#endif
+
+#ifndef CHOICE_UI_BUTTON
+#define	CHOICE_UI_BUTTON "ui_menuAButton"
+#endif
+
+#if !defined( CHOICE_SEP_1 ) || !defined( CHOICE_SEP_SPACING )
+#define CHOICE_SEP_TOTAL_SPACING( itemIndex )	0
+
+#elif !defined( CHOICE_SEP_2 )
+#define CHOICE_SEP_TOTAL_SPACING( itemIndex )	( ( itemIndex <= CHOICE_SEP_1 ) ? 0 : CHOICE_SEP_SPACING )
+
+#elif !defined( CHOICE_SEP_3 )
+#define CHOICE_SEP_TOTAL_SPACING( itemIndex )	( ( itemIndex <= CHOICE_SEP_1 ) ? 0 : ( ( itemIndex <= CHOICE_SEP_2 ) ? CHOICE_SEP_SPACING : CHOICE_SEP_SPACING * 2 ) )
+
+#else
+#define CHOICE_SEP_TOTAL_SPACING( itemIndex )	( ( itemIndex <= CHOICE_SEP_1 ) ? 0 : ( ( itemIndex <= CHOICE_SEP_2 ) ? CHOICE_SEP_SPACING : ( ( itemIndex <= CHOICE_SEP_3 ) ? CHOICE_SEP_SPACING * 2 : CHOICE_SEP_SPACING * 3 ) ) )
+#endif
+
+#define CHOICE_ROW( itemIndex )		( ( itemIndex - 0 ) % CHOICE_Y_COUNT )
+#define CHOICE_COL( itemIndex )		( ( itemIndex - 0 - ( ( itemIndex - 0 ) % CHOICE_Y_COUNT ) ) / CHOICE_Y_COUNT )
+
+#define CHOICE_X( itemIndex ) 		( CHOICE_X_START + CHOICE_X_SPACING * CHOICE_COL( itemIndex ) )
+
+#define CHOICE_SHADER( itemIndex, nameArg ) \
+		itemDef \
+		{ \
+			forecolor 0 0 0 1 \
+			style 3 \
+			rect CHOICE_ORIGIN( itemIndex ) 336 20 CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN \
+			background CHOICE_HIGHLIGHT \
+			visible when ( getfocuseditemname() == nameArg ) \
+			decoration \
+		}
+		
+
+#define CHOICE_SCRIPTS_ALL( itemIndex, nameArg, actionArg, onFocusArg, leaveFocusArg ) \
+		onFocus \
+		{  \
+			onFocusArg \
+			play CHOICE_FOCUS_SOUND; \
+			setLocalVarInt "ui_menuAButton" ( itemIndex ); \
+			setLocalVarString "ui_choicegroup" ( CHOICE_GROUP ); \
+		} \
+		leaveFocus \
+		{ \
+			leaveFocusArg \
+			setItemColor nameArg backcolor 0 0 0 0; \
+			setLocalVarInt "ui_menuAButton" ( 0 ); \
+		} \
+		action \
+		{ \
+			play "mouse_click"; \
+			actionArg \
+		}
+		
+#define CHOICE_BUTTON( itemIndex, nameArg, textArg, actionArg ) \
+		CHOICE_BUTTON_VIS( itemIndex, nameArg, textArg, actionArg, 1 )
+
+#define CHOICE_BUTTON_NOHI( itemIndex, nameArg, textArg, actionArg ) \
+		CHOICE_BUTTON_NOHI_VIS( itemIndex, nameArg, textArg, actionArg, 1 )
+
+#define CHOICE_BUTTON_VIS( itemIndex, nameArg, textArg, actionArg, visArg ) \
+		CHOICE_BUTTON_NOHI_VIS( itemIndex, nameArg, textArg, actionArg, visArg )
+
+#define CHOICE_BUTTON_VIS_ADV( itemIndex, nameArg, textArg, actionArg, visArg, vis ) \
+		CHOICE_BUTTON_NOHI_VIS( itemIndex, nameArg, textArg, actionArg, visArg )
+	
+#define CHOICE_BUTTON_NOHI_VIS( itemIndex, nameArg, textArg, actionArg, visArg ) \
+		CHOICE_BUTTON_FOCUS_NOHI_VIS( itemIndex, nameArg, textArg, actionArg, ;, ;, visArg )
+
+#define CHOICE_BUTTON_FOCUS( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg ) \
+		CHOICE_BUTTON_FOCUS_VIS( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, 1 )
+
+#define CHOICE_BUTTON_FOCUS_NOHI( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg ) \
+		CHOICE_BUTTON_FOCUS_NOHI_VIS( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, 1 )
+
+#define CHOICE_BUTTON_FOCUS_VIS( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg ) \
+		CHOICE_BUTTON_FOCUS_NOHI_VIS( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg )
+
+#define CHOICE_BUTTON_FOCUS_VIS_ADV( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg, vis ) \
+		CHOICE_BUTTON_FOCUS_NOHI_VIS( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg )
+
+#define CHOICE_BUTTON_FOCUS_NOHI_VIS( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg ) \
+		CHOICE_BUTTON_FOCUS_NOHI_VIS_EX( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg, ; )
+
+#define CHOICE_BUTTON_EX( itemIndex, nameArg, textArg, actionArg, extraArgs ) \
+		CHOICE_BUTTON_FOCUS_NOHI_VIS_EX( itemIndex, nameArg, textArg, actionArg, ;, ;, 1, extraArgs )
+
+#define CHOICE_BUTTON_EX_VIS( itemIndex, nameArg, textArg, actionArg, visArg, extraArgs ) \
+		CHOICE_BUTTON_FOCUS_NOHI_VIS_EX( itemIndex, nameArg, textArg, actionArg, ;, ;, visArg, extraArgs )
+
+#define CHOICE_BUTTON_FOCUS_EX( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, extraArgs ) \
+		CHOICE_BUTTON_FOCUS_NOHI_VIS_EX( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, 1, extraArgs )
+
+#define CHOICE_BUTTON_FOCUS_VIS_EX( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg, extraArgs ) \
+		CHOICE_BUTTON_FOCUS_NOHI_VIS_EX( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg, extraArgs )
+
+#define CHOICE_BUTTON_FOCUS_VIS_ADV_EX( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg, extraArgs, vis ) \
+		CHOICE_BUTTON_FOCUS_NOHI_VIS_EX( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg, extraArgs )
+
+#define CHOICE_BUTTON_FOCUS_NOHI_VIS_EX( itemIndex, nameArg, textArg, actionArg, onFocusArg, leaveFocusArg, visArg, extraArgs ) \
+		CHOICE_SHADER( itemIndex, nameArg ) \
+		itemDef \
+		{ \
+			name nameArg \
+			rect CHOICE_RECT( itemIndex ) \
+			forecolor CHOICE_TEXTCOLOR \
+			disablecolor CHOICE_TEXTCOLOR_DISABLED \
+			style CHOICE_STYLE \
+			group "mw2_button" \
+			type ITEM_TYPE_BUTTON \
+			textAlign CHOICE_TEXTALIGN \
+			textAlignX CHOICE_TEXT_OFFSET_X \
+			textFont CHOICE_TEXTFONT \
+			textScale CHOICE_TEXTSIZE \
+			textStyle CHOICE_TEXTSTYLE \
+			exp text( textArg ) \
+			visible visArg \
+			extraArgs \
+			CHOICE_SCRIPTS_ALL( itemIndex, nameArg, actionArg, onFocusArg, leaveFocusArg ) \
+		}
+		
+#define CHOICE_BACK( textArg, actionArg ) \
+		CHOICE_BACK_VIS( textArg, actionArg, 1 )
+
+#define CHOICE_BACK_VIS( textArg, actionArg, visArg ) \
+		itemDef \
+		{ \
+			rect -64 -20 336 20 1 3 \
+			visible 1 \
+			group "mw2_button" \
+			style 1 \
+			foreColor CHOICE_TEXTCOLOR \
+			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 textArg \
+			visible when ( visArg ) \
+			onFocus \
+			{ \
+				play CHOICE_FOCUS_SOUND; \
+				setItemColor self backcolor 0 0 0 1; \
+				setLocalVarBool "ui_menuAButton" ( 1 ); \
+			} \
+			leaveFocus \
+			{ \
+				setItemColor self backcolor 0 0 0 0; \
+				setLocalVarString "ui_hint_text" ( "@NULL_EMPTY" ); \
+				setLocalVarBool "ui_menuAButton" ( 0 ); \
+			} \
+			action \
+			{ \
+				play "mouse_click"; \
+				escape "self"; \
+				actionArg \
+			} \
+		}

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/mapmacros.inc

@@ -0,0 +1,55 @@
+#define LOCAL_MAP_ACTION( mapname ) \
+		setdvar ui_mapname mapname; \
+		close "settings_map"; \
+		close "self"; 
+
+#define LOCAL_MAP_FOCUS( name, desc, icon ) \
+		setLocalVarString "ui_info_name" ( name ); \
+		setLocalVarString "ui_info_desc" ( desc ); \
+		setLocalVarString "ui_info_icon" ( icon ); 
+
+#define LOCAL_MAP_NAME( name ) \
+		"@" + name 
+
+#define LOCAL_XDLC_FOCUS \
+		setLocalVarString "ui_info_name" ( "PATCH_DLC_MAPS" ); \
+		setLocalVarString "ui_info_desc" ( "PATCH_DLC_MAPS_DESC" ); \
+		setLocalVarString "ui_info_icon" ( "loadscreen_mp_bonusmaps" );
+
+#define LOCAL_MAP_SELECTION_RECT(i) 220 ( 30 + ( i * 20 ) ) 148 18 1 1
+
+#define LOCAL_MAP_SELECTION(itemIndex, mapname, name, desc, icon, visArg) \
+		itemDef \
+		{ \
+			rect LOCAL_MAP_SELECTION_RECT(itemIndex) \
+			forecolor 1 1 1 1 \
+			style WINDOW_STYLE_FILLED \
+			background "menu_rules_selection_bar" \
+			group "mw2_button" \
+			type ITEM_TYPE_BUTTON \
+			textAlign ITEM_ALIGN_TOP_RIGHT \
+			textAlignX -34 \
+			textAlignY -1 \
+			textScale CHOICE_TEXTSIZE \
+			textFont CHOICE_TEXTFONT \
+			exp text ( LOCAL_MAP_NAME( name ) ) \
+			visible when (visArg) \
+			onFocus \
+			{ \
+				play "mouse_over"; \
+				setItemColor self backColor 0 0 0 1; \
+				setLocalVarBool "ui_menuAButton" ( 1 ); \
+				setLocalVarFloat "ui_popupYPos" ( 0 ); \
+				LOCAL_MAP_FOCUS( name, desc, icon ) \
+			} \
+			leaveFocus \
+			{ \
+				setItemColor self backColor 0 0 0 0; \
+				setLocalVarBool "ui_menuAButton" ( 0 ); \
+			} \
+			action \
+			{ \
+				play "mouse_click"; \
+				LOCAL_MAP_ACTION( mapname ) \
+			} \
+		}

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/playerdataread.menu

@@ -43,8 +43,6 @@
 			setDvar	"ui_checkclass" 14;
 			open "resetclass";
 
-			exec "checkClasses";
-
 			setLocalVarInt "classIndex" ( localvarint( "oldClassIndex" ) );
 			if ( !isitemunlocked( getplayerdata( "killstreaks" , 0 ) ) && getplayerdata( "killstreaks" , 0 ) != "none" )
 			{

iw4x/iw4x_00/ui_mp/scriptmenus/callvote.menu

@@ -0,0 +1,56 @@
+#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", "@MPUI_KICK_PLAYER", open "kickplayer"; close "changemap"; close "changegametype"; close self;, ;, 1)
+
+		ITEM_BUTTON_BACK(close "self")
+	}
+}

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 "voteGame";
+			}
+		}
+	}
+}

iw4x/iw4x_00/ui_mp/scriptmenus/changemap.menu

@@ -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";
+			}
+		}
+	}
+}

iw4x/iw4x_00/ui_mp/scriptmenus/class.menu

@@ -474,13 +474,12 @@
 			textalign 6
 			textalignx -60
 			textscale 0.375
-			text "@MENU_OPTIONS"
+			text "@MPUI_MUTE_PLAYERS"
 			action
 			{
 				play "mouse_click";
 				close self;
-				open "pc_options_video";
-				execnow "set ui_allow_graphic_change 0";
+				open "muteplayer";
 			}
 			onFocus
 			{
@@ -515,14 +514,53 @@
 			textalign 6
 			textalignx -60
 			textscale 0.375
-			//text "@MPUI_MUTE_PLAYERS"
+			text "@MENU_OPTIONS"
+			action
+			{
+				play "mouse_click";
+				close self;
+				open "pc_options_video";
+				execnow "set ui_allow_graphic_change 0";
+			}
+			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_options"
+			rect -64 108 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
 			disabled when(dvarBool("party_host"))
 			text "@MENU_ADD_TO_FAVORITES"
 			action
 			{
 				play "mouse_click";
 				close self;
-				//open "muteplayer";
 				uiScript "CreateCurrentServerFavorite";
 			}
 			onFocus
@@ -544,9 +582,50 @@
 			}
 		}
 		itemDef
+		{
+			name "game_callvote"
+			rect -64 128 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
+			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 108 336 20 1 1
+			rect -64 148 336 20 1 1
 			visible 1
 			group "mw2_button"
 			style 1
@@ -586,7 +665,7 @@
 		itemDef
 		{
 			name "game_leavegame"
-			rect -64 108 336 20 1 1
+			rect -64 148 336 20 1 1
 			visible 1
 			group "mw2_button"
 			style 1

iw4x/iw4x_00/ui_mp/scriptmenus/kickplayer.menu

@@ -0,0 +1,124 @@
+#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", "@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";
+			}
+		}
+	}
+}

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(5, "@MPUI_RULES_FRIENDLY_FIRE", dvarString("uiSi_ffType"))
+	SV_INFO_FIELD(4, "@MPUI_RULES_AIMASSIST", dvarString("uiSi_aimAssist"))
+	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") == ""))

iw4x/iw4x_00/ui_mp/settings_map.menu

@@ -1,3 +1,7 @@
+#define CHOICE_Y( itemIndex ) 		( CHOICE_Y_START + CHOICE_Y_SPACING * CHOICE_ROW( itemIndex ) + CHOICE_SEP_TOTAL_SPACING( itemIndex ) )
+#define CHOICE_ORIGIN( itemIndex )	CHOICE_X( itemIndex ) CHOICE_Y( itemIndex )
+#define CHOICE_RECT( itemIndex )	CHOICE_ORIGIN( itemIndex ) CHOICE_SIZE_X CHOICE_SIZE_Y CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN
+
 #include "ui/menudef.h"
 #include "ui_mp/main.inc"
 
@@ -8,117 +12,339 @@
 #undef CHOICE_GROUP
 #define CHOICE_GROUP MENU_NAME
 
-#undef MENU_BACKGROUND_PANEL_RIGHT
-#define MENU_BACKGROUND_PANEL_RIGHT \
-	itemDef \
-	{ \
-		rect										(0 - MENU_BACKGROUND_PANEL_RIGHT_WIDTH) 28 MENU_BACKGROUND_PANEL_RIGHT_WIDTH MENU_BACKGROUND_PANEL_RIGHT_HEIGHT HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_TOP \
-		style										WINDOW_STYLE_SHADER \
-		foreColor									0 0 0 0.7 \
-		background									"black" \
-		decoration									\
-		textScale									0.55 \
-		visible										1 \
-	} \
-	itemDef \
-	{ \
-		name										"image" \
-		rect										(0 - (MENU_BACKGROUND_PANEL_RIGHT_WIDTH - 10)) 50 (MENU_BACKGROUND_PANEL_RIGHT_WIDTH - 20) 127 HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_TOP \
-		style										WINDOW_STYLE_SHADER \
-		foreColor									1 1 1 1 \
-		decoration									\
-		textScale									0.55 \
-		visible										1 \
-		exp											material ("preview_" + dvarString("ui_map_name")) \
-	} \
-	itemDef \
-	{ \
-		name										"longname" \
-		rect										(0 - (MENU_BACKGROUND_PANEL_RIGHT_WIDTH - 10)) 28 (MENU_BACKGROUND_PANEL_RIGHT_WIDTH - 20) 22 HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_TOP \
-		foreColor									CHOICE_TEXTCOLOR \
-		decoration									\
-		textAlign									ITEM_ALIGN_TOP_LEFT \
-		textScale									CHOICE_TEXTSIZE \
-		textFont									9 \
-		visible										1 \
-		exp											text (dvarString("ui_map_long")) \
-	} \
-	itemDef \
-	{ \
-		name										"description" \
-		rect										(0 - (MENU_BACKGROUND_PANEL_RIGHT_WIDTH - 10)) 180 (MENU_BACKGROUND_PANEL_RIGHT_WIDTH - 20) 20 HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_TOP \
-		foreColor									1 1 1 0.65 \
-		decoration									\
-		autoWrapped									\
-		textAlign									ITEM_ALIGN_TOP_LEFT \
-		textScale									CHOICE_TEXTSIZE \
-		textFont									UI_FONT_SMALL \
-		visible										1 \
-		exp											text (dvarString("ui_map_desc")) \
-	}
-
-#define ON_MENU_OPEN \
-	focusFirst;										\
-	uiScript										"ApplyInitialMap";
-
-#define ON_MENU_CLOSE \
-	execNow											"xupdatepartystate";
-
-#define ON_MENU_ESC \
-	close											self;
-
-menuDef
 {
+	menuDef
+	{
 		name MENU_NAME
 		fullscreen 1
 		rect 0 0 640 480
-	foreColor										CHOICE_TEXTCOLOR
-	focusColor										CHOICE_TEXTCOLOR
+		foreColor 1 1 1 1
+		focusColor 1 1 1 1
 		soundLoop MENU_MUSIC
 		fadeCycle 1
 		fadeClamp 1
 		fadeAmount 0.1
+		onOpen
+		{
+			focusFirst;
+			uiScript "ApplyInitialMap";
 
-	MENU_ON_OPEN(ON_MENU_OPEN)
-	MENU_ON_CLOSE(ON_MENU_CLOSE)
-	MENU_ON_ESC(ON_MENU_ESC)
+		}
+		onClose
+		{
+			execNow "xupdatepartystate";
+		}
+		onESC
+		{
+			close "self";
+		}
 
 		#define DISABLE_SIDEBAR
 		#include "ui_mp/bg.inc"
 
-	MENU_ITEM_TITLE(10)
 		MENU_BACKGROUND_FRAME
-	MENU_BACKGROUND_PANEL_RIGHT
 
 		itemDef
 		{
-		name										"maplist"
-		rect										62 28 210 356 HORIZONTAL_ALIGN_LEFT VERTICAL_ALIGN_TOP
-		style										WINDOW_STYLE_FILLED
-		foreColor									CHOICE_TEXTCOLOR
-		outLineColor								0 0 0 0.6
-		type										ITEM_TYPE_LISTBOX
-		textFont									UI_FONT_NORMAL
-		textAlignX									6
-		textScale									CHOICE_TEXTSIZE
+			rect 0 0 272 28 1 1
+			decoration
 			visible 1
-		feeder										60
-		selectBorder								0.8 0.95 1 0
-		elementWidth								120
-		elementHeight								22
-//		numcols			xpos		xwidth		textlen		alignment
-		columns 1		8			120			25			0
-		doubleClick
-		{
-			uiScript								"ApplyMap";
-			close									self;
+			forecolor 1 1 1 1
+			textfont 9
+			textalign 6
+			textalignx -60
+			textscale 0.5
+			text "@MENU_CHOOSE_MAP_CAP"
 		}
-		execkeyint 13
+		
+		#include "ui_mp/mapmacros.inc"
+
+		#undef CHOICE_Y_START
+		#define CHOICE_Y_START 28
+
+		#undef CHOICE_TEXTALIGN
+		#define CHOICE_TEXTALIGN ITEM_ALIGN_TOP_LEFT
+
+		#undef CHOICE_TEXT_OFFSET_X
+		#define CHOICE_TEXT_OFFSET_X 124
+
+		CHOICE_BACK( "@PLATFORM_BACK_CAPS", close "self"; )
+
+		#undef CHOICE_TEXTCOLOR
+		#define CHOICE_TEXTCOLOR 0.5 1 0.5 1
+		CHOICE_BUTTON_FOCUS(0, "dlc_list_1", "@MP_ORIGINAL_MAPS", setdvar "iw4x_maps_dlc" 0;, LOCAL_MAP_FOCUS( "MP_ORIGINAL_MAPS", "NULL_EMPTY", "loadscreen_mp_bonusmaps" ), ; )
+		CHOICE_BUTTON_FOCUS(1, "dlc_list_2", "@PATCH_DLC1", setdvar "iw4x_maps_dlc" 1;, LOCAL_MAP_FOCUS( "PATCH_DLC1", "PATCH_DESC_DLC1", "preview_stimulus_dlc" ), 1)
+		CHOICE_BUTTON_FOCUS(2, "dlc_list_3", "@PATCH_DLC2", setdvar "iw4x_maps_dlc" 2;, LOCAL_MAP_FOCUS( "PATCH_DLC2", "PATCH_DESC_DLC2", "preview_resurgence_dlc" ), 1)
+		CHOICE_BUTTON_FOCUS(3, "dlc_list_4", "@PATCH_IW4X_DLC", setdvar "iw4x_maps_dlc" 3;, LOCAL_MAP_FOCUS( "PATCH_IW4X_DLC", "PATCH_DESC_IW4X_DLC", "preview_codo_dlc" ), 1)
+		CHOICE_BUTTON_FOCUS(4, "dlc_list_5", "@PATCH_COD4_DLC", setdvar "iw4x_maps_dlc" 4;, LOCAL_MAP_FOCUS( "PATCH_COD4_DLC", "PATCH_DESC_COD4_DLC", "preview_cod4_dlc" ), 1)
+		CHOICE_BUTTON_FOCUS(5, "dlc_list_6", "@PATCH_MW3_DLC", setdvar "iw4x_maps_dlc" 5;, LOCAL_MAP_FOCUS( "PATCH_MW3_DLC", "PATCH_DESC_MW3_DLC", "preview_mw3_dlc" ), 1)
+		CHOICE_BUTTON_FOCUS(6, "dlc_list_custom", "@CUSTOM_MAPS_DLC", setdvar "iw4x_maps_dlc" 99;, LOCAL_MAP_FOCUS( "CUSTOM_MAPS_DLC", "DESC_CUSTOM_MAPS_DLC", "preview_custom_maps" ), 1)
+
+		LOCAL_MAP_SELECTION( 0, 	"mp_afghan", 			"MPUI_AFGHAN", 			"MPUI_DESC_MAP_AFGHAN", 		"preview_mp_afghan",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION( 1, 	"mp_derail", 			"MPUI_DERAIL", 			"MPUI_DESC_MAP_DERAIL", 		"preview_mp_derail",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION( 2, 	"mp_estate", 			"MPUI_ESTATE", 			"MPUI_DESC_MAP_ESTATE", 		"preview_mp_estate",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION( 3, 	"mp_favela", 			"MPUI_FAVELA", 			"MPUI_DESC_MAP_FAVELA", 		"preview_mp_favela",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION( 4, 	"mp_highrise",			"MPUI_HIGHRISE", 		"MPUI_DESC_MAP_HIGHRISE", 		"preview_mp_highrise",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION( 5, 	"mp_invasion",			"MPUI_INVASION", 		"MPUI_DESC_MAP_INVASION", 		"preview_mp_invasion",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION( 6, 	"mp_checkpoint", 		"MPUI_CHECKPOINT", 		"MPUI_DESC_MAP_CHECKPOINT", 	"preview_mp_checkpoint",		dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION( 7, 	"mp_quarry", 			"MPUI_QUARRY", 			"MPUI_DESC_MAP_QUARRY", 		"preview_mp_quarry",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION( 8, 	"mp_rundown",			"MPUI_RUNDOWN", 		"MPUI_DESC_MAP_RUNDOWN", 		"preview_mp_rundown",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION( 9, 	"mp_rust",				"MPUI_RUST", 			"MPUI_DESC_MAP_RUST", 			"preview_mp_rust",				dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION( 10, 	"mp_boneyard",			"MPUI_BONEYARD", 		"MPUI_DESC_MAP_BONEYARD", 		"preview_mp_boneyard",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION( 11, 	"mp_skidrow",			"MPUI_RAID", 			"MPUI_DESC_MAP_NIGHTSHIFT", 	"preview_mp_nightshift",		dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION( 12, 	"mp_subbase",			"MPUI_SUBBASE", 		"MPUI_DESC_MAP_SUBBASE", 		"preview_mp_subbase",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION( 13, 	"mp_terminal",			"MPUI_TERMINAL", 		"MPUI_DESC_MAP_TERMINAL", 		"preview_mp_terminal",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION( 14, 	"mp_underpass", 		"MPUI_UNDERPASS", 		"MPUI_DESC_MAP_UNDERPASS", 		"preview_mp_underpass",			dvarint("iw4x_maps_dlc") == 0)
+		LOCAL_MAP_SELECTION( 15, 	"mp_brecourt",			"MPUI_WASTELAND", 		"MPUI_DESC_MAP_BRECOURT", 		"preview_mp_brecourt",			dvarint("iw4x_maps_dlc") == 0)
+
+		LOCAL_MAP_SELECTION( 0, 	"mp_complex", 			"PATCH_COMPLEX", 		"PATCH_DESC_MAP_COMPLEX", 		"preview_mp_complex",			dvarint("iw4x_maps_dlc") == 1)
+		LOCAL_MAP_SELECTION( 1, 	"mp_crash", 			"MPUI_CRASH", 			"MPUI_DESC_MAP_CRASH", 			"preview_mp_crash",				dvarint("iw4x_maps_dlc") == 1)
+		LOCAL_MAP_SELECTION( 2, 	"mp_overgrown", 		"MPUI_OVERGROWN", 		"MPUI_DESC_MAP_OVERGROWN", 		"preview_mp_overgrown",			dvarint("iw4x_maps_dlc") == 1)
+		LOCAL_MAP_SELECTION( 3, 	"mp_compact", 			"PATCH_COMPACT", 		"PATCH_DESC_MAP_COMPACT", 		"preview_mp_compact",			dvarint("iw4x_maps_dlc") == 1)
+		LOCAL_MAP_SELECTION( 4, 	"mp_storm", 			"PATCH_STORM", 			"PATCH_DESC_MAP_STORM", 		"preview_mp_storm",				dvarint("iw4x_maps_dlc") == 1)
+
+		LOCAL_MAP_SELECTION( 0, 	"mp_abandon", 			"PATCH_ABANDON", 		"PATCH_DESC_MAP_ABANDON", 		"preview_mp_abandon",			dvarint("iw4x_maps_dlc") == 2)
+		LOCAL_MAP_SELECTION( 1, 	"mp_fuel2", 			"PATCH_FUEL2", 			"PATCH_DESC_MAP_FUEL2",			"preview_mp_fuel2",				dvarint("iw4x_maps_dlc") == 2)
+		LOCAL_MAP_SELECTION( 2, 	"mp_strike", 			"PATCH_STRIKE", 		"MPUI_DESC_MAP_STRIKE", 		"preview_mp_strike",			dvarint("iw4x_maps_dlc") == 2)
+		LOCAL_MAP_SELECTION( 3, 	"mp_trailerpark", 		"PATCH_TRAILERPARK",	"PATCH_DESC_MAP_TRAILERPARK", 	"preview_mp_trailerpark",		dvarint("iw4x_maps_dlc") == 2)
+		LOCAL_MAP_SELECTION( 4, 	"mp_vacant", 			"PATCH_VACANT", 		"MPUI_DESC_MAP_VACANT", 		"preview_mp_vacant",			dvarint("iw4x_maps_dlc") == 2)
+
+		LOCAL_MAP_SELECTION( 0, 	"mp_nuked",				"MPUI_NUKED",			"MPUI_DESC_MAP_NUKED", 			"preview_mp_nuked",				dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION( 1, 	"mp_cross_fire",		"MPUI_CROSSFIRE",		"MPUI_DESC_MAP_CROSSFIRE",		"preview_mp_cross_fire",		dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION( 2, 	"mp_cargoship",			"MPUI_CARGOSHIP",		"MPUI_DESC_MAP_CARGOSHIP",		"preview_mp_cargoship",			dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION( 3, 	"mp_bloc_sh",			"MPUI_BLOC_SH",			"MPUI_DESC_MAP_BLOC_SH",		"preview_mp_bloc_sh",			dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION( 4, 	"mp_killhouse",			"MPUI_KILLHOUSE",		"MPUI_DESC_MAP_KILLHOUSE",		"preview_mp_killhouse",			dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION( 5, 	"mp_bog", 				"MPUI_BOG_SH",			"MPUI_DESC_MAP_BOG",			"preview_mp_bog_sh",			dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION( 6, 	"mp_cargoship_sh",		"MPUI_CARGOSHIP_SH",	"MPUI_DESC_MAP_CARGOSHIP_SH",	"preview_mp_cargoship_sh",		dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION( 7, 	"mp_shipment_long",		"MPUI_SHIPMENT_LONG",	"MPUI_DESC_MAP_SHIPMENT_LONG",	"preview_mp_shipment_long",		dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION( 8, 	"mp_rust_long",			"MPUI_RUST_LONG",		"MPUI_DESC_MAP_RUST_LONG",		"preview_mp_rust_long",			dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION( 9, 	"mp_firingrange",		"MPUI_FIRINGRANGE",		"MPUI_DESC_MAP_FIRINGRANGE",	"preview_mp_firingrange",		dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION( 10, 	"mp_bloc", 				"MPUI_BLOC",			"MPUI_DESC_MAP_BLOC",			"preview_mp_bloc",				dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION( 11, 	"mp_crash_tropical",	"MPUI_CRASH_TROPICAL",	"MPUI_DESC_MAP_CRASH_TROPICAL",	"preview_mp_crash_tropical",	dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION( 12, 	"mp_estate_tropical",	"MPUI_ESTATE_TROPICAL",	"MPUI_DESC_MAP_ESTATE_TROPICAL","preview_mp_estate_tropical",	dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION( 13, 	"mp_fav_tropical",		"MPUI_FAV_TROPICAL",	"MPUI_DESC_MAP_FAV_TROPICAL",	"preview_mp_fav_tropical",		dvarint("iw4x_maps_dlc") == 3)
+		LOCAL_MAP_SELECTION( 14, 	"mp_storm_spring",		"MPUI_STORM_SPRING",	"MPUI_DESC_MAP_STORM_SPRING", 	"preview_mp_storm_spring",		dvarint("iw4x_maps_dlc") == 3)
+
+		LOCAL_MAP_SELECTION( 0, 	"mp_farm",				"MPUI_FARM",			"MPUI_DESC_MAP_FARM", 			"preview_mp_farm",				dvarint("iw4x_maps_dlc") == 4)
+		LOCAL_MAP_SELECTION( 1, 	"mp_backlot",			"MPUI_BACKLOT",			"MPUI_DESC_MAP_BACKLOT",		"preview_mp_backlot",			dvarint("iw4x_maps_dlc") == 4)
+		LOCAL_MAP_SELECTION( 2, 	"mp_pipeline",			"MPUI_PIPELINE",		"MPUI_DESC_PIPELINE",			"preview_mp_pipeline",			dvarint("iw4x_maps_dlc") == 4)
+		LOCAL_MAP_SELECTION( 3, 	"mp_countdown",			"MPUI_COUNTDOWN",		"MPUI_DESC_MAP_COUNTDOWN",		"preview_mp_countdown",			dvarint("iw4x_maps_dlc") == 4)
+		LOCAL_MAP_SELECTION( 4, 	"mp_crash_snow",		"MPUI_CRASH_SNOW",		"MPUI_DESC_MAP_CRASH_SNOW",		"preview_mp_crash_snow",		dvarint("iw4x_maps_dlc") == 4)
+		LOCAL_MAP_SELECTION( 5, 	"mp_carentan", 			"MPUI_CARENTAN",		"MPUI_DESC_MAP_CARENTAN",		"preview_mp_carentan",			dvarint("iw4x_maps_dlc") == 4)
+		LOCAL_MAP_SELECTION( 6, 	"mp_broadcast",			"MPUI_BROADCAST",		"MPUI_DESC_MAP_BROADCAST",		"preview_mp_broadcast",			dvarint("iw4x_maps_dlc") == 4)
+		LOCAL_MAP_SELECTION( 7, 	"mp_showdown",			"MPUI_SHOWDOWN",		"MPUI_DESC_MAP_SHOWDOWN",		"preview_mp_showdown",			dvarint("iw4x_maps_dlc") == 4)
+		LOCAL_MAP_SELECTION( 8, 	"mp_convoy",			"MPUI_CONVOY",			"MPUI_DESC_MAP_CONVOY",			"preview_mp_convoy",			dvarint("iw4x_maps_dlc") == 4)
+
+		LOCAL_MAP_SELECTION( 0,		"mp_alpha", 			"MPUI_LOCKDOWN",		"MPUI_DESC_MAP_LOCKDOWN",		"preview_mp_alpha",				dvarint("iw4x_maps_dlc") == 5)
+		LOCAL_MAP_SELECTION( 1,		"mp_bravo", 			"MPUI_MISSION",			"MPUI_DESC_MAP_MISSION",		"preview_mp_bravo",				dvarint("iw4x_maps_dlc") == 5)
+		LOCAL_MAP_SELECTION( 2,		"mp_dome", 				"MPUI_DOME",			"MPUI_DESC_MAP_DOME",			"preview_mp_dome",				dvarint("iw4x_maps_dlc") == 5)
+		LOCAL_MAP_SELECTION( 3,		"mp_hardhat", 			"MPUI_HARDHAT",			"MPUI_DESC_MAP_HARDHAT",		"preview_mp_hardhat",			dvarint("iw4x_maps_dlc") == 5)
+		LOCAL_MAP_SELECTION( 4,		"mp_paris", 			"MPUI_RESISTANCE",		"MPUI_DESC_MAP_RESISTANCE",		"preview_mp_paris",				dvarint("iw4x_maps_dlc") == 5)
+		LOCAL_MAP_SELECTION( 5,		"mp_plaza2", 			"MPUI_ARKADEN",			"MPUI_DESC_MAP_ARKADEN",		"preview_mp_plaza2",			dvarint("iw4x_maps_dlc") == 5)
+		LOCAL_MAP_SELECTION( 6,		"mp_seatown", 			"MPUI_SEATOWN",			"MPUI_DESC_MAP_SEATOWN",		"preview_mp_seatown",			dvarint("iw4x_maps_dlc") == 5)
+		LOCAL_MAP_SELECTION( 7,		"mp_underground", 		"MPUI_UNDERGROUND",		"MPUI_DESC_MAP_UNDERGROUND",	"preview_mp_underground",		dvarint("iw4x_maps_dlc") == 5)
+		LOCAL_MAP_SELECTION( 8,		"mp_village", 			"MPUI_VILLAGE",			"MPUI_DESC_MAP_VILLAGE",		"preview_mp_village",			dvarint("iw4x_maps_dlc") == 5)
+
+		itemDef 
 		{ 
-			uiScript								"ApplyMap";
-			close									self;
+			name "select_custom_map"
+			rect 250 -20 96 20 1 3 
+			visible 1 
+			group "mw2_button" 
+			style 1 
+			foreColor 1 1 1 1 
+			disableColor 0.6 0.55 0.55 1 
+			background "black" 
+			type 1 
+			textFont 3 
+			textAlign 6 
+			textAlignX -60 
+			textScale 0.375 
+			text "@MPUI_DONE_SELECTING" 
+			visible when ( dvarint("iw4x_maps_dlc") == 99 ) 
+			onFocus 
+			{ 
+				play CHOICE_FOCUS_SOUND; 
+				setItemColor self backcolor 0 0 0 1; 
+				setLocalVarBool "ui_menuAButton" ( 1 ); 
+			} 
+			leaveFocus 
+			{ 
+				setItemColor self backcolor 0 0 0 0; 
+				setLocalVarString "ui_hint_text" ( "@NULL_EMPTY" ); 
+				setLocalVarBool "ui_menuAButton" ( 0 ); 
+			} 
+			action 
+			{ 
+				play "mouse_click"; 
+				escape "self"; 
+				uiScript "ApplyMap" 
+				close "settings_map"; 
+				close "self"; 
 			} 
 		}
 
-	ITEM_BUTTON_BACK(close self;)
+		itemDef
+		{
+			name "maplist_hd"
+			rect -478 28 185 356 3 1
+			visible 1
+			style 1
+			border 1
+			bordersize 1
+			forecolor 1 1 1 1
+			backcolor 0 0 0 0.7
+			bordercolor 1 1 1 0.15
+			outlinecolor 1 1 1 0.2
+			type ITEM_TYPE_LISTBOX
+			textfont 1
+			textalignx 6
+			textscale 0.4
+			feeder 60
+			elementtype LISTBOX_TEXT
+			elementWidth 120
+			elementHeight 22
+			visible when ( dvarbool( "widescreen" ) && dvarint("iw4x_maps_dlc") == 99 )
+			onFocus
+			{
+				play "mouse_over";
+				setItemColor "maplist" bordercolor 1 1 1 "1";
+				LOCAL_MAP_FOCUS( "@" + localvarstring( "ui_info_name" ), "Custom usermaps/", "loadscreen_mp_bonusmaps" )
+			}
+			leaveFocus
+			{
+				setItemColor "maplist" bordercolor 1 1 1 "0.15";
+			}
+		}
+		itemDef
+		{
+			rect -292 28 292 356 3 1
+			style 3
+			foreColor 0 0 0 0.7
+			background "black"
+			decoration 
+			textScale 0.55
+			visible when ( dvarbool( "widescreen" ) )
+		}
+		itemDef
+		{
+			name "mapimage"
+			rect -282 50 272 153 3 1
+			style 3
+			foreColor 1 1 1 1
+			decoration 
+			textScale 0.55
+			exp material ( localvarstring( "ui_info_icon" ) )
+			visible when(localvarstring( "ui_info_icon") != "" && dvarbool( "widescreen" ) && dvarint("iw4x_maps_dlc") != 99 )
+		}
+		itemDef
+		{
+			name "longname"
+			rect -282 28 272 22 3 1
+			foreColor 1 1 1 1
+			decoration 
+			textAlign 4
+			textScale 0.375
+			textFont 9
+			exp text ( "@" + localvarstring( "ui_info_name" ) )
+			visible when ( dvarbool( "widescreen" ) )
+		}
+		itemDef
+		{
+			name "description"
+			rect -282 203 272 20 3 1
+			foreColor 1 1 1 0.65
+			decoration 
+			autoWrapped 
+			textAlign 4
+			textScale 0.375
+			textFont 3
+			exp text ( "@" + localvarstring( "ui_info_desc" ) )
+			visible when ( dvarbool( "widescreen" ) )
+		}
+
+		// temporary lazy fix for non 16:9
+
+		itemDef
+		{
+			name "maplist_sd"
+			rect -292 28 120 356 3 1
+			visible 1
+			style 1
+			border 1
+			bordersize 1
+			forecolor 1 1 1 1
+			backcolor 0 0 0 0.7
+			bordercolor 1 1 1 0.15
+			outlinecolor 1 1 1 0.2
+			type ITEM_TYPE_LISTBOX
+			textfont 1
+			textalignx 6
+			textscale 0.4
+			feeder 60
+			elementtype LISTBOX_TEXT
+			elementWidth 120
+			elementHeight 22
+			visible when (!dvarbool( "widescreen" ) && dvarint("iw4x_maps_dlc") == 99 )
+			onFocus
+			{
+				play "mouse_over";
+				setItemColor "maplist" bordercolor 1 1 1 "1";
+				LOCAL_MAP_FOCUS( "Custom Maps", "Custom usermaps/", "loadscreen_mp_bonusmaps" )
+			}
+			leaveFocus
+			{
+				setItemColor "maplist" bordercolor 1 1 1 "0.15";
+			}
+		}
+
+		itemDef
+		{
+			rect -172 28 210 356 3 1
+			style 3
+			foreColor 0 0 0 0.7
+			background "black"
+			decoration 
+			textScale 0.55
+			visible when ( !dvarbool( "widescreen" ) )
+		}
+		itemDef
+		{
+			name "mapimage"
+			rect -162 50 190 133 3 1
+			style 3
+			foreColor 1 1 1 1
+			decoration 
+			textScale 0.55
+			exp material ( localvarstring( "ui_info_icon" ) )
+			visible when( localvarstring( "ui_info_icon") != "" && !dvarbool( "widescreen" ) && dvarint("iw4x_maps_dlc") != 99	 )
+		}
+		itemDef
+		{
+			name "longname"
+			rect -162 28 200 22 3 1
+			foreColor 1 1 1 1
+			decoration 
+			textAlign 4
+			textScale 0.375
+			textFont 9
+			visible 1
+			exp text ( "@" + localvarstring( "ui_info_name" ) )
+			visible when ( !dvarbool( "widescreen" ) )
+		}
+		itemDef
+		{
+			name "description"
+			rect -162 186 200 20 3 1
+			foreColor 1 1 1 0.65
+			decoration 
+			autoWrapped 
+			textAlign 4
+			textScale 0.375
+			textFont 3
+			visible 1
+			exp text ( "@" + localvarstring( "ui_info_desc" ) )
+			visible when ( !dvarbool("widescreen") )
+		}
+	}
 }

iw4x/iw4x_00/vision/mp_bloc.vision

@@ -1,16 +1,4 @@
 r_glow                    "1"
-//r_glowRadius0             "0.5"
-//r_glowBloomCutoff         "0.68"
-//r_glowBloomDesaturation   "0"
-//r_glowBloomIntensity0     "0.45"
- 
-//r_filmEnable				"1"
-//r_filmContrast				"0.82104"
-//r_filmBrightness			"0"
-//r_filmDesaturation			"0.352396"
-//r_filmInvert				"0"
-//r_filmLightTint				"1.10838 1.10717 1.15409"
-//r_filmDarkTint				"0.6 0.858125 0.9"
 
 r_glowRadius0             "0.5"
 r_glowBloomCutoff         "0.66"

iw4x/iw4x_00/vision/mp_broadcast.vision

@@ -0,0 +1,17 @@
+r_glow                    "0"
+r_glowRadius0             "5"
+r_glowRadius1             "12"
+r_glowBloomCutoff         "0.9"
+r_glowBloomDesaturation   "0.75"
+r_glowBloomIntensity0     "1"
+r_glowBloomIntensity1     "1"
+r_glowSkyBleedIntensity0  "0.5"
+r_glowSkyBleedIntensity1  "0"
+ 
+r_filmEnable              "1"
+r_filmContrast            "1.5"
+r_filmBrightness          "0.2298"
+r_filmDesaturation        "0.1"
+r_filmInvert              "0"
+r_filmLightTint           "1.179 1.086 1.024"
+r_filmDarkTint            "0.7 1.0215 1.265"

iw4x/iw4x_00/vision/mp_citystreets.vision

@@ -0,0 +1,19 @@
+r_glow                    "1"
+r_glowRadius0             "0"
+r_glowBloomCutoff         "0"
+r_glowBloomDesaturation   "0"
+r_glowBloomIntensity0     "0"
+ 
+r_filmEnable              "1"
+r_filmContrast            "1.15843"
+r_filmBrightness          "0.0355033"
+r_filmDesaturation        "0.40242"
+r_filmDesaturationDark    "0.402416"
+r_filmInvert              "0"
+r_filmLightTint           "1.25 1.28 0.71"
+r_filmDarkTint            "0.49 0.50 0.465"
+r_filmMediumTint          "1.19992 1.16455 1.16903"
+ 
+r_primaryLightUseTweaks              "1"
+r_primaryLightTweakDiffuseStrength   "1.5"
+r_primaryLightTweakSpecularStrength  "1.2"

iw4x/iw4x_00/vision/mp_convoy.vision

@@ -0,0 +1,19 @@
+r_glow                    "1"
+r_glowRadius0             "0"
+r_glowBloomCutoff         "0.000359348"
+r_glowBloomDesaturation   "0"
+r_glowBloomIntensity0     "0"␍
+ ␍
+r_filmEnable              "1"
+r_filmContrast            "0.78"
+r_filmBrightness          "-0.069"
+r_filmDesaturation        "0.28"
+r_filmDesaturationDark    "0.58"
+r_filmInvert              "0"␍
+r_filmMediumTint          "1 1 1"
+r_filmLightTint           "1.17604 1.16347 1.12133"
+r_filmDarkTint            "0.853149 0.782718 1.0015"
+␍
+r_primaryLightUseTweaks              "1"
+r_primaryLightTweakDiffuseStrength   "1.125"
+r_primaryLightTweakSpecularStrength  "1.5"␍

iw4x/iw4x_00/vision/mp_pipeline.vision

@@ -2,11 +2,11 @@ r_glow                    "1"
 r_glowRadius0             "7.15348"
 r_glowBloomCutoff         "0.749243"
 r_glowBloomDesaturation   "1"
-r_glowBloomIntensity0     "0.3"
+r_glowBloomIntensity0     "0.6"
  
 r_filmEnable              "1"
 r_filmContrast            "1.068"
-r_filmBrightness          "0.01177428"
+r_filmBrightness          "-0.01177428"
 r_filmDesaturation        "0.060000"
 r_filmDesaturationDark    "0.188197"
 r_filmInvert              "0"

iw4x/iw4x_00/vision/mp_showdown.vision

@@ -0,0 +1,18 @@
+r_glow                    "1"
+r_glowRadius0             "2.73322"
+r_glowRadius1             "4.4"
+r_glowBloomCutoff         "0.269427"
+r_glowBloomDesaturation   "0.75"
+r_glowBloomIntensity0     "0.37154"
+r_glowBloomIntensity1     ".375"
+r_glowSkyBleedIntensity0  "0"
+r_glowSkyBleedIntensity1  "0"
+ 
+r_filmEnable              "1"
+r_filmContrast            "1.2"
+r_filmBrightness          "0.055"
+r_filmDesaturation        "0.386669"
+r_filmInvert              "0"
+r_filmLightTint           "1.09 1.20125 0.891854"
+r_filmMediumTint          "1.05654 1.05654 0.994713"
+r_filmDarkTint            "1.13153 0.80991 1.19249"

scripts/release.ps1

@@ -0,0 +1,79 @@
+# Window Title
+(Get-Host).UI.RawUI.WindowTitle = "Release Script: iw4x-rawfiles"
+
+# Set the progress preference so that no blue progress bars appear in the console when running Compress-Archive cmdlets.
+${global:ProgressPreference} = "SilentlyContinue"
+
+# Grab the parent directory of the .ps1 script, regardless of the working directory you run the script from. This should 
+# grab the full path to the iw4x-rawfiles directory, assuming this script is in the iw4x-rawfiles\scripts directory.
+${rawFilesPath} = (Get-Item ${PSScriptRoot}).parent.FullName
+
+# Create folders used for the release.
+if (!(Test-Path -Path "${rawFilesPath}\release")) {
+    [void](New-Item "${rawFilesPath}\release" -ItemType Directory)
+}
+
+if (Test-Path -Path "${rawFilesPath}\release\temp") {
+    Remove-Item -Recurse -Force "${rawFilesPath}\release\temp"
+}
+
+[void](New-Item "${rawFilesPath}\release\temp" -ItemType Directory)
+
+# Copy executables, iw4x files, and zone files to the temp folder.
+Write-Host "Copying executables to ${rawFilesPath}\release\temp..."
+Copy-Item -Path "${rawFilesPath}\iw4sp.exe" -Destination "${rawFilesPath}\release\temp\iw4sp.exe"
+Copy-Item -Path "${rawFilesPath}\iw4x.exe" -Destination "${rawFilesPath}\release\temp\iw4x.exe"
+Write-Host "Done copying executable files.`n"
+
+Write-Host "Copying files to ${rawFilesPath}\release\temp\iw4x..."
+Copy-Item -Path "${rawFilesPath}\iw4x" -Destination "${rawFilesPath}\release\temp\iw4x" -Recurse
+Write-Host "Done copying iw4x files.`n"
+
+Write-Host "Copying files to ${rawFilesPath}\release\temp\zone..."
+Copy-Item -Path "${rawFilesPath}\zone" -Destination "${rawFilesPath}\release\temp\zone" -Recurse
+Write-Host "Done copying zone files.`n"
+
+# Create iw4x_00.iwd
+Write-Host "Compressing iw4x_00.zip..."
+Compress-Archive -Path "${rawFilesPath}\release\temp\iw4x\iw4x_00\*" -DestinationPath "${rawFilesPath}\release\temp\iw4x\iw4x_00.zip"
+Write-Host "Renaming iw4x_00.zip to iw4x_00.iwd..."
+Move-Item -Path "${rawFilesPath}\release\temp\iw4x\iw4x_00.zip" -Destination "${rawFilesPath}\release\temp\iw4x\iw4x_00.iwd"
+Write-Host "Cleaning up iw4x_00 directory..."
+Remove-Item -Recurse "${rawFilesPath}\release\temp\iw4x\iw4x_00"
+Write-Host "Finished compressing iw4x_00.iwd`n"
+
+# Create iw4x_01.iwd
+Write-Host "Compressing iw4x_01.zip..."
+Compress-Archive -Path "${rawFilesPath}\release\temp\iw4x\iw4x_01\*" -DestinationPath "${rawFilesPath}\release\temp\iw4x\iw4x_01.zip"
+Write-Host "Renaming iw4x_01.zip to iw4x_01.iwd..."
+Move-Item -Path "${rawFilesPath}\release\temp\iw4x\iw4x_01.zip" -Destination "${rawFilesPath}\release\temp\iw4x\iw4x_01.iwd"
+Write-Host "Cleaning up iw4x_01 directory..."
+Remove-Item -Recurse "${rawFilesPath}\release\temp\iw4x\iw4x_01"
+Write-Host "Finished compressing iw4x_01.iwd`n"
+
+# Create iw4x_02.iwd
+Write-Host "Compressing iw4x_02.zip..."
+Compress-Archive -Path "${rawFilesPath}\release\temp\iw4x\iw4x_02\*" -DestinationPath "${rawFilesPath}\release\temp\iw4x\iw4x_02.zip"
+Write-Host "Renaming iw4x_02.zip to iw4x_02.iwd..."
+Move-Item -Path "${rawFilesPath}\release\temp\iw4x\iw4x_02.zip" -Destination "${rawFilesPath}\release\temp\iw4x\iw4x_02.iwd"
+Write-Host "Cleaning up iw4x_02 directory..."
+Remove-Item -Recurse "${rawFilesPath}\release\temp\iw4x\iw4x_02"
+Write-Host "Finished compressing iw4x_02.iwd`n"
+
+# Create release.zip
+if (Test-Path -Path "${rawFilesPath}\release\release.zip") {
+    Write-Host "Cleaning up old release.zip..."
+    Remove-Item "${rawFilesPath}\release\release.zip"
+}
+
+Write-Host "Compressing release.zip..."
+Compress-Archive -Path "${rawFilesPath}\release\temp\*" -DestinationPath "${rawFilesPath}\release\release.zip"
+Write-Host "Finished compressing release.zip`n"
+
+# Clean up temp directory
+Write-Host "Cleaning up temp directory..."
+Remove-Item -Recurse "${rawFilesPath}\release\temp"
+Write-Host "Removed temp directory.`n"
+
+# Output path for the release file generated
+Write-Host "iw4x-rawfiles release script finished. File generated: ${rawFilesPath}\release\release.zip"

scripts/run_release.bat

@@ -0,0 +1 @@
+powershell.exe -ExecutionPolicy Bypass ./release.ps1