Merge pull request #4226 from SolastaMods/dev

1.5.94.36
SolastaMods · Dec 8, 2023 · 792bb9f · 792bb9f
2 parents 348b67b + 29f8653
commit 792bb9f
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 7 deletions.
diff --git a/SolastaUnfinishedBusiness/ChangelogHistory.txt b/SolastaUnfinishedBusiness/ChangelogHistory.txt
@@ -1,4 +1,8 @@
-1.5.94.35:
+1.5.94.36:
+
+- fixed a null exception on gadgets saving throws
+
+1.5.94.35:
 
 - SPECIAL THANKS to SpaceHamster, ImpPhil, ChrisJohnDigital, TPABOBAP, and HiddenHax as without them UB wouldn't exist
 

diff --git a/SolastaUnfinishedBusiness/Info.json b/SolastaUnfinishedBusiness/Info.json
@@ -1,7 +1,7 @@
 {
   "Id": "SolastaUnfinishedBusiness",
   "DisplayName": "Unfinished Business [UB1]",
-  "Version": "1.5.94.35",
+  "Version": "1.5.94.36",
   "GameVersion": "1.5.94",
   "ManagerVersion": "0.24.0",
   "AssemblyName": "SolastaUnfinishedBusiness.dll",

diff --git a/SolastaUnfinishedBusiness/Patches/RulesetImplementationManagerPatcher.cs b/SolastaUnfinishedBusiness/Patches/RulesetImplementationManagerPatcher.cs
@@ -751,14 +751,14 @@ internal static void OnRollSavingThrowOath(
             string selfConditionName,
             ConditionDefinition conditionDefinitionEnemy)
         {
-            if (sourceDefinition is not SpellDefinition { castingTime: ActivationTime.Action } &&
-                sourceDefinition is not FeatureDefinitionPower { RechargeRate: RechargeRate.ChannelDivinity } &&
-                !caster.AllConditions.Any(x => x.Name.Contains("Smite")))
+            if (caster == null || !caster.HasAnyConditionOfType(selfConditionName) || caster.Side == target.Side)
             {
                 return;
             }
 
-            if (caster == null || !caster.HasAnyConditionOfType(selfConditionName) || caster.Side == target.Side)
+            if (sourceDefinition is not SpellDefinition { castingTime: ActivationTime.Action } &&
+                sourceDefinition is not FeatureDefinitionPower { RechargeRate: RechargeRate.ChannelDivinity } &&
+                !caster.AllConditions.Any(x => x.Name.Contains("Smite")))
             {
                 return;
             }

diff --git a/SolastaUnfinishedBusiness/Portraits/DrowFemale1.png b/SolastaUnfinishedBusiness/Portraits/DrowFemale1.png
diff --git a/SolastaUnfinishedBusiness/Portraits/DrowMale1.png b/SolastaUnfinishedBusiness/Portraits/DrowMale1.png
diff --git a/SolastaUnfinishedBusiness/Portraits/DwarfFighter4.png b/SolastaUnfinishedBusiness/Portraits/DwarfFighter4.png
diff --git a/SolastaUnfinishedBusiness/Portraits/ElvenFemale1.png b/SolastaUnfinishedBusiness/Portraits/ElvenFemale1.png
diff --git a/SolastaUnfinishedBusiness/Portraits/ElvenFemale2.png b/SolastaUnfinishedBusiness/Portraits/ElvenFemale2.png
diff --git a/SolastaUnfinishedBusiness/Portraits/FemaleOrc1.png b/SolastaUnfinishedBusiness/Portraits/FemaleOrc1.png
diff --git a/SolastaUnfinishedBusiness/Portraits/HumanMale8.png b/SolastaUnfinishedBusiness/Portraits/HumanMale8.png
diff --git a/SolastaUnfinishedBusiness/Portraits/TieflingFemale3.png b/SolastaUnfinishedBusiness/Portraits/TieflingFemale3.png
diff --git a/SolastaUnfinishedBusiness/SolastaUnfinishedBusiness.csproj b/SolastaUnfinishedBusiness/SolastaUnfinishedBusiness.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <LangVersion>10</LangVersion>
     <TargetFramework>net472</TargetFramework>
-    <AssemblyVersion>1.5.94.35</AssemblyVersion>
+    <AssemblyVersion>1.5.94.36</AssemblyVersion>
     <RepositoryUrl>https://github.com/SolastaMods/SolastaUnfinishedBusiness</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <Configurations>Debug Install;Release Install</Configurations>