prepare for 1.5.97.40 release

SolastaMods · Dec 1, 2024 · 4211eec · 4211eec
1 parent 4906fa4
commit 4211eec
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 20 deletions.
diff --git a/SolastaUnfinishedBusiness/ChangelogHistory.txt b/SolastaUnfinishedBusiness/ChangelogHistory.txt
@@ -1,4 +1,6 @@
-1.5.97.40:
+1.5.97.40 - 3 Years CE/UB anniversary has a lot to say:
+
+ATTENTION: Check "The Forsaken Isle" and "Morrows Deep" from Artyoan, updated with NPCs text-to-speech data
 
 - added 'Enable Fighter Studied Attacks at 13' setting [ADV if previous attack in turn against same target missed]
 - added 'Enable Fighter Tactical Mind, and Tactical Shift at 2 and 5' setting [augment second wind scenarios]
@@ -19,7 +21,7 @@
 - fixed 'Enable Second Wind to use 5e 2024 usages progression' forcing max usage to zero when off
 - fixed Defensive Duelist triggering on any attack roll instead of melee attacks only
 - fixed Grapple interaction with teleporting enemies
-- fixed Martial Arcane Archer Beguiling Arrow charmed condition application time 
+- fixed Martial Arcane Archer Beguiling Arrow charmed condition application time, and improved all arrows impact SFX
 - fixed Patron Hexblade interaction with 5e 2024 pact of blades invocation [by BradS]
 - fixed Staff of Fire not granting fire damage resistance to wielder [VANILLA]
 - fixed True Strike 2024 version not allowing ranged or thrown, and enforcing concentration

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.39",
+  "Version": "1.5.97.40",
   "GameVersion": "1.5.97",
   "ManagerVersion": "0.24.0",
   "AssemblyName": "SolastaUnfinishedBusiness.dll",

diff --git a/SolastaUnfinishedBusiness/Models/SpeechContext.cs b/SolastaUnfinishedBusiness/Models/SpeechContext.cs
@@ -350,10 +350,9 @@ private static void InitPiper()
                 ZipFile.ExtractToDirectory(fullZipFile, Main.ModFolder);
                 File.Delete(fullZipFile);
 
-                if (!TryGetExecutablePath(out var executablePath))
+                if (!TryGetExecutablePath(out _))
                 {
-                    message =
-                        $"Piper successfully downloaded but failed to find executable at {executablePath}.";
+                    message = "Piper successfully downloaded but failed to extract executable.";
                 }
             }
         }
@@ -367,8 +366,8 @@ private static void InitPiper()
 
     internal static void RefreshAvailableVoices()
     {
-        var directoryInfo = new DirectoryInfo(VoicesFolder);
-        var voices = directoryInfo.GetFiles("*.onnx").Select(x => x.Name.Replace(".onnx", string.Empty));
+        var voices = new DirectoryInfo(VoicesFolder)
+            .GetFiles("*.onnx").Select(x => x.Name.Replace(".onnx", string.Empty));
 
         VoiceNames = new List<string> { DefaultVoice }.Union(voices).ToArray();
     }
@@ -568,7 +567,6 @@ internal static async void Speak(string inputText, int heroId, bool forceUseCamp
 
             if (!TryGetExecutablePath(out var executablePath))
             {
-                Main.Info($"Speech system cannot find executable path: {executablePath}");
                 return;
             }
 

diff --git a/SolastaUnfinishedBusiness/Models/Tabletop2024Context.cs b/SolastaUnfinishedBusiness/Models/Tabletop2024Context.cs
@@ -1346,17 +1346,21 @@ internal static bool IsRestActivityMemorizeSpellAvailable(
                (Main.Settings.EnableWizardMemorizeSpell && hero.GetClassLevel(Wizard) >= 5);
     }
 
-    internal static bool IsMemorizeSpellPreparation(RulesetCharacter rulesetCharacter)
+    private static bool TryGetMemorizeSpellCondition(RulesetCharacter character, out RulesetCondition condition)
     {
-        return rulesetCharacter.HasConditionOfCategoryAndType(
-            AttributeDefinitions.TagEffect, ConditionMemorizeSpell.Name);
+        return character.TryGetConditionOfCategoryAndType(
+            AttributeDefinitions.TagEffect, ConditionMemorizeSpell.Name, out condition);
+    }
+
+    internal static bool IsMemorizeSpellPreparation(RulesetCharacter character)
+    {
+        return TryGetMemorizeSpellCondition(character, out _);
     }
 
     internal static bool IsInvalidMemorizeSelectedSpell(
         SpellRepertoirePanel spellRepertoirePanel, RulesetCharacter rulesetCharacter, SpellDefinition spell)
     {
-        if (!rulesetCharacter.TryGetConditionOfCategoryAndType(
-                AttributeDefinitions.TagEffect, ConditionMemorizeSpell.Name, out var activeCondition))
+        if (!TryGetMemorizeSpellCondition(rulesetCharacter, out var activeCondition))
         {
             return false;
         }

diff --git a/SolastaUnfinishedBusiness/Resources/UI/ContentPack.png b/SolastaUnfinishedBusiness/Resources/UI/ContentPack.png
diff --git a/SolastaUnfinishedBusiness/Settings/zappastuff.xml b/SolastaUnfinishedBusiness/Settings/zappastuff.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Settings>
-    <DisplayModMessage>1</DisplayModMessage>
+    <DisplayModMessage>2</DisplayModMessage>
     <EnableDiagsDump>0</EnableDiagsDump>
     <SelectedTab>0</SelectedTab>
     <DisplayMultiplayerToggle>false</DisplayMultiplayerToggle>
@@ -730,6 +730,7 @@
     <EnableWarlockMagicalCunningAtLevel2AndImprovedEldritchMasterAt20>true
     </EnableWarlockMagicalCunningAtLevel2AndImprovedEldritchMasterAt20>
     <EnableWarlockToLearnPatronAtLevel3>true</EnableWarlockToLearnPatronAtLevel3>
+    <EnableWizardMemorizeSpell>true</EnableWizardMemorizeSpell>
     <EnableWizardToLearnScholarAtLevel2>true</EnableWizardToLearnScholarAtLevel2>
     <EnableWizardToLearnSchoolAtLevel3>true</EnableWizardToLearnSchoolAtLevel3>
     <EnableSignatureSpellsRelearn>false</EnableSignatureSpellsRelearn>
@@ -1866,8 +1867,4 @@
     <EnableEnemiesControlledByPlayer>false</EnableEnemiesControlledByPlayer>
     <EnableHeroesControlledByComputer>true</EnableHeroesControlledByComputer>
     <DebugDisableVerifyDefinitionNameIsNotInUse>true</DebugDisableVerifyDefinitionNameIsNotInUse>
-    <WildSurgeEffectDie>0</WildSurgeEffectDie>
-    <DebugLogDefinitionCreation>false</DebugLogDefinitionCreation>
-    <DebugLogFieldInitialization>false</DebugLogFieldInitialization>
-    <DebugLogVariantMisuse>false</DebugLogVariantMisuse>
 </Settings>
diff --git a/SolastaUnfinishedBusiness/SolastaUnfinishedBusiness.csproj b/SolastaUnfinishedBusiness/SolastaUnfinishedBusiness.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <LangVersion>12</LangVersion>
     <TargetFramework>net481</TargetFramework>
-    <AssemblyVersion>1.5.97.39</AssemblyVersion>
+    <AssemblyVersion>1.5.97.40</AssemblyVersion>
     <RepositoryUrl>https://github.com/SolastaMods/SolastaUnfinishedBusiness</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <Configurations>Debug Install;Release Install</Configurations>