From e8c5647e16357338b5e8b2cbe30a20bc3bc5ba11 Mon Sep 17 00:00:00 2001 From: EnvyDragon <138727357+EnvyDragon@users.noreply.github.com> Date: Mon, 21 Oct 2024 11:59:23 -0400 Subject: [PATCH] WttJ swaps --- .../Base.SC2Data/GameData/BehaviorData.xml | 10 + .../GameData/ConversationData.xml | 31 + .../Base.SC2Data/GameData/SoundData.xml | 15 + .../Base.SC2Data/GameData/UnitData.xml | 9 + .../MapScript.galaxy | 85 +- .../Minimap.tga | Bin 98348 -> 98348 bytes .../ap_welcome_to_the_jungle.SC2Map/Objects | 572 ++++--- .../ap_welcome_to_the_jungle.SC2Map/Triggers | 1367 ++++++++++++++++- .../LocalizedData/ConversationStrings.txt | 2 + .../LocalizedData/GameStrings.txt | 14 +- .../LocalizedData/ObjectStrings.txt | 2 + .../LocalizedData/TriggerStrings.txt | 1 + 12 files changed, 1789 insertions(+), 319 deletions(-) create mode 100644 Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Base.SC2Data/GameData/BehaviorData.xml create mode 100644 Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Base.SC2Data/GameData/ConversationData.xml create mode 100644 Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Base.SC2Data/GameData/SoundData.xml create mode 100644 Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Base.SC2Data/GameData/UnitData.xml create mode 100644 Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/enUS.SC2Data/LocalizedData/ConversationStrings.txt create mode 100644 Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/enUS.SC2Data/LocalizedData/ObjectStrings.txt diff --git a/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Base.SC2Data/GameData/BehaviorData.xml b/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Base.SC2Data/GameData/BehaviorData.xml new file mode 100644 index 000000000..f9a5c62c5 --- /dev/null +++ b/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Base.SC2Data/GameData/BehaviorData.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Base.SC2Data/GameData/ConversationData.xml b/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Base.SC2Data/GameData/ConversationData.xml new file mode 100644 index 000000000..b00e3d3b4 --- /dev/null +++ b/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Base.SC2Data/GameData/ConversationData.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Base.SC2Data/GameData/SoundData.xml b/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Base.SC2Data/GameData/SoundData.xml new file mode 100644 index 000000000..1c13f08ca --- /dev/null +++ b/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Base.SC2Data/GameData/SoundData.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Base.SC2Data/GameData/UnitData.xml b/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Base.SC2Data/GameData/UnitData.xml new file mode 100644 index 000000000..8463d1394 --- /dev/null +++ b/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Base.SC2Data/GameData/UnitData.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/MapScript.galaxy index fb43182df..b2ebb2b17 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/MapScript.galaxy @@ -145,6 +145,7 @@ trigger gt_WestRelic; trigger gt_NorthEastRelic; trigger gt_AwardPlayerdependingonSealedNodes; trigger gt_ArchInit; +trigger gt_FactionSwapInit; trigger gt_Initialization; trigger gt_Init01Technology; trigger gt_Init02Players; @@ -1182,6 +1183,52 @@ 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") || (libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Terr"))) { + lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(5), "Terr", false); + } + else { + lib15EF4C78_gf_RemoveUnusedStartingUnits(UnitGroupFromId(5), libABFE498B_gv_aP_Triggers_Option_overridePlayerRace, false); + lib15EF4C78_gf_AP_Player_UtilTownHallAutoRally(gv_p1_USER); + libLbty_gf_OrderWorkerstoGatherNearbyResources(RegionEntireMap(), gv_p1_USER); + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Zerg")) { + PlayerSetRace(1, "Zerg"); + lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_p1_USER, lib5BD4895D_gv_aP_Core_Faction_KERRIGAN_SWARM); + } + else { + if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) { + PlayerSetRace(1, "Prot"); + lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_p1_USER, lib5BD4895D_gv_aP_Core_Faction_DAELAAM); + if ((libABFE498B_gv_aP_Triggers_Option_SoAPresence == 2)) { + lib15EF4C78_gf_AP_Player_CreateSoAUnit(gv_p1_USER); + } + + if ((libABFE498B_gv_aP_Triggers_Option_SoAPresenceAutocasts == 2)) { + lib15EF4C78_gf_AP_Player_CreateSoAAutonomousCasterUnit(gv_p1_USER); + } + + } + + } + } + return true; +} + +//-------------------------------------------------------------------------------------------------- +void gt_FactionSwapInit_Init () { + gt_FactionSwapInit = TriggerCreate("gt_FactionSwapInit_Func"); + TriggerAddEventGeneric(gt_FactionSwapInit, lib5BD4895D_gv_aP_Core_LOAD_FINISHED_EVENT); +} + //-------------------------------------------------------------------------------------------------- // Trigger: Initialization //-------------------------------------------------------------------------------------------------- @@ -2209,7 +2256,7 @@ bool gt_Playerstartsharvestingterrazine_Func (bool testConds, bool runActions) { // Conditions if (testConds) { - if (!((UnitGetType(EventUnit()) == "AP_SCV"))) { + if (!(((UnitGetType(EventUnit()) == "AP_SCV") || (UnitGetType(EventUnit()) == "AP_SISCV") || (UnitGetType(EventUnit()) == "AP_Drone") || (UnitGetType(EventUnit()) == "AP_Probe")))) { return false; } @@ -2334,6 +2381,8 @@ bool gt_Playerstartsharvestingterrazine_Func (bool testConds, bool runActions) { void gt_Playerstartsharvestingterrazine_Init () { gt_Playerstartsharvestingterrazine = TriggerCreate("gt_Playerstartsharvestingterrazine_Func"); TriggerAddEventUnitAbility(gt_Playerstartsharvestingterrazine, null, AbilityCommand("AP_SCVHarvest", 0), c_abilHarvestStageHarvest, false); + TriggerAddEventUnitAbility(gt_Playerstartsharvestingterrazine, null, AbilityCommand("AP_ProbeHarvest", 0), c_abilHarvestStageHarvest, false); + TriggerAddEventUnitAbility(gt_Playerstartsharvestingterrazine, null, AbilityCommand("AP_DroneHarvest", 0), c_abilHarvestStageHarvest, false); } //-------------------------------------------------------------------------------------------------- @@ -2439,7 +2488,7 @@ bool gt_SCViskilledwhileharvesting_Func (bool testConds, bool runActions) { return false; } - if (!((UnitGetType(EventUnit()) == "AP_SCV"))) { + if (!(((UnitGetType(EventUnit()) == "AP_SCV") || (UnitGetType(EventUnit()) == "AP_SISCV") || (UnitGetType(EventUnit()) == "AP_Drone") || (UnitGetType(EventUnit()) == "AP_Probe")))) { return false; } } @@ -2529,7 +2578,7 @@ bool gt_SCVharvestingmanuallystopped_Func (bool testConds, bool runActions) { return false; } - if (!((UnitGetType(EventUnit()) == "AP_SCV"))) { + if (!(((UnitGetType(EventUnit()) == "AP_SCV") || (UnitGetType(EventUnit()) == "AP_SISCV") || (UnitGetType(EventUnit()) == "AP_Drone") || (UnitGetType(EventUnit()) == "AP_Probe")))) { return false; } } @@ -2561,6 +2610,8 @@ bool gt_SCVharvestingmanuallystopped_Func (bool testConds, bool runActions) { void gt_SCVharvestingmanuallystopped_Init () { gt_SCVharvestingmanuallystopped = TriggerCreate("gt_SCVharvestingmanuallystopped_Func"); TriggerAddEventUnitAbility(gt_SCVharvestingmanuallystopped, null, AbilityCommand("AP_SCVHarvest", 0), c_unitAbilStageCancel, false); + TriggerAddEventUnitAbility(gt_SCVharvestingmanuallystopped, null, AbilityCommand("AP_ProbeHarvest", 0), c_unitAbilStageCancel, false); + TriggerAddEventUnitAbility(gt_SCVharvestingmanuallystopped, null, AbilityCommand("AP_DroneHarvest", 0), c_unitAbilStageCancel, false); } //-------------------------------------------------------------------------------------------------- @@ -2620,7 +2671,7 @@ bool gt_SCVisheadinghomewithterrazine_Func (bool testConds, bool runActions) { return false; } - if (!((UnitGetType(EventUnit()) == "AP_SCV"))) { + if (!(((UnitGetType(EventUnit()) == "AP_SCV") || (UnitGetType(EventUnit()) == "AP_SISCV") || (UnitGetType(EventUnit()) == "AP_Drone") || (UnitGetType(EventUnit()) == "AP_Probe")))) { return false; } @@ -2662,7 +2713,11 @@ bool gt_SCVisheadinghomewithterrazine_Func (bool testConds, bool runActions) { void gt_SCVisheadinghomewithterrazine_Init () { gt_SCVisheadinghomewithterrazine = TriggerCreate("gt_SCVisheadinghomewithterrazine_Func"); TriggerAddEventUnitAbility(gt_SCVisheadinghomewithterrazine, null, AbilityCommand("AP_SCVHarvest", 1), c_abilHarvestStageWaitToReturn, false); + TriggerAddEventUnitAbility(gt_SCVisheadinghomewithterrazine, null, AbilityCommand("AP_ProbeHarvest", 1), c_abilHarvestStageWaitToReturn, false); + TriggerAddEventUnitAbility(gt_SCVisheadinghomewithterrazine, null, AbilityCommand("AP_DroneHarvest", 1), c_abilHarvestStageWaitToReturn, false); TriggerAddEventUnitAbility(gt_SCVisheadinghomewithterrazine, null, AbilityCommand("AP_SCVHarvest", 0), c_unitAbilStageComplete, false); + TriggerAddEventUnitAbility(gt_SCVisheadinghomewithterrazine, null, AbilityCommand("AP_ProbeHarvest", 0), c_unitAbilStageComplete, false); + TriggerAddEventUnitAbility(gt_SCVisheadinghomewithterrazine, null, AbilityCommand("AP_DroneHarvest", 0), c_unitAbilStageComplete, false); } //-------------------------------------------------------------------------------------------------- @@ -2674,6 +2729,8 @@ bool gt_FirstTerrazineReturnQ_Func (bool testConds, bool runActions) { unit lv_firstSCVGoingHome; // Automatic Variable Declarations + string autoA6E1847A_val; + // Variable Initialization // Conditions @@ -2704,8 +2761,19 @@ bool gt_FirstTerrazineReturnQ_Func (bool testConds, bool runActions) { UIAlertUnit("Trigger", gv_p1_USER, StringExternal("Param/Value/6130E297"), null, lv_firstSCVGoingHome); libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Speech); libLbty_gf_PlayTransmissionCueSound(PlayerGroupAll()); - // Transmission - SoundLink("TTosh02SCV00006", -1) - libCamp_gf_SendTransmissionCampaign(lv_firstSCVGoingHome, SoundLink("TTosh02SCV00006", -1), c_transmissionDurationAdd, 0.0, true); + autoA6E1847A_val = UnitGetType(lv_firstSCVGoingHome); + if (autoA6E1847A_val == "AP_Drone") { + // Transmission - SoundLink("TTosh02Drone00068", -1) + libCamp_gf_SendTransmissionCampaign(lv_firstSCVGoingHome, SoundLink("TTosh02Drone00068", -1), c_transmissionDurationAdd, 3.0, true); + } + else if (autoA6E1847A_val == "AP_Probe") { + // Transmission - SoundLink("TTosh02Probe00069", -1) + libCamp_gf_SendTransmissionCampaign(lv_firstSCVGoingHome, SoundLink("TTosh02Probe00069", -1), c_transmissionDurationAdd, 3.0, true); + } + else { + // Transmission - SoundLink("TTosh02SCV00006", -1) + libCamp_gf_SendTransmissionCampaign(lv_firstSCVGoingHome, SoundLink("TTosh02SCV00006", -1), c_transmissionDurationAdd, 0.0, true); + } libCamp_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Game); libNtve_gf_KillModel(lv_talkIcon); TriggerQueueExit(); @@ -2733,7 +2801,7 @@ bool gt_SCVwithterrazinediesonreturntrip_Func (bool testConds, bool runActions) return false; } - if (!((UnitGetType(EventUnit()) == "AP_SCV"))) { + if (!(((UnitGetType(EventUnit()) == "AP_SCV") || (UnitGetType(EventUnit()) == "AP_SISCV") || (UnitGetType(EventUnit()) == "AP_Drone") || (UnitGetType(EventUnit()) == "AP_Probe")))) { return false; } } @@ -2874,6 +2942,8 @@ bool gt_Playerhasclaimedterrazine_Func (bool testConds, bool runActions) { void gt_Playerhasclaimedterrazine_Init () { gt_Playerhasclaimedterrazine = TriggerCreate("gt_Playerhasclaimedterrazine_Func"); TriggerAddEventUnitAbility(gt_Playerhasclaimedterrazine, null, AbilityCommand("AP_SCVHarvest", 1), c_abilHarvestStageDropOff, false); + TriggerAddEventUnitAbility(gt_Playerhasclaimedterrazine, null, AbilityCommand("AP_ProbeHarvest", 1), c_abilHarvestStageDropOff, false); + TriggerAddEventUnitAbility(gt_Playerhasclaimedterrazine, null, AbilityCommand("AP_DroneHarvest", 1), c_abilHarvestStageDropOff, false); } //-------------------------------------------------------------------------------------------------- @@ -4968,6 +5038,7 @@ void InitTriggers () { gt_NorthEastRelic_Init(); gt_AwardPlayerdependingonSealedNodes_Init(); gt_ArchInit_Init(); + gt_FactionSwapInit_Init(); gt_Initialization_Init(); gt_Init01Technology_Init(); gt_Init02Players_Init(); diff --git a/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Minimap.tga b/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Minimap.tga index bc60d4b490b921e5487879a24799d093e68aadcb..0660e932bea0998dd34206ea7dd1fdc542e3b4fd 100644 GIT binary patch delta 333 zcmZ3}z_zA=ZG-q1W+`p;%~D@#8JQ)u)HcuhTF%HRqo)OAOY3QFmii9l3K_}()yNv? zY@YQ4$Q3q`lhM}_F;Uno^{axB-BeOQjZZ{-^UU8BjGPP%3~T}%LYhLGrT%6!vdOqB zD`mQF?*3QBs4kgoA{u5OY$?ZYCCO(kA>gPY8fGLMsKYMG%`MBvV=D^O%Pz#eRfn;J zk&Tg=kyC+x`!Ytxe0CONd11SlzHp~Pn+!Ed#_NS-m1QAjAsSR~9)&`bs> RrC_2jY%RC_tpcNcJOIYzN_qeQ delta 333 zcmZ3}z_zA=ZG-q1W(f_I%~D@#8NrNMU&|ReWes&CwbZ1v)i+Ch2Xci?<$!D%J^@T0v_^l-QtR(~-RYb##gadWhMY%adxVQ`j8Ngtx4r2);8&Hr< zjBEQcM#g-079)8n)9sR+j5Um0Mj{d>l9Fa}(k9#Ib1_=-GHbgzZoe(g2z0%?vEKG* zNg#_2$kO+5+kQ_9BrIShy**Bbv6@lbR!Yc1R@6*U&QQlV$VbP+8K@43CMTW~-Oeh< z7|bXo8loc_X)I(aBWs{7XQT_16ths`x0U3#-d-fnn8_$45T+}hW+`YY4U| - + @@ -9310,14 +9310,14 @@ - + - + @@ -9337,43 +9337,43 @@ - - + + - + + - - - - + - - + + + + - + @@ -9387,32 +9387,43 @@ - - + - + + - + - - + + - + + + + + + + + + + + + @@ -9426,17 +9437,6 @@ - - - - - - - - - - - @@ -9485,25 +9485,25 @@ - + - - - + + + - + - - - + + + @@ -9550,8 +9550,8 @@ - + @@ -9560,6 +9560,10 @@ + + + + @@ -9567,29 +9571,26 @@ - - - - - - - - - - + + + + + + + @@ -9612,12 +9613,12 @@ - - + - + + @@ -9629,6 +9630,9 @@ + + + @@ -9637,14 +9641,17 @@ - + - + + + + @@ -9667,19 +9674,17 @@ - - - - - - + + + + @@ -9687,28 +9692,36 @@ + + + + + + + + - + - - + + - + - + @@ -9737,11 +9750,12 @@ - + + @@ -9772,17 +9786,17 @@ - + - + - + @@ -9800,25 +9814,25 @@ - + + - + - - - - + + + @@ -9829,6 +9843,7 @@ + @@ -9839,15 +9854,11 @@ - - - - - + @@ -9855,6 +9866,10 @@ + + + + @@ -9862,12 +9877,6 @@ - - - - - - @@ -9875,7 +9884,12 @@ - + + + + + + @@ -9883,15 +9897,12 @@ + - - - - @@ -9899,6 +9910,10 @@ + + + + @@ -9912,14 +9927,14 @@ - - - - + + + + @@ -9927,13 +9942,13 @@ + + + - - - @@ -9946,22 +9961,18 @@ - - - - - - - + + + - + @@ -9970,6 +9981,11 @@ + + + + + @@ -9977,14 +9993,10 @@ - - - - - + @@ -9995,6 +10007,10 @@ + + + + @@ -10012,12 +10028,8 @@ - - - - - + @@ -10025,7 +10037,7 @@ - + @@ -10033,6 +10045,10 @@ + + + + @@ -10044,20 +10060,24 @@ - + + + + - + - - - + + + + @@ -10066,22 +10086,14 @@ - - - - - - - - - + @@ -10090,6 +10102,10 @@ + + + + @@ -10097,8 +10113,9 @@ - - + + + @@ -10107,9 +10124,8 @@ - - - + + @@ -10118,6 +10134,11 @@ + + + + + @@ -10126,11 +10147,6 @@ - - - - - @@ -10146,28 +10162,34 @@ - - + + - + + - - + - + + + + + + + @@ -10177,10 +10199,6 @@ - - - - @@ -10188,7 +10206,7 @@ - + @@ -10196,6 +10214,10 @@ + + + + @@ -10209,6 +10231,7 @@ + @@ -10226,17 +10249,17 @@ - + - - - + + + @@ -10244,11 +10267,11 @@ - + - + @@ -10275,14 +10298,17 @@ - + - + + + + @@ -10301,6 +10327,7 @@ + @@ -10312,9 +10339,8 @@ - - - + + @@ -10323,6 +10349,10 @@ + + + + @@ -10331,13 +10361,19 @@ + - + + + + + + @@ -10345,13 +10381,6 @@ - - - - - - - @@ -10359,6 +10388,7 @@ + @@ -10391,14 +10421,18 @@ + + + + + - - + @@ -10406,26 +10440,22 @@ - - - - + + - - + - @@ -10437,14 +10467,14 @@ - + - + @@ -10477,20 +10507,20 @@ - - + - + + + - @@ -10510,25 +10540,18 @@ - - - - + + + + - - - - - - - @@ -10536,6 +10559,13 @@ + + + + + + + @@ -10565,13 +10595,16 @@ - - - + + + + + + @@ -10584,11 +10617,15 @@ + + + + - + @@ -10599,20 +10636,20 @@ - - - - + + + + @@ -10624,22 +10661,22 @@ - - - - + + + + - + @@ -10654,12 +10691,12 @@ - - + + @@ -10667,6 +10704,7 @@ + @@ -10674,6 +10712,7 @@ + @@ -10688,6 +10727,7 @@ + @@ -10712,15 +10752,11 @@ - - - - - + @@ -10731,6 +10767,10 @@ + + + + @@ -10742,13 +10782,18 @@ - + + + + + + @@ -10757,15 +10802,16 @@ + - + + - - + @@ -10777,6 +10823,13 @@ + + + + + + + @@ -10785,19 +10838,12 @@ - - - - - - - - + - + @@ -10809,10 +10855,7 @@ - - - - + @@ -10820,6 +10863,10 @@ + + + + @@ -10860,6 +10907,7 @@ + @@ -10868,13 +10916,13 @@ - - - + + + @@ -10976,4 +11024,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Triggers index 4d63dd6e6..ab7a88076 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/Triggers @@ -16,6 +16,7 @@ + @@ -1982,6 +1983,336 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + Zerg + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + Prot + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + + + + + + + + + + + + + + + + + + + + Prot + + + + + + + + + + + + + + + + + + + + + Zerg + + + + + + + + + + + + + + + + + + Terr + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + Neut + + + + + + + + + + + + + + + + + + + + + Terr + + + @@ -11006,7 +11337,9 @@ - + + + @@ -11076,8 +11409,64 @@ + + + + + + + + + + + + + + + + + + AP_ProbeHarvest + + + + + + + + + + + + + + + + + + + + + + + + AP_DroneHarvest + + + + + + + + + + + + + + @@ -11107,6 +11496,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SISCV + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Drone + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Probe + + + @@ -15033,7 +15518,7 @@ - + @@ -15131,44 +15616,148 @@ 0.0 - + + + + + + + + - - - + + + + - + - + - + - + - + - + - + - + - + AP_SCV - - - - SCV's dying is firing "SCV harvesting manually stopped" trigger so don't have to decrement twice (was a bug) - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + AP_SISCV + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Drone + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Probe + + + + + + + SCV's dying is firing "SCV harvesting manually stopped" trigger so don't have to decrement twice (was a bug) + + + @@ -15786,10 +16375,12 @@ + + - + @@ -15829,6 +16420,54 @@ + + + + + + + + + + + + + + + + + + AP_ProbeHarvest + + + + + + + + + + + + + + + + + + + + + + + + AP_DroneHarvest + + + + + + @@ -15977,37 +16616,141 @@ - + + + + + + + + - - - + + + + - + - + - + - + - + - + - + - + - + AP_SCV + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SISCV + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Drone + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Probe + + + @@ -16863,9 +17606,13 @@ + + + + - + @@ -16905,6 +17652,56 @@ + + + + + + + + + + + + + + + + + + AP_ProbeHarvest + + + + + + + + + + + + + + + + + + + + + + + + + AP_DroneHarvest + + + + + + + @@ -16929,6 +17726,54 @@ AP_SCVHarvest + + + + + + + + + + + + + + + + + + + + + + AP_ProbeHarvest + + + + + + + + + + + + + + + + + + + + + + + + AP_DroneHarvest + + @@ -16966,37 +17811,141 @@ true - + + + + + + + + - - - + + + + - + - + - + - + - + - + - + - + - + AP_SCV + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SISCV + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Drone + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Probe + + + @@ -17652,8 +18601,7 @@ - - + @@ -17839,9 +18787,30 @@ + + + + + + + + + + + + + + + + + + + + + - + @@ -17851,7 +18820,7 @@ - + @@ -17880,6 +18849,114 @@ + + + + + + + + + + AP_Drone + + + + + + + + + + + TTosh02Drone00068 + + + + + + + + + + + + + + + + + + TTosh02Drone00068 + + + + + + + + + 3.0 + + + + + + + + + + + + + + + + AP_Probe + + + + + + + + + + + TTosh02Probe00069 + + + + + + + + + + + + + + + + + + TTosh02Probe00069 + + + + + + + + + 3.0 + + + + + + @@ -17907,7 +18984,7 @@ - + @@ -17982,37 +19059,141 @@ 0.0 - + + + + + + + + - - - + + + + - + - + - + - + - + - + - + - + - + AP_SCV + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_SISCV + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Drone + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_Probe + + + @@ -18569,6 +19750,8 @@ + + @@ -18622,6 +19805,56 @@ + + + + + + + + + + + + + + + + + + AP_ProbeHarvest + + + + + + + + + + + + + + + + + + + + + + + + + AP_DroneHarvest + + + + + + + diff --git a/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/enUS.SC2Data/LocalizedData/ConversationStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/enUS.SC2Data/LocalizedData/ConversationStrings.txt new file mode 100644 index 000000000..2af949641 --- /dev/null +++ b/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/enUS.SC2Data/LocalizedData/ConversationStrings.txt @@ -0,0 +1,2 @@ +Conversation/TTosh02/Line00068=Drone: I've got the first canister unhooked, Queen! I'll take it to the nearest Hatchery. +Conversation/TTosh02/Line00069=Probe: I've got the first canister unhooked, Hierarch! I'll take it to the nearest Nexus. diff --git a/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt index 776b01ed2..6a2833bab 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt @@ -9,11 +9,11 @@ MapInfo/Player02/Name=Tal'darim Guardians MapInfo/Player03/Name=Tal'darim Guardians MapInfo/Player04/Name=Tal'darim Guardians MapInfo/Player05/Name=Terrazine -Param/Value/00034CFD=>>SCV Died +Param/Value/00034CFD=>>Worker Died Param/Value/02D689D4=Terrazine can no longerbe gathered here Param/Value/100E53BD=/ Param/Value/20E5CE1C=Mission Start -Param/Value/222F31F7=SCV with Terrazine +Param/Value/222F31F7=Worker with Terrazine Param/Value/24E1C1CC=All of your buildings have been destroyed. Param/Value/2702D1C1=Gather Terrazine Param/Value/34420977= @@ -28,7 +28,7 @@ Param/Value/5146E82B=Anniversary_TTosh_02 granted Param/Value/5A4AC463= Param/Value/5B573431= Param/Value/5E70CBB2=Find Protoss Relics -Param/Value/6130E297=SCV returning to base. +Param/Value/6130E297=Worker returning to base. Param/Value/625C8228=The protoss have sealed off too many terrazine altars. Param/Value/748DDD80=Harvesting node = Param/Value/77033FDB=Use any ground unit to pickup. @@ -36,7 +36,7 @@ Param/Value/77DB2CB9= Param/Value/7B0FC11B=Giving those Tal'darim guys a 'lesson' would make our lives easier Param/Value/7C611772= Param/Value/7DAF9358=Third Terrazine Gathered -Param/Value/81E96079=SCVs Lost +Param/Value/81E96079=Workers Lost Param/Value/833EFEF2=Altar Being Sealed Param/Value/8985286D=Protoss Relic Param/Value/8CA221DD=The Protoss are sealing an altar! @@ -45,7 +45,7 @@ Param/Value/99147108=Player Score = Param/Value/9A49CF2B=Stetmann asked that you collect ancient protoss relics so he can study them to gain better insight into protoss technology. Param/Value/9F7DE18C=>>SCV Cancel Harvest Param/Value/A208EF0E=Find Protoss Relics -Param/Value/A9379847=SCV Lost +Param/Value/A9379847=Worker Lost Param/Value/AA8975D0=Protoss Can't Seal 7 Altars Param/Value/B283104A= Param/Value/B3607A04=A Tal'darim base occupies a spot with many resources. If we want to succeed in our mission we'd need additional resources @@ -53,12 +53,12 @@ Param/Value/C206B757=Sealing Attempts Stopped Param/Value/C2F1621D=Protoss Can't Seal 7 Altars Param/Value/C87BC07E=Protoss Research Earned Param/Value/D2BCF230=Destroy the Protoss Base in the Middle -Param/Value/DD65E84C=Tosh has contracted you to gather terrazine gas for him. Use SCVs to collect the terrazine from the altars. +Param/Value/DD65E84C=Tosh has contracted you to gather terrazine gas for him. Use workers to collect the terrazine from the altars. Param/Value/E3E743A5=First Terrazine Gathered Param/Value/E7F007A7=Sixth Terrazine Gathered Param/Value/ECDBCAF7=Terrazine Shrines Sealed Param/Value/EE6316B3= -Param/Value/F03BE3FA=Use an SCV to gatherRaw Terrazine. +Param/Value/F03BE3FA=Use a worker to gatherRaw Terrazine. Water/Name/Template 1=Template 1 Water/Name/Template 2=Template 2 Water/Name/Template 3=Template 3 diff --git a/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/enUS.SC2Data/LocalizedData/ObjectStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/enUS.SC2Data/LocalizedData/ObjectStrings.txt new file mode 100644 index 000000000..77a132bb0 --- /dev/null +++ b/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/enUS.SC2Data/LocalizedData/ObjectStrings.txt @@ -0,0 +1,2 @@ +Sound/Name/TTosh02SCV000062=TTosh02Drone00006 +Sound/Name/TTosh02SCV0000622=TTosh02Probe00006 diff --git a/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 92a2d6ff3..72bc070db 100644 --- a/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/WoL/ap_welcome_to_the_jungle.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -129,6 +129,7 @@ Trigger/Name/BB10C391=Probe has sealed the terrazine Trigger/Name/BC050F6E=West Relic Trigger/Name/BDB674C3=Primary Objective Collect Terrazine Update Trigger/Name/BDCFA062=SCV is heading home with terrazine +Trigger/Name/BF4F86F3=Faction Swap Init Trigger/Name/C3F37FA0=Defeat Cheat Trigger/Name/C53152B8=onDifficultyNormal Trigger/Name/C95ED8AF=Protoss Aggro Via Timer