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-09 02:17:51 -05:00
Code Issues Releases Wiki Activity

Checked zm_tomb_zmb

Browse Source 
Tested, and moved to Minor Errors category.
This commit is contained in:
JezuzLizard 2020-07-04 09:07:42 -07:00
parent f741460f7a
commit 9cbb7470c3
2 changed files with 119 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

274
zm_tomb_patch/maps/mp/zm_tomb_amb.gsc
View File

@ -1,3 +1,4 @@
//checked includes match cerberus output
#include maps/mp/zombies/_zm_zonemgr; #include maps/mp/zombies/_zm_zonemgr;
#include maps/mp/zombies/_zm_audio; #include maps/mp/zombies/_zm_audio;
#include maps/mp/zombies/_zm_sidequests; #include maps/mp/zombies/_zm_sidequests;
@ -6,7 +7,7 @@
#include maps/mp/_utility; #include maps/mp/_utility;
#include common_scripts/utility; #include common_scripts/utility;
main() main() //checked matches cerberus output
{ {
level thread sndsetupendgamemusicstates(); level thread sndsetupendgamemusicstates();
if ( is_classic() ) if ( is_classic() )
@ -19,17 +20,17 @@ main()
} }
} }
sndsetupendgamemusicstates() sndsetupendgamemusicstates() //checked matches cerberus output
{ {
flag_wait( "start_zombie_round_logic" ); flag_wait( "start_zombie_round_logic" );
level thread maps/mp/zombies/_zm_audio::setupmusicstate( "game_over_ee", "mus_zombie_game_over_ee", 1, 0, undefined, "SILENCE" ); level thread maps/mp/zombies/_zm_audio::setupmusicstate( "game_over_ee", "mus_zombie_game_over_ee", 1, 0, undefined, "SILENCE" );
} }
sndtrackers() sndtrackers() //checked matches cerberus output
{ {
} }
sndstingersetup() sndstingersetup() //checked matches cerberus output
{ {
level.sndmusicstingerevent = ::sndplaystinger; level.sndmusicstingerevent = ::sndplaystinger;
level.sndstinger = spawnstruct(); level.sndstinger = spawnstruct();
@ -46,18 +47,18 @@ sndstingersetup()
level thread snddoormusictrigs(); level thread snddoormusictrigs();
} }
sndstingersetupstates() sndstingersetupstates() //checked matches cerberus output
{ {
createstingerstate( "door_open", "mus_event_group_03", 2,5, "ignore" ); createstingerstate( "door_open", "mus_event_group_03", 2.5, "ignore" );
createstingerstate( "boards_gone", "mus_event_group_02", 0,5, "ignore" ); createstingerstate( "boards_gone", "mus_event_group_02", 0.5, "ignore" );
createstingerstate( "zone_nml_18", "mus_event_location_hilltop", 0,75, "queue" ); createstingerstate( "zone_nml_18", "mus_event_location_hilltop", 0.75, "queue" );
createstingerstate( "zone_village_2", "mus_event_location_church", 0,75, "queue" ); createstingerstate( "zone_village_2", "mus_event_location_church", 0.75, "queue" );
createstingerstate( "ug_bottom_zone", "mus_event_location_crypt", 0,75, "queue" ); createstingerstate( "ug_bottom_zone", "mus_event_location_crypt", 0.75, "queue" );
createstingerstate( "zone_robot_head", "mus_event_location_robot", 0,75, "queue" ); createstingerstate( "zone_robot_head", "mus_event_location_robot", 0.75, "queue" );
createstingerstate( "zone_air_stairs", "mus_event_cave_air", 0,75, "queue" ); createstingerstate( "zone_air_stairs", "mus_event_cave_air", 0.75, "queue" );
createstingerstate( "zone_fire_stairs", "mus_event_cave_fire", 0,75, "queue" ); createstingerstate( "zone_fire_stairs", "mus_event_cave_fire", 0.75, "queue" );
createstingerstate( "zone_bolt_stairs", "mus_event_cave_bolt", 0,75, "queue" ); createstingerstate( "zone_bolt_stairs", "mus_event_cave_bolt", 0.75, "queue" );
createstingerstate( "zone_ice_stairs", "mus_event_cave_ice", 0,75, "queue" ); createstingerstate( "zone_ice_stairs", "mus_event_cave_ice", 0.75, "queue" );
createstingerstate( "poweron", "mus_event_poweron", 0, "reject" ); createstingerstate( "poweron", "mus_event_poweron", 0, "reject" );
createstingerstate( "tank_ride", "mus_event_tank_ride", 0, "queue" ); createstingerstate( "tank_ride", "mus_event_tank_ride", 0, "queue" );
createstingerstate( "generator_1", "mus_event_generator_1", 1, "reject" ); createstingerstate( "generator_1", "mus_event_generator_1", 1, "reject" );
@ -66,24 +67,24 @@ sndstingersetupstates()
createstingerstate( "generator_4", "mus_event_generator_4", 1, "reject" ); createstingerstate( "generator_4", "mus_event_generator_4", 1, "reject" );
createstingerstate( "generator_5", "mus_event_generator_5", 1, "reject" ); createstingerstate( "generator_5", "mus_event_generator_5", 1, "reject" );
createstingerstate( "generator_6", "mus_event_generator_6", 1, "reject" ); createstingerstate( "generator_6", "mus_event_generator_6", 1, "reject" );
createstingerstate( "staff_fire", "mus_event_staff_fire", 0,1, "reject" ); createstingerstate( "staff_fire", "mus_event_staff_fire", 0.1, "reject" );
createstingerstate( "staff_ice", "mus_event_staff_ice", 0,1, "reject" ); createstingerstate( "staff_ice", "mus_event_staff_ice", 0.1, "reject" );
createstingerstate( "staff_lightning", "mus_event_staff_lightning", 0,1, "reject" ); createstingerstate( "staff_lightning", "mus_event_staff_lightning", 0.1, "reject" );
createstingerstate( "staff_wind", "mus_event_staff_wind", 0,1, "reject" ); createstingerstate( "staff_wind", "mus_event_staff_wind", 0.1, "reject" );
createstingerstate( "staff_fire_upgraded", "mus_event_staff_fire_upgraded", 0,1, "reject" ); createstingerstate( "staff_fire_upgraded", "mus_event_staff_fire_upgraded", 0.1, "reject" );
createstingerstate( "staff_ice_upgraded", "mus_event_staff_ice_upgraded", 0,1, "reject" ); createstingerstate( "staff_ice_upgraded", "mus_event_staff_ice_upgraded", 0.1, "reject" );
createstingerstate( "staff_lightning_upgraded", "mus_event_staff_lightning_upgraded", 0,1, "reject" ); createstingerstate( "staff_lightning_upgraded", "mus_event_staff_lightning_upgraded", 0.1, "reject" );
createstingerstate( "staff_wind_upgraded", "mus_event_staff_wind_upgraded", 0,1, "reject" ); createstingerstate( "staff_wind_upgraded", "mus_event_staff_wind_upgraded", 0.1, "reject" );
createstingerstate( "staff_all_upgraded", "mus_event_staff_all_upgraded", 0,1, "reject" ); createstingerstate( "staff_all_upgraded", "mus_event_staff_all_upgraded", 0.1, "reject" );
createstingerstate( "side_sting_1", "mus_side_stinger_1", 0,1, "reject" ); createstingerstate( "side_sting_1", "mus_side_stinger_1", 0.1, "reject" );
createstingerstate( "side_sting_2", "mus_side_stinger_2", 0,1, "reject" ); createstingerstate( "side_sting_2", "mus_side_stinger_2", 0.1, "reject" );
createstingerstate( "side_sting_3", "mus_side_stinger_3", 0,1, "reject" ); createstingerstate( "side_sting_3", "mus_side_stinger_3", 0.1, "reject" );
createstingerstate( "side_sting_4", "mus_side_stinger_4", 0,1, "reject" ); createstingerstate( "side_sting_4", "mus_side_stinger_4", 0.1, "reject" );
createstingerstate( "side_sting_5", "mus_side_stinger_5", 0,1, "reject" ); createstingerstate( "side_sting_5", "mus_side_stinger_5", 0.1, "reject" );
createstingerstate( "side_sting_6", "mus_side_stinger_6", 0,1, "reject" ); createstingerstate( "side_sting_6", "mus_side_stinger_6", 0.1, "reject" );
} }
createstingerstate( state, alias, prewait, interrupt ) createstingerstate( state, alias, prewait, interrupt ) //checked matches cerberus output
{ {
s = level.sndstinger; s = level.sndstinger;
if ( !isDefined( s.states[ state ] ) ) if ( !isDefined( s.states[ state ] ) )
@ -95,31 +96,24 @@ createstingerstate( state, alias, prewait, interrupt )
} }
} }
sndboardmonitor() sndboardmonitor() //checked changed to match cerberus output
{ {
while ( 1 ) while ( 1 )
{ {
level waittill( "last_board_torn", barrier_origin ); level waittill( "last_board_torn", barrier_origin );
players = getplayers(); players = getplayers();
_a122 = players; foreach ( player in players )
_k122 = getFirstArrayKey( _a122 );
while ( isDefined( _k122 ) )
{ {
player = _a122[ _k122 ];
if ( distancesquared( player.origin, barrier_origin ) <= 22500 ) if ( distancesquared( player.origin, barrier_origin ) <= 22500 )
{ {
level thread maps/mp/zombies/_zm_audio::sndmusicstingerevent( "boards_gone" ); level thread maps/mp/zombies/_zm_audio::sndmusicstingerevent( "boards_gone" );
break; break;
} }
else
{
_k122 = getNextArrayKey( _a122, _k122 );
}
} }
} }
} }
locationstingerwait( zone_name, type ) locationstingerwait( zone_name, type ) //checked changed to match cerberus output
{ {
array = sndlocationsarray(); array = sndlocationsarray();
sndnorepeats = 3; sndnorepeats = 3;
@ -127,23 +121,22 @@ locationstingerwait( zone_name, type )
level.sndlastzone = undefined; level.sndlastzone = undefined;
level.sndlocationplayed = 0; level.sndlocationplayed = 0;
level thread sndlocationbetweenroundswait(); level thread sndlocationbetweenroundswait();
for ( ;; ) while ( 1 )
{ {
while ( 1 ) level waittill( "newzoneActive", activezone );
wait 0.1;
if ( !sndlocationshouldplay( array, activezone ) )
{ {
level waittill( "newzoneActive", activezone ); continue;
wait 0,1;
while ( !sndlocationshouldplay( array, activezone ) )
{
continue;
}
if ( is_true( level.sndroundwait ) )
{
}
} }
else while ( is_true( level.sndstinger.isplaying ) ) if ( is_true( level.sndroundwait ) )
{
continue;
}
else if ( is_true( level.sndstinger.isplaying ) )
{ {
level thread sndlocationqueue( activezone ); level thread sndlocationqueue( activezone );
continue;
} }
level thread maps/mp/zombies/_zm_audio::sndmusicstingerevent( activezone ); level thread maps/mp/zombies/_zm_audio::sndmusicstingerevent( activezone );
level.sndlocationplayed = 1; level.sndlocationplayed = 1;
@ -160,13 +153,13 @@ locationstingerwait( zone_name, type )
level waittill( "between_round_over" ); level waittill( "between_round_over" );
while ( is_true( level.sndroundwait ) ) while ( is_true( level.sndroundwait ) )
{ {
wait 0,1; wait 0.1;
} }
level.sndlocationplayed = 0; level.sndlocationplayed = 0;
} }
} }
sndlocationsarray() sndlocationsarray() //checked matches cerberus output
{ {
array = []; array = [];
array[ 0 ] = "zone_nml_18"; array[ 0 ] = "zone_nml_18";
@ -179,7 +172,7 @@ sndlocationsarray()
return array; return array;
} }
sndlocationshouldplay( array, activezone ) sndlocationshouldplay( array, activezone ) //checked changed to match cerberus output
{ {
shouldplay = 0; shouldplay = 0;
if ( activezone == "zone_start_lower" && !flag( "fountain_transport_active" ) ) if ( activezone == "zone_start_lower" && !flag( "fountain_transport_active" ) )
@ -190,16 +183,12 @@ sndlocationshouldplay( array, activezone )
{ {
return shouldplay; return shouldplay;
} }
_a206 = array; foreach ( place in array )
_k206 = getFirstArrayKey( _a206 );
while ( isDefined( _k206 ) )
{ {
place = _a206[ _k206 ];
if ( place == activezone ) if ( place == activezone )
{ {
shouldplay = 1; shouldplay = 1;
} }
_k206 = getNextArrayKey( _a206, _k206 );
} }
if ( shouldplay == 0 ) if ( shouldplay == 0 )
{ {
@ -207,11 +196,8 @@ sndlocationshouldplay( array, activezone )
} }
playersinlocal = 0; playersinlocal = 0;
players = getplayers(); players = getplayers();
_a217 = players; foreach ( player in players )
_k217 = getFirstArrayKey( _a217 );
while ( isDefined( _k217 ) )
{ {
player = _a217[ _k217 ];
if ( player maps/mp/zombies/_zm_zonemgr::is_player_in_zone( activezone ) ) if ( player maps/mp/zombies/_zm_zonemgr::is_player_in_zone( activezone ) )
{ {
if ( !is_true( player.afterlife ) ) if ( !is_true( player.afterlife ) )
@ -219,7 +205,6 @@ sndlocationshouldplay( array, activezone )
playersinlocal++; playersinlocal++;
} }
} }
_k217 = getNextArrayKey( _a217, _k217 );
} }
if ( playersinlocal >= 1 ) if ( playersinlocal >= 1 )
{ {
@ -232,74 +217,59 @@ sndlocationshouldplay( array, activezone )
return shouldplay; return shouldplay;
} }
sndcurrentlocationarray( current_array, activezone, numcut, max_num_removed ) sndcurrentlocationarray( current_array, activezone, numcut, max_num_removed ) //checked changed to match cerberus output
{ {
if ( numcut >= max_num_removed ) if ( numcut >= max_num_removed )
{ {
current_array = sndlocationsarray(); current_array = sndlocationsarray();
} }
_a240 = current_array; foreach ( place in current_array )
_k240 = getFirstArrayKey( _a240 );
while ( isDefined( _k240 ) )
{ {
place = _a240[ _k240 ];
if ( place == activezone ) if ( place == activezone )
{ {
arrayremovevalue( current_array, place ); arrayremovevalue( current_array, place );
break; break;
} }
else
{
_k240 = getNextArrayKey( _a240, _k240 );
}
} }
return current_array; return current_array;
} }
sndlocationbetweenrounds() sndlocationbetweenrounds() //checked partially changed to match cerberus output see info.md
{ {
level endon( "newzoneActive" ); level endon( "newzoneActive" );
activezones = maps/mp/zombies/_zm_zonemgr::get_active_zone_names(); activezones = maps/mp/zombies/_zm_zonemgr::get_active_zone_names();
_a257 = activezones; foreach ( zone in activezones )
_k257 = getFirstArrayKey( _a257 );
while ( isDefined( _k257 ) )
{ {
zone = _a257[ _k257 ];
if ( isDefined( level.sndlastzone ) && zone == level.sndlastzone ) if ( isDefined( level.sndlastzone ) && zone == level.sndlastzone )
{ {
} }
else else
{ {
players = getplayers(); players = getplayers();
_a263 = players; for ( i = 0; i < players.size; i++ )
_k263 = getFirstArrayKey( _a263 );
while ( isDefined( _k263 ) )
{ {
player = _a263[ _k263 ]; if ( is_true( players[ i ].afterlife ) )
if ( is_true( player.afterlife ) )
{ {
} }
else else
{ {
if ( player maps/mp/zombies/_zm_zonemgr::is_player_in_zone( zone ) ) if ( players[ i ] maps/mp/zombies/_zm_zonemgr::is_player_in_zone( zone ) )
{ {
wait 0,1; wait 0.1;
level notify( "newzoneActive" ); level notify( "newzoneActive" );
return; return;
} }
} }
_k263 = getNextArrayKey( _a263, _k263 );
} }
} }
_k257 = getNextArrayKey( _a257, _k257 );
} }
} }
sndlocationbetweenroundswait() sndlocationbetweenroundswait() //checked matches cerberus output
{ {
while ( is_true( level.sndroundwait ) ) while ( is_true( level.sndroundwait ) )
{ {
wait 0,1; wait 0.1;
} }
while ( 1 ) while ( 1 )
{ {
@ -307,22 +277,22 @@ sndlocationbetweenroundswait()
level waittill( "between_round_over" ); level waittill( "between_round_over" );
while ( is_true( level.sndroundwait ) ) while ( is_true( level.sndroundwait ) )
{ {
wait 0,1; wait 0.1;
} }
} }
} }
sndlocationqueue( zone ) sndlocationqueue( zone ) //checked matches cerberus output
{ {
level endon( "newzoneActive" ); level endon( "newzoneActive" );
while ( is_true( level.sndstinger.isplaying ) ) while ( is_true( level.sndstinger.isplaying ) )
{ {
wait 0,5; wait 0.5;
} }
level notify( "newzoneActive" ); level notify( "newzoneActive" );
} }
sndplaystinger( state, player ) sndplaystinger( state, player ) //checked changed to match cerberus output
{ {
s = level.sndstinger; s = level.sndstinger;
if ( !isDefined( s.states[ state ] ) ) if ( !isDefined( s.states[ state ] ) )
@ -345,12 +315,9 @@ sndplaystinger( state, player )
level notify( "sndStingerDone" ); level notify( "sndStingerDone" );
s.isplaying = 0; s.isplaying = 0;
} }
else else if ( s.states[ state ].interrupt == "queue" )
{ {
if ( s.states[ state ].interrupt == "queue" ) level thread sndqueuestinger( state, player );
{
level thread sndqueuestinger( state, player );
}
} }
return; return;
} }
@ -360,7 +327,7 @@ sndplaystinger( state, player )
} }
} }
playstinger( state, player, ignore ) playstinger( state, player, ignore ) //checked matches cerberus output
{ {
s = level.sndstinger; s = level.sndstinger;
if ( !isDefined( s.states[ state ] ) ) if ( !isDefined( s.states[ state ] ) )
@ -396,7 +363,7 @@ playstinger( state, player, ignore )
} }
} }
sndqueuestinger( state, player ) sndqueuestinger( state, player ) //checked changed to match cerberus output
{ {
s = level.sndstinger; s = level.sndstinger;
count = 0; count = 0;
@ -411,16 +378,16 @@ sndqueuestinger( state, player )
{ {
if ( is_true( level.sndroundwait ) || is_true( s.isplaying ) ) if ( is_true( level.sndroundwait ) || is_true( s.isplaying ) )
{ {
wait 0,5; wait 0.5;
count++; count++;
if ( count >= 120 ) if ( count >= 120 )
{ {
return; return;
} }
continue;
} }
else else
{ {
break;
} }
} }
level thread sndplaystinger( state, player ); level thread sndplaystinger( state, player );
@ -428,7 +395,7 @@ sndqueuestinger( state, player )
} }
} }
sndstingerroundwait() sndstingerroundwait() //checked matches cerberus output
{ {
wait 25; wait 25;
level.sndroundwait = 0; level.sndroundwait = 0;
@ -439,14 +406,14 @@ sndstingerroundwait()
} }
} }
sndstingerroundwait_start() sndstingerroundwait_start() //checked matches cerberus output
{ {
level.sndroundwait = 1; level.sndroundwait = 1;
wait 0,05; wait 0.05;
level thread sndstingerroundwait_end(); level thread sndstingerroundwait_end();
} }
sndstingerroundwait_end() sndstingerroundwait_end() //checked matches cerberus output
{ {
level endon( "end_of_round" ); level endon( "end_of_round" );
level waittill( "between_round_over" ); level waittill( "between_round_over" );
@ -454,7 +421,7 @@ sndstingerroundwait_end()
level.sndroundwait = 0; level.sndroundwait = 0;
} }
playstingerstop() playstingerstop() //checked matches cerberus output
{ {
self endon( "sndStingerDone" ); self endon( "sndStingerDone" );
level endon( "sndStingerDone" ); level endon( "sndStingerDone" );
@ -463,23 +430,21 @@ playstingerstop()
self stopsounds(); self stopsounds();
} }
sndmusicegg() sndmusicegg() //checked changed to match cerberus output
{ {
origins = []; origins = [];
origins[ 0 ] = ( 2682,23, 4456,15, -302,352 ); origins[ 0 ] = ( 2682.23, 4456.15, -302.352 );
origins[ 1 ] = ( 721,043, -87,7068, 285,986 ); origins[ 1 ] = ( 721.043, -87.7068, 285.986 );
origins[ 2 ] = ( -674,048, 2536,67, -112,483 ); origins[ 2 ] = ( -674.048, 2536.67, -112.483 );
level.meteor_counter = 0; level.meteor_counter = 0;
level.music_override = 0; level.music_override = 0;
i = 0; for ( i = 0; i < origins.size; i++ )
while ( i < origins.size )
{ {
level thread sndmusicegg_wait( origins[ i ] ); level thread sndmusicegg_wait( origins[ i ] );
i++;
} }
} }
sndmusicegg_wait( bottle_origin ) sndmusicegg_wait( bottle_origin ) //checked matches cerberus output
{ {
temp_ent = spawn( "script_origin", bottle_origin ); temp_ent = spawn( "script_origin", bottle_origin );
temp_ent playloopsound( "zmb_meteor_loop" ); temp_ent playloopsound( "zmb_meteor_loop" );
@ -494,12 +459,12 @@ sndmusicegg_wait( bottle_origin )
} }
else else
{ {
wait 1,5; wait 1.5;
temp_ent delete(); temp_ent delete();
} }
} }
sndmusicegg_override() sndmusicegg_override() //checked matches cerberus output
{ {
if ( is_true( level.music_override ) ) if ( is_true( level.music_override ) )
{ {
@ -508,7 +473,7 @@ sndmusicegg_override()
return 1; return 1;
} }
sndmuseggplay( ent, alias, time ) sndmuseggplay( ent, alias, time ) //checked matches cerberus output
{ {
level.music_override = 1; level.music_override = 1;
wait 1; wait 1;
@ -519,19 +484,19 @@ sndmuseggplay( ent, alias, time )
level waittill_either( "end_game", "sndSongDone" ); level waittill_either( "end_game", "sndSongDone" );
ent stopsounds(); ent stopsounds();
level setclientfield( "mus_zmb_egg_snapshot_loop", 0 ); level setclientfield( "mus_zmb_egg_snapshot_loop", 0 );
wait 0,05; wait 0.05;
ent delete(); ent delete();
level.music_override = 0; level.music_override = 0;
} }
sndeggmusicwait( time ) sndeggmusicwait( time ) //checked matches cerberus output
{ {
level endon( "end_game" ); level endon( "end_game" );
wait time; wait time;
level notify( "sndSongDone" ); level notify( "sndSongDone" );
} }
sndplaystingerwithoverride( alias, length ) sndplaystingerwithoverride( alias, length ) //checked matches cerberus output
{ {
shouldplay = sndwait(); shouldplay = sndwait();
if ( !shouldplay ) if ( !shouldplay )
@ -546,11 +511,11 @@ sndplaystingerwithoverride( alias, length )
wait length; wait length;
level setclientfield( "mus_zmb_egg_snapshot_loop", 0 ); level setclientfield( "mus_zmb_egg_snapshot_loop", 0 );
level.music_override = 0; level.music_override = 0;
wait 0,05; wait 0.05;
ent delete(); ent delete();
} }
sndwait() sndwait() //checked matches cerberus output
{ {
counter = 0; counter = 0;
while ( is_true( level.music_override ) ) while ( is_true( level.music_override ) )
@ -565,33 +530,30 @@ sndwait()
return 1; return 1;
} }
snddoormusictrigs() snddoormusictrigs() //checked changed to match cerberus output
{ {
trigs = getentarray( "sndMusicDoor", "script_noteworthy" ); trigs = getentarray( "sndMusicDoor", "script_noteworthy" );
_a557 = trigs; foreach ( trig in trigs )
_k557 = getFirstArrayKey( _a557 );
while ( isDefined( _k557 ) )
{ {
trig = _a557[ _k557 ];
trig thread snddoormusic(); trig thread snddoormusic();
_k557 = getNextArrayKey( _a557, _k557 );
} }
} }
snddoormusic() snddoormusic() //checked changed to match cerberus output
{ {
self endon( "sndDoorMusic_Triggered" ); self endon( "sndDoorMusic_Triggered" );
for ( ;; ) while ( 1 )
{ {
while ( 1 ) self waittill( "trigger" );
if ( is_true( level.music_override ) )
{ {
self waittill( "trigger" ); wait 0.1;
if ( is_true( level.music_override ) )
{
wait 0,1;
}
} }
else } else
{
break;
}
}
if ( isDefined( self.target ) ) if ( isDefined( self.target ) )
{ {
ent = getent( self.target, "targetname" ); ent = getent( self.target, "targetname" );
@ -600,7 +562,7 @@ snddoormusic()
level thread sndplaystingerwithoverride( self.script_sound, self.script_int ); level thread sndplaystingerwithoverride( self.script_sound, self.script_int );
} }
sndmaelstrom() sndmaelstrom() //checked matches cerberus output
{ {
trig = getent( "sndMaelstrom", "targetname" ); trig = getent( "sndMaelstrom", "targetname" );
if ( !isDefined( trig ) ) if ( !isDefined( trig ) )
@ -616,11 +578,11 @@ sndmaelstrom()
level setclientfield( "sndMaelstromPlr" + who getentitynumber(), 1 ); level setclientfield( "sndMaelstromPlr" + who getentitynumber(), 1 );
} }
who thread sndmaelstrom_timeout(); who thread sndmaelstrom_timeout();
wait 0,1; wait 0.1;
} }
} }
sndmaelstrom_timeout() sndmaelstrom_timeout() //checked matches cerberus output
{ {
self notify( "sndMaelstrom_Timeout" ); self notify( "sndMaelstrom_Timeout" );
self endon( "sndMaelstrom_Timeout" ); self endon( "sndMaelstrom_Timeout" );
@ -629,7 +591,7 @@ sndmaelstrom_timeout()
level setclientfield( "sndMaelstromPlr" + self getentitynumber(), 0 ); level setclientfield( "sndMaelstromPlr" + self getentitynumber(), 0 );
} }
snd115egg() snd115egg() //checked changed to match cerberus output
{ {
level.snd115count = 0; level.snd115count = 0;
oneorigin = []; oneorigin = [];
@ -638,25 +600,17 @@ snd115egg()
fiveorigin = []; fiveorigin = [];
fiveorigin[ 0 ] = ( -2459, 176, 243 ); fiveorigin[ 0 ] = ( -2459, 176, 243 );
fiveorigin[ 1 ] = ( -2792, 175, 243 ); fiveorigin[ 1 ] = ( -2792, 175, 243 );
_a625 = oneorigin; foreach ( origin in oneorigin )
_k625 = getFirstArrayKey( _a625 );
while ( isDefined( _k625 ) )
{ {
origin = _a625[ _k625 ];
level thread snd115egg_wait( origin, 0 ); level thread snd115egg_wait( origin, 0 );
_k625 = getNextArrayKey( _a625, _k625 );
} }
_a628 = fiveorigin; foreach ( origin in fiveorigin )
_k628 = getFirstArrayKey( _a628 );
while ( isDefined( _k628 ) )
{ {
origin = _a628[ _k628 ];
level thread snd115egg_wait( origin, 1 ); level thread snd115egg_wait( origin, 1 );
_k628 = getNextArrayKey( _a628, _k628 );
} }
} }
snd115egg_wait( origin, shouldwait ) snd115egg_wait( origin, shouldwait ) //checked matches cerberus output
{ {
level endon( "sndEnd115" ); level endon( "sndEnd115" );
temp_ent = spawn( "script_origin", origin ); temp_ent = spawn( "script_origin", origin );
@ -685,7 +639,7 @@ snd115egg_wait( origin, shouldwait )
} }
} }
snd115egg_1_override() snd115egg_1_override() //checked matches cerberus output
{ {
stance = self getstance(); stance = self getstance();
if ( is_true( level.music_override ) || stance != "prone" ) if ( is_true( level.music_override ) || stance != "prone" )
@ -695,19 +649,21 @@ snd115egg_1_override()
return 1; return 1;
} }
snd115egg_5_override() snd115egg_5_override() //checked matches cerberus output
{ {
stance = self getstance(); stance = self getstance();
if ( !is_true( level.music_override ) || stance != "prone" && level.snd115count < 2 ) if ( !is_true( level.music_override ) || stance != "prone" || level.snd115count < 2 )
{ {
return 0; return 0;
} }
return 1; return 1;
} }
snddelete115ent() snddelete115ent() //checked matches cerberus output
{ {
self endon( "sndDeleting" ); self endon( "sndDeleting" );
level waittill( "sndEnd115" ); level waittill( "sndEnd115" );
self delete(); self delete();
} }

