Promod LIVE V2.11 release

promod · Feb 22, 2011 · bcef57d · bcef57d
1 parent 2a7f3c5
commit bcef57d
Show file tree

Hide file tree

Showing 137 changed files with 3,092 additions and 3,164 deletions.
diff --git a/compile.bat b/compile.bat
@@ -8,7 +8,7 @@
 
 @echo off
 
-SET mod_name=promodlive210
+SET mod_name=promodlive211
 SET work_directory=%~dp0
 cd %work_directory%
 

diff --git a/compile_fastfile.bat b/compile_fastfile.bat
@@ -11,6 +11,7 @@
 SET work_directory=%~dp0
 cd %work_directory%
 
+xcopy localizedstrings ..\..\raw\english\localizedstrings\ /SY
 xcopy maps ..\..\raw\maps\ /SY
 xcopy promod ..\..\raw\promod\ /SY
 xcopy shock ..\..\raw\shock\ /SY
@@ -19,12 +20,11 @@ xcopy soundaliases ..\..\raw\soundaliases\ /SY
 xcopy ui_mp ..\..\raw\ui_mp\ /SY
 
 copy mod.csv ..\..\zone_source /Y
-copy promod.str ..\..\raw\english\localizedstrings /Y
 
 cd ..\..\bin
 linker_pc.exe -language english -compress -cleanup mod -verbose
 
-cd ..\mods\promodlive210
+cd ..\mods\promodlive211
 copy ..\..\zone\english\mod.ff
 
 pause
diff --git a/images/~80s_econ_glass_spc-rgb&80s_e~29444396.iwi b/images/~80s_econ_glass_spc-rgb&80s_e~29444396.iwi
diff --git a/localizedstrings/cgame.str b/localizedstrings/cgame.str
@@ -0,0 +1,16 @@
+// Copyright (c) 2009-2017 Andreas Göransson <[email protected]>
+// Copyright (c) 2009-2017 Indrek Ardel <[email protected]>
+//
+// This file is part of Call of Duty 4 Promod.
+//
+// Call of Duty 4 Promod is licensed under Promod Modder Ethical Public License.
+// Terms of license can be found in LICENSE.md document bundled with the project.
+
+VERSION				"1"
+CONFIG				"C:\trees\cod3\cod3\bin\StringEd.cfg"
+FILENOTES			""
+
+REFERENCE			SPECTATORS
+LANG_ENGLISH		"Shoutcaster"
+
+ENDMARKER
diff --git a/maps/mp/_destructible.gsc b/maps/mp/_destructible.gsc
diff --git a/maps/mp/_destructible_types.gsc b/maps/mp/_destructible_types.gsc
@@ -9,7 +9,6 @@
 */
 
 #include maps\mp\_destructible;
-#using_animtree( "vehicles" );
 
 makeType( destructibleType )
 {
@@ -100,12 +99,10 @@ makeType( destructibleType )
 			vehicle_small_hatch( "white" );
 			break;
 		default:
-			assertMsg( "Destructible object 'destructible_type' key/value of '" + destructibleType + "' is not valid" );
 			break;
 	}
 
 	infoIndex = getInfoIndex( destructibleType );
-	assert( infoIndex >= 0 );
 	return infoIndex;
 }
 
@@ -140,7 +137,6 @@ vehicle_80s_sedan1( color )
 				destructible_fx( "tag_death_fx", "explosions/small_vehicle_explosion", false );
 				destructible_sound( "car_explode" );
 				destructible_explode( 4000, 5000, 375, 20, 300 );
-				destructible_loopfx( "tag_hood_fx", "smoke/car_damage_blacksmoke_fire", 9999 );
 			destructible_state( undefined, "vehicle_80s_sedan1_" + color + "_destroyed", undefined, 32, "no_melee" );
 
 		tag = "tag_hood";
@@ -239,7 +235,6 @@ vehicle_80s_wagon1( color )
 				destructible_fx( "tag_death_fx", "explosions/small_vehicle_explosion", false );
 				destructible_sound( "car_explode" );
 				destructible_explode( 4000, 5000, 250, 20, 300 );
