Fix for JSONLoader

Author: IngoHHacks

API.csproj

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

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Changelog
+
+## v1.13.1-nonkc
+- Fix for JSONLoader cards
+
 ## v1.13.0
 - Added support for custom card backgrounds, dialogs, encounters and talking cards
 - Fixes to abilities loading and stackable custom abilities

Patches/ChapterSelectMenu_OnChapterConfirmed.cs

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

Patches/LoadingScreenManager_LoadGameData.cs

@@ -11,7 +11,7 @@ public class LoadingScreenManager_LoadGameData
 	{
 		public static void Prefix()
 		{
-			if (ScriptableObjectLoader<CardInfo>.allData == null)
+			if (!Plugin.CardsLoaded)
 			{
 				List<CardInfo> official = ScriptableObjectLoader<CardInfo>.AllData;
 				foreach (CustomCard card in CustomCard.cards)
@@ -32,7 +32,7 @@ public static void Prefix()
 				Plugin.Log.LogInfo($"Loaded {NewCard.cards.Count} custom cards into data");
 			}
 
-			if (ScriptableObjectLoader<AbilityInfo>.allData == null)
+			if (!Plugin.AbilitiesLoaded)
 			{
 				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.0.0";
+    private const string PluginVersion = "1.13.1.0";
 
     internal static ManualLogSource Log;
     internal static ConfigEntry<bool> configEnergy;

Utils/IdentifierHandlers.cs

@@ -6,10 +6,16 @@ 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()
     {
-      ImportCustomAbilities();
-
       Log.LogDebug($"Number of ability IDs to set from NewCard.abilityIds: [{NewCard.abilityIds.Count}]");
       foreach(var item in NewCard.abilityIds)
       {
@@ -49,54 +55,6 @@ private void SetAbilityIdentifiers()
           }
         }
       }
-      
-      ImportCustomCards();
-    }
-
-    private static void ImportCustomAbilities()
-    {
-      Plugin.Log.LogDebug($"Starting pre-emptive data load for AbilityInfo before adding custom abilities...");
-      List<AbilityInfo> officialAbilityInfo = ScriptableObjectLoader<AbilityInfo>.AllData;
-
-      foreach (NewAbility newAbility in NewAbility.abilities)
-      {
-        officialAbilityInfo.Add(newAbility.info);
-        Plugin.Log.LogDebug($"Official ability list now contains [{newAbility.info.rulebookName}]!");
-      }
-
-      ScriptableObjectLoader<AbilityInfo>.allData = officialAbilityInfo;
-      Plugin.Log.LogInfo($"Loaded {NewAbility.abilities.Count} custom abilities into data! " +
-                         $"Total of [{ScriptableObjectLoader<AbilityInfo>.allData.Count}]");
-    }
-
-    private static void ImportCustomCards()
-    {
-      Plugin.Log.LogDebug($"Starting pre-emptive data load for CardInfo before adding modified and new cards...");
-      List<CardInfo> officialCardInfo = ScriptableObjectLoader<CardInfo>.AllData;
-      Plugin.Log.LogDebug($"CustomCards count [{CustomCard.cards.Count}] NewCard.cards count [{NewCard.cards.Count}]");
-      foreach (CustomCard card in CustomCard.cards)
-      {
-        int index = officialCardInfo.FindIndex((CardInfo x) => x.name == card.name);
-        if (index == -1)
-        {
-          Plugin.Log.LogWarning($"Could not find card {card.name} to modify");
-        }
-        else
-        {
-          officialCardInfo[index] = card.AdjustCard(officialCardInfo[index]);
-          Plugin.Log.LogInfo($"Loaded modified [{card.name}] into data");
-        }
-      }
-
-      ScriptableObjectLoader<CardInfo>.allData = officialCardInfo.Concat(
-        NewCard.cards.Select(cardInfo =>
-          {
-            Log.LogInfo($"Loaded custom card to card pool: [{cardInfo.name}]");
-            return cardInfo; 
-          }
-        )
-      ).ToList();
-      Plugin.Log.LogInfo($"Loaded {NewCard.cards.Count} custom cards into data");
     }
 
     private void SetSpecialAbilityIdentifiers()

manifest.json

@@ -1,6 +1,6 @@
 {
     "name": "API",
-    "version_number": "1.13.0",
+    "version_number": "1.13.1",
     "website_url": "https://github.com/ScottWilson0903/InscryptionAPI",
     "description": "This plugin is a BepInEx plugin made for Inscryption as an API. It can currently create custom cards and abilities and inject them into the data pool, or modify existing cards in the card pool.",
     "dependencies": [