1.4.17

pheonix99 · Sep 3, 2023 · fbbc9ce · fbbc9ce
1 parent 6594a2f
commit fbbc9ce
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 138 deletions.
diff --git a/Readme.md b/Readme.md
@@ -13,6 +13,13 @@ NOW REQUIRES TabletopTweaks Core Module and ModMenu
 
 ## Changelog
 
+### 1.4.17
+
+Fixed duplication of new mercies in menu
+
+Interoperabilty fix for Kinetic Lancer - no longer gets double metakinesis
+
+
 ### 1.4.16
 
 Fix Mass Fly being disabled making things explode

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.16",
+  "Version": "1.4.17",
   "ManagerVersion": "0.21.3",
   "AssemblyName": "TomeOfTheFirebird.dll",
   "EntryMethod": "TomeOfTheFirebird.Main.Load",

diff --git a/TomeOfTheFirebird/New Content/Archetypes/CinderAdept.cs b/TomeOfTheFirebird/New Content/Archetypes/CinderAdept.cs
diff --git a/TomeOfTheFirebird/New Content/Archetypes/KineticLancer.cs b/TomeOfTheFirebird/New Content/Archetypes/KineticLancer.cs
diff --git a/TomeOfTheFirebird/New Content/Features/KineticistDoubleMetakinesis.cs b/TomeOfTheFirebird/New Content/Features/KineticistDoubleMetakinesis.cs
@@ -20,6 +20,7 @@
 using TabletopTweaks.Core.Utilities;
 using TomeOfTheFirebird.Helpers;
 using TomeOfTheFirebird.New_Components;
+using UniRx;
 using static TabletopTweaks.Core.MechanicsChanges.MetamagicExtention;
 
 namespace TomeOfTheFirebird.New_Content.Features
@@ -89,6 +90,19 @@ public static void Build()
 
         }
 
