INSANEMODE/Recompilable-gscs-for-BO2-zombies-and-multiplayer
1
0
Fork 0
mirror of https://github.com/JezuzLizard/Recompilable-gscs-for-BO2-zombies-and-multiplayer.git synced 2025-06-08 01:47:50 -05:00
Code Issues Releases Wiki Activity

changed isDefined( condition ) && condition to is_true

Browse Source 
All patch_zm scripts that could use is_true instead have been modified.
This commit is contained in:
JezuzLizard 2020-08-26 23:55:25 -07:00
parent d4bbdeed3f
commit 238cfb5b71
30 changed files with 464 additions and 606 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
patch_zm/maps/mp/zombies/_zm_ai_basic.gsc
View File

@ -199,7 +199,7 @@ get_inert_crawl_substate() //checked matches cerberus output
start_inert( in_place ) //checked changed to match cerberus output start_inert( in_place ) //checked changed to match cerberus output
{ {
self endon( "death" ); self endon( "death" );
if ( isDefined( self.is_inert ) && self.is_inert ) if ( is_true( self.is_inert ) )
{ {
self maps/mp/zombies/_zm_spawner::zombie_history( "is_inert already set " + getTime() ); self maps/mp/zombies/_zm_spawner::zombie_history( "is_inert already set " + getTime() );
return; return;
@ -209,9 +209,9 @@ start_inert( in_place ) //checked changed to match cerberus output
self maps/mp/zombies/_zm_spawner::zombie_eye_glow_stop(); self maps/mp/zombies/_zm_spawner::zombie_eye_glow_stop();
self maps/mp/zombies/_zm_spawner::zombie_history( "is_inert set " + getTime() ); self maps/mp/zombies/_zm_spawner::zombie_history( "is_inert set " + getTime() );
self playsound( "zmb_zombie_go_inert" ); self playsound( "zmb_zombie_go_inert" );
if ( isDefined( self.barricade_enter ) && self.barricade_enter ) if ( is_true( self.barricade_enter ) )
{ {
while ( isDefined( self.barricade_enter ) && self.barricade_enter ) while ( is_true( self.barricade_enter ) )
{ {
wait 0.1; wait 0.1;
} }
@ -221,7 +221,7 @@ start_inert( in_place ) //checked changed to match cerberus output
self notify( "stop_zombie_goto_entrance" ); self notify( "stop_zombie_goto_entrance" );
self maps/mp/zombies/_zm_spawner::reset_attack_spot(); self maps/mp/zombies/_zm_spawner::reset_attack_spot();
} }
if ( isDefined( self.completed_emerging_into_playable_area ) && self.completed_emerging_into_playable_area ) if ( is_true( self.completed_emerging_into_playable_area ) )
{ {
self notify( "stop_find_flesh" ); self notify( "stop_find_flesh" );
self notify( "zombie_acquire_enemy" ); self notify( "zombie_acquire_enemy" );
@ -230,12 +230,12 @@ start_inert( in_place ) //checked changed to match cerberus output
{ {
in_place = 1; in_place = 1;
} }
if ( isDefined( self.in_the_ground ) && self.in_the_ground ) if ( is_true( self.in_the_ground ) )
{ {
self waittill( "risen", find_flesh_struct_string ); self waittill( "risen", find_flesh_struct_string );
if ( self maps/mp/zombies/_zm_spawner::should_skip_teardown( find_flesh_struct_string ) ) if ( self maps/mp/zombies/_zm_spawner::should_skip_teardown( find_flesh_struct_string ) )
{ {
if ( isDefined( self.completed_emerging_into_playable_area ) && !self.completed_emerging_into_playable_area ) if ( !is_true( self.completed_emerging_into_playable_area ) )
{ {
self waittill( "completed_emerging_into_playable_area" ); self waittill( "completed_emerging_into_playable_area" );
} }
@ -243,14 +243,14 @@ start_inert( in_place ) //checked changed to match cerberus output
self notify( "zombie_acquire_enemy" ); self notify( "zombie_acquire_enemy" );
} }
} }
if ( isDefined( self.is_traversing ) && self.is_traversing ) if ( is_true( self.is_traversing ) )
{ {
while ( self isinscriptedstate() ) while ( self isinscriptedstate() )
{ {
wait 0.1; wait 0.1;
} }
} }
if ( isDefined( self.doing_equipment_attack ) && self.doing_equipment_attack ) if ( is_true( self.doing_equipment_attack ) )
{ {
self stopanimscripted(); self stopanimscripted();
} }
@ -269,7 +269,7 @@ inert_think( in_place ) //checked changed to match cerberus output
self animmode( "normal" ); self animmode( "normal" );
if ( self.has_legs ) if ( self.has_legs )
{ {
if ( isDefined( in_place ) && in_place ) if ( is_true( in_place ) )
{ {
self setgoalpos( self.origin ); self setgoalpos( self.origin );
if ( randomint( 100 ) > 50 ) if ( randomint( 100 ) > 50 )
@ -322,7 +322,7 @@ inert_think( in_place ) //checked changed to match cerberus output
{ {
self [[ self.inert_wakeup_override ]](); self [[ self.inert_wakeup_override ]]();
} }
else if ( isDefined( self.completed_emerging_into_playable_area ) && self.completed_emerging_into_playable_area ) else if ( is_true( self.completed_emerging_into_playable_area ) )
{ {
self.ignoreall = 0; self.ignoreall = 0;
if ( isDefined( level.ignore_find_flesh ) && !self [[ level.ignore_find_flesh ]]() ) if ( isDefined( level.ignore_find_flesh ) && !self [[ level.ignore_find_flesh ]]() )
@ -419,12 +419,12 @@ inert_bump() //checked changed at own discretion parity in behavior to cerberus
i++; i++;
continue; continue;
} }
if ( isDefined( zombies[ i ].is_inert ) && zombies[ i ].is_inert ) if ( is_true( zombies[ i ].is_inert ) )
{ {
i++; i++;
continue; continue;
} }
if ( isDefined( zombies[ i ].becoming_inert ) && zombies[ i ].becoming_inert ) if ( is_true( zombies[ i ].becoming_inert ) )
{ {
i++; i++;
continue; continue;

132
patch_zm/maps/mp/zombies/_zm_ai_dogs.gsc
View File

@ -21,17 +21,6 @@
init() //checked matches cerberus output init() //checked matches cerberus output
{ {
//begin of debug additions
level.custom_zm_ai_dogs_loaded = 1;
maps/mp/zombies/_zm_bot::init();
if ( isDefined( level.debugLogging ) && level.debugLogging )
{
if ( !isDefined( level.debugLogging_zm_ai_dogs ) )
{
level.debuglogging_zm_ai_dogs = 0;
}
}
//end of debug additions
level.dogs_enabled = 1; level.dogs_enabled = 1;
level.dog_rounds_enabled = 0; level.dog_rounds_enabled = 0;
level.dog_round_count = 1; level.dog_round_count = 1;
@ -70,41 +59,20 @@ init() //checked matches cerberus output
enable_dog_rounds() //checked matches cerberus output enable_dog_rounds() //checked matches cerberus output
{ {
level.dog_rounds_enabled = 1; level.dog_rounds_enabled = 1;
if ( level.debuglogging_zm_ai_dogs )
{
logline2 = "_zm_ai_dogs.gsc: Dog rounds enabled by enable_dog_rounds() " + "\n";
logprint( logline2 );
}
if ( !isDefined( level.dog_round_track_override ) ) if ( !isDefined( level.dog_round_track_override ) )
{ {
level.dog_round_track_override = ::dog_round_tracker; level.dog_round_track_override = ::dog_round_tracker;
} }
level thread [[ level.dog_round_track_override ]](); level thread [[ level.dog_round_track_override ]]();
if ( level.debuglogging_zm_ai_dogs )
{
logline3 = "_zm_ai_dogs.gsc: level.dog_round_track_override called " + "\n";
logprint( logline3 );
}
} }
dog_spawner_init() //checked does not match cerberus output did not change dog_spawner_init() //checked does not match cerberus output did not change
{ {
if ( level.debuglogging_zm_ai_dogs )
{
logline25 = "_zm_ai_dogs.gsc: dog_spawner_init() start " + " \n";
logprint( logline25 );
}
level.dog_spawners = getentarray( "zombie_dog_spawner", "script_noteworthy" ); level.dog_spawners = getentarray( "zombie_dog_spawner", "script_noteworthy" );
later_dogs = getentarray( "later_round_dog_spawners", "script_noteworthy" ); later_dogs = getentarray( "later_round_dog_spawners", "script_noteworthy" );
level.dog_spawners = arraycombine( level.dog_spawners, later_dogs, 1, 0 ); level.dog_spawners = arraycombine( level.dog_spawners, later_dogs, 1, 0 );
if ( level.dog_spawners.size == 0 ) if ( level.dog_spawners.size == 0 )
{ {
if ( level.debuglogging_zm_ai_dogs )
{
logline4 = "_zm_ai_dogs.gsc: dog_spawner_init() found no level.dog_spawners!, returning " + "\n";
logprint( logline4 );
}
return; return;
} }
i = 0; i = 0;
@ -112,21 +80,11 @@ dog_spawner_init() //checked does not match cerberus output did not change
{ {
if ( maps/mp/zombies/_zm_spawner::is_spawner_targeted_by_blocker( level.dog_spawners[ i ] ) ) if ( maps/mp/zombies/_zm_spawner::is_spawner_targeted_by_blocker( level.dog_spawners[ i ] ) )
{ {
if ( level.debuglogging_zm_ai_dogs )
{
logline5 = "_zm_ai_dogs.gsc: dog_spawner_init() disabled level.dog_spawners: " + level.dog_spawners[ i ] + " \n";
logprint( logline5 );
}
level.dog_spawners[ i ].is_enabled = 0; level.dog_spawners[ i ].is_enabled = 0;
i++; i++;
} }
else else
{ {
if ( level.debuglogging_zm_ai_dogs )
{
logline6 = "_zm_ai_dogs.gsc: dog_spawner_init() enabled level.dog_spawners: " + level.dog_spawners[ i ] + " \n";
logprint( logline6 );
}
level.dog_spawners[ i ].is_enabled = 1; level.dog_spawners[ i ].is_enabled = 1;
level.dog_spawners[ i ].script_forcespawn = 1; level.dog_spawners[ i ].script_forcespawn = 1;
i++; i++;
@ -147,20 +105,10 @@ dog_round_spawning() //checked partially matches cerberus output
} }
if ( level.intermission ) if ( level.intermission )
{ {
if ( level.debuglogging_zm_ai_dogs )
{
logline7 = "_zm_ai_dogs.gsc: dog_round_spawning() found the game ended!, returning " + " \n";
logprint( logline7 );
}
return; return;
} }
level.dog_intermission = 1; level.dog_intermission = 1;
level thread dog_round_aftermath(); level thread dog_round_aftermath();
if ( level.debuglogging_zm_ai_dogs )
{
logline8 = "_zm_ai_dogs.gsc: dog_round_aftermath() is called by dog_round_spawning() " + " \n";
logprint( logline8 );
}
players = get_players(); players = get_players();
array_thread( players, ::play_dog_round ); array_thread( players, ::play_dog_round );
wait 1; wait 1;
@ -175,17 +123,7 @@ dog_round_spawning() //checked partially matches cerberus output
max = players.size * 8; max = players.size * 8;
} }
level.zombie_total = max; level.zombie_total = max;
if ( level.debuglogging_zm_ai_dogs )
{
logline9 = "_zm_ai_dogs.gsc: Total dogs in round is set to: " + max + " \n";
logprint( logline9 );
}
dog_health_increase(); dog_health_increase();
if ( level.debuglogging_zm_ai_dogs )
{
logline10 = "_zm_ai_dogs.gsc: dog_health_increase() is called by dog_round_spawning() " + " \n";
logprint( logline10 );
}
count = 0; count = 0;
while ( count < max ) while ( count < max )
{ {
@ -207,11 +145,6 @@ dog_round_spawning() //checked partially matches cerberus output
spawn_loc thread dog_spawn_fx( ai, spawn_loc ); spawn_loc thread dog_spawn_fx( ai, spawn_loc );
level.zombie_total--; level.zombie_total--;
count++; count++;
if ( level.debuglogging_zm_ai_dogs )
{
logline11 = "_zm_ai_dogs.gsc: hellhound spawned using level.dog_spawn_func, hunting: " + favorite_enemy + " \n";
logprint( logline11 );
}
} }
} }
else else
@ -225,18 +158,8 @@ dog_round_spawning() //checked partially matches cerberus output
level.zombie_total--; level.zombie_total--;
count++; count++;
flag_set( "dog_clips" ); flag_set( "dog_clips" );
if ( level.debuglogging_zm_ai_dogs )
{
logline12 = "_zm_ai_dogs.gsc: hellhound spawned using dog_spawn_factory_logic(), hunting: " + favorite_enemy + " \n";
logprint( logline12 );
}
} }
} }
if ( level.debuglogging_zm_ai_dogs )
{
logline13 = "_zm_ai_dogs.gsc: waiting_for_next_dog_spawn() is called by dog_round_spawning() " + " \n";
logprint( logline13 );
}
waiting_for_next_dog_spawn( count, max ); waiting_for_next_dog_spawn( count, max );
} }
} }
@ -261,11 +184,6 @@ waiting_for_next_dog_spawn( count, max ) //checked matches cerberus output
default_wait = 1.5; default_wait = 1.5;
} }
default_wait = default_wait - count / max; default_wait = default_wait - count / max;
if ( level.debuglogging_zm_ai_dogs )
{
logline14 = "_zm_ai_dogs.gsc: waiting_for_next_dog_spawn() waits for: " + default_wait + " \n";
logprint( logline14 );
}
wait default_wait; wait default_wait;
} }
@ -276,22 +194,12 @@ dog_round_aftermath() //checked matches cerberus output
power_up_origin = level.last_dog_origin; power_up_origin = level.last_dog_origin;
if ( isDefined( power_up_origin ) ) if ( isDefined( power_up_origin ) )
{ {
if ( level.debuglogging_zm_ai_dogs )
{
logline15 = "_zm_ai_dogs.gsc: dog_round_aftermath() drops max ammo from final hellhound " + " \n";
logprint( logline15 );
}
level thread maps/mp/zombies/_zm_powerups::specific_powerup_drop( "full_ammo", power_up_origin ); level thread maps/mp/zombies/_zm_powerups::specific_powerup_drop( "full_ammo", power_up_origin );
} }
wait 2; wait 2;
clientnotify( "dog_stop" ); clientnotify( "dog_stop" );
wait 6; wait 6;
level.dog_intermission = 0; level.dog_intermission = 0;
if ( level.debuglogging_zm_ai_dogs )
{
logline16 = "_zm_ai_dogs.gsc: dog_round_aftermath() sets level.dog_intermission to 0 " + " \n";
logprint( logline16 );
}
} }
dog_spawn_fx( ai, ent ) //checked matches cerberus output dog_spawn_fx( ai, ent ) //checked matches cerberus output
@ -360,19 +268,9 @@ dog_spawn_factory_logic( dog_array, favorite_enemy ) //checked matches cerberus
if ( dist_squared > 160000 && dist_squared < 1000000 ) if ( dist_squared > 160000 && dist_squared < 1000000 )
{ {
level.old_dog_spawn = dog_locs[ i ]; level.old_dog_spawn = dog_locs[ i ];
if ( level.debuglogging_zm_ai_dogs )
{
logline17 = "_zm_ai_dogs.gsc: dog_spawn_factory_logic() found a spawn not previously used and is far enough from the player; returning: " + dog_locs[ i ] + " \n";
logprint( logline17 );
}
return dog_locs[ i ]; return dog_locs[ i ];
} }
} }
if ( level.debuglogging_zm_ai_dogs )
{
logline18 = "_zm_ai_dogs.gsc: dog_spawn_factory_logic() couldn't find a spawner not previously used, far enough from the player; returning first spawner in array: " + dog_locs[ 0 ] + " \n";
logprint( logline18 );
}
return dog_locs[ 0 ]; return dog_locs[ 0 ];
} }
@ -429,11 +327,6 @@ dog_health_increase() //checked changed to match cerberus output
{ {
level.dog_health = 1600; level.dog_health = 1600;
} }
if ( level.debuglogging_zm_ai_dogs )
{
logline19 = "_zm_ai_dogs.gsc: dog_health_increase() sets dog health to: " + level.dog_health + " \n";
logprint( logline19 );
}
} }
dog_round_tracker() //checked changed to match cerberus output dog_round_tracker() //checked changed to match cerberus output
@ -453,11 +346,6 @@ dog_round_tracker() //checked changed to match cerberus output
dog_round_start(); dog_round_start();
level.round_spawn_func = ::dog_round_spawning; level.round_spawn_func = ::dog_round_spawning;
level.next_dog_round = level.round_number + randomintrange( 4, 6 ); level.next_dog_round = level.round_number + randomintrange( 4, 6 );
if ( isDefined( level.debuglogging_zm_ai_dogs ) && level.debuglogging_zm_ai_dogs )
{
logline20 = "_zm_ai_dogs.gsc: dog_round_tracker() sets next dog round to: " + level.next_dog_round + " \n";
logprint( logline20 );
}
} }
else if ( flag( "dog_round" ) ) else if ( flag( "dog_round" ) )
{ {
@ -765,11 +653,6 @@ special_dog_spawn( spawners, num_to_spawn ) //checked matches cerberus output
spawn_point thread dog_spawn_fx( ai ); spawn_point thread dog_spawn_fx( ai );
count++; count++;
flag_set( "dog_clips" ); flag_set( "dog_clips" );
if ( level.debuglogging_zm_ai_dogs )
{
logline21 = "_zm_ai_dogs.gsc: special_dog_spawn() spawns a hellhound from spawner using spawners defined " + " \n";
logprint( logline21 );
}
} }
} }
else if ( isDefined( level.dog_spawn_func ) ) else if ( isDefined( level.dog_spawn_func ) )
@ -782,11 +665,6 @@ special_dog_spawn( spawners, num_to_spawn ) //checked matches cerberus output
spawn_loc thread dog_spawn_fx( ai, spawn_loc ); spawn_loc thread dog_spawn_fx( ai, spawn_loc );
count++; count++;
flag_set( "dog_clips" ); flag_set( "dog_clips" );
if ( level.debuglogging_zm_ai_dogs )
{
logline22 = "_zm_ai_dogs.gsc: special_dog_spawn() spawns a hellhound from spawner using level.dog_spawn_func " + " \n";
logprint( logline22 );
}
} }
} }
else else
@ -799,11 +677,6 @@ special_dog_spawn( spawners, num_to_spawn ) //checked matches cerberus output
spawn_point thread dog_spawn_fx( ai, spawn_point ); spawn_point thread dog_spawn_fx( ai, spawn_point );
count++; count++;
flag_set( "dog_clips" ); flag_set( "dog_clips" );
if ( level.debuglogging_zm_ai_dogs )
{
logline23 = "_zm_ai_dogs.gsc: special_dog_spawn() spawns a hellhound from spawner using dog_spawn_factory_logic() " + " \n";
logprint( logline23 );
}
} }
} }
waiting_for_next_dog_spawn( count, num_to_spawn ); waiting_for_next_dog_spawn( count, num_to_spawn );
@ -828,11 +701,6 @@ dog_run_think() //checked matches cerberus output
if ( !is_player_valid( self.favoriteenemy ) ) if ( !is_player_valid( self.favoriteenemy ) )
{ {
self.favoriteenemy = get_favorite_enemy(); self.favoriteenemy = get_favorite_enemy();
if ( level.debuglogging_zm_ai_dogs )
{
logline24 = "_zm_ai_dogs.gsc: dog_run_think() hellhound couldn't find current target, changing target to: " + self.favoriteenemy + " \n";
logprint( logline24 );
}
} }
wait 0.2; wait 0.2;
} }

10
patch_zm/maps/mp/zombies/_zm_ai_faller.gsc
View File

