Hotfix

Vek17 · Mar 8, 2023 · a32c549 · a32c549
1 parent 487654d
commit a32c549
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Version 2.5.1a
+* Fixes
+    * Blessed Claws now qualifies for shifter's edge.
+    * Fixed Wyrmshifter breath weapons breaking polymorphs in some cases
+
 ## Version 2.5.1
 * Fixes
     * AreaOfEffectDoubleTrigger set to off by default due to some issues with some areas.

diff --git a/TabletopTweaks-Base/Info.json b/TabletopTweaks-Base/Info.json
@@ -10,5 +10,5 @@
   "Repository": "https://raw.githubusercontent.com/Vek17/TabletopTweaks-Base/master/Repository.json",
   "Requirements": [ "TabletopTweaks-Core-0.5.10" ],
   "LoadAfter": [ "TabletopTweaks-Core" ],
-  "Version": "2.5.1"
+  "Version": "2.5.1a"
 }
diff --git a/TabletopTweaks-Base/MechanicsChanges/PolymorphStacking.cs b/TabletopTweaks-Base/MechanicsChanges/PolymorphStacking.cs
@@ -165,7 +165,14 @@ static void RemoveModifiers() {
                     BlueprintTools.GetBlueprint<BlueprintBuff>("93e27994169df9c43885394dc68f137f"), //FormOfTheDragonIBlueBreathWeaponBuff  
                     BlueprintTools.GetBlueprint<BlueprintBuff>("5d7089b61f459204993a1292d6f158f8"), //FormOfTheDragonIBlackBreathWeaponBuff  
                     BlueprintTools.GetBlueprint<BlueprintBuff>("ee6c7f5437a57ad48aaf47320129df33"), //KitsunePolymorphBuff  
-                    BlueprintTools.GetBlueprint<BlueprintBuff>("a13e2e71485901045b1722824019d6f5")  //KitsunePolymorphBuff_Nenio  
+                    BlueprintTools.GetBlueprint<BlueprintBuff>("a13e2e71485901045b1722824019d6f5"), //KitsunePolymorphBuff_Nenio  
+
+                    BlueprintTools.GetBlueprint<BlueprintBuff>("15aa7a7b77d6410ca09730998dc13963"), //WyrmshifterSilverBreathWeaponBuff  
+                    BlueprintTools.GetBlueprint<BlueprintBuff>("a44fa81dbbcb462d9e648b19e720fe1a"), //WyrmshifterGreenBreathWeaponBuff  
+                    BlueprintTools.GetBlueprint<BlueprintBuff>("1b7290523aad4b9f8de5310fd873b000"), //WyrmshifterGoldBreathWeaponBuff  
+                    BlueprintTools.GetBlueprint<BlueprintBuff>("1924db960ed3476f8cf045fc1e787db2"), //WyrmshifterBrassBreathWeaponBuff  
+                    BlueprintTools.GetBlueprint<BlueprintBuff>("a97bed28eac746f4b756eb1473f61f5e"), //WyrmshifterBlueBreathWeaponBuff  
+                    BlueprintTools.GetBlueprint<BlueprintBuff>("695c5f531d084448850c0bb278ab3251")  //WyrmshifterBlackBreathWeaponBuff  
                 };
                 polymorphBuffs
                     .OrderBy(buff => buff.name)

diff --git a/TabletopTweaks-Base/NewContent/Archetypes/HolyBeast.cs b/TabletopTweaks-Base/NewContent/Archetypes/HolyBeast.cs
@@ -29,7 +29,7 @@
 namespace TabletopTweaks.Base.NewContent.Archetypes {
     internal class HolyBeast {
         public static void AddHolyBeast() {
-
+            var ShiftersEdgeFeature = BlueprintTools.GetBlueprint<BlueprintFeature>("0e7ec9a341ca46fcaf4d49759e047c83");
             var FavoriteEnemyOutsider = BlueprintTools.GetBlueprint<BlueprintFeature>("f643b38acc23e8e42a3ed577daeb6949");
             var OutsiderType = BlueprintTools.GetBlueprintReference<BlueprintUnitFactReference>("9054d3988d491d944ac144e27b6bc318");
             var DemonOfMagicFeature = BlueprintTools.GetBlueprintReference<BlueprintUnitFactReference>("1b466705276e3124ab43f865e282c6e8");
@@ -625,6 +625,12 @@ BlueprintFeatureSelection CreateBlessedClawsFeatureSelection(
             }
 
             if (TTTContext.AddedContent.Archetypes.IsDisabled("HolyBeast")) { return; }
+            ShiftersEdgeFeature.TemporaryContext(bp => {
+                var Features = bp.GetComponent<PrerequisiteFeaturesFromList>().Features.ToList();
+                Features.Add(BlessedClawsFeatureAddLevel);
+                bp.RemoveComponents<PrerequisiteFeaturesFromList>();
+                bp.AddPrerequisiteFeaturesFromList(1, Features.ToArray());
+            });
             ClassTools.Classes.ShifterClass.m_Archetypes = ClassTools.Classes.ShifterClass.m_Archetypes.AppendToArray(HolyBeastArchetype.ToReference<BlueprintArchetypeReference>());
             ClassTools.Classes.ShifterClass.Progression.UIGroups = ClassTools.Classes.ShifterClass.Progression.UIGroups.AppendToArray(
                 Helpers.CreateUIGroup(HolyBeastDivineFury)