7
zm_tomb_patch/readme.md
View File

@ -1,10 +1,13 @@
### The following gscs compile and run successfully with no known errors: ### The following gscs compile and run successfully with no known errors:
``` ```
zm_tomb_patch/maps/mp/zm_tomb.gsc zm_tomb_patch/maps/mp/zm_tomb.gsc
zm_tomb_patch/maps/mp/zm_tomb_dig.gsc
zm_tomb_patch/maps/mp/zombies/_zm_perk_random.gsc zm_tomb_patch/maps/mp/zombies/_zm_perk_random.gsc
``` ```
### The following scripts compile and run successfully with minor errors: ### The following scripts compile and run successfully with minor errors:
```
zm_tomb_patch/maps/mp/zm_tomb_amb.gsc
```
### The following scripts compile and run successfully with major errors: ### The following scripts compile and run successfully with major errors:
### The following scripts compile and run serverside but clients cannot join due to exe_client_field_mismatch ### The following scripts compile and run serverside but clients cannot join due to exe_client_field_mismatch
@ -19,14 +22,12 @@ zm_tomb_patch/maps/mp/zm_tomb_main_quest.gsc
### The following scripts are not checked yet, uploaded to setup a baseline: ### The following scripts are not checked yet, uploaded to setup a baseline:
``` ```
zm_tomb_patch/maps/mp/zm_tomb_achivement.gsc zm_tomb_patch/maps/mp/zm_tomb_achivement.gsc
zm_tomb_patch/maps/mp/zm_tomb_amb.gsc
zm_tomb_patch/maps/mp/zm_tomb_ambient_scripts.gsc zm_tomb_patch/maps/mp/zm_tomb_ambient_scripts.gsc
zm_tomb_patch/maps/mp/zm_tomb_capture_zones.gsc zm_tomb_patch/maps/mp/zm_tomb_capture_zones.gsc
zm_tomb_patch/maps/mp/zm_tomb_capture_zones_ffotd.gsc zm_tomb_patch/maps/mp/zm_tomb_capture_zones_ffotd.gsc
zm_tomb_patch/maps/mp/zm_tomb_challenges.gsc zm_tomb_patch/maps/mp/zm_tomb_challenges.gsc
zm_tomb_patch/maps/mp/zm_tomb_chamber.gsc zm_tomb_patch/maps/mp/zm_tomb_chamber.gsc
zm_tomb_patch/maps/mp/zm_tomb_classic.gsc zm_tomb_patch/maps/mp/zm_tomb_classic.gsc
zm_tomb_patch/maps/mp/zm_tomb_dig.gsc
zm_tomb_patch/maps/mp/zm_tomb_distance_tracking.gsc zm_tomb_patch/maps/mp/zm_tomb_distance_tracking.gsc
zm_tomb_patch/maps/mp/zm_tomb_ee_lights.gsc zm_tomb_patch/maps/mp/zm_tomb_ee_lights.gsc
zm_tomb_patch/maps/mp/zm_tomb_ee_main.gsc zm_tomb_patch/maps/mp/zm_tomb_ee_main.gsc