Add Shield regen filler item

Ziktofel · Dec 12, 2024 · 6fa688d · 6fa688d
1 parent a917e25
commit 6fa688d
Show file tree

Hide file tree

Showing 12 changed files with 1,467 additions and 1 deletion.
diff --git a/...lagoCampaign/HotS/ap_with_friends_like_these.SC2Map/Base.SC2Data/GameData/UpgradeData.xml b/...lagoCampaign/HotS/ap_with_friends_like_these.SC2Map/Base.SC2Data/GameData/UpgradeData.xml
@@ -252,4 +252,12 @@
         <EffectArray index="6" Value="0"/>
         <EffectArray index="7" Value="0"/>
     </CUpgrade>
+    <CUpgrade id="AP_ShieldRegenBonusBattlecruiser">
+        <!--  Override -->
+        <EffectArray Reference="Unit,SJHyperion,ShieldRegenRate" Value="0.05"/>
+    </CUpgrade>
+    <CUpgrade id="AP_ShieldRegenBonusBattlecruiser100Stack">
+        <!--  Override -->
+        <EffectArray Reference="Unit,SJHyperion,ShieldRegenRate" Value="5"/>
+    </CUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
diff --git a/Mods/ArchipelagoPlayerLotV.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayerLotV.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -773,4 +773,22 @@
         <EffectArray Reference="Unit,HugeSwarmQueenBurrowed,LifeRegenRateCreep" Value="0.820200"/>
         <EffectArray Reference="Unit,Brutalisk,LifeRegenRateCreep" Value="0.820200"/>
     </CUpgrade>
+    <CUpgrade id="AP_ShieldRegenBonus">
+        <!--  Override -->
+        <EffectArray Reference="Unit,PrologueZeratul,ShieldRegenRate" Value="0.05"/>
+        <EffectArray Reference="Unit,KaraxChampion,ShieldRegenRate" Value="0.05"/>
+        <EffectArray Reference="Unit,AlarakChampion,ShieldRegenRate" Value="0.05"/>
+        <EffectArray Reference="Unit,VorazunChampion,ShieldRegenRate" Value="0.05"/>
+        <EffectArray Reference="Unit,FenixChampion,ShieldRegenRate" Value="0.05"/>
+        <EffectArray Reference="Unit,ArtanisVoid,ShieldRegenRate" Value="0.05"/>
+    </CUpgrade>
+    <CUpgrade id="AP_ShieldRegenBonus100Stack">
+        <!--  Override -->
+        <EffectArray Reference="Unit,PrologueZeratul,ShieldRegenRate" Value="5"/>
+        <EffectArray Reference="Unit,KaraxChampion,ShieldRegenRate" Value="5"/>
+        <EffectArray Reference="Unit,AlarakChampion,ShieldRegenRate" Value="5"/>
+        <EffectArray Reference="Unit,VorazunChampion,ShieldRegenRate" Value="5"/>
+        <EffectArray Reference="Unit,FenixChampion,ShieldRegenRate" Value="5"/>
+        <EffectArray Reference="Unit,ArtanisVoid,ShieldRegenRate" Value="5"/>
+    </CUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayerLotVPrologue.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayerLotVPrologue.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -140,4 +140,12 @@
 
         <EffectArray Operation="Set" Reference="Actor,PrologueZeratul,ShieldArmorIcon" Value="AP\Assets\Custom\Textures\btn-upgrade-protoss-shieldslevel5.dds"/>
     </CUpgrade>
+    <CUpgrade id="AP_ShieldRegenBonus">
+        <!--  Override -->
+        <EffectArray Reference="Unit,PrologueZeratul,ShieldRegenRate" Value="0.05"/>
+    </CUpgrade>
+    <CUpgrade id="AP_ShieldRegenBonus100Stack">
+        <!--  Override -->
+        <EffectArray Reference="Unit,PrologueZeratul,ShieldRegenRate" Value="5"/>
+    </CUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayerWoL.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayerWoL.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -1687,4 +1687,24 @@
         <EffectArray Reference="Weapon,Odin,RateMultiplier" Value="0.15"/>
         <EffectArray Reference="Weapon,OdinAntiAir,RateMultiplier" Value="0.15"/>
     </CUpgrade>
