Survival Maps 2.0.1.6 Update

JezuzLizard · Jul 29, 2021 · fab14f8 · fab14f8
1 parent 846d73d
commit fab14f8
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 8 deletions.
diff --git a/Plutonium/maps/mp/gametypes_zm/_clientids.gsc b/Plutonium/maps/mp/gametypes_zm/_clientids.gsc
@@ -28,6 +28,7 @@ init()
 meleeCoords()
 {
 	level endon("end_game");
+	self endon("disconnnect");
 	for(;;)
 	{
 		if(self meleeButtonPressed())
@@ -73,6 +74,7 @@ power_setup()
 
 onplayerconnected()
 {
+	level endon("end_game");
 	for ( ;; )
 	{
 		level waittill( "connected", player );
@@ -97,7 +99,7 @@ perkHud()
 	if(isdefined(level.customMap) && level.customMap == "vanilla")
 		return;
 	self endon("disconnect");
-	self endon("end_game");
+	level endon("end_game");
 	self.perkText = self createText("Objective", 1, "LEFT", "TOP", -395, -10, 1, self getPerkDisplay());
 	for(;;)
 	{
@@ -123,6 +125,8 @@ getPerkDisplay()
 
 addPerkSlot()
 {
+	self endon("disconnect");
+	level endon("end_game");
 	perks = getPerks();
 	killsNeeded = getDvarIntDefault( "perkSlotIncreaseKills", 0 );
 	completedCount = 0;
@@ -897,6 +901,7 @@ wunderfizzSetup(origin, angles, model)
 
 wunderfizz(origin, angles, model, cost, perks, trig, wunderfizzBottle )
 {
+	level endon("end_game");
 	if(is_true(level.disableBSMMagic))
 	{
 		trig SetHintString("Magic is disabled");
@@ -1111,6 +1116,7 @@ can_buy_weapon() //checked matches cerberus output
 
 playLocFX()
 {
+	level endon("end_game");
 	level waittill("connected", player);
 	for(;;)
 	{
@@ -1126,6 +1132,7 @@ playLocFX()
 
 chooseLocation(currLoc)
 {
+	level endon("end_game");
 	for(;;)
 	{
 		loc = RandomIntRange(1, level.wunderfizz_locations + 1);

diff --git a/Plutonium/maps/mp/gametypes_zm/_zm_gametype.gsc b/Plutonium/maps/mp/gametypes_zm/_zm_gametype.gsc
@@ -1464,7 +1464,7 @@ override_map()
 	}
 	else if ( isdefined(mapname) && mapname == "zm_tomb" )
 	{
-		if ( GetDvar("customMap") != "trenches" && GetDvar("customMap") != "crazyplace" && GetDvar("customMap") != "vanilla" )
+		if ( GetDvar("customMap") != "trenches" && GetDvar("customMap") != "crazyplace" && GetDvar("customMap") != "excavation" && GetDvar("customMap") != "vanilla" )
 		{
 			SetDvar( "customMap", "trenches" );
 		}
@@ -3175,6 +3175,14 @@ get_player_spawns_for_gametype() //modified function
 		}
 		return custom_spawns;
 	}
+	else if ( isdefined( level.customMap ) && level.customMap == "excavation" )
+	{
+		for ( i = 0; i < level.excavationSpawnpoints.size; i++ )
+		{
+			custom_spawns[ custom_spawns.size ] = level.excavationSpawnpoints[ i ];
+		}
+		return custom_spawns;
+	}
 	return player_spawns;
 }
 

diff --git a/Plutonium/maps/mp/zm_highrise.gsc b/Plutonium/maps/mp/zm_highrise.gsc
@@ -270,7 +270,7 @@ main() //checked changed to match cerberus output
 		foreach(elevator in level.elevators)
 		{
 			elevator.body.lock_doors = 1;
-			elevator.body maps/mp/_zm_highrise_elevators::perkelevatordoor(0);
+			elevator.body maps/mp/zm_highrise_elevators::perkelevatordoor(0);
 		}
 	}
 }

diff --git a/Plutonium/maps/mp/zombies/_zm_magicbox.gsc b/Plutonium/maps/mp/zombies/_zm_magicbox.gsc
@@ -179,12 +179,12 @@ init() //modified function
 			start_chest = spawnstruct();
 			start_chest.origin = ( 1608.58, 1053.19, 3221.79 );
 			start_chest.angles = ( 0, 0, 0 );
-			start_chest.script_noteworthy = "start_chest";
+			start_chest.script_noteworthy = "ob6_chest";
 			start_chest.zombie_cost = 950;
 			start_chest2 = spawnstruct();
 			start_chest2.origin = (2177.11, 2416.36, 3040.13);
 			start_chest2.angles = ( 0, 180, 0 );
-			start_chest2.script_noteworthy = "ob6_chest";
+			start_chest2.script_noteworthy = "start_chest";
 			start_chest2.zombie_cost = 950;
 			level.chests[ 0 ] = start_chest;
 			level.chests[ 1 ] = start_chest2;
@@ -375,12 +375,12 @@ set_treasure_chest_cost( cost ) //checked matches cerberus output
 get_chest_pieces() //modified function
 {
 	self.chest_box = getent( self.script_noteworthy + "_zbarrier", "script_noteworthy" );
-	if ( isDefined( level.customMap ) && level.customMap == "building1top" && self.script_noteworthy == "start_chest" )
+	if ( isDefined( level.customMap ) && level.customMap == "building1top" && self.script_noteworthy == "ob6_chest" )
 	{
 		self.chest_box.origin = (1608.58, 1053.19, 3221.79);
 		self.chest_box.angles = (0, 0, 0);
 	}
-	if ( isDefined( level.customMap ) && level.customMap == "building1top" && self.script_noteworthy == "ob6_chest" )
+	if ( isDefined( level.customMap ) && level.customMap == "building1top" && self.script_noteworthy == "start_chest" )
 	{
 		self.chest_box.origin = (2177.11, 2416.36, 3040.13);
 		self.chest_box.angles = (0, 180, 0);

diff --git a/Plutonium/maps/mp/zombies/_zm_perks.gsc b/Plutonium/maps/mp/zombies/_zm_perks.gsc
@@ -3221,6 +3221,13 @@ perk_machine_spawn_init() //modified function
 						else
 							pos[ pos.size ] = structs[ i ];
 					}
+					else if( is_true(level.customMap == "excavation") )
+					{
+						if(structs[i].script_noteworthy == "specialty_weapupgrade" || structs[i].script_noteworthy == "specialty_quickrevive" || structs[i].script_noteworthy == "specialty_fastreload" )
+							structs[i] Delete();
+						else
+							pos[ pos.size ] = structs[ i ];
+					}
 					else
 					{
 						pos[ pos.size ] = structs[ i ];
@@ -3256,7 +3263,7 @@ perk_machine_spawn_init() //modified function
 			pos[ pos.size ] = level.tankPerks[ perk ];
 		}
 	}
-	else if ( isDefined( level.customMap ) && level.customMap == "crazyplace" )
+	else if ( isDefined( level.customMap ) && level.customMap == "crazyplace" && isdefined(level.disableBSMMagic) && !level.disableBSMMagic )
 	{
 		foreach ( perk in level.crazyplacePerkArray )
 		{

diff --git a/Plutonium/maps/mp/zombies/_zm_weapons.gsc b/Plutonium/maps/mp/zombies/_zm_weapons.gsc
@@ -1311,6 +1311,7 @@ init_spawnable_weapon_upgrade() //modified function
 
 customWallbuy(weapon, displayName, cost, ammoCost, origin, angles, fx) //custom function
 {
+	level endon("end_game");
 	if(!isdefined(weapon) || !isdefined(origin) || !isdefined(angles))
 		return;
 	if(!isdefined(cost))