+        public static void DoLast()
+        {
+            if (Settings.IsEnabled("TwinSpell"))
+            {
+                var lancer = BlueprintTool.Get<BlueprintArchetype>("022742CCA0CD414C98EED87F24AE5607");
+
+                if (lancer != null)
+                {
+                    ArchetypeConfigurator.For(lancer).AddToRemoveFeatures(17, "MetakinesisDoubleFeature");
+                }
+            }
+        }
+
         private static void SharedToggleStuff(ActivatableAbilityConfigurator toggle)
         {
             toggle.SetActivationType(Kingmaker.UnitLogic.ActivatableAbilities.AbilityActivationType.Immediately);

diff --git a/TomeOfTheFirebird/New Content/Mercies/ExtraMercies.cs b/TomeOfTheFirebird/New Content/Mercies/ExtraMercies.cs
@@ -1,7 +1,9 @@
 using BlueprintCore.Actions.Builder;
 using BlueprintCore.Actions.Builder.ContextEx;
 using BlueprintCore.Blueprints.Configurators.Classes.Selection;
+using BlueprintCore.Blueprints.CustomConfigurators.Classes;
 using BlueprintCore.Blueprints.CustomConfigurators.Classes.Selection;
+using BlueprintCore.Blueprints.CustomConfigurators.UnitLogic.Buffs;
 using BlueprintCore.Conditions.Builder;
 using BlueprintCore.Conditions.Builder.ContextEx;
 using Kingmaker.Blueprints.Classes;
@@ -37,7 +39,7 @@ void BuildEnsorcelled()
 
                 BlueprintAbility dispel = BlueprintTools.GetBlueprint<BlueprintAbility>("b9be852b03568064b8d2275a6cf9e2de");
                 BlueprintCore.Blueprints.CustomConfigurators.Classes.FeatureConfigurator maker = MakerTools.MakeFeature("MercyEnsorcelled", "Mercy - Ensorcelled", "The paladin’s lay on hands also acts as dispel magic, using the paladin’s level as her caster level.", false, dispel.Icon);
-                maker.AddToGroups(FeatureGroup.Mercy);
+                //maker.AddToGroups(FeatureGroup.Mercy);
                 maker.AddPrerequisiteClassLevel("bfa11238e7ae3544bbeb4d0b92e897ec", 12);
                 maker.SetRanks(1);
 
@@ -84,16 +86,16 @@ void BuildInjured()
 
 
                 Sprite icon = BlueprintTools.GetBlueprint<BlueprintBuff>("9017213d83ccddb4ab720e0a0efe36ff").Icon;
-                BlueprintCore.Blueprints.CustomConfigurators.Classes.FeatureConfigurator maker = MakerTools.MakeFeature("MercyInjured", "Mercy - Injured", "The target gains fast healing 3 for a number of rounds equal to 1/2 the paladin’s level.", false, icon);
-                maker.AddToGroups(FeatureGroup.Mercy);
+                FeatureConfigurator maker = MakerTools.MakeFeature("MercyInjured", "Mercy - Injured", "The target gains fast healing 3 for a number of rounds equal to 1/2 the paladin’s level.", false, icon);
+                //maker.AddToGroups(FeatureGroup.Mercy);
                 maker.AddPrerequisiteClassLevel("bfa11238e7ae3544bbeb4d0b92e897ec", 9);
                 maker.SetRanks(1);
 
 
 
                 injured = maker.Configure();
 
-                BlueprintCore.Blueprints.CustomConfigurators.UnitLogic.Buffs.BuffConfigurator MercyFastHealingBuff = MakerTools.MakeBuff("MercyInjuredBuff", "Mercy: Injured", "Granted Fast Healing 3 by Lay On Hands", icon);
+                BuffConfigurator MercyFastHealingBuff = MakerTools.MakeBuff("MercyInjuredBuff", "Mercy: Injured", "Granted Fast Healing 3 by Lay On Hands", icon);
                 MercyFastHealingBuff.AddEffectContextFastHealing(bonus: new ContextValue() { Value = 3 }).SetIsClassFeature(true);
                 MercyFastHealingBuff.SetRanks(1);
                 ConditionsBuilder conditionsBuilder = ConditionsBuilder.New().CasterHasFact(injured.AssetGuidThreadSafe);
@@ -142,31 +144,15 @@ public static void AddToThings()
             //string TTTExtraMercies = "6e76496c2748405d9946949977bd3e8d";
             if (Settings.IsEnabled("mercyinjured"))
             {
-                FeatureSelectionConfigurator.For("02b187038a8dce545bb34bbfb346428d").AddToAllFeatures(injured.AssetGuidThreadSafe).Configure();
-                try
-                {
-                    //FeatureSelectionConfigurator.For(TTTExtraMercies).AddToAllFeatures(injured.AssetGuidThreadSafe).Configure();
-
-
-                }
-                catch (Exception e)
-                {
-                    Main.TotFContext.Logger.Log("Outright error throwin trying to add to TTT selector");
-                }
+                FeatureConfigurator.For(injured).AddToGroups(FeatureGroup.Mercy).Configure();
+                //FeatureSelectionConfigurator.For("02b187038a8dce545bb34bbfb346428d").AddToAllFeatures(injured.AssetGuidThreadSafe).Configure();
+
             }
             if (Settings.IsEnabled("mercyensorcelled"))
             {
-                FeatureSelectionConfigurator.For("02b187038a8dce545bb34bbfb346428d").AddToAllFeatures(ensorcelled.AssetGuidThreadSafe).Configure();
-                try
-                {
-                    //FeatureSelectionConfigurator.For(TTTExtraMercies).AddToAllFeatures(ensorcelled.AssetGuidThreadSafe).Configure();
-
-
-                }
-                catch (Exception e)
-                {
-                    Main.TotFContext.Logger.Log("Outright error throwin trying to add to TTT selector");
-                }
+                FeatureConfigurator.For(ensorcelled).AddToGroups(FeatureGroup.Mercy).Configure();
+                //FeatureSelectionConfigurator.For("02b187038a8dce545bb34bbfb346428d").AddToAllFeatures(ensorcelled.AssetGuidThreadSafe).Configure();
+
             }
         }
     }

diff --git a/TomeOfTheFirebird/New Content/WildTalents/AirsLeap.cs b/TomeOfTheFirebird/New Content/WildTalents/AirsLeap.cs
diff --git a/TomeOfTheFirebird/TomeOfTheFirebird.csproj b/TomeOfTheFirebird/TomeOfTheFirebird.csproj
@@ -236,11 +236,9 @@
     <Compile Include="New Components\UnitPartDoTwinSpell.cs" />
     <Compile Include="New Content\Archetypes\BanishingWarden.cs" />
     <Compile Include="New Content\Archetypes\Beastmorph.cs" />
-    <Compile Include="New Content\Archetypes\CinderAdept.cs" />
     <Compile Include="New Content\Archetypes\DivineConduit.cs" />
     <Compile Include="New Content\Archetypes\DragonbloodChymist.cs" />
     <Compile Include="New Content\Archetypes\EldritchScionSage.cs" />
-    <Compile Include="New Content\Archetypes\KineticLancer.cs" />
     <Compile Include="New Content\Archetypes\SeasonalWitch.cs" />
     <Compile Include="New Content\Bloodlines\PheonixBloodline.cs" />
     <Compile Include="New Content\Bloodlines\DragonBloodlines.cs" />
@@ -334,7 +332,6 @@
     <Compile Include="New Content\Spells\TODO\WardingWeapon.cs" />
     <Compile Include="New Content\Spells\TODO\WingThorns.cs" />
     <Compile Include="New Content\Spells\TODO\WreathOfBlades.cs" />
-    <Compile Include="New Content\WildTalents\AirsLeap.cs" />
     <Compile Include="New Content\WildTalents\AirsReach.cs" />
     <Compile Include="New Content\WildTalents\AngelicProtection.cs" />
     <Compile Include="New Content\WildTalents\BasicKinesis.cs" />