Update card loading to work with the fix

Author: IngoHHacks

API.csproj

@@ -3,7 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>API</AssemblyName>
     <Description>An API for inscryption</Description>
-    <Version>1.13.1.0</Version>
+    <Version>1.13.2.0</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>9.0</LangVersion>
     <DebugType>full</DebugType>

Patches/ChapterSelectMenu_OnChapterConfirmed.cs

@@ -11,8 +11,9 @@ public class ChapterSelectMenu_OnChapterConfirmed
 	{
 		public static void Prefix()
 		{
-			if (ScriptableObjectLoader<CardInfo>.allData == null)
+			if (!Plugin.CardsLoaded)
 			{
+				Plugin.CardsLoaded = true;
 				List<CardInfo> official = ScriptableObjectLoader<CardInfo>.AllData;
 				foreach (CustomCard card in CustomCard.cards)
 				{

Patches/LoadingScreenManager_LoadGameData.cs

@@ -11,8 +11,9 @@ public class LoadingScreenManager_LoadGameData
 	{
 		public static void Prefix()
 		{
-			if (ScriptableObjectLoader<CardInfo>.allData == null)
+			if (!Plugin.CardsLoaded)
 			{
+				Plugin.CardsLoaded = true;
 				List<CardInfo> official = ScriptableObjectLoader<CardInfo>.AllData;
 				foreach (CustomCard card in CustomCard.cards)
 				{
@@ -32,8 +33,9 @@ public static void Prefix()
 				Plugin.Log.LogInfo($"Loaded {NewCard.cards.Count} custom cards into data");
 			}
 
-			if (ScriptableObjectLoader<AbilityInfo>.allData == null)
+			if (!Plugin.AbilitiesLoaded)
 			{
+				Plugin.AbilitiesLoaded = true;
 				List<AbilityInfo> official = ScriptableObjectLoader<AbilityInfo>.AllData;
 				foreach (NewAbility newAbility in NewAbility.abilities)
 				{

Plugin.cs

@@ -13,7 +13,7 @@ public partial class Plugin : BaseUnityPlugin
   {
     private const string PluginGuid = "cyantist.inscryption.api";
     private const string PluginName = "API";
-    private const string PluginVersion = "1.13.1.0";
+    private const string PluginVersion = "1.13.2.0";
 
     internal static ManualLogSource Log;
     internal static ConfigEntry<bool> configEnergy;

Utils/IdentifierHandlers.cs

@@ -6,6 +6,15 @@ namespace APIPlugin
 {
   public partial class Plugin
   {
+
+    private static bool cardsLoaded = false;
+
+    public static bool CardsLoaded { get => cardsLoaded; set => cardsLoaded = value; }
+
+    private static bool abilitiesLoaded = false;
+
+    public static bool AbilitiesLoaded { get => abilitiesLoaded; set => abilitiesLoaded = value; }
+
     private void SetAbilityIdentifiers()
     {
       Log.LogDebug($"Number of ability IDs to set from NewCard.abilityIds: [{NewCard.abilityIds.Count}]");