Merge pull request #4822 from SolastaMods/dev

1.5.97.22
SolastaMods · Jul 20, 2024 · ce03679 · ce03679
2 parents dfa8c0b + c59fc22
commit ce03679
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/SolastaUnfinishedBusiness/Api/DatabaseHelper-RELEASE.cs b/SolastaUnfinishedBusiness/Api/DatabaseHelper-RELEASE.cs
@@ -231,9 +231,6 @@ internal static class CharacterSubclassDefinitions
         internal static CharacterSubclassDefinition MartialSpellblade { get; } =
             GetDefinition<CharacterSubclassDefinition>("MartialSpellblade");
 
-        internal static CharacterSubclassDefinition PathBerserker { get; } =
-            GetDefinition<CharacterSubclassDefinition>("PathBerserker");
-
         internal static CharacterSubclassDefinition PathClaw { get; } =
             GetDefinition<CharacterSubclassDefinition>("PathClaw");
 

diff --git a/SolastaUnfinishedBusiness/ChangelogHistory.txt b/SolastaUnfinishedBusiness/ChangelogHistory.txt
@@ -1,3 +1,7 @@
+1.5.97.22:
+
+- fixed invalid condition checks leading to a soft lock on Master Duelist, Quivering Palm, and Taunter
+
 1.5.97.21:
 
 - added new subclass sprites to ones still leveraging duplicates

diff --git a/SolastaUnfinishedBusiness/Info.json b/SolastaUnfinishedBusiness/Info.json
@@ -1,7 +1,7 @@
 {
   "Id": "SolastaUnfinishedBusiness",
   "DisplayName": "<i>[<b>Un</b>]</i> <color=Orange>Finished Business</color>",
-  "Version": "1.5.97.21",
+  "Version": "1.5.97.22",
   "GameVersion": "1.5.97",
   "ManagerVersion": "0.24.0",
   "AssemblyName": "SolastaUnfinishedBusiness.dll",

diff --git a/SolastaUnfinishedBusiness/Models/CustomConditionsContext.cs b/SolastaUnfinishedBusiness/Models/CustomConditionsContext.cs
@@ -487,8 +487,8 @@ Id.AttackReadied or
                 var rulesetTarget = target.RulesetActor;
 
                 if (!rulesetTarget.TryGetConditionOfCategoryAndType(
-                        AttributeDefinitions.TagEffect, Taunted.Name, out var activeCondition) &&
-                    activeCondition.SourceGuid == actingCharacter.Guid)
+                        AttributeDefinitions.TagEffect, Taunted.Name, out var activeCondition) ||
+                    activeCondition.SourceGuid != actingCharacter.Guid)
                 {
                     continue;
                 }

diff --git a/SolastaUnfinishedBusiness/Models/Level20SubclassesContext.cs b/SolastaUnfinishedBusiness/Models/Level20SubclassesContext.cs
@@ -2017,7 +2017,7 @@ public IEnumerator OnPowerOrSpellFinishedByMe(CharacterActionMagicEffect action,
             var rulesetTarget = target.RulesetCharacter;
 
             if (!rulesetTarget.TryGetConditionOfCategoryAndType(
-                    AttributeDefinitions.TagEffect, conditionDefinition.Name, out var activeCondition) &&
+                    AttributeDefinitions.TagEffect, conditionDefinition.Name, out var activeCondition) ||
                 activeCondition.SourceGuid != attacker.Guid)
             {
                 yield break;

diff --git a/SolastaUnfinishedBusiness/SolastaUnfinishedBusiness.csproj b/SolastaUnfinishedBusiness/SolastaUnfinishedBusiness.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <LangVersion>12</LangVersion>
     <TargetFramework>net48</TargetFramework>
-    <AssemblyVersion>1.5.97.21</AssemblyVersion>
+    <AssemblyVersion>1.5.97.22</AssemblyVersion>
     <RepositoryUrl>https://github.com/SolastaMods/SolastaUnfinishedBusiness</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <Configurations>Debug Install;Release Install</Configurations>

diff --git a/SolastaUnfinishedBusiness/Subclasses/RoguishDuelist.cs b/SolastaUnfinishedBusiness/Subclasses/RoguishDuelist.cs
@@ -231,7 +231,7 @@ public IEnumerator OnPhysicalAttackFinishedByMe(
 
             // should only check the condition from the same source
             if (!rulesetDefender.TryGetConditionOfCategoryAndType(
-                    AttributeDefinitions.TagEffect, conditionDaringDuel.Name, out var activeCondition) &&
+                    AttributeDefinitions.TagEffect, conditionDaringDuel.Name, out var activeCondition) ||
                 activeCondition.SourceGuid != attacker.Guid)
             {
                 yield break;