diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Base.SC2Data/GameData/ConversationData.xml b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Base.SC2Data/GameData/ConversationData.xml new file mode 100644 index 000000000..249b8fd91 --- /dev/null +++ b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Base.SC2Data/GameData/ConversationData.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Base.SC2Data/GameData/SoundData.xml b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Base.SC2Data/GameData/SoundData.xml new file mode 100644 index 000000000..b12ae6f27 --- /dev/null +++ b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Base.SC2Data/GameData/SoundData.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/ComponentList.SC2Components index 8fbed77a5..786240269 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/ComponentList.SC2Components +++ b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/ComponentList.SC2Components @@ -1,6 +1,5 @@ - GameData DocumentInfo MapInfo diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/DocumentHeader index f0a788f12..906c84316 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/DocumentHeader and b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/DocumentHeader differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/GameData.version b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/GameData.version index 5509d9714..206d77c55 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/GameData.version and b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/GameData.version differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/MapInfo b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/MapInfo index 4cc2c60dc..b9e6d24ed 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/MapInfo and b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/MapInfo differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/MapInfo.version b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/MapInfo.version index 83056e7ac..201357eb9 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/MapInfo.version and b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/MapInfo.version differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/MapScript.galaxy index 72504d71f..2b582abe4 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/MapScript.galaxy @@ -196,8 +196,9 @@ trigger gt_IntroSequence; trigger gt_StartGame; trigger gt_BrutaliskStumbledUpon; trigger gt_CreateMedivacIntro; +trigger gt_ScourgishInquisition1; +trigger gt_ScourgishInquisition2; trigger gt_IntroMedivacsFinished; -trigger gt_MedivacTrained; trigger gt_Site1DestructionComplete; trigger gt_Site1ActivateDefenses; trigger gt_Site1SubwaySpawns; @@ -317,6 +318,7 @@ trigger gt_ObjectiveRescueCreateQ; trigger gt_ObjectiveRescueUpdate; trigger gt_ObjectiveRescueComplete; trigger gt_ArchInit; +trigger gt_FactionSwapInit; trigger gt_VictoryQ; trigger gt_VictorySetup; trigger gt_VictoryCinematic; @@ -1051,7 +1053,15 @@ void gt_BrutaliskStumbledUpon_Init () { // Trigger: Create Medivac Intro //-------------------------------------------------------------------------------------------------- bool gt_CreateMedivacIntro_Func (bool testConds, bool runActions) { + // Variable Declarations + unitgroup lv_scourgeGroup1; + unitgroup lv_scourgeGroup2; + // Automatic Variable Declarations + // Variable Initialization + lv_scourgeGroup1 = UnitGroupEmpty(); + lv_scourgeGroup2 = UnitGroupEmpty(); + // Conditions if (testConds) { if (!((gv_gameOver == false))) { @@ -1068,7 +1078,12 @@ bool gt_CreateMedivacIntro_Func (bool testConds, bool runActions) { libNtve_gf_CreateUnitsAtPoint2(1, "AP_Medivac", 0, gv_p06_MOEBIUS_SEC_FORCE, PointFromId(999)); gv_medivac01 = UnitLastCreated(); libNtve_gf_AddUnitGroupToUnitGroup(UnitLastCreatedGroup(), gv_medivacUnits); - UnitCargoCreate(gv_medivac01, "AP_Marine", 2); + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Zerg")) { + UnitCargoCreate(gv_medivac01, "AP_HunterKiller", 1); + } + else { + UnitCargoCreate(gv_medivac01, "AP_Marine", 2); + } libNtve_gf_AddUnitGroupToUnitGroup(UnitCargoLastCreatedGroup(), gv_medivacUnits); UnitSetPropertyFixed(gv_medivac01, c_unitPropEnergyPercent, 100.0); UnitSetState(UnitLastCreated(), c_unitStateTooltipable, false); @@ -1079,10 +1094,21 @@ bool gt_CreateMedivacIntro_Func (bool testConds, bool runActions) { libNtve_gf_AddUnitGroupToUnitGroup(UnitLastCreatedGroup(), gv_medivacUnits); UnitSetPropertyFixed(gv_medivac02, c_unitPropEnergyPercent, 100.0); UnitSetState(UnitLastCreated(), c_unitStateTooltipable, false); - UnitCargoCreate(gv_medivac02, "AP_Marine", 2); + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Zerg")) { + UnitCargoCreate(gv_medivac02, "AP_HunterKiller", 1); + } + else { + UnitCargoCreate(gv_medivac02, "AP_Marine", 2); + } libNtve_gf_AddUnitGroupToUnitGroup(UnitCargoLastCreatedGroup(), gv_medivacUnits); UnitIssueOrder(gv_medivac02, OrderTargetingPoint(AbilityCommand("AP_MedivacTransport", 2), PointFromId(1117)), c_orderQueueReplace); UnitIssueOrder(gv_medivac02, Order(AbilityCommand("move", 2)), c_orderQueueAddToEnd); + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) { + Wait(3.0, c_timeGame); + TriggerExecute(gt_ScourgishInquisition1, true, false); + TriggerExecute(gt_ScourgishInquisition2, true, false); + } + return true; } @@ -1092,13 +1118,22 @@ void gt_CreateMedivacIntro_Init () { } //-------------------------------------------------------------------------------------------------- -// Trigger: Intro Medivacs Finished +// Trigger: Scourgish Inquisition 1 //-------------------------------------------------------------------------------------------------- -bool gt_IntroMedivacsFinished_Func (bool testConds, bool runActions) { +bool gt_ScourgishInquisition1_Func (bool testConds, bool runActions) { + // Variable Declarations + unitgroup lv_scourgeGroup; + // Automatic Variable Declarations - unitgroup autoF6137478_g; - int autoF6137478_u; - unit autoF6137478_var; + unitgroup auto23A2AC8A_g; + int auto23A2AC8A_u; + unit auto23A2AC8A_var; + unitgroup auto158B9EA8_g; + int auto158B9EA8_u; + unit auto158B9EA8_var; + + // Variable Initialization + lv_scourgeGroup = UnitGroupEmpty(); // Conditions if (testConds) { @@ -1106,11 +1141,69 @@ bool gt_IntroMedivacsFinished_Func (bool testConds, bool runActions) { return false; } - if (!((UnitCargoValue(gv_medivac01, c_unitCargoUnitCount) == 0))) { + if (!((gv_inCinematic == false))) { return false; } + } - if (!((UnitCargoValue(gv_medivac02, c_unitCargoUnitCount) == 0))) { + // Actions + if (!runActions) { + return true; + } + + libNtve_gf_CreateUnitsWithDefaultFacing(12, "AP_Scourge", 0, 8, PointFromId(999)); + lv_scourgeGroup = UnitLastCreatedGroup(); + auto23A2AC8A_g = lv_scourgeGroup; + auto23A2AC8A_u = UnitGroupCount(auto23A2AC8A_g, c_unitCountAll); + for (;; auto23A2AC8A_u -= 1) { + auto23A2AC8A_var = UnitGroupUnitFromEnd(auto23A2AC8A_g, auto23A2AC8A_u); + if (auto23A2AC8A_var == null) { break; } + libNtve_gf_ChangeUnitDamage(auto23A2AC8A_var, libNtve_ge_UnitDamageTakenDealt_Damage_Take, libNtve_ge_UnitDamageChangeOption_Minimal); + } + UnitGroupIssueOrder(lv_scourgeGroup, OrderTargetingUnit(AbilityCommand("attack", 0), gv_medivac01), c_orderQueueReplace); + while (!((UnitIsAlive(gv_medivac01) == false))) { + Wait(0.5, c_timeGame); + } + auto158B9EA8_g = lv_scourgeGroup; + auto158B9EA8_u = UnitGroupCount(auto158B9EA8_g, c_unitCountAll); + for (;; auto158B9EA8_u -= 1) { + auto158B9EA8_var = UnitGroupUnitFromEnd(auto158B9EA8_g, auto158B9EA8_u); + if (auto158B9EA8_var == null) { break; } + UnitKill(auto158B9EA8_var); + } + return true; +} + +//-------------------------------------------------------------------------------------------------- +void gt_ScourgishInquisition1_Init () { + gt_ScourgishInquisition1 = TriggerCreate("gt_ScourgishInquisition1_Func"); +} + +//-------------------------------------------------------------------------------------------------- +// Trigger: Scourgish Inquisition 2 +//-------------------------------------------------------------------------------------------------- +bool gt_ScourgishInquisition2_Func (bool testConds, bool runActions) { + // Variable Declarations + unitgroup lv_scourgeGroup; + + // Automatic Variable Declarations + unitgroup autoF2D10299_g; + int autoF2D10299_u; + unit autoF2D10299_var; + unitgroup auto30EC0504_g; + int auto30EC0504_u; + unit auto30EC0504_var; + + // Variable Initialization + lv_scourgeGroup = UnitGroupEmpty(); + + // Conditions + if (testConds) { + if (!((gv_gameOver == false))) { + return false; + } + + if (!((gv_inCinematic == false))) { return false; } } @@ -1120,49 +1213,63 @@ bool gt_IntroMedivacsFinished_Func (bool testConds, bool runActions) { return true; } - TriggerEnable(TriggerGetCurrent(), false); - autoF6137478_g = gv_medivacUnits; - autoF6137478_u = UnitGroupCount(autoF6137478_g, c_unitCountAll); - for (;; autoF6137478_u -= 1) { - autoF6137478_var = UnitGroupUnitFromEnd(autoF6137478_g, autoF6137478_u); - if (autoF6137478_var == null) { break; } - libNtve_gf_RescueUnit(autoF6137478_var, gv_p01_USER, true); - lib15EF4C78_gf_AP_Player_ReapplyDefaultBehaviorsToUnit(autoF6137478_var); - if ((UnitGetType(autoF6137478_var) == "AP_Medivac")) { - if ((libNtve_gf_DifficultyValueInt(1, 1, 0, 0) == 1)) { - UnitSetInfoText(autoF6137478_var, StringExternal("Param/Value/EB077EA5"), StringExternal("Param/Value/8595A3F1"), StringExternal("Param/Value/AE692EA9")); - UnitSetState(autoF6137478_var, c_unitStateTooltipable, true); - } - else { - UnitSetInfoText(autoF6137478_var, StringExternal("Param/Value/1D83D7CE"), StringToText(""), StringToText("")); - } - } - + libNtve_gf_CreateUnitsWithDefaultFacing(12, "AP_Scourge", 0, 8, PointFromId(2827)); + lv_scourgeGroup = UnitLastCreatedGroup(); + autoF2D10299_g = lv_scourgeGroup; + autoF2D10299_u = UnitGroupCount(autoF2D10299_g, c_unitCountAll); + for (;; autoF2D10299_u -= 1) { + autoF2D10299_var = UnitGroupUnitFromEnd(autoF2D10299_g, autoF2D10299_u); + if (autoF2D10299_var == null) { break; } + libNtve_gf_ChangeUnitDamage(autoF2D10299_var, libNtve_ge_UnitDamageTakenDealt_Damage_Take, libNtve_ge_UnitDamageChangeOption_Minimal); + } + UnitGroupIssueOrder(lv_scourgeGroup, OrderTargetingUnit(AbilityCommand("attack", 0), gv_medivac02), c_orderQueueReplace); + while (!((UnitIsAlive(gv_medivac02) == false))) { + Wait(0.5, c_timeGame); + } + auto30EC0504_g = lv_scourgeGroup; + auto30EC0504_u = UnitGroupCount(auto30EC0504_g, c_unitCountAll); + for (;; auto30EC0504_u -= 1) { + auto30EC0504_var = UnitGroupUnitFromEnd(auto30EC0504_g, auto30EC0504_u); + if (auto30EC0504_var == null) { break; } + UnitKill(auto30EC0504_var); } - TriggerExecute(gt_TipNewUnitMedivacQ, true, true); - TriggerExecute(gt_TipTransportQ, true, true); return true; } //-------------------------------------------------------------------------------------------------- -void gt_IntroMedivacsFinished_Init () { - gt_IntroMedivacsFinished = TriggerCreate("gt_IntroMedivacsFinished_Func"); - TriggerEnable(gt_IntroMedivacsFinished, false); - TriggerAddEventTimePeriodic(gt_IntroMedivacsFinished, 1.0, c_timeGame); +void gt_ScourgishInquisition2_Init () { + gt_ScourgishInquisition2 = TriggerCreate("gt_ScourgishInquisition2_Func"); } //-------------------------------------------------------------------------------------------------- -// Trigger: Medivac Trained +// Trigger: Intro Medivacs Finished //-------------------------------------------------------------------------------------------------- -bool gt_MedivacTrained_Func (bool testConds, bool runActions) { +bool gt_IntroMedivacsFinished_Func (bool testConds, bool runActions) { + // Variable Declarations + unitgroup lv_prisms; + // Automatic Variable Declarations + unitgroup autoF6137478_g; + int autoF6137478_u; + unit autoF6137478_var; + unitgroup auto9FB6BD88_g; + int auto9FB6BD88_u; + unit auto9FB6BD88_var; + + // Variable Initialization + lv_prisms = UnitGroupEmpty(); + // Conditions if (testConds) { if (!((gv_gameOver == false))) { return false; } - if (!((UnitGetType(EventUnitProgressUnit()) == "AP_Medivac"))) { + if (!((UnitCargoValue(gv_medivac01, c_unitCargoUnitCount) == 0))) { + return false; + } + + if (!((UnitCargoValue(gv_medivac02, c_unitCargoUnitCount) == 0))) { return false; } } @@ -1172,20 +1279,46 @@ bool gt_MedivacTrained_Func (bool testConds, bool runActions) { return true; } - if ((libNtve_gf_DifficultyValueInt(1, 1, 0, 0) == 1)) { - UnitSetInfoText(EventUnitProgressUnit(), StringExternal("Param/Value/0494ADCA"), StringExternal("Param/Value/D71A7F16"), StringExternal("Param/Value/DBD1FCB1")); - UnitSetState(EventUnitProgressUnit(), c_unitStateTooltipable, true); + TriggerEnable(TriggerGetCurrent(), false); + autoF6137478_g = gv_medivacUnits; + autoF6137478_u = UnitGroupCount(autoF6137478_g, c_unitCountAll); + for (;; autoF6137478_u -= 1) { + autoF6137478_var = UnitGroupUnitFromEnd(autoF6137478_g, autoF6137478_u); + if (autoF6137478_var == null) { break; } + libNtve_gf_RescueUnit(autoF6137478_var, gv_p01_USER, true); + lib15EF4C78_gf_AP_Player_ReapplyDefaultBehaviorsToUnit(autoF6137478_var); } - else { - UnitSetInfoText(EventUnitProgressUnit(), StringExternal("Param/Value/A452F47F"), StringToText(""), StringToText("")); + TriggerExecute(gt_TipNewUnitMedivacQ, true, true); + TriggerExecute(gt_TipTransportQ, true, true); + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) { + Wait(2.0, c_timeGame); + libNtve_gf_CreateUnitsAtPoint2(1, "AP_WarpPrism", 0, gv_p06_MOEBIUS_SEC_FORCE, PointFromId(995)); + UnitSetHeight(UnitLastCreated(), 20.0, 0.0); + UnitSetHeight(UnitLastCreated(), 3.75, 3.0); + UnitGroupAdd(lv_prisms, UnitLastCreated()); + Wait(0.5, c_timeGame); + libNtve_gf_CreateUnitsAtPoint2(1, "AP_WarpPrism", 0, gv_p06_MOEBIUS_SEC_FORCE, PointFromId(1117)); + UnitSetHeight(UnitLastCreated(), 20.0, 0.0); + UnitSetHeight(UnitLastCreated(), 3.75, 3.0); + UnitGroupAdd(lv_prisms, UnitLastCreated()); + Wait(1.0, c_timeGame); + auto9FB6BD88_g = lv_prisms; + auto9FB6BD88_u = UnitGroupCount(auto9FB6BD88_g, c_unitCountAll); + for (;; auto9FB6BD88_u -= 1) { + auto9FB6BD88_var = UnitGroupUnitFromEnd(auto9FB6BD88_g, auto9FB6BD88_u); + if (auto9FB6BD88_var == null) { break; } + libNtve_gf_RescueUnit(auto9FB6BD88_var, gv_p01_USER, true); + } } + return true; } //-------------------------------------------------------------------------------------------------- -void gt_MedivacTrained_Init () { - gt_MedivacTrained = TriggerCreate("gt_MedivacTrained_Func"); - TriggerAddEventUnitTrainProgress(gt_MedivacTrained, null, c_unitProgressStageComplete); +void gt_IntroMedivacsFinished_Init () { + gt_IntroMedivacsFinished = TriggerCreate("gt_IntroMedivacsFinished_Func"); + TriggerEnable(gt_IntroMedivacsFinished, false); + TriggerAddEventTimePeriodic(gt_IntroMedivacsFinished, 1.0, c_timeGame); } //-------------------------------------------------------------------------------------------------- @@ -3155,6 +3288,11 @@ bool gt_IntroMilitiaStartQ_Func (bool testConds, bool runActions) { actor lv_talkActor; // Automatic Variable Declarations + string auto5F20BAFE_val; + const int autoC64EE707_n = 2; + int autoC64EE707_i; + const int auto0CF50EB2_n = 4; + int auto0CF50EB2_i; const int auto3587E73F_n = 4; int auto3587E73F_i; unitgroup auto893DB8D7_g; @@ -3163,6 +3301,9 @@ bool gt_IntroMilitiaStartQ_Func (bool testConds, bool runActions) { unitgroup autoF42710C8_g; int autoF42710C8_u; unit autoF42710C8_var; + string auto53594B18_val; + string autoE5431E21_val; + string autoA067942C_val; // Variable Initialization @@ -3182,11 +3323,30 @@ bool gt_IntroMilitiaStartQ_Func (bool testConds, bool runActions) { return true; } - for (auto3587E73F_i = 1; auto3587E73F_i <= auto3587E73F_n; auto3587E73F_i += 1) { - libNtve_gf_CreateUnitsAtPoint2(1, "AP_WarPig", 0, gv_p06_MOEBIUS_SEC_FORCE, PointFromId(1680)); - UnitIssueOrder(UnitLastCreated(), OrderTargetingPoint(AbilityCommand("move", 0), RegionGetCenter(RegionFromId(35))), c_orderQueueReplace); - UnitSetPropertyFixed(UnitLastCreated(), c_unitPropLifePercent, 75.0); - UnitGroupAdd(gv_introMilitia, UnitLastCreated()); + auto5F20BAFE_val = libABFE498B_gv_aP_Triggers_Option_overridePlayerRace; + if (auto5F20BAFE_val == "Zerg") { + for (autoC64EE707_i = 1; autoC64EE707_i <= autoC64EE707_n; autoC64EE707_i += 1) { + libNtve_gf_CreateUnitsAtPoint2(1, "AP_HunterKiller", 0, gv_p06_MOEBIUS_SEC_FORCE, PointFromId(1680)); + UnitIssueOrder(UnitLastCreated(), OrderTargetingPoint(AbilityCommand("move", 0), RegionGetCenter(RegionFromId(35))), c_orderQueueReplace); + UnitSetPropertyFixed(UnitLastCreated(), c_unitPropLifePercent, 75.0); + UnitGroupAdd(gv_introMilitia, UnitLastCreated()); + } + } + else if (auto5F20BAFE_val == "Prot") { + for (auto0CF50EB2_i = 1; auto0CF50EB2_i <= auto0CF50EB2_n; auto0CF50EB2_i += 1) { + libNtve_gf_CreateUnitsAtPoint2(1, "AP_Adept", 0, gv_p06_MOEBIUS_SEC_FORCE, PointFromId(1680)); + UnitIssueOrder(UnitLastCreated(), OrderTargetingPoint(AbilityCommand("move", 0), RegionGetCenter(RegionFromId(35))), c_orderQueueReplace); + UnitSetPropertyFixed(UnitLastCreated(), c_unitPropShieldsPercent, 55.0); + UnitGroupAdd(gv_introMilitia, UnitLastCreated()); + } + } + else { + for (auto3587E73F_i = 1; auto3587E73F_i <= auto3587E73F_n; auto3587E73F_i += 1) { + libNtve_gf_CreateUnitsAtPoint2(1, "AP_WarPig", 0, gv_p06_MOEBIUS_SEC_FORCE, PointFromId(1680)); + UnitIssueOrder(UnitLastCreated(), OrderTargetingPoint(AbilityCommand("move", 0), RegionGetCenter(RegionFromId(35))), c_orderQueueReplace); + UnitSetPropertyFixed(UnitLastCreated(), c_unitPropLifePercent, 75.0); + UnitGroupAdd(gv_introMilitia, UnitLastCreated()); + } } gv_uNITIntroSpeaker = UnitLastCreated(); Wait(1.5, c_timeGame); @@ -3209,11 +3369,20 @@ bool gt_IntroMilitiaStartQ_Func (bool testConds, bool runActions) { TriggerExecute(gt_AchievementAllUnitsRescued, true, false); TriggerQueueEnter(); UIAlertUnit("Trigger", gv_p01_USER, StringExternal("Param/Value/5299697B"), null, gv_uNITIntroSpeaker); - libNtve_gf_AttachModelToUnit(gv_uNITIntroSpeaker, "TalkIcon", "Origin"); + libNtve_gf_AttachModelToUnit(gv_uNITIntroSpeaker, "TalkIcon", "Ref_Origin"); libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Speech); libLbty_gf_PlayTransmissionCueSound(PlayerGroupAll()); - // Transmission - SoundLink("TTychus03Marine700017", -1) - libCamp_gf_SendTransmissionCampaign(null, SoundLink("TTychus03Marine700017", -1), c_transmissionDurationAdd, 1.0, true); + auto53594B18_val = libABFE498B_gv_aP_Triggers_Option_overridePlayerRace; + if (auto53594B18_val == "Zerg") { + SoundPlayForPlayer(SoundLink("AP_SCBW_Hydralisk_Ready", -1), c_maxPlayers, PlayerGroupAll(), 100.0, 0.0); + } + else if (auto53594B18_val == "Prot") { + SoundPlayForPlayer(SoundLink("Adept_Pissed", -1), c_maxPlayers, PlayerGroupAll(), 150.0, 0.0); + } + else { + // Transmission - SoundLink("TTychus03Marine700017", -1) + libCamp_gf_SendTransmissionCampaign(null, SoundLink("TTychus03Marine700017", -1), c_transmissionDurationAdd, 1.0, true); + } libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Game); libNtve_gf_KillModel(libNtve_gf_ActorLastCreated()); TriggerQueueExit(); @@ -3223,18 +3392,38 @@ bool gt_IntroMilitiaStartQ_Func (bool testConds, bool runActions) { Wait(10.0, c_timeGame); if ((TriggerIsEnabled(gt_Site1MilitiaHeadsUpQ) == true)) { TriggerEnable(gt_Site1MilitiaHeadsUpQ, false); - libNtve_gf_CreateModelAtPoint("BriefingUnitSelectLarge", PointFromId(2654)); + autoE5431E21_val = libABFE498B_gv_aP_Triggers_Option_overridePlayerRace; + if (autoE5431E21_val == "Zerg") { + libNtve_gf_CreateModelAtPoint("BriefingUnitSelectLarge", PointFromId(734733913)); + } + else if (autoE5431E21_val == "Prot") { + libNtve_gf_CreateModelAtPoint("BriefingUnitSelectLarge", PointFromId(228429242)); + } + else { + libNtve_gf_CreateModelAtPoint("BriefingUnitSelectLarge", PointFromId(2654)); + } gv_site1RescuableReticule = libNtve_gf_ActorLastCreated(); TriggerQueueEnter(); UIAlertUnit("Trigger", gv_p01_USER, StringExternal("Param/Value/5F4C1497"), null, gv_uNITSite1Speaker); MinimapPing(PlayerGroupAll(), UnitGetPosition(gv_uNITSite1Speaker), 2.0, Color(100.00, 100.00, 0.00)); libNtve_gf_ShareVisionofUnit(gv_uNITSite1Speaker, true, gv_p01_USER); - libNtve_gf_AttachModelToUnit(gv_uNITSite1Speaker, "TalkIcon", "Origin"); + libNtve_gf_AttachModelToUnit(gv_uNITSite1Speaker, "TalkIcon", "Ref_Origin"); lv_talkActor = libNtve_gf_ActorLastCreated(); libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Speech); libLbty_gf_PlayTransmissionCueSound(PlayerGroupAll()); - // Transmission - SoundLink("TTychus03MoebiusMarine00022", -1) - libCamp_gf_SendTransmissionCampaign(gv_uNITSite1Speaker, SoundLink("TTychus03MoebiusMarine00022", -1), c_transmissionDurationAdd, 0.0, true); + autoA067942C_val = libABFE498B_gv_aP_Triggers_Option_overridePlayerRace; + if (autoA067942C_val == "Zerg") { + // Transmission - SoundLink("TValerian02AInfestedRefugee00021", -1) + libCamp_gf_SendTransmissionCampaign(gv_uNITSite1Speaker, SoundLink("TValerian02AInfestedRefugee00021", -1), c_transmissionDurationAdd, 0.0, true); + } + else if (autoA067942C_val == "Prot") { + // Transmission - SoundLink("TRaynor01Raynor00015", -1) + libCamp_gf_SendTransmissionCampaign(gv_uNITSite1Speaker, SoundLink("TRaynor01Raynor00015", -1), c_transmissionDurationAdd, 0.0, true); + } + else { + // Transmission - SoundLink("TTychus03MoebiusMarine00022", -1) + libCamp_gf_SendTransmissionCampaign(gv_uNITSite1Speaker, SoundLink("TTychus03MoebiusMarine00022", -1), c_transmissionDurationAdd, 0.0, true); + } libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Game); libNtve_gf_KillModel(lv_talkActor); TriggerEnable(gt_Site1MilitiaRescued, true); @@ -3257,6 +3446,9 @@ bool gt_Site1MilitiaHeadsUpQ_Func (bool testConds, bool runActions) { actor lv_talkActor; // Automatic Variable Declarations + string auto64F1080E_val; + string auto7CD1D777_val; + // Variable Initialization // Conditions @@ -3289,18 +3481,38 @@ bool gt_Site1MilitiaHeadsUpQ_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveRescueCreateQ, true, false); + auto64F1080E_val = libABFE498B_gv_aP_Triggers_Option_overridePlayerRace; + if (auto64F1080E_val == "Zerg") { + } + else if (auto64F1080E_val == "Prot") { + } + else { + } libNtve_gf_CreateModelAtPoint("BriefingUnitSelectLarge", PointFromId(2654)); gv_site1RescuableReticule = libNtve_gf_ActorLastCreated(); TriggerQueueEnter(); UIAlertUnit("Trigger", gv_p01_USER, StringExternal("Param/Value/B04777F1"), null, gv_uNITSite1Speaker); MinimapPing(PlayerGroupAll(), UnitGetPosition(gv_uNITSite1Speaker), 2.0, Color(100.00, 100.00, 0.00)); libNtve_gf_ShareVisionofUnit(gv_uNITSite1Speaker, true, gv_p01_USER); - libNtve_gf_AttachModelToUnit(gv_uNITSite1Speaker, "TalkIcon", "Origin"); - lv_talkActor = libNtve_gf_ActorLastCreated(); libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Speech); libLbty_gf_PlayTransmissionCueSound(PlayerGroupAll()); - // Transmission - SoundLink("TTychus03MoebiusMarine00022", -1) - libCamp_gf_SendTransmissionCampaign(gv_uNITSite1Speaker, SoundLink("TTychus03MoebiusMarine00022", -1), c_transmissionDurationAdd, 0.0, true); + auto7CD1D777_val = libABFE498B_gv_aP_Triggers_Option_overridePlayerRace; + if (auto7CD1D777_val == "Zerg") { + libNtve_gf_AttachModelToUnit(gv_uNITSite1Speaker, "TalkIcon", "Ref_Origin"); + lv_talkActor = libNtve_gf_ActorLastCreated(); + // Transmission - SoundLink("TValerian02AInfestedRefugee00021", -1) + libCamp_gf_SendTransmissionCampaign(gv_uNITSite1Speaker, SoundLink("TValerian02AInfestedRefugee00021", -1), c_transmissionDurationAdd, 0.0, true); + } + else if (auto7CD1D777_val == "Prot") { + // Transmission - SoundLink("TRaynor01Raynor00015", -1) + libCamp_gf_SendTransmissionCampaign(gv_uNITSite1Speaker, SoundLink("TRaynor01Raynor00015", -1), c_transmissionDurationAdd, 0.0, true); + } + else { + libNtve_gf_AttachModelToUnit(gv_uNITSite1Speaker, "TalkIcon", "Ref_Origin"); + lv_talkActor = libNtve_gf_ActorLastCreated(); + // Transmission - SoundLink("TTychus03MoebiusMarine00022", -1) + libCamp_gf_SendTransmissionCampaign(gv_uNITSite1Speaker, SoundLink("TTychus03MoebiusMarine00022", -1), c_transmissionDurationAdd, 0.0, true); + } libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Game); libNtve_gf_KillModel(lv_talkActor); TriggerEnable(gt_Site1MilitiaRescued, true); @@ -3333,7 +3545,7 @@ bool gt_Site1MilitiaRescued_Func (bool testConds, bool runActions) { return false; } - if (!(((UnitGroupCount(UnitGroup(null, gv_p01_USER, RegionFromId(52), UnitFilter(0, 0, (1 << c_targetFilterAir) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Medivac", gv_p01_USER, RegionFromId(52), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Hercules", gv_p01_USER, RegionFromId(52), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0)))) { + if (!(((UnitGroupCount(UnitGroup(null, gv_p01_USER, RegionFromId(52), UnitFilter(0, 0, (1 << c_targetFilterAir) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Medivac", gv_p01_USER, RegionFromId(52), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Hercules", gv_p01_USER, RegionFromId(52), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_WarpPrismPhasing", gv_p01_USER, RegionFromId(52), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_WarpPrism", gv_p01_USER, RegionFromId(52), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Yggdrasil", gv_p01_USER, RegionFromId(52), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || ((UnitGroupCount(UnitGroup("AP_Overlord", gv_p01_USER, RegionFromId(52), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) && (TechTreeUpgradeCount(gv_p01_USER, "AP_overlordtransport", c_techCountQueuedOrBetter) >= 1))))) { return false; } @@ -3381,6 +3593,8 @@ bool gt_TheWallHeadsUpQ_Func (bool testConds, bool runActions) { actor lv_talkActor; // Automatic Variable Declarations + string auto579DDD62_val; + // Variable Initialization // Conditions @@ -3418,12 +3632,25 @@ bool gt_TheWallHeadsUpQ_Func (bool testConds, bool runActions) { UIAlertPoint("Trigger", gv_p01_USER, StringExternal("Param/Value/E0CF8433"), null, PointFromId(1308)); MinimapPing(PlayerGroupAll(), UnitGetPosition(gv_uNITWallSpeaker), 2.0, Color(100.00, 100.00, 0.00)); libNtve_gf_ShareVisionofUnit(gv_uNITWallSpeaker, true, gv_p01_USER); - libNtve_gf_AttachModelToUnit(gv_uNITWallSpeaker, "TalkIcon", "Origin"); - lv_talkActor = libNtve_gf_ActorLastCreated(); libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Speech); libLbty_gf_PlayTransmissionCueSound(PlayerGroupAll()); - // Transmission - SoundLink("TTychus03MoebiusMarine00030", -1) - libCamp_gf_SendTransmissionCampaign(gv_uNITWallSpeaker, SoundLink("TTychus03MoebiusMarine00030", -1), c_transmissionDurationAdd, 0.0, true); + auto579DDD62_val = libABFE498B_gv_aP_Triggers_Option_overridePlayerRace; + if (auto579DDD62_val == "Zerg") { + libNtve_gf_AttachModelToUnit(gv_uNITWallSpeaker, "TalkIcon", "Ref_Origin"); + lv_talkActor = libNtve_gf_ActorLastCreated(); + // Transmission - SoundLink("THanson02InfestedRefugee00005", -1) + libCamp_gf_SendTransmissionCampaign(gv_uNITWallSpeaker, SoundLink("THanson02InfestedRefugee00005", -1), c_transmissionDurationAdd, 0.0, true); + } + else if (auto579DDD62_val == "Prot") { + // Transmission - SoundLink("TZeratul01Zeratul00076", -1) + libCamp_gf_SendTransmissionCampaign(gv_uNITSite1Speaker, SoundLink("TZeratul01Zeratul00076", -1), c_transmissionDurationAdd, 0.0, true); + } + else { + libNtve_gf_AttachModelToUnit(gv_uNITWallSpeaker, "TalkIcon", "Ref_Origin"); + lv_talkActor = libNtve_gf_ActorLastCreated(); + // Transmission - SoundLink("TTychus03MoebiusMarine00030", -1) + libCamp_gf_SendTransmissionCampaign(gv_uNITWallSpeaker, SoundLink("TTychus03MoebiusMarine00030", -1), c_transmissionDurationAdd, 0.0, true); + } libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Game); libNtve_gf_KillModel(lv_talkActor); TriggerEnable(gt_TheWallRescued, true); @@ -3456,7 +3683,7 @@ bool gt_TheWallRescued_Func (bool testConds, bool runActions) { return false; } - if (!(((UnitGroupCount(UnitGroup(null, gv_p01_USER, RegionFromId(73), UnitFilter(0, 0, (1 << c_targetFilterAir) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Medivac", gv_p01_USER, RegionFromId(73), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Hercules", gv_p01_USER, RegionFromId(73), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0)))) { + if (!(((UnitGroupCount(UnitGroup(null, gv_p01_USER, RegionFromId(73), UnitFilter(0, 0, (1 << c_targetFilterAir) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Medivac", gv_p01_USER, RegionFromId(73), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Hercules", gv_p01_USER, RegionFromId(73), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_WarpPrismPhasing", gv_p01_USER, RegionFromId(73), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_WarpPrism", gv_p01_USER, RegionFromId(73), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Yggdrasil", gv_p01_USER, RegionFromId(73), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || ((UnitGroupCount(UnitGroup("AP_Overlord", gv_p01_USER, RegionFromId(73), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) && (TechTreeUpgradeCount(gv_p01_USER, "AP_overlordtransport", c_techCountQueuedOrBetter) >= 1))))) { return false; } @@ -3504,6 +3731,9 @@ bool gt_Site2MilitiaHeadsUpQ_Func (bool testConds, bool runActions) { actor lv_talkActor; // Automatic Variable Declarations + string auto1212D02D_val; + string auto47837471_val; + // Variable Initialization // Conditions @@ -3535,20 +3765,40 @@ bool gt_Site2MilitiaHeadsUpQ_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - libNtve_gf_CreateModelAtPoint("BriefingUnitSelectLarge", PointFromId(2656)); + auto1212D02D_val = libABFE498B_gv_aP_Triggers_Option_overridePlayerRace; + if (auto1212D02D_val == "Zerg") { + libNtve_gf_CreateModelAtPoint("BriefingUnitSelectLarge", PointFromId(2079767245)); + } + else if (auto1212D02D_val == "Prot") { + libNtve_gf_CreateModelAtPoint("BriefingUnitSelectLarge", PointFromId(1446728418)); + } + else { + libNtve_gf_CreateModelAtPoint("BriefingUnitSelectLarge", PointFromId(2656)); + } gv_site2RescuableReticule = libNtve_gf_ActorLastCreated(); TriggerQueueEnter(); UIAlertUnit("Trigger", gv_p01_USER, StringExternal("Param/Value/5A52BBEB"), null, gv_uNITSite2Speaker); MinimapPing(PlayerGroupAll(), UnitGetPosition(gv_uNITSite2Speaker), 2.0, Color(100.00, 100.00, 0.00)); libNtve_gf_ShareVisionofUnit(gv_uNITSite2Speaker, true, gv_p01_USER); - libNtve_gf_AttachModelToUnit(gv_uNITSite2Speaker, "TalkIcon", "Origin"); - lv_talkActor = libNtve_gf_ActorLastCreated(); libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Speech); libLbty_gf_PlayTransmissionCueSound(PlayerGroupAll()); - // Transmission - SoundLink("TTychus03MoebiusMarauder00027", -1) - libCamp_gf_SendTransmissionCampaign(gv_uNITSite2Speaker, SoundLink("TTychus03MoebiusMarauder00027", -1), c_transmissionDurationAdd, 0.0, true); + auto47837471_val = libABFE498B_gv_aP_Triggers_Option_overridePlayerRace; + if (auto47837471_val == "Zerg") { + // Transmission - SoundLink("TValerian02ATychus00020", -1) + libCamp_gf_SendTransmissionCampaign(gv_uNITSite2Speaker, SoundLink("TValerian02ATychus00020", -1), c_transmissionDurationAdd, 0.0, true); + } + else if (auto47837471_val == "Prot") { + // Transmission - SoundLink("TZeratul02Zeratul00031", -1) + libCamp_gf_SendTransmissionCampaign(gv_uNITSite2Speaker, SoundLink("TZeratul02Zeratul00046", -1), c_transmissionDurationAdd, 0.0, true); + } + else { + libNtve_gf_AttachModelToUnit(gv_uNITSite2Speaker, "TalkIcon", "Ref_Origin"); + lv_talkActor = libNtve_gf_ActorLastCreated(); + // Transmission - SoundLink("TTychus03MoebiusMarauder00027", -1) + libCamp_gf_SendTransmissionCampaign(gv_uNITSite2Speaker, SoundLink("TTychus03MoebiusMarauder00027", -1), c_transmissionDurationAdd, 0.0, true); + libNtve_gf_KillModel(lv_talkActor); + } libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Game); - libNtve_gf_KillModel(lv_talkActor); TriggerEnable(gt_Site2MilitiaRescued, true); TriggerQueueExit(); return true; @@ -3579,7 +3829,7 @@ bool gt_Site2MilitiaRescued_Func (bool testConds, bool runActions) { return false; } - if (!(((UnitGroupCount(UnitGroup(null, gv_p01_USER, RegionFromId(69), UnitFilter(0, 0, (1 << c_targetFilterAir) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Medivac", gv_p01_USER, RegionFromId(69), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Hercules", gv_p01_USER, RegionFromId(69), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0)))) { + if (!(((UnitGroupCount(UnitGroup(null, gv_p01_USER, RegionFromId(69), UnitFilter(0, 0, (1 << c_targetFilterAir) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Medivac", gv_p01_USER, RegionFromId(69), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Hercules", gv_p01_USER, RegionFromId(69), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_WarpPrismPhasing", gv_p01_USER, RegionFromId(69), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_WarpPrism", gv_p01_USER, RegionFromId(69), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Yggdrasil", gv_p01_USER, RegionFromId(69), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || ((UnitGroupCount(UnitGroup("AP_Overlord", gv_p01_USER, RegionFromId(69), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) && (TechTreeUpgradeCount(gv_p01_USER, "AP_overlordtransport", c_techCountQueuedOrBetter) >= 1))))) { return false; } @@ -3627,8 +3877,14 @@ bool gt_AliveInsideHeadsUpQ_Func (bool testConds, bool runActions) { actor lv_talkActor; // Automatic Variable Declarations + string autoBE1F6F1C_val; const int autoF4FA28C1_n = 5; int autoF4FA28C1_i; + const int auto136EAD32_n = 3; + int auto136EAD32_i; + const int auto8C25A516_n = 3; + int auto8C25A516_i; + string auto6D4EE29D_val; // Variable Initialization @@ -3657,8 +3913,18 @@ bool gt_AliveInsideHeadsUpQ_Func (bool testConds, bool runActions) { } TriggerEnable(TriggerGetCurrent(), false); - for (autoF4FA28C1_i = 1; autoF4FA28C1_i <= autoF4FA28C1_n; autoF4FA28C1_i += 1) { - libNtve_gf_CreateUnitsAtPoint2(1, "AP_WarPig", 0, gv_p06_MOEBIUS_SEC_FORCE, PointFromId(794)); + autoBE1F6F1C_val = libABFE498B_gv_aP_Triggers_Option_overridePlayerRace; + if (autoBE1F6F1C_val == "Zerg") { + for (auto136EAD32_i = 1; auto136EAD32_i <= auto136EAD32_n; auto136EAD32_i += 1) { + libNtve_gf_CreateUnitsAtPoint2(1, "AP_SIInfestedTrooper", 0, gv_p06_MOEBIUS_SEC_FORCE, PointFromId(794)); + SoundPlayOnUnit(SoundLink("Medivac_Unload", -1), PlayerGroupAll(), UnitLastCreated(), 0.0, 100.0, 0.0); + libNtve_gf_ShareVisionofUnit(UnitLastCreated(), true, gv_p01_USER); + UnitGroupAdd(gv_gROUPAliveInside, UnitLastCreated()); + Wait(0.5, c_timeGame); + UnitIssueOrder(UnitLastCreated(), OrderTargetingPoint(AbilityCommand("move", 0), PointFromId(788)), c_orderQueueReplace); + Wait(0.5, c_timeGame); + } + libNtve_gf_CreateUnitsAtPoint2(1, "AP_HunterKiller", 0, gv_p06_MOEBIUS_SEC_FORCE, PointFromId(794)); SoundPlayOnUnit(SoundLink("Medivac_Unload", -1), PlayerGroupAll(), UnitLastCreated(), 0.0, 100.0, 0.0); libNtve_gf_ShareVisionofUnit(UnitLastCreated(), true, gv_p01_USER); UnitGroupAdd(gv_gROUPAliveInside, UnitLastCreated()); @@ -3666,17 +3932,50 @@ bool gt_AliveInsideHeadsUpQ_Func (bool testConds, bool runActions) { UnitIssueOrder(UnitLastCreated(), OrderTargetingPoint(AbilityCommand("move", 0), PointFromId(788)), c_orderQueueReplace); Wait(0.5, c_timeGame); } + else if (autoBE1F6F1C_val == "Prot") { + for (auto8C25A516_i = 1; auto8C25A516_i <= auto8C25A516_n; auto8C25A516_i += 1) { + libNtve_gf_CreateUnitsAtPoint2(1, "AP_Dragoon", 0, gv_p06_MOEBIUS_SEC_FORCE, PointFromId(794)); + SoundPlayOnUnit(SoundLink("Medivac_Unload", -1), PlayerGroupAll(), UnitLastCreated(), 0.0, 100.0, 0.0); + libNtve_gf_ShareVisionofUnit(UnitLastCreated(), true, gv_p01_USER); + UnitGroupAdd(gv_gROUPAliveInside, UnitLastCreated()); + Wait(0.5, c_timeGame); + UnitIssueOrder(UnitLastCreated(), OrderTargetingPoint(AbilityCommand("move", 0), PointFromId(788)), c_orderQueueReplace); + Wait(0.5, c_timeGame); + } + } + else { + for (autoF4FA28C1_i = 1; autoF4FA28C1_i <= autoF4FA28C1_n; autoF4FA28C1_i += 1) { + libNtve_gf_CreateUnitsAtPoint2(1, "AP_WarPig", 0, gv_p06_MOEBIUS_SEC_FORCE, PointFromId(794)); + SoundPlayOnUnit(SoundLink("Medivac_Unload", -1), PlayerGroupAll(), UnitLastCreated(), 0.0, 100.0, 0.0); + libNtve_gf_ShareVisionofUnit(UnitLastCreated(), true, gv_p01_USER); + UnitGroupAdd(gv_gROUPAliveInside, UnitLastCreated()); + Wait(0.5, c_timeGame); + UnitIssueOrder(UnitLastCreated(), OrderTargetingPoint(AbilityCommand("move", 0), PointFromId(788)), c_orderQueueReplace); + Wait(0.5, c_timeGame); + } + } TriggerQueueEnter(); UIAlertPoint("Trigger", gv_p01_USER, StringExternal("Param/Value/CE9DBEA6"), null, PointFromId(794)); MinimapPing(PlayerGroupAll(), RegionGetCenter(RegionFromId(62)), 2.0, Color(100.00, 100.00, 0.00)); - libNtve_gf_AttachModelToUnit(UnitGroupRandomUnit(gv_gROUPAliveInside, c_unitCountAlive), "TalkIcon", "Origin"); - lv_talkActor = libNtve_gf_ActorLastCreated(); libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Speech); libLbty_gf_PlayTransmissionCueSound(PlayerGroupAll()); - // Transmission - SoundLink("TTychus03MoebiusMarine00030", -1) - libCamp_gf_SendTransmissionCampaign(null, SoundLink("TTychus03MoebiusMarine00030", -1), c_transmissionDurationAdd, 0.0, true); + auto6D4EE29D_val = libABFE498B_gv_aP_Triggers_Option_overridePlayerRace; + if (auto6D4EE29D_val == "Zerg") { + // Transmission - SoundLink("THanson02Hanson00014", -1) + libCamp_gf_SendTransmissionCampaign(null, SoundLink("THanson02Hanson00014", -1), c_transmissionDurationAdd, 0.0, true); + } + else if (auto6D4EE29D_val == "Prot") { + // Transmission - SoundLink("THorner02Tychus00023", -1) + libCamp_gf_SendTransmissionCampaign(null, SoundLink("THorner02Tychus00023", -1), c_transmissionDurationAdd, 0.0, true); + } + else { + libNtve_gf_AttachModelToUnit(UnitGroupRandomUnit(gv_gROUPAliveInside, c_unitCountAlive), "TalkIcon", "Ref_Origin"); + lv_talkActor = libNtve_gf_ActorLastCreated(); + // Transmission - SoundLink("TTychus03MoebiusMarine00030", -1) + libCamp_gf_SendTransmissionCampaign(null, SoundLink("TTychus03MoebiusMarine00030", -1), c_transmissionDurationAdd, 0.0, true); + libNtve_gf_KillModel(lv_talkActor); + } libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Game); - libNtve_gf_KillModel(lv_talkActor); TriggerEnable(gt_AliveInsideRescued, true); TriggerQueueExit(); return true; @@ -3707,7 +4006,7 @@ bool gt_AliveInsideRescued_Func (bool testConds, bool runActions) { return false; } - if (!(((UnitGroupCount(UnitGroup(null, gv_p01_USER, RegionFromId(62), UnitFilter(0, 0, (1 << c_targetFilterAir) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Medivac", gv_p01_USER, RegionFromId(62), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Hercules", gv_p01_USER, RegionFromId(62), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0)))) { + if (!(((UnitGroupCount(UnitGroup(null, gv_p01_USER, RegionFromId(62), UnitFilter(0, 0, (1 << c_targetFilterAir) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Medivac", gv_p01_USER, RegionFromId(62), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Hercules", gv_p01_USER, RegionFromId(62), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_WarpPrismPhasing", gv_p01_USER, RegionFromId(62), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_WarpPrism", gv_p01_USER, RegionFromId(62), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Yggdrasil", gv_p01_USER, RegionFromId(62), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || ((UnitGroupCount(UnitGroup("AP_Overlord", gv_p01_USER, RegionFromId(62), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) && (TechTreeUpgradeCount(gv_p01_USER, "AP_overlordtransport", c_techCountQueuedOrBetter) >= 1))))) { return false; } @@ -3754,6 +4053,8 @@ bool gt_Site3MilitiaHeadsUpQ_Func (bool testConds, bool runActions) { actor lv_talkActor; // Automatic Variable Declarations + string auto5A766366_val; + // Variable Initialization // Conditions @@ -3795,8 +4096,19 @@ bool gt_Site3MilitiaHeadsUpQ_Func (bool testConds, bool runActions) { lv_talkActor = libNtve_gf_ActorLastCreated(); libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Speech); libLbty_gf_PlayTransmissionCueSound(PlayerGroupAll()); - // Transmission - SoundLink("TTychus03MoebiusMarine00021", -1) - libCamp_gf_SendTransmissionCampaign(null, SoundLink("TTychus03MoebiusMarine00021", -1), c_transmissionDurationAdd, 0.0, true); + auto5A766366_val = libABFE498B_gv_aP_Triggers_Option_overridePlayerRace; + if (auto5A766366_val == "Zerg") { + // Transmission - SoundLink("TValerian02AInfestedMarine00022", -1) + libCamp_gf_SendTransmissionCampaign(gv_uNITSite3Speaker, SoundLink("TValerian02AInfestedMarine00022", -1), c_transmissionDurationAdd, 0.0, true); + } + else if (auto5A766366_val == "Prot") { + // Transmission - SoundLink("TTychus05DarkTemplar00026", -1) + libCamp_gf_SendTransmissionCampaign(gv_uNITSite3Speaker, SoundLink("TTychus05DarkTemplar00026", -1), c_transmissionDurationAdd, 0.0, true); + } + else { + // Transmission - SoundLink("TTychus03MoebiusMarine00021", -1) + libCamp_gf_SendTransmissionCampaign(gv_uNITSite3Speaker, SoundLink("TTychus03MoebiusMarine00021", -1), c_transmissionDurationAdd, 0.0, true); + } libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Game); libNtve_gf_KillModel(lv_talkActor); TriggerEnable(gt_Site3MilitiaRescued, true); @@ -3829,7 +4141,7 @@ bool gt_Site3MilitiaRescued_Func (bool testConds, bool runActions) { return false; } - if (!(((UnitGroupCount(UnitGroup(null, gv_p01_USER, RegionFromId(63), UnitFilter(0, 0, (1 << c_targetFilterAir) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Medivac", gv_p01_USER, RegionFromId(63), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Hercules", gv_p01_USER, RegionFromId(63), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0)))) { + if (!(((UnitGroupCount(UnitGroup(null, gv_p01_USER, RegionFromId(63), UnitFilter(0, 0, (1 << c_targetFilterAir) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Medivac", gv_p01_USER, RegionFromId(63), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Hercules", gv_p01_USER, RegionFromId(63), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_WarpPrismPhasing", gv_p01_USER, RegionFromId(63), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_WarpPrism", gv_p01_USER, RegionFromId(63), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || (UnitGroupCount(UnitGroup("AP_Yggdrasil", gv_p01_USER, RegionFromId(63), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) || ((UnitGroupCount(UnitGroup("AP_Overlord", gv_p01_USER, RegionFromId(63), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0) && (TechTreeUpgradeCount(gv_p01_USER, "AP_overlordtransport", c_techCountQueuedOrBetter) >= 1))))) { return false; } @@ -5154,14 +5466,23 @@ bool gt_TransmissionMedivacIntroQ_Func (bool testConds, bool runActions) { CameraPan(gv_p01_USER, RegionGetCenter(RegionFromId(35)), 3.0, -1, 10, true); } - // Transmission - SoundLink("TTychus03Narud00005", -1) - libCamp_gf_SendTransmissionCampaign(null, SoundLink("TTychus03Narud00005", -1), c_transmissionDurationAdd, 0.0, true); - lv_talkActor = libNtve_gf_AttachModelToUnit(lv_chosenMedivac, "TalkIcon", "Origin"); - UIAlertUnit("Trigger", gv_p01_USER, StringExternal("Param/Value/5ACED848"), null, lv_chosenMedivac); - // Transmission - SoundLink("TTychus03Medivac00010", -1) - libCamp_gf_SendTransmissionCampaign(lv_chosenMedivac, SoundLink("TTychus03Medivac00010", -1), c_transmissionDurationAdd, 0.0, true); + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace != "Prot")) { + // Transmission - SoundLink("TTychus03Narud00005", -1) + libCamp_gf_SendTransmissionCampaign(null, SoundLink("TTychus03Narud00005", -1), c_transmissionDurationAdd, 0.0, true); + UIAlertUnit("Trigger", gv_p01_USER, StringExternal("Param/Value/5ACED848"), null, lv_chosenMedivac); + // Transmission - SoundLink("TTychus03Medivac00010", -1) + libCamp_gf_SendTransmissionCampaign(lv_chosenMedivac, SoundLink("TTychus03Medivac00010", -1), c_transmissionDurationAdd, 0.0, true); + libNtve_gf_KillModel(lv_talkActor); + } + else { + // Transmission - SoundLink("TTychus03Narud00005", -1) + libCamp_gf_SendTransmissionCampaign(gv_medivac02, SoundLink("TTychus03Narud00005", -1), c_transmissionDurationAdd, 0.0, true); + // Transmission - SoundLink("TRaynor01Raynor00055", -1) + libCamp_gf_SendTransmissionCampaign(null, SoundLink("TRaynor01Raynor00055", -1), c_transmissionDurationAdd, 0.0, true); + // Transmission - SoundLink("THanson01Hanson00032", -1) + libCamp_gf_SendTransmissionCampaign(null, SoundLink("THanson01Hanson00032", -1), c_transmissionDurationAdd, 0.0, true); + } libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Game); - libNtve_gf_KillModel(lv_talkActor); TriggerQueueExit(); return true; } @@ -5312,6 +5633,10 @@ bool gt_TransmissionAliveInsideRescuedQ_Func (bool testConds, bool runActions) { if (!((gv_inCinematic == false))) { return false; } + + if (!(((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut") || (libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Terr")))) { + return false; + } } // Actions @@ -5351,6 +5676,10 @@ bool gt_TransmissionTheWallRescuedQ_Func (bool testConds, bool runActions) { if (!((gv_inCinematic == false))) { return false; } + + if (!(((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut") || (libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Terr")))) { + return false; + } } // Actions @@ -5395,6 +5724,10 @@ bool gt_TransmissionSite1MilitiaRescuedQ_Func (bool testConds, bool runActions) if (!((gv_inCinematic == false))) { return false; } + + if (!(((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut") || (libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Terr")))) { + return false; + } } // Actions @@ -5435,6 +5768,10 @@ bool gt_TransmissionSite2MilitiaRescuedQ_Func (bool testConds, bool runActions) if (!((gv_inCinematic == false))) { return false; } + + if (!(((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut") || (libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Terr")))) { + return false; + } } // Actions @@ -5474,6 +5811,10 @@ bool gt_TransmissionSite3MilitiaRescuedQ_Func (bool testConds, bool runActions) if (!((gv_inCinematic == false))) { return false; } + + if (!(((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut") || (libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Terr")))) { + return false; + } } // Actions @@ -6370,6 +6711,55 @@ void gt_ArchInit_Init () { TriggerAddEventMapInit(gt_ArchInit); } +//-------------------------------------------------------------------------------------------------- +// Trigger: Faction Swap Init +//-------------------------------------------------------------------------------------------------- +bool gt_FactionSwapInit_Func (bool testConds, bool runActions) { + // Automatic Variable Declarations + // Actions + if (!runActions) { + return true; + } + + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Neut")) { + lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(5), "Terr", false); + lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(6), "Terr", false); + } + else { + libABFE498B_gv_aP_Triggers_skipCutscenes = true; + lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(5), libABFE498B_gv_aP_Triggers_Option_overridePlayerRace, false); + lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(6), libABFE498B_gv_aP_Triggers_Option_overridePlayerRace, false); + lib15EF4C78_gf_AP_Player_UtilTownHallAutoRally(gv_p01_USER); + libLbty_gf_OrderWorkerstoGatherNearbyResources(RegionEntireMap(), gv_p01_USER); + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Zerg")) { + PlayerSetRace(gv_p01_USER, "Zerg"); + lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_p01_USER, lib5BD4895D_gv_aP_Core_Faction_KERRIGAN_SWARM_SWITCHABLE_TO_PRIMAL_ZERG); + gv_uNITSite1Speaker = UnitFromId(1758883606); + gv_uNITSite2Speaker = UnitFromId(2010210499); + gv_uNITSite3Speaker = UnitFromId(1856429658); + gv_uNITWallSpeaker = UnitFromId(334103018); + } + else { + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) { + PlayerSetRace(gv_p01_USER, "Prot"); + lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_p01_USER, lib5BD4895D_gv_aP_Core_Faction_DAELAAM); + gv_uNITSite1Speaker = UnitFromId(125132978); + gv_uNITSite2Speaker = UnitFromId(552617609); + gv_uNITSite3Speaker = UnitFromId(998612816); + gv_uNITWallSpeaker = UnitFromId(117942605); + } + + } + } + return true; +} + +//-------------------------------------------------------------------------------------------------- +void gt_FactionSwapInit_Init () { + gt_FactionSwapInit = TriggerCreate("gt_FactionSwapInit_Func"); + TriggerAddEventGeneric(gt_FactionSwapInit, lib5BD4895D_gv_aP_Core_LOAD_FINISHED_EVENT); +} + //-------------------------------------------------------------------------------------------------- // Trigger: Victory Q //-------------------------------------------------------------------------------------------------- @@ -7080,8 +7470,9 @@ void InitTriggers () { gt_StartGame_Init(); gt_BrutaliskStumbledUpon_Init(); gt_CreateMedivacIntro_Init(); + gt_ScourgishInquisition1_Init(); + gt_ScourgishInquisition2_Init(); gt_IntroMedivacsFinished_Init(); - gt_MedivacTrained_Init(); gt_Site1DestructionComplete_Init(); gt_Site1ActivateDefenses_Init(); gt_Site1SubwaySpawns_Init(); @@ -7201,6 +7592,7 @@ void InitTriggers () { gt_ObjectiveRescueUpdate_Init(); gt_ObjectiveRescueComplete_Init(); gt_ArchInit_Init(); + gt_FactionSwapInit_Init(); gt_VictoryQ_Init(); gt_VictorySetup_Init(); gt_VictoryCinematic_Init(); diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Minimap.tga b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Minimap.tga index f656f29da..47020b336 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Minimap.tga and b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Minimap.tga differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Objects b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Objects index 7f733934d..ce7291825 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Objects +++ b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Objects @@ -1144,9 +1144,6 @@ - - - @@ -9870,10 +9867,10 @@ - + @@ -9886,21 +9883,21 @@ - + - + + + - - @@ -9922,13 +9919,13 @@ - + - + @@ -9949,12 +9946,12 @@ - - + + @@ -9966,19 +9963,21 @@ + - + + - + @@ -9986,17 +9985,17 @@ + - - + @@ -10005,31 +10004,31 @@ - + - + + - + - @@ -10055,10 +10054,10 @@ + - @@ -10072,15 +10071,15 @@ - + - + @@ -10120,43 +10119,44 @@ + - - + + - - + + - + - + - + - + - + @@ -10173,24 +10173,24 @@ + - + - - + @@ -10200,6 +10200,7 @@ + @@ -10254,17 +10255,6 @@ - - - - - - - - - - - @@ -10276,25 +10266,25 @@ - - + + - - - + + + - + - - - + + + @@ -10309,6 +10299,17 @@ + + + + + + + + + + + @@ -10320,25 +10321,25 @@ - + - - - + + + - + - - - + + + @@ -10354,25 +10355,25 @@ - + - + - - - + + + @@ -10392,24 +10393,26 @@ + - + + - + - + @@ -10423,6 +10426,7 @@ + @@ -10432,13 +10436,13 @@ - + @@ -10447,8 +10451,8 @@ - + @@ -10456,35 +10460,35 @@ - + + + + - - - - + @@ -10509,6 +10513,8 @@ + + @@ -10518,8 +10524,8 @@ - + @@ -10544,6 +10550,7 @@ + @@ -10551,20 +10558,20 @@ - + - + - + @@ -10578,8 +10585,9 @@ - + + @@ -10599,15 +10607,16 @@ - + + @@ -10617,6 +10626,7 @@ + @@ -10633,8 +10643,9 @@ - + + @@ -10647,8 +10658,8 @@ - + @@ -10672,13 +10683,13 @@ - + @@ -10696,26 +10707,26 @@ - + - + - - + + @@ -10742,37 +10753,37 @@ + - - + - + + - @@ -10786,13 +10797,14 @@ - + + @@ -10800,6 +10812,7 @@ + @@ -10814,6 +10827,7 @@ + @@ -10869,8 +10883,8 @@ - + @@ -10878,8 +10892,8 @@ - + @@ -10906,6 +10920,7 @@ + @@ -10954,6 +10969,7 @@ + @@ -10971,6 +10987,7 @@ + @@ -10992,6 +11009,9 @@ + + + @@ -10999,13 +11019,13 @@ - + @@ -11023,6 +11043,7 @@ + @@ -11043,6 +11064,7 @@ + @@ -11051,20 +11073,20 @@ - + - + - + @@ -11076,6 +11098,7 @@ + @@ -11113,13 +11136,13 @@ - + - + @@ -11147,6 +11170,10 @@ + + + + @@ -11164,16 +11191,20 @@ + + - + + + @@ -11181,13 +11212,13 @@ + - @@ -11205,6 +11236,7 @@ + @@ -11238,13 +11270,13 @@ - + - + @@ -11255,16 +11287,17 @@ + - + @@ -11285,13 +11318,13 @@ - + - + @@ -11303,6 +11336,7 @@ + @@ -11310,13 +11344,14 @@ - + + - + @@ -11337,12 +11372,14 @@ + + @@ -11357,6 +11394,7 @@ + @@ -11392,15 +11430,15 @@ - - + + @@ -11427,19 +11465,21 @@ + + - + @@ -11473,15 +11513,15 @@ - + + - @@ -11493,13 +11533,13 @@ - + @@ -11511,37 +11551,37 @@ - - + - - + + + - - - + + + - + - + @@ -11555,6 +11595,7 @@ + @@ -11576,13 +11617,13 @@ - + - + @@ -11642,6 +11683,9 @@ + + + @@ -11664,7 +11708,13 @@ + + + + + + @@ -11681,14 +11731,15 @@ - + + @@ -11724,8 +11775,8 @@ - + @@ -11885,4 +11936,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Objects.version b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Objects.version index 7028cae0e..3cdadd84c 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Objects.version and b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Objects.version differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Preload.xml index b0bc780a8..42c029444 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Preload.xml +++ b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Preload.xml @@ -135,9 +135,13 @@ + + + + @@ -181,6 +185,19 @@ + + + + + + + + + + + + + @@ -246,11 +263,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/PreloadAssetDB.txt b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/PreloadAssetDB.txt index bd8b02eea..bf3785778 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/PreloadAssetDB.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/PreloadAssetDB.txt @@ -1,15 +1,41 @@ +[Conversation] +id=TRaynor01 +Actor=AP_GimbalZTurret,AP_TrooperMengsk_ModelSwap_AS,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +ConversationState=Cameras,Characters,Credits,MissionAvailable,MissionCompleted,MissionCompletedCount,MissionLast,TechState +Sound=##id##Adjutant00010,##id##Adjutant00019,##id##Adjutant00023,##id##Adjutant00024,##id##Arcturus00007,##id##Arcturus00012,##id##Arcturus00013,##id##Arcturus00018,##id##Arcturus00022,##id##Arcturus00025,##id##Arcturus00031,##id##Civilian100004,##id##Civilian100059,##id##Civilian200048,##id##Civilian200049,##id##Civilian200057,##id##Civilian200058,##id##Civilian300001,##id##Civilian400032,##id##Civilian4WhitewGoggles00005,##id##Civilian500016,##id##Civilian600026,##id##Civilian700056,##id##Civilian800061,##id##CivilianFemale100014,##id##CivilianFemale100041,##id##CivilianFemale100053,##id##CivilianFemale200006,##id##CivilianFemale200050,##id##CivilianFemale500033,##id##CivilianFemale500035,##id##DominionMarine100017,##id##DominionMarine100020,##id##DominionMarine300021,##id##DominionMarine700036,##id##DominionMarine700045,##id##DominionMarine7Generic00027,##id##DominionMarine900046,##id##DominionOfficer100054,##id##Raynor00003,##id##Raynor00011,##id##Raynor00015,##id##Raynor00028,##id##Raynor00029,##id##Raynor00030,##id##Raynor00034,##id##Raynor00037,##id##Raynor00038,##id##Raynor00039,##id##Raynor00040,##id##Raynor00042,##id##Raynor00043,##id##Raynor00044,##id##Raynor00047,##id##Raynor00051,##id##Raynor00052,##id##Raynor00055,##id##Raynor00062,##id##Raynor00065 + [Light] +id=Tyrador +Actor=AP_GimbalZTurret,AP_TrooperMengsk_ModelSwap_AS,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr + +[Sound] +id=TRaynor01Raynor00015 +0=LocalizedData\Sounds\TerranVO\CampaignVO\##id##.ogg +Actor=AP_GimbalZTurret,AP_TrooperMengsk_ModelSwap_AS,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +Model=RaynorCommanderPortrait +id=TRaynor01Raynor00055 +0=LocalizedData\Sounds\TerranVO\CampaignVO\##id##.ogg +Actor=AP_GimbalZTurret,AP_TrooperMengsk_ModelSwap_AS,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +Model=RaynorCommanderPortrait [Terrain] id=Tyrador path=Assets\Textures\.dds asset=Creep,CreepEdgeNormal,CreepHeight,CreepNoise,CreepSpecularMask +Actor=AP_GimbalZTurret,AP_TrooperMengsk_ModelSwap_AS,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr Light +Soundtrack=Ambience_##id## TerrainTex=##id##BigBricks,##id##Bricks,##id##Concrete,##id##ConcreteCracked,##id##Grass,##id##MarbleTiles,##id##Rubble,##id##SquareBricks [Water] id=Agria asset=Assets\Textures\DefaultWater.dds +Actor=AP_GimbalZTurret,AP_TrooperMengsk_ModelSwap_AS,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr +Model=BelShirBeachShoreline,BelShirCliffShoreline,DefaultLava +Sound=Emitter_WaterCalm +id=Template 1 +asset=Assets\Textures\DefaultWater.dds +Actor=AP_GimbalZTurret,AP_TrooperMengsk_ModelSwap_AS,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr Model=BelShirBeachShoreline,BelShirCliffShoreline,DefaultLava Sound=Emitter_WaterCalm diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Triggers index 0fbd2a1b8..aca6f903d 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Triggers @@ -8470,6 +8470,8 @@ + + @@ -8682,13 +8684,15 @@ + + - + @@ -8700,10 +8704,35 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8810,8 +8839,37 @@ + + + + + + + + + + + + + + + + + + + + 1 + + + + + AP_HunterKiller + + + + @@ -8831,6 +8889,27 @@ + + + + + + + + + + + + + + + + + + Zerg + + + @@ -9060,27 +9139,77 @@ - + + + + + + + - - - + + + + - + - + + + 1 + + + + + AP_HunterKiller + + + + + + + + + + + + + + + 2 - + AP_Marine + + + + + + + + + + + + + + + + + + Zerg + + + @@ -9160,8 +9289,570 @@ + + + + + + + + + + + + + + + + + + + + + + + + + Prot + + + + + + + + + + + + 3.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + 12 + + + + + + + + + + 8 + + + + + AP_Scourge + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + attack + + + + + + + + + + + + + + + + + + + + + + + + 0.5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + 12 + + + + + + + + + + 8 + + + + + AP_Scourge + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + attack + + + + + + + + + + + + + + + + + + + + + + + + 0.5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + @@ -9170,6 +9861,19 @@ + + + + + + + + + + + + + @@ -9330,6 +10034,7 @@ + @@ -9536,7 +10241,320 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 2.0 + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + AP_WarpPrism + + + + + + + + + + + + + + + + + + + + 20.0 + + + + + 0 + + + + + + + + + + + + + + + + + + + 3.75 + + + + + 3.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.5 + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + AP_WarpPrism + + + + + + + + + + + + + + + + + + + + 20.0 + + + + + 0 + + + + + + + + + + + + + + + + + + + 3.75 + + + + + 3.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Prot + + + + @@ -27056,7 +28074,7 @@ - + @@ -27115,8 +28133,312 @@ false + + + + + + + + + + + + + + + + + + + + Zerg + + + + + + + + + + + + + + + 2 + + + + + + + + + + + + + + 1 + + + + + + + + + AP_HunterKiller + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + move + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 75.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + Prot + + + + + + + + + + + + + + + 4 + + + + + + + + + + + + + + 1 + + + + + + + + + AP_Adept + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + move + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 55.0 + + + + + + + + + + + + + + + + + + + + @@ -27423,8 +28745,7 @@ - - + @@ -27463,24 +28784,23 @@ - + - - - Origin - - TalkIcon + + + + @@ -27502,9 +28822,22 @@ + + + + + + + + + + + + + - + @@ -27514,7 +28847,7 @@ - + @@ -27543,6 +28876,100 @@ + + + + + + + + + Zerg + + + + + + + + + + + + + + + + + + + + + + + + + + 100.0 + + + + + 0.0 + + + + + AP_SCBW_Hydralisk_Ready + + + + + + + + + + + Prot + + + + + + + + + + + + + + + + + + + + + + + + + + 150.0 + + + + + 0.0 + + + + + Adept_Pissed + + @@ -27619,7 +29046,7 @@ - + @@ -27639,9 +29066,21 @@ + + + + + + + + + + + + - + @@ -27656,6 +29095,64 @@ + + + + + + + + + Zerg + + + + + + + + + + + + BriefingUnitSelectLarge + + + + + + + + + + + + + + + + + Prot + + + + + + + + + + + + BriefingUnitSelectLarge + + + + + + + + @@ -27685,8 +29182,7 @@ - - + @@ -27794,24 +29290,23 @@ - + - - - Origin - - TalkIcon + + + + @@ -27850,9 +29345,22 @@ + + + + + + + + + + + + + - + @@ -27862,7 +29370,7 @@ - + @@ -27891,6 +29399,114 @@ + + + + + + + + + + Zerg + + + + + + + + + + + TValerian02AInfestedRefugee00021 + + + + + + + + + + + + + + + + + + TValerian02AInfestedRefugee00021 + + + + + + + + + 0.0 + + + + + + + + + + + + + + + + Prot + + + + + + + + + + + TRaynor01Raynor00015 + + + + + + + + + + + + + + + + + + TRaynor01Raynor00015 + + + + + + + + + 0.0 + + + + + + @@ -27963,6 +29579,7 @@ + @@ -28202,6 +29819,38 @@ + + + + + + + + + + + + + + + + + + Zerg + + + + + + + + + + + Prot + + + @@ -28241,12 +29890,9 @@ - - - - + @@ -28350,31 +29996,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + TalkIcon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + TTychus03MoebiusMarine00022 + + + + + + + + + + + + + + + + + + TTychus03MoebiusMarine00022 + + + + + + + + + 0.0 + + + + + + + + + + + + + + + + + + Zerg + + + - + - + - - - Origin - - TalkIcon + + + + - + @@ -28389,65 +30164,98 @@ - - - - + + + + - - - + + + TValerian02AInfestedRefugee00021 + - - - - + + + + + + + + - - - + + + - - + + + TValerian02AInfestedRefugee00021 + - + + + + + + + 0.0 + + + + + + + + + + + + + + + + Prot + + + + - - + + - + - TTychus03MoebiusMarine00022 + TRaynor01Raynor00015 - + - - - - - - + + + + + + - + - + - TTychus03MoebiusMarine00022 + TRaynor01Raynor00015 - + - + 0.0 - + @@ -28558,6 +30366,10 @@ + + + + @@ -28752,6 +30564,312 @@ 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_WarpPrismPhasing + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_WarpPrism + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Yggdrasil + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Overlord + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + AP_overlordtransport + + + + + + + + + + + + + + 1 + + @@ -29303,12 +31421,9 @@ - - - - + @@ -29413,45 +31528,6 @@ - - - - - - - - - - - - - - Origin - - - - - TalkIcon - - - - - - - - - - - - - - - - - - - - @@ -29473,9 +31549,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + TalkIcon + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -29485,7 +31614,7 @@ - + @@ -29514,6 +31643,154 @@ + + + + + + + + + + + + Zerg + + + + + + + + + + + + + + + + + TalkIcon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + THanson02InfestedRefugee00005 + + + + + + + + + + + + + + + + + + THanson02InfestedRefugee00005 + + + + + + + + + 0.0 + + + + + + + + + + + + + + + + Prot + + + + + + + + + + + TZeratul01Zeratul00076 + + + + + + + + + + + + + + + + + + TZeratul01Zeratul00076 + + + + + + + + + 0.0 + + + + + + @@ -29621,6 +31898,10 @@ + + + + @@ -29815,6 +32096,312 @@ 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_WarpPrismPhasing + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_WarpPrism + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Yggdrasil + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Overlord + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + AP_overlordtransport + + + + + + + + + + + + + + 1 + + @@ -30107,7 +32694,7 @@ - + @@ -30327,8 +32914,20 @@ + + + + + + + + + + + + @@ -30343,6 +32942,64 @@ + + + + + + + + + Zerg + + + + + + + + + + + + BriefingUnitSelectLarge + + + + + + + + + + + + + + + + + Prot + + + + + + + + + + + + BriefingUnitSelectLarge + + + + + + + + @@ -30366,14 +33023,10 @@ - - - - + - @@ -30475,31 +33128,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - Origin - - TalkIcon + + + + - + @@ -30514,30 +33203,9 @@ - - - - - - - - - - - - - - - - - - - - - - + @@ -30547,7 +33215,7 @@ - + @@ -30576,6 +33244,123 @@ + + + + + + + + + + + + + + + + + + + Zerg + + + + + + + + + + + TValerian02ATychus00020 + + + + + + + + + + + + + + + + + + TValerian02ATychus00020 + + + + + + + + + 0.0 + + + + + + + + + + + + + + + + Prot + + + + + + + + + + + TZeratul02Zeratul00031 + + + + + + + + + + + + + + + + + + TZeratul02Zeratul00046 + + + + + + + + + 0.0 + + + + + + @@ -30585,15 +33370,6 @@ - - - - - - - - - @@ -30683,6 +33459,10 @@ + + + + @@ -30877,6 +33657,312 @@ 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_WarpPrismPhasing + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_WarpPrism + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Yggdrasil + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Overlord + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + AP_overlordtransport + + + + + + + + + + + + + + 1 + + @@ -31167,7 +34253,7 @@ - + @@ -31322,8 +34408,20 @@ + + + + + + + + + + + + @@ -31523,20 +34621,636 @@ + + + + + + + + + + + + + + + + Zerg + + + + + + + + + + + + + + + + + + 3 + + + + + + + + + + + + + + 1 + + + + + + + + + AP_SIInfestedTrooper + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0 + + + + + 100.0 + + + + + 0.0 + + + + + Medivac_Unload + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + move + + + + + + + + + + + + + + + + + + + + 0.5 + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + AP_HunterKiller + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0 + + + + + 100.0 + + + + + 0.0 + + + + + Medivac_Unload + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + move + + + + + + + + + + + + + + + + + + + + 0.5 + + + + + + + + + + + + + + + Prot + + + + + + + + + + + + + + + + + + 3 + + + + + + + + + + + + + + 1 + + + + + + + + + AP_Dragoon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0 + + + + + 100.0 + + + + + 0.0 + + + + + Medivac_Unload + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + move + + + + + + + + + + + + + + + + + + + + 0.5 + + + + + + - - - - + - @@ -31621,12 +35335,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -31645,20 +35396,19 @@ - - - Origin - - TalkIcon + + + + - + @@ -31673,30 +35423,9 @@ - - - - - - - - - - - - - - - - - - - - - - + @@ -31706,7 +35435,7 @@ - + @@ -31735,6 +35464,123 @@ + + + + + + + + + + + + + + + + + + + Zerg + + + + + + + + + + + THanson02Hanson00014 + + + + + + + + + + + + + + + + + + THanson02Hanson00014 + + + + + + + + + 0.0 + + + + + + + + + + + + + + + + Prot + + + + + + + + + + + THorner02Tychus00023 + + + + + + + + + + + + + + + + + + THorner02Tychus00023 + + + + + + + + + 0.0 + + + + + + @@ -31744,15 +35590,6 @@ - - - - - - - - - @@ -31841,6 +35678,10 @@ + + + + @@ -32035,6 +35876,312 @@ 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_WarpPrismPhasing + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_WarpPrism + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Yggdrasil + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Overlord + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + AP_overlordtransport + + + + + + + + + + + + + + 1 + + @@ -32582,8 +36729,7 @@ - - + @@ -32747,9 +36893,22 @@ + + + + + + + + + + + + + - + @@ -32759,7 +36918,7 @@ - + @@ -32768,7 +36927,7 @@ - + @@ -32788,6 +36947,114 @@ + + + + + + + + + + Zerg + + + + + + + + + + + TValerian02AInfestedMarine00022 + + + + + + + + + + + + + + + + + + TValerian02AInfestedMarine00022 + + + + + + + + + 0.0 + + + + + + + + + + + + + + + + Prot + + + + + + + + + + + TTychus05DarkTemplar00026 + + + + + + + + + + + + + + + + + + TTychus05DarkTemplar00026 + + + + + + + + + 0.0 + + + + + + @@ -32897,6 +37164,10 @@ + + + + @@ -33091,6 +37362,312 @@ 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_WarpPrismPhasing + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_WarpPrism + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Yggdrasil + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Overlord + + + + + + + + + + + + + + + -;Missile,Dead,Hidden + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + AP_overlordtransport + + + + + + + + + + + + + + 1 + + @@ -44759,14 +49336,8 @@ - - - - - - + - @@ -44936,9 +49507,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Prot + + + + + + + + + + + TTychus03Narud00005 + + + + + + + + + + + + + + + + + + TTychus03Narud00005 + + + + + + + + + 0 + + + + + + + + + + + + + + TRaynor01Raynor00055 + + + + + + + + + + + + + + + + + + TRaynor01Raynor00055 + + + + + + + + + 0 + + + + + + + + + + + + + + THanson01Hanson00032 + + + + + + + + + + + + + + + + + + THanson01Hanson00032 + + + + + + + + + 0 + + + + + + - + @@ -44948,7 +49681,7 @@ - + @@ -44978,8 +49711,9 @@ + - + @@ -44993,15 +49727,9 @@ - - - - Origin - - TalkIcon @@ -45014,7 +49742,7 @@ - + @@ -45045,7 +49773,7 @@ - + @@ -45055,7 +49783,7 @@ - + @@ -45084,6 +49812,15 @@ + + + + + + + + + @@ -45093,15 +49830,6 @@ - - - - - - - - - @@ -46241,6 +50969,7 @@ + @@ -46282,6 +51011,53 @@ false + + + + + + + + + + + + + + + + + + + + + + + Neut + + + + + + + + + + + + + + + + + + + + + Terr + + + @@ -46429,6 +51205,7 @@ + @@ -46470,6 +51247,53 @@ false + + + + + + + + + + + + + + + + + + + + + + + Neut + + + + + + + + + + + + + + + + + + + + + Terr + + + @@ -46606,6 +51430,7 @@ + @@ -46656,6 +51481,53 @@ false + + + + + + + + + + + + + + + + + + + + + + + Neut + + + + + + + + + + + + + + + + + + + + + Terr + + + @@ -46805,6 +51677,7 @@ + @@ -46846,6 +51719,53 @@ false + + + + + + + + + + + + + + + + + + + + + + + Neut + + + + + + + + + + + + + + + + + + + + + Terr + + + @@ -46980,6 +51900,7 @@ + @@ -47021,6 +51942,53 @@ false + + + + + + + + + + + + + + + + + + + + + + + Neut + + + + + + + + + + + + + + + + + + + + + Terr + + + @@ -50509,6 +55477,7 @@ + @@ -51506,6 +56475,425 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Terr + + + + + + false + + + + + + + + + + + + + + + + + Terr + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + Zerg + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Prot + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Prot + + + + + + + + + + + + + + + + + + + + + Zerg + + + + + + + + + + + + + + + + + + + + + Neut + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Triggers.version index 4ebcf9962..cd1bd326f 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Triggers.version and b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/Triggers.version differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 75d626c25..cd35638a0 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -89,6 +89,7 @@ Trigger/Name/07D9D0B0=Site 1 - Creep Advance Ambient Drop pods Puke Trigger/Name/08EC30C5=Kerrigan - Recalculate Timer Trigger/Name/0917F310=DEBUG - Path 2 Array Trigger/Name/0B085994=Victory +Trigger/Name/0DB1E934=Scourgish Inquisition 2 Trigger/Name/1172620F=Path Site 2 Trigger/Name/11E612D1=Site 3 - Nydus 2 Trigger/Name/12010928=Intro Medivacs Finished @@ -104,6 +105,7 @@ Trigger/Name/20717332=Kerrigan - Taunts Raynor 3 Q Trigger/Name/2151ECA7=Achievement - Combat Unit Trained Trigger/Name/24E39B41=Kerrigan - Pick Next Target Trigger/Name/2518681A=DEBUG - Path 1 Array +Trigger/Name/25F09766=Faction Swap Init Trigger/Name/27B0B4B9=Alive Inside!!! Heads Up Q Trigger/Name/281F42FA=Site 1 Reticule Creator Trigger/Name/2A38EF3D=Brutalisk Stumbled Upon @@ -128,6 +130,7 @@ Trigger/Name/4C887BB2=Path Remove Point Updater: Site 3 Trigger/Name/4DA300DC=Arch Init Trigger/Name/4EB32B58=Site 2 - Creep Puker Spawns Trigger/Name/4F7B75AD=Kerrigan - Target Reached +Trigger/Name/5109965F=Scourgish Inquisition 1 Trigger/Name/51D1C608=Path Site 3 Trigger/Name/52300AC4=Site 2 Militia Heads Up Q Trigger/Name/537A6A82=onDifficultyBrutal @@ -275,6 +278,7 @@ Variable/Name/2A04EDB8=U Variable/Name/2ADC8DB4=Stat - Brutalisk Killed Variable/Name/2B7BCAB6=Intro Chasers Variable/Name/2CBFC9B3=Intro Militia +Variable/Name/2DCE92BF=prisms Variable/Name/3374E61B=LOCATION_ID_WALL_RESCUE Variable/Name/347ADEDE=Target Variable/Name/37E28AAF=currentUnit @@ -316,6 +320,7 @@ Variable/Name/713D1B28=P02_ZERG Variable/Name/716C6352=Objective Building Reticule Variable/Name/73A82B25=ChosenMedivac Variable/Name/7438331F=PathIndex +Variable/Name/74A862FA=Scourge Group Variable/Name/753A55AB=PickedUnit Variable/Name/753C43BB=Type2 Variable/Name/77C2B346=UNIT-Faux Targets Type @@ -330,6 +335,7 @@ Variable/Name/82DC4132=GROUP_INITIALWAVE Variable/Name/83B91B73=TYPE Variable/Name/841A7727=PathIndex Variable/Name/841B606E=DropPodQty1 +Variable/Name/84D2EE3E=ScourgeGroup1 Variable/Name/867759B8=BaseNydusPing1 Variable/Name/88D7386D=ZergGroup Variable/Name/8C7C1C36=Rescued Count @@ -358,6 +364,7 @@ Variable/Name/A2156893=LOCATION_ID_ALIVE_INSIDE_RESCUE Variable/Name/A2F22DC6=Player Variable/Name/A6829FB2=NonMercCombatUnitTrained Variable/Name/A86C09BB=POINT +Variable/Name/AAA99273=ScourgeGroup2 Variable/Name/AAEC1F8D=Site 1 Path Length Variable/Name/AB6FE2C9=InCinematic Variable/Name/AB73B488=PathIndex @@ -375,6 +382,7 @@ Variable/Name/B987E9D7=Qty2 Variable/Name/B9E6DA05=U Variable/Name/BC3B820D=GuardUnits Variable/Name/BCB2A5C5=Qty2 +Variable/Name/C17013C2=Scourge Group Variable/Name/C3A4214F=DropPodType2 Variable/Name/C588C228=TARGET unit Variable/Name/C622E14B=Site 3 Path Length diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3HeightMap b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3HeightMap index d641fc85f..3d9714b8f 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3HeightMap and b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3HeightMap differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3SyncHeightMap b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3SyncHeightMap index 13c3ae41e..11f6b8016 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3SyncHeightMap and b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3SyncHeightMap differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3Terrain.version b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3Terrain.version index a4463f444..e024c7c8a 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3Terrain.version and b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3Terrain.version differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3Terrain.xml b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3Terrain.xml index 58d034021..71c349da9 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3Terrain.xml +++ b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3Terrain.xml @@ -41,7 +41,7 @@ - + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3VertCol b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3VertCol index 41da8e02a..44ac84ad9 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3VertCol and b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3VertCol differ diff --git a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3Water b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3Water index ede66ede9..ef7256179 100644 Binary files a/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3Water and b/Maps/ArchipelagoCampaign/WoL/ap_the_moebius_factor.SC2Map/t3Water differ