From dd5046dc45cc8a68f86cb4ecaf52c43a2305af11 Mon Sep 17 00:00:00 2001 From: JezuzLizard Date: Wed, 30 Sep 2020 08:22:43 -0700 Subject: [PATCH] Checked 14 zm_transit_patch scripts Checked zstandard.gsc, zgrief.gsc, zm_transit_fx.gsc, zm_transit_gamemodes.gsc, zm_transit_grief_farm.gsc, zm_transit_grief_station.gsc, zm_transit_grief_town.gsc, zm_transit_standard_farm.gsc, zm_transit_standard_town.gsc, zm_game_module_grief.gsc, zm_game_module_meat.gsc, zm_game_module_standard.gsc, zm_game_module_utility.gsc, and _zm_weap_bowie.gsc. --- .../maps/mp/gametypes_zm/zgrief.gsc | 142 +++++++++--------- .../maps/mp/gametypes_zm/zstandard.gsc | 14 +- zm_transit_patch/maps/mp/zm_transit_fx.gsc | 9 +- .../maps/mp/zm_transit_gamemodes.gsc | 30 ++-- .../maps/mp/zm_transit_grief_farm.gsc | 25 ++- .../maps/mp/zm_transit_grief_station.gsc | 15 +- .../maps/mp/zm_transit_grief_town.gsc | 11 +- .../maps/mp/zm_transit_standard_farm.gsc | 25 ++- .../maps/mp/zm_transit_standard_town.gsc | 9 +- .../maps/mp/zombies/_zm_game_module_grief.gsc | 4 +- .../maps/mp/zombies/_zm_game_module_meat.gsc | 1 + .../mp/zombies/_zm_game_module_standard.gsc | 1 + .../mp/zombies/_zm_game_module_utility.gsc | 13 +- .../maps/mp/zombies/_zm_weap_bowie.gsc | 4 +- zm_transit_patch/readme.md | 28 ++-- 15 files changed, 168 insertions(+), 163 deletions(-) diff --git a/zm_transit_patch/maps/mp/gametypes_zm/zgrief.gsc b/zm_transit_patch/maps/mp/gametypes_zm/zgrief.gsc index 7c3bcf7..0bd0408 100644 --- a/zm_transit_patch/maps/mp/gametypes_zm/zgrief.gsc +++ b/zm_transit_patch/maps/mp/gametypes_zm/zgrief.gsc @@ -108,7 +108,7 @@ custom_end_screen() //checked changed to match cerberus output winner_text = &"ZOMBIE_GRIEF_WIN_SINGLE"; loser_text = &"ZOMBIE_GRIEF_LOSE_SINGLE"; } - if ( isDefined( level.host_ended_game ) && level.host_ended_game ) + if ( is_true( level.host_ended_game ) ) { players[ i ].survived_hud settext( &"MP_HOST_ENDED_GAME" ); } @@ -138,12 +138,12 @@ postinit_func() //checked matches cerberus output level._get_game_module_players = undefined; level.powerup_drop_count = 0; level.is_zombie_level = 1; - level._effect["meat_impact"] = loadfx("maps/zombie/fx_zmb_meat_impact"); - level._effect["spawn_cloud"] = loadfx("maps/zombie/fx_zmb_race_zombie_spawn_cloud"); - level._effect["meat_stink_camera"] = loadfx("maps/zombie/fx_zmb_meat_stink_camera"); - level._effect["meat_stink_torso"] = loadfx("maps/zombie/fx_zmb_meat_stink_torso"); + level._effect[ "meat_impact" ] = loadfx( "maps/zombie/fx_zmb_meat_impact" ); + level._effect[ "spawn_cloud" ] = loadfx( "maps/zombie/fx_zmb_race_zombie_spawn_cloud" ); + level._effect[ "meat_stink_camera" ] = loadfx( "maps/zombie/fx_zmb_meat_stink_camera" ); + level._effect[ "meat_stink_torso" ] = loadfx( "maps/zombie/fx_zmb_meat_stink_torso" ); include_powerup("meat_stink"); - maps/mp/zombies/_zm_powerups::add_zombie_powerup("meat_stink", "t6_wpn_zmb_meat_world", &"ZOMBIE_POWERUP_MAX_AMMO", ::func_should_drop_meat, 0, 0, 0); + maps/mp/zombies/_zm_powerups::add_zombie_powerup( "meat_stink", "t6_wpn_zmb_meat_world", &"ZOMBIE_POWERUP_MAX_AMMO", ::func_should_drop_meat, 0, 0, 0 ); setmatchtalkflag( "DeadChatWithDead", 1 ); setmatchtalkflag( "DeadChatWithTeam", 1 ); setmatchtalkflag( "DeadHearTeamLiving", 1 ); @@ -153,7 +153,7 @@ postinit_func() //checked matches cerberus output func_should_drop_meat() //checked matches cerberus output { - if(minigun_no_drop()) + if ( minigun_no_drop() ) { return 0; } @@ -163,14 +163,14 @@ func_should_drop_meat() //checked matches cerberus output minigun_no_drop() //checked matches cerberus output { players = get_players(); - for(i = 0; i < players.size; i++) + for ( i = 0; i < players.size; i++ ) { - if(players[i].ignoreme == 1) + if ( players[ i ].ignoreme == 1 ) { return 1; } } - if(isdefined(level.meat_on_ground) && level.meat_on_ground) + if ( is_true( level.meat_on_ground) ) { return 1; } @@ -184,7 +184,7 @@ grief_game_end_check_func() //checked matches cerberus output player_prevent_damage( einflictor, eattacker, idamage, idflags, smeansofdeath, sweapon, vpoint, vdir, shitloc, psoffsettime ) //checked matches cerberus output { - if ( isDefined( eattacker ) && isplayer( eattacker ) && self != eattacker && !eattacker hasperk( "specialty_noname" ) && isDefined( self.is_zombie ) && !self.is_zombie ) + if ( isDefined( eattacker ) && isplayer( eattacker ) && self != eattacker && !eattacker hasperk( "specialty_noname" ) && !is_true( self.is_zombie )) { return 1; } @@ -255,12 +255,12 @@ kill_start_chest() //checked matches cerberus output start_chest maps/mp/zombies/_zm_magicbox::hide_chest(); } -meat_stink_powerup_grab(powerup, who) //checked matches cerberus output +meat_stink_powerup_grab( powerup, who ) //checked matches cerberus output { - switch(powerup.powerup_name) + switch ( powerup.powerup_name ) { case "meat_stink": - level thread meat_stink(who); + level thread meat_stink( who ); break; } } @@ -269,56 +269,56 @@ meat_stink(who) //checked matches cerberus output { weapons = who getweaponslist(); has_meat = 0; - foreach(weapon in weapons) + foreach ( weapon in weapons ) { - if(weapon == "item_meat_zm") + if ( weapon == "item_meat_zm" ) { has_meat = 1; } } - if(has_meat) + if ( has_meat ) { return; } who.pre_meat_weapon = who getcurrentweapon(); - level notify("meat_grabbed"); - who notify("meat_grabbed"); - who playsound("zmb_pickup_meat"); + level notify( "meat_grabbed" ); + who notify( "meat_grabbed" ); + who playsound( "zmb_pickup_meat" ); who increment_is_drinking(); - who giveweapon("item_meat_zm"); - who switchtoweapon("item_meat_zm"); - who setweaponammoclip("item_meat_zm", 1); + who giveweapon( "item_meat_zm" ); + who switchtoweapon( "item_meat_zm" ); + who setweaponammoclip( "item_meat_zm", 1 ); } meat_stink_on_ground(position_to_play) //checked matches cerberus output { level.meat_on_ground = 1; - attractor_point = spawn("script_model", position_to_play); - attractor_point setmodel("tag_origin"); - attractor_point playsound("zmb_land_meat"); - wait(0.2); - playfxontag(level._effect["meat_stink_torso"], attractor_point, "tag_origin"); - attractor_point playloopsound("zmb_meat_flies"); - attractor_point create_zombie_point_of_interest(1536, 32, 10000); + attractor_point = spawn( "script_model", position_to_play ); + attractor_point setmodel( "tag_origin" ); + attractor_point playsound( "zmb_land_meat" ); + wait 0.2 ; + playfxontag( level._effect[ "meat_stink_torso" ], attractor_point, "tag_origin" ); + attractor_point playloopsound( "zmb_meat_flies" ); + attractor_point create_zombie_point_of_interest( 1536, 32, 10000 ); attractor_point.attract_to_origin = 1; - attractor_point thread create_zombie_point_of_interest_attractor_positions(4, 45); + attractor_point thread create_zombie_point_of_interest_attractor_positions( 4, 45 ); attractor_point thread maps/mp/zombies/_zm_weap_cymbal_monkey::wait_for_attractor_positions_complete(); - attractor_point delay_thread(15, ::self_delete); - wait(16); + attractor_point delay_thread( 15, ::self_delete ); + wait 16 ; level.meat_on_ground = undefined; } -meat_bounce_override(pos, normal, ent) //checked matches cerberus output +meat_bounce_override( pos, normal, ent ) //checked matches cerberus output { - if(isdefined(ent) && isplayer(ent)) + if ( isdefined( ent ) && isplayer( ent ) ) { - if(!ent maps/mp/zombies/_zm_laststand::player_is_in_laststand()) + if ( !ent maps/mp/zombies/_zm_laststand::player_is_in_laststand() ) { - level thread meat_stink_player(ent); - if(isdefined(self.owner)) + level thread meat_stink_player( ent ); + if(isdefined( self.owner ) ) { - maps/mp/_demo::bookmark("zm_player_meat_stink", GetTime(), ent, self.owner, 0, self); - self.owner maps/mp/zombies/_zm_stats::increment_client_stat("contaminations_given"); + maps/mp/_demo::bookmark( "zm_player_meat_stink", GetTime(), ent, self.owner, 0, self ); + self.owner maps/mp/zombies/_zm_stats::increment_client_stat( "contaminations_given" ); } } } @@ -330,66 +330,66 @@ meat_bounce_override(pos, normal, ent) //checked matches cerberus output player_index = 0; while ( player_index < players.size ) { - player_to_check = players[player_index]; - if(self.owner == player_to_check) + player_to_check = players[ player_index ]; + if ( self.owner == player_to_check ) { player_index++; continue; } - if(player_to_check maps/mp/zombies/_zm_laststand::player_is_in_laststand()) + if ( player_to_check maps/mp/zombies/_zm_laststand::player_is_in_laststand() ) { player_index++; continue; } - distsq = distancesquared(pos, player_to_check.origin); - if(distsq < closest_player_dist) + distsq = distancesquared( pos, player_to_check.origin ); + if ( distsq < closest_player_dist ) { closest_player = player_to_check; closest_player_dist = distsq; } player_index++; } - if(isdefined(closest_player)) + if ( isdefined( closest_player ) ) { - level thread meat_stink_player(closest_player); - if(isdefined(self.owner)) + level thread meat_stink_player( closest_player ); + if ( isdefined( self.owner ) ) { - maps/mp/_demo::bookmark("zm_player_meat_stink", GetTime(), closest_player, self.owner, 0, self); - self.owner maps/mp/zombies/_zm_stats::increment_client_stat("contaminations_given"); + maps/mp/_demo::bookmark( "zm_player_meat_stink", GetTime(), closest_player, self.owner, 0, self ); + self.owner maps/mp/zombies/_zm_stats::increment_client_stat( "contaminations_given" ); } } else { - valid_poi = check_point_in_enabled_zone(pos, undefined, undefined); - if(valid_poi) + valid_poi = check_point_in_enabled_zone( pos, undefined, undefined ); + if ( valid_poi ) { self hide(); - level thread meat_stink_on_ground(self.origin); + level thread meat_stink_on_ground( self.origin ); } } - playfx(level._effect["meat_impact"], self.origin); + playfx( level._effect[ "meat_impact" ], self.origin ); } self delete(); } -meat_stink_player(who) //checked matches cerberus output +meat_stink_player( who ) //checked matches cerberus output { - level notify("new_meat_stink_player"); - level endon("new_meat_stink_player"); + level notify( "new_meat_stink_player" ); + level endon( "new_meat_stink_player" ); who.ignoreme = 0; players = get_players(); - foreach(player in players) + foreach ( player in players ) { player thread meat_stink_player_cleanup(); - if(player != who) + if ( player != who ) { player.ignoreme = 1; } } who thread meat_stink_player_create(); - who waittill_any_or_timeout(30, "disconnect", "player_downed", "bled_out"); + who waittill_any_or_timeout( 30, "disconnect", "player_downed", "bled_out" ); players = get_players(); - foreach(player in players) + foreach ( player in players ) { player thread meat_stink_player_cleanup(); player.ignoreme = 0; @@ -398,26 +398,26 @@ meat_stink_player(who) //checked matches cerberus output meat_stink_player_create() //checked matches cerberus output { - self maps/mp/zombies/_zm_stats::increment_client_stat("contaminations_received"); - self endon("disconnect"); - self endon("death"); + self maps/mp/zombies/_zm_stats::increment_client_stat( "contaminations_received" ); + self endon( "disconnect" ); + self endon( "death" ); tagname = "J_SpineLower"; - self.meat_stink_3p = spawn("script_model", self gettagorigin(tagname)); - self.meat_stink_3p setmodel("tag_origin"); - self.meat_stink_3p linkto(self, tagname); + self.meat_stink_3p = spawn( "script_model", self gettagorigin( tagname ) ); + self.meat_stink_3p setmodel( "tag_origin" ); + self.meat_stink_3p linkto( self, tagname ); wait 0.5; - playfxontag(level._effect["meat_stink_torso"], self.meat_stink_3p, "tag_origin"); - self setclientfieldtoplayer("meat_stink", 1); + playfxontag( level._effect[ "meat_stink_torso" ], self.meat_stink_3p, "tag_origin" ); + self setclientfieldtoplayer( "meat_stink", 1 ); } meat_stink_player_cleanup() //checked matches cerberus output { - if(isdefined(self.meat_stink_3p)) + if ( isdefined( self.meat_stink_3p ) ) { self.meat_stink_3p unlink(); self.meat_stink_3p delete(); } - self setclientfieldtoplayer("meat_stink", 0); + self setclientfieldtoplayer( "meat_stink", 0 ); } door_close_zombie_think() //checked changed to match cerberus output diff --git a/zm_transit_patch/maps/mp/gametypes_zm/zstandard.gsc b/zm_transit_patch/maps/mp/gametypes_zm/zstandard.gsc index 95e51ef..c380171 100644 --- a/zm_transit_patch/maps/mp/gametypes_zm/zstandard.gsc +++ b/zm_transit_patch/maps/mp/gametypes_zm/zstandard.gsc @@ -1,21 +1,23 @@ +//checked includes match cerberus output #include maps/mp/zombies/_zm; #include maps/mp/zombies/_zm_ai_dogs; #include maps/mp/zombies/_zm_stats; +#include maps/mp/gametypes_zm/_zm_gametype; #include common_scripts/utility; #include maps/mp/gametypes_zm/_hud_util; #include maps/mp/_utility; -main() +main() //checked matches cerberus output { maps/mp/gametypes_zm/_zm_gametype::main(); level.onprecachegametype = ::onprecachegametype; level.onstartgametype = ::onstartgametype; - level._game_module_custom_spawn_init_func = ::maps/mp/gametypes_zm/_zm_gametype::custom_spawn_init_func; - level._game_module_stat_update_func = ::maps/mp/zombies/_zm_stats::survival_classic_custom_stat_update; + level._game_module_custom_spawn_init_func = maps/mp/gametypes_zm/_zm_gametype::custom_spawn_init_func; + level._game_module_stat_update_func = maps/mp/zombies/_zm_stats::survival_classic_custom_stat_update; maps/mp/gametypes_zm/_zm_gametype::post_gametype_main( "zstandard" ); } -onprecachegametype() +onprecachegametype() //checked matches cerberus output { level.playersuicideallowed = 1; level.canplayersuicide = ::canplayersuicide; @@ -25,13 +27,13 @@ onprecachegametype() maps/mp/gametypes_zm/_zm_gametype::rungametypeprecache( "zstandard" ); } -onstartgametype() +onstartgametype() //checked matches cerberus output { maps/mp/gametypes_zm/_zm_gametype::setup_classic_gametype(); maps/mp/gametypes_zm/_zm_gametype::rungametypemain( "zstandard", ::zstandard_main ); } -zstandard_main() +zstandard_main() //checked matches cerberus output { level.dog_rounds_allowed = getgametypesetting( "allowdogs" ); if ( level.dog_rounds_allowed ) diff --git a/zm_transit_patch/maps/mp/zm_transit_fx.gsc b/zm_transit_patch/maps/mp/zm_transit_fx.gsc index 1fd55fe..6a3fbc3 100644 --- a/zm_transit_patch/maps/mp/zm_transit_fx.gsc +++ b/zm_transit_patch/maps/mp/zm_transit_fx.gsc @@ -1,6 +1,9 @@ +//checked includes match cerberus output +#include maps/mp/createart/zm_transit_art; +#include maps/mp/createfx/zm_transit_fx; #include maps/mp/_utility; -main() +main() //checked matches cerberus output { precache_createfx_fx(); precache_scripted_fx(); @@ -8,7 +11,7 @@ main() maps/mp/createart/zm_transit_art::main(); } -precache_scripted_fx() +precache_scripted_fx() //checked matches cerberus output { level._effect[ "switch_sparks" ] = loadfx( "env/electrical/fx_elec_wire_spark_burst" ); level._effect[ "maxis_sparks" ] = loadfx( "maps/zombie/fx_zmb_race_trail_grief" ); @@ -38,7 +41,7 @@ precache_scripted_fx() level._effect[ "mc_towerlight" ] = loadfx( "maps/zombie/fx_zmb_morsecode_loop" ); } -precache_createfx_fx() +precache_createfx_fx() //checked matches cerberus output { level._effect[ "fx_insects_swarm_md_light" ] = loadfx( "bio/insects/fx_insects_swarm_md_light" ); level._effect[ "fx_zmb_tranzit_flourescent_flicker" ] = loadfx( "maps/zombie/fx_zmb_tranzit_flourescent_flicker" ); diff --git a/zm_transit_patch/maps/mp/zm_transit_gamemodes.gsc b/zm_transit_patch/maps/mp/zm_transit_gamemodes.gsc index 8a2e522..2e92c99 100644 --- a/zm_transit_patch/maps/mp/zm_transit_gamemodes.gsc +++ b/zm_transit_patch/maps/mp/zm_transit_gamemodes.gsc @@ -1,3 +1,11 @@ +//checked includes changed to match cerberus output +#include maps/mp/zm_transit_grief_town; +#include maps/mp/zm_transit_grief_farm; +#include maps/mp/zm_transit_grief_station; +#include maps/mp/zm_transit_standard_town; +#include maps/mp/zm_transit_standard_farm; +#include maps/mp/zm_transit_standard_station; +#include maps/mp/zm_transit_classic; #include maps/mp/zm_transit; #include maps/mp/gametypes_zm/_zm_gametype; #include maps/mp/zm_transit_utility; @@ -6,16 +14,16 @@ #include maps/mp/_utility; #include common_scripts/utility; -init() +init() //checked matches cerberus output { - add_map_gamemode( "zclassic", ::maps/mp/zm_transit::zclassic_preinit, undefined, undefined ); - add_map_gamemode( "zgrief", ::maps/mp/zm_transit::zgrief_preinit, undefined, undefined ); - add_map_gamemode( "zstandard", ::maps/mp/zm_transit::zstandard_preinit, undefined, undefined ); - add_map_location_gamemode( "zclassic", "transit", ::maps/mp/zm_transit_classic::precache, ::maps/mp/zm_transit_classic::main ); - add_map_location_gamemode( "zstandard", "transit", ::maps/mp/zm_transit_standard_station::precache, ::maps/mp/zm_transit_standard_station::main ); - add_map_location_gamemode( "zstandard", "farm", ::maps/mp/zm_transit_standard_farm::precache, ::maps/mp/zm_transit_standard_farm::main ); - add_map_location_gamemode( "zstandard", "town", ::maps/mp/zm_transit_standard_town::precache, ::maps/mp/zm_transit_standard_town::main ); - add_map_location_gamemode( "zgrief", "transit", ::maps/mp/zm_transit_grief_station::precache, ::maps/mp/zm_transit_grief_station::main ); - add_map_location_gamemode( "zgrief", "farm", ::maps/mp/zm_transit_grief_farm::precache, ::maps/mp/zm_transit_grief_farm::main ); - add_map_location_gamemode( "zgrief", "town", ::maps/mp/zm_transit_grief_town::precache, ::maps/mp/zm_transit_grief_town::main ); + add_map_gamemode( "zclassic", maps/mp/zm_transit::zclassic_preinit, undefined, undefined ); + add_map_gamemode( "zgrief", maps/mp/zm_transit::zgrief_preinit, undefined, undefined ); + add_map_gamemode( "zstandard", maps/mp/zm_transit::zstandard_preinit, undefined, undefined ); + add_map_location_gamemode( "zclassic", "transit", maps/mp/zm_transit_classic::precache, maps/mp/zm_transit_classic::main ); + add_map_location_gamemode( "zstandard", "transit", maps/mp/zm_transit_standard_station::precache, maps/mp/zm_transit_standard_station::main ); + add_map_location_gamemode( "zstandard", "farm", maps/mp/zm_transit_standard_farm::precache, maps/mp/zm_transit_standard_farm::main ); + add_map_location_gamemode( "zstandard", "town", maps/mp/zm_transit_standard_town::precache, maps/mp/zm_transit_standard_town::main ); + add_map_location_gamemode( "zgrief", "transit", maps/mp/zm_transit_grief_station::precache, maps/mp/zm_transit_grief_station::main ); + add_map_location_gamemode( "zgrief", "farm", maps/mp/zm_transit_grief_farm::precache, maps/mp/zm_transit_grief_farm::main ); + add_map_location_gamemode( "zgrief", "town", maps/mp/zm_transit_grief_town::precache, maps/mp/zm_transit_grief_town::main ); } diff --git a/zm_transit_patch/maps/mp/zm_transit_grief_farm.gsc b/zm_transit_patch/maps/mp/zm_transit_grief_farm.gsc index f95017b..4a8f4e7 100644 --- a/zm_transit_patch/maps/mp/zm_transit_grief_farm.gsc +++ b/zm_transit_patch/maps/mp/zm_transit_grief_farm.gsc @@ -1,3 +1,4 @@ +//checked includes match cerberus output #include maps/mp/gametypes_zm/zmeat; #include maps/mp/zombies/_zm_game_module; #include maps/mp/zombies/_zm_zonemgr; @@ -7,11 +8,11 @@ #include common_scripts/utility; #include maps/mp/_utility; -precache() +precache() //checked matches cerberus output { } -farm_treasure_chest_init() +farm_treasure_chest_init() //checked matches cerberus output { chest1 = getstruct( "farm_chest", "script_noteworthy" ); level.chests = []; @@ -19,7 +20,7 @@ farm_treasure_chest_init() maps/mp/zombies/_zm_magicbox::treasure_chest_init( "farm_chest" ); } -main() +main() //checked matches cerberus output { maps/mp/gametypes_zm/_zm_gametype::setup_standard_objects( "farm" ); init_standard_farm(); @@ -44,15 +45,12 @@ main() #/ } -init_standard_farm() +init_standard_farm() //checked partially changed to match cerberus output see info.md No. 1, No. 2 { maps/mp/zombies/_zm_game_module::set_current_game_module( level.game_module_standard_index ); ents = getentarray(); - _a81 = ents; - _k81 = getFirstArrayKey( _a81 ); - while ( isDefined( _k81 ) ) + foreach ( ent in ents ) { - ent = _a81[ _k81 ]; if ( isDefined( ent.script_flag ) && ent.script_flag == "OnFarm_enter" ) { ent delete(); @@ -63,16 +61,12 @@ init_standard_farm() { tokens = strtok( ent.script_parameters, " " ); remove = 0; - _a92 = tokens; - _k92 = getFirstArrayKey( _a92 ); - while ( isDefined( _k92 ) ) + for ( i = 0; i < tokens.size; i++ ) { - token = _a92[ _k92 ]; - if ( token == "standard_remove" ) + if ( tokens[ i ] == "standard_remove" ) { remove = 1; } - _k92 = getNextArrayKey( _a92, _k92 ); } if ( remove ) { @@ -80,11 +74,10 @@ init_standard_farm() } } } - _k81 = getNextArrayKey( _a81, _k81 ); } } -enemy_location_override( zombie, enemy ) +enemy_location_override( zombie, enemy ) //checked matches cerberus output { location = enemy.origin; if ( is_true( self.reroute ) ) diff --git a/zm_transit_patch/maps/mp/zm_transit_grief_station.gsc b/zm_transit_patch/maps/mp/zm_transit_grief_station.gsc index 54dbbf7..6f67f15 100644 --- a/zm_transit_patch/maps/mp/zm_transit_grief_station.gsc +++ b/zm_transit_patch/maps/mp/zm_transit_grief_station.gsc @@ -1,3 +1,4 @@ +//checked includes match cerberus output #include maps/mp/gametypes_zm/zmeat; #include maps/mp/zombies/_zm_game_module; #include maps/mp/zombies/_zm_perks; @@ -7,12 +8,12 @@ #include common_scripts/utility; #include maps/mp/_utility; -precache() +precache() //checked matches cerberus output { precachemodel( "zm_collision_transit_busdepot_survival" ); } -station_treasure_chest_init() +station_treasure_chest_init() //checked matches cerberus output { chest1 = getstruct( "depot_chest", "script_noteworthy" ); level.chests = []; @@ -20,7 +21,7 @@ station_treasure_chest_init() maps/mp/zombies/_zm_magicbox::treasure_chest_init( "depot_chest" ); } -main() +main() //checked changed to match cerberus output { maps/mp/gametypes_zm/_zm_gametype::setup_standard_objects( "station" ); station_treasure_chest_init(); @@ -30,13 +31,9 @@ main() collision disconnectpaths(); flag_wait( "initial_blackscreen_passed" ); nodes = getnodearray( "classic_only_traversal", "targetname" ); - _a44 = nodes; - _k44 = getFirstArrayKey( _a44 ); - while ( isDefined( _k44 ) ) + foreach ( node in nodes ) { - node = _a44[ _k44 ]; unlink_nodes( node, getnode( node.target, "targetname" ) ); - _k44 = getNextArrayKey( _a44, _k44 ); } level thread maps/mp/zombies/_zm_perks::perk_machine_removal( "specialty_quickrevive", "p_glo_tools_chest_tall" ); maps/mp/zombies/_zm_game_module::turn_power_on_and_open_doors(); @@ -45,7 +42,7 @@ main() #/ } -enemy_location_override( zombie, enemy ) +enemy_location_override( zombie, enemy ) //checked matches cerberus output { location = enemy.origin; if ( is_true( self.reroute ) ) diff --git a/zm_transit_patch/maps/mp/zm_transit_grief_town.gsc b/zm_transit_patch/maps/mp/zm_transit_grief_town.gsc index 3f5f08b..aa9dd34 100644 --- a/zm_transit_patch/maps/mp/zm_transit_grief_town.gsc +++ b/zm_transit_patch/maps/mp/zm_transit_grief_town.gsc @@ -1,3 +1,4 @@ +//checked includes match cerberus output #include maps/mp/gametypes_zm/zmeat; #include maps/mp/zombies/_zm_game_module; #include maps/mp/gametypes_zm/_zm_gametype; @@ -7,12 +8,12 @@ #include common_scripts/utility; #include maps/mp/_utility; -precache() +precache() //checked matches cerberus output { precachemodel( "zm_collision_transit_town_survival" ); } -town_treasure_chest_init() +town_treasure_chest_init() //checked matches cerberus output { chest1 = getstruct( "town_chest", "script_noteworthy" ); chest2 = getstruct( "town_chest_2", "script_noteworthy" ); @@ -24,7 +25,7 @@ town_treasure_chest_init() maps/mp/zombies/_zm_magicbox::treasure_chest_init( "town_chest" ); } -main() +main() //checked matches cerberus output { maps/mp/gametypes_zm/_zm_gametype::setup_standard_objects( "town" ); town_treasure_chest_init(); @@ -47,12 +48,14 @@ main() level notify( "sleight_on" ); wait_network_frame(); level notify( "Pack_A_Punch_on" ); + /* /# level thread maps/mp/gametypes_zm/zmeat::spawn_level_meat_manager(); #/ + */ } -enemy_location_override( zombie, enemy ) +enemy_location_override( zombie, enemy ) //checked matches cerberus output { location = enemy.origin; if ( is_true( self.reroute ) ) diff --git a/zm_transit_patch/maps/mp/zm_transit_standard_farm.gsc b/zm_transit_patch/maps/mp/zm_transit_standard_farm.gsc index 49f999d..f507f8c 100644 --- a/zm_transit_patch/maps/mp/zm_transit_standard_farm.gsc +++ b/zm_transit_patch/maps/mp/zm_transit_standard_farm.gsc @@ -1,3 +1,4 @@ +//checked includes match cerberus output #include maps/mp/zombies/_zm_game_module; #include maps/mp/zombies/_zm_zonemgr; #include maps/mp/gametypes_zm/_zm_gametype; @@ -7,11 +8,11 @@ #include common_scripts/utility; #include maps/mp/_utility; -precache() +precache() //checked matches cerberus output { } -farm_treasure_chest_init() +farm_treasure_chest_init() //checked matches cerberus output { chest1 = getstruct( "farm_chest", "script_noteworthy" ); level.chests = []; @@ -19,7 +20,7 @@ farm_treasure_chest_init() maps/mp/zombies/_zm_magicbox::treasure_chest_init( "farm_chest" ); } -main() +main() //checked matches cerberus output { maps/mp/gametypes_zm/_zm_gametype::setup_standard_objects( "farm" ); init_standard_farm(); @@ -41,15 +42,12 @@ main() wait_network_frame(); } -init_standard_farm() +init_standard_farm() //checked partially changed to match cerberus output see info.md No. 1, No. 2 { maps/mp/zombies/_zm_game_module::set_current_game_module( level.game_module_standard_index ); ents = getentarray(); - _a77 = ents; - _k77 = getFirstArrayKey( _a77 ); - while ( isDefined( _k77 ) ) + foreach ( ent in ents ) { - ent = _a77[ _k77 ]; if ( isDefined( ent.script_flag ) && ent.script_flag == "OnFarm_enter" ) { ent delete(); @@ -60,16 +58,12 @@ init_standard_farm() { tokens = strtok( ent.script_parameters, " " ); remove = 0; - _a88 = tokens; - _k88 = getFirstArrayKey( _a88 ); - while ( isDefined( _k88 ) ) + for ( i = 0; i < tokens.size; i++ ) { - token = _a88[ _k88 ]; - if ( token == "standard_remove" ) + if ( tokens[ i ] == "standard_remove" ) { remove = 1; } - _k88 = getNextArrayKey( _a88, _k88 ); } if ( remove ) { @@ -77,11 +71,10 @@ init_standard_farm() } } } - _k77 = getNextArrayKey( _a77, _k77 ); } } -enemy_location_override( zombie, enemy ) +enemy_location_override( zombie, enemy ) //checked matches cerberus output { location = enemy.origin; if ( is_true( self.reroute ) ) diff --git a/zm_transit_patch/maps/mp/zm_transit_standard_town.gsc b/zm_transit_patch/maps/mp/zm_transit_standard_town.gsc index b49f73f..33083bf 100644 --- a/zm_transit_patch/maps/mp/zm_transit_standard_town.gsc +++ b/zm_transit_patch/maps/mp/zm_transit_standard_town.gsc @@ -1,3 +1,4 @@ +//checked includes matche cerberus output #include maps/mp/zombies/_zm_game_module; #include maps/mp/zm_transit_utility; #include maps/mp/gametypes_zm/_zm_gametype; @@ -7,12 +8,12 @@ #include common_scripts/utility; #include maps/mp/_utility; -precache() +precache() //checked matches cerberus output { precachemodel( "zm_collision_transit_town_survival" ); } -town_treasure_chest_init() +town_treasure_chest_init() //checked matches cerberus output { chest1 = getstruct( "town_chest", "script_noteworthy" ); chest2 = getstruct( "town_chest_2", "script_noteworthy" ); @@ -22,7 +23,7 @@ town_treasure_chest_init() maps/mp/zombies/_zm_magicbox::treasure_chest_init( "town_chest" ); } -main() +main() //checked matches cerberus output { maps/mp/gametypes_zm/_zm_gametype::setup_standard_objects( "town" ); town_treasure_chest_init(); @@ -50,7 +51,7 @@ main() level notify( "Pack_A_Punch_on" ); } -enemy_location_override( zombie, enemy ) +enemy_location_override( zombie, enemy ) //checked matches cerberus output { location = enemy.origin; if ( is_true( self.reroute ) ) diff --git a/zm_transit_patch/maps/mp/zombies/_zm_game_module_grief.gsc b/zm_transit_patch/maps/mp/zombies/_zm_game_module_grief.gsc index 14a2eba..c626fe9 100644 --- a/zm_transit_patch/maps/mp/zombies/_zm_game_module_grief.gsc +++ b/zm_transit_patch/maps/mp/zombies/_zm_game_module_grief.gsc @@ -1,10 +1,12 @@ +//checked includes changed to match cerberus output +#include maps/mp/zombies/_zm_game_module; #include maps/mp/zombies/_zm_game_module_utility; #include maps/mp/zombies/_zm_utility; #include common_scripts/utility; #include maps/mp/gametypes_zm/_hud_util; #include maps/mp/_utility; -register_game_module() +register_game_module() //checked matches cerberus output { level.game_module_grief_index = 9; maps/mp/zombies/_zm_game_module::register_game_module( level.game_module_grief_index, "zgrief", ::onpreinitgametype, ::onpostinitgametype, undefined, ::onspawnzombie, ::onstartgametype ); diff --git a/zm_transit_patch/maps/mp/zombies/_zm_game_module_meat.gsc b/zm_transit_patch/maps/mp/zombies/_zm_game_module_meat.gsc index e083fb3..2eb58a5 100644 --- a/zm_transit_patch/maps/mp/zombies/_zm_game_module_meat.gsc +++ b/zm_transit_patch/maps/mp/zombies/_zm_game_module_meat.gsc @@ -1,3 +1,4 @@ +//checked includes match cerberus output #include maps/mp/zombies/_zm_game_module_utility; #include maps/mp/zombies/_zm_game_module_meat_utility; #include maps/mp/zombies/_zm_utility; diff --git a/zm_transit_patch/maps/mp/zombies/_zm_game_module_standard.gsc b/zm_transit_patch/maps/mp/zombies/_zm_game_module_standard.gsc index e69de29..93d5954 100644 --- a/zm_transit_patch/maps/mp/zombies/_zm_game_module_standard.gsc +++ b/zm_transit_patch/maps/mp/zombies/_zm_game_module_standard.gsc @@ -0,0 +1 @@ +//empty script \ No newline at end of file diff --git a/zm_transit_patch/maps/mp/zombies/_zm_game_module_utility.gsc b/zm_transit_patch/maps/mp/zombies/_zm_game_module_utility.gsc index 7c90b48..b3820d3 100644 --- a/zm_transit_patch/maps/mp/zombies/_zm_game_module_utility.gsc +++ b/zm_transit_patch/maps/mp/zombies/_zm_game_module_utility.gsc @@ -1,3 +1,4 @@ +//checked matches cerberus output #include maps/mp/zombies/_zm_game_module_meat; #include maps/mp/zombies/_zm_game_module_meat_utility; #include maps/mp/zombies/_zm_utility; @@ -5,32 +6,28 @@ #include maps/mp/gametypes_zm/_hud_util; #include maps/mp/_utility; -init_item_meat() +init_item_meat() //checked matches cerberus output { level.item_meat_name = "item_meat_zm"; precacheitem( level.item_meat_name ); } -move_ring( ring ) +move_ring( ring ) //checked changed to match cerberus output { positions = getstructarray( ring.target, "targetname" ); positions = array_randomize( positions ); level endon( "end_game" ); while ( 1 ) { - _a23 = positions; - _k23 = getFirstArrayKey( _a23 ); - while ( isDefined( _k23 ) ) + foreach ( position in positions ) { - position = _a23[ _k23 ]; self moveto( position.origin, randomintrange( 30, 45 ) ); self waittill( "movedone" ); - _k23 = getNextArrayKey( _a23, _k23 ); } } } -rotate_ring( forward ) +rotate_ring( forward ) //checked matches cerberus output { level endon( "end_game" ); dir = -360; diff --git a/zm_transit_patch/maps/mp/zombies/_zm_weap_bowie.gsc b/zm_transit_patch/maps/mp/zombies/_zm_weap_bowie.gsc index 4ad88c6..938a6c1 100644 --- a/zm_transit_patch/maps/mp/zombies/_zm_weap_bowie.gsc +++ b/zm_transit_patch/maps/mp/zombies/_zm_weap_bowie.gsc @@ -1,9 +1,11 @@ +//checked includes changed to match cerberus output #include maps/mp/zombies/_zm_weapons; +#include maps/mp/zombies/_zm_melee_weapon; #include maps/mp/zombies/_zm_utility; #include maps/mp/_utility; #include common_scripts/utility; -init() +init() //checked matches cerberus output { if ( isDefined( level.bowie_cost ) ) { diff --git a/zm_transit_patch/readme.md b/zm_transit_patch/readme.md index 413d089..1513181 100644 --- a/zm_transit_patch/readme.md +++ b/zm_transit_patch/readme.md @@ -19,26 +19,34 @@ zm_transit_patch/maps/mp/zombies/_zm_weap_jetgun.gsc ``` ### The following scripts have been checked, but they have not been tested yet ``` +zm_transit_patch/maps/mp/gametypes_zm/zstandard.gsc + +zm_transit_patch/maps/mp/zombies/_zm_game_module_grief.gsc +zm_transit_patch/maps/mp/zombies/_zm_game_module_meat.gsc +zm_transit_patch/maps/mp/zombies/_zm_game_module_standard.gsc +zm_transit_patch/maps/mp/zombies/_zm_game_module_utility.gsc +zm_transit_patch/maps/mp/zombies/_zm_weap_bowie.gsc + zm_transit_patch/maps/mp/zm_transit.gsc +zm_transit_patch/maps/mp/zm_transit_gamemodes.gsc +zm_transit_patch/maps/mp/zm_transit_grief_farm.gsc +zm_transit_patch/maps/mp/zm_transit_grief_station.gsc +zm_transit_patch/maps/mp/zm_transit_grief_town.gsc +zm_transit_patch/maps/mp/zm_transit_standard_farm.gsc +zm_transit_patch/maps/mp/zm_transit_standard_station.gsc +zm_transit_patch/maps/mp/zm_transit_standard_town.gsc ``` ### The following scripts are not checked yet, uploaded to setup a baseline: ``` -zm_transit_patch/maps/mp/gametypes_zm/zstandard.gsc - zm_transit_patch/maps/mp/zombies/_zm_ai_avogadro.gsc zm_transit_patch/maps/mp/zombies/_zm_ai_screecher.gsc zm_transit_patch/maps/mp/zombies/_zm_banking.gsc zm_transit_patch/maps/mp/zombies/_zm_equip_electrictrap.gsc zm_transit_patch/maps/mp/zombies/_zm_equip_turret.gsc -zm_transit_patch/maps/mp/zombies/_zm_game_module_grief.gsc -zm_transit_patch/maps/mp/zombies/_zm_game_module_meat.gsc zm_transit_patch/maps/mp/zombies/_zm_game_module_meat_utility.gsc -zm_transit_patch/maps/mp/zombies/_zm_game_module_standard.gsc -zm_transit_patch/maps/mp/zombies/_zm_game_module_utility.gsc zm_transit_patch/maps/mp/zombies/_zm_melee_weapon.gsc zm_transit_patch/maps/mp/zombies/_zm_riotshield.gsc zm_transit_patch/maps/mp/zombies/_zm_weap_ballistic_knife.gsc -zm_transit_patch/maps/mp/zombies/_zm_weap_bowie.gsc zm_transit_patch/maps/mp/zombies/_zm_weap_claymore.gsc zm_transit_patch/maps/mp/zombies/_zm_weap_emp_bomb.gsc zm_transit_patch/maps/mp/zombies/_zm_weap_riotshield.gsc @@ -55,16 +63,10 @@ zm_transit_patch/maps/mp/zm_transit_cling.gsc zm_transit_patch/maps/mp/zm_transit_distance_tracking.gsc zm_transit_patch/maps/mp/zm_transit_ffotd.gsc zm_transit_patch/maps/mp/zm_transit_fx.gsc -zm_transit_patch/maps/mp/zm_transit_gamemodes.gsc -zm_transit_patch/maps/mp/zm_transit_grief_farm.gsc -zm_transit_patch/maps/mp/zm_transit_grief_station.gsc -zm_transit_patch/maps/mp/zm_transit_grief_town.gsc zm_transit_patch/maps/mp/zm_transit_lava.gsc zm_transit_patch/maps/mp/zm_transit_openings.gsc zm_transit_patch/maps/mp/zm_transit_power.gsc zm_transit_patch/maps/mp/zm_transit_sq.gsc -zm_transit_patch/maps/mp/zm_transit_standard_farm.gsc -zm_transit_patch/maps/mp/zm_transit_standard_town.gsc ``` ### notes: