From 5779552ba19e926902235f569d5507f6e757c394 Mon Sep 17 00:00:00 2001 From: JezuzLizard Date: Tue, 4 Aug 2020 20:12:15 -0700 Subject: [PATCH] replaced several isdefined() && condition Also added more shovel spawns --- .../zm_tomb_craftables.gsc | 117 +-------- .../8 Player Origins Fix/zm_tomb_dig.gsc | 226 +++--------------- 2 files changed, 43 insertions(+), 300 deletions(-) diff --git a/Plutonium specific gsc-related fixes/8 Player Origins Fix/zm_tomb_craftables.gsc b/Plutonium specific gsc-related fixes/8 Player Origins Fix/zm_tomb_craftables.gsc index c69daaf..e8a6de8 100644 --- a/Plutonium specific gsc-related fixes/8 Player Origins Fix/zm_tomb_craftables.gsc +++ b/Plutonium specific gsc-related fixes/8 Player Origins Fix/zm_tomb_craftables.gsc @@ -71,72 +71,11 @@ init_craftables() //checked changed to match cerberus output add_craftable_cheat( craftable ) //dev call skipped { - /* -/# - if ( !isDefined( level.cheat_craftables ) ) - { - level.cheat_craftables = []; - } - _a112 = craftable.a_piecestubs; - _k112 = getFirstArrayKey( _a112 ); - while ( isDefined( _k112 ) ) - { - s_piece = _a112[ _k112 ]; - id_string = undefined; - client_field_val = undefined; - if ( isDefined( s_piece.client_field_id ) ) - { - id_string = s_piece.client_field_id; - client_field_val = id_string; - } - else if ( isDefined( s_piece.client_field_state ) ) - { - id_string = "gem"; - client_field_val = s_piece.client_field_state; - } - else - { - } - tokens = strtok( id_string, "_" ); - display_string = "piece"; - _a134 = tokens; - _k134 = getFirstArrayKey( _a134 ); - while ( isDefined( _k134 ) ) - { - token = _a134[ _k134 ]; - if ( token != "piece" && token != "staff" && token != "zm" ) - { - display_string = ( display_string + "_" ) + token; - } - _k134 = getNextArrayKey( _a134, _k134 ); - } - level.cheat_craftables[ "" + client_field_val ] = s_piece; - adddebugcommand( "devgui_cmd "Zombies/Tomb:1/Craftables:1/" + craftable.name + "/" + display_string + "" "give_craftable " + client_field_val + ""\n" ); - s_piece.waste = "waste"; - _k112 = getNextArrayKey( _a112, _k112 ); - } - flag_wait( "start_zombie_round_logic" ); - _a149 = craftable.a_piecestubs; - _k149 = getFirstArrayKey( _a149 ); - while ( isDefined( _k149 ) ) - { - s_piece = _a149[ _k149 ]; - s_piece craftable_waittill_spawned(); - s_piece.piecespawn.model thread puzzle_debug_position( "C", vectorScale( ( 0, 0, 1 ), 255 ), undefined, "show_craftable_locations" ); - _k149 = getNextArrayKey( _a149, _k149 ); -#/ - } - */ } autocraft_staffs() //checked changed to match cerberus output { setdvar( "autocraft_staffs", "off" ); - /* -/# - adddebugcommand( "devgui_cmd "Zombies/Tomb:1/Craftables:1/Give All Staff Pieces:0" "autocraft_staffs on"\n" ); -#/ - */ while ( getDvar( "autocraft_staffs" ) != "on" ) { wait_network_frame(); @@ -174,27 +113,6 @@ autocraft_staffs() //checked changed to match cerberus output run_craftables_devgui() //dev call skipped { - /* -/# - level thread autocraft_staffs(); - setdvar( "give_craftable", "" ); - while ( 1 ) - { - craftable_id = getDvar( "give_craftable" ); - if ( craftable_id != "" ) - { - piece_spawn = level.cheat_craftables[ craftable_id ].piecespawn; - if ( isDefined( piece_spawn ) ) - { - players = getplayers(); - players[ 0 ] maps/mp/zombies/_zm_craftables::player_take_piece( piece_spawn ); - } - setdvar( "give_craftable", "" ); - } - wait 0,05; -#/ - } - */ } include_craftables() //checked matches cerberus output @@ -453,7 +371,7 @@ craftable_model_attach_glow( n_elem, do_glow_now ) //checked matches cerberus ou tomb_staff_update_prompt( player, b_set_hint_string_now, trigger ) //checked matches cerberus output { - if ( isDefined( self.crafted ) && self.crafted ) + if ( is_true( self.crafted ) ) { return 1; } @@ -553,7 +471,7 @@ tankcraftableupdateprompt( player, sethintstringnow, buildabletrigger ) //checke if ( isDefined( self ) ) { self.hint_string = ""; - if ( isDefined( sethintstringnow ) && sethintstringnow && isDefined( buildabletrigger ) ) + if ( is_true( sethintstringnow ) && isDefined( buildabletrigger ) ) { buildabletrigger sethintstring( self.hint_string ); } @@ -635,7 +553,7 @@ clear_player_crystal( n_element ) //checked matches cerberus output piece_pickup_conversation( player ) //checked changed to match cerberus output { wait 1; - while ( isDefined( player.isspeaking ) && player.isspeaking ) + while ( is_true( player.isspeaking ) ) { wait_network_frame(); } @@ -660,14 +578,6 @@ onpickup_common( player ) //checked changed to match cerberus output player playsound( "zmb_craftable_pickup" ); self.piece_owner = player; self thread piece_pickup_conversation( player ); - /* -/# - foreach ( spawn in self.spawns ) - { - spawn notify( "stop_debug_position" ); -#/ - } - */ } staff_pickup_vo() //checked matches cerberus output @@ -676,7 +586,7 @@ staff_pickup_vo() //checked matches cerberus output { return; } - if ( isDefined( level.sam_staff_line_played ) && !level.sam_staff_line_played ) + if ( !is_true( level.sam_staff_line_played ) ) { level.sam_staff_line_played = 1; wait 1; @@ -760,7 +670,7 @@ watch_part_pickup( str_quest_clientfield, n_clientfield_val ) //checked matches self craftable_waittill_spawned(); self.piecespawn waittill( "pickup" ); level notify( ( self.craftablename + "_" ) + self.piecename + "_picked_up" ); - if ( isDefined( str_quest_clientfield ) && isDefined( n_clientfield_val ) ) + if ( is_true( str_quest_clientfield ) ) { level setclientfield( str_quest_clientfield, n_clientfield_val ); } @@ -776,11 +686,6 @@ count_staff_piece_pickup( a_staff_pieces ) //checked changed to match cerberus o level.staff_part_count[ str_name ] = a_staff_pieces.size; foreach ( piece in a_staff_pieces ) { - /* -/# - assert( piece.craftablename == str_name ); -#/ - */ piece thread watch_staff_pickup(); } } @@ -1163,7 +1068,7 @@ tomb_custom_craftable_validation( player ) //checked changed to match cerberus o return 1; } str_craftable = self.stub.equipname; - if ( isDefined( level.craftables_crafted[ str_craftable ] ) && !level.craftables_crafted[ str_craftable ] ) + if ( !is_true( level.craftables_crafted[ str_craftable ] ) ) { return 1; } @@ -1315,7 +1220,7 @@ track_staff_weapon_respawn( player ) //checked partially changed to match cerber has_weapon = 0; while ( isalive( player ) ) { - if ( isDefined( s_elemental_staff.charger.is_inserted ) && s_elemental_staff.charger.is_inserted || isDefined( s_upgraded_staff.charger.is_inserted ) || s_upgraded_staff.charger.is_inserted && isDefined( s_upgraded_staff.ee_in_use ) && s_upgraded_staff.ee_in_use ) + if ( is_true( s_elemental_staff.charger.is_inserted ) || is_true( s_upgraded_staff.charger.is_inserted ) || is_true( s_upgraded_staff.ee_in_use ) ) { has_weapon = 1; break; @@ -1342,16 +1247,16 @@ track_staff_weapon_respawn( player ) //checked partially changed to match cerber s_upgraded_staff.revive_ammo_stock = player getweaponammostock( "staff_revive_zm" ); s_upgraded_staff.revive_ammo_clip = player getweaponammoclip( "staff_revive_zm" ); } - if ( has_weapon && isDefined( player.one_inch_punch_flag_has_been_init ) && !player.one_inch_punch_flag_has_been_init && n_melee_element != 0 ) + if ( has_weapon && !is_true( player.one_inch_punch_flag_has_been_init ) && n_melee_element != 0 ) { cur_weapon = player getcurrentweapon(); - if ( cur_weapon != weapon && isDefined( player.use_staff_melee ) && player.use_staff_melee ) + if ( cur_weapon != weapon && is_true( player.use_staff_melee ) ) { player update_staff_accessories( 0 ); } else { - if ( cur_weapon == weapon && isDefined( player.use_staff_melee ) && !player.use_staff_melee ) + if ( cur_weapon == weapon && !is_true( player.use_staff_melee ) ) { player update_staff_accessories( n_melee_element ); } @@ -1456,3 +1361,5 @@ hide_staff_model() //checked changed to match cerberus output + + diff --git a/Plutonium specific gsc-related fixes/8 Player Origins Fix/zm_tomb_dig.gsc b/Plutonium specific gsc-related fixes/8 Player Origins Fix/zm_tomb_dig.gsc index b8bccf8..0a9b0d7 100644 --- a/Plutonium specific gsc-related fixes/8 Player Origins Fix/zm_tomb_dig.gsc +++ b/Plutonium specific gsc-related fixes/8 Player Origins Fix/zm_tomb_dig.gsc @@ -23,6 +23,8 @@ init_shovel() //checked changed to match cerberus output maps/mp/zombies/_zm_audio_announcer::createvox( "blood_money", "powerup_blood_money" ); onplayerconnect_callback( ::init_shovel_player ); a_shovel_pos = getstructarray( "shovel_location", "targetname" ); + logline1 = "number of shovel locations: " + a_shovel_pos.size + "\n"; + logprint( logline1 ); a_shovel_zone = []; foreach ( s_shovel_pos in a_shovel_pos ) { @@ -40,6 +42,25 @@ init_shovel() //checked changed to match cerberus output m_shovel setmodel( "p6_zm_tm_shovel" ); generate_shovel_unitrigger( m_shovel ); } + newShovel1 = spawn( "script_model", ( 254, 2130, -123 ) ); + newShovel1.angles = ( 0, 0, 0 ); + newShovel1 setmodel( "p6_zm_tm_shovel" ); + generate_shovel_unitrigger( newShovel1 ); + + newShovel2 = spawn( "script_model", ( -129, 3680, -295 ) ); + newShovel2.angles = ( 0, -90, 0 ); + newShovel2 setmodel( "p6_zm_tm_shovel" ); + generate_shovel_unitrigger( newShovel2 ); + + newShovel3 = spawn( "script_model", ( 1230, -3488, 305 ) ); + newShovel3.angles = ( 0, 90, 0 ); + newShovel3 setmodel( "p6_zm_tm_shovel" ); + generate_shovel_unitrigger( newShovel3 ); + + newShovel4 = spawn( "script_model", ( 2214, 387, 119 ) ); + newShovel4.angles = ( 0, -90, 0 ); + newShovel4 setmodel( "p6_zm_tm_shovel" ); + generate_shovel_unitrigger( newShovel4 ); level.get_player_perk_purchase_limit = ::get_player_perk_purchase_limit; level.bonus_points_powerup_override = ::bonus_points_powerup_override; level thread dig_powerups_tracking(); @@ -102,7 +123,7 @@ shovel_prompt_update( e_player ) //checked matches cerberus output return 0; } self.hint_string = &"ZM_TOMB_SHPU"; - if ( isDefined( e_player.dig_vars[ "has_shovel" ] ) && e_player.dig_vars[ "has_shovel" ] ) + if ( is_true( e_player.dig_vars[ "has_shovel" ] ) ) { self.hint_string = &"ZM_TOMB_SHAG"; } @@ -119,7 +140,7 @@ shovel_unitrigger_think() //checked changed to match cerberus output { continue; } - if ( isDefined( e_player.dig_vars[ "has_shovel" ] ) && !e_player.dig_vars[ "has_shovel" ] ) + if ( !is_true( e_player.dig_vars[ "has_shovel" ] ) ) { e_player.dig_vars[ "has_shovel" ] = 1; e_player playsound( "zmb_craftable_pickup" ); @@ -138,7 +159,7 @@ shovel_unitrigger_think() //checked changed to match cerberus output dig_reward_dialog( str_category ) //checked matches cerberus output { - if ( isDefined( self.dig_vo_cooldown ) && !self.dig_vo_cooldown ) + if ( !is_true( self.dig_vo_cooldown ) ) { self do_player_general_vox( "digging", str_category ); if ( str_category != "pickup_shovel" ) @@ -238,7 +259,7 @@ dig_spots_respawn( a_dig_spots ) //checked partially changed to match cerberus o } for ( i = 0; i < a_dig_spots.size; i++ ) { - if ( isDefined( a_dig_spots[ i ].dug ) && a_dig_spots[ i ].dug && n_respawned < n_respawned_max && level.n_dig_spots_cur <= level.n_dig_spots_max ) + if ( is_true( a_dig_spots[ i ].dug ) && n_respawned < n_respawned_max && level.n_dig_spots_cur <= level.n_dig_spots_max ) { a_dig_spots[ i ].dug = undefined; a_dig_spots[ i ] thread dig_spot_spawn(); @@ -256,7 +277,7 @@ dig_spots_respawn( a_dig_spots ) //checked partially changed to match cerberus o { if ( isDefined( s_dig_spot.str_zone ) && issubstr( s_dig_spot.str_zone, s_staff.zone_substr ) ) { - if ( isDefined( s_dig_spot.dug ) && !s_dig_spot.dug ) + if ( !is_true( s_dig_spot.dug ) ) { n_active_mounds++; } @@ -300,7 +321,7 @@ dig_spot_spawn() //checked changed to match cerberus output dig_spot_trigger_visibility( player ) //checked matches cerberus output { - if ( isDefined( player.dig_vars[ "has_shovel" ] ) && player.dig_vars[ "has_shovel" ] ) + if ( is_true( player.dig_vars[ "has_shovel" ] ) ) { self sethintstring( &"ZM_TOMB_X2D" ); } @@ -316,7 +337,7 @@ waittill_dug( s_dig_spot ) //checked changed to match cerberus output while ( 1 ) { self waittill( "trigger", player ); - if ( isDefined( player.dig_vars[ "has_shovel" ] ) && player.dig_vars[ "has_shovel" ] ) + if ( is_true( player.dig_vars[ "has_shovel" ] ) ) { player playsound( "evt_dig" ); s_dig_spot.dug = 1; @@ -734,7 +755,7 @@ waittill_zombie_blood_dug( s_dig_spot ) //checked changed to match cerberus outp while ( 1 ) { self waittill( "trigger", player ); - if ( isDefined( player.dig_vars[ "has_shovel" ] ) && player.dig_vars[ "has_shovel" ] ) + if ( is_true( player.dig_vars[ "has_shovel" ] ) ) { player.t_zombie_blood_dig.origin = ( 0, 0, 0 ); player playsound( "evt_dig" ); @@ -827,197 +848,12 @@ dig_set_powerup_spawned( str_powerup ) //checked matches cerberus output setup_dig_devgui() //dev call skipped { - /* -/# - setdvar( "give_shovel", "off" ); - setdvar( "give_golden_shovel", "off" ); - setdvar( "give_helmet", "off" ); - setdvar( "spawn_max_mounds", "off" ); - setdvar( "spawn_all_mounds", "off" ); - setdvar( "test_blood_mounds", "off" ); - setdvar( "force_weather_rain", "off" ); - setdvar( "force_weather_snow", "off" ); - setdvar( "force_weather_none", "off" ); - adddebugcommand( "devgui_cmd "Zombies/Tomb:1/Digging:1/Give Shovel:1" "give_shovel on"\n" ); - adddebugcommand( "devgui_cmd "Zombies/Tomb:1/Digging:1/Give Golden Shovel:2" "give_golden_shovel on"\n" ); - adddebugcommand( "devgui_cmd "Zombies/Tomb:1/Digging:1/Give Helmet:3" "give_helmet on"\n" ); - adddebugcommand( "devgui_cmd "Zombies/Tomb:1/Digging:1/Spawn Max Mounds:4" "spawn_max_mounds on"\n" ); - adddebugcommand( "devgui_cmd "Zombies/Tomb:1/Digging:1/Spawn All Mounds:5" "spawn_all_mounds on"\n" ); - adddebugcommand( "devgui_cmd "Zombies/Tomb:1/Digging:1/Test Blood Mounds:6" "test_blood_mounds on"\n" ); - adddebugcommand( "devgui_cmd "Zombies/Tomb:1/Weather:1/Rain:1" "force_weather_rain on"\n" ); - adddebugcommand( "devgui_cmd "Zombies/Tomb:1/Weather:1/Snow:2" "force_weather_snow on"\n" ); - adddebugcommand( "devgui_cmd "Zombies/Tomb:1/Weather:1/Clear:3" "force_weather_none on"\n" ); - level thread watch_devgui_dig(); -#/ - */ } watch_devgui_dig() //dev call skipped { - /* -/# - while ( 1 ) - { - while ( getDvar( "give_shovel" ) == "on" ) - { - setdvar( "give_shovel", "off" ); - _a1131 = getplayers(); - _k1131 = getFirstArrayKey( _a1131 ); - while ( isDefined( _k1131 ) ) - { - player = _a1131[ _k1131 ]; - player.dig_vars[ "has_shovel" ] = 1; - n_player = player getentitynumber() + 1; - level setclientfield( "shovel_player" + n_player, 1 ); - _k1131 = getNextArrayKey( _a1131, _k1131 ); - } - } - while ( getDvar( "give_golden_shovel" ) == "on" ) - { - setdvar( "give_golden_shovel", "off" ); - _a1141 = getplayers(); - _k1141 = getFirstArrayKey( _a1141 ); - while ( isDefined( _k1141 ) ) - { - player = _a1141[ _k1141 ]; - player.dig_vars[ "has_shovel" ] = 1; - player.dig_vars[ "has_upgraded_shovel" ] = 1; - player thread ee_zombie_blood_dig(); - n_player = player getentitynumber() + 1; - level setclientfield( "shovel_player" + n_player, 2 ); - _k1141 = getNextArrayKey( _a1141, _k1141 ); - } - } - while ( getDvar( "give_helmet" ) == "on" ) - { - setdvar( "give_helmet", "off" ); - _a1153 = getplayers(); - _k1153 = getFirstArrayKey( _a1153 ); - while ( isDefined( _k1153 ) ) - { - player = _a1153[ _k1153 ]; - player.dig_vars[ "has_helmet" ] = 1; - n_player = player getentitynumber() + 1; - level setclientfield( "helmet_player" + n_player, 1 ); - _k1153 = getNextArrayKey( _a1153, _k1153 ); - } - } - while ( getDvar( "spawn_max_mounds" ) == "on" ) - { - setdvar( "spawn_max_mounds", "off" ); - a_dig_spots = array_randomize( level.a_dig_spots ); - i = 0; - while ( i < a_dig_spots.size ) - { - if ( isDefined( a_dig_spots[ i ].dug ) && a_dig_spots[ i ].dug && level.n_dig_spots_cur <= level.n_dig_spots_max ) - { - a_dig_spots[ i ].dug = undefined; - a_dig_spots[ i ] thread dig_spot_spawn(); - wait_network_frame(); - } - i++; - } - } - while ( getDvar( "spawn_all_mounds" ) == "on" ) - { - setdvar( "spawn_all_mounds", "off" ); - a_dig_spots = array_randomize( level.a_dig_spots ); - i = 0; - while ( i < a_dig_spots.size ) - { - if ( isDefined( a_dig_spots[ i ].dug ) && a_dig_spots[ i ].dug ) - { - a_dig_spots[ i ].dug = undefined; - a_dig_spots[ i ] thread dig_spot_spawn(); - wait_network_frame(); - } - i++; - } - } - while ( getDvar( "test_blood_mounds" ) == "on" ) - { - setdvar( "test_blood_mounds", "off" ); - a_z_spots = getstructarray( "zombie_blood_dig_spot", "targetname" ); - _a1193 = a_z_spots; - _k1193 = getFirstArrayKey( _a1193 ); - while ( isDefined( _k1193 ) ) - { - s_spot = _a1193[ _k1193 ]; - s_spot.m_dig = spawn( "script_model", s_spot.origin + vectorScale( ( 0, 0, -1 ), 40 ) ); - s_spot.m_dig.angles = s_spot.angles; - s_spot.m_dig setmodel( "p6_zm_tm_dig_mound_blood" ); - s_spot.m_dig moveto( s_spot.origin, 3, 0, 1 ); - wait_network_frame(); - _k1193 = getNextArrayKey( _a1193, _k1193 ); - } - } - while ( getDvar( "force_weather_rain" ) == "on" ) - { - setdvar( "force_weather_rain", "off" ); - level.weather_snow = 0; - level.weather_rain = 5; - level.weather_vision = 1; - level setclientfield( "rain_level", level.weather_rain ); - level setclientfield( "snow_level", level.weather_snow ); - wait 1; - _a1212 = getplayers(); - _k1212 = getFirstArrayKey( _a1212 ); - while ( isDefined( _k1212 ) ) - { - player = _a1212[ _k1212 ]; - if ( is_player_valid( player, 0, 1 ) ) - { - player set_weather_to_player(); - } - _k1212 = getNextArrayKey( _a1212, _k1212 ); - } - } - while ( getDvar( "force_weather_snow" ) == "on" ) - { - setdvar( "force_weather_snow", "off" ); - level.weather_snow = 5; - level.weather_rain = 0; - level.weather_vision = 2; - level setclientfield( "rain_level", level.weather_rain ); - level setclientfield( "snow_level", level.weather_snow ); - wait 1; - _a1229 = getplayers(); - _k1229 = getFirstArrayKey( _a1229 ); - while ( isDefined( _k1229 ) ) - { - player = _a1229[ _k1229 ]; - if ( is_player_valid( player, 0, 1 ) ) - { - player set_weather_to_player(); - } - _k1229 = getNextArrayKey( _a1229, _k1229 ); - } - } - while ( getDvar( "force_weather_none" ) == "on" ) - { - setdvar( "force_weather_none", "off" ); - level.weather_snow = 0; - level.weather_rain = 0; - level.weather_vision = 3; - level setclientfield( "rain_level", level.weather_rain ); - level setclientfield( "snow_level", level.weather_snow ); - wait 1; - _a1246 = getplayers(); - _k1246 = getFirstArrayKey( _a1246 ); - while ( isDefined( _k1246 ) ) - { - player = _a1246[ _k1246 ]; - if ( is_player_valid( player, 0, 1 ) ) - { - player set_weather_to_player(); - } - _k1246 = getNextArrayKey( _a1246, _k1246 ); - } - } - wait 0,05; -#/ - } - */ } + +