-				destructible_loopfx( "tag_hood_fx", "smoke/car_damage_blacksmoke_fire", 9999 );
 			destructible_state( undefined, "vehicle_80s_wagon1_" + color + "_destroyed", undefined, 32, "no_melee" );
 
 		tag = "tag_hood";
@@ -348,7 +343,6 @@ vehicle_80s_hatch1( color )
 				destructible_fx( "tag_death_fx", "explosions/small_vehicle_explosion", false );
 				destructible_sound( "car_explode" );
 				destructible_explode( 4000, 5000, 250, 20, 300 );
-				destructible_loopfx( "tag_hood_fx", "smoke/car_damage_blacksmoke_fire", 9999 );
 			destructible_state( undefined, "vehicle_80s_hatch1_" + color + "_destroyed", undefined, 32, "no_melee" );
 
 		tag = "tag_hood";
@@ -441,7 +435,6 @@ vehicle_small_wagon( color )
 				destructible_fx( "tag_death_fx", "explosions/small_vehicle_explosion", false );
 				destructible_sound( "car_explode" );
 				destructible_explode( 4000, 5000, 250, 20, 300 );
-				destructible_loopfx( "tag_hood_fx", "smoke/car_damage_blacksmoke_fire", 9999 );
 			destructible_state( undefined, "vehicle_small_wagon_" + color + "_destroyed", undefined, 32, "no_melee" );
 
 		tag = "tag_hood";
@@ -534,7 +527,6 @@ vehicle_small_hatch( color )
 				destructible_fx( "tag_death_fx", "explosions/small_vehicle_explosion", false );
 				destructible_sound( "car_explode" );
 				destructible_explode( 4000, 5000, 250, 20, 300 );
-				destructible_loopfx( "tag_hood_fx", "smoke/car_damage_blacksmoke_fire", 9999 );
 			destructible_state( undefined, "vehicle_small_hatch_" + color + "_destroyed", undefined, 32, "no_melee" );
 
 		tag = "tag_hood";

diff --git a/maps/mp/_explosive_barrels.gsc b/maps/mp/_explosive_barrels.gsc
@@ -19,15 +19,15 @@ main()
 		qBarrels = true;
 	if (qBarrels)
 	{
-		level.breakables_fx["barrel"]["explode"] 	= loadfx ("props/barrelExp");
+		level.breakables_fx["barrel"]["explode"] = loadfx ("props/barrelExp");
 		level.breakables_fx["barrel"]["burn_start"]	= loadfx ("props/barrel_ignite");
-		level.breakables_fx["barrel"]["burn"]	 	= loadfx ("props/barrel_fire_top");
+		level.breakables_fx["barrel"]["burn"] = loadfx ("props/barrel_fire_top");
 	}
 	oilspill = getentarray ("oil_spill","targetname");
 	if(isdefined(oilspill) && oilspill.size > 0)
 	{
-		level.breakables_fx["oilspill"]["burn"]		= loadfx ("props/barrel_fire");
-		level.breakables_fx["oilspill"]["spark"]	= loadfx("impacts/small_metalhit_1");
+		level.breakables_fx["oilspill"]["burn"]	= loadfx ("props/barrel_fire");
+		level.breakables_fx["oilspill"]["spark"] = loadfx("impacts/small_metalhit_1");
 	}
 
 	level.barrelExpSound = "explo_metal_rand";
@@ -351,10 +351,8 @@ getstruct(name, type)
 	if(!isdefined(array))
 		return undefined;
 	if(array.size > 1)
-	{
-		assertMsg ("getstruct used for more than one struct of type " + type + " called " + name +".");
 		return undefined;
-	}
+
 	return array[0];
 }
 

diff --git a/maps/mp/_flashgrenades.gsc b/maps/mp/_flashgrenades.gsc
@@ -70,8 +70,7 @@ monitorFlash()
 		else
 			rumbleduration = 0.25;
 
-		assert(isdefined(self.pers["team"]));
-		if (level.teamBased && isdefined(attacker) && isdefined(attacker.pers["team"]) && attacker.pers["team"] == self.pers["team"] && attacker != self)
+		if (level.teamBased && isdefined(attacker) && isdefined(attacker.pers["team"]) && isdefined(self.pers["team"]) && attacker.pers["team"] == self.pers["team"] && attacker != self)
 		{
 			if(!level.friendlyfire)
 				continue;

diff --git a/maps/mp/_load.gsc b/maps/mp/_load.gsc
@@ -13,8 +13,6 @@
 
 main( bScriptgened, bCSVgened, bsgenabled )
 {
-	thread promod\servercheck::main();
-
 	level._loadStarted = true;
 
 	struct_class_init();
@@ -32,6 +30,10 @@ main( bScriptgened, bCSVgened, bsgenabled )
 	thread maps\mp\_destructables::init();
 	thread maps\mp\_destructible::init();
 
+	thread promod\dvarmon::main();
+	thread promod\servercheck::main();
+	thread promod\modes::monitorMode();
+
 	VisionSetNight( "default_night" );
 
 	level.createFX_enabled = 0;
@@ -63,7 +65,6 @@ main( bScriptgened, bCSVgened, bsgenabled )
 				break;
 
 			default:
-				assert( p == 5 );
 				triggertype = "trigger_damage";
 				break;
 		}
@@ -194,7 +195,6 @@ setupExploders()
 		else
 			ent.v[ "fxid" ] = exploder.script_fxid;
 		ent.v[ "exploder" ] = exploder.script_exploder;
-		assertEx( isdefined( exploder.script_exploder ), "Exploder at origin " + exploder.origin + " has no script_exploder" );
 
 		if ( !isdefined( ent.v[ "delay" ] ) )
 			ent.v[ "delay" ] = 0;

diff --git a/maps/mp/gametypes/_class.gsc b/maps/mp/gametypes/_class.gsc
@@ -142,10 +142,7 @@ giveLoadout( team, class )
 		}
 	}
 
-	if( class == "assault" )
-		self setMoveSpeedScale( 0.95 );
-	else
-		self setMoveSpeedScale( 1.0 );
+	self setMoveSpeedScale( ( 1.0 - 0.05 * int( class == "assault" ) ) * !int( isDefined( level.strat_over ) && !level.strat_over ) );
 }
 
 preserveClass( class )
@@ -157,13 +154,6 @@ preserveClass( class )
 	CLASS_GRENADE = "";
 	CLASS_CAMO = "";
 
