v1.1.1 fixes

pheonix99 · May 13, 2022 · 270aef4 · 270aef4
1 parent 5443ef3
commit 270aef4
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 29 deletions.
diff --git a/Readme.md b/Readme.md
@@ -6,6 +6,11 @@ And also some more random stuff I made when I got annoyed at the game.
 
 All homebrew content or divergences from TT will be called out.
 ##Changelog
+1.1.1
+Fixed Mercy: Injured always applying
+Fixed Chains Of Fire doing all hits on primary target.
+
+
 1.1
 Updated for v1.2 beta
 Added Arcanist Holy Water Jet fix

diff --git a/TomeOfTheFirebird/BlueprintCore/changes.md b/TomeOfTheFirebird/BlueprintCore/changes.md
@@ -1,5 +1,17 @@
 # Changelog
 
+#v1.3.6 Release
+
+Updated for compatibility w/ 1.3.
+
+#v1.3.5 Release
+
+Updated for compatibility w/ 1.2.1h.
+
+#v1.3.4 Release
+
+Updated for Patch 1.2 release version. There were some additional changes from the beta branch.
+
 #v1.3.3 Release (Patch 1.2)
 
 Changes here are minimal to maintain support with Patch 1.2. If you are not working on the Beta branch you'll need to

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.1.0",
+  "Version": "1.1.1",
   "ManagerVersion": "0.21.3",
   "Requirements": [],
   "AssemblyName": "TomeOfTheFirebird.dll",

diff --git a/TomeOfTheFirebird/New Content/Mercies/ExtraMercies.cs b/TomeOfTheFirebird/New Content/Mercies/ExtraMercies.cs
@@ -97,14 +97,17 @@ void BuildInjured()
                 injured = maker.Configure();
 
                 var MercyFastHealingBuff = MakerTools.MakeBuff("MercyInjuredBuff", "Mercy: Injured", "Granted Fast Healing 3 by Lay On Hands", icon);
-                MercyFastHealingBuff.AddEffectContextFastHealing(bonus: new ContextValue() { Value = 3 });
-
-
+                MercyFastHealingBuff.AddEffectContextFastHealing(bonus: new ContextValue() { Value = 3 }).SetIsClassFeature(true);
+
+                var conditionsBuilder = ConditionsBuilder.New().CasterHasFact(injured.AssetGuidThreadSafe);
+
                 var buffDone = MercyFastHealingBuff.Configure();
-                var buffAct = ActionsBuilder.New().ApplyBuff(buffDone.AssetGuidThreadSafe, duration: MakerTools.GetContextDurationValue(DurationRate.Minutes, false));
+
+                var buffAct = ActionsBuilder.New().ApplyBuff(buffDone.AssetGuidThreadSafe, duration: MakerTools.GetContextDurationValue(DurationRate.Minutes, false), isFromSpell: false, dispellable: false, permanent:false);
+                var buffActWrapper = ActionsBuilder.New().Conditional(conditionsBuilder, buffAct);
 
 
-                var actDone = buffAct.Build().Actions[0];
+                var actDone = buffActWrapper.Build().Actions[0];
                 var LayOnHandsSelf = Resources.GetBlueprint<BlueprintAbility>("8d6073201e5395d458b8251386d72df1");
                 Conditional LoHMeCond = LayOnHandsSelf.Components.OfType<AbilityEffectRunAction>().First().Actions.Actions.OfType<Conditional>().First();
                 LoHMeCond.IfTrue.Actions = LoHMeCond.IfTrue.Actions.Append(actDone).ToArray();
@@ -131,13 +134,7 @@ void BuildInjured()
                 LoHSCond.IfTrue.Actions = LoHSCond.IfTrue.Actions.Append(actDone).ToArray();
 
 
-                //Make Feature
-
-                //Add To Selectors
-
-                //Add Effect On Heal to all three
-
-                //Add Effect On Kill Mode to LoH - Ohter
+
 
             }
 