+    <CUpgrade id="AP_ShieldRegenBonus">
+        <!--  Override -->
+        <EffectArray Reference="Unit,Odin,ShieldRegenRate" Value="0.05"/>
+        <EffectArray Reference="Unit,Zeratul,ShieldRegenRate" Value="0.05"/>
+        <EffectArray Reference="Unit,Urun,ShieldRegenRate" Value="0.05"/>
+        <EffectArray Reference="Unit,Mohandar,ShieldRegenRate" Value="0.05"/>
+        <EffectArray Reference="Unit,Selendis,ShieldRegenRate" Value="0.05"/>
+        <EffectArray Reference="Unit,Artanis,ShieldRegenRate" Value="0.05"/>
+        <EffectArray Reference="Unit,SelendisInterceptor,ShieldRegenRate" Value="0.05"/>
+    </CUpgrade>
+    <CUpgrade id="AP_ShieldRegenBonus100Stack">
+        <!--  Override -->
+        <EffectArray Reference="Unit,Odin,ShieldRegenRate" Value="5"/>
+        <EffectArray Reference="Unit,Zeratul,ShieldRegenRate" Value="5"/>
+        <EffectArray Reference="Unit,Urun,ShieldRegenRate" Value="5"/>
+        <EffectArray Reference="Unit,Mohandar,ShieldRegenRate" Value="5"/>
+        <EffectArray Reference="Unit,Selendis,ShieldRegenRate" Value="5"/>
+        <EffectArray Reference="Unit,Artanis,ShieldRegenRate" Value="5"/>
+        <EffectArray Reference="Unit,SelendisInterceptor,ShieldRegenRate" Value="5"/>
+    </CUpgrade>
 </Catalog>
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -3033,6 +3033,8 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorAdaptiveDefenses (int lp_pl
     // Automatic Variable Declarations
     // Implementation
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_PredatorAdaptiveDefenses", 1);
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonusPredator", TechTreeUpgradeCount(lp_player, "AP_ShieldRegenBonus", c_techCountCompleteOnly));
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonusPredator100Stack", TechTreeUpgradeCount(lp_player, "AP_ShieldRegenBonus100Stack", c_techCountCompleteOnly));
 }
 
 void libABFE498B_gf_AP_Triggers_Terran_unlockMedivacRapidDeploymentTube (int lp_player) {
@@ -3063,6 +3065,8 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockMedivacScatterVeil (int lp_player)
     // Automatic Variable Declarations
     // Implementation
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_MedivacShield", 1);
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonusMedivac", TechTreeUpgradeCount(lp_player, "AP_ShieldRegenBonus", c_techCountCompleteOnly));
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonusMedivac100Stack", TechTreeUpgradeCount(lp_player, "AP_ShieldRegenBonus100Stack", c_techCountCompleteOnly));
 }
 
 void libABFE498B_gf_AP_Triggers_Terran_unlockMedivacAdvancedCloakingField (int lp_player) {
@@ -3267,6 +3271,8 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockBattlecruiserProgressiveDefensiveMa
 
         if ((lp_level >= 2)) {
             libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_BattlecruiserAdvancedDefensiveMatrix", 1);
+            libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonusBattlecruiser", TechTreeUpgradeCount(lp_player, "AP_ShieldRegenBonus", c_techCountCompleteOnly));
+            libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonusBattlecruiser100Stack", TechTreeUpgradeCount(lp_player, "AP_ShieldRegenBonus100Stack", c_techCountCompleteOnly));
         }
 
     }