@ -50,7 +50,7 @@ faller_script_parameters() //checked changed to match cerberus output
setup_deathfunc( func_name ) //checked matches cerberus output setup_deathfunc( func_name ) //checked matches cerberus output
{ {
self endon( "death" ); self endon( "death" );
while ( isDefined( self.zombie_init_done ) && !self.zombie_init_done ) while ( !is_true( self.zombie_init_done ) )
{ {
wait_network_frame(); wait_network_frame();
} }
@ -74,7 +74,7 @@ do_zombie_fall( spot ) //checked changed to match cerberus output
self.zombie_faller_location = spot; self.zombie_faller_location = spot;
self.zombie_faller_location.is_enabled = 0; self.zombie_faller_location.is_enabled = 0;
self.zombie_faller_location faller_script_parameters(); self.zombie_faller_location faller_script_parameters();
if ( isDefined( self.zombie_faller_location.emerge_bottom ) && self.zombie_faller_location.emerge_bottom || isDefined( self.zombie_faller_location.emerge_top ) && self.zombie_faller_location.emerge_top ) if ( is_true( self.zombie_faller_location.emerge_bottom ) || is_true( self.zombie_faller_location.emerge_top ) )
{ {
self do_zombie_emerge( spot ); self do_zombie_emerge( spot );
return; return;
@ -205,7 +205,7 @@ zombie_land() //checked matches cerberus output
zombie_faller_always_drop() //checked matches cerberus output zombie_faller_always_drop() //checked matches cerberus output
{ {
if ( isDefined( self.zombie_faller_location.drop_now ) && self.zombie_faller_location.drop_now ) if ( is_true( self.zombie_faller_location.drop_now ) )
{ {
return 1; return 1;
} }
@ -214,7 +214,7 @@ zombie_faller_always_drop() //checked matches cerberus output
zombie_faller_drop_not_occupied() //checked matches cerberus output zombie_faller_drop_not_occupied() //checked matches cerberus output
{ {
if ( isDefined( self.zombie_faller_location.drop_not_occupied ) && self.zombie_faller_location.drop_not_occupied ) if ( is_true( self.zombie_faller_location.drop_not_occupied ) )
{ {
if ( isDefined( self.zone_name ) && isDefined( level.zones[ self.zone_name ] ) ) if ( isDefined( self.zone_name ) && isDefined( level.zones[ self.zone_name ] ) )
{ {
@ -569,7 +569,7 @@ do_zombie_emerge( spot ) //checked changed to match cerberus output
zombie_faller_emerge( spot ) //checked matches cerberus output zombie_faller_emerge( spot ) //checked matches cerberus output
{ {
self endon( "death" ); self endon( "death" );
if ( isDefined( self.zombie_faller_location.emerge_bottom ) && self.zombie_faller_location.emerge_bottom ) if ( is_true( self.zombie_faller_location.emerge_bottom ) )
{ {
self animscripted( self.zombie_faller_location.origin, self.zombie_faller_location.angles, "zombie_riser_elevator_from_floor" ); self animscripted( self.zombie_faller_location.origin, self.zombie_faller_location.angles, "zombie_riser_elevator_from_floor" );
} }

30
patch_zm/maps/mp/zombies/_zm_audio.gsc
View File

@ -26,7 +26,7 @@ setexertvoice( exert_id ) //checked matches cerberus output
playerexert( exert ) //checked changed to match cerberus output playerexert( exert ) //checked changed to match cerberus output
{ {
if ( isDefined( self.isspeaking ) && self.isspeaking || isDefined( self.isexerting ) && self.isexerting ) if ( is_true( self.isspeaking ) || is_true( self.isexerting ) )
{ {
return; return;
} }
@ -328,11 +328,11 @@ do_zombies_playvocals( alias_type, zombie_type ) //checked changed to match cerb
{ {
zombie_type = "zombie"; zombie_type = "zombie";
} }
if ( isDefined( self.shrinked ) && self.shrinked ) if ( is_true( self.shrinked ) )
{ {
return; return;
} }
if ( isDefined( self.is_inert ) && self.is_inert ) if ( is_true( self.is_inert ) )
{ {
return; return;
} }
@ -447,7 +447,7 @@ oh_shit_vox() //checked changed to match cerberus output
} }
if ( close_zombs > 4 ) if ( close_zombs > 4 )
{ {
if ( randomint( 100 ) > 75 && isDefined( self.isonbus ) && !self.isonbus ) if ( randomint( 100 ) > 75 && !is_true( self.isonbus ) )
{ {
self create_and_play_dialog( "general", "oh_shit" ); self create_and_play_dialog( "general", "oh_shit" );
wait 4; wait 4;
@ -464,7 +464,7 @@ create_and_play_dialog( category, type, response, force_variant, override ) //ch
{ {
return; return;
} }
if ( isDefined( self.dontspeak ) && self.dontspeak ) if ( is_true( self.dontspeak ) )
{ {
return; return;
} }
@ -516,7 +516,7 @@ create_and_play_dialog( category, type, response, force_variant, override ) //ch
do_player_or_npc_playvox( prefix, index, sound_to_play, waittime, category, type, override, isresponse ) //checked partially changed to match cerberus output do_player_or_npc_playvox( prefix, index, sound_to_play, waittime, category, type, override, isresponse ) //checked partially changed to match cerberus output
{ {
self endon( "death_or_disconnect" ); self endon( "death_or_disconnect" );
if ( isDefined( level.skit_vox_override ) && level.skit_vox_override && isDefined( override ) && !override ) if ( is_true( level.skit_vox_override ) && !is_true( override ) )
{ {
return; return;
} }
@ -524,11 +524,11 @@ do_player_or_npc_playvox( prefix, index, sound_to_play, waittime, category, type
{ {
self.isspeaking = 0; self.isspeaking = 0;
} }
if ( isDefined( self.isspeaking ) && self.isspeaking ) if ( is_true( self.isspeaking ) )
{ {
return; return;
} }
if ( !self arenearbyspeakersactive() || isDefined( self.ignorenearbyspkrs ) && self.ignorenearbyspkrs ) if ( !self arenearbyspeakersactive() || is_true( self.ignorenearbyspkrs ) )
{ {
self.speakingline = sound_to_play; self.speakingline = sound_to_play;
self.isspeaking = 1; self.isspeaking = 1;
@ -552,7 +552,7 @@ do_player_or_npc_playvox( prefix, index, sound_to_play, waittime, category, type
} }
self playsoundontag( prefix + sound_to_play, "J_Head" ); self playsoundontag( prefix + sound_to_play, "J_Head" );
wait playbacktime; wait playbacktime;
if ( isplayer( self ) && isDefined( isresponse ) && !isresponse && isDefined( self.last_vo_played_time ) ) if ( isplayer( self ) && !is_true( isresponse ) && isDefined( self.last_vo_played_time ) )
{ {
if ( getTime() < ( self.last_vo_played_time + 5000 ) ) if ( getTime() < ( self.last_vo_played_time + 5000 ) )
{ {
@ -570,7 +570,7 @@ do_player_or_npc_playvox( prefix, index, sound_to_play, waittime, category, type
{ {
self.last_vo_played_time = getTime(); self.last_vo_played_time = getTime();
} }
if ( isDefined( isresponse ) && isresponse ) if ( is_true( isresponse ) )
{ {
return; return;
} }
@ -744,7 +744,7 @@ player_killstreak_timer() //checked matches cerberus output
{ {
continue; continue;
} }
if ( isDefined( zomb.microwavegun_death ) && zomb.microwavegun_death ) if ( is_true( zomb.microwavegun_death ) )
{ {
continue; continue;
} }
@ -768,7 +768,7 @@ player_zombie_kill_vox( hit_location, player, mod, zombie ) //checked does not m
instakill = level.zombie_vars[ player.team ][ "zombie_insta_kill" ]; instakill = level.zombie_vars[ player.team ][ "zombie_insta_kill" ];
death = [[ level.audio_get_mod_type ]]( hit_location, mod, weapon, zombie, instakill, dist, player ); death = [[ level.audio_get_mod_type ]]( hit_location, mod, weapon, zombie, instakill, dist, player );
chance = get_response_chance( death ); chance = get_response_chance( death );
if ( chance > randomintrange( 1, 100 ) && isDefined( player.force_wait_on_kill_line ) && !player.force_wait_on_kill_line ) if ( chance > randomintrange( 1, 100 ) && !is_true( player.force_wait_on_kill_line ) )
{ {
player.force_wait_on_kill_line = 1; player.force_wait_on_kill_line = 1;
player create_and_play_dialog( "kill", death ); player create_and_play_dialog( "kill", death );
@ -879,7 +879,7 @@ get_mod_type( impact, mod, weapon, zombie, instakill, dist, player ) //checked d
return "weapon_instakill"; return "weapon_instakill";
} }
} }
if ( is_explosive_damage( mod ) && weapon != "ray_gun_zm" && isDefined( zombie.is_on_fire ) && !zombie.is_on_fire ) if ( is_explosive_damage( mod ) && weapon != "ray_gun_zm" && !is_true( zombie.is_on_fire ) )
{ {
if ( !instakill ) if ( !instakill )
{ {
@ -1197,7 +1197,7 @@ addasspeakernpc( ignorenearbyspeakers ) //checked matches cerberus output
{ {
level.npcs = []; level.npcs = [];
} }
if ( isDefined( ignorenearbyspeakers ) && ignorenearbyspeakers ) if ( is_true( ignorenearbyspeakers ) )
{ {
self.ignorenearbyspkrs = 1; self.ignorenearbyspkrs = 1;
} }
@ -1235,7 +1235,7 @@ arenearbyspeakersactive() //checked partially changed to match cerberus output
continue; continue;
} }
} }
if ( isdefined( person.isspeaking ) && person.isspeaking && isdefined( person.ignorenearbyspkrs ) && !person.ignorenearbyspkrs ) if ( is_true( person.isspeaking ) && !is_true( person.ignorenearbyspkrs ) )
{ {
if ( distancesquared( self.origin, person.origin ) < radius * radius ) if ( distancesquared( self.origin, person.origin ) < radius * radius )
{ {

4
patch_zm/maps/mp/zombies/_zm_audio_announcer.gsc
View File

@ -309,11 +309,11 @@ leaderdialogonplayer( dialog, group, queue, waittime ) //checked changed to matc
return; return;
} }
} }
if ( isDefined( self.zmbdialogactive ) && !self.zmbdialogactive ) if ( !is_true( self.zmbdialogactive ) )
{ {
self thread playleaderdialogonplayer( dialog, team, waittime ); self thread playleaderdialogonplayer( dialog, team, waittime );
} }
else if ( isdefined( queue ) && queue ) else if ( is_true( queue ) )
{ {
self.zmbdialogqueue[ self.zmbdialogqueue.size ] = dialog; self.zmbdialogqueue[ self.zmbdialogqueue.size ] = dialog;
} }

52
patch_zm/maps/mp/zombies/_zm_blockers.gsc
View File

@ -310,7 +310,7 @@ door_activate( time, open, quick, use_blocker_clip_for_pathing ) //checked match
} }
} }
self.door_moving = 1; self.door_moving = 1;
if ( open || isDefined( quick ) && !quick ) if ( open || !is_true( quick ) )
{ {
self notsolid(); self notsolid();
} }
@ -567,7 +567,7 @@ waittill_door_can_close() //checked changed to match cerberus output
self waittill_door_trigger_clear_local_power_off( trigger, all_trigs ); self waittill_door_trigger_clear_local_power_off( trigger, all_trigs );
self thread kill_trapped_zombies( trigger ); self thread kill_trapped_zombies( trigger );
} }
else if ( isDefined( self.local_power_on ) && self.local_power_on ) else if ( is_true( self.local_power_on ) )
{ {
self waittill( "local_power_off" ); self waittill( "local_power_off" );
} }
@ -581,7 +581,7 @@ waittill_door_can_close() //checked changed to match cerberus output
self thread kill_trapped_zombies( trigger ); self thread kill_trapped_zombies( trigger );
} }
} }
else if ( isDefined( self.power_on ) && self.power_on ) else if ( is_true( self.power_on ) )
{ {
self waittill( "power_off" ); self waittill( "power_off" );
} }
@ -603,11 +603,11 @@ door_think() //checked changed to match cerberus output
switch ( self.script_noteworthy ) switch ( self.script_noteworthy )
{ {
case "local_electric_door": case "local_electric_door":
if ( isDefined( self.local_power_on ) && !self.local_power_on ) if ( !is_true( self.local_power_on ) )
{ {
self waittill( "local_power_on" ); self waittill( "local_power_on" );
} }
if ( isDefined( self._door_open ) && !self._door_open ) if ( !is_true( self._door_open ) )
{ {
/* /*
/# /#
@ -622,14 +622,14 @@ door_think() //checked changed to match cerberus output
self.power_cost += 200; self.power_cost += 200;
} }
self sethintstring( "" ); self sethintstring( "" );
if ( isDefined( level.local_doors_stay_open ) && level.local_doors_stay_open ) if ( is_true( level.local_doors_stay_open ) )
{ {
return; return;
} }
wait 3; wait 3;
self waittill_door_can_close(); self waittill_door_can_close();
self door_block(); self door_block();
if ( isDefined( self._door_open ) && self._door_open ) if ( is_true( self._door_open ) )
{ {
/* /*
/# /#
@ -642,11 +642,11 @@ door_think() //checked changed to match cerberus output
wait 3; wait 3;
continue; continue;
case "electric_door": case "electric_door":
if ( isDefined( self.power_on ) && !self.power_on ) if ( !is_true( self.power_on ) )
{ {
self waittill( "power_on" ); self waittill( "power_on" );
} }
if ( isDefined( self._door_open ) && !self._door_open ) if ( !is_true( self._door_open ) )
{ {
/* /*
/# /#
@ -661,14 +661,14 @@ door_think() //checked changed to match cerberus output
self.power_cost += 200; self.power_cost += 200;
} }
self sethintstring( "" ); self sethintstring( "" );
if ( isDefined( level.local_doors_stay_open ) && level.local_doors_stay_open ) if ( is_true( level.local_doors_stay_open ) )
{ {
return; return;
} }
wait 3; wait 3;
self waittill_door_can_close(); self waittill_door_can_close();
self door_block(); self door_block();
if ( isDefined( self._door_open ) && self._door_open ) if ( is_true( self._door_open ) )
{ {
/* /*
/# /#
@ -718,7 +718,7 @@ door_think() //checked changed to match cerberus output
self_and_flag_wait( msg ) //checked matches cerberus output self_and_flag_wait( msg ) //checked matches cerberus output
{ {
self endon( msg ); self endon( msg );
if ( isDefined( self.power_door_ignore_flag_wait ) && self.power_door_ignore_flag_wait ) if ( is_true( self.power_door_ignore_flag_wait ) )
{ {
level waittill( "forever" ); level waittill( "forever" );
} }
@ -744,7 +744,7 @@ door_block() //checked changed to match cerberus output
door_opened( cost, quick_close ) //checked partially changed to match cerberus output //did not foreach to prevent infinite loop with continues door_opened( cost, quick_close ) //checked partially changed to match cerberus output //did not foreach to prevent infinite loop with continues
{ {
if ( isDefined( self.door_is_moving ) && self.door_is_moving ) if ( is_true( self.door_is_moving ) )
{ {
return; return;
} }
@ -846,7 +846,7 @@ door_opened( cost, quick_close ) //checked partially changed to match cerberus o
{ {
trig.door_is_moving = 0; trig.door_is_moving = 0;
} }
if ( isDefined( quick_close ) && quick_close ) if ( is_true( quick_close ) )
{ {
for ( i = 0; i < all_trigs.size; i++ ) for ( i = 0; i < all_trigs.size; i++ )
{ {
@ -963,7 +963,7 @@ debris_think() //partially changed to match cerberus output //did not change whi
while ( 1 ) while ( 1 )
{ {
self waittill( "trigger", who, force ); self waittill( "trigger", who, force );
if ( getDvarInt( "zombie_unlock_all" ) > 0 || isDefined( force ) && force ) if ( getDvarInt( "zombie_unlock_all" ) > 0 || is_true( force ) )
{ {
} }
else if ( !who usebuttonpressed() ) else if ( !who usebuttonpressed() )
@ -1126,7 +1126,7 @@ blocker_init() //checked partially changed to match cerberus output //did not ch
continue; continue;
} }
self.zbarrier = targets[ j ]; self.zbarrier = targets[ j ];
if ( isDefined( level.zbarrier_script_string_sets_collision ) && level.zbarrier_script_string_sets_collision ) if ( is_true( level.zbarrier_script_string_sets_collision ) )
{ {
m_collision = "p6_anim_zm_barricade_board_collision"; m_collision = "p6_anim_zm_barricade_board_collision";
} }
@ -1430,7 +1430,7 @@ blocker_unitrigger_think() //checked matches cerberus output
blocker_trigger_think() //checked changed to match cerberus output blocker_trigger_think() //checked changed to match cerberus output
{ {
self endon( "blocker_hacked" ); self endon( "blocker_hacked" );
if ( isDefined( level.no_board_repair ) && level.no_board_repair ) if ( is_true( level.no_board_repair ) )
{ {
return; return;
} }
@ -1547,7 +1547,7 @@ blocker_trigger_think() //checked changed to match cerberus output
} }
if ( isDefined( chunk.script_parameters ) && chunk.script_parameters != "board" || chunk.script_parameters == "repair_board" && chunk.script_parameters == "barricade_vents" ) if ( isDefined( chunk.script_parameters ) && chunk.script_parameters != "board" || chunk.script_parameters == "repair_board" && chunk.script_parameters == "barricade_vents" )
{ {
if ( isDefined( level.use_clientside_board_fx ) && !level.use_clientside_board_fx ) if ( !is_true( level.use_clientside_board_fx ) )
{ {
if ( !isDefined( chunk.material ) || isDefined( chunk.material ) && chunk.material != "rock" ) if ( !isDefined( chunk.material ) || isDefined( chunk.material ) && chunk.material != "rock" )
{ {
@ -1678,7 +1678,7 @@ remove_chunk( chunk, node, destroy_immediately, zomb ) //checked changed to matc
{ {
fx = self.script_fxid; fx = self.script_fxid;
} }
if ( isDefined( chunk.script_moveoverride ) && chunk.script_moveoverride ) if ( is_true( chunk.script_moveoverride ) )
{ {
chunk hide(); chunk hide();
} }
@ -1894,7 +1894,7 @@ zombie_boardtear_audio_offset( chunk ) //checked changed to match cerberus outpu
} }
else if ( isDefined( chunk.material ) && chunk.material == "rock" ) else if ( isDefined( chunk.material ) && chunk.material == "rock" )
{ {
if ( isDefined( level.use_clientside_rock_tearin_fx ) && !level.use_clientside_rock_tearin_fx ) if ( !is_true( level.use_clientside_rock_tearin_fx ) )
{ {
chunk playsound( "zmb_break_rock_barrier" ); chunk playsound( "zmb_break_rock_barrier" );
wait randomfloatrange( 0.3, 0.6 ); wait randomfloatrange( 0.3, 0.6 );
@ -1904,12 +1904,12 @@ zombie_boardtear_audio_offset( chunk ) //checked changed to match cerberus outpu
} }
else if ( isDefined( chunk.material ) && chunk.material == "metal_vent" ) else if ( isDefined( chunk.material ) && chunk.material == "metal_vent" )
{ {
if ( isDefined( level.use_clientside_board_fx ) && !level.use_clientside_board_fx ) if ( !is_true( level.use_clientside_board_fx ) )
{ {
chunk playsound( "evt_vent_slat_remove" ); chunk playsound( "evt_vent_slat_remove" );
} }
} }
else if ( isDefined( level.use_clientside_board_fx ) && !level.use_clientside_board_fx ) else if ( !is_true( level.use_clientside_board_fx ) )
{ {
chunk play_sound_on_ent( "break_barrier_piece" ); chunk play_sound_on_ent( "break_barrier_piece" );
wait randomfloatrange( 0.3, 0.6 ); wait randomfloatrange( 0.3, 0.6 );
@ -2018,7 +2018,7 @@ zombie_boardtear_audio_plus_fx_offset_repair_horizontal( chunk ) //checked chang
{ {
if ( isDefined( chunk.material ) && chunk.material == "rock" ) if ( isDefined( chunk.material ) && chunk.material == "rock" )
{ {
if ( isDefined( level.use_clientside_rock_tearin_fx ) && level.use_clientside_rock_tearin_fx ) if ( is_true( level.use_clientside_rock_tearin_fx ) )
{ {
chunk clearclientflag( level._zombie_scriptmover_flag_rock_fx ); chunk clearclientflag( level._zombie_scriptmover_flag_rock_fx );
} }
@ -2031,7 +2031,7 @@ zombie_boardtear_audio_plus_fx_offset_repair_horizontal( chunk ) //checked chang
playfx( level._effect[ "wood_chunk_destory" ], chunk.origin + vectorScale( ( 0, 0, -1 ), 30 ) ); playfx( level._effect[ "wood_chunk_destory" ], chunk.origin + vectorScale( ( 0, 0, -1 ), 30 ) );
} }
} }
else if ( isDefined( level.use_clientside_board_fx ) && level.use_clientside_board_fx ) else if ( is_true( level.use_clientside_board_fx ) )
{ {
chunk clearclientflag( level._zombie_scriptmover_flag_board_horizontal_fx ); chunk clearclientflag( level._zombie_scriptmover_flag_board_horizontal_fx );
} }
@ -2049,7 +2049,7 @@ zombie_boardtear_audio_plus_fx_offset_repair_verticle( chunk ) //checked changed
{ {
if ( isDefined( chunk.material ) && chunk.material == "rock" ) if ( isDefined( chunk.material ) && chunk.material == "rock" )
{ {
if ( isDefined( level.use_clientside_rock_tearin_fx ) && level.use_clientside_rock_tearin_fx ) if ( is_true( level.use_clientside_rock_tearin_fx ) )
{ {
chunk clearclientflag( level._zombie_scriptmover_flag_rock_fx ); chunk clearclientflag( level._zombie_scriptmover_flag_rock_fx );
} }
@ -2062,7 +2062,7 @@ zombie_boardtear_audio_plus_fx_offset_repair_verticle( chunk ) //checked changed
playfx( level._effect[ "wood_chunk_destory" ], chunk.origin + vectorScale( ( -1, 0, 0 ), 30 ) ); playfx( level._effect[ "wood_chunk_destory" ], chunk.origin + vectorScale( ( -1, 0, 0 ), 30 ) );
} }
} }
else if ( isDefined( level.use_clientside_board_fx ) && level.use_clientside_board_fx ) else if ( is_true( level.use_clientside_board_fx ) )
{ {
chunk clearclientflag( level._zombie_scriptmover_flag_board_vertical_fx ); chunk clearclientflag( level._zombie_scriptmover_flag_board_vertical_fx );
} }

54
patch_zm/maps/mp/zombies/_zm_buildables.gsc
View File

@ -473,7 +473,7 @@ generate_piece_unitrigger( classname, origin, angles, flags, radius, script_heig
unitrigger_stub.prompt_and_visibility_func = ::piecetrigger_update_prompt; unitrigger_stub.prompt_and_visibility_func = ::piecetrigger_update_prompt;
unitrigger_stub.originfunc = ::piecestub_get_unitrigger_origin; unitrigger_stub.originfunc = ::piecestub_get_unitrigger_origin;
unitrigger_stub.onspawnfunc = ::anystub_on_spawn_trigger; unitrigger_stub.onspawnfunc = ::anystub_on_spawn_trigger;
if ( isDefined( moving ) && moving ) if ( is_true( moving ) )
{ {
maps/mp/zombies/_zm_unitrigger::register_unitrigger( unitrigger_stub, ::piece_unitrigger_think ); maps/mp/zombies/_zm_unitrigger::register_unitrigger( unitrigger_stub, ::piece_unitrigger_think );
} }
@ -722,7 +722,7 @@ player_throw_piece( piece, origin, dir, return_to_spawn, return_time, endangles
{ {
piece [[ piece.ondrop ]]( self ); piece [[ piece.ondrop ]]( self );
} }
if ( isDefined( return_to_spawn ) && return_to_spawn ) if ( is_true( return_to_spawn ) )
{ {
piece piece_wait_and_return( return_time ); piece piece_wait_and_return( return_time );
} }
@ -1117,7 +1117,7 @@ piece_spawn_in( piecespawn ) //checked matches cerberus output
{ {
return; return;
} }
if ( isDefined( self.managed_spawn ) && self.managed_spawn ) if ( is_true( self.managed_spawn ) )
{ {
if ( !isDefined( self.current_spawn ) ) if ( !isDefined( self.current_spawn ) )
{ {
@ -1182,7 +1182,7 @@ piece_spawn_at( origin, angles ) //checked changed to match cerberus output
{ {
return; return;
} }
if ( isDefined( self.managed_spawn ) && self.managed_spawn ) if ( is_true( self.managed_spawn ) )
{ {
if ( !isDefined( self.current_spawn ) && !isDefined( origin ) ) if ( !isDefined( self.current_spawn ) && !isDefined( origin ) )
{ {
@ -1256,7 +1256,7 @@ piece_unspawn() //checked matches cerberus output
{ {
self [[ self.onunspawn ]](); self [[ self.onunspawn ]]();
} }
if ( isDefined( self.managed_spawn ) && self.managed_spawn ) if ( is_true( self.managed_spawn ) )
{ {
self piece_deallocate_spawn(); self piece_deallocate_spawn();
} }
@ -1366,7 +1366,7 @@ buildable_piece_unitriggers( buildable_name, origin ) //checked changed to match
{ {
buildablepiece.generated_instances = 0; buildablepiece.generated_instances = 0;
} }
if ( isDefined( buildablepiece.generated_piece ) && isDefined( buildablepiece.can_reuse ) && buildablepiece.can_reuse ) if ( isDefined( buildablepiece.generated_piece ) && is_true( buildablepiece.can_reuse ) )
{ {
piece = buildablepiece.generated_piece; piece = buildablepiece.generated_piece;
break; break;
@ -1605,9 +1605,9 @@ buildable_is_piece_built_or_building( piece ) //checked partially changed to mat
{ {
if ( self.pieces[ i ].modelname == piece.modelname && self.pieces[ i ].buildablename == piece.buildablename ) if ( self.pieces[ i ].modelname == piece.modelname && self.pieces[ i ].buildablename == piece.buildablename )
{ {
if ( isDefined( self.pieces[ i ].built ) && !self.pieces[ i ].built ) if ( !is_true( self.pieces[ i ].built ) )
{ {
if ( isDefined( self.pieces[ i ].building ) && self.pieces[ i ].building ) if ( is_true( self.pieces[ i ].building ) )
{ {
return 1; return 1;
} }
@ -1622,7 +1622,7 @@ buildable_all_built() //checked changed to match cerberus output
{ {
for ( i = 0; i < self.pieces.size; i++ ) for ( i = 0; i < self.pieces.size; i++ )
{ {
if ( isDefined( self.pieces[ i ].built ) && !self.pieces[ i ].built ) if ( !is_true( self.pieces[ i ].built ) )
{ {
return 0; return 0;
} }
@ -1644,7 +1644,7 @@ player_can_build( buildable, continuing ) //checked changed to match cerberus ou
{ {
return 0; return 0;
} }
if ( isDefined( continuing ) && continuing ) if ( is_true( continuing ) )
{ {
if ( buildable buildable_is_piece_built( self player_get_buildable_piece( buildable.buildable_slot ) ) ) if ( buildable buildable_is_piece_built( self player_get_buildable_piece( buildable.buildable_slot ) ) )
{ {
@ -1685,7 +1685,7 @@ player_build( buildable, pieces ) //checked partially changed to match cerberus
if ( isDefined( buildable.pieces[ i ].part_name ) ) if ( isDefined( buildable.pieces[ i ].part_name ) )
{ {
buildable.stub.model notsolid(); buildable.stub.model notsolid();
if ( isDefined( buildable.pieces[ i ].built ) && !buildable.pieces[ i ].built ) if ( !is_true( buildable.pieces[ i ].built ) )
{ {
buildable.stub.model hidepart( buildable.pieces[ i ].part_name ); buildable.stub.model hidepart( buildable.pieces[ i ].part_name );
i++; i++;
@ -1877,7 +1877,7 @@ buildablestub_update_prompt( player ) //checked changed to match cerberus output
self.hint_string = &"ZOMBIE_GO_TO_THE_BOX_LIMITED"; self.hint_string = &"ZOMBIE_GO_TO_THE_BOX_LIMITED";
return 0; return 0;
} }
else if ( isDefined( self.bought ) && self.bought ) else if ( is_true( self.bought ) )
{ {
self.hint_string = &"ZOMBIE_GO_TO_THE_BOX"; self.hint_string = &"ZOMBIE_GO_TO_THE_BOX";
return 0; return 0;
@ -1941,7 +1941,7 @@ player_continue_building( buildablezone, build_stub ) //checked matches cerberus
return 0; return 0;
} }
} }
if ( isDefined( build_stub.require_look_at ) && build_stub.require_look_at && !self is_player_looking_at( trigger.origin, 0.4 ) ) if ( is_true( build_stub.require_look_at ) && !self is_player_looking_at( trigger.origin, 0.4 ) )
{ {
return 0; return 0;
} }
@ -2039,7 +2039,7 @@ buildable_use_hold_think_internal( player, bind_stub ) //checked changed to matc
player notify( "buildable_progress_end" ); player notify( "buildable_progress_end" );
player maps/mp/zombies/_zm_weapons::switch_back_primary_weapon( orgweapon ); player maps/mp/zombies/_zm_weapons::switch_back_primary_weapon( orgweapon );
player takeweapon( "zombie_builder_zm" ); player takeweapon( "zombie_builder_zm" );
if ( isDefined( player.is_drinking ) && player.is_drinking ) if ( is_true( player.is_drinking ) )
{ {
player decrement_is_drinking(); player decrement_is_drinking();
} }
@ -2090,7 +2090,7 @@ buildable_place_think() //checked partially changed to match cerberus output //c
{ {
self endon( "kill_trigger" ); self endon( "kill_trigger" );
player_built = undefined; player_built = undefined;
while ( isDefined( self.stub.built ) && !self.stub.built ) while ( !is_true( self.stub.built ) )
{ {
self waittill( "trigger", player ); self waittill( "trigger", player );
if ( player != self.parent_player ) if ( player != self.parent_player )
@ -2189,7 +2189,7 @@ bptrigger_think_one_use_and_fly( player_built ) //checked changed to match cerbe
self sethintstring( self.stub.hint_string ); self sethintstring( self.stub.hint_string );
return; return;
} }
if ( isDefined( self.stub.bought ) && self.stub.bought ) if ( is_true( self.stub.bought ) )
{ {
self.stub.hint_string = &"ZOMBIE_GO_TO_THE_BOX"; self.stub.hint_string = &"ZOMBIE_GO_TO_THE_BOX";
self sethintstring( self.stub.hint_string ); self sethintstring( self.stub.hint_string );
@ -2203,7 +2203,7 @@ bptrigger_think_one_use_and_fly( player_built ) //checked changed to match cerbe
while ( self.stub.persistent == 2 ) while ( self.stub.persistent == 2 )
{ {
self waittill( "trigger", player ); self waittill( "trigger", player );
while ( isDefined( player.screecher_weapon ) ) if ( isDefined( player.screecher_weapon ) )
{ {
continue; continue;
} }
@ -2213,7 +2213,7 @@ bptrigger_think_one_use_and_fly( player_built ) //checked changed to match cerbe
self sethintstring( self.stub.hint_string ); self sethintstring( self.stub.hint_string );
return; return;
} }
if ( isDefined( self.stub.built ) && !self.stub.built ) if ( !is_true( self.stub.built ) )
{ {
self.stub.hint_string = ""; self.stub.hint_string = "";
self sethintstring( self.stub.hint_string ); self sethintstring( self.stub.hint_string );
@ -2266,7 +2266,7 @@ bptrigger_think_persistent( player_built ) //checked changed to match cerberus o
{ {
continue; continue;
} }
if ( isDefined( self.stub.built ) && !self.stub.built ) if ( !is_true( self.stub.built ) )
{ {
self.stub.hint_string = ""; self.stub.hint_string = "";
self sethintstring( self.stub.hint_string ); self sethintstring( self.stub.hint_string );
@ -2394,7 +2394,7 @@ stub_unbuild_buildable( stub, return_pieces, origin, angles ) //checked partiall
if ( isDefined( buildable.pieces[ i ].part_name ) ) if ( isDefined( buildable.pieces[ i ].part_name ) )
{ {
buildable.stub.model notsolid(); buildable.stub.model notsolid();
if ( isDefined( buildable.pieces[ i ].built ) && !buildable.pieces[ i ].built ) if ( is_true( buildable.pieces[ i ].built ) )
{ {
buildable.stub.model hidepart( buildable.pieces[ i ].part_name ); buildable.stub.model hidepart( buildable.pieces[ i ].part_name );
} }
@ -2404,7 +2404,7 @@ stub_unbuild_buildable( stub, return_pieces, origin, angles ) //checked partiall
buildable.stub.model showpart( buildable.pieces[ i ].part_name ); buildable.stub.model showpart( buildable.pieces[ i ].part_name );
} }
} }
if ( isDefined( return_pieces ) && return_pieces ) if ( is_true( return_pieces ) )
{ {
if ( isDefined( buildable.stub.str_unbuild_notify ) ) if ( isDefined( buildable.stub.str_unbuild_notify ) )
{ {
@ -2441,7 +2441,7 @@ player_explode_buildable( equipname, origin, speed, return_to_spawn, return_time
if ( isDefined( buildable.pieces[ i ].part_name ) ) if ( isDefined( buildable.pieces[ i ].part_name ) )
{ {
buildable.stub.model notsolid(); buildable.stub.model notsolid();
if ( isDefined( buildable.pieces[ i ].built ) && !buildable.pieces[ i ].built ) if ( !is_true( buildable.pieces[ i ].built ) )
{ {
buildable.stub.model hidepart( buildable.pieces[ i ].part_name ); buildable.stub.model hidepart( buildable.pieces[ i ].part_name );
} }
@ -2995,7 +2995,7 @@ track_buildables_planted( equipment ) //checked matches cerberus output
{ {
vo_name = "build_plc_trap"; vo_name = "build_plc_trap";
} }
if ( isDefined( self.buildable_timer ) && !self.buildable_timer ) if ( !is_true( self.buildable_timer ) )
{ {
self thread do_player_general_vox( "general", vo_name ); self thread do_player_general_vox( "general", vo_name );
self thread placed_buildable_vo_timer(); self thread placed_buildable_vo_timer();
@ -3029,7 +3029,7 @@ track_planted_buildables_pickedup( equipment ) //checked changed to match cerber
self maps/mp/zombies/_zm_stats::increment_client_stat( "planted_buildables_pickedup", 0 ); self maps/mp/zombies/_zm_stats::increment_client_stat( "planted_buildables_pickedup", 0 );
self maps/mp/zombies/_zm_stats::increment_player_stat( "planted_buildables_pickedup" ); self maps/mp/zombies/_zm_stats::increment_player_stat( "planted_buildables_pickedup" );
} }
if ( isDefined( self.buildable_pickedup_timer ) && !self.buildable_pickedup_timer ) if ( !is_true( self.buildable_pickedup_timer ) )
{ {
self say_pickup_buildable_vo( equipment, 1 ); self say_pickup_buildable_vo( equipment, 1 );
self thread buildable_pickedup_timer(); self thread buildable_pickedup_timer();
@ -3061,7 +3061,7 @@ add_map_buildable_stat( piece_name, stat_name, value ) //checked changed to matc
{ {
return; return;
} }
if ( isDefined( level.zm_disable_recording_stats ) && level.zm_disable_recording_stats || isDefined( level.zm_disable_recording_buildable_stats ) && level.zm_disable_recording_buildable_stats ) if ( is_true( level.zm_disable_recording_stats ) || is_true( level.zm_disable_recording_buildable_stats ) )
{ {
return; return;
} }
@ -3070,7 +3070,7 @@ add_map_buildable_stat( piece_name, stat_name, value ) //checked changed to matc
say_pickup_buildable_vo( buildable_name, world ) //checked matches cerberus output say_pickup_buildable_vo( buildable_name, world ) //checked matches cerberus output
{ {
if ( isDefined( self.buildable_pickedup_timer ) && self.buildable_pickedup_timer ) if ( is_true( self.buildable_pickedup_timer ) )
{ {
return; return;
} }
@ -3080,7 +3080,7 @@ say_pickup_buildable_vo( buildable_name, world ) //checked matches cerberus outp
return; return;
} }
vo_name = "build_pck_b" + name; vo_name = "build_pck_b" + name;
if ( isDefined( world ) && world ) if ( is_true( world ) )
{ {
vo_name = "build_pck_w" + name; vo_name = "build_pck_w" + name;
} }

10
patch_zm/maps/mp/zombies/_zm_chugabud.gsc
View File

@ -39,7 +39,7 @@ chugabud_laststand() //checked changed to match cerberus output
self maps/mp/zombies/_zm_chugabud::chugabud_save_loadout(); self maps/mp/zombies/_zm_chugabud::chugabud_save_loadout();
self maps/mp/zombies/_zm_chugabud::chugabud_fake_death(); self maps/mp/zombies/_zm_chugabud::chugabud_fake_death();
wait 3; wait 3;
if ( isDefined( self.insta_killed ) && self.insta_killed || isDefined( self.disable_chugabud_corpse ) ) if ( is_true( self.insta_killed ) || isDefined( self.disable_chugabud_corpse ) )
{ {
create_corpse = 0; create_corpse = 0;
} }
@ -58,8 +58,6 @@ chugabud_laststand() //checked changed to match cerberus output
} }
} }
} }
logline1 = "INFO: _zm_chugabud.gsc chugabud_laststand() create_corpse: " + create_corpse + "\n";
logprint( logline1 );
if ( create_corpse == 1 ) if ( create_corpse == 1 )
{ {
self thread activate_chugabud_effects_and_audio(); self thread activate_chugabud_effects_and_audio();
@ -352,7 +350,7 @@ chugabud_give_loadout() //checked partially changed to match cerberus output con
chugabud_restore_grenades() //checked matches cerberus output chugabud_restore_grenades() //checked matches cerberus output
{ {
if ( isDefined( self.loadout.hasemp ) && self.loadout.hasemp ) if ( is_true( self.loadout.hasemp ) )
{ {
self giveweapon( "emp_grenade_zm" ); self giveweapon( "emp_grenade_zm" );
self setweaponammoclip( "emp_grenade_zm", self.loadout.empclip ); self setweaponammoclip( "emp_grenade_zm", self.loadout.empclip );
@ -366,7 +364,7 @@ chugabud_restore_grenades() //checked matches cerberus output
chugabud_restore_claymore() //checked matches cerberus output chugabud_restore_claymore() //checked matches cerberus output
{ {
if ( isDefined( self.loadout.hasclaymore ) && self.loadout.hasclaymore && !self hasweapon( "claymore_zm" ) ) if ( is_true( self.loadout.hasclaymore ) && !self hasweapon( "claymore_zm" ) )
{ {
self giveweapon( "claymore_zm" ); self giveweapon( "claymore_zm" );
self set_player_placeable_mine( "claymore_zm" ); self set_player_placeable_mine( "claymore_zm" );
@ -605,7 +603,7 @@ restore_weapon_for_chugabud( player, weapon_name ) //checked changed to match ce
{ {
return; return;
} }
if ( isDefined( self.chugabud_melee_weapons[ weapon_name ] ) && self.chugabud_melee_weapons[ weapon_name ] ) if ( is_true( self.chugabud_melee_weapons[ weapon_name ] ) )
{ {
player giveweapon( weapon_name ); player giveweapon( weapon_name );
player set_player_melee_weapon( weapon_name ); player set_player_melee_weapon( weapon_name );

54
patch_zm/maps/mp/zombies/_zm_equip_turbine.gsc
View File

@ -100,7 +100,7 @@ cleanupoldturbine( preserve_state ) //checked matches cerberus output
} }
self.buildableturbine stoploopsound(); self.buildableturbine stoploopsound();
self.buildableturbine delete(); self.buildableturbine delete();
if ( isDefined( preserve_state ) && !preserve_state ) if ( !is_true( preserve_state ) )
{ {
self.turbine_health = undefined; self.turbine_health = undefined;
self.turbine_emped = undefined; self.turbine_emped = undefined;
@ -179,15 +179,15 @@ pickupturbine( item ) //checked matches cerberus output
transferturbine( fromplayer, toplayer ) //checked changed to match cerberus output transferturbine( fromplayer, toplayer ) //checked changed to match cerberus output
{ {
while ( isDefined( toplayer.turbine_is_powering_on ) && toplayer.turbine_is_powering_on || isDefined( fromplayer.turbine_is_powering_on ) && fromplayer.turbine_is_powering_on ) while ( is_true( toplayer.turbine_is_powering_on ) || is_true( fromplayer.turbine_is_powering_on ) )
{ {
wait 0.05; wait 0.05;
} }
if ( isDefined( fromplayer.buildableturbine ) && isDefined( fromplayer.buildableturbine.dying ) && fromplayer.buildableturbine.dying ) if ( isDefined( fromplayer.buildableturbine ) && is_true( fromplayer.buildableturbine.dying ) )
{ {
fromplayer cleanupoldturbine( 0 ); fromplayer cleanupoldturbine( 0 );
} }
if ( isDefined( toplayer.buildableturbine ) && isDefined( toplayer.buildableturbine.dying ) && toplayer.buildableturbine.dying ) if ( isDefined( toplayer.buildableturbine ) && is_true( toplayer.buildableturbine.dying ) )
{ {
toplayer cleanupoldturbine( 0 ); toplayer cleanupoldturbine( 0 );
} }
@ -268,7 +268,7 @@ startturbinedeploy( weapon ) //checked matches cerberus output
self thread turbineaudio(); self thread turbineaudio();
self thread turbineanim(); self thread turbineanim();
self thread turbinepowerthink( weapon, powerradius ); self thread turbinepowerthink( weapon, powerradius );
if ( isDefined( weapon.equipment_can_move ) && weapon.equipment_can_move ) if ( is_true( weapon.equipment_can_move ) )
{ {
self thread turbinepowermove( weapon ); self thread turbinepowermove( weapon );
} }
@ -310,14 +310,14 @@ turbinepowerthink( weapon, powerradius ) //checked changed to match cerberus out
self.buildableturbine endon( "death" ); self.buildableturbine endon( "death" );
origin = weapon.origin; origin = weapon.origin;
self thread turbine_watch_for_emp( weapon, powerradius ); self thread turbine_watch_for_emp( weapon, powerradius );
if ( isDefined( self.turbine_power_on ) && self.turbine_power_on || isDefined( self.turbine_emped ) && self.turbine_emped ) if ( is_true( self.turbine_power_on ) || is_true( self.turbine_emped ) )
{ {
self thread turbinepoweron( origin, powerradius ); self thread turbinepoweron( origin, powerradius );
} }
while ( isDefined( self.buildableturbine ) ) while ( isDefined( self.buildableturbine ) )
{ {
self waittill( "turbine_power_change" ); self waittill( "turbine_power_change" );
if ( isDefined( self.turbine_emped ) && self.turbine_emped ) if ( is_true( self.turbine_emped ) )
{ {
self thread turbinepoweroff( origin, powerradius ); self thread turbinepoweroff( origin, powerradius );
if ( isDefined( weapon ) ) if ( isDefined( weapon ) )
@ -327,7 +327,7 @@ turbinepowerthink( weapon, powerradius ) //checked changed to match cerberus out
self thread turbinepoweron( origin, powerradius ); self thread turbinepoweron( origin, powerradius );
//continue; //continue;
} }
else if ( isDefined( self.turbine_power_is_on ) && !self.turbine_power_is_on ) else if ( !is_true( self.turbine_power_is_on ) )
{ {
self thread turbinepoweroff( origin, powerradius ); self thread turbinepoweroff( origin, powerradius );
break; break;
@ -363,7 +363,7 @@ turbinepowermove( weapon ) //checked matches cerberus output
turbinewarmup() //checked matches cerberus output //order of operations may need to be checked turbinewarmup() //checked matches cerberus output //order of operations may need to be checked
{ {
if ( isDefined( self.turbine_emped ) && self.turbine_emped ) if ( is_true( self.turbine_emped ) )
{ {
emp_time = level.zombie_vars[ "emp_perk_off_time" ]; emp_time = level.zombie_vars[ "emp_perk_off_time" ];
now = getTime(); now = getTime();
@ -389,7 +389,7 @@ turbinepoweron( origin, powerradius ) //checked matches cerberus output
self endon( "disconnect" ); self endon( "disconnect" );
self endon( "equip_turbine_zm_taken" ); self endon( "equip_turbine_zm_taken" );
self.buildableturbine endon( "death" ); self.buildableturbine endon( "death" );
if ( isDefined( self.turbine_power_is_on ) && !self.turbine_power_is_on && isDefined( self.turbine_is_powering_on ) && !self.turbine_is_powering_on && isDefined( self.buildableturbine.dying ) && !self.buildableturbine.dying ) if ( !is_true( self.turbine_power_is_on ) && !is_true( self.turbine_is_powering_on ) && !is_true( self.buildableturbine.dying ) )
{ {
self.turbine_is_powering_on = 1; self.turbine_is_powering_on = 1;
self.buildableturbine playloopsound( "zmb_turbine_loop", 2 ); self.buildableturbine playloopsound( "zmb_turbine_loop", 2 );
@ -400,7 +400,7 @@ turbinepoweron( origin, powerradius ) //checked matches cerberus output
} }
self.localpower = undefined; self.localpower = undefined;
self.turbine_power_is_on = 0; self.turbine_power_is_on = 0;
if ( isDefined( self.turbine_emped ) && !self.turbine_emped ) if ( !is_true( self.turbine_emped ) )
{ {
self.localpower = maps/mp/zombies/_zm_power::add_local_power( origin, powerradius ); self.localpower = maps/mp/zombies/_zm_power::add_local_power( origin, powerradius );
self thread depower_on_disconnect( self.localpower ); self thread depower_on_disconnect( self.localpower );
@ -415,7 +415,7 @@ turbinepoweron( origin, powerradius ) //checked matches cerberus output
turbinepoweroff( origin, powerradius ) //checked matches cerberus output turbinepoweroff( origin, powerradius ) //checked matches cerberus output
{ {
if ( isDefined( self.turbine_power_is_on ) && self.turbine_power_is_on ) if ( is_true( self.turbine_power_is_on ) )
{ {
if ( isDefined( self.localpower ) ) if ( isDefined( self.localpower ) )
{ {
@ -425,7 +425,7 @@ turbinepoweroff( origin, powerradius ) //checked matches cerberus output
self.localpower = undefined; self.localpower = undefined;
self.turbine_power_is_on = 0; self.turbine_power_is_on = 0;
self thread turbineaudio(); self thread turbineaudio();
if ( isDefined( self.buildableturbine.dying ) && !self.buildableturbine.dying ) if ( !is_true( self.buildableturbine.dying ) )
{ {
self thread turbineanim(); self thread turbineanim();
} }
@ -447,7 +447,7 @@ turbine_disappear_fx( origin, waittime ) //checked matches cerberus output
turbinefxonce( withaoe ) //checked matches cerberus output turbinefxonce( withaoe ) //checked matches cerberus output
{ {
if ( isDefined( self ) && isDefined( self.buildableturbine ) && isDefined( self.turbine_power_is_on ) && self.turbine_power_is_on ) if ( isDefined( self ) && isDefined( self.buildableturbine ) && is_true( self.turbine_power_is_on ) )
{ {
value = 0; value = 0;
switch( self.turbine_power_level ) switch( self.turbine_power_level )
@ -465,7 +465,7 @@ turbinefxonce( withaoe ) //checked matches cerberus output
} }
if ( withaoe ) if ( withaoe )
{ {
if ( isDefined( self.buildableturbine.equipment_can_move ) && self.buildableturbine.equipment_can_move && isDefined( self.buildableturbine.move_parent.ismoving ) && self.buildableturbine.move_parent.ismoving ) if ( is_true( self.buildableturbine.equipment_can_move ) && is_true( self.buildableturbine.move_parent.ismoving ) )
{ {
value |= 4; value |= 4;
} }
@ -474,7 +474,7 @@ turbinefxonce( withaoe ) //checked matches cerberus output
value |= 8; value |= 8;
} }
} }
if ( value && isDefined( self.buildableturbine ) && isDefined( self.turbine_power_is_on ) && self.turbine_power_is_on ) if ( value && isDefined( self.buildableturbine ) && is_true( self.turbine_power_is_on ) )
{ {
self.buildableturbine thread maps/mp/zombies/_zm_equipment::signal_equipment_activated( value ); self.buildableturbine thread maps/mp/zombies/_zm_equipment::signal_equipment_activated( value );
} }
@ -485,7 +485,7 @@ turbinefx() //checked matches cerberus output
{ {
self endon( "disconnect" ); self endon( "disconnect" );
self endon( "equip_turbine_zm_taken" ); self endon( "equip_turbine_zm_taken" );
while ( isDefined( self ) && isDefined( self.buildableturbine ) && isDefined( self.turbine_power_is_on ) && self.turbine_power_is_on ) while ( isDefined( self ) && isDefined( self.buildableturbine ) && is_true( self.turbine_power_is_on ) )
{ {
self turbinefxonce( 1 ); self turbinefxonce( 1 );
wait 0.5; wait 0.5;
@ -500,7 +500,7 @@ turbineaudio() //checked changed to match cerberus output
{ {
return; return;
} }
if ( isDefined( self.turbine_power_is_on ) && !self.turbine_power_is_on || isDefined( self.turbine_emped ) && self.turbine_emped ) if ( !is_true( self.turbine_power_is_on ) || is_true( self.turbine_emped ) )
{ {
self.buildableturbine stoploopsound(); self.buildableturbine stoploopsound();
return; return;
@ -521,13 +521,13 @@ turbineanim( wait_for_end ) //checked changed to match cerberus output
} }
animlength = 0; animlength = 0;
self.buildableturbine useanimtree( -1 ); self.buildableturbine useanimtree( -1 );
if ( isDefined( self.buildableturbine.dying ) && self.buildableturbine.dying ) if ( is_true( self.buildableturbine.dying ) )
{ {
animlength = getanimlength( %o_zombie_buildable_turbine_death ); animlength = getanimlength( %o_zombie_buildable_turbine_death );
self.buildableturbine setanim( %o_zombie_buildable_turbine_death ); self.buildableturbine setanim( %o_zombie_buildable_turbine_death );
break; break;
} }
if ( isDefined( self.turbine_emped ) && self.turbine_emped ) if ( is_true( self.turbine_emped ) )
{ {
self.buildableturbine clearanim( %o_zombie_buildable_turbine_fullpower, 0 ); self.buildableturbine clearanim( %o_zombie_buildable_turbine_fullpower, 0 );
return; return;
@ -548,7 +548,7 @@ turbineanim( wait_for_end ) //checked changed to match cerberus output
self.buildableturbine setanim( %o_zombie_buildable_turbine_neardeath ); self.buildableturbine setanim( %o_zombie_buildable_turbine_neardeath );
break; break;
} }
if ( isDefined( wait_for_end ) && wait_for_end ) if ( is_true( wait_for_end ) )
{ {
wait animlength; wait animlength;
} }
@ -570,7 +570,7 @@ turbinedecay() //checked changed to match cerberus output //order of operations
while ( self.turbine_health > 0 ) while ( self.turbine_health > 0 )
{ {
old_power_level = self.turbine_power_level; old_power_level = self.turbine_power_level;
if ( isDefined( self.turbine_emped ) && self.turbine_emped && isDefined( self.turbine_is_powering_on ) && self.turbine_is_powering_on ) if ( is_true( self.turbine_emped ) && is_true( self.turbine_is_powering_on ) )
{ {
emp_time = level.zombie_vars[ "emp_perk_off_time" ]; emp_time = level.zombie_vars[ "emp_perk_off_time" ];
now = getTime(); now = getTime();
@ -583,11 +583,11 @@ turbinedecay() //checked changed to match cerberus output //order of operations
old_power_level = -1; old_power_level = -1;
} }
} }
if ( isDefined( self.turbine_emped ) && self.turbine_emped ) if ( is_true( self.turbine_emped ) )
{ {
self.turbine_power_level = 0; self.turbine_power_level = 0;
} }
else if ( isDefined( self.turbine_power_is_on ) && self.turbine_power_is_on ) else if ( is_true( self.turbine_power_is_on ) )
{ {
cost = 1; cost = 1;
if ( isDefined( self.localpower ) ) if ( isDefined( self.localpower ) )
@ -614,7 +614,7 @@ turbinedecay() //checked changed to match cerberus output //order of operations
{ {
self notify( "turbine_power_change" ); self notify( "turbine_power_change" );
self thread turbineaudio(); self thread turbineaudio();
if ( isDefined( self.buildableturbine.dying ) && !self.buildableturbine.dying ) if ( !is_true( self.buildableturbine.dying ) )
{ {
self thread turbineanim(); self thread turbineanim();
} }
@ -640,7 +640,7 @@ destroy_placed_turbine() //checked matches cerberus output
{ {
if ( isDefined( self.buildableturbine ) ) if ( isDefined( self.buildableturbine ) )
{ {
if ( isDefined( self.buildableturbine.dying ) && self.buildableturbine.dying ) if ( is_true( self.buildableturbine.dying ) )
{ {
while ( isDefined( self.buildableturbine ) ) while ( isDefined( self.buildableturbine ) )
{ {
@ -670,7 +670,7 @@ turbinepowerdiminish( origin, powerradius ) //checked changed to match cerberus
self endon( "disconnect" ); self endon( "disconnect" );
self endon( "equip_turbine_zm_taken" ); self endon( "equip_turbine_zm_taken" );
self.buildableturbine endon( "death" ); self.buildableturbine endon( "death" );
while ( isDefined( self.buildableturbine.dying ) && !self.buildableturbine.dying ) while ( !is_true( self.buildableturbine.dying ) )
{ {
if ( isDefined( self.turbine_power_level ) && isDefined( self.buildableturbine ) ) if ( isDefined( self.turbine_power_level ) && isDefined( self.buildableturbine ) )
{ {

46
patch_zm/maps/mp/zombies/_zm_equipment.gsc
View File

@ -14,14 +14,14 @@ init() //checked matches cerberus output
init_equipment_upgrade(); init_equipment_upgrade();
onplayerconnect_callback( ::equipment_placement_watcher ); onplayerconnect_callback( ::equipment_placement_watcher );
level._equipment_disappear_fx = loadfx( "maps/zombie/fx_zmb_tranzit_electrap_explo" ); level._equipment_disappear_fx = loadfx( "maps/zombie/fx_zmb_tranzit_electrap_explo" );
if ( isDefined( level.disable_fx_zmb_tranzit_shield_explo ) && !level.disable_fx_zmb_tranzit_shield_explo ) if ( !is_true( level.disable_fx_zmb_tranzit_shield_explo ) )
{ {
level._riotshield_dissapear_fx = loadfx( "maps/zombie/fx_zmb_tranzit_shield_explo" ); level._riotshield_dissapear_fx = loadfx( "maps/zombie/fx_zmb_tranzit_shield_explo" );
} }
level.placeable_equipment_destroy_fn = []; level.placeable_equipment_destroy_fn = [];
registerclientfield( "scriptmover", "equipment_activated", 12000, 4, "int" ); registerclientfield( "scriptmover", "equipment_activated", 12000, 4, "int" );
if ( isDefined( level._no_equipment_activated_clientfield ) && !level._no_equipment_activated_clientfield ) if ( !is_true( level._no_equipment_activated_clientfield ) )
{ {
registerclientfield( "scriptmover", "equipment_activated", 12000, 4, "int" ); registerclientfield( "scriptmover", "equipment_activated", 12000, 4, "int" );
} }
@ -33,7 +33,7 @@ signal_equipment_activated( val ) //checked changed to match cerberus output
{ {
val = 1; val = 1;
} }
if ( isDefined( level._no_equipment_activated_clientfield ) && level._no_equipment_activated_clientfield ) if ( is_true( level._no_equipment_activated_clientfield ) )
{ {
return; return;
} }
@ -48,7 +48,7 @@ signal_equipment_activated( val ) //checked changed to match cerberus output
register_equipment( equipment_name, hint, howto_hint, hint_icon, equipmentvo, watcher_thread, transfer_fn, drop_fn, pickup_fn, place_fn ) //checked matches cerberus output register_equipment( equipment_name, hint, howto_hint, hint_icon, equipmentvo, watcher_thread, transfer_fn, drop_fn, pickup_fn, place_fn ) //checked matches cerberus output
{ {
if ( !isDefined( level.zombie_include_equipment ) || isDefined( level.zombie_include_equipment[ equipment_name ] ) && !level.zombie_include_equipment[ equipment_name ] ) if ( !isDefined( level.zombie_include_equipment ) || !is_true( level.zombie_include_equipment[ equipment_name ] ) )
{ {
return; return;
} }
@ -251,7 +251,7 @@ equipment_take( equipment ) //checked matches cerberus output
println( "ZM EQUIPMENT: " + self.name + " lost " + equipment + "\n" ); println( "ZM EQUIPMENT: " + self.name + " lost " + equipment + "\n" );
#/ #/
*/ */
if ( isDefined( self.current_equipment_active[ equipment ] ) && self.current_equipment_active[ equipment ] ) if ( is_true( self.current_equipment_active[ equipment ] ) )
{ {
self.current_equipment_active[ equipment ] = 0; self.current_equipment_active[ equipment ] = 0;
self notify( equipment + "_deactivate" ); self notify( equipment + "_deactivate" );
@ -485,7 +485,7 @@ show_equipment_hint( equipment ) //checked matches cerberus output
self endon( "kill_previous_show_equipment_hint_thread" ); self endon( "kill_previous_show_equipment_hint_thread" );
self endon( "death" ); self endon( "death" );
self endon( "disconnect" ); self endon( "disconnect" );
if ( isDefined( self.do_not_display_equipment_pickup_hint ) && self.do_not_display_equipment_pickup_hint ) if ( is_true( self.do_not_display_equipment_pickup_hint ) )
{ {
return; return;
} }
@ -531,7 +531,7 @@ equipment_onspawnretrievableweaponobject( watcher, player ) //checked partially
waittillframeend; waittillframeend;
if ( iswallmount ) if ( iswallmount )
{ {
if ( isDefined( player.planted_wallmount_on_a_zombie ) && player.planted_wallmount_on_a_zombie ) if ( is_true( player.planted_wallmount_on_a_zombie ) )
{ {
equip_name = self.name; equip_name = self.name;
thread equipment_disappear_fx( self.origin, undefined, self.angles ); thread equipment_disappear_fx( self.origin, undefined, self.angles );
@ -600,7 +600,7 @@ equipment_onspawnretrievableweaponobject( watcher, player ) //checked partially
plant_origin = ( plant_origin[ 0 ], plant_origin[ 1 ], player.origin[ 2 ] + 10 ); plant_origin = ( plant_origin[ 0 ], plant_origin[ 1 ], player.origin[ 2 ] + 10 );
} }
} }
if ( isDefined( iswallmount ) && iswallmount ) if ( is_true( iswallmount ) )
{ {
self ghost(); self ghost();
} }
@ -642,7 +642,7 @@ equipment_retrieve( player ) //checked changed to match cerberus output
self.owner = player; self.owner = player;
} }
player equipment_from_deployed( weaponname ); player equipment_from_deployed( weaponname );
if ( isDefined( self.requires_pickup ) && self.requires_pickup ) if ( is_true( self.requires_pickup ) )
{ {
if ( isDefined( level.zombie_equipment[ weaponname ].pickup_fn ) ) if ( isDefined( level.zombie_equipment[ weaponname ].pickup_fn ) )
{ {
@ -1022,7 +1022,7 @@ generate_equipment_unitrigger( classname, origin, angles, flags, radius, script_
} }
unitrigger_stub.originfunc = ::eqstub_get_unitrigger_origin; unitrigger_stub.originfunc = ::eqstub_get_unitrigger_origin;
unitrigger_stub.onspawnfunc = ::eqstub_on_spawn_trigger; unitrigger_stub.onspawnfunc = ::eqstub_on_spawn_trigger;
if ( isDefined( moving ) && moving ) if ( is_true( moving ) )
{ {
maps/mp/zombies/_zm_unitrigger::register_unitrigger( unitrigger_stub, think ); maps/mp/zombies/_zm_unitrigger::register_unitrigger( unitrigger_stub, think );
} }
@ -1055,11 +1055,11 @@ can_pick_up_equipment( equipment_name, equipment_trigger ) //checked matches cer
{ {
return 0; return 0;
} }
if ( isDefined( self.pickup_equipment ) && self.pickup_equipment ) if ( is_true( self.pickup_equipment ) )
{ {
return 0; return 0;
} }
if ( isDefined( level.equipment_team_pick_up ) && level.equipment_team_pick_up && !self same_team_placed_equipment( equipment_trigger ) ) if ( is_true( level.equipment_team_pick_up ) && !self same_team_placed_equipment( equipment_trigger ) )
{ {
return 0; return 0;
} }
@ -1306,7 +1306,7 @@ pickup_dropped_equipment( player ) //checked matches cerberus output
dropped_equipment_destroy( gusto ) //checked changed to match cerberus output dropped_equipment_destroy( gusto ) //checked changed to match cerberus output
{ {
stub = self.stub; stub = self.stub;
if ( isDefined( gusto ) && gusto ) if ( is_true( gusto ) )
{ {
equipment_disappear_fx( self.origin, undefined, self.angles ); equipment_disappear_fx( self.origin, undefined, self.angles );
} }
@ -1388,7 +1388,7 @@ equipment_watch_placement( equipment ) //checked changed to match cerberus outpu
} }
self notify( "create_equipment_turret", placeturret ); self notify( "create_equipment_turret", placeturret );
ended = self waittill_any_return( "weapon_change", "grenade_fire", "death_or_disconnect" ); ended = self waittill_any_return( "weapon_change", "grenade_fire", "death_or_disconnect" );
if ( isDefined( level.use_legacy_equipment_placement ) && !level.use_legacy_equipment_placement ) if ( !is_true( level.use_legacy_equipment_placement ) )
{ {
self.turret_placement = self canplayerplaceturret( placeturret ); self.turret_placement = self canplayerplaceturret( placeturret );
} }
@ -1486,7 +1486,7 @@ player_damage_equipment( equipment, damage, origin ) //checked matches cerberus
item_damage( damage ) //checked changed to match cerberus output item_damage( damage ) //checked changed to match cerberus output
{ {
if ( isDefined( self.isriotshield ) && self.isriotshield ) if ( is_true( self.isriotshield ) )
{ {
if ( isDefined( level.riotshield_damage_callback ) && isDefined( self.owner ) ) if ( isDefined( level.riotshield_damage_callback ) && isDefined( self.owner ) )
{ {
@ -1686,7 +1686,7 @@ item_attract_zombies() //checked partially changed to match cerberus output did
i++; i++;
continue; continue;
} }
if ( isDefined( ai[ i ].ignore_equipment ) && ai[ i ].ignore_equipment ) if ( is_true( ai[ i ].ignore_equipment ) )
{ {
i++; i++;
continue; continue;
@ -1699,12 +1699,12 @@ item_attract_zombies() //checked partially changed to match cerberus output did
continue; continue;
} }
} }
if ( isDefined( ai[ i ].is_inert ) && ai[ i ].is_inert ) if ( is_true( ai[ i ].is_inert ) )
{ {
i++; i++;
continue; continue;
} }
if ( isDefined( ai[ i ].is_traversing ) && ai[ i ].is_traversing ) if ( is_true( ai[ i ].is_traversing ) )
{ {
i++; i++;
continue; continue;
@ -1722,7 +1722,7 @@ item_attract_zombies() //checked partially changed to match cerberus output did
} }
if ( distsqrd < distmax && distsqrd > distmin && vdist < vdistmax || should_attack ) if ( distsqrd < distmax && distsqrd > distmin && vdist < vdistmax || should_attack )
{ {
if ( isDefined( ai[ i ].isscreecher ) && !ai[ i ].isscreecher && !ai[ i ] is_quad() && !ai[ i ] is_leaper() ) if ( !is_true( ai[ i ].isscreecher ) && !ai[ i ] is_quad() && !ai[ i ] is_leaper() )
{ {
ai[ i ] thread attack_item( self ); ai[ i ] thread attack_item( self );
item_choke(); item_choke();
@ -1740,11 +1740,11 @@ attack_item( item ) //checked changed to match cerberus output
self endon( "death" ); self endon( "death" );
item endon( "death" ); item endon( "death" );
self endon( "start_inert" ); self endon( "start_inert" );
if ( isDefined( self.doing_equipment_attack ) && self.doing_equipment_attack ) if ( is_true( self.doing_equipment_attack ) )
{ {
return 0; return 0;
} }
if ( isDefined( self.not_interruptable ) && self.not_interruptable ) if ( is_true( self.not_interruptable ) )
{ {
return 0; return 0;
} }
@ -1804,14 +1804,14 @@ attack_item( item ) //checked changed to match cerberus output
attack_item_interrupt( item ) //checked matches cerberus output attack_item_interrupt( item ) //checked matches cerberus output
{ {
if ( isDefined( self.has_legs ) && !self.has_legs ) if ( !is_true( self.has_legs ) )
{ {
return; return;
} }
self notify( "attack_item_interrupt" ); self notify( "attack_item_interrupt" );
self endon( "attack_item_interrupt" ); self endon( "attack_item_interrupt" );
self endon( "death" ); self endon( "death" );
while ( isDefined( self.has_legs ) && self.has_legs ) while ( is_true( self.has_legs ) )
{ {
self waittill( "damage" ); self waittill( "damage" );
} }

8
patch_zm/maps/mp/zombies/_zm_game_module.gsc
View File

@ -248,7 +248,7 @@ wait_for_team_death_and_round_end() //checked partially changed to match cerberu
} }
i++; i++;
} }
if ( cia_alive == 0 && cdc_alive == 0 && !level.isresetting_grief && isDefined( level.host_ended_game ) && !level.host_ended_game ) if ( cia_alive == 0 && cdc_alive == 0 && !level.isresetting_grief && !is_true( level.host_ended_game ) )
{ {
wait 0.5; wait 0.5;
if ( isDefined( level._grief_reset_message ) ) if ( isDefined( level._grief_reset_message ) )
@ -332,14 +332,14 @@ wait_for_team_death() //checked partially changed to match cerberus output //did
{ {
if ( players[ i ]._encounters_team == "A" ) if ( players[ i ]._encounters_team == "A" )
{ {
if ( is_player_valid( players[ i ] ) || isDefined( level.force_solo_quick_revive ) && level.force_solo_quick_revive && isDefined( players[ i ].lives ) && players[ i ].lives > 0 ) if ( is_player_valid( players[ i ] ) || is_true( level.force_solo_quick_revive ) && isDefined( players[ i ].lives ) && players[ i ].lives > 0 )
{ {
cia_alive++; cia_alive++;
i++; i++;
continue; continue;
} }
} }
if ( is_player_valid( players[ i ] ) || isDefined( level.force_solo_quick_revive ) && level.force_solo_quick_revive && isDefined( players[ i ].lives ) && players[ i ].lives > 0 ) if ( is_player_valid( players[ i ] ) || is_true( level.force_solo_quick_revive ) && isDefined( players[ i ].lives ) && players[ i ].lives > 0 )
{ {
cdc_alive++; cdc_alive++;
} }
@ -411,7 +411,7 @@ create_fireworks( launch_spots, min_wait, max_wait, randomize ) //checked change
level endon( "stop_fireworks" ); level endon( "stop_fireworks" );
while ( 1 ) while ( 1 )
{ {
if ( isDefined( randomize ) && randomize ) if ( is_true( randomize ) )
{ {
launch_spots = array_randomize( launch_spots ); launch_spots = array_randomize( launch_spots );
} }

10
patch_zm/maps/mp/zombies/_zm_gump.gsc
View File

@ -10,7 +10,7 @@ init() //checked changed to match cerberus output //changed partially at own dis
registerclientfield( "toplayer", "blackscreen", 1, 1, "int" ); registerclientfield( "toplayer", "blackscreen", 1, 1, "int" );
} }
*/ //the value of level.disable_blackscreen_clientfield is not defined in any map file except buried meaning */ //the value of level.disable_blackscreen_clientfield is not defined in any map file except buried meaning
if ( !isDefined( level.disable_blackscreen_clientfield ) || !level.disable_blackscreen_clientfield ) if ( !is_true( level.disable_blackscreen_clientfield ) )
{ {
registerclientfield( "toplayer", "blackscreen", 1, 1, "int" ); registerclientfield( "toplayer", "blackscreen", 1, 1, "int" );
} }
@ -18,7 +18,7 @@ init() //checked changed to match cerberus output //changed partially at own dis
{ {
level.uses_gumps = 0; level.uses_gumps = 0;
} }
if ( isDefined( level.uses_gumps ) && level.uses_gumps ) if ( is_true( level.uses_gumps ) )
{ {
onplayerconnect_callback( ::player_connect_gump ); onplayerconnect_callback( ::player_connect_gump );
} }
@ -26,11 +26,11 @@ init() //checked changed to match cerberus output //changed partially at own dis
player_teleport_blackscreen_on() //checked matches cerberus output player_teleport_blackscreen_on() //checked matches cerberus output
{ {
if ( isDefined( level.disable_blackscreen_clientfield ) && level.disable_blackscreen_clientfield ) if ( is_true( level.disable_blackscreen_clientfield ) )
{ {
return; return;
} }
if ( isDefined( level.uses_gumps ) && level.uses_gumps ) if ( is_true( level.uses_gumps ) )
{ {
self setclientfieldtoplayer( "blackscreen", 1 ); self setclientfieldtoplayer( "blackscreen", 1 );
wait 0.05; wait 0.05;
@ -44,7 +44,7 @@ player_connect_gump() //checked matches cerberus output
player_watch_spectate_change() //checked matches cerberus output player_watch_spectate_change() //checked matches cerberus output
{ {
if ( isDefined( level.disable_blackscreen_clientfield ) && level.disable_blackscreen_clientfield ) if ( is_true( level.disable_blackscreen_clientfield ) )
{ {
return; return;
} }

24
patch_zm/maps/mp/zombies/_zm_laststand.gsc
View File

@ -333,7 +333,7 @@ laststand_disable_player_weapons() //checked partially changed to match cerberus
laststand_enable_player_weapons() //checked matches cerberus output laststand_enable_player_weapons() //checked matches cerberus output
{ {
if ( isDefined( self.hadpistol ) && !self.hadpistol && isDefined( self.laststandpistol ) ) if ( !is_true( self.hadpistol ) && isDefined( self.laststandpistol ) )
{ {
self takeweapon( self.laststandpistol ); self takeweapon( self.laststandpistol );
} }
@ -467,11 +467,11 @@ bleed_out() //checked changed to match cerberus output
} }
level notify( "bleed_out", self.characterindex ); level notify( "bleed_out", self.characterindex );
self undolaststand(); self undolaststand();
if ( isDefined( level.is_zombie_level ) && level.is_zombie_level ) if ( is_true( level.is_zombie_level ) )
{ {
self thread [[ level.player_becomes_zombie ]](); self thread [[ level.player_becomes_zombie ]]();
} }
if ( isDefined( level.is_specops_level ) && level.is_specops_level ) if ( is_true( level.is_specops_level ) )
{ {
self thread [[ level.spawnspectator ]](); self thread [[ level.spawnspectator ]]();
} }
@ -672,7 +672,7 @@ can_suicide() //checked matches cerberus output
{ {
return 0; return 0;
} }
if ( isDefined( self.is_zombie ) && self.is_zombie ) if ( is_true( self.is_zombie ) )
{ {
return 0; return 0;
} }
@ -820,7 +820,7 @@ can_revive( revivee ) //checked changed to match cerberus output
{ {
return 0; return 0;
} }
if ( isDefined( self.is_zombie ) && self.is_zombie ) if ( is_true( self.is_zombie ) )
{ {
return 0; return 0;
} }
@ -828,7 +828,7 @@ can_revive( revivee ) //checked changed to match cerberus output
{ {
return 0; return 0;
} }
if ( isDefined( level.can_revive_use_depthinwater_test ) && level.can_revive_use_depthinwater_test && revivee depthinwater() > 10 ) if ( is_true( level.can_revive_use_depthinwater_test ) && revivee depthinwater() > 10 )
{ {
return 1; return 1;
} }
@ -1065,7 +1065,7 @@ auto_revive( reviver, dont_enable_weapons ) //checked changed to match cerberus
self allowjump( 1 ); self allowjump( 1 );
self.ignoreme = 0; self.ignoreme = 0;
self.laststand = undefined; self.laststand = undefined;
if ( isDefined( level.isresetting_grief ) && !level.isresetting_grief ) if ( !is_true( level.isresetting_grief ) )
{ {
reviver.revives++; reviver.revives++;
reviver maps/mp/zombies/_zm_stats::increment_client_stat( "revives" ); reviver maps/mp/zombies/_zm_stats::increment_client_stat( "revives" );
@ -1096,18 +1096,18 @@ revive_success( reviver, b_track_stats ) //checked changed to match cerberus out
self notify( "player_revived", reviver ); self notify( "player_revived", reviver );
return; return;
} }
if ( isDefined( b_track_stats ) && b_track_stats ) if ( is_true( b_track_stats ) )
{ {
maps/mp/_demo::bookmark( "zm_player_revived", getTime(), self, reviver ); maps/mp/_demo::bookmark( "zm_player_revived", getTime(), self, reviver );
} }
self notify( "player_revived", reviver ); self notify( "player_revived", reviver );
self reviveplayer(); self reviveplayer();
self maps/mp/zombies/_zm_perks::perk_set_max_health_if_jugg( "health_reboot", 1, 0 ); self maps/mp/zombies/_zm_perks::perk_set_max_health_if_jugg( "health_reboot", 1, 0 );
if ( isDefined( self.pers_upgrades_awarded[ "perk_lose" ] ) && self.pers_upgrades_awarded[ "perk_lose" ] ) if ( is_true( self.pers_upgrades_awarded[ "perk_lose" ] ) )
{ {
self thread maps/mp/zombies/_zm_pers_upgrades_functions::pers_upgrade_perk_lose_restore(); self thread maps/mp/zombies/_zm_pers_upgrades_functions::pers_upgrade_perk_lose_restore();
} }
if ( !is_true( level.isresetting_grief ) && isDefined( b_track_stats ) && b_track_stats ) if ( !is_true( level.isresetting_grief ) && is_true( b_track_stats ) )
{ {
reviver.revives++; reviver.revives++;
reviver maps/mp/zombies/_zm_stats::increment_client_stat( "revives" ); reviver maps/mp/zombies/_zm_stats::increment_client_stat( "revives" );
@ -1115,11 +1115,11 @@ revive_success( reviver, b_track_stats ) //checked changed to match cerberus out
self recordplayerrevivezombies( reviver ); self recordplayerrevivezombies( reviver );
reviver.upgrade_fx_origin = self.origin; reviver.upgrade_fx_origin = self.origin;
} }
if ( is_classic() && isDefined( b_track_stats ) && b_track_stats ) if ( is_classic() && is_true( b_track_stats ) )
{ {
maps/mp/zombies/_zm_pers_upgrades_functions::pers_increment_revive_stat( reviver ); maps/mp/zombies/_zm_pers_upgrades_functions::pers_increment_revive_stat( reviver );
} }
if ( isDefined( b_track_stats ) && b_track_stats ) if ( is_true( b_track_stats ) )
{ {
reviver thread check_for_sacrifice(); reviver thread check_for_sacrifice();
} }

2
patch_zm/maps/mp/zombies/_zm_perk_electric_cherry.gsc
View File

@ -23,7 +23,7 @@ enable_electric_cherry_perk_for_level() //checked matches cerberus output
register_perk_threads( "specialty_grenadepulldeath", ::electric_cherry_reload_attack, ::electric_cherry_perk_lost ); register_perk_threads( "specialty_grenadepulldeath", ::electric_cherry_reload_attack, ::electric_cherry_perk_lost );
register_perk_machine( "specialty_grenadepulldeath", ::electric_cherry_perk_machine_setup, ::electric_cherry_perk_machine_think ); register_perk_machine( "specialty_grenadepulldeath", ::electric_cherry_perk_machine_setup, ::electric_cherry_perk_machine_think );
register_perk_host_migration_func( "specialty_grenadepulldeath", ::electric_cherry_host_migration_func ); register_perk_host_migration_func( "specialty_grenadepulldeath", ::electric_cherry_host_migration_func );
if ( isDefined( level.custom_electric_cherry_perk_threads ) && level.custom_electric_cherry_perk_threads ) if ( is_true( level.custom_electric_cherry_perk_threads ) )
{ {
level thread [[ level.custom_electric_cherry_perk_threads ]](); level thread [[ level.custom_electric_cherry_perk_threads ]]();
} }

132
patch_zm/maps/mp/zombies/_zm_perks.gsc
View File

@ -78,39 +78,39 @@ init() //checked partially changed to match cerberus output
array_thread( vending_triggers, ::vending_trigger_think ); array_thread( vending_triggers, ::vending_trigger_think );
array_thread( vending_triggers, ::electric_perks_dialog ); array_thread( vending_triggers, ::electric_perks_dialog );
if ( isDefined( level.zombiemode_using_doubletap_perk ) && level.zombiemode_using_doubletap_perk ) if ( is_true( level.zombiemode_using_doubletap_perk ) )
{ {
level thread turn_doubletap_on(); level thread turn_doubletap_on();
} }
if ( isDefined( level.zombiemode_using_marathon_perk ) && level.zombiemode_using_marathon_perk ) if ( is_true( level.zombiemode_using_marathon_perk ) )
{ {
level thread turn_marathon_on(); level thread turn_marathon_on();
} }
if ( isDefined( level.zombiemode_using_juggernaut_perk ) && level.zombiemode_using_juggernaut_perk ) if ( is_true( level.zombiemode_using_juggernaut_perk ) )
{ {
level thread turn_jugger_on(); level thread turn_jugger_on();
} }
if ( isDefined( level.zombiemode_using_revive_perk ) && level.zombiemode_using_revive_perk ) if ( is_true( level.zombiemode_using_revive_perk ) )
{ {
level thread turn_revive_on(); level thread turn_revive_on();
} }
if ( isDefined( level.zombiemode_using_sleightofhand_perk ) && level.zombiemode_using_sleightofhand_perk ) if ( is_true( level.zombiemode_using_sleightofhand_perk ) )
{ {
level thread turn_sleight_on(); level thread turn_sleight_on();
} }
if ( isDefined( level.zombiemode_using_deadshot_perk ) && level.zombiemode_using_deadshot_perk ) if ( is_true( level.zombiemode_using_deadshot_perk ) )
{ {
level thread turn_deadshot_on(); level thread turn_deadshot_on();
} }
if ( isDefined( level.zombiemode_using_tombstone_perk ) && level.zombiemode_using_tombstone_perk ) if ( is_true( level.zombiemode_using_tombstone_perk ) )
{ {
level thread turn_tombstone_on(); level thread turn_tombstone_on();
} }
if ( isDefined( level.zombiemode_using_additionalprimaryweapon_perk ) && level.zombiemode_using_additionalprimaryweapon_perk ) if ( is_true( level.zombiemode_using_additionalprimaryweapon_perk ) )
{ {
level thread turn_additionalprimaryweapon_on(); level thread turn_additionalprimaryweapon_on();
} }
if ( isDefined( level.zombiemode_using_chugabud_perk ) && level.zombiemode_using_chugabud_perk ) if ( is_true( level.zombiemode_using_chugabud_perk ) )
{ {
level thread turn_chugabud_on(); level thread turn_chugabud_on();
} }
@ -143,7 +143,7 @@ init() //checked partially changed to match cerberus output
default_vending_precaching() //checked changed to match cerberus output default_vending_precaching() //checked changed to match cerberus output
{ {
if ( isDefined( level.zombiemode_using_pack_a_punch ) && level.zombiemode_using_pack_a_punch ) if ( is_true( level.zombiemode_using_pack_a_punch ) )
{ {
precacheitem( "zombie_knuckle_crack" ); precacheitem( "zombie_knuckle_crack" );
precachemodel( "p6_anim_zm_buildable_pap" ); precachemodel( "p6_anim_zm_buildable_pap" );
@ -156,7 +156,7 @@ default_vending_precaching() //checked changed to match cerberus output
level.machine_assets[ "packapunch" ].off_model = "p6_anim_zm_buildable_pap"; level.machine_assets[ "packapunch" ].off_model = "p6_anim_zm_buildable_pap";
level.machine_assets[ "packapunch" ].on_model = "p6_anim_zm_buildable_pap_on"; level.machine_assets[ "packapunch" ].on_model = "p6_anim_zm_buildable_pap_on";
} }
if ( isDefined( level.zombiemode_using_additionalprimaryweapon_perk ) && level.zombiemode_using_additionalprimaryweapon_perk ) if ( is_true( level.zombiemode_using_additionalprimaryweapon_perk ) )
{ {
precacheitem( "zombie_perk_bottle_additionalprimaryweapon" ); precacheitem( "zombie_perk_bottle_additionalprimaryweapon" );
precacheshader( "specialty_additionalprimaryweapon_zombies" ); precacheshader( "specialty_additionalprimaryweapon_zombies" );
@ -169,7 +169,7 @@ default_vending_precaching() //checked changed to match cerberus output
level.machine_assets[ "additionalprimaryweapon" ].off_model = "zombie_vending_three_gun"; level.machine_assets[ "additionalprimaryweapon" ].off_model = "zombie_vending_three_gun";
level.machine_assets[ "additionalprimaryweapon" ].on_model = "zombie_vending_three_gun_on"; level.machine_assets[ "additionalprimaryweapon" ].on_model = "zombie_vending_three_gun_on";
} }
if ( isDefined( level.zombiemode_using_deadshot_perk ) && level.zombiemode_using_deadshot_perk ) if ( is_true( level.zombiemode_using_deadshot_perk ) )
{ {
precacheitem( "zombie_perk_bottle_deadshot" ); precacheitem( "zombie_perk_bottle_deadshot" );
precacheshader( "specialty_ads_zombies" ); precacheshader( "specialty_ads_zombies" );
@ -182,7 +182,7 @@ default_vending_precaching() //checked changed to match cerberus output
level.machine_assets[ "deadshot" ].off_model = "zombie_vending_ads"; level.machine_assets[ "deadshot" ].off_model = "zombie_vending_ads";
level.machine_assets[ "deadshot" ].on_model = "zombie_vending_ads_on"; level.machine_assets[ "deadshot" ].on_model = "zombie_vending_ads_on";
} }
if ( isDefined( level.zombiemode_using_doubletap_perk ) && level.zombiemode_using_doubletap_perk ) if ( is_true( level.zombiemode_using_doubletap_perk ) )
{ {
precacheitem( "zombie_perk_bottle_doubletap" ); precacheitem( "zombie_perk_bottle_doubletap" );
precacheshader( "specialty_doubletap_zombies" ); precacheshader( "specialty_doubletap_zombies" );
@ -195,7 +195,7 @@ default_vending_precaching() //checked changed to match cerberus output
level.machine_assets[ "doubletap" ].off_model = "zombie_vending_doubletap2"; level.machine_assets[ "doubletap" ].off_model = "zombie_vending_doubletap2";
level.machine_assets[ "doubletap" ].on_model = "zombie_vending_doubletap2_on"; level.machine_assets[ "doubletap" ].on_model = "zombie_vending_doubletap2_on";
} }
if ( isDefined( level.zombiemode_using_juggernaut_perk ) && level.zombiemode_using_juggernaut_perk ) if ( is_true( level.zombiemode_using_juggernaut_perk ) )
{ {
precacheitem( "zombie_perk_bottle_jugg" ); precacheitem( "zombie_perk_bottle_jugg" );
precacheshader( "specialty_juggernaut_zombies" ); precacheshader( "specialty_juggernaut_zombies" );
@ -208,7 +208,7 @@ default_vending_precaching() //checked changed to match cerberus output
level.machine_assets[ "juggernog" ].off_model = "zombie_vending_jugg"; level.machine_assets[ "juggernog" ].off_model = "zombie_vending_jugg";
level.machine_assets[ "juggernog" ].on_model = "zombie_vending_jugg_on"; level.machine_assets[ "juggernog" ].on_model = "zombie_vending_jugg_on";
} }
if ( isDefined( level.zombiemode_using_marathon_perk ) && level.zombiemode_using_marathon_perk ) if ( is_true( level.zombiemode_using_marathon_perk ) )
{ {
precacheitem( "zombie_perk_bottle_marathon" ); precacheitem( "zombie_perk_bottle_marathon" );
precacheshader( "specialty_marathon_zombies" ); precacheshader( "specialty_marathon_zombies" );
@ -221,7 +221,7 @@ default_vending_precaching() //checked changed to match cerberus output
level.machine_assets[ "marathon" ].off_model = "zombie_vending_marathon"; level.machine_assets[ "marathon" ].off_model = "zombie_vending_marathon";
level.machine_assets[ "marathon" ].on_model = "zombie_vending_marathon_on"; level.machine_assets[ "marathon" ].on_model = "zombie_vending_marathon_on";
} }
if ( isDefined( level.zombiemode_using_revive_perk ) && level.zombiemode_using_revive_perk ) if ( is_true( level.zombiemode_using_revive_perk ) )
{ {
precacheitem( "zombie_perk_bottle_revive" ); precacheitem( "zombie_perk_bottle_revive" );
precacheshader( "specialty_quickrevive_zombies" ); precacheshader( "specialty_quickrevive_zombies" );
@ -235,7 +235,7 @@ default_vending_precaching() //checked changed to match cerberus output
level.machine_assets[ "revive" ].off_model = "zombie_vending_revive"; level.machine_assets[ "revive" ].off_model = "zombie_vending_revive";
level.machine_assets[ "revive" ].on_model = "zombie_vending_revive_on"; level.machine_assets[ "revive" ].on_model = "zombie_vending_revive_on";
} }
if ( isDefined( level.zombiemode_using_sleightofhand_perk ) && level.zombiemode_using_sleightofhand_perk ) if ( is_true( level.zombiemode_using_sleightofhand_perk ) )
{ {
precacheitem( "zombie_perk_bottle_sleight" ); precacheitem( "zombie_perk_bottle_sleight" );
precacheshader( "specialty_fastreload_zombies" ); precacheshader( "specialty_fastreload_zombies" );
@ -248,7 +248,7 @@ default_vending_precaching() //checked changed to match cerberus output
level.machine_assets[ "speedcola" ].off_model = "zombie_vending_sleight"; level.machine_assets[ "speedcola" ].off_model = "zombie_vending_sleight";
level.machine_assets[ "speedcola" ].on_model = "zombie_vending_sleight_on"; level.machine_assets[ "speedcola" ].on_model = "zombie_vending_sleight_on";
} }
if ( isDefined( level.zombiemode_using_tombstone_perk ) && level.zombiemode_using_tombstone_perk ) if ( is_true( level.zombiemode_using_tombstone_perk ) )
{ {
precacheitem( "zombie_perk_bottle_tombstone" ); precacheitem( "zombie_perk_bottle_tombstone" );
precacheshader( "specialty_tombstone_zombies" ); precacheshader( "specialty_tombstone_zombies" );
@ -262,7 +262,7 @@ default_vending_precaching() //checked changed to match cerberus output
level.machine_assets[ "tombstone" ].off_model = "zombie_vending_tombstone"; level.machine_assets[ "tombstone" ].off_model = "zombie_vending_tombstone";
level.machine_assets[ "tombstone" ].on_model = "zombie_vending_tombstone_on"; level.machine_assets[ "tombstone" ].on_model = "zombie_vending_tombstone_on";
} }
if ( isDefined( level.zombiemode_using_chugabud_perk ) && level.zombiemode_using_chugabud_perk ) if ( is_true( level.zombiemode_using_chugabud_perk ) )
{ {
precacheitem( "zombie_perk_bottle_whoswho" ); precacheitem( "zombie_perk_bottle_whoswho" );
precacheshader( "specialty_quickrevive_zombies" ); precacheshader( "specialty_quickrevive_zombies" );
@ -465,7 +465,7 @@ can_pack_weapon( weaponname ) //checked did not match cebrerus output changed at
player_use_can_pack_now() //checked changed to match cerberus output player_use_can_pack_now() //checked changed to match cerberus output
{ {
if ( self maps/mp/zombies/_zm_laststand::player_is_in_laststand() || isDefined( self.intermission ) && self.intermission || self isthrowinggrenade() ) if ( self maps/mp/zombies/_zm_laststand::player_is_in_laststand() || is_true( self.intermission ) || self isthrowinggrenade() )
{ {
return 0; return 0;
} }
@ -574,12 +574,12 @@ vending_weapon_upgrade() //checked matches cerberus output
continue; continue;
} }
} }
if ( player maps/mp/zombies/_zm_magicbox::can_buy_weapon() && !player maps/mp/zombies/_zm_laststand::player_is_in_laststand() && isDefined( player.intermission ) && !player.intermission || player isthrowinggrenade() && !player maps/mp/zombies/_zm_weapons::can_upgrade_weapon( current_weapon ) ) if ( player maps/mp/zombies/_zm_magicbox::can_buy_weapon() && !player maps/mp/zombies/_zm_laststand::player_is_in_laststand() && !is_true( player.intermission ) || player isthrowinggrenade() && !player maps/mp/zombies/_zm_weapons::can_upgrade_weapon( current_weapon ) )
{ {
wait 0.1; wait 0.1;
continue; continue;
} }
if ( isDefined( level.pap_moving ) && level.pap_moving ) if ( is_true( level.pap_moving ) )
{ {
continue; continue;
} }
@ -643,7 +643,7 @@ vending_weapon_upgrade() //checked matches cerberus output
self thread maps/mp/zombies/_zm_audio::play_jingle_or_stinger( "mus_perks_packa_sting" ); self thread maps/mp/zombies/_zm_audio::play_jingle_or_stinger( "mus_perks_packa_sting" );
player maps/mp/zombies/_zm_audio::create_and_play_dialog( "weapon_pickup", "upgrade_wait" ); player maps/mp/zombies/_zm_audio::create_and_play_dialog( "weapon_pickup", "upgrade_wait" );
self disable_trigger(); self disable_trigger();
if ( isDefined( upgrade_as_attachment ) && !upgrade_as_attachment ) if ( !is_true( upgrade_as_attachment ) )
{ {
player thread do_player_general_vox( "general", "pap_wait", 10, 100 ); player thread do_player_general_vox( "general", "pap_wait", 10, 100 );
} }
@ -674,7 +674,7 @@ vending_weapon_upgrade() //checked matches cerberus output
{ {
self.worldgun delete(); self.worldgun delete();
} }
if ( isDefined( level.zombiemode_reusing_pack_a_punch ) && level.zombiemode_reusing_pack_a_punch ) if ( is_true( level.zombiemode_reusing_pack_a_punch ) )
{ {
self sethintstring( &"ZOMBIE_PERK_PACKAPUNCH_ATT", self.cost ); self sethintstring( &"ZOMBIE_PERK_PACKAPUNCH_ATT", self.cost );
} }
@ -713,7 +713,7 @@ vending_weapon_upgrade_cost() //checked 3/30/20 4:19 pm //checked matches cerber
{ {
self.cost = 5000; self.cost = 5000;
self.attachment_cost = 2000; self.attachment_cost = 2000;
if ( isDefined( level.zombiemode_reusing_pack_a_punch ) && level.zombiemode_reusing_pack_a_punch ) if ( is_true( level.zombiemode_reusing_pack_a_punch ) )
{ {
self sethintstring( &"ZOMBIE_PERK_PACKAPUNCH_ATT", self.cost ); self sethintstring( &"ZOMBIE_PERK_PACKAPUNCH_ATT", self.cost );
} }
@ -724,7 +724,7 @@ vending_weapon_upgrade_cost() //checked 3/30/20 4:19 pm //checked matches cerber
level waittill( "powerup bonfire sale" ); level waittill( "powerup bonfire sale" );
self.cost = 1000; self.cost = 1000;
self.attachment_cost = 1000; self.attachment_cost = 1000;
if ( isDefined( level.zombiemode_reusing_pack_a_punch ) && level.zombiemode_reusing_pack_a_punch ) if ( is_true( level.zombiemode_reusing_pack_a_punch ) )
{ {
self sethintstring( &"ZOMBIE_PERK_PACKAPUNCH_ATT", self.cost ); self sethintstring( &"ZOMBIE_PERK_PACKAPUNCH_ATT", self.cost );
} }
@ -755,7 +755,7 @@ wait_for_player_to_take( player, weapon, packa_timer, upgrade_as_attachment ) //
{ {
packa_timer playloopsound( "zmb_perks_packa_ticktock" ); packa_timer playloopsound( "zmb_perks_packa_ticktock" );
self waittill( "trigger", trigger_player ); self waittill( "trigger", trigger_player );
if ( isDefined( level.pap_grab_by_anyone ) && level.pap_grab_by_anyone ) if ( is_true( level.pap_grab_by_anyone ) )
{ {
player = trigger_player; player = trigger_player;
} }
@ -780,7 +780,7 @@ wait_for_player_to_take( player, weapon, packa_timer, upgrade_as_attachment ) //
self notify( "pap_taken" ); self notify( "pap_taken" );
player notify( "pap_taken" ); player notify( "pap_taken" );
player.pap_used = 1; player.pap_used = 1;
if ( isDefined( upgrade_as_attachment ) && !upgrade_as_attachment ) if ( !is_true( upgrade_as_attachment ) )
{ {
player thread do_player_general_vox( "general", "pap_arm", 15, 100 ); player thread do_player_general_vox( "general", "pap_arm", 15, 100 );
} }
@ -801,7 +801,7 @@ wait_for_player_to_take( player, weapon, packa_timer, upgrade_as_attachment ) //
player givestartammo( upgrade_weapon ); player givestartammo( upgrade_weapon );
} }
player switchtoweapon( upgrade_weapon ); player switchtoweapon( upgrade_weapon );
if ( isDefined( player.restore_ammo ) && player.restore_ammo ) if ( is_true( player.restore_ammo ) )
{ {
new_clip = player.restore_clip + ( weaponclipsize( upgrade_weapon ) - player.restore_clip_size ); new_clip = player.restore_clip + ( weaponclipsize( upgrade_weapon ) - player.restore_clip_size );
new_stock = player.restore_stock + ( weaponmaxammo( upgrade_weapon ) - player.restore_max ); new_stock = player.restore_stock + ( weaponmaxammo( upgrade_weapon ) - player.restore_max );
@ -926,7 +926,7 @@ upgrade_knuckle_crack_end( gun ) //changed //checked matches cerberus output
*/ */
self enable_player_move_states(); self enable_player_move_states();
weapon = level.machine_assets[ "packapunch" ].weapon; weapon = level.machine_assets[ "packapunch" ].weapon;
if ( self maps/mp/zombies/_zm_laststand::player_is_in_laststand() || isDefined( self.intermission ) && self.intermission ) if ( self maps/mp/zombies/_zm_laststand::player_is_in_laststand() || is_true( self.intermission ) )
{ {
self takeweapon( weapon ); self takeweapon( weapon );
return; return;
@ -1064,7 +1064,7 @@ use_solo_revive() //checked matches cerberus output
} }
players = get_players(); players = get_players();
solo_mode = 0; solo_mode = 0;
if ( players.size == 1 || isDefined( level.force_solo_quick_revive ) && level.force_solo_quick_revive ) if ( players.size == 1 || is_true( level.force_solo_quick_revive ) )
{ {
solo_mode = 1; solo_mode = 1;
} }
@ -1079,7 +1079,7 @@ turn_revive_on() //checked partially changed to match cerberus output
machine_triggers = getentarray( "vending_revive", "target" ); machine_triggers = getentarray( "vending_revive", "target" );
machine_model = undefined; machine_model = undefined;
machine_clip = undefined; machine_clip = undefined;
if ( isDefined( level.zombiemode_using_revive_perk ) && !level.zombiemode_using_revive_perk ) if ( !is_true( level.zombiemode_using_revive_perk ) )
{ {
return; return;
} }
@ -1115,7 +1115,7 @@ turn_revive_on() //checked partially changed to match cerberus output
level.quick_revive_machine = machine[ i ]; level.quick_revive_machine = machine[ i ];
} }
array_thread( machine_triggers, ::set_power_on, 0 ); array_thread( machine_triggers, ::set_power_on, 0 );
if ( isDefined( start_state ) && !start_state ) if ( !is_true( start_state ) )
{ {
level waittill( "revive_on" ); level waittill( "revive_on" );
} }
@ -1854,7 +1854,7 @@ vending_trigger_think() //checked changed to match cerberus output
{ {
self waittill( "trigger", player ); self waittill( "trigger", player );
index = maps/mp/zombies/_zm_weapons::get_player_index( player ); index = maps/mp/zombies/_zm_weapons::get_player_index( player );
if ( player maps/mp/zombies/_zm_laststand::player_is_in_laststand() || isDefined( player.intermission ) && player.intermission ) if ( player maps/mp/zombies/_zm_laststand::player_is_in_laststand() || is_true( player.intermission ) )
{ {
wait 0.1; wait 0.1;
continue; continue;
@ -1954,11 +1954,11 @@ vending_trigger_post_think( player, perk ) //checked matches cerberus output
return; return;
} }
player notify( "burp" ); player notify( "burp" );
if ( isDefined( level.pers_upgrade_cash_back ) && level.pers_upgrade_cash_back ) if ( is_true( level.pers_upgrade_cash_back ) )
{ {
player maps/mp/zombies/_zm_pers_upgrades_functions::cash_back_player_drinks_perk(); player maps/mp/zombies/_zm_pers_upgrades_functions::cash_back_player_drinks_perk();
} }
if ( isDefined( level.pers_upgrade_perk_lose ) && level.pers_upgrade_perk_lose ) if ( is_true( level.pers_upgrade_perk_lose ) )
{ {
player thread maps/mp/zombies/_zm_pers_upgrades_functions::pers_upgrade_perk_lose_bought(); player thread maps/mp/zombies/_zm_pers_upgrades_functions::pers_upgrade_perk_lose_bought();
} }
@ -2022,7 +2022,7 @@ return_retained_perks() //checked changed to match cerberus output
keys = getarraykeys( self._retain_perks_array ); keys = getarraykeys( self._retain_perks_array );
foreach ( perk in keys ) foreach ( perk in keys )
{ {
if ( isdefined( self._retain_perks_array[ perk ] ) && self._retain_perks_array[ perk ] ) if ( is_true( self._retain_perks_array[ perk ] ) )
{ {
self give_perk( perk, 0 ); self give_perk( perk, 0 );
} }
@ -2034,10 +2034,10 @@ give_perk( perk, bought ) //checked changed to match cerberus output
{ {
self setperk( perk ); self setperk( perk );
self.num_perks++; self.num_perks++;
if ( isDefined( bought ) && bought ) if ( is_true( bought ) )
{ {
self maps/mp/zombies/_zm_audio::playerexert( "burp" ); self maps/mp/zombies/_zm_audio::playerexert( "burp" );
if ( isDefined( level.remove_perk_vo_delay ) && level.remove_perk_vo_delay ) if ( is_true( level.remove_perk_vo_delay ) )
{ {
self maps/mp/zombies/_zm_audio::perk_vox( perk ); self maps/mp/zombies/_zm_audio::perk_vox( perk );
} }
@ -2051,7 +2051,7 @@ give_perk( perk, bought ) //checked changed to match cerberus output
self notify( "perk_bought", perk ); self notify( "perk_bought", perk );
} }
self perk_set_max_health_if_jugg( perk, 1, 0 ); self perk_set_max_health_if_jugg( perk, 1, 0 );
if ( isDefined( level.disable_deadshot_clientfield ) && !level.disable_deadshot_clientfield ) if ( !is_true( level.disable_deadshot_clientfield ) )
{ {
if ( perk == "specialty_deadshot" ) if ( perk == "specialty_deadshot" )
{ {
@ -2242,11 +2242,11 @@ perk_think( perk ) //checked changed to match cerberus output
} }
if ( do_retain ) if ( do_retain )
{ {
if ( isDefined( self._retain_perks ) && self._retain_perks ) if ( is_true( self._retain_perks ) )
{ {
return; return;
} }
else if ( isDefined( self._retain_perks_array ) && isDefined( self._retain_perks_array[ perk ] ) && self._retain_perks_array[ perk ] ) else if ( isDefined( self._retain_perks_array ) && is_true( self._retain_perks_array[ perk ] ) )
{ {
return; return;
} }
@ -2266,13 +2266,13 @@ perk_think( perk ) //checked changed to match cerberus output
} }
break; break;
case "specialty_deadshot": case "specialty_deadshot":
if ( isDefined( level.disable_deadshot_clientfield ) && !level.disable_deadshot_clientfield ) if ( !is_true( level.disable_deadshot_clientfield ) )
{ {
self setclientfieldtoplayer( "deadshot_perk", 0 ); self setclientfieldtoplayer( "deadshot_perk", 0 );
} }
break; break;
case "specialty_deadshot_upgrade": case "specialty_deadshot_upgrade":
if ( isDefined( level.disable_deadshot_clientfield ) && !level.disable_deadshot_clientfield ) if ( !is_true( level.disable_deadshot_clientfield ) )
{ {
self setclientfieldtoplayer( "deadshot_perk", 0 ); self setclientfieldtoplayer( "deadshot_perk", 0 );
} }
@ -2406,7 +2406,7 @@ perk_hud_start_flash( perk ) //checked does not match cerberus output did not ch
hud = self.perk_hud[ perk ]; hud = self.perk_hud[ perk ];
if ( isDefined( hud ) ) if ( isDefined( hud ) )
{ {
if ( isDefined( hud.flash ) && !hud.flash ) if ( !is_true( hud.flash ) )
{ {
hud thread perk_hud_flash(); hud thread perk_hud_flash();
self thread perk_flash_audio( perk ); self thread perk_flash_audio( perk );
@ -2551,7 +2551,7 @@ perk_give_bottle_end( gun, perk ) //checked matches cerberus output
{ {
weapon = level._custom_perks[ perk ].perk_bottle; weapon = level._custom_perks[ perk ].perk_bottle;
} }
if ( self maps/mp/zombies/_zm_laststand::player_is_in_laststand() || isDefined( self.intermission ) && self.intermission ) if ( self maps/mp/zombies/_zm_laststand::player_is_in_laststand() || is_true( self.intermission ) )
{ {
self takeweapon( weapon ); self takeweapon( weapon );
return; return;
@ -2581,7 +2581,7 @@ perk_give_bottle_end( gun, perk ) //checked matches cerberus output
} }
self waittill( "weapon_change_complete" ); self waittill( "weapon_change_complete" );
self decrement_is_drinking(); self decrement_is_drinking();
if ( !self maps/mp/zombies/_zm_laststand::player_is_in_laststand() && isDefined( self.intermission ) && !self.intermission ) if ( !self maps/mp/zombies/_zm_laststand::player_is_in_laststand() && !is_true( self.intermission ) )
{ {
self decrement_is_drinking(); self decrement_is_drinking();
} }
@ -2748,7 +2748,7 @@ perk_pause( perk ) //checked changed to match cerberus output
{ {
player.disabled_perks = []; player.disabled_perks = [];
} }
if ( isDefined( player.disabled_perks[ perk ] ) && !player.disabled_perks[ perk ] ) if ( !is_true( player.disabled_perks[ perk ] ) )
{ {
player.disabled_perks[ perk ] = player hasperk( perk ); player.disabled_perks[ perk ] = player hasperk( perk );
} }
@ -2794,7 +2794,7 @@ perk_unpause( perk ) //checked changed to match cerberus output
for ( j = 0; j < get_players().size; j++ ) for ( j = 0; j < get_players().size; j++ )
{ {
player = get_players()[ j ]; player = get_players()[ j ];
if ( isDefined( player.disabled_perks ) && isDefined( player.disabled_perks[ perk ] ) && player.disabled_perks[ perk ] ) if ( isDefined( player.disabled_perks ) && is_true( player.disabled_perks[ perk ] ) )
{ {
player.disabled_perks[ perk ] = 0; player.disabled_perks[ perk ] = 0;
player set_perk_clientfield( perk, 1 ); player set_perk_clientfield( perk, 1 );
@ -2837,7 +2837,7 @@ perk_unpause_all_perks() //checked changed to match cerberus output
has_perk_paused( perk ) //checked matches cerberus output has_perk_paused( perk ) //checked matches cerberus output
{ {
if ( isDefined( self.disabled_perks ) && isDefined( self.disabled_perks[ perk ] ) && self.disabled_perks[ perk ] ) if ( isDefined( self.disabled_perks ) && is_true( self.disabled_perks[ perk ] ) )
{ {
return 1; return 1;
} }
@ -2985,7 +2985,7 @@ perk_machine_spawn_init()
k++; k++;
} }
} }
else if ( isDefined( useDefaultLocation ) && useDefaultLocation ) else if ( is_true( useDefaultLocation ) )
{ {
pos[ pos.size ] = structs[ i ]; pos[ pos.size ] = structs[ i ];
} }
@ -3010,7 +3010,7 @@ perk_machine_spawn_init()
perk_machine = Spawn( "script_model", pos[ i ].origin ); perk_machine = Spawn( "script_model", pos[ i ].origin );
perk_machine.angles = pos[ i ].angles; perk_machine.angles = pos[ i ].angles;
perk_machine SetModel( pos[ i ].model ); perk_machine SetModel( pos[ i ].model );
if ( isdefined( level._no_vending_machine_bump_trigs ) && level._no_vending_machine_bump_trigs ) if ( is_true( level._no_vending_machine_bump_trigs ) )
{ {
bump_trigger = undefined; bump_trigger = undefined;
} }
@ -3201,7 +3201,7 @@ perk_machine_spawn_init()
get_perk_machine_start_state( perk ) //checked matches cerberus output get_perk_machine_start_state( perk ) //checked matches cerberus output
{ {
if ( isDefined( level.vending_machines_powered_on_at_start ) && level.vending_machines_powered_on_at_start ) if ( is_true( level.vending_machines_powered_on_at_start ) )
{ {
return 1; return 1;
} }
@ -3214,43 +3214,43 @@ get_perk_machine_start_state( perk ) //checked matches cerberus output
perks_register_clientfield() //checked matches cerberus output perks_register_clientfield() //checked matches cerberus output
{ {
if ( isDefined( level.zombiemode_using_additionalprimaryweapon_perk ) && level.zombiemode_using_additionalprimaryweapon_perk ) if ( is_true( level.zombiemode_using_additionalprimaryweapon_perk ) )
{ {
registerclientfield( "toplayer", "perk_additional_primary_weapon", 1, 2, "int" ); registerclientfield( "toplayer", "perk_additional_primary_weapon", 1, 2, "int" );
} }
if ( isDefined( level.zombiemode_using_deadshot_perk ) && level.zombiemode_using_deadshot_perk ) if ( is_true( level.zombiemode_using_deadshot_perk ) )
{ {
registerclientfield( "toplayer", "perk_dead_shot", 1, 2, "int" ); registerclientfield( "toplayer", "perk_dead_shot", 1, 2, "int" );
} }
if ( isDefined( level.zombiemode_using_doubletap_perk ) && level.zombiemode_using_doubletap_perk ) if ( is_true( level.zombiemode_using_doubletap_perk ) )
{ {
registerclientfield( "toplayer", "perk_double_tap", 1, 2, "int" ); registerclientfield( "toplayer", "perk_double_tap", 1, 2, "int" );
} }
if ( isDefined( level.zombiemode_using_juggernaut_perk ) && level.zombiemode_using_juggernaut_perk ) if ( is_true( level.zombiemode_using_juggernaut_perk ) )
{ {
registerclientfield( "toplayer", "perk_juggernaut", 1, 2, "int" ); registerclientfield( "toplayer", "perk_juggernaut", 1, 2, "int" );
} }
if ( isDefined( level.zombiemode_using_marathon_perk ) && level.zombiemode_using_marathon_perk ) if ( is_true( level.zombiemode_using_marathon_perk ) )
{ {
registerclientfield( "toplayer", "perk_marathon", 1, 2, "int" ); registerclientfield( "toplayer", "perk_marathon", 1, 2, "int" );
} }
if ( isDefined( level.zombiemode_using_revive_perk ) && level.zombiemode_using_revive_perk ) if ( is_true( level.zombiemode_using_revive_perk ) )
{ {
registerclientfield( "toplayer", "perk_quick_revive", 1, 2, "int" ); registerclientfield( "toplayer", "perk_quick_revive", 1, 2, "int" );
} }
if ( isDefined( level.zombiemode_using_sleightofhand_perk ) && level.zombiemode_using_sleightofhand_perk ) if ( is_true( level.zombiemode_using_sleightofhand_perk ) )
{ {
registerclientfield( "toplayer", "perk_sleight_of_hand", 1, 2, "int" ); registerclientfield( "toplayer", "perk_sleight_of_hand", 1, 2, "int" );
} }
if ( isDefined( level.zombiemode_using_tombstone_perk ) && level.zombiemode_using_tombstone_perk ) if ( is_true( level.zombiemode_using_tombstone_perk ) )
{ {
registerclientfield( "toplayer", "perk_tombstone", 1, 2, "int" ); registerclientfield( "toplayer", "perk_tombstone", 1, 2, "int" );
} }
if ( isDefined( level.zombiemode_using_perk_intro_fx ) && level.zombiemode_using_perk_intro_fx ) if ( is_true( level.zombiemode_using_perk_intro_fx ) )
{ {
registerclientfield( "scriptmover", "clientfield_perk_intro_fx", 1000, 1, "int" ); registerclientfield( "scriptmover", "clientfield_perk_intro_fx", 1000, 1, "int" );
} }
if ( isDefined( level.zombiemode_using_chugabud_perk ) && level.zombiemode_using_chugabud_perk ) if ( is_true( level.zombiemode_using_chugabud_perk ) )
{ {
registerclientfield( "toplayer", "perk_chugabud", 1000, 1, "int" ); registerclientfield( "toplayer", "perk_chugabud", 1000, 1, "int" );
} }
@ -3312,7 +3312,7 @@ reenable_quickrevive( machine_clip, solo_mode ) //checked changed to match cerbe
{ {
perk_unpause( "specialty_quickrevive" ); perk_unpause( "specialty_quickrevive" );
} }
if ( isDefined( level.solo_revive_init ) && level.solo_revive_init && flag( "solo_revive" ) ) if ( is_true( level.solo_revive_init ) && flag( "solo_revive" ) )
{ {
disable_quickrevive( machine_clip ); disable_quickrevive( machine_clip );
return; return;
@ -3326,7 +3326,7 @@ reenable_quickrevive( machine_clip, solo_mode ) //checked changed to match cerbe
} }
else else
{ {
if ( isDefined( level._dont_unhide_quickervive_on_hotjoin ) && !level._dont_unhide_quickervive_on_hotjoin ) if ( !is_true( level._dont_unhide_quickervive_on_hotjoin ) )
{ {
unhide_quickrevive(); unhide_quickrevive();
level notify( "revive_off" ); level notify( "revive_off" );
@ -3561,7 +3561,7 @@ unhide_quickrevive() //checked matches cerberus output
org += level.quick_revive_linked_ent_offset; org += level.quick_revive_linked_ent_offset;
} }
} }
if ( isDefined( level.quick_revive_linked_ent_moves ) && !level.quick_revive_linked_ent_moves && level.quick_revive_machine.origin != org ) if ( !is_true( level.quick_revive_linked_ent_moves ) && level.quick_revive_machine.origin != org )
{ {
level.quick_revive_machine moveto( org, 3 ); level.quick_revive_machine moveto( org, 3 );
level.quick_revive_machine vibrate( direction, 10, 0.5, 2.9 ); level.quick_revive_machine vibrate( direction, 10, 0.5, 2.9 );

42
patch_zm/maps/mp/zombies/_zm_pers_upgrades.gsc
View File

@ -35,11 +35,11 @@ pers_abilities_init_globals() //checked matches cerberus output
self.pers[ "last_headshot_kill_time" ] = getTime(); self.pers[ "last_headshot_kill_time" ] = getTime();
self.pers[ "zombies_multikilled" ] = 0; self.pers[ "zombies_multikilled" ] = 0;
self.non_headshot_kill_counter = 0; self.non_headshot_kill_counter = 0;
if ( isDefined( level.pers_upgrade_box_weapon ) && level.pers_upgrade_box_weapon ) if ( is_true( level.pers_upgrade_box_weapon ) )
{ {
self.pers_box_weapon_awarded = undefined; self.pers_box_weapon_awarded = undefined;
} }
if ( isDefined( level.pers_upgrade_nube ) && level.pers_upgrade_nube ) if ( is_true( level.pers_upgrade_nube ) )
{ {
self thread pers_nube_unlock_watcher(); self thread pers_nube_unlock_watcher();
} }
@ -69,7 +69,7 @@ is_pers_system_disabled() //checked matches cerberus output
setup_pers_upgrade_boards() //checked matches cerberus output setup_pers_upgrade_boards() //checked matches cerberus output
{ {
if ( isDefined( level.pers_upgrade_boards ) && level.pers_upgrade_boards ) if ( is_true( level.pers_upgrade_boards ) )
{ {
level.pers_boarding_round_start = 10; level.pers_boarding_round_start = 10;
level.pers_boarding_number_of_boards_required = 74; level.pers_boarding_number_of_boards_required = 74;
@ -79,7 +79,7 @@ setup_pers_upgrade_boards() //checked matches cerberus output
setup_pers_upgrade_revive() //checked matches cerberus output setup_pers_upgrade_revive() //checked matches cerberus output
{ {
if ( isDefined( level.pers_upgrade_revive ) && level.pers_upgrade_revive ) if ( is_true( level.pers_upgrade_revive ) )
{ {
level.pers_revivenoperk_number_of_revives_required = 17; level.pers_revivenoperk_number_of_revives_required = 17;
level.pers_revivenoperk_number_of_chances_to_keep = 1; level.pers_revivenoperk_number_of_chances_to_keep = 1;
@ -89,7 +89,7 @@ setup_pers_upgrade_revive() //checked matches cerberus output
setup_pers_upgrade_multi_kill_headshots() //checked matches cerberus output setup_pers_upgrade_multi_kill_headshots() //checked matches cerberus output
{ {
if ( isDefined( level.pers_upgrade_multi_kill_headshots ) && level.pers_upgrade_multi_kill_headshots ) if ( is_true( level.pers_upgrade_multi_kill_headshots ) )
{ {
level.pers_multikill_headshots_required = 5; level.pers_multikill_headshots_required = 5;
level.pers_multikill_headshots_upgrade_reset_counter = 25; level.pers_multikill_headshots_upgrade_reset_counter = 25;
@ -99,7 +99,7 @@ setup_pers_upgrade_multi_kill_headshots() //checked matches cerberus output
setup_pers_upgrade_cash_back() //checked matches cerberus output setup_pers_upgrade_cash_back() //checked matches cerberus output
{ {
if ( isDefined( level.pers_upgrade_cash_back ) && level.pers_upgrade_cash_back ) if ( is_true( level.pers_upgrade_cash_back ) )
{ {
level.pers_cash_back_num_perks_required = 50; level.pers_cash_back_num_perks_required = 50;
level.pers_cash_back_perk_buys_prone_required = 15; level.pers_cash_back_perk_buys_prone_required = 15;
@ -112,7 +112,7 @@ setup_pers_upgrade_cash_back() //checked matches cerberus output
setup_pers_upgrade_insta_kill() //checked matches cerberus output setup_pers_upgrade_insta_kill() //checked matches cerberus output
{ {
if ( isDefined( level.pers_upgrade_insta_kill ) && level.pers_upgrade_insta_kill ) if ( is_true( level.pers_upgrade_insta_kill ) )
{ {
level.pers_insta_kill_num_required = 2; level.pers_insta_kill_num_required = 2;
level.pers_insta_kill_upgrade_active_time = 18; level.pers_insta_kill_upgrade_active_time = 18;
@ -122,7 +122,7 @@ setup_pers_upgrade_insta_kill() //checked matches cerberus output
setup_pers_upgrade_jugg() //checked matches cerberus output setup_pers_upgrade_jugg() //checked matches cerberus output
{ {
if ( isDefined( level.pers_upgrade_jugg ) && level.pers_upgrade_jugg ) if ( is_true( level.pers_upgrade_jugg ) )
{ {
level.pers_jugg_hit_and_die_total = 3; level.pers_jugg_hit_and_die_total = 3;
level.pers_jugg_hit_and_die_round_limit = 2; level.pers_jugg_hit_and_die_round_limit = 2;
@ -135,7 +135,7 @@ setup_pers_upgrade_jugg() //checked matches cerberus output
setup_pers_upgrade_carpenter() //checked matches cerberus output setup_pers_upgrade_carpenter() //checked matches cerberus output
{ {
if ( isDefined( level.pers_upgrade_carpenter ) && level.pers_upgrade_carpenter ) if ( is_true( level.pers_upgrade_carpenter ) )
{ {
level.pers_carpenter_zombie_kills = 1; level.pers_carpenter_zombie_kills = 1;
pers_register_upgrade( "carpenter", ::pers_upgrade_carpenter_active, "pers_carpenter", level.pers_carpenter_zombie_kills, 0 ); pers_register_upgrade( "carpenter", ::pers_upgrade_carpenter_active, "pers_carpenter", level.pers_carpenter_zombie_kills, 0 );
@ -144,7 +144,7 @@ setup_pers_upgrade_carpenter() //checked matches cerberus output
setup_pers_upgrade_flopper() //checked matches cerberus output setup_pers_upgrade_flopper() //checked matches cerberus output
{ {
if ( isDefined( level.pers_upgrade_flopper ) && level.pers_upgrade_flopper ) if ( is_true( level.pers_upgrade_flopper ) )
{ {
level.pers_flopper_damage_counter = 6; level.pers_flopper_damage_counter = 6;
level.pers_flopper_counter = 1; level.pers_flopper_counter = 1;
@ -156,7 +156,7 @@ setup_pers_upgrade_flopper() //checked matches cerberus output
setup_pers_upgrade_perk_lose() //checked matches cerberus output setup_pers_upgrade_perk_lose() //checked matches cerberus output
{ {
if ( isDefined( level.pers_upgrade_perk_lose ) && level.pers_upgrade_perk_lose ) if ( is_true( level.pers_upgrade_perk_lose ) )
{ {
level.pers_perk_round_reached_max = 6; level.pers_perk_round_reached_max = 6;
level.pers_perk_lose_counter = 3; level.pers_perk_lose_counter = 3;
@ -166,7 +166,7 @@ setup_pers_upgrade_perk_lose() //checked matches cerberus output
setup_pers_upgrade_pistol_points() //checked matches cerberus output setup_pers_upgrade_pistol_points() //checked matches cerberus output
{ {
if ( isDefined( level.pers_upgrade_pistol_points ) && level.pers_upgrade_pistol_points ) if ( is_true( level.pers_upgrade_pistol_points ) )
{ {
level.pers_pistol_points_num_kills_in_game = 8; level.pers_pistol_points_num_kills_in_game = 8;
level.pers_pistol_points_accuracy = 0.25; level.pers_pistol_points_accuracy = 0.25;
@ -177,7 +177,7 @@ setup_pers_upgrade_pistol_points() //checked matches cerberus output
setup_pers_upgrade_double_points() //checked matches cerberus output setup_pers_upgrade_double_points() //checked matches cerberus output
{ {
if ( isDefined( level.pers_upgrade_double_points ) && level.pers_upgrade_double_points ) if ( is_true( level.pers_upgrade_double_points ) )
{ {
level.pers_double_points_score = 2500; level.pers_double_points_score = 2500;
level.pers_double_points_counter = 1; level.pers_double_points_counter = 1;
@ -187,7 +187,7 @@ setup_pers_upgrade_double_points() //checked matches cerberus output
setup_pers_upgrade_sniper() //checked matches cerberus output setup_pers_upgrade_sniper() //checked matches cerberus output
{ {
if ( isDefined( level.pers_upgrade_sniper ) && level.pers_upgrade_sniper ) if ( is_true( level.pers_upgrade_sniper ) )
{ {
level.pers_sniper_round_kills_counter = 5; level.pers_sniper_round_kills_counter = 5;
level.pers_sniper_kill_distance = 800; level.pers_sniper_kill_distance = 800;
@ -199,7 +199,7 @@ setup_pers_upgrade_sniper() //checked matches cerberus output
setup_pers_upgrade_box_weapon() //checked matches cerberus output setup_pers_upgrade_box_weapon() //checked matches cerberus output
{ {
if ( isDefined( level.pers_upgrade_box_weapon ) && level.pers_upgrade_box_weapon ) if ( is_true( level.pers_upgrade_box_weapon ) )
{ {
level.pers_box_weapon_counter = 5; level.pers_box_weapon_counter = 5;
level.pers_box_weapon_lose_round = 10; level.pers_box_weapon_lose_round = 10;
@ -209,7 +209,7 @@ setup_pers_upgrade_box_weapon() //checked matches cerberus output
setup_pers_upgrade_nube() //checked matches cerberus output setup_pers_upgrade_nube() //checked matches cerberus output
{ {
if ( isDefined( level.pers_upgrade_nube ) && level.pers_upgrade_nube ) if ( is_true( level.pers_upgrade_nube ) )
{ {
level.pers_nube_counter = 1; level.pers_nube_counter = 1;
level.pers_nube_lose_round = 10; level.pers_nube_lose_round = 10;
@ -315,7 +315,7 @@ pers_upgrade_insta_kill_active() //checked changed to match cerberus output
if ( isDefined( level.pers_melee_swipe_zombie_swiper ) ) if ( isDefined( level.pers_melee_swipe_zombie_swiper ) )
{ {
e_zombie = level.pers_melee_swipe_zombie_swiper; e_zombie = level.pers_melee_swipe_zombie_swiper;
if ( isalive( e_zombie ) && isDefined( e_zombie.is_zombie ) && e_zombie.is_zombie ) if ( isalive( e_zombie ) && is_true( e_zombie.is_zombie ) )
{ {
e_zombie.marked_for_insta_upgraded_death = 1; e_zombie.marked_for_insta_upgraded_death = 1;
e_zombie dodamage( e_zombie.health + 666, e_zombie.origin, self, self, "none", "MOD_PISTOL_BULLET", 0, "knife_zm" ); e_zombie dodamage( e_zombie.health + 666, e_zombie.origin, self, self, "none", "MOD_PISTOL_BULLET", 0, "knife_zm" );
@ -336,7 +336,7 @@ is_insta_kill_upgraded_and_active() //checked matches cerberus output
{ {
if ( self maps/mp/zombies/_zm_powerups::is_insta_kill_active() ) if ( self maps/mp/zombies/_zm_powerups::is_insta_kill_active() )
{ {
if ( isDefined( self.pers_upgrades_awarded[ "insta_kill" ] ) && self.pers_upgrades_awarded[ "insta_kill" ] ) if ( is_true( self.pers_upgrades_awarded[ "insta_kill" ] ) )
{ {
return 1; return 1;
} }
@ -398,10 +398,10 @@ pers_upgrade_carpenter_active() //checked changed to match cerberus output
persistent_carpenter_ability_check() //checked changed to match cerberus output persistent_carpenter_ability_check() //checked changed to match cerberus output
{ {
if ( isDefined( level.pers_upgrade_carpenter ) && level.pers_upgrade_carpenter ) if ( is_true( level.pers_upgrade_carpenter ) )
{ {
self endon( "disconnect" ); self endon( "disconnect" );
if ( isDefined( self.pers_upgrades_awarded[ "carpenter" ] ) && self.pers_upgrades_awarded[ "carpenter" ] ) if ( is_true( self.pers_upgrades_awarded[ "carpenter" ] ) )
{ {
level.pers_carpenter_boards_active = 1; level.pers_carpenter_boards_active = 1;
} }
@ -429,7 +429,7 @@ persistent_carpenter_ability_check() //checked changed to match cerberus output
} }
else if ( isDefined( self.pers_carpenter_kill ) ) else if ( isDefined( self.pers_carpenter_kill ) )
{ {
if ( isDefined( self.pers_upgrades_awarded[ "carpenter" ] ) && self.pers_upgrades_awarded[ "carpenter" ] ) if ( is_true( self.pers_upgrades_awarded[ "carpenter" ] ) )
{ {
break; break;
} }

80
patch_zm/maps/mp/zombies/_zm_pers_upgrades_functions.gsc
View File

@ -13,11 +13,11 @@
pers_boards_updated( zbarrier ) //checked matches cerberus output pers_boards_updated( zbarrier ) //checked matches cerberus output
{ {
if ( isDefined( level.pers_upgrade_boards ) && level.pers_upgrade_boards ) if ( is_true( level.pers_upgrade_boards ) )
{ {
if ( maps/mp/zombies/_zm_pers_upgrades::is_pers_system_active() ) if ( maps/mp/zombies/_zm_pers_upgrades::is_pers_system_active() )
{ {
if ( isDefined( self.pers_upgrades_awarded[ "board" ] ) && !self.pers_upgrades_awarded[ "board" ] ) if ( !is_true( self.pers_upgrades_awarded[ "board" ] ) )
{ {
if ( level.round_number >= level.pers_boarding_round_start ) if ( level.round_number >= level.pers_boarding_round_start )
{ {
@ -39,7 +39,7 @@ pers_revive_active() //checked matches cerberus output
{ {
if ( maps/mp/zombies/_zm_pers_upgrades::is_pers_system_active() ) if ( maps/mp/zombies/_zm_pers_upgrades::is_pers_system_active() )
{ {
if ( isDefined( self.pers_upgrades_awarded[ "revive" ] ) && self.pers_upgrades_awarded[ "revive" ] ) if ( is_true( self.pers_upgrades_awarded[ "revive" ] ) )
{ {
return 1; return 1;
} }
@ -59,7 +59,7 @@ pers_mulit_kill_headshot_active() //checked matches cerberus output
{ {
if ( maps/mp/zombies/_zm_pers_upgrades::is_pers_system_active() ) if ( maps/mp/zombies/_zm_pers_upgrades::is_pers_system_active() )
{ {
if ( isDefined( self.pers_upgrades_awarded[ "multikill_headshots" ] ) && self.pers_upgrades_awarded[ "multikill_headshots" ] ) if ( is_true( self.pers_upgrades_awarded[ "multikill_headshots" ] ) )
{ {
return 1; return 1;
} }
@ -96,9 +96,9 @@ cash_back_player_drinks_perk() //checked matches cerberus output
{ {
if ( maps/mp/zombies/_zm_pers_upgrades::is_pers_system_active() ) if ( maps/mp/zombies/_zm_pers_upgrades::is_pers_system_active() )
{ {
if ( isDefined( level.pers_upgrade_cash_back ) && level.pers_upgrade_cash_back ) if ( is_true( level.pers_upgrade_cash_back ) )
{ {
if ( isDefined( self.pers_upgrades_awarded[ "cash_back" ] ) && self.pers_upgrades_awarded[ "cash_back" ] ) if ( is_true self.pers_upgrades_awarded[ "cash_back" ] ) )
{ {
self thread cash_back_money_reward(); self thread cash_back_money_reward();
self thread cash_back_player_prone_check( 1 ); self thread cash_back_player_prone_check( 1 );
@ -160,7 +160,7 @@ cash_back_player_prone_check( got_ability ) //checked changed to match cerberus
pers_upgrade_insta_kill_upgrade_check() //checked changed to match cerberus output pers_upgrade_insta_kill_upgrade_check() //checked changed to match cerberus output
{ {
if ( isDefined( level.pers_upgrade_insta_kill ) && level.pers_upgrade_insta_kill ) if ( is_true( level.pers_upgrade_insta_kill ) )
{ {
self endon( "death" ); self endon( "death" );
if ( !maps/mp/zombies/_zm_pers_upgrades::is_pers_system_active() ) if ( !maps/mp/zombies/_zm_pers_upgrades::is_pers_system_active() )
@ -171,12 +171,12 @@ pers_upgrade_insta_kill_upgrade_check() //checked changed to match cerberus outp
for ( i = 0; i < players.size; i++ ) for ( i = 0; i < players.size; i++ )
{ {
e_player = players[ i ]; e_player = players[ i ];
if ( isDefined( e_player.pers_upgrades_awarded[ "insta_kill" ] ) && e_player.pers_upgrades_awarded[ "insta_kill" ] ) if ( is_true( e_player.pers_upgrades_awarded[ "insta_kill" ] ) )
{ {
e_player thread insta_kill_upgraded_player_kill_func( level.pers_insta_kill_upgrade_active_time ); e_player thread insta_kill_upgraded_player_kill_func( level.pers_insta_kill_upgrade_active_time );
} }
} }
if ( isDefined( self.pers_upgrades_awarded[ "insta_kill" ] ) && !self.pers_upgrades_awarded[ "insta_kill" ] ) if ( !is_true( self.pers_upgrades_awarded[ "insta_kill" ] ) )
{ {
kills_start = self maps/mp/gametypes_zm/_globallogic_score::getpersstat( "kills" ); kills_start = self maps/mp/gametypes_zm/_globallogic_score::getpersstat( "kills" );
self waittill( "insta_kill_over" ); self waittill( "insta_kill_over" );
@ -267,11 +267,11 @@ pers_insta_kill_melee_swipe( smeansofdeath, eattacker ) //checked matches cerber
pers_upgrade_jugg_player_death_stat() //checked matches cerberus output pers_upgrade_jugg_player_death_stat() //checked matches cerberus output
{ {
if ( isDefined( level.pers_upgrade_jugg ) && level.pers_upgrade_jugg ) if ( is_true( level.pers_upgrade_jugg ) )
{ {
if ( maps/mp/zombies/_zm_pers_upgrades::is_pers_system_active() ) if ( maps/mp/zombies/_zm_pers_upgrades::is_pers_system_active() )
{ {
if ( isDefined( self.pers_upgrades_awarded[ "jugg" ] ) && !self.pers_upgrades_awarded[ "jugg" ] ) if ( !is_true( self.pers_upgrades_awarded[ "jugg" ] ) )
{ {
if ( level.round_number <= level.pers_jugg_hit_and_die_round_limit ) if ( level.round_number <= level.pers_jugg_hit_and_die_round_limit )
{ {
@ -286,7 +286,7 @@ pers_jugg_active() //checked matches cerberus output
{ {
if ( maps/mp/zombies/_zm_pers_upgrades::is_pers_system_active() ) if ( maps/mp/zombies/_zm_pers_upgrades::is_pers_system_active() )
{ {
if ( isDefined( self.pers_upgrades_awarded[ "jugg" ] ) && self.pers_upgrades_awarded[ "jugg" ] ) if ( is_true( self.pers_upgrades_awarded[ "jugg" ] ) )
{ {
return 1; return 1;
} }
@ -304,7 +304,7 @@ pers_upgrade_flopper_damage_check( smeansofdeath, idamage ) //checked changed to
{ {
return 0; return 0;
} }
if ( isDefined( self.pers_upgrades_awarded[ "flopper" ] ) && !self.pers_upgrades_awarded[ "flopper" ] ) if ( !is_true( self.pers_upgrades_awarded[ "flopper" ] ) )
{ {
if ( idamage < level.pers_flopper_min_fall_damage_activate ) if ( idamage < level.pers_flopper_min_fall_damage_activate )
{ {
@ -325,7 +325,7 @@ pers_upgrade_flopper_damage_check( smeansofdeath, idamage ) //checked changed to
*/ */
} }
} }
else if ( isDefined( self.pers_flopper_active ) && !self.pers_flopper_active ) else if ( !is_true( self.pers_flopper_active ) )
{ {
if ( idamage >= level.pers_flopper_min_fall_damage_deactivate ) if ( idamage >= level.pers_flopper_min_fall_damage_deactivate )
{ {
@ -385,7 +385,7 @@ pers_flopper_explode( attacker, origin ) //checked matches cerberus output
radius = level.zombie_vars[ "zombie_perk_divetonuke_radius" ]; radius = level.zombie_vars[ "zombie_perk_divetonuke_radius" ];
min_damage = level.zombie_vars[ "zombie_perk_divetonuke_min_damage" ]; min_damage = level.zombie_vars[ "zombie_perk_divetonuke_min_damage" ];
max_damage = level.zombie_vars[ "zombie_perk_divetonuke_max_damage" ]; max_damage = level.zombie_vars[ "zombie_perk_divetonuke_max_damage" ];
if ( isDefined( level.pers_flopper_network_optimized ) && level.pers_flopper_network_optimized ) if ( is_true( level.pers_flopper_network_optimized ) )
{ {
attacker thread pers_flopper_damage_network_optimized( origin, radius, max_damage, min_damage, "MOD_GRENADE_SPLASH" ); attacker thread pers_flopper_damage_network_optimized( origin, radius, max_damage, min_damage, "MOD_GRENADE_SPLASH" );
} }
@ -441,7 +441,7 @@ pers_upgrade_pistol_points_kill() //checked matches cerberus output
self.pers_num_zombies_killed_in_game = 0; self.pers_num_zombies_killed_in_game = 0;
} }
self.pers_num_zombies_killed_in_game++; self.pers_num_zombies_killed_in_game++;
if ( isDefined( self.pers_upgrades_awarded[ "pistol_points" ] ) && !self.pers_upgrades_awarded[ "pistol_points" ] ) if ( !is_true( self.pers_upgrades_awarded[ "pistol_points" ] ) )
{ {
if ( self.pers_num_zombies_killed_in_game >= level.pers_pistol_points_num_kills_in_game ) if ( self.pers_num_zombies_killed_in_game >= level.pers_pistol_points_num_kills_in_game )
{ {
@ -467,7 +467,7 @@ pers_upgrade_pistol_points_set_score( score, event, mod, damage_weapon ) //check
{ {
if ( maps/mp/zombies/_zm_pers_upgrades::is_pers_system_active() ) if ( maps/mp/zombies/_zm_pers_upgrades::is_pers_system_active() )
{ {
if ( isDefined( self.pers_upgrades_awarded[ "pistol_points" ] ) && self.pers_upgrades_awarded[ "pistol_points" ] ) if ( is_true( self.pers_upgrades_awarded[ "pistol_points" ] ) )
{ {
if ( isDefined( event ) ) if ( isDefined( event ) )
{ {
@ -501,7 +501,7 @@ pers_upgrade_double_points_pickup_start() //checked changed to match cerberus ou
{ {
return; return;
} }
if ( isDefined( self.double_points_ability_check_active ) && self.double_points_ability_check_active ) if ( is_true( self.double_points_ability_check_active ) )
{ {
self.double_points_ability_start_time = getTime(); self.double_points_ability_start_time = getTime();
return; return;
@ -555,7 +555,7 @@ pers_upgrade_double_points_pickup_start() //checked changed to match cerberus ou
{ {
bank_withdrawal_total = 0; bank_withdrawal_total = 0;
} }
if ( isDefined( self.pers_upgrades_awarded[ "double_points" ] ) && self.pers_upgrades_awarded[ "double_points" ] ) if ( is_true( self.pers_upgrades_awarded[ "double_points" ] ) )
{ {
if ( ability_lost == 1 ) if ( ability_lost == 1 )
{ {
@ -583,9 +583,9 @@ pers_upgrade_double_points_set_score( score ) //checked matches cerberus output
{ {
if ( maps/mp/zombies/_zm_pers_upgrades::is_pers_system_active() ) if ( maps/mp/zombies/_zm_pers_upgrades::is_pers_system_active() )
{ {
if ( isDefined( self.pers_upgrades_awarded[ "double_points" ] ) && self.pers_upgrades_awarded[ "double_points" ] ) if ( is_true( self.pers_upgrades_awarded[ "double_points" ] ) )
{ {
if ( isDefined( level.pers_double_points_active ) && level.pers_double_points_active ) if ( is_true( level.pers_double_points_active ) )
{ {
score = int( score * 0.5 ); score = int( score * 0.5 );
} }
@ -598,7 +598,7 @@ pers_upgrade_double_points_cost( current_cost ) //checked matches cerberus outpu
{ {
if ( maps/mp/zombies/_zm_pers_upgrades::is_pers_system_active() ) if ( maps/mp/zombies/_zm_pers_upgrades::is_pers_system_active() )
{ {
if ( isDefined( self.pers_upgrades_awarded[ "double_points" ] ) && self.pers_upgrades_awarded[ "double_points" ] ) if ( is_true( self.pers_upgrades_awarded[ "double_points" ] ) )
{ {
current_cost = int( current_cost / 2 ); current_cost = int( current_cost / 2 );
} }
@ -608,9 +608,9 @@ pers_upgrade_double_points_cost( current_cost ) //checked matches cerberus outpu
is_pers_double_points_active() //checked matches cerberus output is_pers_double_points_active() //checked matches cerberus output
{ {
if ( isDefined( self.pers_upgrades_awarded[ "double_points" ] ) && self.pers_upgrades_awarded[ "double_points" ] ) if ( is_true( self.pers_upgrades_awarded[ "double_points" ] ) )
{ {
if ( isDefined( level.pers_double_points_active ) && level.pers_double_points_active ) if ( is_true( level.pers_double_points_active ) )
{ {
return 1; return 1;
} }
@ -625,7 +625,7 @@ pers_upgrade_perk_lose_bought() //checked changed to match cerberus output
return; return;
} }
wait 1; wait 1;
if ( isDefined( self.pers_upgrades_awarded[ "perk_lose" ] ) && !self.pers_upgrades_awarded[ "perk_lose" ] ) if ( !is_true( self.pers_upgrades_awarded[ "perk_lose" ] ) )
{ {
if ( level.round_number <= level.pers_perk_round_reached_max ) if ( level.round_number <= level.pers_perk_round_reached_max )
{ {
@ -765,7 +765,7 @@ pers_upgrade_sniper_kill_check( zombie, attacker ) //checked changed to match ce
{ {
return; return;
} }
if ( isDefined( zombie.marked_for_insta_upgraded_death ) && zombie.marked_for_insta_upgraded_death ) if ( is_true( zombie.marked_for_insta_upgraded_death ) )
{ {
return; return;
} }
@ -774,7 +774,7 @@ pers_upgrade_sniper_kill_check( zombie, attacker ) //checked changed to match ce
{ {
return; return;
} }
if ( isDefined( self.pers_upgrades_awarded[ "sniper" ] ) && self.pers_upgrades_awarded[ "sniper" ] ) if ( is_true( self.pers_upgrades_awarded[ "sniper" ] ) )
{ {
self thread pers_sniper_score_reward(); self thread pers_sniper_score_reward();
} }
@ -838,7 +838,7 @@ pers_sniper_player_fires( weapon, hit ) //checked changed to match cerberus outp
} }
if ( isDefined( weapon ) && isDefined( hit ) ) if ( isDefined( weapon ) && isDefined( hit ) )
{ {
if ( isDefined( self.pers_upgrades_awarded[ "sniper" ] ) && self.pers_upgrades_awarded[ "sniper" ] ) if ( is_true( self.pers_upgrades_awarded[ "sniper" ] ) )
{ {
if ( is_sniper_weapon( weapon ) ) if ( is_sniper_weapon( weapon ) )
{ {
@ -917,7 +917,7 @@ pers_upgrade_box_weapon_used( e_user, e_grabber ) //checked changed to match cer
{ {
return; return;
} }
if ( isDefined( e_grabber.pers_upgrades_awarded[ "box_weapon" ] ) && e_grabber.pers_upgrades_awarded[ "box_weapon" ] ) if ( is_true( e_grabber.pers_upgrades_awarded[ "box_weapon" ] ) )
{ {
return; return;
} }
@ -925,7 +925,7 @@ pers_upgrade_box_weapon_used( e_user, e_grabber ) //checked changed to match cer
} }
else if ( isDefined( e_user ) && isplayer( e_user ) ) else if ( isDefined( e_user ) && isplayer( e_user ) )
{ {
if ( isDefined( e_user.pers_upgrades_awarded[ "box_weapon" ] ) && e_user.pers_upgrades_awarded[ "box_weapon" ] ) if ( is_true( e_user.pers_upgrades_awarded[ "box_weapon" ] ) )
{ {
return; return;
} }
@ -936,7 +936,7 @@ pers_upgrade_box_weapon_used( e_user, e_grabber ) //checked changed to match cer
pers_magic_box_teddy_bear() //checked changed to match cerberus output pers_magic_box_teddy_bear() //checked changed to match cerberus output
{ {
self endon( "disconnect" ); self endon( "disconnect" );
if ( isDefined( level.pers_magic_box_firesale ) && level.pers_magic_box_firesale ) if ( is_true( level.pers_magic_box_firesale ) )
{ {
self thread pers_magic_box_firesale(); self thread pers_magic_box_firesale();
} }
@ -978,10 +978,10 @@ pers_magic_box_teddy_bear() //checked changed to match cerberus output
wait 0.1; wait 0.1;
m_bear setvisibletoplayer( self ); m_bear setvisibletoplayer( self );
} }
if ( isDefined( level.sloth_moving_box ) && level.sloth_moving_box ) if ( is_true( level.sloth_moving_box ) )
{ {
m_bear setinvisibletoall(); m_bear setinvisibletoall();
while ( isDefined( level.sloth_moving_box ) && level.sloth_moving_box ) while ( is_true( level.sloth_moving_box ) )
{ {
wait 0.1; wait 0.1;
} }
@ -989,12 +989,12 @@ pers_magic_box_teddy_bear() //checked changed to match cerberus output
wait 0.1; wait 0.1;
m_bear setvisibletoplayer( self ); m_bear setvisibletoplayer( self );
} }
if ( isDefined( box._box_open ) && box._box_open ) if ( is_true( box._box_open ) )
{ {
m_bear setinvisibletoall(); m_bear setinvisibletoall();
while ( 1 ) while ( 1 )
{ {
if ( isDefined( box._box_open ) && !box._box_open ) if ( !is_true( box._box_open ) )
{ {
break; break;
} }
@ -1145,12 +1145,12 @@ box_firesale_teddy_bear( box, box_index ) //checked changed to match cerberus ou
m_bear setvisibletoplayer( self ); m_bear setvisibletoplayer( self );
while ( 1 ) while ( 1 )
{ {
if ( isDefined( box._box_open ) && box._box_open ) if ( is_true( box._box_open ) )
{ {
m_bear setinvisibletoall(); m_bear setinvisibletoall();
while ( 1 ) while ( 1 )
{ {
if ( isDefined( box._box_open ) && !box._box_open ) if ( !is_true( box._box_open ) )
{ {
break; break;
} }
@ -1219,7 +1219,7 @@ pers_nube_weapon_upgrade_check( player, str_weapon ) //checked matches cerberus
{ {
if ( getsubstr( str_weapon, 0, 11 ) == "rottweil72_" ) if ( getsubstr( str_weapon, 0, 11 ) == "rottweil72_" )
{ {
if ( isDefined( player.pers_upgrades_awarded[ "nube" ] ) && !player.pers_upgrades_awarded[ "nube" ] ) if ( !is_true( player.pers_upgrades_awarded[ "nube" ] ) )
{ {
if ( pers_nube_player_ranked_as_nube( player ) ) if ( pers_nube_player_ranked_as_nube( player ) )
{ {
@ -1247,7 +1247,7 @@ pers_nube_weapon_ammo_check( player, str_weapon ) //checked matches cerberus out
{ {
if ( getsubstr( str_weapon, 0, 11 ) == "rottweil72_" ) if ( getsubstr( str_weapon, 0, 11 ) == "rottweil72_" )
{ {
if ( isDefined( player.pers_upgrades_awarded[ "nube" ] ) && player.pers_upgrades_awarded[ "nube" ] ) if ( is_true( player.pers_upgrades_awarded[ "nube" ] ) )
{ {
if ( player hasweapon( "ray_gun_zm" ) ) if ( player hasweapon( "ray_gun_zm" ) )
{ {
@ -1297,7 +1297,7 @@ pers_nube_should_we_give_raygun( player_has_weapon, player, weapon_buy ) //check
{ {
player_has_weapon = 0; player_has_weapon = 0;
} }
else if ( isDefined( player.pers_upgrades_awarded[ "nube" ] ) && player.pers_upgrades_awarded[ "nube" ] && player_has_raygun ) else if ( is_true( player.pers_upgrades_awarded[ "nube" ] ) && player_has_raygun )
{ {
player_has_weapon = 1; player_has_weapon = 1;
} }

12
patch_zm/maps/mp/zombies/_zm_pers_upgrades_system.gsc
View File

@ -73,7 +73,7 @@ pers_upgrades_monitor() //checked partially changed to match cerberus output //d
player = players[ player_index ]; player = players[ player_index ];
if ( is_player_valid( player ) && isDefined( player.stats_this_frame ) ) if ( is_player_valid( player ) && isDefined( player.stats_this_frame ) )
{ {
if ( !player.stats_this_frame.size && isDefined( player.pers_upgrade_force_test ) && !player.pers_upgrade_force_test ) if ( !player.stats_this_frame.size && !is_true( player.pers_upgrade_force_test ) )
{ {
player_index++; player_index++;
continue; continue;
@ -88,7 +88,7 @@ pers_upgrades_monitor() //checked partially changed to match cerberus output //d
should_award = player check_pers_upgrade( pers_upgrade ); should_award = player check_pers_upgrade( pers_upgrade );
if ( should_award ) if ( should_award )
{ {
if ( isDefined( player.pers_upgrades_awarded[ level.pers_upgrades_keys[ pers_upgrade_index ] ] ) && player.pers_upgrades_awarded[ level.pers_upgrades_keys[ pers_upgrade_index ] ] ) if ( is_true( player.pers_upgrades_awarded[ level.pers_upgrades_keys[ pers_upgrade_index ] ] ) )
{ {
pers_upgrade_index++; pers_upgrade_index++;
continue; continue;
@ -102,7 +102,7 @@ pers_upgrades_monitor() //checked partially changed to match cerberus output //d
type = level.snd_pers_upgrade_force_type; type = level.snd_pers_upgrade_force_type;
} }
player playsoundtoplayer( "evt_player_upgrade", player ); player playsoundtoplayer( "evt_player_upgrade", player );
if ( isDefined( level.pers_upgrade_vo_spoken ) && level.pers_upgrade_vo_spoken ) if ( is_true( level.pers_upgrade_vo_spoken ) )
{ {
player delay_thread( 1, maps/mp/zombies/_zm_audio::create_and_play_dialog, "general", type, undefined, level.snd_pers_upgrade_force_variant ); player delay_thread( 1, maps/mp/zombies/_zm_audio::create_and_play_dialog, "general", type, undefined, level.snd_pers_upgrade_force_variant );
} }
@ -137,7 +137,7 @@ pers_upgrades_monitor() //checked partially changed to match cerberus output //d
pers_upgrade_index++; pers_upgrade_index++;
continue; continue;
} }
if ( isDefined( player.pers_upgrades_awarded[ level.pers_upgrades_keys[ pers_upgrade_index ] ] ) && player.pers_upgrades_awarded[ level.pers_upgrades_keys[ pers_upgrade_index ] ] ) if ( is_true( player.pers_upgrades_awarded[ level.pers_upgrades_keys[ pers_upgrade_index ] ] ) )
{ {
if ( flag( "initial_blackscreen_passed" ) && !is_true( player.is_hotjoining ) ) if ( flag( "initial_blackscreen_passed" ) && !is_true( player.is_hotjoining ) )
{ {
@ -179,7 +179,7 @@ wait_for_game_end() //checked changed to match cerberus output
game_end_reset_if_not_achieved = level.pers_upgrades[ str_name ].game_end_reset_if_not_achieved; game_end_reset_if_not_achieved = level.pers_upgrades[ str_name ].game_end_reset_if_not_achieved;
if ( isDefined( game_end_reset_if_not_achieved ) && game_end_reset_if_not_achieved == 1 ) if ( isDefined( game_end_reset_if_not_achieved ) && game_end_reset_if_not_achieved == 1 )
{ {
if ( isDefined( player.pers_upgrades_awarded[ str_name ] ) && !player.pers_upgrades_awarded[ str_name ] ) if ( !is_true( player.pers_upgrades_awarded[ str_name ] ) )
{ {
for ( stat_index = 0; stat_index < level.pers_upgrades[ str_name ].stat_names.size; stat_index++ ) for ( stat_index = 0; stat_index < level.pers_upgrades[ str_name ].stat_names.size; stat_index++ )
{ {
@ -208,7 +208,7 @@ check_pers_upgrade( pers_upgrade ) //checked changed to match cerberus output
is_any_pers_upgrade_stat_updated( pers_upgrade ) //checked changed to match cerberus output is_any_pers_upgrade_stat_updated( pers_upgrade ) //checked changed to match cerberus output
{ {
if ( isDefined( self.pers_upgrade_force_test ) && self.pers_upgrade_force_test ) if ( is_true( self.pers_upgrade_force_test ) )
{ {
return 1; return 1;
} }

6
patch_zm/maps/mp/zombies/_zm_playerhealth.gsc
View File

@ -373,14 +373,14 @@ redflashingoverlay( overlay ) //checked matches cerberus output
self endon( "disconnect" ); self endon( "disconnect" );
self endon( "clear_red_flashing_overlay" ); self endon( "clear_red_flashing_overlay" );
self.stopflashingbadlytime = getTime() + level.longregentime; self.stopflashingbadlytime = getTime() + level.longregentime;
if ( isDefined( self.is_in_process_of_zombify ) && !self.is_in_process_of_zombify && isDefined( self.is_zombie ) && !self.is_zombie ) if ( !is_true( self.is_in_process_of_zombify ) && !is_true( self.is_zombie ) )
{ {
fadefunc( overlay, 1, 1, 0 ); fadefunc( overlay, 1, 1, 0 );
while ( getTime() < self.stopflashingbadlytime && isalive( self ) && isDefined( self.is_in_process_of_zombify ) && !self.is_in_process_of_zombify && isDefined( self.is_zombie ) && !self.is_zombie ) while ( getTime() < self.stopflashingbadlytime && isalive( self ) && !is_true( self.is_in_process_of_zombify ) && !is_true( self.is_zombie ) )
{ {
fadefunc( overlay, 0.9, 1, 0 ); fadefunc( overlay, 0.9, 1, 0 );
} }
if ( isDefined( self.is_in_process_of_zombify ) && !self.is_in_process_of_zombify && isDefined( self.is_zombie ) && !self.is_zombie ) if ( !is_true( self.is_in_process_of_zombify ) && !is_true( self.is_zombie ) )
{ {
if ( isalive( self ) ) if ( isalive( self ) )
{ {

20
patch_zm/maps/mp/zombies/_zm_power.gsc
View File

@ -88,7 +88,7 @@ standard_powered_items() //checked partially changed to match cerberus output //
if ( isDefined( door.script_noteworthy ) && door.script_noteworthy == "local_electric_door" ) if ( isDefined( door.script_noteworthy ) && door.script_noteworthy == "local_electric_door" )
{ {
power_sources = 0; power_sources = 0;
if ( isDefined( level.power_local_doors_globally ) && !level.power_local_doors_globally ) if ( !is_true( level.power_local_doors_globally ) )
{ {
power_sources = 1; power_sources = 1;
} }
@ -335,11 +335,11 @@ has_local_power( origin ) //checked changed to match cerberus output
get_powered_item_cost() //checked matches cerberus output get_powered_item_cost() //checked matches cerberus output
{ {
if ( isDefined( self.power ) && !self.power ) if ( !is_true( self.power ) )
{ {
return 0; return 0;
} }
if ( isDefined( level._power_global ) && level._power_global && self.power_sources != 1 ) if ( is_true( level._power_global ) && self.power_sources != 1 )
{ {
return 0; return 0;
} }
@ -451,11 +451,11 @@ cost_low_if_local() //checked matches cerberus output
self.one_time_cost = undefined; self.one_time_cost = undefined;
return cost; return cost;
} }
if ( isDefined( level._power_global ) && level._power_global ) if ( is_true( level._power_global ) )
{ {
return 0; return 0;
} }
if ( isDefined( self.self_powered ) && self.self_powered ) if ( is_true( self.self_powered ) )
{ {
return 0; return 0;
} }
@ -593,7 +593,7 @@ stun_zombie() //checked matches cerberus output
*/ */
return; return;
} }
if ( isDefined( self.ignore_inert ) && self.ignore_inert ) if ( is_true( self.ignore_inert ) )
{ {
return; return;
} }
@ -610,11 +610,11 @@ perk_range( delta, origin, radius ) //checked changed to match cerberus output
if ( isDefined( self.target ) ) if ( isDefined( self.target ) )
{ {
perkorigin = self.target.origin; perkorigin = self.target.origin;
if ( isDefined( self.target.trigger_off ) && self.target.trigger_off ) if ( is_true( self.target.trigger_off ) )
{ {
perkorigin = self.target.realorigin; perkorigin = self.target.realorigin;
} }
else if ( isDefined( self.target.disabled ) && self.target.disabled ) else if ( is_true( self.target.disabled ) )
{ {
perkorigin += vectorScale( ( 0, 0, 1 ), 10000 ); perkorigin += vectorScale( ( 0, 0, 1 ), 10000 );
} }
@ -667,11 +667,11 @@ pap_range( delta, origin, radius ) //checked changed to match cerberus output
if ( isDefined( self.target ) ) if ( isDefined( self.target ) )
{ {
paporigin = self.target.origin; paporigin = self.target.origin;
if ( isDefined( self.target.trigger_off ) && self.target.trigger_off ) if ( is_true( self.target.trigger_off ) )
{ {
paporigin = self.target.realorigin; paporigin = self.target.realorigin;
} }
else if ( isDefined( self.target.disabled ) && self.target.disabled ) else if ( is_true( self.target.disabled ) )
{ {
paporigin += vectorScale( ( 0, 0, 1 ), 10000 ); paporigin += vectorScale( ( 0, 0, 1 ), 10000 );
} }

40
patch_zm/maps/mp/zombies/_zm_powerups.gsc
View File

@ -66,7 +66,7 @@ init() //checked matches cerberus output
level._effect[ "powerup_off" ] = loadfx( "misc/fx_zombie_powerup_off" ); level._effect[ "powerup_off" ] = loadfx( "misc/fx_zombie_powerup_off" );
level._effect[ "powerup_grabbed" ] = loadfx( "misc/fx_zombie_powerup_grab" ); level._effect[ "powerup_grabbed" ] = loadfx( "misc/fx_zombie_powerup_grab" );
level._effect[ "powerup_grabbed_wave" ] = loadfx( "misc/fx_zombie_powerup_wave" ); level._effect[ "powerup_grabbed_wave" ] = loadfx( "misc/fx_zombie_powerup_wave" );
if ( isDefined( level.using_zombie_powerups ) && level.using_zombie_powerups ) if ( is_true( level.using_zombie_powerups ) )
{ {
level._effect[ "powerup_on_red" ] = loadfx( "misc/fx_zombie_powerup_on_red" ); level._effect[ "powerup_on_red" ] = loadfx( "misc/fx_zombie_powerup_on_red" );
level._effect[ "powerup_grabbed_red" ] = loadfx( "misc/fx_zombie_powerup_red_grab" ); level._effect[ "powerup_grabbed_red" ] = loadfx( "misc/fx_zombie_powerup_red_grab" );
@ -93,7 +93,7 @@ init() //checked matches cerberus output
init_powerups() //checked matches cerberus output init_powerups() //checked matches cerberus output
{ {
flag_init( "zombie_drop_powerups" ); flag_init( "zombie_drop_powerups" );
if ( isDefined( level.enable_magic ) && level.enable_magic ) if ( is_true( level.enable_magic ) )
{ {
flag_set( "zombie_drop_powerups" ); flag_set( "zombie_drop_powerups" );
} }
@ -980,7 +980,7 @@ powerup_grab(powerup_team) //checked partially changed to match cerberus output
i++; i++;
continue; continue;
} }
if ( isdefined( self.can_pick_up_in_last_stand ) && !self.can_pick_up_in_last_stand && players[ i ] maps/mp/zombies/_zm_laststand::player_is_in_laststand() ) if ( !is_true( self.can_pick_up_in_last_stand ) && players[ i ] maps/mp/zombies/_zm_laststand::player_is_in_laststand() )
{ {
i++; i++;
continue; continue;
@ -1114,7 +1114,7 @@ powerup_grab(powerup_team) //checked partially changed to match cerberus output
playfx( level._effect[ "powerup_grabbed_wave" ], self.origin ); playfx( level._effect[ "powerup_grabbed_wave" ], self.origin );
} }
if ( isdefined( self.stolen ) && self.stolen ) if ( is_true( self.stolen ) )
{ {
level notify( "monkey_see_monkey_dont_achieved" ); level notify( "monkey_see_monkey_dont_achieved" );
} }
@ -1479,12 +1479,12 @@ nuke_powerup( drop_item, player_team ) //checked changed to match cerberus outpu
i = 0; i = 0;
while ( i < zombies.size ) while ( i < zombies.size )
{ {
if ( isdefined( zombies[ i ].ignore_nuke ) && zombies[ i ].ignore_nuke ) if ( is_true( zombies[ i ].ignore_nuke ) )
{ {
i++; i++;
continue; continue;
} }
if ( isdefined( zombies[ i ].marked_for_death ) && zombies[ i ].marked_for_death ) if ( is_true( zombies[ i ].marked_for_death ) )
{ {
i++; i++;
continue; continue;
@ -1529,7 +1529,7 @@ nuke_powerup( drop_item, player_team ) //checked changed to match cerberus outpu
} }
if ( !zombies_nuked[ i ].isdog ) if ( !zombies_nuked[ i ].isdog )
{ {
if ( isdefined( zombies_nuked[ i ].no_gib ) && !zombies_nuked[ i ].no_gib ) if ( !is_true( zombies_nuked[ i ].no_gib ) )
{ {
zombies_nuked[ i ] maps/mp/zombies/_zm_spawner::zombie_head_gib(); zombies_nuked[ i ] maps/mp/zombies/_zm_spawner::zombie_head_gib();
} }
@ -1578,7 +1578,7 @@ double_points_powerup( drop_item, player ) //checked partially matches cerberus
level endon( "powerup points scaled_" + player.team ); level endon( "powerup points scaled_" + player.team );
team = player.team; team = player.team;
level thread point_doubler_on_hud( drop_item, team ); level thread point_doubler_on_hud( drop_item, team );
if ( isDefined( level.pers_upgrade_double_points ) && level.pers_upgrade_double_points ) if ( is_true( level.pers_upgrade_double_points ) )
{ {
player thread maps/mp/zombies/_zm_pers_upgrades_functions::pers_upgrade_double_points_pickup_start(); player thread maps/mp/zombies/_zm_pers_upgrades_functions::pers_upgrade_double_points_pickup_start();
} }
@ -1727,7 +1727,7 @@ check_for_instakill( player, mod, hit_location ) //checked changed to match cerb
self dodamage( self.health + 666, self.origin, player, self, hit_location, modname ); self dodamage( self.health + 666, self.origin, player, self, hit_location, modname );
player notify( "zombie_killed" ); player notify( "zombie_killed" );
} }
if ( isDefined( player ) && isalive( player ) && level.zombie_vars[ player.team ][ "zombie_insta_kill" ] || isDefined( player.personal_instakill ) && player.personal_instakill ) if ( isDefined( player ) && isalive( player ) && level.zombie_vars[ player.team ][ "zombie_insta_kill" ] || is_true( player.personal_instakill ) )
{ {
if ( is_magic_bullet_shield_enabled( self ) ) if ( is_magic_bullet_shield_enabled( self ) )
{ {
@ -1984,11 +1984,11 @@ setup_firesale_audio() //checked changed to match cerberus output
play_firesale_audio() //checked matches cerberus output play_firesale_audio() //checked matches cerberus output
{ {
if ( isDefined( level.sndfiresalemusoff ) && level.sndfiresalemusoff ) if ( is_true( level.sndfiresalemusoff ) )
{ {
return; return;
} }
if ( isDefined( level.sndannouncerisrich ) && level.sndannouncerisrich ) if ( is_true( level.sndannouncerisrich ) )
{ {
self playloopsound( "mus_fire_sale_rich" ); self playloopsound( "mus_fire_sale_rich" );
} }
@ -2024,11 +2024,11 @@ setup_bonfiresale_audio() //checked changed to match cerberus output
play_bonfiresale_audio() //checked matches cerberus output play_bonfiresale_audio() //checked matches cerberus output
{ {
if ( isDefined( level.sndfiresalemusoff ) && level.sndfiresalemusoff ) if ( is_true( level.sndfiresalemusoff ) )
{ {
return; return;
} }
if ( isDefined( level.sndannouncerisrich ) && level.sndannouncerisrich ) if ( is_true( level.sndannouncerisrich ) )
{ {
self playloopsound( "mus_fire_sale_rich" ); self playloopsound( "mus_fire_sale_rich" );
} }
@ -2055,7 +2055,7 @@ free_perk_powerup( item ) //checked changed to match cerberus output
player notify( "player_received_ghost_round_free_perk" ); player notify( "player_received_ghost_round_free_perk" );
} }
free_perk = player maps/mp/zombies/_zm_perks::give_random_perk(); free_perk = player maps/mp/zombies/_zm_perks::give_random_perk();
if ( isDefined( level.disable_free_perks_before_power ) && level.disable_free_perks_before_power ) if ( is_true( level.disable_free_perks_before_power ) )
{ {
player thread disable_perk_before_power( free_perk ); player thread disable_perk_before_power( free_perk );
} }
@ -2096,7 +2096,7 @@ random_weapon_powerup( item, player ) //checked partially matches cerberus outpu
{ {
return 0; return 0;
} }
if ( isDefined( player.random_weapon_powerup_throttle ) && !player.random_weapon_powerup_throttle || player isswitchingweapons() && player.is_drinking > 0 ) if ( !is_true( player.random_weapon_powerup_throttle ) || player isswitchingweapons() && player.is_drinking > 0 )
{ {
return 0; return 0;
} }
@ -2224,7 +2224,7 @@ minigun_weapon_powerup( ent_player, time ) //checked matches cerberus output
{ {
time = level._minigun_time_override; time = level._minigun_time_override;
} }
if ( ent_player.zombie_vars[ "zombie_powerup_minigun_on" ] || ent_player getcurrentweapon() == "minigun_zm" && isDefined( ent_player.has_minigun ) && ent_player.has_minigun ) if ( ent_player.zombie_vars[ "zombie_powerup_minigun_on" ] || ent_player getcurrentweapon() == "minigun_zm" && is_true( ent_player.has_minigun ) )
{ {
if ( ent_player.zombie_vars[ "zombie_powerup_minigun_time" ] < time ) if ( ent_player.zombie_vars[ "zombie_powerup_minigun_time" ] < time )
{ {
@ -2327,7 +2327,7 @@ minigun_weapon_powerup_off() //checked matches cerberus output
minigun_watch_gunner_downed() //checked partially matches cerberus output did not change minigun_watch_gunner_downed() //checked partially matches cerberus output did not change
{ {
if ( isDefined( self.has_minigun ) && !self.has_minigun ) if ( !is_true( self.has_minigun ) )
{ {
return; return;
} }
@ -2356,7 +2356,7 @@ tesla_weapon_powerup( ent_player, time ) //checked changed to match cerberus out
{ {
time = 11; time = 11;
} }
if ( ent_player.zombie_vars[ "zombie_powerup_tesla_on" ] && ent_player getcurrentweapon() == "tesla_gun_zm" || isDefined( ent_player.has_tesla ) && ent_player.has_tesla ) if ( ent_player.zombie_vars[ "zombie_powerup_tesla_on" ] && ent_player getcurrentweapon() == "tesla_gun_zm" || is_true( ent_player.has_tesla ) )
{ {
ent_player givemaxammo( "tesla_gun_zm" ); ent_player givemaxammo( "tesla_gun_zm" );
if ( ent_player.zombie_vars[ "zombie_powerup_tesla_time" ] < time ) if ( ent_player.zombie_vars[ "zombie_powerup_tesla_time" ] < time )
@ -2475,7 +2475,7 @@ tesla_weapon_powerup_off() //checked matches cerberus output
tesla_watch_gunner_downed() //checked changed to match cerberus output tesla_watch_gunner_downed() //checked changed to match cerberus output
{ {
if ( isDefined( self.has_tesla ) && !self.has_tesla ) if ( !is_true( self.has_tesla ) )
{ {
return; return;
} }
@ -2792,7 +2792,7 @@ func_should_drop_carpenter() //checked matches cerberus output
func_should_drop_fire_sale() //checked partially changed to match cerberus output func_should_drop_fire_sale() //checked partially changed to match cerberus output
{ {
if ( level.zombie_vars[ "zombie_powerup_fire_sale_on" ] == 1 || level.chest_moves < 1 || isDefined( level.disable_firesale_drop ) && level.disable_firesale_drop ) if ( level.zombie_vars[ "zombie_powerup_fire_sale_on" ] == 1 || level.chest_moves < 1 || is_true( level.disable_firesale_drop ) )
{ {
return 0; return 0;
} }

57
patch_zm/maps/mp/zombies/_zm_spawner.gsc
View File

@ -32,7 +32,7 @@ init() //checked changed to match cerberus output
//end debug code //end debug code
level._contextual_grab_lerp_time = 0.3; level._contextual_grab_lerp_time = 0.3;
level.zombie_spawners = getentarray( "zombie_spawner", "script_noteworthy" ); level.zombie_spawners = getentarray( "zombie_spawner", "script_noteworthy" );
if ( isDefined( level.use_multiple_spawns ) && level.use_multiple_spawns ) if ( is_true( level.use_multiple_spawns ) )
{ {
level.zombie_spawn = []; level.zombie_spawn = [];
for ( i = 0; i < level.zombie_spawners.size; i++ ) for ( i = 0; i < level.zombie_spawners.size; i++ )
@ -256,7 +256,7 @@ zombie_spawn_init( animname_set ) //checked partially changed to match cerberus
self thread [[ level._zombie_custom_spawn_logic ]](); self thread [[ level._zombie_custom_spawn_logic ]]();
} }
} }
if ( !isDefined( self.no_eye_glow ) || !self.no_eye_glow ) if ( !is_true( self.no_eye_glow ) )
{ {
if ( !is_true( self.is_inert ) ) //imported from beta dump if ( !is_true( self.is_inert ) ) //imported from beta dump
{ {
@ -553,7 +553,7 @@ zombie_goto_entrance( node, endon_bad_path ) //checked matches cerberus output
self endon( "stop_zombie_goto_entrance" ); self endon( "stop_zombie_goto_entrance" );
level endon( "intermission" ); level endon( "intermission" );
self.ai_state = "zombie_goto_entrance"; self.ai_state = "zombie_goto_entrance";
if ( isDefined( endon_bad_path ) && endon_bad_path ) if ( is_true( endon_bad_path ) )
{ {
self endon( "bad_path" ); self endon( "bad_path" );
} }
@ -760,7 +760,7 @@ tear_into_building() //checked changed to match cerberus output
if ( !all_chunks_destroyed( self.first_node, self.first_node.barrier_chunks ) ) if ( !all_chunks_destroyed( self.first_node, self.first_node.barrier_chunks ) )
{ {
attack = self should_attack_player_thru_boards(); attack = self should_attack_player_thru_boards();
if ( isDefined( attack ) && !attack && self.has_legs ) if ( !is_true( attack ) && self.has_legs )
{ {
self do_a_taunt(); self do_a_taunt();
} }
@ -804,7 +804,7 @@ tear_into_building() //checked changed to match cerberus output
self zombie_tear_notetracks( "tear_anim", chunk, self.first_node ); self zombie_tear_notetracks( "tear_anim", chunk, self.first_node );
self.lastchunk_destroy_time = getTime(); self.lastchunk_destroy_time = getTime();
attack = self should_attack_player_thru_boards(); attack = self should_attack_player_thru_boards();
if ( isDefined( attack ) && !attack && self.has_legs ) if ( !is_true( attack ) && self.has_legs )
{ {
self do_a_taunt(); self do_a_taunt();
} }
@ -1299,7 +1299,7 @@ zombie_hat_gib( attacker, means_of_death ) //checked matches cerberus output
{ {
return 0; return 0;
} }
if ( isDefined( self.hat_gibbed ) && self.hat_gibbed ) if ( is_true( self.hat_gibbed ) )
{ {
return; return;
} }
@ -1354,7 +1354,7 @@ zombie_head_gib( attacker, means_of_death ) //checked changed to match cerberus
} }
temp_array = []; temp_array = [];
temp_array[ 0 ] = level._zombie_gib_piece_index_head; temp_array[ 0 ] = level._zombie_gib_piece_index_head;
if ( isDefined( self.hat_gibbed ) && !self.hat_gibbed && isDefined( self.gibspawn5 ) && isDefined( self.gibspawntag5 ) ) if ( !is_true( self.hat_gibbed ) && isDefined( self.gibspawn5 ) && isDefined( self.gibspawntag5 ) )
{ {
temp_array[ 1 ] = level._zombie_gib_piece_index_hat; temp_array[ 1 ] = level._zombie_gib_piece_index_hat;
} }
@ -1752,7 +1752,7 @@ zombie_can_drop_powerups( zombie ) //checked matches cerberus output
{ {
return 0; return 0;
} }
if ( isDefined( zombie.no_powerups ) && zombie.no_powerups ) if ( is_true( zombie.no_powerups ) )
{ {
return 0; return 0;
} }
@ -1984,7 +1984,7 @@ damage_on_fire( player ) //checked matches cerberus output
self endon( "death" ); self endon( "death" );
self endon( "stop_flame_damage" ); self endon( "stop_flame_damage" );
wait 2; wait 2;
while ( isDefined( self.is_on_fire ) && self.is_on_fire ) while ( is_true( self.is_on_fire ) )
{ {
if ( level.round_number < 6 ) if ( level.round_number < 6 )
{ {
@ -2066,7 +2066,7 @@ zombie_damage( mod, hit_location, hit_origin, player, amount, team ) //checked c
{ {
damage_type = "damage_light"; damage_type = "damage_light";
} }
if ( !is_true self.no_damage_points ) ) if ( !is_true( self.no_damage_points ) )
{ {
player maps/mp/zombies/_zm_score::player_add_points( damage_type, mod, hit_location, self.isdog, team, self.damageweapon ); player maps/mp/zombies/_zm_score::player_add_points( damage_type, mod, hit_location, self.isdog, team, self.damageweapon );
} }
@ -2226,7 +2226,7 @@ zombie_flame_damage( mod, player ) //checked changed to match cerberus output
{ {
if ( mod == "MOD_BURNED" ) if ( mod == "MOD_BURNED" )
{ {
if ( !isDefined( self.is_on_fire ) || isDefined( self.is_on_fire ) && !self.is_on_fire ) if ( !is_true( self.is_on_fire ) )
{ {
self thread damage_on_fire( player ); self thread damage_on_fire( player );
} }
@ -2283,11 +2283,11 @@ zombie_death_event( zombie ) //checked changed to match cerberus output
} }
if ( isDefined( attacker ) && isplayer( attacker ) ) if ( isDefined( attacker ) && isplayer( attacker ) )
{ {
if ( isDefined( level.pers_upgrade_carpenter ) && level.pers_upgrade_carpenter ) if ( is_true( level.pers_upgrade_carpenter ) )
{ {
maps/mp/zombies/_zm_pers_upgrades::pers_zombie_death_location_check( attacker, zombie.origin ); maps/mp/zombies/_zm_pers_upgrades::pers_zombie_death_location_check( attacker, zombie.origin );
} }
if ( isDefined( level.pers_upgrade_sniper ) && level.pers_upgrade_sniper ) if ( is_true( level.pers_upgrade_sniper ) )
{ {
attacker pers_upgrade_sniper_kill_check( zombie, attacker ); attacker pers_upgrade_sniper_kill_check( zombie, attacker );
} }
@ -2321,9 +2321,18 @@ zombie_death_event( zombie ) //checked changed to match cerberus output
} }
attacker maps/mp/zombies/_zm::add_rampage_bookmark_kill_time(); attacker maps/mp/zombies/_zm::add_rampage_bookmark_kill_time();
attacker.kills++; attacker.kills++;
//modified for grief gun game
if ( level.griefGunGame )
{
level.gunGameData[ attacker.team ].totalKills++;
if ( level.gunGameData[ attacker.team ].totalKills >= level.gunGameData[ attacker.team ].nextKillGoal )
{
level notify( "gunGameKillGoalReached", attacker.team );
}
}
attacker maps/mp/zombies/_zm_stats::increment_client_stat( "kills" ); attacker maps/mp/zombies/_zm_stats::increment_client_stat( "kills" );
attacker maps/mp/zombies/_zm_stats::increment_player_stat( "kills" ); attacker maps/mp/zombies/_zm_stats::increment_player_stat( "kills" );
if ( isDefined( level.pers_upgrade_pistol_points ) && level.pers_upgrade_pistol_points ) if ( is_true( level.pers_upgrade_pistol_points ) )
{ {
attacker maps/mp/zombies/_zm_pers_upgrades_functions::pers_upgrade_pistol_points_kill(); attacker maps/mp/zombies/_zm_pers_upgrades_functions::pers_upgrade_pistol_points_kill();
} }
@ -2337,7 +2346,7 @@ zombie_death_event( zombie ) //checked changed to match cerberus output
{ {
zombie maps/mp/zombies/_zm_spawner::zombie_head_gib(); zombie maps/mp/zombies/_zm_spawner::zombie_head_gib();
} }
if ( isDefined( level.pers_upgrade_nube ) && level.pers_upgrade_nube ) if ( is_true( level.pers_upgrade_nube ) )
{ {
attacker notify( "pers_player_zombie_kill" ); attacker notify( "pers_player_zombie_kill" );
} }
@ -2796,7 +2805,7 @@ zombie_eye_glow() //checked matches cerberus output
{ {
return; return;
} }
if ( !isDefined( self.no_eye_glow ) || !self.no_eye_glow ) if ( !is_true( self.no_eye_glow ) )
{ {
self setclientfield( "zombie_has_eyes", 1 ); self setclientfield( "zombie_has_eyes", 1 );
} }
@ -2808,7 +2817,7 @@ zombie_eye_glow_stop() //checked matches cerberus output
{ {
return; return;
} }
if ( !isDefined( self.no_eye_glow ) || !self.no_eye_glow ) if ( !is_true( self.no_eye_glow ) )
{ {
self setclientfield( "zombie_has_eyes", 0 ); self setclientfield( "zombie_has_eyes", 0 );
} }
@ -2856,7 +2865,7 @@ do_zombie_spawn() //checked changed to match cerberus output
i = 0; i = 0;
while ( i < level.zombie_spawn_locations.size ) while ( i < level.zombie_spawn_locations.size )
{ {
if ( isDefined( level.use_multiple_spawns ) && level.use_multiple_spawns && isDefined( self.script_int ) ) if ( is_true( level.use_multiple_spawns ) && isDefined( self.script_int ) )
{ {
if ( isDefined( level.spawner_int ) && self.script_int == level.spawner_int && ( !isDefined( level.zombie_spawn_locations[ i ].script_int ) || !isDefined( level.zones[ level.zombie_spawn_locations[ i ].zone_name ].script_int ) ) ) if ( isDefined( level.spawner_int ) && self.script_int == level.spawner_int && ( !isDefined( level.zombie_spawn_locations[ i ].script_int ) || !isDefined( level.zones[ level.zombie_spawn_locations[ i ].zone_name ].script_int ) ) )
{ {
@ -2922,7 +2931,7 @@ do_zombie_spawn() //checked changed to match cerberus output
self.spawn_point = spot; self.spawn_point = spot;
/* /*
/# /#
if ( isDefined( level.toggle_show_spawn_locations ) && level.toggle_show_spawn_locations ) if ( is_true( level.toggle_show_spawn_locations ) )
{ {
debugstar( spot.origin, getDvarInt( #"BB9101B2" ), ( 0, 0, 0 ) ); debugstar( spot.origin, getDvarInt( #"BB9101B2" ), ( 0, 0, 0 ) );
host_player = gethostplayer(); host_player = gethostplayer();
@ -3009,11 +3018,6 @@ do_zombie_spawn() //checked changed to match cerberus output
if ( isdefined(self.anchor ) ) if ( isdefined(self.anchor ) )
{ {
i++; i++;
if ( ( level.errorDisplayLevel == 0 || level.errorDisplayLevel == 3 ) && level.debugLogging_zm_spawner )
{
logline4 = "INFO: _zm_spawner.gsc do_zombie_spawn() self.anchor is defined; returning" + "\n";
logprint( logline4 );
}
return; return;
} }
self.anchor = spawn( "script_origin", self.origin ); self.anchor = spawn( "script_origin", self.origin );
@ -3046,11 +3050,6 @@ do_zombie_spawn() //checked changed to match cerberus output
self notify( "risen", spot.script_string ); self notify( "risen", spot.script_string );
i++; i++;
} }
if ( ( level.errorDisplayLevel == 0 || level.errorDisplayLevel == 3 ) && level.debugLogging_zm_spawner )
{
logline4 = "INFO: _zm_spawner.gsc do_zombie_spawn() has completed its operation" + "\n";
logprint( logline4 );
}
} }
do_zombie_rise( spot ) //checked changed to match cerberus output do_zombie_rise( spot ) //checked changed to match cerberus output

16
patch_zm/maps/mp/zombies/_zm_tombstone.gsc
View File

@ -13,7 +13,7 @@ init() //checked matches cerberus output
level.tombstone_laststand_func = ::tombstone_laststand; level.tombstone_laststand_func = ::tombstone_laststand;
level.tombstone_spawn_func = ::tombstone_spawn; level.tombstone_spawn_func = ::tombstone_spawn;
level thread tombstone_hostmigration(); level thread tombstone_hostmigration();
if ( isDefined( level.zombiemode_using_tombstone_perk ) && level.zombiemode_using_tombstone_perk ) if ( is_true( level.zombiemode_using_tombstone_perk ) )
{ {
add_custom_limited_weapon_check( ::is_weapon_available_in_tombstone ); add_custom_limited_weapon_check( ::is_weapon_available_in_tombstone );
} }
@ -69,7 +69,7 @@ tombstone_revived( player ) //checked changed to match cerberus output
shown = 1; shown = 1;
while ( isDefined( self ) && isDefined( player ) ) while ( isDefined( self ) && isDefined( player ) )
{ {
if ( isDefined( player.revivetrigger ) && isDefined( player.revivetrigger.beingrevived ) && player.revivetrigger.beingrevived ) if ( isDefined( player.revivetrigger ) && is_true( player.revivetrigger.beingrevived ) )
{ {
if ( shown ) if ( shown )
{ {
@ -103,7 +103,7 @@ tombstone_laststand() //checked changed to match cerberus output
dc.current_weapon = index; dc.current_weapon = index;
} }
} }
if ( isDefined( self.hasriotshield ) && self.hasriotshield ) if ( is_true( self.hasriotshield ) )
{ {
dc.hasriotshield = 1; dc.hasriotshield = 1;
} }
@ -189,7 +189,7 @@ tombstone_grab() //checked partially changed to match cerberus output
istombstonepowered = 0; istombstonepowered = 0;
foreach ( trigger in tombstone_machine_triggers ) foreach ( trigger in tombstone_machine_triggers )
{ {
if ( isdefined( trigger.power_on ) && trigger.power_on || isdefined( trigger.turbine_power_on ) && trigger.turbine_power_on ) if ( is_true( trigger.power_on ) || is_true( trigger.turbine_power_on ) )
{ {
istombstonepowered = 1; istombstonepowered = 1;
} }
@ -261,7 +261,7 @@ tombstone_give() //checked partially changed to match cerberus output
i++; i++;
} }
} }
if ( isDefined( dc.hasriotshield ) && dc.hasriotshield ) if ( is_true( dc.hasriotshield ) )
{ {
self maps/mp/zombies/_zm_equipment::equipment_give( "riotshield_zm" ); self maps/mp/zombies/_zm_equipment::equipment_give( "riotshield_zm" );
if ( isDefined( self.player_shield_reset_health ) ) if ( isDefined( self.player_shield_reset_health ) )
@ -270,14 +270,14 @@ tombstone_give() //checked partially changed to match cerberus output
} }
} }
dc restore_weapons_for_tombstone( self ); dc restore_weapons_for_tombstone( self );
if ( isDefined( dc.hasclaymore ) && dc.hasclaymore && !self hasweapon( "claymore_zm" ) ) if ( is_true( dc.hasclaymore ) && !self hasweapon( "claymore_zm" ) )
{ {
self giveweapon( "claymore_zm" ); self giveweapon( "claymore_zm" );
self set_player_placeable_mine( "claymore_zm" ); self set_player_placeable_mine( "claymore_zm" );
self setactionslot( 4, "weapon", "claymore_zm" ); self setactionslot( 4, "weapon", "claymore_zm" );
self setweaponammoclip( "claymore_zm", dc.claymoreclip ); self setweaponammoclip( "claymore_zm", dc.claymoreclip );
} }
if ( isDefined( dc.hasemp ) && dc.hasemp ) if ( is_true( dc.hasemp ) )
{ {
self giveweapon( "emp_grenade_zm" ); self giveweapon( "emp_grenade_zm" );
self setweaponammoclip( "emp_grenade_zm", dc.empclip ); self setweaponammoclip( "emp_grenade_zm", dc.empclip );
@ -432,7 +432,7 @@ restore_weapon_for_tombstone( player, weapon_name ) //checked changed to match c
{ {
return; return;
} }
if ( isDefined( self.tombstone_melee_weapons[ weapon_name ] ) && self.tombstone_melee_weapons[ weapon_name ] ) if ( is_true( self.tombstone_melee_weapons[ weapon_name ] ) )
{ {
player giveweapon( weapon_name ); player giveweapon( weapon_name );
player change_melee_weapon( weapon_name, "none" ); player change_melee_weapon( weapon_name, "none" );

2
patch_zm/maps/mp/zombies/_zm_traps.gsc
View File

@ -668,7 +668,7 @@ play_elec_vocals() //checked matches cerberus output
electroctute_death_fx() //checked matches cerberus output electroctute_death_fx() //checked matches cerberus output
{ {
self endon( "death" ); self endon( "death" );
if ( isDefined( self.is_electrocuted ) && self.is_electrocuted ) if ( is_true( self.is_electrocuted ) )
{ {
return; return;
} }

32
patch_zm/maps/mp/zombies/_zm_turned.gsc
View File

@ -13,7 +13,7 @@ init() //checked matches cerberus output
level.turnedmeleeweapon_dw = "zombiemelee_dw"; level.turnedmeleeweapon_dw = "zombiemelee_dw";
precacheitem( level.turnedmeleeweapon ); precacheitem( level.turnedmeleeweapon );
precacheitem( level.turnedmeleeweapon_dw ); precacheitem( level.turnedmeleeweapon_dw );
if ( isDefined( level.custom_zombie_player_loadout_init ) && !level.custom_zombie_player_loadout_init ) if ( !is_true( level.custom_zombie_player_loadout_init ) )
{ {
precachemodel( "c_zom_player_zombie_fb" ); precachemodel( "c_zom_player_zombie_fb" );
precachemodel( "c_zom_zombie_viewhands" ); precachemodel( "c_zom_zombie_viewhands" );
@ -50,15 +50,15 @@ delay_turning_on_eyes() //checked matches cerberus output
turn_to_zombie() //checked changed to match cerberus output turn_to_zombie() //checked changed to match cerberus output
{ {
if ( self.sessionstate == "playing" && isDefined( self.is_zombie ) && self.is_zombie && isDefined( self.laststand ) && !self.laststand ) if ( self.sessionstate == "playing" && is_true( self.is_zombie ) && !is_true( self.laststand ) )
{ {
return; return;
} }
if ( isDefined( self.is_in_process_of_zombify ) && self.is_in_process_of_zombify ) if ( is_true( self.is_in_process_of_zombify ) )
{ {
return; return;
} }
while ( isDefined( self.is_in_process_of_humanify ) && self.is_in_process_of_humanify ) while ( is_true( self.is_in_process_of_humanify ) )
{ {
wait 0.1; wait 0.1;
} }
@ -86,7 +86,7 @@ turn_to_zombie() //checked changed to match cerberus output
self freezecontrols( 1 ); self freezecontrols( 1 );
self.is_zombie = 1; self.is_zombie = 1;
self setburn( 0 ); self setburn( 0 );
if ( isDefined( self.turned_visionset ) && self.turned_visionset ) if ( is_true( self.turned_visionset ) )
{ {
maps/mp/_visionset_mgr::vsmgr_deactivate( "visionset", "zm_turned", self ); maps/mp/_visionset_mgr::vsmgr_deactivate( "visionset", "zm_turned", self );
wait_network_frame(); wait_network_frame();
@ -159,15 +159,15 @@ turn_to_zombie() //checked changed to match cerberus output
turn_to_human() //checked changed to match cerberus output turn_to_human() //checked changed to match cerberus output
{ {
if ( self.sessionstate == "playing" && isDefined( self.is_zombie ) && !self.is_zombie && isDefined( self.laststand ) && !self.laststand ) if ( self.sessionstate == "playing" && !is_true( self.is_zombie ) && !is_true( self.laststand ) )
{ {
return; return;
} }
if ( isDefined( self.is_in_process_of_humanify ) && self.is_in_process_of_humanify ) if ( is_true( self.is_in_process_of_humanify ) )
{ {
return; return;
} }
while ( isDefined( self.is_in_process_of_zombify ) && self.is_in_process_of_zombify ) while ( is_true( self.is_in_process_of_zombify ) )
{ {
wait 0.1; wait 0.1;
} }
@ -230,7 +230,7 @@ turn_to_human() //checked changed to match cerberus output
{ {
self freezecontrols( level.player_movement_suppressed ); self freezecontrols( level.player_movement_suppressed );
} }
else if ( isDefined( self.hostmigrationcontrolsfrozen ) && !self.hostmigrationcontrolsfrozen ) else if ( !is_true( self.hostmigrationcontrolsfrozen ) )
{ {
self freezecontrols( 0 ); self freezecontrols( 0 );
} }
@ -245,7 +245,7 @@ deletezombiesinradius( origin ) //checked changed to match cerberus output
maxradius = 128; maxradius = 128;
foreach ( zombie in zombies ) foreach ( zombie in zombies )
{ {
if ( isDefined( zombie ) && isalive( zombie ) && isDefined( zombie.is_being_used_as_spawner ) && !zombie.is_being_used_as_spawner ) if ( isDefined( zombie ) && isalive( zombie ) && !is_true( zombie.is_being_used_as_spawner ) )
{ {
if ( distancesquared( zombie.origin, origin ) < ( maxradius * maxradius ) ) if ( distancesquared( zombie.origin, origin ) < ( maxradius * maxradius ) )
{ {
@ -268,7 +268,7 @@ turned_give_melee_weapon() //checked matches cerberus output
#/ #/
*/ */
self.turned_had_knife = self hasweapon( "knife_zm" ); self.turned_had_knife = self hasweapon( "knife_zm" );
if ( isDefined( self.turned_had_knife ) && self.turned_had_knife ) if ( is_true( self.turned_had_knife ) )
{ {
self takeweapon( "knife_zm" ); self takeweapon( "knife_zm" );
} }
@ -285,7 +285,7 @@ turned_player_buttons() //checked changed to match cerberus output
self endon( "disconnect" ); self endon( "disconnect" );
self endon( "humanify" ); self endon( "humanify" );
level endon( "end_game" ); level endon( "end_game" );
while ( isDefined( self.is_zombie ) && self.is_zombie ) while ( is_true( self.is_zombie ) )
{ {
if ( self attackbuttonpressed() || self adsbuttonpressed() || self meleebuttonpressed() ) if ( self attackbuttonpressed() || self adsbuttonpressed() || self meleebuttonpressed() )
{ {
@ -320,7 +320,7 @@ turned_player_buttons() //checked changed to match cerberus output
turned_disable_player_weapons() //checked matches cerberus output turned_disable_player_weapons() //checked matches cerberus output
{ {
if ( isDefined( self.is_zombie ) && self.is_zombie ) if ( is_true( self.is_zombie ) )
{ {
return; return;
} }
@ -357,7 +357,7 @@ turned_enable_player_weapons() //checked changed to match cerberus output
self giveweapon( "rottweil72_zm" ); self giveweapon( "rottweil72_zm" );
self switchtoweapon( "rottweil72_zm" ); self switchtoweapon( "rottweil72_zm" );
} }
if ( isDefined( self.is_zombie ) && !self.is_zombie && !self hasweapon( level.start_weapon ) ) if ( !is_true( self.is_zombie ) && !self hasweapon( level.start_weapon ) )
{ {
if ( !self hasweapon( "knife_zm" ) ) if ( !self hasweapon( "knife_zm" ) )
{ {
@ -393,7 +393,7 @@ get_farthest_available_zombie( player ) //checked changed to match cerberus outp
for ( x = 0; x < zombies.size; x++ ) for ( x = 0; x < zombies.size; x++ )
{ {
zombie = zombies[ x ]; zombie = zombies[ x ];
if ( isDefined( zombie ) && isalive( zombie ) && isDefined( zombie.in_the_ground ) && !zombie.in_the_ground && isDefined( zombie.gibbed ) && !zombie.gibbed && isDefined( zombie.head_gibbed ) && !zombie.head_gibbed && isDefined( zombie.is_being_used_as_spawnpoint ) && !zombie.is_being_used_as_spawnpoint && zombie in_playable_area() ) if ( isDefined( zombie ) && isalive( zombie ) && !is_true( zombie.in_the_ground ) && !is_true( zombie.gibbed ) && !is_true( zombie.head_gibbed ) && !is_true( zombie.is_being_used_as_spawnpoint ) && zombie in_playable_area() )
{ {
zombie.is_being_used_as_spawnpoint = 1; zombie.is_being_used_as_spawnpoint = 1;
return zombie; return zombie;
@ -408,7 +408,7 @@ get_available_human() //checked changed to match cerberus output
players = get_players(); players = get_players();
foreach ( player in players ) foreach ( player in players )
{ {
if ( isDefined( player.is_zombie ) && !player.is_zombie ) if ( !is_true( player.is_zombie ) )
{ {
return player; return player;
} }

22
patch_zm/maps/mp/zombies/_zm_unitrigger.gsc
View File

@ -162,7 +162,7 @@ unregister_unitrigger_internal( unitrigger_stub ) //checked changed to match cer
return; return;
} }
unitrigger_stub.registered = 0; unitrigger_stub.registered = 0;
if ( isDefined( unitrigger_stub.trigger_per_player ) && unitrigger_stub.trigger_per_player ) if ( is_true( unitrigger_stub.trigger_per_player ) )
{ {
if ( isDefined( unitrigger_stub.playertrigger ) && unitrigger_stub.playertrigger.size > 0 ) if ( isDefined( unitrigger_stub.playertrigger ) && unitrigger_stub.playertrigger.size > 0 )
{ {
@ -320,7 +320,7 @@ debug_unitriggers() //checked changed to match cerberus output dvar taken from b
cleanup_trigger( trigger, player ) //checked changed to match cerberus output cleanup_trigger( trigger, player ) //checked changed to match cerberus output
{ {
trigger notify( "kill_trigger" ); trigger notify( "kill_trigger" );
if ( isDefined( trigger.stub.trigger_per_player ) && trigger.stub.trigger_per_player ) if ( is_true( trigger.stub.trigger_per_player ) )
{ {
trigger.stub.playertrigger[player getentitynumber()] = undefined; trigger.stub.playertrigger[player getentitynumber()] = undefined;
} }
@ -342,7 +342,7 @@ assess_and_apply_visibility( trigger, stub, player, default_keep ) //checked cha
if ( !isDefined( stub.prompt_and_visibility_func ) || trigger [[ stub.prompt_and_visibility_func ]]( player ) ) if ( !isDefined( stub.prompt_and_visibility_func ) || trigger [[ stub.prompt_and_visibility_func ]]( player ) )
{ {
keep_thread = 1; keep_thread = 1;
if ( isDefined( trigger.thread_running ) && !trigger.thread_running ) if ( !is_true( trigger.thread_running ) )
{ {
trigger thread trigger_thread( trigger.stub.trigger_func ); trigger thread trigger_thread( trigger.stub.trigger_func );
} }
@ -352,7 +352,7 @@ assess_and_apply_visibility( trigger, stub, player, default_keep ) //checked cha
trigger.reassess_time = undefined; trigger.reassess_time = undefined;
} }
} }
else if ( isDefined( trigger.thread_running ) && trigger.thread_running ) else if ( is_true( trigger.thread_running ) )
{ {
keep_thread = 0; keep_thread = 0;
} }
@ -435,7 +435,7 @@ main() //checked against bo3 _zm_unitrigger.gsc and cerberus output changed at o
} }
} }
closest = get_closest_unitriggers( player_origin, candidate_list, valid_range ); closest = get_closest_unitriggers( player_origin, candidate_list, valid_range );
if ( isDefined( trigger ) && time_to_ressess && closest.size < 2 || isDefined( trigger.thread_running ) && trigger.thread_running ) if ( isDefined( trigger ) && time_to_ressess && closest.size < 2 || is_true( trigger.thread_running ) )
{ {
if ( assess_and_apply_visibility( trigger, trigger.stub, player, 1 ) ) if ( assess_and_apply_visibility( trigger, trigger.stub, player, 1 ) )
{ {
@ -456,12 +456,12 @@ main() //checked against bo3 _zm_unitrigger.gsc and cerberus output changed at o
last_trigger = undefined; last_trigger = undefined;
while ( index < closest.size ) while ( index < closest.size )
{ {
if ( !maps/mp/zombies/_zm_utility::is_player_valid( player ) && isDefined( closest[ index ].ignore_player_valid ) && !closest[ index ].ignore_player_valid ) if ( !maps/mp/zombies/_zm_utility::is_player_valid( player ) && !is_true( closest[ index ].ignore_player_valid ) )
{ {
index++; index++;
continue; continue;
} }
if ( isDefined( closest[ index ].registered ) && !closest[ index ].registered ) if ( !is_true( closest[ index ].registered ) )
{ {
index++; index++;
continue; continue;
@ -472,7 +472,7 @@ main() //checked against bo3 _zm_unitrigger.gsc and cerberus output changed at o
last_trigger = undefined; last_trigger = undefined;
} }
trigger = undefined; trigger = undefined;
if ( isDefined( closest[ index ].trigger_per_player ) && closest[ index ].trigger_per_player ) if ( is_true( closest[ index ].trigger_per_player ) )
{ {
if ( !isDefined( closest[ index ].playertrigger ) ) if ( !isDefined( closest[ index ].playertrigger ) )
{ {
@ -517,7 +517,7 @@ run_visibility_function_for_all_triggers() //checked changed to match cerberus o
{ {
return; return;
} }
if ( isDefined( self.trigger_per_player ) && self.trigger_per_player ) if ( is_true( self.trigger_per_player ) )
{ {
if ( !isDefined( self.playertrigger ) ) if ( !isDefined( self.playertrigger ) )
{ {
@ -606,7 +606,7 @@ build_trigger_from_unitrigger_stub( stub, player ) //checked matches cerberus ou
} }
} }
trigger triggerignoreteam(); trigger triggerignoreteam();
if ( isDefined( stub.require_look_at ) && stub.require_look_at ) if ( is_true( stub.require_look_at ) )
{ {
trigger usetriggerrequirelookat(); trigger usetriggerrequirelookat();
} }
@ -632,7 +632,7 @@ build_trigger_from_unitrigger_stub( stub, player ) //checked matches cerberus ou
trigger.stub = stub; trigger.stub = stub;
} }
copy_zombie_keys_onto_trigger( trigger, stub ); copy_zombie_keys_onto_trigger( trigger, stub );
if ( isDefined( stub.trigger_per_player ) && stub.trigger_per_player ) if ( is_true( stub.trigger_per_player ) )
{ {
if ( isDefined( trigger ) ) if ( isDefined( trigger ) )
{ {

84
patch_zm/maps/mp/zombies/_zm_utility.gsc
View File

@ -55,7 +55,7 @@ is_player() //checked does not match cerberus output changed at own discretion
{ {
return 0; return 0;
} }
if ( isDefined( self.pers ) && isDefined( self.pers[ "isBot" ] ) && self.pers[ "isBot" ] ) if ( isDefined( self.pers ) && is_true( self.pers[ "isBot" ] ) )
{ {
return 0; return 0;
} }
@ -143,7 +143,7 @@ get_round_enemy_array() //checked partially changed to match cerberus output//di
i = 0; i = 0;
while ( i < enemies.size ) while ( i < enemies.size )
{ {
if ( isDefined( enemies[ i ].ignore_enemy_count ) && enemies[ i ].ignore_enemy_count ) if ( is_true( enemies[ i ].ignore_enemy_count ) )
{ {
i++; i++;
continue; continue;
@ -275,7 +275,7 @@ spawn_zombie( spawner, target_name, spawn_point, round_number ) //checked matche
wait 0.05; wait 0.05;
} }
spawner.script_moveoverride = 1; spawner.script_moveoverride = 1;
if ( isDefined( spawner.script_forcespawn ) && spawner.script_forcespawn ) if ( is_true( spawner.script_forcespawn ) )
{ {
guy = spawner spawnactor(); guy = spawner spawnactor();
if ( isDefined( level.giveextrazombies ) ) if ( isDefined( level.giveextrazombies ) )
@ -419,7 +419,7 @@ is_survival() //checked matches cerberus output
is_encounter() //checked matches cerberus output is_encounter() //checked matches cerberus output
{ {
if ( isDefined( level._is_encounter ) && level._is_encounter ) if ( is_true( level._is_encounter ) )
{ {
return 1; return 1;
} }
@ -494,9 +494,9 @@ check_point_in_enabled_zone( origin, zone_is_active, player_zones ) //checked pa
if ( scr_org istouching( player_zones[ i ] ) ) if ( scr_org istouching( player_zones[ i ] ) )
{ {
zone = level.zones[ player_zones[ i ].targetname ]; zone = level.zones[ player_zones[ i ].targetname ];
if ( isDefined( zone ) && isDefined( zone.is_enabled ) && zone.is_enabled ) if ( isDefined( zone ) && is_true( zone.is_enabled ) )
{ {
if ( isDefined( zone_is_active ) && zone_is_active == 1 && isDefined( zone.is_active ) && !zone.is_active ) if ( isDefined( zone_is_active ) && zone_is_active == 1 && !is_true( zone.is_active ) )
{ {
i++; i++;
continue; continue;
@ -698,7 +698,7 @@ generated_radius_attract_positions( forward, offset, num_positions, attract_radi
{ {
pos = [[ level.poi_positioning_func ]]( self.origin, rotated_forward ); pos = [[ level.poi_positioning_func ]]( self.origin, rotated_forward );
} }
else if ( isDefined( level.use_alternate_poi_positioning ) && level.use_alternate_poi_positioning ) else if ( is_true( level.use_alternate_poi_positioning ) )
{ {
pos = maps/mp/zombies/_zm_server_throttle::server_safe_ground_trace( "poi_trace", 10, self.origin + rotated_forward + vectorScale( ( 0, 0, 1 ), 10 ) ); pos = maps/mp/zombies/_zm_server_throttle::server_safe_ground_trace( "poi_trace", 10, self.origin + rotated_forward + vectorScale( ( 0, 0, 1 ), 10 ) );
} }
@ -710,7 +710,7 @@ generated_radius_attract_positions( forward, offset, num_positions, attract_radi
{ {
failed++; failed++;
} }
else if ( isDefined( level.use_alternate_poi_positioning ) && level.use_alternate_poi_positioning ) else if ( is_true( level.use_alternate_poi_positioning ) )
{ {
if ( isDefined( self ) && isDefined( self.origin ) ) if ( isDefined( self ) && isDefined( self.origin ) )
{ {
@ -769,7 +769,7 @@ debug_draw_attractor_positions() //checked changed to match cerberus output
get_zombie_point_of_interest( origin, poi_array ) //checked partially changed to match cerberus output //did not change while loop to for loop because continues cause infinite loops in for loops get_zombie_point_of_interest( origin, poi_array ) //checked partially changed to match cerberus output //did not change while loop to for loop because continues cause infinite loops in for loops
{ {
if ( isDefined( self.ignore_all_poi ) && self.ignore_all_poi ) if ( is_true( self.ignore_all_poi ) )
{ {
return undefined; return undefined;
} }
@ -852,13 +852,13 @@ get_zombie_point_of_interest( origin, poi_array ) //checked partially changed to
return undefined; return undefined;
} }
} }
if ( isDefined( best_poi._new_ground_trace ) && best_poi._new_ground_trace ) if ( is_true( best_poi._new_ground_trace ) )
{ {
position = []; position = [];
position[ 0 ] = groundpos_ignore_water_new( best_poi.origin + vectorScale( ( 0, 0, 1 ), 100 ) ); position[ 0 ] = groundpos_ignore_water_new( best_poi.origin + vectorScale( ( 0, 0, 1 ), 100 ) );
position[ 1 ] = self; position[ 1 ] = self;
} }
else if ( isDefined( best_poi.attract_to_origin ) && best_poi.attract_to_origin ) else if ( is_true( best_poi.attract_to_origin ) )
{ {
position = []; position = [];
position[ 0 ] = groundpos( best_poi.origin + vectorScale( ( 0, 0, 1 ), 100 ) ); position[ 0 ] = groundpos( best_poi.origin + vectorScale( ( 0, 0, 1 ), 100 ) );
@ -1058,7 +1058,7 @@ can_attract( attractor ) //checked matches cerberus output
{ {
return 1; return 1;
} }
if ( isDefined( self.num_poi_attracts ) && self.attractor_array.size >= self.num_poi_attracts ) if ( isDefined( self.num_poi_attracts ) && ( self.attractor_array.size >= self.num_poi_attracts ) )
{ {
return 0; return 0;
} }
@ -1235,7 +1235,7 @@ get_closest_valid_player( origin, ignore_player ) //checked changed to match cer
{ {
valid_player_found = 0; valid_player_found = 0;
players = get_players(); players = get_players();
if ( isDefined( level._zombie_using_humangun ) && level._zombie_using_humangun ) if ( is_true( level._zombie_using_humangun ) )
{ {
players = arraycombine( players, level._zombie_human_array, 0, 0 ); players = arraycombine( players, level._zombie_human_array, 0, 0 );
} }
@ -1275,7 +1275,7 @@ get_closest_valid_player( origin, ignore_player ) //checked changed to match cer
{ {
player = [[ level.closest_player_override ]]( origin, players ); player = [[ level.closest_player_override ]]( origin, players );
} }
else if ( isDefined( level.calc_closest_player_using_paths ) && level.calc_closest_player_using_paths ) else if ( is_true( level.calc_closest_player_using_paths ) )
{ {
player = get_closest_player_using_paths( origin, players ); player = get_closest_player_using_paths( origin, players );
} }
@ -1287,7 +1287,7 @@ get_closest_valid_player( origin, ignore_player ) //checked changed to match cer
{ {
return undefined; return undefined;
} }
if ( isDefined( level._zombie_using_humangun ) && level._zombie_using_humangun && isai( player ) ) if ( is_true( level._zombie_using_humangun ) && isai( player ) )
{ {
return player; return player;
} }
@ -1329,18 +1329,18 @@ is_player_valid( player, checkignoremeflag, ignore_laststand_players ) //checked
{ {
return 0; return 0;
} }
if ( isDefined( self.intermission ) && self.intermission ) if ( is_true( self.intermission ) )
{ {
return 0; return 0;
} }
if ( isDefined( ignore_laststand_players ) && !ignore_laststand_players ) if ( !is_true( ignore_laststand_players ) )
{ {
if ( player maps/mp/zombies/_zm_laststand::player_is_in_laststand() ) if ( player maps/mp/zombies/_zm_laststand::player_is_in_laststand() )
{ {
return 0; return 0;
} }
} }
if ( isDefined( checkignoremeflag ) && checkignoremeflag && player.ignoreme ) if ( is_true( checkignoremeflag ) && player.ignoreme )
{ {
return 0; return 0;
} }
@ -2441,11 +2441,11 @@ add_spawner( spawner ) //checked matches cerberus output
{ {
return; return;
} }
if ( isDefined( spawner.is_enabled ) && !spawner.is_enabled ) if ( !is_true( spawner.is_enabled ) )
{ {
return; return;
} }
if ( isDefined( spawner.has_been_added ) && spawner.has_been_added ) if ( is_true( spawner.has_been_added ) )
{ {
return; return;
} }
@ -2498,7 +2498,7 @@ set_hint_string( ent, default_ref, cost ) //checked matches cerberus output
{ {
ref = ent.script_hint; ref = ent.script_hint;
} }
if ( isDefined( level.legacy_hint_system ) && level.legacy_hint_system ) if ( is_true( level.legacy_hint_system ) )
{ {
ref = ref + "_" + cost; ref = ref + "_" + cost;
self sethintstring( get_zombie_hint( ref ) ); self sethintstring( get_zombie_hint( ref ) );
@ -2525,7 +2525,7 @@ get_hint_string( ent, default_ref, cost ) //checked matches cerberus output
{ {
ref = ent.script_hint; ref = ent.script_hint;
} }
if ( isDefined( level.legacy_hint_system ) && level.legacy_hint_system && isDefined( cost ) ) if ( is_true( level.legacy_hint_system ) && isDefined( cost ) )
{ {
ref = ref + "_" + cost; ref = ref + "_" + cost;
} }
@ -2551,7 +2551,7 @@ unitrigger_set_hint_string( ent, default_ref, cost ) //checked partially changed
{ {
ref = ent.script_hint; ref = ent.script_hint;
} }
if ( isDefined( level.legacy_hint_system ) && level.legacy_hint_system ) if ( is_true( level.legacy_hint_system ) )
{ {
ref = ref + "_" + cost; ref = ref + "_" + cost;
triggers[ i ] sethintstring( get_zombie_hint( ref ) ); triggers[ i ] sethintstring( get_zombie_hint( ref ) );
@ -2714,7 +2714,7 @@ set_zombie_var( var, value, is_float, column, is_team_based ) //checked changed
value = int( table_value ); value = int( table_value );
} }
} }
if ( isDefined( is_team_based ) && is_team_based ) if ( is_true( is_team_based ) )
{ {
foreach ( team in level.teams ) foreach ( team in level.teams )
{ {
@ -3028,7 +3028,7 @@ stop_magic_bullet_shield() //checked matches cerberus output
magic_bullet_shield() //checked matches cerberus output magic_bullet_shield() //checked matches cerberus output
{ {
if ( isDefined( self.magic_bullet_shield ) && !self.magic_bullet_shield ) if ( !is_true( self.magic_bullet_shield ) )
{ {
if ( isai( self ) || isplayer( self ) ) if ( isai( self ) || isplayer( self ) )
{ {
@ -3203,7 +3203,7 @@ trigger_invisible( enable ) //checked changed to match cerberus output
print3d_ent( text, color, scale, offset, end_msg, overwrite ) //checked changed to match cerberus output print3d_ent( text, color, scale, offset, end_msg, overwrite ) //checked changed to match cerberus output
{ {
self endon( "death" ); self endon( "death" );
if ( isDefined( overwrite ) && overwrite && isDefined( self._debug_print3d_msg ) ) if ( is_true( overwrite ) && isDefined( self._debug_print3d_msg ) )
{ {
self notify( "end_print3d" ); self notify( "end_print3d" );
wait 0.05; wait 0.05;
@ -3324,7 +3324,7 @@ get_current_zone( return_zone ) //checked changed to match cerberus output
{ {
if ( self istouching( zone.volumes[ i ] ) ) if ( self istouching( zone.volumes[ i ] ) )
{ {
if ( isDefined( return_zone ) && return_zone ) if ( is_true( return_zone ) )
{ {
return zone; return zone;
} }
@ -3386,11 +3386,11 @@ shock_onpain() //checked changed to match cerberus output
{ {
oldhealth = self.health; oldhealth = self.health;
self waittill( "damage", damage, attacker, direction_vec, point, mod ); self waittill( "damage", damage, attacker, direction_vec, point, mod );
if ( isDefined( level.shock_onpain ) && !level.shock_onpain ) if ( !is_true( level.shock_onpain ) )
{ {
continue; continue;
} }
if ( isDefined( self.shock_onpain ) && !self.shock_onpain ) if ( !is_true( self.shock_onpain ) )
{ {
continue; continue;
} }
@ -3406,7 +3406,7 @@ shock_onpain() //checked changed to match cerberus output
{ {
shocktype = undefined; shocktype = undefined;
shocklight = undefined; shocklight = undefined;
if ( isDefined( self.is_burning ) && self.is_burning ) if ( is_true( self.is_burning ) )
{ {
shocktype = "lava"; shocktype = "lava";
shocklight = "lava_small"; shocklight = "lava_small";
@ -3985,7 +3985,7 @@ is_player_offhand_weapon( weaponname ) //checked changed at own discretion
has_powerup_weapon() //checked changed at own discretion has_powerup_weapon() //checked changed at own discretion
{ {
if ( isDefined( self.has_powerup_weapon ) && self.has_powerup_weapon ) if ( is_true( self.has_powerup_weapon ) )
{ {
return 1; return 1;
} }
@ -3996,7 +3996,7 @@ give_start_weapon( switch_to_weapon ) //checked matches cerberus output
{ {
self giveweapon( level.start_weapon ); self giveweapon( level.start_weapon );
self givestartammo( level.start_weapon ); self givestartammo( level.start_weapon );
if ( isDefined( switch_to_weapon ) && switch_to_weapon ) if ( is_true( switch_to_weapon ) )
{ {
self switchtoweapon( level.start_weapon ); self switchtoweapon( level.start_weapon );
} }
@ -4037,7 +4037,7 @@ array_removedead( array ) //checked partially changed to match cerberus output /
i = 0; i = 0;
while ( i < array.size ) while ( i < array.size )
{ {
if ( !isalive( array[ i ] ) || isDefined( array[ i ].isacorpse ) && array[ i ].isacorpse ) if ( !isalive( array[ i ] ) || is_true( array[ i ].isacorpse ) )
{ {
i++; i++;
continue; continue;
@ -4231,20 +4231,20 @@ giveachievement_wrapper( achievement, all_players ) //checked changed to match c
{ {
return; return;
} }
if ( isDefined( level.zm_disable_recording_stats ) && level.zm_disable_recording_stats ) if ( is_true( level.zm_disable_recording_stats ) )
{ {
return; return;
} }
achievement_lower = tolower( achievement ); achievement_lower = tolower( achievement );
global_counter = 0; global_counter = 0;
if ( isDefined( all_players ) && all_players ) if ( is_true( all_players ) )
{ {
players = get_players(); players = get_players();
for ( i = 0; i < players.size; i++ ) for ( i = 0; i < players.size; i++ )
{ {
players[ i ] giveachievement( achievement ); players[ i ] giveachievement( achievement );
has_achievement = players[ i ] maps/mp/zombies/_zm_stats::get_global_stat( achievement_lower ); has_achievement = players[ i ] maps/mp/zombies/_zm_stats::get_global_stat( achievement_lower );
if ( isDefined( has_achievement ) && !has_achievement ) if ( !is_true( has_achievement ) )
{ {
global_counter++; global_counter++;
} }
@ -4269,7 +4269,7 @@ giveachievement_wrapper( achievement, all_players ) //checked changed to match c
} }
self giveachievement( achievement ); self giveachievement( achievement );
has_achievement = self maps/mp/zombies/_zm_stats::get_global_stat( achievement_lower ); has_achievement = self maps/mp/zombies/_zm_stats::get_global_stat( achievement_lower );
if ( isDefined( has_achievement ) && !has_achievement ) if ( !is_true( has_achievement ) )
{ {
global_counter++; global_counter++;
} }
@ -4519,7 +4519,7 @@ ent_flag_init( message, val ) //checked matches cerberus output
#/ #/
*/ */
} }
if ( isDefined( val ) && val ) if ( is_true( val ) )
{ {
self.ent_flag[ message ] = 1; self.ent_flag[ message ] = 1;
/* /*
@ -5100,16 +5100,12 @@ is_favorite_weapon( weapon_to_check )
{ {
return 0; return 0;
} }
_a6174 = self.favorite_wall_weapons_list; foreach ( weapon in self.favorite_wall_weapons_list )
_k6174 = getFirstArrayKey( _a6174 );
while ( isDefined( _k6174 ) )
{ {
weapon = _a6174[ _k6174 ];
if ( weapon_to_check == weapon ) if ( weapon_to_check == weapon )
{ {
return 1; return 1;
} }
_k6174 = getNextArrayKey( _a6174, _k6174 );
} }
return 0; return 0;
} }
@ -5257,7 +5253,7 @@ sq_refresh_player_navcard_hud_internal() //checked changed to match cerberus out
set_player_is_female( onoff ) //checked matches cerberus output set_player_is_female( onoff ) //checked matches cerberus output
{ {
if ( isDefined( level.use_female_animations ) && level.use_female_animations ) if ( is_true( level.use_female_animations ) )
{ {
female_perk = "specialty_gpsjammer"; female_perk = "specialty_gpsjammer";
if ( onoff ) if ( onoff )

10
patch_zm/maps/mp/zombies/_zm_weap_cymbal_monkey.gsc
View File

@ -17,7 +17,7 @@ init() //checked matches cerberus output
level.zombiemode_devgui_cymbal_monkey_give = ::player_give_cymbal_monkey; level.zombiemode_devgui_cymbal_monkey_give = ::player_give_cymbal_monkey;
#/ #/
*/ */
if ( isDefined( level.legacy_cymbal_monkey ) && level.legacy_cymbal_monkey ) if ( is_true( level.legacy_cymbal_monkey ) )
{ {
level.cymbal_monkey_model = "weapon_zombie_monkey_bomb"; level.cymbal_monkey_model = "weapon_zombie_monkey_bomb";
} }
@ -282,7 +282,7 @@ player_throw_cymbal_monkey( grenade, num_attractors, max_attract_dist, attract_d
model.angles = grenade.angles; model.angles = grenade.angles;
model thread monkey_cleanup( grenade ); model thread monkey_cleanup( grenade );
clone = undefined; clone = undefined;
if ( isDefined( level.cymbal_monkey_dual_view ) && level.cymbal_monkey_dual_view ) if ( is_true( level.cymbal_monkey_dual_view ) )
{ {
model setvisibletoallexceptteam( level.zombie_team ); model setvisibletoallexceptteam( level.zombie_team );
clone = maps/mp/zombies/_zm_clone::spawn_player_clone( self, vectorScale( ( 0, 0, -1 ), 999 ), level.cymbal_monkey_clone_weapon, undefined ); clone = maps/mp/zombies/_zm_clone::spawn_player_clone( self, vectorScale( ( 0, 0, -1 ), 999 ), level.cymbal_monkey_clone_weapon, undefined );
@ -307,7 +307,7 @@ player_throw_cymbal_monkey( grenade, num_attractors, max_attract_dist, attract_d
if ( isDefined( model ) ) if ( isDefined( model ) )
{ {
model setanim( %o_monkey_bomb ); model setanim( %o_monkey_bomb );
if ( isDefined( grenade.backlinked ) && !grenade.backlinked ) if ( !is_true( grenade.backlinked ) )
{ {
model unlink(); model unlink();
model.origin = grenade.origin; model.origin = grenade.origin;
@ -416,7 +416,7 @@ monkey_cleanup( parent ) //checked matches cerberus output
{ {
if ( !isDefined( parent ) ) if ( !isDefined( parent ) )
{ {
if ( isDefined( self ) && isDefined( self.dud ) && self.dud ) if ( isDefined( self ) && is_true( self.dud ) )
{ {
wait 6; wait 6;
} }
@ -444,7 +444,7 @@ do_monkey_sound( model, info ) //checked changed to match cerberus output
} }
if ( !self.monk_scream_vox && level.music_override == 0 ) if ( !self.monk_scream_vox && level.music_override == 0 )
{ {
if ( isDefined( level.cymbal_monkey_dual_view ) && level.cymbal_monkey_dual_view ) if ( is_true( level.cymbal_monkey_dual_view ) )
{ {
self playsoundtoteam( "zmb_monkey_song", "allies" ); self playsoundtoteam( "zmb_monkey_song", "allies" );
} }

51
patch_zm/maps/mp/zombies/_zm_weapons.gsc
View File

@ -27,7 +27,6 @@ init() //checked matches cerberus output
level.debugLogging_zm_weapons = 0; level.debugLogging_zm_weapons = 0;
} }
//end debug //end debug
level.monolingustic_prompt_format = 0;
init_weapons(); init_weapons();
init_weapon_upgrade(); init_weapon_upgrade();
init_weapon_toggle(); init_weapon_toggle();
@ -252,7 +251,7 @@ take_fallback_weapon() //checked matches cerberus output
switch_back_primary_weapon( oldprimary ) //checked changed to match cerberus output switch_back_primary_weapon( oldprimary ) //checked changed to match cerberus output
{ {
if ( isDefined( self.laststand ) && self.laststand ) if ( is_true( self.laststand ) )
{ {
return; return;
} }
@ -569,7 +568,7 @@ add_zombie_weapon( weapon_name, upgrade_name, hint, cost, weaponvo, weaponvoresp
level.zombie_weapons[ weapon_name ] = struct; level.zombie_weapons[ weapon_name ] = struct;
if ( isDefined( level.zombiemode_reusing_pack_a_punch ) && level.zombiemode_reusing_pack_a_punch && isDefined( upgrade_name ) ) if ( is_true( level.zombiemode_reusing_pack_a_punch ) && isDefined( upgrade_name ) )
{ {
add_attachments( weapon_name, upgrade_name ); add_attachments( weapon_name, upgrade_name );
} }
@ -734,8 +733,6 @@ include_zombie_weapon( weapon_name, in_box, collector, weighting_func ) //checke
init_weapons() //checked matches cerberus output init_weapons() //checked matches cerberus output
{ {
//throws exe_client_field_mismatch on join
//or the server won't rotate to the map
if ( isdefined( level._zombie_custom_add_weapons ) ) if ( isdefined( level._zombie_custom_add_weapons ) )
{ {
[[ level._zombie_custom_add_weapons ]](); [[ level._zombie_custom_add_weapons ]]();
@ -978,7 +975,7 @@ init_spawnable_weapon_upgrade() //checked partially changed to match cerberus ou
if ( spawn_list[ i ].targetname == "weapon_upgrade" ) if ( spawn_list[ i ].targetname == "weapon_upgrade" )
{ {
unitrigger_stub.cost = get_weapon_cost( spawn_list[ i ].zombie_weapon_upgrade ); unitrigger_stub.cost = get_weapon_cost( spawn_list[ i ].zombie_weapon_upgrade );
if ( isDefined( level.monolingustic_prompt_format ) && !level.monolingustic_prompt_format ) if ( !is_true( level.monolingustic_prompt_format ) )
{ {
unitrigger_stub.hint_string = get_weapon_hint( spawn_list[ i ].zombie_weapon_upgrade ); unitrigger_stub.hint_string = get_weapon_hint( spawn_list[ i ].zombie_weapon_upgrade );
unitrigger_stub.hint_parm1 = unitrigger_stub.cost; unitrigger_stub.hint_parm1 = unitrigger_stub.cost;
@ -1149,7 +1146,7 @@ wall_weapon_update_prompt( player ) //checked partially changed to match cerberu
if ( isDefined( level.monolingustic_prompt_format ) && !level.monolingustic_prompt_format ) if ( isDefined( level.monolingustic_prompt_format ) && !level.monolingustic_prompt_format )
{ {
player_has_weapon = player has_weapon_or_upgrade( weapon ); player_has_weapon = player has_weapon_or_upgrade( weapon );
if ( !player_has_weapon && isDefined( level.weapons_using_ammo_sharing ) && level.weapons_using_ammo_sharing ) if ( !player_has_weapon && is_true( level.weapons_using_ammo_sharing ) )
{ {
shared_ammo_weapon = player get_shared_ammo_weapon( self.zombie_weapon_upgrade ); shared_ammo_weapon = player get_shared_ammo_weapon( self.zombie_weapon_upgrade );
if ( isDefined( shared_ammo_weapon ) ) if ( isDefined( shared_ammo_weapon ) )
@ -1164,7 +1161,7 @@ wall_weapon_update_prompt( player ) //checked partially changed to match cerberu
self.stub.hint_string = get_weapon_hint( weapon ); self.stub.hint_string = get_weapon_hint( weapon );
self sethintstring( self.stub.hint_string, cost ); self sethintstring( self.stub.hint_string, cost );
} }
else if ( isDefined( level.use_legacy_weapon_prompt_format ) && level.use_legacy_weapon_prompt_format ) else if ( is_true( level.use_legacy_weapon_prompt_format ) )
{ {
cost = get_weapon_cost( weapon ); cost = get_weapon_cost( weapon );
ammo_cost = get_ammo_cost( weapon ); ammo_cost = get_ammo_cost( weapon );
@ -1185,7 +1182,7 @@ wall_weapon_update_prompt( player ) //checked partially changed to match cerberu
else if ( !player has_weapon_or_upgrade( weapon ) ) else if ( !player has_weapon_or_upgrade( weapon ) )
{ {
string_override = 0; string_override = 0;
if ( isDefined( player.pers_upgrades_awarded[ "nube" ] ) && player.pers_upgrades_awarded[ "nube" ] ) if ( is_true( player.pers_upgrades_awarded[ "nube" ] ) )
{ {
string_override = maps/mp/zombies/_zm_pers_upgrades_functions::pers_nube_ammo_hint_string( player, weapon ); string_override = maps/mp/zombies/_zm_pers_upgrades_functions::pers_nube_ammo_hint_string( player, weapon );
} }
@ -1287,7 +1284,7 @@ init_weapon_upgrade() //checked changed to match cerberus output
weapon_spawns = getentarray( "weapon_upgrade", "targetname" ); weapon_spawns = getentarray( "weapon_upgrade", "targetname" );
for ( i = 0; i < weapon_spawns.size; i++ ) for ( i = 0; i < weapon_spawns.size; i++ )
{ {
if ( isDefined( level.monolingustic_prompt_format ) && !level.monolingustic_prompt_format ) if ( !is_true( level.monolingustic_prompt_format ) )
{ {
hint_string = get_weapon_hint( weapon_spawns[ i ].zombie_weapon_upgrade ); hint_string = get_weapon_hint( weapon_spawns[ i ].zombie_weapon_upgrade );
cost = get_weapon_cost( weapon_spawns[ i ].zombie_weapon_upgrade ); cost = get_weapon_cost( weapon_spawns[ i ].zombie_weapon_upgrade );
@ -1778,7 +1775,7 @@ get_upgrade_weapon( weaponname, add_attachment ) //checked changed to match cerb
{ {
newweapon = level.zombie_weapons[ rootweaponname ].upgrade_name; newweapon = level.zombie_weapons[ rootweaponname ].upgrade_name;
} }
if ( isDefined( add_attachment ) && add_attachment && isDefined( level.zombiemode_reusing_pack_a_punch ) && level.zombiemode_reusing_pack_a_punch ) if ( is_true( add_attachment ) && is_true( level.zombiemode_reusing_pack_a_punch ) )
{ {
oldatt = get_attachment_name( weaponname ); oldatt = get_attachment_name( weaponname );
att = random_attachment( baseweaponname, oldatt ); att = random_attachment( baseweaponname, oldatt );
@ -1804,7 +1801,7 @@ can_upgrade_weapon( weaponname ) //checked changed to match cerberus output
{ {
return 1; return 1;
} }
if ( isDefined( level.zombiemode_reusing_pack_a_punch ) && level.zombiemode_reusing_pack_a_punch && weapon_supports_attachments( weaponname ) ) if ( is_true( level.zombiemode_reusing_pack_a_punch ) && weapon_supports_attachments( weaponname ) )
{ {
return 1; return 1;
} }
@ -1823,7 +1820,7 @@ will_upgrade_weapon_as_attachment( weaponname ) //checked changed to match cerbe
{ {
return 0; return 0;
} }
if ( isDefined( level.zombiemode_reusing_pack_a_punch ) && level.zombiemode_reusing_pack_a_punch && weapon_supports_attachments( weaponname ) ) if ( is_true( level.zombiemode_reusing_pack_a_punch ) && weapon_supports_attachments( weaponname ) )
{ {
return 1; return 1;
} }
@ -1851,7 +1848,7 @@ get_weapon_with_attachments( weaponname ) //checked changed to match cerberus ou
{ {
return weaponname; return weaponname;
} }
if ( isDefined( level.zombiemode_reusing_pack_a_punch ) && level.zombiemode_reusing_pack_a_punch ) if ( is_true( level.zombiemode_reusing_pack_a_punch ) )
{ {
weaponname = tolower( weaponname ); weaponname = tolower( weaponname );
weaponname = get_base_name( weaponname ); weaponname = get_base_name( weaponname );
@ -1875,7 +1872,7 @@ has_weapon_or_attachments( weaponname ) //checked changed to match cerberus outp
{ {
return 1; return 1;
} }
if ( isDefined( level.zombiemode_reusing_pack_a_punch ) && level.zombiemode_reusing_pack_a_punch ) if ( is_true( level.zombiemode_reusing_pack_a_punch ) )
{ {
weaponname = tolower( weaponname ); weaponname = tolower( weaponname );
weaponname = get_base_name( weaponname ); weaponname = get_base_name( weaponname );
@ -1981,7 +1978,7 @@ get_player_weapon_with_same_base( weaponname ) //checked changed tp match cerber
get_weapon_hint_ammo() //checked matches cerberus output get_weapon_hint_ammo() //checked matches cerberus output
{ {
if ( isDefined( level.has_pack_a_punch ) && !level.has_pack_a_punch ) if ( !is_true( level.has_pack_a_punch ) )
{ {
return &"ZOMBIE_WEAPONCOSTAMMO"; return &"ZOMBIE_WEAPONCOSTAMMO";
} }
@ -2008,7 +2005,7 @@ weapon_spawn_think() //checked changed to match cerberus output
second_endon = "kill_trigger"; second_endon = "kill_trigger";
self.first_time_triggered = self.stub.first_time_triggered; self.first_time_triggered = self.stub.first_time_triggered;
} }
if ( isDefined( self.stub ) && isDefined( self.stub.trigger_per_player ) && self.stub.trigger_per_player ) if ( isDefined( self.stub ) && is_true( self.stub.trigger_per_player ) )
{ {
self thread decide_hide_show_hint( "stop_hint_logic", second_endon, self.parent_player ); self thread decide_hide_show_hint( "stop_hint_logic", second_endon, self.parent_player );
} }
@ -2032,7 +2029,7 @@ weapon_spawn_think() //checked changed to match cerberus output
} }
else if ( self.first_time_triggered ) else if ( self.first_time_triggered )
{ {
if ( isDefined( level.use_legacy_weapon_prompt_format ) && level.use_legacy_weapon_prompt_format ) if ( is_true( level.use_legacy_weapon_prompt_format ) )
{ {
self weapon_set_first_time_hint( cost, get_ammo_cost( self.zombie_weapon_upgrade ) ); self weapon_set_first_time_hint( cost, get_ammo_cost( self.zombie_weapon_upgrade ) );
} }
@ -2050,7 +2047,7 @@ weapon_spawn_think() //checked changed to match cerberus output
wait 0.1; wait 0.1;
continue; continue;
} }
if ( isDefined( self.stub ) && isDefined( self.stub.require_look_from ) && self.stub.require_look_from ) if ( isDefined( self.stub ) && is_true( self.stub.require_look_from ) )
{ {
toplayer = player get_eye() - self.origin; toplayer = player get_eye() - self.origin;
forward = -1 * anglesToRight( self.angles ); forward = -1 * anglesToRight( self.angles );
@ -2066,7 +2063,7 @@ weapon_spawn_think() //checked changed to match cerberus output
continue; continue;
} }
player_has_weapon = player has_weapon_or_upgrade( self.zombie_weapon_upgrade ); player_has_weapon = player has_weapon_or_upgrade( self.zombie_weapon_upgrade );
if ( !player_has_weapon && isDefined( level.weapons_using_ammo_sharing ) && level.weapons_using_ammo_sharing ) if ( !player_has_weapon && is_true( level.weapons_using_ammo_sharing ) )
{ {
shared_ammo_weapon = player get_shared_ammo_weapon( self.zombie_weapon_upgrade ); shared_ammo_weapon = player get_shared_ammo_weapon( self.zombie_weapon_upgrade );
if ( isDefined( shared_ammo_weapon ) ) if ( isDefined( shared_ammo_weapon ) )
@ -2074,7 +2071,7 @@ weapon_spawn_think() //checked changed to match cerberus output
player_has_weapon = 1; player_has_weapon = 1;
} }
} }
if ( isDefined( level.pers_upgrade_nube ) && level.pers_upgrade_nube ) if ( is_true( level.pers_upgrade_nube ) )
{ {
player_has_weapon = maps/mp/zombies/_zm_pers_upgrades_functions::pers_nube_should_we_give_raygun( player_has_weapon, player, self.zombie_weapon_upgrade ); player_has_weapon = maps/mp/zombies/_zm_pers_upgrades_functions::pers_nube_should_we_give_raygun( player_has_weapon, player, self.zombie_weapon_upgrade );
} }
@ -2112,7 +2109,7 @@ weapon_spawn_think() //checked changed to match cerberus output
player set_player_lethal_grenade( self.zombie_weapon_upgrade ); player set_player_lethal_grenade( self.zombie_weapon_upgrade );
} }
str_weapon = self.zombie_weapon_upgrade; str_weapon = self.zombie_weapon_upgrade;
if ( isDefined( level.pers_upgrade_nube ) && level.pers_upgrade_nube ) if ( is_true( level.pers_upgrade_nube ) )
{ {
str_weapon = maps/mp/zombies/_zm_pers_upgrades_functions::pers_nube_weapon_upgrade_check( player, str_weapon ); str_weapon = maps/mp/zombies/_zm_pers_upgrades_functions::pers_nube_weapon_upgrade_check( player, str_weapon );
} }
@ -2133,11 +2130,11 @@ weapon_spawn_think() //checked changed to match cerberus output
{ {
str_weapon = shared_ammo_weapon; str_weapon = shared_ammo_weapon;
} }
if ( isDefined( level.pers_upgrade_nube ) && level.pers_upgrade_nube ) if ( is_true( level.pers_upgrade_nube ) )
{ {
str_weapon = maps/mp/zombies/_zm_pers_upgrades_functions::pers_nube_weapon_ammo_check( player, str_weapon ); str_weapon = maps/mp/zombies/_zm_pers_upgrades_functions::pers_nube_weapon_ammo_check( player, str_weapon );
} }
if ( isDefined( self.hacked ) && self.hacked ) if ( is_true( self.hacked ) )
{ {
if ( !player has_upgrade( str_weapon ) ) if ( !player has_upgrade( str_weapon ) )
{ {
@ -2156,7 +2153,7 @@ weapon_spawn_think() //checked changed to match cerberus output
{ {
ammo_cost = get_ammo_cost( str_weapon ); ammo_cost = get_ammo_cost( str_weapon );
} }
if ( isDefined( player.pers_upgrades_awarded[ "nube" ] ) && player.pers_upgrades_awarded[ "nube" ] ) if ( is_true( player.pers_upgrades_awarded[ "nube" ] ) )
{ {
ammo_cost = maps/mp/zombies/_zm_pers_upgrades_functions::pers_nube_override_ammo_cost( player, self.zombie_weapon_upgrade, ammo_cost ); ammo_cost = maps/mp/zombies/_zm_pers_upgrades_functions::pers_nube_override_ammo_cost( player, self.zombie_weapon_upgrade, ammo_cost );
} }
@ -2249,7 +2246,7 @@ show_all_weapon_buys( player, cost, ammo_cost, is_grenade ) //checked changed to
{ {
self weapon_set_first_time_hint( cost, ammo_cost ); self weapon_set_first_time_hint( cost, ammo_cost );
} }
if ( isDefined( level.dont_link_common_wallbuys ) && !level.dont_link_common_wallbuys && isDefined( level._spawned_wallbuys ) ) if ( !is_true( level.dont_link_common_wallbuys ) && isDefined( level._spawned_wallbuys ) )
{ {
i = 0; i = 0;
while ( i < level._spawned_wallbuys.size ) while ( i < level._spawned_wallbuys.size )
@ -2513,7 +2510,7 @@ weapon_give( weapon, is_upgrade, magic_box, nosound ) //checked changed to match
play_weapon_vo( weapon, magic_box ); play_weapon_vo( weapon, magic_box );
return; return;
} }
if ( isDefined( nosound ) && !nosound ) if ( !is_true( nosound ) )
{ {
self play_sound_on_ent( "purchase" ); self play_sound_on_ent( "purchase" );
} }

4
patch_zm/maps/mp/zombies/_zm_zonemgr.gsc
View File

@ -129,7 +129,7 @@ player_in_zone( zone_name ) //checked changed to match cerberus output
entity_in_zone( zone_name, ignore_enabled_check ) //checked changed to match cerberus output entity_in_zone( zone_name, ignore_enabled_check ) //checked changed to match cerberus output
{ {
if ( !zone_is_enabled( zone_name ) && isdefined( ignore_enabled_check ) && !ignore_enabled_check ) if ( !zone_is_enabled( zone_name ) && !is_true( ignore_enabled_check ) )
{ {
return 0; return 0;
} }
@ -214,7 +214,7 @@ zone_init( zone_name ) //checked changed to match cerberus output
for (i = 0; i < spots.size; i++) for (i = 0; i < spots.size; i++)
{ {
spots[ i ].zone_name = zone_name; spots[ i ].zone_name = zone_name;
if ( isDefined( spots[ i ].is_blocked ) && !spots[ i ].is_blocked || !isDefined( spots[ i ].is_blocked ) ) //spots[ i ].isblocked is not defined if ( !is_true( spots[ i ].is_blocked ) )
{ {
spots[ i ].is_enabled = 1; spots[ i ].is_enabled = 1;
} }