diff --git a/README.md b/README.md index b6c1eeeb..ba5763aa 100644 --- a/README.md +++ b/README.md @@ -482,6 +482,7 @@ * Attracts zombies more consistently on ground * Decreased attract radius on ground by 50% * Decreased time on ground from 16 seconds to 10 seconds +* Decreased time on players from 30 seconds to 15 seconds * Bounces off walls when thrown * Added weapon name on HUD * Changed powerup fx color to blue diff --git a/scripts/zm/replaced/zgrief.gsc b/scripts/zm/replaced/zgrief.gsc index 9ba215d6..bb1eee73 100644 --- a/scripts/zm/replaced/zgrief.gsc +++ b/scripts/zm/replaced/zgrief.gsc @@ -445,7 +445,7 @@ meat_stink_player(who, owner) who thread meat_stink_ignoreme_think(); who thread meat_stink_player_create(); - who waittill_any_or_timeout(30, "disconnect", "player_downed", "bled_out", "spawned_player"); + who waittill_any_or_timeout(15, "disconnect", "player_downed", "bled_out", "spawned_player"); who notify("meat_stink_player_end"); players = get_players(); diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc index 693fbc73..184127e1 100644 --- a/scripts/zm/zgrief/zgrief_reimagined.gsc +++ b/scripts/zm/zgrief/zgrief_reimagined.gsc @@ -831,10 +831,14 @@ kill_feed() } else if (isDefined(self.last_meated_by)) { + self.last_meated_by.attacker.killsconfirmed++; + obituary(self, self.last_meated_by.attacker, level.item_meat_name, "MOD_UNKNOWN"); } else if (isDefined(self.last_emped_by)) { + self.last_emped_by.attacker.killsconfirmed++; + obituary(self, self.last_emped_by.attacker, "emp_grenade_zm", "MOD_GRENADE_SPLASH"); } else @@ -873,10 +877,25 @@ get_held_melee_weapon(melee_weapon) add_grief_downed_score() { - if (isDefined(self.last_griefed_by) && is_player_valid(self.last_griefed_by.attacker)) + downed_by = undefined; + + if (isDefined(self.last_griefed_by)) { - score = 500 * maps\mp\zombies\_zm_score::get_points_multiplier(self.last_griefed_by.attacker); - self.last_griefed_by.attacker maps\mp\zombies\_zm_score::add_to_player_score(score); + downed_by = self.last_griefed_by; + } + else if (isDefined(self.last_meated_by)) + { + downed_by = self.last_meated_by; + } + else if (isDefined(self.last_emped_by)) + { + downed_by = self.last_emped_by; + } + + if (isDefined(downed_by) && is_player_valid(downed_by.attacker)) + { + score = 500 * maps\mp\zombies\_zm_score::get_points_multiplier(downed_by.attacker); + downed_by.attacker maps\mp\zombies\_zm_score::add_to_player_score(score); } }