@@ -7721,6 +7727,8 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockSupplicantShieldRegeneration (int
     // Automatic Variable Declarations
     // Implementation
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_AlarakSupplicantShieldRegen", 1);
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonusSupplicantBoosted", TechTreeUpgradeCount(lp_player, "AP_ShieldRegenBonus", c_techCountCompleteOnly));
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonusSupplicantBoosted100Stack", TechTreeUpgradeCount(lp_player, "AP_ShieldRegenBonus100Stack", c_techCountCompleteOnly));
 }
 
 void libABFE498B_gf_AP_Triggers_Protoss_unlockAdeptShockwave (int lp_player) {
@@ -7775,6 +7783,8 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonTrillicCompressionSystems (
     // Automatic Variable Declarations
     // Implementation
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DragoonHealth", 1);
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonusDragoonTrillic", TechTreeUpgradeCount(lp_player, "AP_ShieldRegenBonus", c_techCountCompleteOnly));
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonusDragoonTrillic100Stack", TechTreeUpgradeCount(lp_player, "AP_ShieldRegenBonus100Stack", c_techCountCompleteOnly));
 }
 
 void libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonSingularityCharge (int lp_player) {
@@ -9151,6 +9161,46 @@ void libABFE498B_gf_AP_Triggers_giveProtossDefaultTech (int lp_player) {
     libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_VoidRayBeamCanCharge", 1);
 }
 
+void libABFE498B_gf_AP_Triggers_giveShieldRegeneration (int lp_player, int lp_stacks) {
+    // Variable Declarations
+    int lv__1stacks;
+    int lv__100stacks;
+
+    // Automatic Variable Declarations
+    // Variable Initialization
+    lv__1stacks = ModI(lp_stacks, 100);
+    lv__100stacks = (lp_stacks / 100);
+
+    // Implementation
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonus", lv__1stacks);
+    libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonus100Stack", lv__100stacks);
+    if ((TechTreeUpgradeCount(lp_player, "AP_DragoonHealth", c_techCountCompleteOnly) > 0)) {
+        libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonusDragoonTrillic", lv__1stacks);
+        libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonusDragoonTrillic100Stack", lv__100stacks);
+    }
+
+    if ((TechTreeUpgradeCount(lp_player, "AP_AlarakSupplicantShieldRegen", c_techCountCompleteOnly) > 0)) {
+        libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonusSupplicantBoosted", lv__1stacks);
+        libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonusSupplicantBoosted100Stack", lv__100stacks);
+    }
+
+    if ((TechTreeUpgradeCount(lp_player, "AP_MedivacShield", c_techCountCompleteOnly) > 0)) {
+        libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonusMedivac", lv__1stacks);
+        libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonusMedivac100Stack", lv__100stacks);
+    }
+
+    if ((TechTreeUpgradeCount(lp_player, "AP_BattlecruiserAdvancedDefensiveMatrix", c_techCountCompleteOnly) > 0)) {
+        libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonusBattlecruiser", lv__1stacks);
+        libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonusBattlecruiser100Stack", lv__100stacks);
+    }
+
+    if ((TechTreeUpgradeCount(lp_player, "AP_PredatorAdaptiveDefenses", c_techCountCompleteOnly) > 0)) {
+        libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonusPredator", lv__1stacks);
+        libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ShieldRegenBonusPredator100Stack", lv__100stacks);
+    }
+
+}
+
 void libABFE498B_gf_AP_Triggers_replaceUpgrade (int lp_player, string lp_oldUpgrade, string lp_newUpgrade) {
     // Automatic Variable Declarations
     // Implementation
@@ -9514,6 +9564,7 @@ bool libABFE498B_gt_AP_Triggers_giveProtossTech_Func (bool testConds, bool runAc
     string lv_forge4Value;
     string lv_warCouncilValue;
     string lv_warCouncil2Value;
+    string lv_shieldRegenValue;
 
     // Automatic Variable Declarations
     playergroup auto67EC4BC5_g;
@@ -9532,6 +9583,7 @@ bool libABFE498B_gt_AP_Triggers_giveProtossTech_Func (bool testConds, bool runAc
     lv_forge4Value = "";
     lv_warCouncilValue = "";
     lv_warCouncil2Value = "";
+    lv_shieldRegenValue = "";
 
     // Actions
     if (!runActions) {
@@ -9551,6 +9603,7 @@ bool libABFE498B_gt_AP_Triggers_giveProtossTech_Func (bool testConds, bool runAc
     lv_forge4Value = StringWord(EventChatMessage(false), 12);
     lv_warCouncilValue = StringWord(EventChatMessage(false), 13);
     lv_warCouncil2Value = StringWord(EventChatMessage(false), 14);
+    lv_shieldRegenValue = StringWord(EventChatMessage(false), 15);
     auto67EC4BC5_g = lib5BD4895D_gv_aP_Core_affectedPlayers;
     lv_currentPlayer = -1;
     while (true) {
@@ -9569,6 +9622,7 @@ bool libABFE498B_gt_AP_Triggers_giveProtossTech_Func (bool testConds, bool runAc
         libABFE498B_gf_AP_Triggers_unlockProtossForge4(lv_currentPlayer, StringToInt(lv_forge4Value));
         libABFE498B_gf_AP_Triggers_unlockProtossWarCouncil(lv_currentPlayer, StringToInt(lv_warCouncilValue));
         libABFE498B_gf_AP_Triggers_unlockProtossWarCouncil2(lv_currentPlayer, StringToInt(lv_warCouncil2Value));
+        libABFE498B_gf_AP_Triggers_giveShieldRegeneration(lv_currentPlayer, StringToInt(lv_shieldRegenValue));
     }
     return true;
 }

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
@@ -947,6 +947,7 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockRoboticsFacility (int lp_player);
 void libABFE498B_gf_AP_Triggers_Protoss_unlockStargate (int lp_player);
 void libABFE498B_gf_AP_Triggers_clearProtossTech (int lp_player);
 void libABFE498B_gf_AP_Triggers_giveProtossDefaultTech (int lp_player);
+void libABFE498B_gf_AP_Triggers_giveShieldRegeneration (int lp_player, int lp_stacks);
 void libABFE498B_gf_AP_Triggers_replaceUpgrade (int lp_player, string lp_oldUpgrade, string lp_newUpgrade);
 
 // Trigger Declarations

diff --git a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/GameText.version b/Mods/ArchipelagoTriggers.SC2Mod/GameText.version