1.4.15: Fix for E Scion Sage Second Bloodline

pheonix99 · May 8, 2023 · c5b29f6 · c5b29f6
1 parent 365c10e
commit c5b29f6
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 5 deletions.
diff --git a/Readme.md b/Readme.md
@@ -13,6 +13,11 @@ NOW REQUIRES TabletopTweaks Core Module and ModMenu
 
 ## Changelog
 
+### 1.4.15
+
+Fixed Second Bloodline progression for Sage Eldritch Scion
+
+
 ### 1.4.14
 
 Added Mass Fly

diff --git a/TomeOfTheFirebird/BuildContent.cs b/TomeOfTheFirebird/BuildContent.cs
@@ -54,6 +54,7 @@ static void Postfix()
 
 
                     LocalizationTool.LoadLocalizationPack("Mods\\TomeOfTheFirebird\\Localization\\Settings.json");
+                    LocalizationTool.LoadLocalizationPack("Mods\\TomeOfTheFirebird\\Localization\\ClassesAndArchetypes.json");
                     //LocalizationTool.LoadLocalizationPack("Mods\\TomeOfTheFirebird\\Localization\\LocalizationPack.json");
                     LocalizationTool.LoadLocalizationPack("Mods\\TomeOfTheFirebird\\Localization\\Spells.json");
                     LocalizationTool.LoadLocalizationPack("Mods\\TomeOfTheFirebird\\Localization\\Bloodlines.json");

diff --git a/TomeOfTheFirebird/Info.json b/TomeOfTheFirebird/Info.json
@@ -2,7 +2,7 @@
   "Id": "TomeOfTheFirebird",
   "DisplayName": "Tome Of The Firebird",
   "Author": "pheonix99",
-  "Version": "1.4.14",
+  "Version": "1.4.15",
   "ManagerVersion": "0.21.3",
   "AssemblyName": "TomeOfTheFirebird.dll",
   "EntryMethod": "TomeOfTheFirebird.Main.Load",

diff --git a/TomeOfTheFirebird/Localization/ClassesAndArchetypes.json b/TomeOfTheFirebird/Localization/ClassesAndArchetypes.json
@@ -0,0 +1,12 @@
+[
+  {
+    "Key": "EldritchScionSageArchetype.Name",
+    "ProcessTemplates": false,
+    "enGB": "Eldritch Scion (Sage)"
+  },
+  {
+    "Key": "EldritchScionSageArchetype.Description",
+    "ProcessTemplates": true,
+    "enGB": "Unlike typical magi, sage eldritch scions do not only study tomes of magic or spend time learning to combine martial and magical {g|Encyclopedia:Skills}skills{/g}. Rather, their magic comes from the knowledge and traditions that your bloodline accumulated through the generations, not just from force of personality. You use your {g|Encyclopedia:Intelligence}Intelligence{/g} to determine the effectiveness of your spells and magus class features like a normal magus, and to determine the effects of bloodline powers like a sage sorcerer."
+  }
+]
diff --git a/TomeOfTheFirebird/Localization/Settings.json b/TomeOfTheFirebird/Localization/Settings.json
@@ -133,6 +133,16 @@
     "Key": "TotF.Settings.AddDeitySpecificSpells.Desc",
     "ProcessTemplates": false,
     "enGB": "Enables the unique spell rules for various deities. Currently only works with base game dieties and spells for cleric/warpriest/paladin/ranger."
+  },
+  {
+    "Key": "TotF.Settings.EldritchScionSage.Name",
+    "ProcessTemplates": false,
+    "enGB": "Eldritch Scion (Sage)"
+  },
+  {
+    "Key": "TotF.Settings.EldritchScionSage.Desc",
+    "ProcessTemplates": false,
+    "enGB": "Adds Eldritch Scion version of Sage Sorc."
   }
 
 ]
