INSANEMODE/BO2-Reimagined
1
0
Fork 0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-10 15:17:57 -05:00
Code Issues Releases Wiki Activity

Encounter: add Meat and EMP Grenade obituary icons

Browse Source
This commit is contained in:
Jbleezy
2023-12-27 17:40:33 -08:00
parent 4857c62b8e
commit 7b30d395f5
11 changed files with 55 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/zm/replaced/_zm_weap_emp_bomb.gsc
View File

@ -167,7 +167,7 @@ emp_players(origin, radius, owner)
{
time = level.zombie_vars["emp_stun_time"];
player shellshock("flashbang", 1);
player thread player_perk_pause_and_unpause_all_perks(time);
player thread player_perk_pause_and_unpause_all_perks(time, owner);
player thread player_emp_fx(time);
}
}
@ -191,18 +191,30 @@ player_emp_fx(time)
}
}
player_perk_pause_and_unpause_all_perks(time)
player_perk_pause_and_unpause_all_perks(time, owner)
{
self notify("player_perk_pause_and_unpause_all_perks");
self endon("player_perk_pause_and_unpause_all_perks");
self endon("disconnect");
if (self.team != owner.team)
{
self.last_emped_by = spawnStruct();
self.last_emped_by.attacker = owner;
}
else
{
self.last_emped_by = undefined;
}
self player_perk_pause_all_perks();
self thread player_perk_pause_all_perks_acquired(time);
self waittill_any_or_timeout(time, "spawned_player", "bled_out", "player_suicide");
self player_perk_unpause_all_perks();
self.last_emped_by = undefined;
}
player_perk_pause_all_perks_acquired(time)

27
scripts/zm/replaced/zgrief.gsc
View File

@ -22,7 +22,7 @@ meat_bounce_override(pos, normal, ent, bounce)
{
if (isdefined(ent) && isplayer(ent) && is_player_valid(ent) && !ent hasWeapon(level.item_meat_name) && !is_true(ent.dont_touch_the_meat))
{
level thread meat_stink_player(ent);
level thread meat_stink_player(ent, self.owner);
if (isdefined(self.owner))
{
@ -62,7 +62,7 @@ meat_bounce_override(pos, normal, ent, bounce)
if (isdefined(closest_player))
{
level thread meat_stink_player(closest_player);
level thread meat_stink_player(closest_player, self.owner);
if (isdefined(self.owner))
{
@ -404,7 +404,7 @@ meat_stink_on_ground(position_to_play)
level.meat_on_ground = undefined;
}
meat_stink_player(who)
meat_stink_player(who, owner)
{
level notify("new_meat_stink_player");
level endon("new_meat_stink_player");
@ -415,6 +415,16 @@ meat_stink_player(who)
return;
}
if (who.team != owner.team)
{
who.last_meated_by = spawnStruct();
who.last_meated_by.attacker = owner;
}
else
{
who.last_meated_by = undefined;
}
who notify("meat_stink_player_start");
level.meat_player = who;
who.ignoreme = 0;
@ -451,6 +461,17 @@ meat_stink_player(who)
}
level.meat_player = undefined;
who thread wait_and_reset_last_meated_by();
}
wait_and_reset_last_meated_by()
{
self endon("disconnect");
wait 0.05;
self.last_meated_by = undefined;
}
meat_stink_player_create()

8
scripts/zm/replaced/zmeat.gsc
View File

@ -43,14 +43,6 @@ item_meat_on_spawn_retrieve_trigger(watcher, player, weaponname)
level.meat_player = undefined;
player setMoveSpeedScale(1);
if (is_true(player.meat_weapons_disabled))
{
player.meat_weapons_disabled = undefined;
player enableWeapons();
}
if (level.scr_zm_ui_gametype_obj == "zmeat")
{
player.head_icon.alpha = 1;

8
scripts/zm/zgrief/zgrief_reimagined.gsc
View File

@ -829,6 +829,14 @@ kill_feed()
obituary(self, self.last_griefed_by.attacker, self.last_griefed_by.weapon, self.last_griefed_by.meansofdeath);
}
else if (isDefined(self.last_meated_by))
{
obituary(self, self.last_meated_by.attacker, level.item_meat_name, "MOD_UNKNOWN");
}
else if (isDefined(self.last_emped_by))
{
obituary(self, self.last_emped_by.attacker, "emp_grenade_zm", "MOD_GRENADE_SPLASH");
}
else
{
obituary(self, self, "none", "MOD_SUICIDE");