INSANEMODE/BO2-Reimagined
1
0
Fork 0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-27 07:30:09 -05:00
Code Issues Releases Wiki Activity

Remove all calls to zgrief_reimagined in other files

Browse Source
This commit is contained in:
Jbleezy
2023-03-09 18:17:30 -08:00
parent e03d80681e
commit 6b5311bd7b
8 changed files with 52 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
scripts/zm/replaced/_zm_game_module.gsc
View File

@ -113,7 +113,10 @@ round_end(winner)
team = "allies";
}
scripts\zm\zgrief\zgrief_reimagined::increment_score(team);
if (isDefined(level.increment_score_func))
{
[[level.increment_score_func]](team);
}
}
players = get_players();
@ -140,25 +143,29 @@ round_end(winner)
level.round_number++;
level thread maps\mp\zombies\_zm_audio_announcer::leaderdialog( "grief_restarted" );
if(isDefined(winner))
if (isDefined(level.show_grief_hud_msg_func))
{
foreach(player in players)
if (isDefined(winner))
{
if(player.team == team)
foreach (player in players)
{
player thread scripts\zm\zgrief\zgrief_reimagined::show_grief_hud_msg( "You won the round!" );
}
else
{
player thread scripts\zm\zgrief\zgrief_reimagined::show_grief_hud_msg( "You lost the round!" );
if (player.team == team)
{
player thread [[level.show_grief_hud_msg_func]]( "You won the round!" );
}
else
{
player thread [[level.show_grief_hud_msg_func]]( "You lost the round!" );
}
}
}
}
else
{
foreach(player in players)
else
{
player thread scripts\zm\zgrief\zgrief_reimagined::show_grief_hud_msg( &"ZOMBIE_GRIEF_RESET" );
foreach (player in players)
{
player thread [[level.show_grief_hud_msg_func]]( &"ZOMBIE_GRIEF_RESET" );
}
}
}
@ -220,7 +227,10 @@ zombie_goto_round(target_round)
level thread player_respawn_award();
level thread scripts\zm\zgrief\zgrief_reimagined::round_start_wait(5);
if (isDefined(level.round_start_wait_func))
{
level thread [[level.round_start_wait_func]](5);
}
}
player_respawn_award()

2
scripts/zm/replaced/_zm_gametype.gsc
View File

@ -173,7 +173,7 @@ onplayerspawned()
hide_gump_loading_for_hotjoiners()
{
if(scripts\zm\zgrief\zgrief_reimagined::is_respawn_gamemode())
if(isDefined(level.is_respawn_gamemode_func) && [[level.is_respawn_gamemode_func]]())
{
return;
}

5
scripts/zm/replaced/_zm_powerups.gsc
View File

@ -240,7 +240,10 @@ nuke_powerup( drop_item, player_team )
}
else if(players[i] maps\mp\zombies\_zm_laststand::player_is_in_laststand())
{
players[i] thread scripts\zm\zgrief\zgrief_reimagined::player_suicide();
if (isDefined(level.player_suicide_func))
{
players[i] thread [[level.player_suicide_func]]();
}
}
}
}

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

@ -4,7 +4,7 @@
game_mode_spawn_player_logic()
{
if(scripts\zm\zgrief\zgrief_reimagined::is_respawn_gamemode())
if(isDefined(level.is_respawn_gamemode_func) && [[level.is_respawn_gamemode_func]]())
{
return 0;
}
@ -62,7 +62,7 @@ meat_stink_player( who )
if(level.scr_zm_ui_gametype_obj == "zmeat")
{
level thread [[level.zgrief_meat_stink]](who);
level thread maps\mp\gametypes_zm\zgrief::meat_stink(who);
return;
}
@ -70,7 +70,7 @@ meat_stink_player( who )
players = get_players();
foreach ( player in players )
{
player thread [[level.zgrief_meat_stink_player_cleanup]]();
player thread maps\mp\gametypes_zm\zgrief::meat_stink_player_cleanup();
if ( player != who )
{
player.ignoreme = 1;
@ -78,12 +78,12 @@ meat_stink_player( who )
print_meat_msg(player, who);
}
who thread [[level.zgrief_meat_stink_player_create]]();
who thread maps\mp\gametypes_zm\zgrief::meat_stink_player_create();
who waittill_any_or_timeout( 30, "disconnect", "player_downed", "bled_out" );
players = get_players();
foreach ( player in players )
{
player thread [[level.zgrief_meat_stink_player_cleanup]]();
player thread maps\mp\gametypes_zm\zgrief::meat_stink_player_cleanup();
player.ignoreme = 0;
}
}