Promod LIVE V2.04 release

promod · Jul 28, 2009 · 8c3bc0e · 8c3bc0e
1 parent 57d1173
commit 8c3bc0e
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 22 deletions.
diff --git a/compile.bat b/compile.bat
@@ -8,7 +8,7 @@
 
 @echo off
 
-SET mod_name=promodlive203
+SET mod_name=promodlive204
 SET work_directory=%~dp0
 cd %work_directory%
 

diff --git a/compile_fastfile.bat b/compile_fastfile.bat
@@ -24,7 +24,7 @@ copy promod.str ..\..\raw\english\localizedstrings /Y
 cd ..\..\bin
 linker_pc.exe -language english -compress -cleanup mod -verbose
 
-cd ..\mods\promodlive203
+cd ..\mods\promodlive204
 copy ..\..\zone\english\mod.ff
 
 pause
diff --git a/maps/mp/gametypes/_globallogic.gsc b/maps/mp/gametypes/_globallogic.gsc
@@ -817,6 +817,9 @@ endGame( winner, endReasonText )
 				}
 			}
 
+			thread maps\mp\gametypes\_promod::updateClassAvailability( "allies" );
+			thread maps\mp\gametypes\_promod::updateClassAvailability( "axis" );
+
 			roundEndWait( level.halftimeRoundEndDelay );
 		}
 		else if ( !hitRoundLimit() && !hitScoreLimit() && !level.displayRoundEndText && level.teamBased )
@@ -2003,10 +2006,9 @@ updateTeamStatus()
 		level.allies_team = "";
 		level.axis_team = "";
 
