From fa6bfe9dbaa9ba303b5969cedba9380a26fe7e7e Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Sat, 6 May 2023 23:19:38 -0700 Subject: [PATCH] Tranzit Quest (Maxis): fix being able to do the lamp posts step without doing the Avogadro step --- scripts/zm/replaced/zm_transit_sq.gsc | 64 +++++++++++---------------- 1 file changed, 26 insertions(+), 38 deletions(-) diff --git a/scripts/zm/replaced/zm_transit_sq.gsc b/scripts/zm/replaced/zm_transit_sq.gsc index d18c3c72..0f9f5c54 100644 --- a/scripts/zm/replaced/zm_transit_sq.gsc +++ b/scripts/zm/replaced/zm_transit_sq.gsc @@ -162,9 +162,32 @@ maxis_sidequest_c() if ( !zone_used ) { - level thread set_screecher_zone_origin_and_notify( zone.script_noteworthy, "sq_max" ); - level.sq_progress["maxis"]["C_screecher_" + level.sq_progress["maxis"]["C_screecher_dark"]] = zone; - level.sq_progress["maxis"]["C_screecher_dark"]++; + if ( level.sq_progress["maxis"]["B_complete"] && level.sq_progress["maxis"]["A_complete"] ) + { + if ( !turbine_1_talked ) + { + turbine_1_talked = 1; + level thread maxissay( "vox_maxi_turbine_1light_0", zone.origin ); + } + + level thread set_screecher_zone_origin_and_notify( zone.script_noteworthy, "sq_max" ); + level.sq_progress["maxis"]["C_screecher_" + level.sq_progress["maxis"]["C_screecher_dark"]] = zone; + level.sq_progress["maxis"]["C_screecher_dark"]++; + + if ( level.sq_progress["maxis"]["C_screecher_dark"] >= 8 ) + { + if ( !turbine_2_talked ) + { + turbine_2_talked = 1; + level thread maxissay( "vox_maxi_turbine_2light_on_0", zone.origin ); + } + + player = get_players(); + player[0] setclientfield( "screecher_maxis_lights", 0 ); + level maxis_sidequest_complete_check( "C_complete" ); + return; + } + } } continue; @@ -173,26 +196,6 @@ maxis_sidequest_c() } } - if ( level.sq_progress["maxis"]["C_screecher_dark"] >= 8 ) - { - level.sq_progress["maxis"]["A_complete"] = 1; - level.sq_progress["maxis"]["B_complete"] = 1; - - if ( level.sq_progress["maxis"]["B_complete"] && level.sq_progress["maxis"]["A_complete"] ) - { - if ( !turbine_2_talked ) - { - level thread maxissay( "vox_maxi_turbine_2light_on_0", zone.origin ); - turbine_2_talked = 1; - } - - player = get_players(); - player[0] setclientfield( "screecher_maxis_lights", 0 ); - level maxis_sidequest_complete_check( "C_complete" ); - return; - } - } - level waittill_either( "turbine_deployed", "equip_turbine_zm_cleaned_up" ); level.sq_progress["maxis"]["C_complete"] = 0; } @@ -308,19 +311,4 @@ droppowerup( story ) trail delete(); wait( randomintrange( mintime, maxtime ) ); } -} - -sq_give_player_perks( perks ) -{ - foreach ( perk in perks ) - { - if ( isdefined( self.perk_purchased ) && self.perk_purchased == perk ) - continue; - - if ( self hasperk( perk ) || self maps\mp\zombies\_zm_perks::has_perk_paused( perk ) ) - continue; - - self maps\mp\zombies\_zm_perks::give_perk( perk, 0 ); - wait 0.25; - } } \ No newline at end of file