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

Grief: store player damage function into level var

Browse Source
This commit is contained in:
Jbleezy
2021-12-07 22:54:58 -08:00
parent ddb8753b96
commit 9f647160bd
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/zm/_zm_reimagined.gsc
View File

@ -1747,7 +1747,7 @@ track_players_intersection_tracker()
{
if(getDvar("g_gametype") == "zgrief" && players[i]._encounters_team != players[j]._encounters_team)
{
players[j] scripts/zm/_zm_reimagined_grief::store_damage_info(players[i], "none", "MOD_FALLING");
players[j] [[level.store_player_damage_info_func]](players[i], "none", "MOD_FALLING");
players[j] dodamage( 1000, (0, 0, 0) );
}
@ -1757,7 +1757,7 @@ track_players_intersection_tracker()
{
if(getDvar("g_gametype") == "zgrief" && players[i]._encounters_team != players[j]._encounters_team)
{
players[i] scripts/zm/_zm_reimagined_grief::store_damage_info(players[j], "none", "MOD_FALLING");
players[i] [[level.store_player_damage_info_func]](players[j], "none", "MOD_FALLING");
players[i] dodamage( 1000, (0, 0, 0) );
}

9
scripts/zm/_zm_reimagined_grief.gsc
View File

@ -170,6 +170,7 @@ set_grief_vars()
level.grief_score["B"] = 0;
level.game_mode_shellshock_time = 0.5;
level.game_mode_griefed_time = 2.5;
level.store_player_damage_info_func = ::store_player_damage_info;
flag_wait( "start_zombie_round_logic" ); // needs a wait
@ -645,7 +646,7 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme
self playsound( "zmb_player_hit_ding" );
self thread add_grief_stun_score(eattacker);
self thread store_damage_info(eattacker, sweapon, smeansofdeath);
self thread [[level.store_player_damage_info_func]](eattacker, sweapon, smeansofdeath);
}
}
@ -669,7 +670,7 @@ add_grief_stun_score(attacker)
}
}
store_damage_info(attacker, weapon, meansofdeath)
store_player_damage_info(attacker, weapon, meansofdeath)
{
// show weapon icon for impact damage
if(meansofdeath == "MOD_IMPACT")
@ -682,10 +683,10 @@ store_damage_info(attacker, weapon, meansofdeath)
self.last_griefed_by.weapon = weapon;
self.last_griefed_by.meansofdeath = meansofdeath;
self thread remove_damage_info();
self thread remove_player_damage_info();
}
remove_damage_info()
remove_player_damage_info()
{
self notify("new_griefer");
self endon("new_griefer");