diff --git a/TomeOfTheFirebird/New Content/Spells/ChainsOfFire.cs b/TomeOfTheFirebird/New Content/Spells/ChainsOfFire.cs
@@ -41,9 +41,10 @@ public static void BuildSpell()
 
             ChainsMaker.AddSpellDescriptors(SpellDescriptor.Fire);
             //ActionsBuilder chainAct = 
-
-
-            ChainsMaker.AddAbilityEffectRunActionOnClickedUnit(ActionsBuilder.New().DealDamage(new Kingmaker.RuleSystem.Rules.Damage.DamageTypeDescription() { Energy = Kingmaker.Enums.Damage.DamageEnergyType.Fire, Type = Kingmaker.RuleSystem.Rules.Damage.DamageType.Energy }, new ContextDiceValue() { DiceType = Kingmaker.RuleSystem.DiceType.D6, DiceCountValue = new Kingmaker.UnitLogic.Mechanics.ContextValue() { ValueType = ContextValueType.Rank }, BonusValue = new Kingmaker.UnitLogic.Mechanics.ContextValue() { ValueType = ContextValueType.Shared } }, dealHalfIfSaved: true, isAOE: true)).AddContextRankConfig(ContextRankConfigs.CasterLevel(type: Kingmaker.Enums.AbilityRankType.DamageDice, min: 1, max: 20)).AddContextRankConfig(ContextRankConfigs.CasterLevel(min: 1, max: 20, type: Kingmaker.Enums.AbilityRankType.ProjectilesCount, useMax: true));
+
+            ChainsMaker.RunActions(ActionsBuilder.New().DealDamage(new Kingmaker.RuleSystem.Rules.Damage.DamageTypeDescription() { Energy = Kingmaker.Enums.Damage.DamageEnergyType.Fire, Type = Kingmaker.RuleSystem.Rules.Damage.DamageType.Energy }, new ContextDiceValue() { DiceType = Kingmaker.RuleSystem.DiceType.D6, DiceCountValue = new Kingmaker.UnitLogic.Mechanics.ContextValue() { ValueType = ContextValueType.Rank }, BonusValue = new Kingmaker.UnitLogic.Mechanics.ContextValue() { ValueType = ContextValueType.Shared } }, dealHalfIfSaved: true, isAOE: true), Kingmaker.EntitySystem.Stats.SavingThrowType.Reflex);
+
+                ChainsMaker.AddContextRankConfig(ContextRankConfigs.CasterLevel(type: Kingmaker.Enums.AbilityRankType.DamageDice, min: 1, max: 20)).AddContextRankConfig(ContextRankConfigs.CasterLevel(min: 1, max: 20, type: Kingmaker.Enums.AbilityRankType.ProjectilesCount, useMax: true));
 
             ChainsMaker.AddAbilityDeliverChain(radius: new Kingmaker.Utility.Feet(30), projectile: "8cc159ce94d29fe46a94b80ce549161f", projectileFirst: "8cc159ce94d29fe46a94b80ce549161f", targetsCount: new ContextValue() { ValueType = ContextValueType.Rank, ValueRank = Kingmaker.Enums.AbilityRankType.ProjectilesCount });
             ChainsMaker.AddCraftInfoComponent(Kingmaker.Craft.CraftSpellType.Damage, Kingmaker.Craft.CraftSavingThrow.Reflex, Kingmaker.Craft.CraftAOE.AOE);

diff --git a/TomeOfTheFirebird/TomeOfTheFirebird.csproj b/TomeOfTheFirebird/TomeOfTheFirebird.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Aze.Publicise.MSBuild.Task.1.0.0\build\Aze.Publicise.MSBuild.Task.props" Condition="Exists('..\packages\Aze.Publicise.MSBuild.Task.1.0.0\build\Aze.Publicise.MSBuild.Task.props')" />
+  <Import Project="..\packages\Aze.Publicise.MSBuild.Task.1.1.0\build\Aze.Publicise.MSBuild.Task.props" Condition="Exists('..\packages\Aze.Publicise.MSBuild.Task.1.1.0\build\Aze.Publicise.MSBuild.Task.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -51,14 +51,14 @@
     <Publicise InputAssemblies="@(PubliciseInputAssemblies)" OutputPath="$(SolutionDir)lib/" PubliciseCompilerGenerated="true" />
   </Target>
   <ItemGroup>
