fixed more bugs and removed a duplicate script

This commit is contained in:
JezuzLizard 2020-04-02 04:38:05 -07:00
parent f422eaf366
commit b6617db1be
6 changed files with 902 additions and 3026 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -10,7 +10,6 @@
init() //checked 100% parity init() //checked 100% parity
{ {
level thread onPlayerConnect(); //this is new code added to define player
level._random_zombie_perk_cost = 1500; level._random_zombie_perk_cost = 1500;
level thread precache(); level thread precache();
level thread init_machines(); level thread init_machines();
@ -30,15 +29,6 @@ init() //checked 100% parity
} }
onPlayerConnect()
{
for(;;)
{
level waittill("connected", player);
level.players_wunderfizz = player;
}
}
init_machines() init_machines()
{ {
machines = getentarray("random_perk_machine", "targetname"); machines = getentarray("random_perk_machine", "targetname");
@ -306,7 +296,6 @@ conditional_power_indicators() //checked 100% parity
} }
} }
wunderfizz_unitrigger_think( player ) //checked 100% parity wunderfizz_unitrigger_think( player ) //checked 100% parity
{ {
self endon( "kill_trigger" ); self endon( "kill_trigger" );
@ -314,6 +303,7 @@ wunderfizz_unitrigger_think( player ) //checked 100% parity
{ {
self waittill( "trigger", player ); self waittill( "trigger", player );
self.stub.trigger_target notify( "trigger" ); self.stub.trigger_target notify( "trigger" );
level.players_wunderfizz = player; //better way to define player
} }
} }
@ -338,8 +328,6 @@ machine_think() //checked 80% parity
{ {
self waittill("trigger", level.players_wunderfizz); self waittill("trigger", level.players_wunderfizz);
flag_clear("machine_can_reset"); flag_clear("machine_can_reset");
//level notify("pmmove");
//broken
player = level.players_wunderfizz; player = level.players_wunderfizz;
if(player.score < level._random_zombie_perk_cost) if(player.score < level._random_zombie_perk_cost)
{ {
@ -347,7 +335,6 @@ machine_think() //checked 80% parity
player maps/mp/zombies/_zm_audio::create_and_play_dialog("general", "perk_deny", undefined, 0); player maps/mp/zombies/_zm_audio::create_and_play_dialog("general", "perk_deny", undefined, 0);
continue; continue;
} }
//working
if(self.num_time_used >= self.num_til_moved) if(self.num_time_used >= self.num_til_moved)
{ {
level notify("pmmove"); level notify("pmmove");
@ -359,13 +346,11 @@ machine_think() //checked 80% parity
self hidepart("j_ball"); self hidepart("j_ball");
return; return;
} }
//working
self.machine_user = player; self.machine_user = player;
self.num_time_used++; self.num_time_used++;
player maps/mp/zombies/_zm_stats::increment_client_stat("use_perk_random"); player maps/mp/zombies/_zm_stats::increment_client_stat("use_perk_random");
player maps/mp/zombies/_zm_stats::increment_player_stat("use_perk_random"); player maps/mp/zombies/_zm_stats::increment_player_stat("use_perk_random");
//broken
player maps/mp/zombies/_zm_score::minus_to_player_score(level._random_zombie_perk_cost); player maps/mp/zombies/_zm_score::minus_to_player_score(level._random_zombie_perk_cost);
@ -377,10 +362,8 @@ machine_think() //checked 80% parity
while(1) while(1)
{ {
//working
thread maps/mp/zombies/_zm_unitrigger::unregister_unitrigger(self.unitrigger_stub); thread maps/mp/zombies/_zm_unitrigger::unregister_unitrigger(self.unitrigger_stub);
//broken
random_perk = get_weighted_random_perk(player); random_perk = get_weighted_random_perk(player);
self setclientfield("perk_bottle_cycle_state", 1); self setclientfield("perk_bottle_cycle_state", 1);
@ -415,7 +398,7 @@ machine_think() //checked 80% parity
} }
self.grab_perk_hint = 1; self.grab_perk_hint = 1;
thread maps/mp/zombies/_zm_unitrigger::register_static_unitrigger(self.unitrigger_stub, ::wunderfizz_unitrigger_think); thread maps/mp/zombies/_zm_unitrigger::register_static_unitrigger(self.unitrigger_stub, ::wunderfizz_unitrigger_think);
//broken
self thread grab_check(player, random_perk); self thread grab_check(player, random_perk);
self thread time_out_check(); self thread time_out_check();
@ -484,7 +467,6 @@ grab_check( player, random_perk ) //checked 100% parity
player do_player_general_vox("wunderfizz", "perk_wonder", undefined, 100); player do_player_general_vox("wunderfizz", "perk_wonder", undefined, 100);
player.has_drunk_wunderfizz = 1; player.has_drunk_wunderfizz = 1;
} }
} }
monitor_when_player_acquires_perk() //checked 100% parity monitor_when_player_acquires_perk() //checked 100% parity
@ -699,3 +681,5 @@ machine_sounds() //checked 100% parity