From 29b17787adea95bd331fc3d8ea9768fee20e32eb Mon Sep 17 00:00:00 2001 From: JezuzLizard Date: Mon, 9 Mar 2020 01:08:07 -0700 Subject: [PATCH 1/6] Update readme.md --- MapRestartWorkaround/readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MapRestartWorkaround/readme.md b/MapRestartWorkaround/readme.md index 5ee9b2c..5ab01b9 100644 --- a/MapRestartWorkaround/readme.md +++ b/MapRestartWorkaround/readme.md @@ -66,3 +66,5 @@ Not exactly ideal, but it does mean all players can remain in the lobby and all -Players keep all points -End game check is disabled just incase player[0] leaves during the respawn function its reenabled when players are respawned + +-Players who were killed during the blackscreen have their downs set to 0 From 502f4f499c4b10cff62e0a20c367cc322e0f56ca Mon Sep 17 00:00:00 2001 From: JezuzLizard Date: Mon, 9 Mar 2020 01:09:41 -0700 Subject: [PATCH 2/6] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 02e38d1..a57adda 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,5 @@ Some Plutonium GSC mods * Grief Mode -* Tombstone For Town server +* Tombstone Fix +* Map_restart Workaround From cc7908a9da55ec043b01d2b240b68102a51c0c6c Mon Sep 17 00:00:00 2001 From: JezuzLizard Date: Mon, 9 Mar 2020 01:17:33 -0700 Subject: [PATCH 3/6] Update readme.md --- GriefFix/readme.md | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/GriefFix/readme.md b/GriefFix/readme.md index d638012..9e48e3f 100644 --- a/GriefFix/readme.md +++ b/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 From 4d1f775033aab9e1fcb2ef0703ff8816cc5171b8 Mon Sep 17 00:00:00 2001 From: JezuzLizard Date: Mon, 9 Mar 2020 01:23:07 -0700 Subject: [PATCH 4/6] downs reset after initial respawn --- GriefFix/main.gsc | 1 + 1 file changed, 1 insertion(+) diff --git a/GriefFix/main.gsc b/GriefFix/main.gsc index 0e8a566..4aad403 100644 --- a/GriefFix/main.gsc +++ b/GriefFix/main.gsc @@ -500,6 +500,7 @@ spawnAllPlayers() players[ i ] [[ level.spawnplayer ]](); thread refresh_player_navcard_hud(); players[ i ].score = 500; + players[ i ].downs = 0; } i++; } From 2e94a8346dde4428312ae230927f6c439bdb5181 Mon Sep 17 00:00:00 2001 From: JezuzLizard Date: Mon, 9 Mar 2020 15:14:02 -0700 Subject: [PATCH 5/6] used waittill instead of a while loop in the restart function --- MapRestartWorkaround/main.gsc | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/MapRestartWorkaround/main.gsc b/MapRestartWorkaround/main.gsc index 38a61ed..56b9fc4 100644 --- a/MapRestartWorkaround/main.gsc +++ b/MapRestartWorkaround/main.gsc @@ -20,15 +20,9 @@ initialMapRestart() gscRestart() { - while ( 1 ) - { - if ( level.intermission ) - { - wait 20; //20 is ideal - map_restart( false ); - } - wait 1; - } + level waittill( "end_game" ); + wait 20; //20 is ideal + map_restart( false ); } killAllPlayers() @@ -77,4 +71,4 @@ spawnAllPlayers() i++; } level.no_end_game_check = 0; -} \ No newline at end of file +} From 2d384547c97fd804850e41403a1d1410ac16ec0f Mon Sep 17 00:00:00 2001 From: JezuzLizard Date: Mon, 9 Mar 2020 15:19:39 -0700 Subject: [PATCH 6/6] updated all restart functions to use waittill --- GriefFix/main.gsc | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/GriefFix/main.gsc b/GriefFix/main.gsc index 4aad403..658c0ed 100644 --- a/GriefFix/main.gsc +++ b/GriefFix/main.gsc @@ -121,9 +121,9 @@ add_bots() { flag_clear( "solo_game" ); flag_clear( "start_zombie_round_logic" ); - players = get_players(); - level.waiting = 1; - thread waitMessage(); + players = get_players(); + level.waiting = 1; + 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 ) - { - if ( level.intermission ) - { - wait 20; - map_restart( false ); - } - wait 1; - } + level waittill( "end_game" ); + wait 20; + map_restart( false ); } emptyLobbyRestart() @@ -334,16 +328,10 @@ gscMapChange() { return; } - while ( 1 ) - { - if ( level.intermission ) - { - wait 20; - mapChange( location() ); - map_restart( false ); - } - wait 1; - } + level waittill( "end_game" ); + wait 20; + mapChange( location() ); + map_restart( false ); } location()