-    <Reference Include="0Harmony, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Lib.Harmony.2.2.0\lib\net472\0Harmony.dll</HintPath>
+    <Reference Include="0Harmony, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Lib.Harmony.2.2.1\lib\net472\0Harmony.dll</HintPath>
     </Reference>
     <Reference Include="Assembly-CSharp_public">
       <HintPath>..\lib\Assembly-CSharp_public.dll</HintPath>
     </Reference>
-    <Reference Include="BlueprintCore, Version=1.3.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\WW-Blueprint-Core.1.3.3\lib\net472\BlueprintCore.dll</HintPath>
+    <Reference Include="BlueprintCore, Version=1.3.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WW-Blueprint-Core.1.3.6\lib\net472\BlueprintCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
@@ -101,8 +101,8 @@
     <Reference Include="System.Text.Encodings.Web, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Text.Encodings.Web.6.0.0\lib\net461\System.Text.Encodings.Web.dll</HintPath>
     </Reference>
-    <Reference Include="System.Text.Json, Version=6.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.6.0.2\lib\net461\System.Text.Json.dll</HintPath>
+    <Reference Include="System.Text.Json, Version=6.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.6.0.4\lib\net461\System.Text.Json.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
@@ -240,11 +240,12 @@
   <PropertyGroup>
     <PostBuildEvent>(robocopy "$(TargetDir) " "%25WrathPath%25\Mods\TomeOfTheFirebird\ " /s /e )^&amp; IF %25ERRORLEVEL%25 LEQ 1 exit 0</PostBuildEvent>
   </PropertyGroup>
-  <Import Project="..\packages\System.Text.Json.6.0.2\build\System.Text.Json.targets" Condition="Exists('..\packages\System.Text.Json.6.0.2\build\System.Text.Json.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\System.Text.Json.6.0.2\build\System.Text.Json.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Text.Json.6.0.2\build\System.Text.Json.targets'))" />
+    <Error Condition="!Exists('..\packages\Aze.Publicise.MSBuild.Task.1.1.0\build\Aze.Publicise.MSBuild.Task.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Aze.Publicise.MSBuild.Task.1.1.0\build\Aze.Publicise.MSBuild.Task.props'))" />
+    <Error Condition="!Exists('..\packages\System.Text.Json.6.0.4\build\System.Text.Json.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Text.Json.6.0.4\build\System.Text.Json.targets'))" />
   </Target>
+  <Import Project="..\packages\System.Text.Json.6.0.4\build\System.Text.Json.targets" Condition="Exists('..\packages\System.Text.Json.6.0.4\build\System.Text.Json.targets')" />
 </Project>
diff --git a/TomeOfTheFirebird/packages.config b/TomeOfTheFirebird/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Aze.Publicise.MSBuild.Task" version="1.0.0" targetFramework="net472" developmentDependency="true" />
-  <package id="Lib.Harmony" version="2.2.0" targetFramework="net472" />
+  <package id="Aze.Publicise.MSBuild.Task" version="1.1.0" targetFramework="net472" developmentDependency="true" />
+  <package id="Lib.Harmony" version="2.2.1" targetFramework="net472" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net472" />
   <package id="ModKit" version="1.0.8" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
@@ -10,8 +10,8 @@
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
   <package id="System.Text.Encodings.Web" version="6.0.0" targetFramework="net472" />
-  <package id="System.Text.Json" version="6.0.2" targetFramework="net472" />
+  <package id="System.Text.Json" version="6.0.4" targetFramework="net472" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
-  <package id="WW-Blueprint-Core" version="1.3.3" targetFramework="net472" />
+  <package id="WW-Blueprint-Core" version="1.3.6" targetFramework="net472" />
 </packages>