Merge pull request #1286 from SolastaMods/Dev

1.3.55.2
SolastaMods · May 18, 2022 · ad3e1c2 · ad3e1c2
2 parents d5f4c65 + 7f4a864
commit ad3e1c2
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 12 deletions.
diff --git a/SolastaCommunityExpansion/Info.json b/SolastaCommunityExpansion/Info.json
@@ -2,7 +2,7 @@
   "Id": "SolastaCommunityExpansion",
   "DisplayName": "Community Expansion",
   "Author": "SolastaMods",
-  "Version": "1.3.55.1",
+  "Version": "1.3.55.2",
   "GameVersion": "1.3.55",
   "ManagerVersion": "0.23.4",
   "AssemblyName": "SolastaCommunityExpansion.dll",

diff --git a/...pansion/Patches/CustomFeatures/RitualAndAutoPreparedSpells/RulesetCharacterHeroPatcher.cs b/...pansion/Patches/CustomFeatures/RitualAndAutoPreparedSpells/RulesetCharacterHeroPatcher.cs
@@ -21,6 +21,7 @@ internal static void Postfix(RulesetCharacterHero __instance, RuleDefinitions.Ri
             }
 
             var spellRepertoire = __instance.SpellRepertoires
+                .Where(r => r.SpellCastingFeature.SpellCastingOrigin != FeatureDefinitionCastSpell.CastingOrigin.Race)
                 .Where(r => r.SpellCastingFeature.SpellReadyness == RuleDefinitions.SpellReadyness.AllKnown)
                 .FirstOrDefault(r => r.SpellCastingFeature.SpellKnowledge == RuleDefinitions.SpellKnowledge.Selection);
 

diff --git a/...CommunityExpansion/Patches/GameUi/CharacterInspection/CharacterInspectionScreenPatcher.cs b/...CommunityExpansion/Patches/GameUi/CharacterInspection/CharacterInspectionScreenPatcher.cs
@@ -25,7 +25,7 @@ internal static void Prefix()
     [SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Patch")]
     internal static class CharacterInspectionScreen_Bind
     {
-        internal static void Postfix(
+        internal static void Prefix(
             RulesetCharacterHero heroCharacter,
             CharacterPlateDetailed ___characterPlate,
             ToggleGroup ___toggleGroup)
@@ -43,7 +43,18 @@ internal static void Postfix(
     [SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Patch")]
     internal static class CharacterInspectionScreen_Unbind
     {
-        internal static void Postfix()
+        internal static void Prefix()
+        {
+            Global.InspectedHero = null;
+        }
+    }
+
+    // reset the inspection context for MC heroes
+    [HarmonyPatch(typeof(CharacterInspectionScreen), "DoClose")]
+    [SuppressMessage("Minor Code Smell", "S101:Types should be named in PascalCase", Justification = "Patch")]
+    internal static class CharacterInspectionScreen_DoClose
+    {
+        internal static void Prefix()
         {
             Global.InspectedHero = null;
         }

diff --git a/SolastaCommunityExpansion/Patches/Multiclass/LevelUp/ArchetypesPreviewModalPatcher.cs b/SolastaCommunityExpansion/Patches/Multiclass/LevelUp/ArchetypesPreviewModalPatcher.cs
@@ -17,7 +17,8 @@ public static int Level(FeatureUnlockByLevel featureUnlockByLevel)
             var isLevelingUp = LevelUpContext.IsLevelingUp(hero);
             var selectedClass = LevelUpContext.GetSelectedClass(hero);
 
-            if (isLevelingUp && hero.ClassesAndLevels.TryGetValue(selectedClass, out var levels)
+            if (isLevelingUp 
+                && hero.ClassesAndLevels.TryGetValue(selectedClass, out var levels)
                 && featureUnlockByLevel.Level <= levels + 1)
             {
                 return int.MaxValue;

diff --git a/...CommunityExpansion/Patches/Multiclass/LevelUp/CharacterStageClassSelectionPanelPatcher.cs b/...CommunityExpansion/Patches/Multiclass/LevelUp/CharacterStageClassSelectionPanelPatcher.cs
@@ -74,14 +74,20 @@ public static int Level(FeatureUnlockByLevel featureUnlockByLevel, RulesetCharac
             var isLevelingUp = LevelUpContext.IsLevelingUp(hero);
             var selectedClass = LevelUpContext.GetSelectedClass(hero);
 
-            if (isLevelingUp
-                && hero.ClassesAndLevels.TryGetValue(selectedClass, out var levels)
-                && featureUnlockByLevel.Level != (levels + 1))
+            if (isLevelingUp)
             {
-                return int.MaxValue;
+                if (hero.ClassesAndLevels.TryGetValue(selectedClass, out var levels)
+                    && featureUnlockByLevel.Level != (levels + 1))
+                {
+                    return int.MaxValue;
+                }
+                else
+                {
+                    return featureUnlockByLevel.Level - 1;
+                }
             }
 
-            return featureUnlockByLevel.Level - 1;
+            return featureUnlockByLevel.Level;
         }
 
         internal static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)

diff --git a/SolastaCommunityExpansion/Patches/Multiclass/LevelUp/HigherLevelFeaturesModalPatcher.cs b/SolastaCommunityExpansion/Patches/Multiclass/LevelUp/HigherLevelFeaturesModalPatcher.cs
@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using HarmonyLib;
+using SolastaCommunityExpansion.Models;
 
 namespace SolastaCommunityExpansion.Patches.Multiclass.LevelUp
 {
@@ -10,10 +11,12 @@ internal static class HigherLevelFeaturesModal_Bind
     {
         internal static void Prefix(ref int achievementLevel)
         {
-            var hero = Models.Global.ActiveLevelUpHero;
-            var selectedClass = Models.LevelUpContext.GetSelectedClass(hero);
+            var hero = Global.ActiveLevelUpHero;
+            var isLevelingUp = LevelUpContext.IsLevelingUp(hero);
+            var selectedClass = LevelUpContext.GetSelectedClass(hero);
 
-            if (hero.ClassesAndLevels.TryGetValue(selectedClass, out var levels))
+            if (isLevelingUp
+                && hero.ClassesAndLevels.TryGetValue(selectedClass, out var levels))
             {
                 achievementLevel = levels + 1;
             }