Merge branch 'master' of https://github.com/JezuzLizard/Public-BO2-Mods

GriefFix/main.gsc

@@ -121,9 +121,9 @@ add_bots()
 {
 	flag_clear( "solo_game" );
 	flag_clear( "start_zombie_round_logic" );
-    players = get_players();
+    	players = get_players();
-    level.waiting = 1;
+   	level.waiting = 1;
-    thread waitMessage();
+    	thread waitMessage();
 	while ( players.size < level.player_quota && level.player_quota_active || players.size < 1)
 	{
 		wait 0.5;
@@ -133,7 +133,7 @@ add_bots()
 	level.countdown_start = 1;
 	thread countdownTimer();
 	wait level.wait_time;
-    flag_set( "start_zombie_round_logic" );
+    	flag_set( "start_zombie_round_logic" );
 }
 
 waitMessage()
@@ -296,15 +296,9 @@ gscRestart()
 	{
 		return;
 	}
-	while ( 1 )
+	level waittill( "end_game" );
-	{
+	wait 20;
-		if ( level.intermission )
+	map_restart( false );
-		{
-			wait 20;
-			map_restart( false );
-		}
-		wait 1;
-	}
 }
 
 emptyLobbyRestart()
@@ -334,16 +328,10 @@ gscMapChange()
 	{
 		return;
 	}
-	while ( 1 )
+	level waittill( "end_game" );
-	{
+	wait 20;
-		if ( level.intermission )
+	mapChange( location() );
-		{
+	map_restart( false );
-			wait 20;
-			mapChange( location() );
-			map_restart( false );
-		}
-		wait 1;
-	}
 }
 
 location()
@@ -500,6 +488,7 @@ spawnAllPlayers()
 			players[ i ] [[ level.spawnplayer ]]();
 			thread refresh_player_navcard_hud();
 			players[ i ].score = 500;
+			players[ i ].downs = 0;
 		}
 		i++;
 	}

GriefFix/readme.md

@@ -1,4 +1,4 @@
-**GriefFix Features:**
+# GriefFix Features:
 
 Added team balancing
 
@@ -12,23 +12,23 @@ Added map change option (only for farm, town, and bus depot)
 
 Added empty lobby restart 
 
-**Team Balancing:**
+## Team Balancing:
 
 Picks a team for a player on join based on how many players are on each team
 
 CIA/Inmates are the default team if teams are equal
 
-**Game Start Delay and Quota:**
+## Game Start Delay and Quota:
 
-adjustable wait time
+Adjustable wait time
 
-adjustable quota
+Adjustable quota
 
-either the wait time and quota can be fully disabled by changing the value of 1 variable each
+Either the wait time and quota can be fully disabled by changing the value of 1 variable each
 
-**Randomized Game Settings:**
+## Randomized Game Settings:
 
-can be turned off by disabling the corresponding variables
+Can be turned off by disabling the corresponding variables
 
 **defaults:**
 
@@ -54,16 +54,18 @@ can be turned off by disabling the corresponding variables
 
 40% chance of electric doors being disabled
 
-**Map Restart:**
+## Map Restart:
 
-after intermission the map restarts using map_restart instead of a normal restart
+After intermission the map restarts using map_restart instead of a normal restart
 
-this fixes the no sound bug on respawn
+This fixes the no sound bug on respawn
 
-but requires all other players except 1 player to be killed and respawned
+But requires all other players except 1 player to be killed and respawned
 
-**Map Rotate**
+Player downs are reset after players respawn
 
-the map can rotate between 3 locations 
+## Map Rotate
 
-town, farm and bus depot
+The map can rotate between 3 locations 
+
+Town, Farm and Bus Depot //requires one of these maps to be loaded initially and only works on tranzit

MapRestartWorkaround/main.gsc

@@ -28,15 +28,9 @@ init()
 
 gscRestart()
 {
-    while ( 1 )
+	level waittill( "end_game" );
-    {
+      	wait 20; //20 is ideal
-        if ( level.intermission )
+        map_restart( false );
-        {
-            wait 20; //20 is ideal
-            map_restart( false );
-        }
-        wait 1;
-    }
 }
 
 killAllPlayers()
@@ -85,4 +79,4 @@ spawnAllPlayers()
 		i++;
 	}
 	level.no_end_game_check = 0;
-}
+}

MapRestartWorkaround/readme.md

@@ -68,3 +68,7 @@ Not exactly ideal, but it does mean all players can remain in the lobby and all
 -End game check is disabled just incase player[0] leaves during the respawn function its reenabled when players are respawned
 
 -Fixed invisible player glitch hopefully for good
+
+-Players who were killed during the blackscreen have their downs set to 0
+
+

README.md

@@ -3,4 +3,5 @@
 Some Plutonium GSC mods
 
 * Grief Mode
-* Tombstone For Town server
+* Tombstone Fix
+* Map_restart Workaround