Cleaned up for 1.3.5

Vek17 · Sep 29, 2021 · b4d930c · b4d930c
1 parent dba8eae
commit b4d930c
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,11 @@
 ## Version 1.3.5
 * shatter defenses now works like in tabletop
-* added mythic shatter defenses
 * extra feat mythic feat can now only be taken once
 * extra mythic ability mythic feat can now only be taken once
 * improvements to natual armor stacking rules
+* added mythic shatter defenses
+* added nature soul @Aegonek 
+* added animal ally @Aegonek 
 
 ## Version 1.3.4a
 * fixed issue where weapon materials didn't apply correctly

diff --git a/README.md b/README.md
@@ -36,6 +36,9 @@ All fixes and added content are configurable and can be disabled by editing the
         Mounted Maniac
         Mythic Spell Combat
         Precision Critical
+
+    Adds the following mythic feats:
+        Shatter Defenses (Mythic)
 
     Adds the following arcanist exploits:
         Quick Study
@@ -81,6 +84,8 @@ All fixes and added content are configurable and can be disabled by editing the
         Extra Revelation
         Extra Discovery
         Extra Mercy
+        Nature Soul
+        Animal Ally
 
     Adds the following rogue talents:
         Graceful Athlete

diff --git a/Repository.json b/Repository.json
@@ -2,7 +2,7 @@
     "Releases": [
         {
             "Id": "TabletopTweaks",
-            "Version": "1.3.4a"
+            "Version": "1.3.5"
         }
     ]
 }
diff --git a/TabletopTweaks/Config/AddedContent.cs b/TabletopTweaks/Config/AddedContent.cs
@@ -13,6 +13,7 @@ public class AddedContent : IUpdatableSettings {
         public SettingGroup Races = new SettingGroup();
         public SettingGroup Spells = new SettingGroup();
         public SettingGroup MythicAbilities = new SettingGroup();
+        public SettingGroup MythicFeats = new SettingGroup();
 
         public void OverrideSettings(IUpdatableSettings userSettings) {
             var loadedSettings = userSettings as AddedContent;
@@ -28,6 +29,7 @@ public void OverrideSettings(IUpdatableSettings userSettings) {
             Races.LoadSettingGroup(loadedSettings.Races, NewSettingsOffByDefault);
             Spells.LoadSettingGroup(loadedSettings.Spells, NewSettingsOffByDefault);
             MythicAbilities.LoadSettingGroup(loadedSettings.MythicAbilities, NewSettingsOffByDefault);
+            MythicFeats.LoadSettingGroup(loadedSettings.MythicFeats, NewSettingsOffByDefault);
         }
     }
 }
diff --git a/TabletopTweaks/Config/AddedContent.json b/TabletopTweaks/Config/AddedContent.json
@@ -52,7 +52,7 @@
             "ShingleRunner": true,
             "StreetSmarts": true,
             "NatureSoul": true,
-            "AnimalAlly":  true
+            "AnimalAlly": true
         }
     },
     "FighterAdvancedWeaponTraining": {
@@ -110,5 +110,11 @@
             "MythicSpellCombat": true,
             "PrecisionCritical": true
         }
+    },
+    "MythicFeats": {
+        "DisableAll": false,
+        "Enabled": {
+            "MythicShatterDefenses": true
+        }
     }
 }
diff --git a/TabletopTweaks/Config/Blueprints.json b/TabletopTweaks/Config/Blueprints.json
@@ -11,7 +11,6 @@
         "AdvancedArmorTrainingSelection": "5bf17c2a-e9ee-4615-b27c-993629ed9bc3",
         "AdvancedWeaponTrainingSelection": "538bc739-00c2-425b-9367-7cc02a3048b1",
         "AeonBaneIncreaseResourceFeature": "ba1b0e6d-7bec-4a49-94ae-0e61a1fda1bd",
-        "AnimalAlly": "0105896c-0cdb-4ab5-990a-cc0b9d854db7",
         "AnimalAllyFeatureSelection": "ecf97b54-4d58-4edb-8bb0-ba9e7de20751",
         "AnimalAllyProgression": "494c76f2-040a-494b-ac3b-53b78176f5e5",
         "ArcanistExploitFamiliar": "23fb1d26-bbc1-4224-87a3-be92275bd40b",
