1
0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-29 08:30:03 -05:00

Fixed pers upgrades not being disabled correctly

This commit is contained in:
Jbleezy
2020-03-25 00:55:19 -07:00
parent f65dd61dc9
commit 28c5c4e711

View File

@ -45,8 +45,6 @@ onplayerspawned()
self bank_clear_account_value(); self bank_clear_account_value();
self weapon_locker_clear_stored_weapondata(); self weapon_locker_clear_stored_weapondata();
self disable_player_pers_upgrades();
self tomb_give_shovel(); self tomb_give_shovel();
self thread enemy_counter_hud(); self thread enemy_counter_hud();
@ -61,6 +59,8 @@ onplayerspawned()
self thread on_equipment_placed(); self thread on_equipment_placed();
self thread give_additional_perks(); self thread give_additional_perks();
self thread disable_player_pers_upgrades();
//self thread disable_sniper_scope_sway(); // Buried does not load the clientfield //self thread disable_sniper_scope_sway(); // Buried does not load the clientfield
self thread jetgun_fast_cooldown(); self thread jetgun_fast_cooldown();
@ -120,8 +120,6 @@ post_all_players_spawned()
wallbuy_increase_trigger_radius(); wallbuy_increase_trigger_radius();
wallbuy_location_changes(); wallbuy_location_changes();
disable_pers_upgrades();
zone_changes(); zone_changes();
enemies_ignore_equipments(); enemies_ignore_equipments();
@ -164,6 +162,8 @@ post_all_players_spawned()
level thread buildbuildables(); level thread buildbuildables();
level thread buildcraftables(); level thread buildcraftables();
level thread disable_pers_upgrades();
level thread zombie_health_fix(); level thread zombie_health_fix();
level thread solo_revive_trigger_fix(); level thread solo_revive_trigger_fix();
@ -342,23 +342,12 @@ round_timer_hud()
round_timer_hud.alpha = 0; round_timer_hud.alpha = 0;
round_timer_hud.color = ( 1, 1, 1 ); round_timer_hud.color = ( 1, 1, 1 );
round_timer_hud.hidewheninmenu = 1; round_timer_hud.hidewheninmenu = 1;
round_timer_hud.label = &"Total Time: ";
round_timer_text = "Round Time: ";
total_timer_text = "Total Time: ";
round_timer_secs = 0;
flag_wait( "initial_blackscreen_passed" ); flag_wait( "initial_blackscreen_passed" );
round_timer_hud.alpha = 1; round_timer_hud.alpha = 1;
while (1) round_timer_hud setTimerUp(0);
{
round_time = to_mins_short(round_timer_secs);
round_timer_hud setText(round_timer_text + round_time);
wait 1;
round_timer_secs++;
}
} }
to_mins_short(seconds) to_mins_short(seconds)
@ -1801,12 +1790,16 @@ weapon_locker_clear_stored_weapondata()
disable_pers_upgrades() disable_pers_upgrades()
{ {
level waittill("initial_disable_player_pers_upgrades");
level.pers_upgrades_keys = []; level.pers_upgrades_keys = [];
level.pers_upgrades = []; level.pers_upgrades = [];
} }
disable_player_pers_upgrades() disable_player_pers_upgrades()
{ {
flag_wait( "initial_blackscreen_passed" );
if (isDefined(self.pers_upgrades_awarded)) if (isDefined(self.pers_upgrades_awarded))
{ {
upgrade = getFirstArrayKey(self.pers_upgrades_awarded); upgrade = getFirstArrayKey(self.pers_upgrades_awarded);
@ -1832,6 +1825,8 @@ disable_player_pers_upgrades()
index++; index++;
} }
} }
level notify("initial_disable_player_pers_upgrades");
} }
disable_carpenter() disable_carpenter()