1
0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-11 23:57:59 -05:00

Grief: add revives and bleedouts to kill feed

This commit is contained in:
Jbleezy
2021-12-10 01:45:48 -08:00
parent fbaa583fab
commit faceb2f24e
2 changed files with 35 additions and 7 deletions

View File

@ -246,7 +246,7 @@
* Stunning enemy players steals 10 points from them * Stunning enemy players steals 10 points from them
* Downing enemy players awards 5% of their current points * Downing enemy players awards 5% of their current points
* Landing on top of an enemy player downs them * Landing on top of an enemy player downs them
* Added player kill feed * Added kill feed (includes downs, revives, and bleedouts)
* Added player kills on scoreboard * Added player kills on scoreboard
* Announcer audio always plays * Announcer audio always plays
* Last player alive audio only plays for the player who is alive instead of every player on the team * Last player alive audio only plays for the player who is alive instead of every player on the team

View File

@ -167,6 +167,7 @@ grief_onplayerconnect()
self [[ level.givecustomcharacters ]](); self [[ level.givecustomcharacters ]]();
self thread on_player_downed(); self thread on_player_downed();
self thread on_player_bleedout(); self thread on_player_bleedout();
self thread on_player_revived();
self.killsconfirmed = 0; self.killsconfirmed = 0;
} }
@ -197,15 +198,35 @@ on_player_bleedout()
{ {
self waittill( "bled_out" ); self waittill( "bled_out" );
self bleedout_feed();
level thread update_players_on_bleedout( self ); level thread update_players_on_bleedout( self );
} }
} }
on_player_revived()
{
self endon( "disconnect" );
while(1)
{
self waittill( "player_revived", reviver );
self revive_feed( reviver );
}
}
kill_feed() kill_feed()
{ {
if(isDefined(self.last_griefed_by)) if(isDefined(self.last_griefed_by))
{ {
self.last_griefed_by.attacker.killsconfirmed++; self.last_griefed_by.attacker.killsconfirmed++;
// show weapon icon for impact damage
if(self.last_griefed_by.meansofdeath == "MOD_IMPACT")
{
self.last_griefed_by.meansofdeath = "MOD_UNKNOWN";
}
obituary(self, self.last_griefed_by.attacker, self.last_griefed_by.weapon, self.last_griefed_by.meansofdeath); obituary(self, self.last_griefed_by.attacker, self.last_griefed_by.weapon, self.last_griefed_by.meansofdeath);
} }
else else
@ -214,6 +235,19 @@ kill_feed()
} }
} }
bleedout_feed()
{
obituary(self, self, "none", "MOD_CRUSH");
}
revive_feed(reviver)
{
if(isDefined(reviver) && reviver != self)
{
obituary(self, reviver, level.revive_tool, "MOD_IMPACT");
}
}
add_grief_downed_score() add_grief_downed_score()
{ {
if(isDefined(self.score_lost_when_downed) && isDefined(self.last_griefed_by) && is_player_valid(self.last_griefed_by.attacker)) if(isDefined(self.score_lost_when_downed) && isDefined(self.last_griefed_by) && is_player_valid(self.last_griefed_by.attacker))
@ -957,12 +991,6 @@ stun_score_steal(attacker, score)
store_player_damage_info(attacker, weapon, meansofdeath) store_player_damage_info(attacker, weapon, meansofdeath)
{ {
// show weapon icon for impact damage
if(meansofdeath == "MOD_IMPACT")
{
meansofdeath = "MOD_UNKNOWN";
}
self.last_griefed_by = spawnStruct(); self.last_griefed_by = spawnStruct();
self.last_griefed_by.attacker = attacker; self.last_griefed_by.attacker = attacker;
self.last_griefed_by.weapon = weapon; self.last_griefed_by.weapon = weapon;