Fixes Made

SirChuckOfTheChuckles · Sep 14, 2024 · 667e91c · 667e91c
1 parent d35072f
commit 667e91c
Show file tree

Hide file tree

Showing 28 changed files with 361 additions and 398 deletions.
diff --git a/...rchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Base.SC2Data/GameData/UnitData.xml b/...rchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Base.SC2Data/GameData/UnitData.xml
@@ -3,7 +3,7 @@
     <CUnit id="Odin">
         <ShieldArmor value="3"/>
         <ShieldRegenDelay value="10"/>
-        <ShieldRegenRate value="5.5"/>
+        <ShieldRegenRate value="6"/>
         <ShieldArmorName value="Unit/ShieldArmorName/AP_TerranShieldArmor"/>
     </CUnit>
     <CUnit id="TychusChaingun">

diff --git a/...ipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Base.SC2Data/GameData/UpgradeData.xml b/...ipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Base.SC2Data/GameData/UpgradeData.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Catalog>
+    <CUpgrade id="AP_ProtossOdin">
+        <Icon value="Assets\Textures\Talent-Swann-Level14-VehicleHealthIncrease.dds"/>
+        <EffectArray Operation="Multiply" Reference="Unit,Odin,LifeStart" Value="0.4"/>
+        <EffectArray Operation="Multiply" Reference="Unit,Odin,LifeMax" Value="0.4"/>
+        <EffectArray Operation="Multiply" Reference="Unit,TychusChaingun,LifeMax" Value="0.4"/>
+        <EffectArray Operation="Multiply" Reference="Unit,TychusChaingun,LifeStart" Value="0.4"/>
+        <EffectArray Reference="Unit,TychusChaingun,LifeStart" Value="1"/>
+        <EffectArray Reference="Unit,TychusChaingun,LifeMax" Value="1"/>
+        <EffectArray Reference="Unit,Odin,LifeStart" Value="1"/>
+        <EffectArray Reference="Unit,Odin,LifeMax" Value="1"/>
+    </CUpgrade>
+</Catalog>
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/DocumentHeader
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/GameData.version b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/GameData.version
diff --git 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
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Objects b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Objects
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Objects.version b/Maps/ArchipelagoCampaign/WoL/ap_engine_of_destruction.SC2Map/Objects.version
diff --git 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 @@
 <Unit id="SpartanCompany"/>
 <Unit id="HelsAngelFighter"/>
 <Unit id="DuskWing"/>
-<Unit id="InfestedAbomination"/>
 <Unit id="BarracksTechReactor"/>
 <Unit id="FactoryTechReactor"/>
 <Unit id="StarportTechReactor"/>

diff --git 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
+