diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Base.SC2Data/GameData/UnitData.xml b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Base.SC2Data/GameData/UnitData.xml
index c7cdc227d..c597efd91 100644
--- a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Base.SC2Data/GameData/UnitData.xml
+++ b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Base.SC2Data/GameData/UnitData.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Base.SC2Data/GameData/UpgradeData.xml b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Base.SC2Data/GameData/UpgradeData.xml
new file mode 100644
index 000000000..25f9ebdab
--- /dev/null
+++ b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Base.SC2Data/GameData/UpgradeData.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/DocumentHeader
index 8db6ac854..7ab091085 100644
Binary files a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/DocumentHeader and b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/DocumentHeader differ
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/GameData.version b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/GameData.version
index e680d7fe4..81879e0b6 100644
Binary files a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/GameData.version and b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/GameData.version differ
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/MapScript.galaxy
index 00331e54f..510f05c0f 100644
--- a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/MapScript.galaxy
+++ b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/MapScript.galaxy
@@ -831,17 +831,15 @@ bool gt_Init03Units_Func (bool testConds, bool runActions) {
UnitSetPropertyFixed(autoD9B4D754_var, c_unitPropEnergyPercent, 100.0);
}
if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Zerg")) {
- UnitSetPropertyFixed(gv_odin, c_unitPropLifeRegen, 2.0);
+ UnitSetPropertyFixed(gv_odin, c_unitPropLifeRegen, 3.3);
+ UnitSetPropertyFixed(UnitFromId(4), c_unitPropLifeRegen, 1.1);
UnitBehaviorAdd(gv_odin, "AP_ZergOdin", gv_odin, 1);
}
else {
if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) {
- UnitSetPropertyFixed(gv_odin, c_unitPropLifeMax, 1000.0);
- UnitSetPropertyFixed(gv_odin, c_unitPropLife, 1000.0);
+ TechTreeUpgradeAddLevel(2, "AP_ProtossOdin", 1);
UnitSetPropertyFixed(gv_odin, c_unitPropShieldsMax, 1500.0);
UnitSetPropertyFixed(gv_odin, c_unitPropShields, 1500.0);
- UnitSetPropertyFixed(UnitFromId(4), c_unitPropLifeMax, 100.0);
- UnitSetPropertyFixed(UnitFromId(4), c_unitPropLife, 100.0);
UnitSetPropertyFixed(UnitFromId(4), c_unitPropShieldsMax, 150.0);
UnitSetPropertyFixed(UnitFromId(4), c_unitPropShields, 150.0);
}
@@ -1170,16 +1168,16 @@ bool gt_StartGameWarehouse_Func (bool testConds, bool runActions) {
return true;
}
- Wait(2.0, c_timeReal);
if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Zerg")) {
- HelpPanelAddTip(PlayerGroupAll(), libNtve_gf_FormatTipTitle(StringExternal("Param/Value/5DE3D472"), libNtve_ge_TipType_MissionStrategy), StringExternal("Param/Value/91918019"), StringExternal("Param/Value/AEE8FC36"), "AP\\Assets\\Textures\\AP_icon.dds");
+ HelpPanelAddTip(PlayerGroupAll(), libNtve_gf_FormatTipTitle(StringExternal("Param/Value/08EA02F2"), libNtve_ge_TipType_MissionStrategy), StringExternal("Param/Value/EACB4213"), StringExternal("Param/Value/25949F1C"), "AP\\Assets\\Textures\\AP_icon.dds");
}
else {
if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) {
- HelpPanelAddTip(PlayerGroupAll(), libNtve_gf_FormatTipTitle(StringExternal("Param/Value/5DABCD66"), libNtve_ge_TipType_MissionStrategy), StringExternal("Param/Value/3C3CAE4B"), StringExternal("Param/Value/BEBF9F31"), "AP\\Assets\\Textures\\AP_icon.dds");
+ HelpPanelAddTip(PlayerGroupAll(), libNtve_gf_FormatTipTitle(StringExternal("Param/Value/6422A1BC"), libNtve_ge_TipType_MissionStrategy), StringExternal("Param/Value/DC94063B"), StringExternal("Param/Value/70034A8C"), "AP\\Assets\\Textures\\AP_icon.dds");
}
}
+ Wait(2.0, c_timeReal);
TriggerExecute(gt_ObjectiveStealtheOdinCreateQ, true, true);
Wait(1.0, c_timeGame);
if ((gv_initialOrderGiven == false)) {
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Minimap.tga b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Minimap.tga
index b45992025..8f1a2b0ab 100644
Binary files a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Minimap.tga and b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Minimap.tga differ
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Objects b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Objects
index 9b576603a..a478ec213 100644
--- a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Objects
+++ b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Objects
@@ -6213,29 +6213,29 @@
-
+
-
+
-
+
-
+
-
-
+
+
@@ -6244,34 +6244,34 @@
-
-
+
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
@@ -6279,18 +6279,18 @@
-
-
+
-
+
-
+
+
-
+
@@ -6367,6 +6367,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -6379,17 +6390,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -6403,27 +6403,27 @@
-
-
+
+
-
+
-
-
+
+
-
-
-
+
+
-
+
-
-
+
+
+
@@ -6490,17 +6490,6 @@
-
-
-
-
-
-
-
-
-
-
-
@@ -6513,20 +6502,31 @@
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
@@ -6553,13 +6553,13 @@
+
+
+
-
-
-
@@ -6607,13 +6607,13 @@
-
+
@@ -6712,13 +6712,13 @@
-
+
@@ -6728,6 +6728,7 @@
+
@@ -6800,11 +6801,11 @@
+
-
@@ -6834,8 +6835,8 @@
-
+
@@ -6849,13 +6850,13 @@
-
+
-
+
@@ -6877,8 +6878,8 @@
-
+
@@ -6888,8 +6889,8 @@
-
+
@@ -6943,11 +6944,11 @@
+
-
@@ -7012,16 +7013,16 @@
+
-
+
-
@@ -7040,11 +7041,11 @@
-
+
@@ -7054,16 +7055,16 @@
+
+
+
+
-
-
-
-
@@ -7081,18 +7082,18 @@
-
-
+
+
@@ -7118,11 +7119,11 @@
-
+
@@ -7176,8 +7177,8 @@
-
+
@@ -7189,21 +7190,25 @@
+
-
-
+
+
+
+
+
@@ -7211,10 +7216,6 @@
-
-
-
-
@@ -7244,23 +7245,18 @@
-
-
-
+
-
+
+
+
-
-
-
-
-
@@ -7268,6 +7264,10 @@
+
+
+
+
@@ -7285,18 +7285,19 @@
+
-
+
-
+
@@ -7311,14 +7312,14 @@
-
+
+
-
@@ -7330,14 +7331,14 @@
-
+
+
-
+
-
@@ -7355,17 +7356,14 @@
+
-
-
-
-
-
+
@@ -7373,6 +7371,10 @@
+
+
+
+
@@ -7391,6 +7393,7 @@
+
@@ -7398,7 +7401,6 @@
-
@@ -7407,11 +7409,11 @@
-
+
@@ -7426,6 +7428,7 @@
+
@@ -7433,7 +7436,6 @@
-
@@ -7450,26 +7452,26 @@
-
+
-
-
-
+
+
+
-
+
@@ -7489,8 +7491,8 @@
-
+
@@ -7511,6 +7513,11 @@
+
+
+
+
+
@@ -7518,11 +7525,6 @@
-
-
-
-
-
@@ -7539,13 +7541,13 @@
-
+
-
+
@@ -7563,23 +7565,23 @@
+
+
+
+
+
-
-
-
-
-
-
+
@@ -7609,6 +7611,7 @@
+
@@ -7637,13 +7640,13 @@
-
+
-
+
@@ -7657,13 +7660,13 @@
-
+
@@ -7717,24 +7720,24 @@
-
+
-
-
-
+
+
+
@@ -7789,15 +7792,15 @@
-
-
-
+
+
+
@@ -7828,14 +7831,14 @@
-
-
-
+
+
+
@@ -7884,22 +7887,22 @@
-
+
-
+
@@ -7912,6 +7915,7 @@
+
@@ -7924,8 +7928,8 @@
-
+
@@ -8049,10 +8053,10 @@
+
-
@@ -8257,17 +8261,19 @@
+
+
+
-
@@ -8289,9 +8295,11 @@
+
+
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Objects.version b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Objects.version
index 4f3e43eee..32a202f28 100644
Binary files a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Objects.version and b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Objects.version differ
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Preload.xml
index 843bef871..593503917 100644
--- a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Preload.xml
+++ b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Preload.xml
@@ -239,7 +239,6 @@
-
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/PreloadAssetDB.txt b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/PreloadAssetDB.txt
index 1f9ec257b..7cbb541d4 100644
--- a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/PreloadAssetDB.txt
+++ b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/PreloadAssetDB.txt
@@ -33,3 +33,9 @@ Actor=AP_GimbalZTurret,BlipVisual,CommandUIHarnessAttackProtoss,CommandUIHarness
Button=Attack,Move,MoveHoldPosition,MovePatrol,Stop
Weapon
+[Upgrade]
+id=AP_ProtossOdin
+asset=Assets\Textures\Talent-Swann-Level14-VehicleHealthIncrease.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=UpgradeComplete
+
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Triggers
index a5c59476c..1f5753e09 100644
--- a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Triggers
+++ b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Triggers
@@ -3801,6 +3801,7 @@
+
@@ -3822,7 +3823,28 @@
- 2.0
+ 3.3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.1
@@ -3855,55 +3877,35 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1000.0
-
-
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+ 2
+
-
-
-
+
+
+ 1
+
-
-
- 1000.0
-
+
+
+ AP_ProtossOdin
+
+
@@ -3945,48 +3947,6 @@
1500.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 100.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 100.0
-
-
@@ -8793,176 +8753,176 @@
+
-
-
-
-
-
-
-
-
- 2.0
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Prot
-
-
-
-
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
AP\Assets\Textures\AP_icon.dds
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
Zerg
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Prot
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
AP\Assets\Textures\AP_icon.dds
-
+
+
+
+
+
+
+
+
+ 2.0
+
+
+
+
+
+
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Triggers.version
index 2577c25af..7b097d8f8 100644
Binary files a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Triggers.version and b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Triggers.version differ
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt
index a39b85b76..c0a02475f 100644
--- a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -17,6 +17,7 @@ MapInfo/Player10/Name=Loki
Param/Expression/D027731D=SCV Healing Performed On Odin = ~A~
Param/Value/00C70090=Odin shutdown is imminent
Param/Value/07A3982F=/
+Param/Value/08EA02F2=Raceswap Changes
Param/Value/0B8E722E=
Param/Value/11837275=Don't let Tychus die.
Param/Value/16ADA481=An advanced battlecruiser prototype is located here. Destroying it will deal a serious blow to the Dominion.
@@ -24,29 +25,28 @@ Param/Value/189E72CE=
Param/Value/1AAF573D=Destroy All Dominion Bases
Param/Value/22D9DD50=Tychus has been killed.
Param/Value/2504059C=Find Devourer Tissue Samples
+Param/Value/25949F1C=ZERG: Raceswap Changes
Param/Value/35A07756=No Dominion forces can be left behind to report that the Odin has been stolen. Assist the Odin as it rampages through the Dominion bases.
Param/Value/364B1809=After fourth Dominion Base is destroyed
Param/Value/3B4E4D40=3
-Param/Value/3C3CAE4B=The Odin now has 1500 shields and 1000 life, and has innate shield regeneration.Tychus now has 150 shields and 100 life in the starting sequence, and has innate shield regeneration.
Param/Value/4001BD40=Odin Health Repaired
Param/Value/4B6C8309=All of your structures have been destroyed.
Param/Value/4CC8F111=Dominion Battlecruiser
Param/Value/4DF1D7BC=Destroy all Dominion guards protecting the Odin so Tychus can pilot it.
Param/Value/4F1324DA=Do not let the Odin be destroyed.
Param/Value/5CA86664=
-Param/Value/5DABCD66=Raceswap Changes
-Param/Value/5DE3D472=Raceswap Changes
Param/Value/61DADD36=Use any ground unit to open.
Param/Value/6247E812=Enemies Killed by the Odin
+Param/Value/6422A1BC=Raceswap Changes
Param/Value/65CF8966=Find Devourer Tissue Samples
Param/Value/67435239=Escort Tychus to the Odin
+Param/Value/70034A8C=PROTOSS: Raceswap Changes
Param/Value/80DE907E=Dominion Battlecruiser
Param/Value/837C87D2=After stealing the Odin.
Param/Value/83B223A5=Tychus Must Survive
Param/Value/85BC6DAF=Escort Tychus to the Odin
Param/Value/8B3AA905=Auto-Turret Location
Param/Value/8D543226=The Odin has been destroyed.
-Param/Value/91918019=The Odin now has the Biological attribute, and slowly regenerates its life.Tychus slowly regenerates life in the starting sequence.
Param/Value/932ED8C2=Find and Destroy the Loki
Param/Value/9337876A=Dominion researchers have samples of zerg devourers and are studying them at the Valhalla military base. Find these samples for Stetmann.
Param/Value/94E1BA17=Find and Destroy the Loki
@@ -60,11 +60,12 @@ Param/Value/A2EBB206=Tychus Must Survive
Param/Value/A8E89351=
Param/Value/A96CEBFB=All of your units have been killed.
Param/Value/A9A99548=
-Param/Value/AEE8FC36=ZERG: Raceswap Changes
Param/Value/B6A1D7EC=Destroy All Dominion Bases
-Param/Value/BEBF9F31=PROTOSS: Raceswap Changes
+Param/Value/DC94063B=The Odin now has 1500 shields and 1000 life, and gains innate shield regeneration.Tychus now has 150 shields and 100 life, and gains innate shield regeneration in the starting sequence.
Param/Value/E256D5EB=
+Param/Value/EACB4213=The Odin now has the Biological attribute, and regenerates its life slowly over time.Tychus slowly regenerates life in the starting sequence.
Param/Value/EB0F053F=Zerg Research Earned
Param/Value/F6112D1D=Odin
Param/Value/FAEB47D8=Devourer Tissue Sample found
Param/Value/FD0C270E=Odin Must Survive
+Upgrade/Name/AP_ProtossOdin=AP_ProtossOdin
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/t3HeightMap b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/t3HeightMap
index 110a0a43d..e20be1a71 100644
Binary files a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/t3HeightMap and b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/t3HeightMap differ
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/t3SyncHeightMap b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/t3SyncHeightMap
index 3bb341e79..3ffcfbbeb 100644
Binary files a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/t3SyncHeightMap and b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/t3SyncHeightMap differ
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/t3Terrain.version b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/t3Terrain.version
index 22569b127..d39bcf4f4 100644
Binary files a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/t3Terrain.version and b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/t3Terrain.version differ
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/t3Terrain.xml b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/t3Terrain.xml
index 2ecfd8c12..2eeacc359 100644
--- a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/t3Terrain.xml
+++ b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/t3Terrain.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/t3VertCol b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/t3VertCol
index 314e6a629..2b7d7a453 100644
Binary files a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/t3VertCol and b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/t3VertCol differ
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/Base.SC2Data/GameData/UpgradeData.xml b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/Base.SC2Data/GameData/UpgradeData.xml
new file mode 100644
index 000000000..c34c929ac
--- /dev/null
+++ b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/Base.SC2Data/GameData/UpgradeData.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/DocumentHeader
index 527936242..5762dc031 100644
Binary files a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/DocumentHeader and b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/DocumentHeader differ
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/GameData.version b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/GameData.version
index cd764b95a..d7f125f68 100644
Binary files a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/GameData.version and b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/GameData.version differ
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/MapScript.galaxy
index 42de9bfef..d139dbcf9 100644
--- a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/MapScript.galaxy
+++ b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/MapScript.galaxy
@@ -961,13 +961,12 @@ bool gt_Init03Units_Func (bool testConds, bool runActions) {
gv_statueBullhorns[5] = UnitFromId(217);
gv_statueBullhorns[6] = UnitFromId(215);
if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Zerg")) {
- UnitSetPropertyFixed(gv_odin, c_unitPropLifeRegen, 1.8);
+ UnitSetPropertyFixed(gv_odin, c_unitPropLifeRegen, 2.1);
UnitBehaviorAdd(gv_odin, "AP_ZergOdin", gv_odin, 1);
}
else {
if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) {
- UnitSetPropertyFixed(gv_odin, c_unitPropLifeMax, 2000.0);
- UnitSetPropertyFixed(gv_odin, c_unitPropLife, 2000.0);
+ TechTreeUpgradeAddLevel(1, "AP_ProtossOdin", 1);
UnitSetPropertyFixed(gv_odin, c_unitPropShieldsMax, 500.0);
UnitSetPropertyFixed(gv_odin, c_unitPropShields, 500.0);
}
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/PreloadAssetDB.txt b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/PreloadAssetDB.txt
index 148aafc25..2bb4afce7 100644
--- a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/PreloadAssetDB.txt
+++ b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/PreloadAssetDB.txt
@@ -55,6 +55,12 @@ Actor=AP_GimbalZTurret,BlipVisual,##id##,CommandUIHarnessAttackProtoss,CommandUI
Button=Attack,Move,MoveHoldPosition,MovePatrol,Stop
Weapon=ThrowMolotov
+[Upgrade]
+id=AP_ProtossOdin
+asset=Assets\Textures\Talent-Swann-Level14-VehicleHealthIncrease.dds
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Alert=UpgradeComplete
+
[Water]
id=Template 2
asset=Assets\Textures\DefaultWater.dds
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/Triggers
index 4ad84ea53..045018316 100644
--- a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/Triggers
+++ b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/Triggers
@@ -1744,7 +1744,7 @@
- 1.8
+ 2.1
@@ -1777,51 +1777,33 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2000.0
-
-
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+ 1
+
-
-
-
+
+
+ 1
+
-
-
- 2000.0
-
+
+
+ AP_ProtossOdin
+
+
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/Triggers.version
index 0fd676e5d..9d6542086 100644
Binary files a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/Triggers.version and b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/Triggers.version differ
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt
index 03cbfbfea..3b19724e0 100644
--- a/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Maps/ArchipelagoCampaign/WoL/ap_media_blitz.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -91,4 +91,5 @@ Sound/Name/PlaceholderSoundFile2=PlaceholderSoundFile (Mothership)
Unit/Name/Civilian=Civilian
Unit/Name/CivilianFemale=Civilian
Unit/Name/Odin=Odin
+Upgrade/Name/AP_ProtossOdin=AP_ProtossOdin
Water/Name/Template 2=Template 2
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78.galaxy b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78.galaxy
index 90b7b413f..ec59a78de 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78.galaxy
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/Lib15EF4C78.galaxy
@@ -2967,16 +2967,12 @@ void lib15EF4C78_gf_RemoveUnusedStartingUnits (unitgroup lp_startingUnits, strin
if (((UnitGetType(autoA0E4A284_var) == "AP_Hatchery") || (UnitGetType(autoA0E4A284_var) == "AP_Lair") || (UnitGetType(autoA0E4A284_var) == "AP_Hive") || (UnitGetType(autoA0E4A284_var) == "AP_Nexus") || (UnitGetType(autoA0E4A284_var) == "AP_CommandCenter"))) {
if ((lp_hiveUpgrade == true)) {
lib15EF4C78_gf_ReplaceTownHall(autoA0E4A284_var, lp_desiredFaction, true);
- continue;
}
else {
lib15EF4C78_gf_ReplaceTownHall(autoA0E4A284_var, lp_desiredFaction, false);
- continue;
}
}
- else {
- continue;
- }
+
if ((lp_desiredFaction != "Zerg") && ((UnitGetType(autoA0E4A284_var) == "AP_CreepTumor") || (UnitGetType(autoA0E4A284_var) == "AP_CreepTumorBurrowed") || (UnitGetType(autoA0E4A284_var) == "AP_CreepTumorUsed"))) {
UnitRemove(autoA0E4A284_var);
CreepModify(UnitGetPosition(autoA0E4A284_var), 11.0, false, false);
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/DocumentHeader b/Mods/ArchipelagoPlayer.SC2Mod/DocumentHeader
index 18f68b742..97f4bf1ab 100644
Binary files a/Mods/ArchipelagoPlayer.SC2Mod/DocumentHeader and b/Mods/ArchipelagoPlayer.SC2Mod/DocumentHeader differ
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Triggers b/Mods/ArchipelagoPlayer.SC2Mod/Triggers
index 1b3f37279..1668e68b2 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Triggers
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Triggers
@@ -59781,21 +59781,14 @@
-
-
-
-
-
-
-
@@ -59821,10 +59814,6 @@
false
-
-
-
-
@@ -59848,10 +59837,6 @@
true
-
-
-
-
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Triggers.version b/Mods/ArchipelagoPlayer.SC2Mod/Triggers.version
index 84e47a549..95ad03dee 100644
Binary files a/Mods/ArchipelagoPlayer.SC2Mod/Triggers.version and b/Mods/ArchipelagoPlayer.SC2Mod/Triggers.version differ