From 53424048755323b559c6352ba69968f764464c02 Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Tue, 14 Mar 2023 19:10:49 -0700 Subject: [PATCH] Meat powerup: set level.meat_player for meat_stink_player --- scripts/zm/replaced/zgrief.gsc | 2 ++ scripts/zm/zgrief/zgrief_reimagined.gsc | 16 +++------------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/scripts/zm/replaced/zgrief.gsc b/scripts/zm/replaced/zgrief.gsc index 512b1690..c9faa9ed 100644 --- a/scripts/zm/replaced/zgrief.gsc +++ b/scripts/zm/replaced/zgrief.gsc @@ -323,6 +323,7 @@ meat_stink_player( who ) return; } + level.meat_player = who; who.ignoreme = 0; players = get_players(); foreach ( player in players ) @@ -343,6 +344,7 @@ meat_stink_player( who ) player thread maps\mp\gametypes_zm\zgrief::meat_stink_player_cleanup(); player.ignoreme = 0; } + level.meat_player = undefined; } print_meat_msg(meat_player, verb) diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc index aee5ba26..484b4433 100644 --- a/scripts/zm/zgrief/zgrief_reimagined.gsc +++ b/scripts/zm/zgrief/zgrief_reimagined.gsc @@ -2599,23 +2599,13 @@ containment_think() in_containment_zone["allies"] = []; min_team_size = min(countplayers("axis"), countplayers("allies")); - meat_stink_player = 0; - foreach(player in players) - { - if(isDefined(player.meat_stink_3p)) - { - meat_stink_player = 1; - break; - } - } - foreach(player in players) { if(player get_current_zone() == zone_name) { if(is_player_valid(player)) { - if(!meat_stink_player && !is_true(player.spawn_protection) && !is_true(player.revive_protection)) + if(!isDefined(level.meat_player) && !is_true(player.spawn_protection) && !is_true(player.revive_protection)) { player.ignoreme = 0; } @@ -2646,7 +2636,7 @@ containment_think() { if(is_player_valid(player)) { - if(!meat_stink_player) + if(!isDefined(level.meat_player)) { player.ignoreme = 1; } @@ -2788,7 +2778,7 @@ containment_think() { if(is_player_valid(player)) { - if(!meat_stink_player && !is_true(player.spawn_protection) && !is_true(player.revive_protection)) + if(!isDefined(level.meat_player) && !is_true(player.spawn_protection) && !is_true(player.revive_protection)) { player.ignoreme = 0; }