Merge pull request #313 from HumabHatterZed/main

2.20.1

Author: IngoHHacks

CHANGELOG.md

@@ -1,6 +1,22 @@
 <details>
 <summary>View Changelog</summary>
 
+# 2.21.0
+- Fixed ability stacks not rendering
+- Fixed rendering error when displaying a card with tribes outside of Act 1
+- Fixed ResetShields not re-setting lostShield to false under certain conditions
+- Fixed RemoveMaxEnergy not working as intended
+- Fixed custom AudioClips not loading correctly on Mac OSX
+- Added RuleBookManager for adding custom rulebook sections (see wiki for more info)
+- Added AllModificationInfos, AllModificationTypes, and modification syncing to SlotModificationManager
+- Added additional functionality to SlotModificationManager - Infos now store name and GUID
+- Added rulebook entry support for slot modifications - use extension method .SetRulebook() when adding your slot modification
+- Added more shield-related extensions
+- Added some AbilityInfo-related extensions
+- Added ShieldManager.AllShieldAbilities and ShieldManager.AllShieldInfos for easier tracking of custom shield abilities
+- Added config to the community patches to add a forced red emission to Undead Cat
+- Modified Obsolete warning for Helpers.CustomLine to point to Dialogue.CustomLine
+
 # 2.20.0
 - Updated wiki sections for Adding Map Nodes, and Conditional Map Nodes; moved Special Sequencers section to Opponents
 - Fixed issues related to challlenge icon sorting when a boss icon is present

InscryptionAPI/Boons/BoonManager.cs

@@ -291,19 +291,18 @@ private static void LoadBoons(DeckInfo __instance)
     }
 
     [HarmonyPatch(typeof(RuleBookInfo), nameof(RuleBookInfo.ConstructPageData))]