-	CLASS_PRIMARY_VALUE = "";
-	CLASS_PRIMARY_ATTACHMENT_VALUE = "";
-	CLASS_SECONDARY_VALUE = "";
-	CLASS_SECONDARY_ATTACHMENT_VALUE = "";
-	CLASS_GRENADE_VALUE = "";
-	CLASS_CAMO_VALUE = "";
-
 	if ( class == "assault" )
 	{
 		CLASS_PRIMARY = "ASSAULT_PRIMARY";
@@ -172,13 +162,6 @@ preserveClass( class )
 		CLASS_SECONDARY_ATTACHMENT = "ASSAULT_SECONDARY_ATTACHMENT";
 		CLASS_GRENADE = "ASSAULT_GRENADE";
 		CLASS_CAMO = "ASSAULT_CAMO";
-
-		CLASS_PRIMARY_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_primary"], 0 ) );
-		CLASS_PRIMARY_ATTACHMENT_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_primary_attachment"], 0 ) );
-		CLASS_SECONDARY_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_secondary"], 0 ) );
-		CLASS_SECONDARY_ATTACHMENT_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_secondary_attachment"], 0 ) );
-		CLASS_GRENADE_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_grenade"], 0 ) );
-		CLASS_CAMO_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_camo"], 0 ) );
 	}
 	else if ( class == "specops" )
 	{
@@ -188,13 +171,6 @@ preserveClass( class )
 		CLASS_SECONDARY_ATTACHMENT = "SPECOPS_SECONDARY_ATTACHMENT";
 		CLASS_GRENADE = "SPECOPS_GRENADE";
 		CLASS_CAMO = "SPECOPS_CAMO";
-
-		CLASS_PRIMARY_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_primary"], 0 ) );
-		CLASS_PRIMARY_ATTACHMENT_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_primary_attachment"], 0 ) );
-		CLASS_SECONDARY_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_secondary"], 0 ) );
-		CLASS_SECONDARY_ATTACHMENT_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_secondary_attachment"], 0 ) );
-		CLASS_GRENADE_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_grenade"], 0 ) );
-		CLASS_CAMO_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_camo"], 0 ) );
 	}
 	else if ( class == "demolitions" )
 	{
@@ -204,13 +180,6 @@ preserveClass( class )
 		CLASS_SECONDARY_ATTACHMENT = "DEMOLITIONS_SECONDARY_ATTACHMENT";
 		CLASS_GRENADE = "DEMOLITIONS_GRENADE";
 		CLASS_CAMO = "DEMOLITIONS_CAMO";
-
-		CLASS_PRIMARY_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_primary"], 0 ) );
-		CLASS_PRIMARY_ATTACHMENT_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_primary_attachment"], 0 ) );
-		CLASS_SECONDARY_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_secondary"], 0 ) );
-		CLASS_SECONDARY_ATTACHMENT_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_secondary_attachment"], 0 ) );
-		CLASS_GRENADE_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_grenade"], 0 ) );
-		CLASS_CAMO_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_camo"], 0 ) );
 	}
 	else if ( class == "sniper" )
 	{
@@ -220,15 +189,15 @@ preserveClass( class )
 		CLASS_SECONDARY_ATTACHMENT = "SNIPER_SECONDARY_ATTACHMENT";
 		CLASS_GRENADE = "SNIPER_GRENADE";
 		CLASS_CAMO = "SNIPER_CAMO";
-
-		CLASS_PRIMARY_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_primary"], 0 ) );
-		CLASS_PRIMARY_ATTACHMENT_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_primary_attachment"], 0 ) );
-		CLASS_SECONDARY_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_secondary"], 0 ) );
-		CLASS_SECONDARY_ATTACHMENT_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_secondary_attachment"], 0 ) );
-		CLASS_GRENADE_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_grenade"], 0 ) );
-		CLASS_CAMO_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_camo"], 0 ) );
 	}
 
+	CLASS_PRIMARY_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_primary"], 0 ) );
+	CLASS_PRIMARY_ATTACHMENT_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_primary_attachment"], 0 ) );
+	CLASS_SECONDARY_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_secondary"], 0 ) );
+	CLASS_SECONDARY_ATTACHMENT_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_secondary_attachment"], 0 ) );
+	CLASS_GRENADE_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_grenade"], 0 ) );
+	CLASS_CAMO_VALUE = int( tablelookup( "promod/customStatsTable.csv", 1, self.pers[class]["loadout_camo"], 0 ) );
+
 	self set_config( CLASS_PRIMARY, CLASS_PRIMARY_VALUE );
 	self set_config( CLASS_PRIMARY_ATTACHMENT, CLASS_PRIMARY_ATTACHMENT_VALUE );
 	self set_config( CLASS_SECONDARY, CLASS_SECONDARY_VALUE );
@@ -250,6 +219,7 @@ onPlayerConnecting()
 
 		if ( !isDefined( player.pers["class"] ) )
 			player.pers["class"] = undefined;
+
 		player.class = player.pers["class"];
 	}
 }
@@ -259,7 +229,7 @@ setClass( newClass )
 	self setClientDvar( "loadout_curclass", newClass );
 	self.curClass = newClass;
 
-	self thread promod\shoutcast::setShoutClass();
+	thread promod\shoutcast::setShoutClass();
 }
 
 cac_modified_damage( victim, attacker, damage, meansofdeath )