1
0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-07-05 03:19:06 -05:00

Containment: fix showing gained/lost lead msg on contest

This commit is contained in:
Jbleezy
2023-03-15 16:09:09 -07:00
parent b3daf4aa9e
commit c4263d9689
2 changed files with 22 additions and 19 deletions

View File

@ -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);

View File

@ -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,6 +3218,8 @@ increment_score(team)
}
}
if (show_lead_msg)
{
if (!isDefined(level.prev_leader) || (level.prev_leader != encounters_team && level.grief_score[encounters_team] > level.grief_score[level.prev_leader]))
{
level.prev_leader = encounters_team;
@ -3242,6 +3244,7 @@ increment_score(team)
}
}
}
}
spawn_bots()
{