-    [HarmonyPostfix]
+    [HarmonyPostfix, HarmonyPriority(100)]
     private static void ConstructPageData(ref List<RuleBookPageInfo> __result, RuleBookInfo __instance, AbilityMetaCategory metaCategory)
     {
         if (NewBoons.Count > 0 && metaCategory == AbilityMetaCategory.Part1Rulebook)
         {
             foreach (PageRangeInfo pageRangeInfo in __instance.pageRanges)
             {
-                // regular abilities
                 if (pageRangeInfo.type == PageRangeType.Boons)
                 {
                     int insertPosition = __result.FindLastIndex(rbi => rbi.pagePrefab == pageRangeInfo.rangePrefab) + 1;
                     int curPageNum = (int)Ability.NUM_ABILITIES;
-                    List<FullBoon> abilitiesToAdd = NewBoons.Where(x => x != null && x.boon != null && BoonsUtil.GetData(x.boon.type)?.icon != null).ToList();
+                    List<FullBoon> abilitiesToAdd = NewBoons.Where(x => x?.boon != null && BoonsUtil.GetData(x.boon.type)?.icon != null).ToList();
                     //InscryptionAPIPlugin.Logger.LogInfo($"Adding {abilitiesToAdd.Count} out of {NewAbilities.Count} abilities to rulebook");
                     foreach (FullBoon fboo in abilitiesToAdd)
                     {

InscryptionAPI/Card/AbilityExtensions.cs

@@ -334,6 +334,16 @@ public static AbilityInfo SetPowerlevel(this AbilityInfo abilityInfo, int powerL
         abilityInfo.powerLevel = powerLevel;
         return abilityInfo;
     }
+    public static AbilityInfo SetRulebookDescription(this AbilityInfo abilityInfo, string description)
+    {
+        abilityInfo.rulebookDescription = description;
+        return abilityInfo;
+    }
+    public static AbilityInfo SetRulebookName(this AbilityInfo abilityInfo, string name)
+    {
+        abilityInfo.rulebookName = name;
+        return abilityInfo;
+    }
     /// <summary>
     /// Sets whether or not the ability is an activated ability.
     /// </summary>
@@ -454,6 +464,20 @@ public static AbilityInfo ResetDescription(this AbilityInfo abilityInfo)
         return abilityInfo;
     }
 
+    public static bool HasMetaCategories(this AbilityInfo info, params AbilityMetaCategory[] categories)
+    {
+        foreach (AbilityMetaCategory app in categories)
+            if (!info.HasMetaCategory(app))
+                return false;
+
+        return true;
+    }
+
+    public static bool HasMetaCategory(this AbilityInfo info, AbilityMetaCategory category)
+    {
+        return info.metaCategories.Contains(category);
+    }
+
     #region TriggersOncePerStack
     /// <summary>
     /// Sets the ability to only ever trigger once per stack. This prevents abilities from triggering twice per stack after a card evolves.

InscryptionAPI/Card/AbilityManager.cs

@@ -402,17 +402,18 @@ private static bool GetLearnedAbilitesReplacement(bool opponentUsable, int minPo
     }
 
     #region Rulebook Description
+    public const string SIGILCOST = "[sigilcost:";
     [HarmonyPostfix, HarmonyPatch(typeof(AbilityInfo), nameof(AbilityInfo.ParseAndTranslateDescription))]
     private static void CleanUpParsedDescription(ref string __result)
     {
-        while (__result.Contains("[sigilcost:"))
+        while (__result.Contains(SIGILCOST))
         {
-            string textToCheck = __result.Substring(__result.IndexOf("[sigilcost:"));
+            string textToCheck = __result.Substring(__result.IndexOf(SIGILCOST));
             if (!textToCheck.Contains("]"))
                 break;
 
             textToCheck = textToCheck.Substring(0, textToCheck.IndexOf("]") + 1);
-            __result = __result.Replace(textToCheck, textToCheck.Replace("[sigilcost:", "").Replace("]", ""));
+            __result = __result.Replace(textToCheck, textToCheck.Replace(SIGILCOST, "").Replace("]", ""));
         }
     }
 
@@ -449,9 +450,9 @@ private static bool ResetAlteredDescriptions(bool shown)
 
     internal static string ParseAndUpdateDescription(string description, ExtendedActivatedAbilityBehaviour ability)
     {
-        while (description.Contains("[sigilcost:"))
+        while (description.Contains(SIGILCOST))
         {
-            int startIndex = description.IndexOf("[sigilcost:");
+            int startIndex = description.IndexOf(SIGILCOST);
             string textToChange = description.Substring(startIndex);
             if (!textToChange.Contains("]"))
                 break;
@@ -537,34 +538,30 @@ internal static string ParseAndUpdateDescription(string description, ExtendedAct
     }
 
     [HarmonyPatch(typeof(RuleBookInfo), "ConstructPageData", new Type[] { typeof(AbilityMetaCategory) })]
-    [HarmonyPostfix]
+    [HarmonyPostfix, HarmonyPriority(100)]
     private static void FixRulebook(AbilityMetaCategory metaCategory, RuleBookInfo __instance, ref List<RuleBookPageInfo> __result)
     {
         //InscryptionAPIPlugin.Logger.LogInfo($"In rulebook patch: I see {NewAbilities.Count}");
-        if (NewAbilities.Count <= 0)
-            return;
-
-        foreach (PageRangeInfo pageRangeInfo in __instance.pageRanges)
+        if (NewAbilities.Count > 0)
         {
-            // regular abilities
-            if (pageRangeInfo.type != PageRangeType.Abilities)
-                continue;
-
-            int insertPosition = __result.FindLastIndex(rbi => rbi.pagePrefab == pageRangeInfo.rangePrefab) + 1;
-            int curPageNum = (int)Ability.NUM_ABILITIES;
-            List<FullAbility> abilitiesToAdd = NewAbilities.Where(x => __instance.AbilityShouldBeAdded((int)x.Id, metaCategory)).ToList();
-            //InscryptionAPIPlugin.Logger.LogInfo($"Adding {abilitiesToAdd.Count} out of {NewAbilities.Count} abilities to rulebook");
-            foreach (FullAbility fab in abilitiesToAdd)
+            foreach (PageRangeInfo pageRangeInfo in __instance.pageRanges)
             {
-                RuleBookPageInfo info = new()
+                if (pageRangeInfo.type == PageRangeType.Abilities) // regular abilities
                 {
-                    pagePrefab = pageRangeInfo.rangePrefab,
-                    headerText = string.Format(Localization.Translate("APPENDIX XII, SUBSECTION I - MOD ABILITIES {0}"), curPageNum)
-                };
-                __instance.FillAbilityPage(info, pageRangeInfo, (int)fab.Id);
-                __result.Insert(insertPosition, info);
-                curPageNum += 1;
-                insertPosition += 1;
+                    int curPageNum = (int)Ability.NUM_ABILITIES;
+                    int insertPosition = __result.FindLastIndex(rbi => rbi.pagePrefab == pageRangeInfo.rangePrefab) + 1;
+                    List<FullAbility> abilitiesToAdd = NewAbilities.Where(x => __instance.AbilityShouldBeAdded((int)x.Id, metaCategory)).ToList();
+                    foreach (FullAbility fab in abilitiesToAdd)
+                    {
+                        RuleBookPageInfo info = new();
+                        info.pagePrefab = pageRangeInfo.rangePrefab;
+                        info.headerText = string.Format(Localization.Translate("APPENDIX XII, SUBSECTION I - MOD ABILITIES {0}"), curPageNum);
+                        __instance.FillAbilityPage(info, pageRangeInfo, (int)fab.Id);
+                        __result.Insert(insertPosition, info);
+                        curPageNum++;
+                        insertPosition++;
+                    }
+                }
             }
         }
     }

InscryptionAPI/Card/SpecialStatIconManager.cs

@@ -116,14 +116,13 @@ private static void AbilityLoadPrefix()
     }
 
     [HarmonyPatch(typeof(RuleBookInfo), "ConstructPageData", new Type[] { typeof(AbilityMetaCategory) })]
-    [HarmonyPostfix]
+    [HarmonyPostfix, HarmonyPriority(100)]
     private static void FixRulebook(AbilityMetaCategory metaCategory, RuleBookInfo __instance, ref List<RuleBookPageInfo> __result)
     {
         if (NewStatIcons.Count > 0)
         {
             foreach (PageRangeInfo pageRangeInfo in __instance.pageRanges)
             {
-                // regular abilities
                 if (pageRangeInfo.type == PageRangeType.StatIcons)
                 {
                     int insertPosition = __result.FindLastIndex(rbi => rbi.pagePrefab == pageRangeInfo.rangePrefab) + 1;
@@ -133,7 +132,7 @@ private static void FixRulebook(AbilityMetaCategory metaCategory, RuleBookInfo _
                         RuleBookPageInfo info = new();
                         info.pagePrefab = pageRangeInfo.rangePrefab;
                         info.headerText = string.Format(Localization.Translate("APPENDIX XII, SUBSECTION VII - VARIABLE STATS {0}"), curPageNum);
-                        __instance.FillAbilityPage(info, pageRangeInfo, (int)fab.Id);
+                        __instance.FillStatIconPage(info, pageRangeInfo, (int)fab.Id);
                         __result.Insert(insertPosition, info);
                         curPageNum += 1;
                         insertPosition += 1;

InscryptionAPI/Compatibility/CustomLine.cs

@@ -3,7 +3,7 @@
 namespace InscryptionAPI.Helpers;
 
 
-[Obsolete("Use DialogueManager.GenerateEvent instead")]
+[Obsolete("Use DialogueManager.GenerateEvent or InscryptionAPI.Dialogue.CustomLine instead.")]
 public struct CustomLine
 {
     public CustomLine() { }

InscryptionAPI/InscryptionAPI.csproj

@@ -10,7 +10,7 @@
         <DebugType>full</DebugType>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-        <Version>2.20.0</Version>
+        <Version>2.21.0</Version>
     </PropertyGroup>
 
     <PropertyGroup>

InscryptionAPI/InscryptionAPIPlugin.cs

@@ -13,6 +13,7 @@
 using InscryptionAPI.Pelts;
 using InscryptionAPI.PixelCard;
 using InscryptionAPI.Regions;
+using InscryptionAPI.Slots;
 using InscryptionAPI.Totems;
 using System.Runtime.CompilerServices;
 
@@ -28,7 +29,7 @@ public class InscryptionAPIPlugin : BaseUnityPlugin
 {
     public const string ModGUID = "cyantist.inscryption.api";
     public const string ModName = "InscryptionAPI";
-    public const string ModVer = "2.20.0";
+    public const string ModVer = "2.21.0";
 
     public static string Directory = "";
 
@@ -79,6 +80,7 @@ internal static void ResyncAll()
         CardCostManager.SyncCustomCostList();
         CardModificationInfoManager.SyncCardMods();
         AbilityManager.SyncAbilityList();
+        SlotModificationManager.SyncSlotModificationList();
         EncounterManager.SyncEncounterList();
         RegionManager.SyncRegionList();
     }