diff --git a/scripts/zm/replaced/zgrief.gsc b/scripts/zm/replaced/zgrief.gsc index 3cc13479..adc46afe 100644 --- a/scripts/zm/replaced/zgrief.gsc +++ b/scripts/zm/replaced/zgrief.gsc @@ -22,7 +22,7 @@ meat_bounce_override( pos, normal, ent, bounce ) { if ( isdefined( ent ) && isplayer( ent ) && is_player_valid(ent) && !ent hasWeapon("item_meat_zm") && !is_true(ent.dont_touch_the_meat) ) { - if (ent isMeleeing()) // && ent is_player_looking_at(pos, 0.5, 0) + if (ent isMeleeing()) { ent thread maps\mp\gametypes_zm\zmeat::spike_the_meat(self); @@ -71,7 +71,7 @@ meat_bounce_override( pos, normal, ent, bounce ) if ( isdefined( closest_player ) ) { - if (closest_player isMeleeing()) // && ent is_player_looking_at(pos, 0.5, 0) + if (closest_player isMeleeing()) { closest_player thread maps\mp\gametypes_zm\zmeat::spike_the_meat(self); diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc index 5312c38d..77d12dda 100644 --- a/scripts/zm/zgrief/zgrief_reimagined.gsc +++ b/scripts/zm/zgrief/zgrief_reimagined.gsc @@ -2822,7 +2822,7 @@ containment_think() player.captures++; } - increment_score("axis"); + increment_score("axis", !isDefined(held_time["allies"])); } } } @@ -2842,7 +2842,7 @@ containment_think() player.captures++; } - increment_score("allies"); + increment_score("allies", !isDefined(held_time["axis"])); } } } @@ -3175,7 +3175,7 @@ powerup_can_player_grab(player) return true; } -increment_score(team) +increment_score(team, show_lead_msg = true) { level endon("end_game"); @@ -3218,26 +3218,29 @@ increment_score(team) } } - if (!isDefined(level.prev_leader) || (level.prev_leader != encounters_team && level.grief_score[encounters_team] > level.grief_score[level.prev_leader])) + if (show_lead_msg) { - level.prev_leader = encounters_team; - - delay = 0; - if (level.scr_zm_ui_gametype_obj == "zsnr") + if (!isDefined(level.prev_leader) || (level.prev_leader != encounters_team && level.grief_score[encounters_team] > level.grief_score[level.prev_leader])) { - delay = 1; - } + level.prev_leader = encounters_team; - players = get_players(); - foreach (player in players) - { - if (player.team == team) + delay = 0; + if (level.scr_zm_ui_gametype_obj == "zsnr") { - player thread show_grief_hud_msg("Gained the lead!", undefined, 30, delay); + delay = 1; } - else + + players = get_players(); + foreach (player in players) { - player thread show_grief_hud_msg("Lost the lead!", undefined, 30, delay); + if (player.team == team) + { + player thread show_grief_hud_msg("Gained the lead!", undefined, 30, delay); + } + else + { + player thread show_grief_hud_msg("Lost the lead!", undefined, 30, delay); + } } } }