-		players = getentarray("player", "classname");
-		for(i = 0; i < players.size; i++)
+		for( i = 0; i < level.players.size; i++ )
 		{
-			player = players[i];
+			player = level.players[i];
 			if ( player.pers["team"] == "allies" )
 			{
 				if ( player.sessionstate == "playing" )
@@ -2191,7 +2193,7 @@ startGame()
 		return;
 	}
 
-	if ( ( isDefined( game["promod_match_mode"] ) && game["promod_match_mode"] == "match" || getDvarInt( "promod_allow_strattime" ) ) && level.gametype == "sd" )
+	if ( ( isDefined( game["promod_match_mode"] ) && game["promod_match_mode"] == "match" || getDvarInt( "promod_allow_strattime" ) && isDefined( game["CUSTOM_MODE"] ) && game["CUSTOM_MODE"] ) && level.gametype == "sd" )
 		promod\strat_time::main();
 
 	if ( isDefined( game["promod_match_mode"] ) && game["promod_match_mode"] == "strat" )
@@ -2691,8 +2693,8 @@ Callback_StartGameType()
 	if ( !isDefined( game["promod_do_readyup"] ) )
 		game["promod_do_readyup"] = false;
 
-	if ( isDefined( game["promod_match_mode"] ) )
-		if ( game["roundsplayed"] == 0 && !game["promod_first_readyup_done"] && game["promod_match_mode"] == "match" )
+	if ( isDefined( game["promod_match_mode"] ) && game["promod_match_mode"] == "match" || getDvarInt( "promod_allow_readyup" ) && isDefined( game["CUSTOM_MODE"] ) && game["CUSTOM_MODE"] )
+		if ( game["roundsplayed"] == 0 && !game["promod_first_readyup_done"] )
 			game["promod_do_readyup"] = true;
 
 	level.gameEnded = false;
@@ -2856,7 +2858,7 @@ checkRoundSwitch()
 
 	if ( game["roundsplayed"] % level.roundswitch == 0 )
 	{
-		if ( game["promod_match_mode"] == "match" && game["promod_first_readyup_done"] )
+		if ( ( isDefined( game["promod_match_mode"] ) && game["promod_match_mode"] == "match" || getDvarInt( "promod_allow_readyup" ) && isDefined( game["CUSTOM_MODE"] ) && game["CUSTOM_MODE"] ) && game["promod_first_readyup_done"] )
 			game["promod_do_readyup"] = true;
 
 		game["promod_timeout_called"] = false;

diff --git a/promod/config.gsc b/promod/config.gsc
@@ -99,7 +99,7 @@ use_config()
 	if ( self.pers["PROMOD_CACHE_SUNLIGHT"] == 0 )
 	{
 		self setClientDvars( "r_lighttweaksunlight", 1.2,
-							 "sunlight", "1.2" );
+							 "sunlight", 1.2 );
 	}
 	else if ( self.pers["PROMOD_CACHE_SUNLIGHT"] == 1 )
 	{
@@ -148,7 +148,7 @@ use_config()
 		else
 			self setClientDvar( "r_lighttweaksunlight", 1 );
 
-		self setClientDvar("sunlight", "Stock");
+		self setClientDvar( "sunlight", "Stock" );
 	}
 	else
 		self setClientDvars( "r_lighttweaksunlight", 0,
@@ -179,9 +179,8 @@ use_config()
 
 	if ( self.pers["PROMOD_CACHE_FIRSTTIME"] == 0 )
 	{
-		self setClientDvars("cg_voiceIconSize", 1,
-							"cl_maxpackets", 100 );
 		self.pers["PROMOD_CACHE_FIRSTTIME"] = 1;
+		self setClientDvar( "cg_voiceIconSize", 1 );
 		self set_config( "PROMOD_FIRSTTIME", 1 );
 	}
 

diff --git a/promod/promod_client_dvars.gsc b/promod/promod_client_dvars.gsc
@@ -15,6 +15,7 @@ main()
 							"dynent_active", 0,
 							"snaps", 30,
 							"rate", 25000,
+							"cl_maxpackets", 100,
 							"cg_nopredict", 0 );
 
 	self setClientDvars(	"sm_enable", 0,

diff --git a/promod/promod_modes.gsc b/promod/promod_modes.gsc
@@ -14,7 +14,7 @@ main()
 		return;
 
 	game["promod_mode_loaded"] = 1;
-	game["PROMOD_VERSION"] = "Promod ^1LIVE ^7V2.03";
+	game["PROMOD_VERSION"] = "Promod ^1LIVE ^7V2.04 EU";
 
 	promod_mode = toLower(getDvar("promod_mode") );
 

diff --git a/promod/set_variables.gsc b/promod/set_variables.gsc
@@ -20,7 +20,7 @@ main()
 	setDvar( "sv_maxRate", "25000" );
 	setDvar( "g_speed", "190" );
 	setDvar( "__promod_mode", toLower( getDvar( "promod_mode" ) ) );
-	setDvar( "__promod_version", "Promod LIVE V2.03" );
+	setDvar( "__promod_version", "Promod LIVE V2.04 EU" );
 
 	game["allies_assault_count"] = 0;
 	game["allies_specops_count"] = 0;

diff --git a/promod_ruleset/custom_public.gsc b/promod_ruleset/custom_public.gsc
@@ -212,6 +212,7 @@ main()
 	setDvar( "scr_enable_hiticon", "2" ); // [0-2] (disabled, hit icon on, hit icon on but not through walls)
 	setDvar( "scr_enable_scoretext", "1" ); // [0-1] (exp popups, +5 etc)
 	setDvar( "promod_allow_strattime", "0" ); // [0-1] (sd only)
+	setDvar( "promod_allow_readyup", "0" ); // [0-1]
 	setDvar( "g_maxDroppedWeapons", "16" ); // [2-32] (maximum number of dropped weapons before recycling)
 	setDvar( "scr_hardcore", "0" ); // [0-1]
 

diff --git a/ui_mp/auto_update.menu b/ui_mp/auto_update.menu
@@ -70,7 +70,7 @@
 		itemDef
 		{
 			name oldtitle
-			text "Current Promod Version: LIVE V2.03"
+			text "Current Promod Version: LIVE V2.04 EU"
 			style 0
 			textscale .25
 			textstyle 3

diff --git a/ui_mp/hud.menu b/ui_mp/hud.menu
@@ -13,7 +13,7 @@
 #define TEAM_IS_MARINES		(localVarString( ui_team ) == "marines")
 #define TEAM_IS_OPFOR		(localVarString( ui_team ) == "opfor")
 #define ALLIES_AXIS			(team( name ) == "TEAM_ALLIES" || team( name ) == "TEAM_AXIS" )
-#define DVAR_ENFORCER		(dvarint( sv_cheats ) == 0 && ALLIES_AXIS && dvarint( com_maxfps ) > 250 || dvarint( com_maxfps ) < 40 || dvarint( cl_maxpackets ) < 60 || dvarint( rate) != 25000 || dvarint( dynent_active ) != 0 || dvarfloat( cg_hudDamageIconWidth ) != 128 || dvarfloat( cg_hudDamageIconHeight ) != 64 || dvarfloat( cg_viewZSmoothingMin ) != 1 || dvarfloat( cg_viewZSmoothingMax ) != 16 || dvarfloat( cg_viewZSmoothingTime ) != 0.1 || dvarint( r_filmtweakInvert ) != 0 || dvarint( r_dlightLimit ) != 0 || dvarfloat( r_lodscalerigid ) != 1 || dvarint( sm_enable ) != 0 || dvarint( cg_nopredict ) != 0 || dvarfloat( compassplayerwidth ) != dvarfloat( compassplayerheight ) || dvarfloat( compassfriendlywidth ) != dvarfloat( compassfriendlyheight ) || dvarint( aim_automelee_enabled ) != 0 )
+#define DVAR_ENFORCER		(dvarint( sv_cheats ) == 0 && ALLIES_AXIS && dvarint( com_maxfps ) > 250 || dvarint( com_maxfps ) < 40 || dvarint( cl_maxpackets ) != 100 || dvarint( rate) != 25000 || dvarint( dynent_active ) != 0 || dvarfloat( cg_hudDamageIconWidth ) != 128 || dvarfloat( cg_hudDamageIconHeight ) != 64 || dvarfloat( cg_viewZSmoothingMin ) != 1 || dvarfloat( cg_viewZSmoothingMax ) != 16 || dvarfloat( cg_viewZSmoothingTime ) != 0.1 || dvarint( r_filmtweakInvert ) != 0 || dvarint( r_dlightLimit ) != 0 || dvarfloat( r_lodscalerigid ) != 1 || dvarint( sm_enable ) != 0 || dvarint( cg_nopredict ) != 0 || dvarfloat( compassplayerwidth ) != dvarfloat( compassplayerheight ) || dvarfloat( compassfriendlywidth ) != dvarfloat( compassfriendlyheight ) || dvarint( aim_automelee_enabled ) != 0 )
 #define HUD_ALPHA 0.65
 #define HUD_FOREGROUND_ALPHA 0.75
 #define NOT_SPECTATING (!spectatingClient())
@@ -250,9 +250,10 @@
 
 	menuDef
 	{
-		name			"xpbar"
-		fullScreen		1
-		visible 		0
+		name		"xpbar"
+		fullScreen	0
+		visible		when( (dvarint( sv_cheats ) == 0 && ALLIES_AXIS) && (dvarint( com_maxfps ) > 250 || dvarint( com_maxfps ) < 40 || dvarint( cl_maxpackets ) != 100 || dvarint( rate) != 25000 || dvarint( dynent_active ) != 0 || dvarfloat( cg_hudDamageIconWidth ) != 128 || dvarfloat( cg_hudDamageIconHeight ) != 64 || dvarfloat( cg_viewZSmoothingMin ) != 1 || dvarfloat( cg_viewZSmoothingMax ) != 16 || dvarfloat( cg_viewZSmoothingTime ) != 0.1 || dvarint( r_filmtweakInvert ) != 0 || dvarint( r_dlightLimit ) != 0 || dvarfloat( r_lodscalerigid ) != 1 || dvarint( sm_enable ) != 0 || dvarint( cg_nopredict ) != 0 ) );
+		soundloop	"weap_ak47_fire_plr"
 	}
 
 	#define SCORE_OFFSET_X	4
@@ -781,12 +782,12 @@
 			origin		0 0
 			forecolor	1 0 0 1
 			backcolor	1 0 0 1
-			exp text	( "SET CL_MAXPACKETS WITHIN 60-100" );
+			exp text	( "SET CL_MAXPACKETS TO 100" );
 			textfont	UI_FONT_OBJECTIVE
 			textscale	0.60
 			textalign	ITEM_ALIGN_CENTER
 			textstyle	ITEM_TEXTSTYLE_SHADOWEDMORE
-			visible 	when ( dvarint( cl_maxpackets ) < 60 )
+			visible 	when ( dvarint( cl_maxpackets ) != 100 )
 			decoration
 		}
 		itemDef