diff --git a/README.md b/README.md index d225c0bb..6feb1a4a 100644 --- a/README.md +++ b/README.md @@ -464,8 +464,8 @@ * Enemies remaining text is removed when new text is displayed * Added text when rounds are won/lost * Added new audio when enemy players bleed out +* Players do not get their weapons back on round reset if they bled out * Round reset properly restores dual wield weapon left clip ammo, alternative weapon ammo, and equipment -* Limited weapons can no longer be obtained if another player had the weapon when they bled out * Spawn points are assigned to a team * Teams switch spawn points each round * Players respawn at initial spawn points diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc index d4116b86..3638bc71 100644 --- a/scripts/zm/zgrief/zgrief_reimagined.gsc +++ b/scripts/zm/zgrief/zgrief_reimagined.gsc @@ -52,7 +52,6 @@ init() setteamscore("allies", 0); player_spawn_override(); - maps/mp/zombies/_zm_weapons::add_custom_limited_weapon_check(::grief_loadout_limited_weapon_check); level thread grief_score_hud(); level thread set_grief_vars(); @@ -706,6 +705,7 @@ on_player_bleedout() self waittill_any( "bled_out", "player_suicide" ); self.statusicon = "hud_status_dead"; + self.grief_savedweapon_weapons = undefined; self bleedout_feed(); self add_grief_bleedout_score(); level thread update_players_on_bleedout( self ); @@ -1804,32 +1804,6 @@ func_should_drop_meat() return 1; } -grief_loadout_limited_weapon_check(weapon) -{ - count = 0; - i = 0; - players = get_players(); - - while(i < players.size) - { - if(isDefined(players[i].grief_savedweapon_weapons)) - { - foreach(grief_savedweapon in players[i].grief_savedweapon_weapons) - { - if(grief_savedweapon == weapon) - { - count++; - break; - } - } - } - - i++; - } - - return count; -} - remove_round_number() { level endon("end_game");