Merge branch 'master' into sc2-next

Ziktofel · Jul 7, 2024 · 6d8f064 · 6d8f064
2 parents f26ac0e + f3d22c1
commit 6d8f064
Show file tree

Hide file tree

Showing 4 changed files with 129 additions and 250 deletions.
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_purification.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/LotV/ap_purification.SC2Map/DocumentHeader
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_purification.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/LotV/ap_purification.SC2Map/MapScript.galaxy
@@ -597,15 +597,10 @@ void gf_ActivateStasisChamber (int lp_containmentTowerIndex) {
     gv_purifierStasisChambersOnlineCount += 1;
     gv_purifierStasisChambers[lp_containmentTowerIndex].lv_isActivated = true;
     Wait(2.0, c_timeGame);
-    if ((gv_purifierStasisChambersOnlineCount == 1)) {
+    if ((gv_purifierStasisChambersOnlineCount == 1) && (libABFE498B_gv_aP_Triggers_skipCutscenes == false)) {
         gv_midContainmentIndex = lp_containmentTowerIndex;
         TriggerExecute(gt_TransmissionActivateStasisChamberQ, true, true);
         Wait(1.0, c_timeGame);
-        if ((libABFE498B_gv_aP_Triggers_skipCutscenes == true)) {
-            TriggerExecute(gt_UpdateCybrosLights, true, false);
-            gf_WarpInPurifiers(lp_containmentTowerIndex);
-        }
-
         TriggerExecute(gt_MidQ, true, true);
         VisRevealArea(gv_pLAYER_01_USER, gv_purifierStasisChambers[lp_containmentTowerIndex].lv_revealRegion, 32.0, false);
         libVCMI_gf_PingMinimapCampaign(PlayerGroupAll(), gv_purifierStasisChambers[lp_containmentTowerIndex].lv_spawnPoint, 2.0, Color(0.00, 100.00, 0.00));
@@ -618,6 +613,10 @@ void gf_ActivateStasisChamber (int lp_containmentTowerIndex) {
         Wait(2.0, c_timeGame);
         TriggerExecute(gt_TransmissionActivateStasisChamberQ, true, false);
         gf_WarpInPurifiers(lp_containmentTowerIndex);
+        if ((gv_purifierStasisChambersOnlineCount == 1)) {
+            libVCMI_gf_SendTransmissionCampaign(null, "pMission_Purifier03|Line00163", c_transmissionDurationAdd, 0.0, true, libVCMI_ge_MissionTransmissionPortraitOptioins_HidePortraitAfter, libVCMI_ge_MissionTransmissionCueSoundOptions_DefaultCueSoundBehavior);
+        }
+
     }
     lv_chosenZergBaseTarget = gf_GetZergBaseTarget(lp_containmentTowerIndex);
     gv_zergBase[lv_chosenZergBaseTarget].lv_isEngaged = true;
@@ -6739,17 +6738,10 @@ bool gt_MidQ_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerQueueEnter();
-    if ((libABFE498B_gv_aP_Triggers_skipCutscenes == false)) {
-        TriggerExecute(gt_MidSetup, true, true);
-        TriggerExecute(gt_MidCinematic, true, true);
-        TriggerExecute(gt_MidCinematicEnd, true, true);
-        TriggerExecute(gt_MidCleanup, true, true);
-    }
-    else {
-        libVCMI_gf_SendTransmissionCampaign(null, "pMission_Purifier03|Line00195", c_transmissionDurationAdd, 0.0, true, libVCMI_ge_MissionTransmissionPortraitOptioins_HidePortraitAfter, libVCMI_ge_MissionTransmissionCueSoundOptions_DefaultCueSoundBehavior);
-        libVCMI_gf_SendTransmissionCampaign(null, "pMission_Purifier03|Line00186", c_transmissionDurationAdd, 0.0, true, libVCMI_ge_MissionTransmissionPortraitOptioins_HidePortraitAfter, libVCMI_ge_MissionTransmissionCueSoundOptions_DefaultCueSoundBehavior);
-        libVCMI_gf_SendTransmissionCampaign(null, "pMission_Purifier03|Line00184", c_transmissionDurationAdd, 0.0, true, libVCMI_ge_MissionTransmissionPortraitOptioins_HidePortraitAfter, libVCMI_ge_MissionTransmissionCueSoundOptions_DefaultCueSoundBehavior);
-    }
+    TriggerExecute(gt_MidSetup, true, true);
+    TriggerExecute(gt_MidCinematic, true, true);
+    TriggerExecute(gt_MidCinematicEnd, true, true);
+    TriggerExecute(gt_MidCleanup, true, true);
     TriggerQueueExit();
     return true;
 }