diff --git a/TomeOfTheFirebird/New Content/Archetypes/EldritchScionSage.cs b/TomeOfTheFirebird/New Content/Archetypes/EldritchScionSage.cs
@@ -44,8 +44,8 @@ public static void Make()
             var sysname = "EldritchScionSageArchetype";
             var bp = Main.TotFContext.Blueprints.GetGUID(sysname);
             var EScionSage = ArchetypeConfigurator.New(sysname, bp.ToString());
-            EScionSage.SetLocalizedName(LocalizationTool.CreateString(sysname + ".Name", "Eldritch Scion (Sage)"));
-            EScionSage.SetLocalizedDescription(LocalizationTool.CreateString(sysname + ".Desc", "Unlike typical magi, sage eldritch scions do not only study tomes of magic or spend time learning to combine martial and magical {g|Encyclopedia:Skills}skills{/g}. Rather, their magic comes from the knowledge and traditions that your bloodline accumulated through the generations, not just from force of personality. You use your {g|Encyclopedia:Intelligence}Intelligence{/g} to determine the effectiveness of your spells and magus class features like a normal magus, and to determine the effects of bloodline powers like a sage sorcerer."));
+            EScionSage.SetLocalizedName(sysname + ".Name");
+            EScionSage.SetLocalizedDescription(sysname + ".Desc");
             EScionSage.SetReplaceSpellbook(spellbook);
             EScionSage.SetBuildChanging(true);
             EScionSage.SetParentClass(magus);
@@ -125,7 +125,7 @@ public static void Link()
                             }
                         }
 
-                    }).Configure();
+                    }).AddToArchetypes("EldritchScionSageArchetype").Configure();
                 }
             }
         }

diff --git a/TomeOfTheFirebird/Settings.cs b/TomeOfTheFirebird/Settings.cs
@@ -81,7 +81,7 @@ public static void Make()
 
 
             builder.AddSubHeader(GetString("Archetypes.Title"), startExpanded: true);
-            builder.AddToggle(MakeToggle("eldritchscionsage", "Eldritch Scion (Sage)", true, "Adds Eldritch Scion version of Sage Sorc"));
+            builder.AddToggle(MakeLocalizedToggle("EldritchScionSage",  true));
 
             builder.AddSubHeader(GetString("ClassFeatures.Title"), startExpanded: true);
             //builder.AddToggle(MakeToggle("BloodHavoc", "Bloodline Mutation: Blood Havoc", true, "Sorcerer / Bloodrager / Eldritch Scion alternate feature - increase attack spell damage by 1 per dice if spell is bloodline spell or caster has applicable spell focus"));

diff --git a/TomeOfTheFirebird/TomeOfTheFirebird.csproj b/TomeOfTheFirebird/TomeOfTheFirebird.csproj
@@ -384,6 +384,10 @@
     <EmbeddedResource Include="Localization\Kineticist.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
+
+    <EmbeddedResource Include="Localization\ClassesAndArchetypes.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -425,6 +429,7 @@
       <Localization Include="$(OutputPath)\Localization\Bloodlines.json" />
       <Localization Include="$(OutputPath)\Localization\Feats.json" />
       <Localization Include="$(OutputPath)\Localization\Kineticist.json" />
+      <Localization Include="$(OutputPath)\Localization\ClassesAndArchetypes.json" />
       <Localization Include="$(OutputPath)\Localization\Spells.json" />
       <SpellAssets Include="$(OutputPath)\Assets\Spells\BoneFists.png" />
       <SpellAssets Include="$(OutputPath)\Assets\Spells\FreezingSphere.png" />
@@ -456,6 +461,7 @@
       <Localization Include="$(OutputPath)\Localization\Bloodlines.json" />
       <Localization Include="$(OutputPath)\Localization\Feats.json" />
       <Localization Include="$(OutputPath)\Localization\Kineticist.json" />
+      <Localization Include="$(OutputPath)\Localization\ClassesAndArchetypes.json" />
       <Localization Include="$(OutputPath)\Localization\Spells.json" />
       <Localization Include="$(OutputPath)\Localization\Settings.json" />
     </ItemGroup>