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

Remove unnecessary melee weapon files

Encounter: always use held melee weapon obituary icon
This commit is contained in:
Jbleezy
2023-12-23 02:59:01 -08:00
parent 30b2e08d67
commit cfd156706c
6 changed files with 15 additions and 5 deletions

View File

@ -794,6 +794,11 @@ kill_feed()
self.last_griefed_by.meansofdeath = "MOD_UNKNOWN";
}
if (is_melee_weapon(self.last_griefed_by.weapon))
{
self.last_griefed_by.weapon = get_held_melee_weapon(self.last_griefed_by.weapon);
}
obituary(self, self.last_griefed_by.attacker, self.last_griefed_by.weapon, self.last_griefed_by.meansofdeath);
}
else
@ -830,6 +835,16 @@ revive_feed(reviver)
}
}
get_held_melee_weapon(melee_weapon)
{
if (!issubstr(melee_weapon, "held_"))
{
melee_weapon = "held_" + melee_weapon;
}
return melee_weapon;
}
add_grief_downed_score()
{
if (isDefined(self.last_griefed_by) && is_player_valid(self.last_griefed_by.attacker))