@@ -354,6 +353,7 @@
         "ShadowEnchantment": "d934f706-a12b-40ec-87a9-c8baf221b8a9",
         "ShadowEnchantmentGreater": "ba079628-2748-4eb3-8bf0-b6aadd9f5f22",
         "ShatterDefensesBuff": "a9c869b5-519f-466c-bdeb-5952e4fb0232",
+        "ShatterDefensesDisplayBuff": "74688fc2-5e0c-4c2c-ae41-6a02a0fe6528",
         "ShatterDefensesMythicBuff": "94046670-7810-4f5a-9dcf-a0f70e5464f2",
         "ShatterDefensesMythicFeat": "a1b70155-c69a-431a-87f8-7efd9d4eb6d9",
         "ShingleRunner": "e6c54b27-d20e-40f4-8a06-e032172afa1d",

diff --git a/TabletopTweaks/Info.json b/TabletopTweaks/Info.json
@@ -9,5 +9,5 @@
     "ManagerVersion": "0.23.0",
     "Repository": "https://raw.githubusercontent.com/Vek17/WrathMods-TabletopTweaks/master/Repository.json",
     "Requirements": [],
-    "Version": "1.3.4a"
+    "Version": "1.3.5"
 }
diff --git a/TabletopTweaks/NewContent/ContentAdder.cs b/TabletopTweaks/NewContent/ContentAdder.cs
@@ -74,6 +74,8 @@ static void Postfix() {
                 MythicAbilities.MythicSpellCombat.AddMythicSpellCombat();
                 MythicAbilities.PrecisionCritical.AddPrecisionCritical();
 
+                MythicFeats.MythicShatterDefenses.AddMythicShatterDefenses();
+
                 Feats.MagicalAptitude.AddMagicalAptitude();
                 Feats.Scholar.AddScholar();
                 Feats.SelfSufficient.AddSelfSufficient();
@@ -84,7 +86,7 @@ static void Postfix() {
                 Feats.NatureSoul.AddNatureSoul();
                 Feats.AnimalAlly.AddAnimalAlly();
 
-                Feats.ShatterDefenses.AddShatterDefensesBuffs();
+                Feats.ShatterDefenses.AddNewShatterDefenseBlueprints();
 
                 Feats.ExtraReservoir.AddExtraReservoir();
                 Feats.ExtraHex.AddExtraHex();

diff --git a/TabletopTweaks/NewContent/Feats/ShatterDefenses.cs b/TabletopTweaks/NewContent/Feats/ShatterDefenses.cs
@@ -10,10 +10,10 @@
 
 namespace TabletopTweaks.NewContent.Feats {
     static class ShatterDefenses {
-        public static void AddShatterDefensesBuffs() {
+        public static void AddNewShatterDefenseBlueprints() {
             var ShatterDefenses = Resources.GetBlueprint<BlueprintFeature>("61a17ccbbb3d79445b0926347ec07577");
 
-            var ShatterDefensesDisplayBuff = Helpers.CreateBuff("ShatterDefensesBuff", bp => {
+            var ShatterDefensesDisplayBuff = Helpers.CreateBuff("ShatterDefensesDisplayBuff", bp => {
                 bp.m_Icon = ShatterDefenses.m_Icon;
                 bp.Stacking = StackingType.Prolong;
                 bp.SetName("Shattered Defenses");
@@ -42,23 +42,6 @@ public static void AddShatterDefensesBuffs() {
                 bp.SetName("Shattered Defenses");
                 bp.SetDescription("An opponent you affect with Shatter Defenses is flat-footed to your attacks.");
             });
-            var ShatterDefensesMythicBuff = Helpers.CreateBuff("ShatterDefensesMythicBuff", bp => {
-                bp.m_Icon = ShatterDefenses.m_Icon;
-                bp.SetName("Shattered Defenses (Mythic)");
-                bp.SetDescription("An opponent affected by Shatter Defenses is flat-footed to all attacks.");
-            });
-            var ShatterDefensesMythicFeat = Helpers.CreateBlueprint<BlueprintFeature>("ShatterDefensesMythicFeat", bp => {
-                bp.m_Icon = ShatterDefenses.m_Icon;
-                bp.SetName("Shatter Defenses (Mythic)");
-                bp.SetDescription("An opponent you affect with Shatter Defenses is flat-footed to all attacks, not just yours.");
-                bp.IsClassFeature = true;
-                bp.Ranks = 1;
-                bp.Groups = new FeatureGroup[] { FeatureGroup.MythicFeat };
-                bp.AddPrerequisiteFeature(ShatterDefenses);
-            });
-            if (ModSettings.Fixes.Feats.IsDisabled("ShatterDefenses")) { return; }
-            if (ModSettings.AddedContent.MythicFeats.IsDisabled("MythicShatterDefenses")) { return; }
-            FeatTools.AddAsMythicFeat(ShatterDefensesMythicFeat);
         }
     }
 }
diff --git a/TabletopTweaks/NewContent/MythicFeats/MythicShatterDefenses.cs b/TabletopTweaks/NewContent/MythicFeats/MythicShatterDefenses.cs
@@ -0,0 +1,29 @@
+using Kingmaker.Blueprints.Classes;
+using TabletopTweaks.Config;
+using TabletopTweaks.Extensions;
+using TabletopTweaks.Utilities;
+
+namespace TabletopTweaks.NewContent.MythicFeats {
+    class MythicShatterDefenses {
+        public static void AddMythicShatterDefenses() {
+            var ShatterDefenses = Resources.GetBlueprint<BlueprintFeature>("61a17ccbbb3d79445b0926347ec07577");
+            var ShatterDefensesMythicBuff = Helpers.CreateBuff("ShatterDefensesMythicBuff", bp => {
+                bp.m_Icon = ShatterDefenses.m_Icon;
+                bp.SetName("Shattered Defenses (Mythic)");
+                bp.SetDescription("An opponent affected by Shatter Defenses is flat-footed to all attacks.");
+            });
+            var ShatterDefensesMythicFeat = Helpers.CreateBlueprint<BlueprintFeature>("ShatterDefensesMythicFeat", bp => {
+                bp.m_Icon = ShatterDefenses.m_Icon;
+                bp.SetName("Shatter Defenses (Mythic)");
+                bp.SetDescription("An opponent you affect with Shatter Defenses is flat-footed to all attacks, not just yours.");
+                bp.IsClassFeature = true;
+                bp.Ranks = 1;
+                bp.Groups = new FeatureGroup[] { FeatureGroup.MythicFeat };
+                bp.AddPrerequisiteFeature(ShatterDefenses);
+            });
+            if (ModSettings.Fixes.Feats.IsDisabled("ShatterDefenses")) { return; }
+            if (ModSettings.AddedContent.MythicFeats.IsDisabled("MythicShatterDefenses")) { return; }
+            FeatTools.AddAsMythicFeat(ShatterDefensesMythicFeat);
+        }
+    }
+}
diff --git a/TabletopTweaks/TabletopTweaks.csproj b/TabletopTweaks/TabletopTweaks.csproj
@@ -302,6 +302,7 @@
     <Compile Include="NewContent\MythicAbilities\MountedManiac.cs" />
     <Compile Include="NewContent\MythicAbilities\MythicSpellCombat.cs" />
     <Compile Include="NewContent\MythicAbilities\PrecisionCritical.cs" />
+    <Compile Include="NewContent\MythicFeats\MythicShatterDefenses.cs" />
     <Compile Include="NewContent\Races\Elf.cs" />
     <Compile Include="NewContent\Races\Dwarf.cs" />
     <Compile Include="NewContent\Races\Gnome.cs" />

diff --git a/TabletopTweaks/Utilities/DescriptionTools.cs b/TabletopTweaks/Utilities/DescriptionTools.cs
@@ -136,7 +136,10 @@ static class DescriptionTools {
             },
             new EncyclopediaEntry {
                 Entry = "Flat_Footed",
-                Patterns = { "Flat Footed" }
+                Patterns = { 
+                    "Flat Footed",
+                    "Flat-Footed"
+                }
             },
             new EncyclopediaEntry {
                 Entry = "Armor_Class",