Added debug logging.

Refactored CustomCard to include special abilities now

Author: julian-perge

Models/CustomCard.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using CardLoaderPlugin.lib;
 using DiskCardGame;
 using UnityEngine;
@@ -7,11 +8,12 @@ namespace APIPlugin
 {
 	public class CustomCard
 	{
-		public static List<CustomCard> cards = new List<CustomCard>();
-		public static Dictionary<int,List<AbilityIdentifier>> abilityIds = new Dictionary<int,List<AbilityIdentifier>>();
-		public static Dictionary<int,EvolveIdentifier> evolveIds = new Dictionary<int,EvolveIdentifier>();
-		public static Dictionary<int,IceCubeIdentifier> iceCubeIds = new Dictionary<int,IceCubeIdentifier>();
-		public static Dictionary<int,TailIdentifier> tailIds = new Dictionary<int,TailIdentifier>();
+		public static List<CustomCard> cards = new();
+		public static Dictionary<int,List<AbilityIdentifier>> abilityIds = new();
+		public static Dictionary<int, List<SpecialAbilityIdentifier>> specialAbilityIds = new();
+		public static Dictionary<int,EvolveIdentifier> evolveIds = new();
+		public static Dictionary<int,IceCubeIdentifier> iceCubeIds = new();
+		public static Dictionary<int,TailIdentifier> tailIds = new();
 		public string name;
 		public List<CardMetaCategory> metaCategories;
 		public CardComplexity? cardComplexity;
@@ -28,8 +30,8 @@ public class CustomCard
 		public SpecialStatIcon? specialStatIcon;
 		public List<Tribe> tribes;
 		public List<Trait> traits;
-		public List<SpecialTriggeredAbility> specialAbilities;
-		public List<Ability> abilities;
+		public List<SpecialTriggeredAbility> specialAbilities = new();
+		public List<Ability> abilities = new();
 		public EvolveParams evolveParams;
 		public string defaultEvolutionName;
 		public TailParams tailParams;
@@ -51,32 +53,57 @@ public class CustomCard
 		public IceCubeIdentifier iceCubeId;
 		public TailIdentifier tailId;
 
-		public CustomCard(string name, List<AbilityIdentifier> abilityId=null, EvolveIdentifier evolveId=null, IceCubeIdentifier iceCubeId=null, TailIdentifier tailId=null)
+		public CustomCard(
+			string name, 
+			List<AbilityIdentifier> abilityIdParam=null, 
+			List<SpecialAbilityIdentifier> specialAbilityIdParam=null, 
+			EvolveIdentifier evolveId=null, 
+			IceCubeIdentifier iceCubeId=null, 
+			TailIdentifier tailId=null)
 		{
 			this.name = name;
 			CustomCard.cards.Add(this);
 
 			// Handle AbilityIdentifier
-			List<AbilityIdentifier> toRemove = new List<AbilityIdentifier>();
-			if (this.abilityId is not null)
+			List<AbilityIdentifier> abilitiesToRemove = new List<AbilityIdentifier>();
+			if (abilityIdParam is not null)
 			{
-				foreach (AbilityIdentifier id in abilityId)
+				foreach (var id in abilityIdParam.Where(id => id.id != 0))
 				{
-					if (id.id != 0)
-					{
-						this.abilities.Add(id.id);
-					}
+					this.abilities.Add(id.id);
 				}
-				foreach (AbilityIdentifier id in toRemove)
+				
+				foreach (AbilityIdentifier id in abilitiesToRemove)
 				{
-					this.abilityId.Remove(id);
+					abilityIdParam.Remove(id);
+				}
+				
+				if (abilityIdParam.Count > 0)
+				{
+					CustomCard.abilityIds[CustomCard.cards.Count - 1] = abilityIdParam;
 				}
 			}
-			if (abilityId is not null && this.abilityId.Count > 0)
+
+			List<SpecialAbilityIdentifier> specialAbilitiesToRemove = new List<SpecialAbilityIdentifier>();
+			if (specialAbilityIdParam is not null)
 			{
-				CustomCard.abilityIds[CustomCard.cards.Count - 1] = abilityId;
+				foreach (var id in specialAbilityIdParam.Where(id => id.id != 0))
+				{
+					this.specialAbilities.Add(id.id);
+				}
+				
+				foreach (SpecialAbilityIdentifier id in specialAbilitiesToRemove)
+				{
+					specialAbilityIdParam.Remove(id);
+				}
+				
+				if (specialAbilityIdParam.Count > 0)
+				{
+					CustomCard.specialAbilityIds[CustomCard.cards.Count - 1] = specialAbilityIdParam;
+				}
 			}
 
+
 			// Handle EvolveIdentifier
 			if (evolveId is not null)
 			{

Patches/CardTriggerHandler.cs

@@ -18,17 +18,20 @@ public static bool Prefix(Ability ability, CardTriggerHandler __instance)
 
 			Predicate<Tuple<Ability, AbilityBehaviour>> checkAbilityExists = tuple =>
 				tuple.Item1 == ability || AbilityCanStackAndIsNotPassive(ability);
-
+			Plugin.Log.LogDebug($"Attempting to add regular ability in card trigger handler [{ability}]");
 			// return true if the ability is equal to the ability in the pair OR if ability cannot stack and is passive
 			if (!__instance.triggeredAbilities.Exists(checkAbilityExists))
 			{
+				Plugin.Log.LogDebug($"-> Ability [{ability}] does not exist, adding...");
 				NewAbility newAbility = NewAbility.abilities.Find(x => x.ability == ability);
+				Plugin.Log.LogDebug($"-> New Ability is [{newAbility.ability}]");
 				Type type = newAbility.abilityBehaviour;
 				Component baseC = __instance;
 				AbilityBehaviour item = baseC.gameObject.GetComponent(type) as AbilityBehaviour;
 				if (item == null)
 				{
 					item = baseC.gameObject.AddComponent(type) as AbilityBehaviour;
+					Plugin.Log.LogDebug($"--> Item is [{item}] | Ability toString [{ability}]");
 				}
 
 				__instance.triggeredAbilities.Add(new Tuple<Ability, AbilityBehaviour>(ability, item));
@@ -48,14 +51,14 @@ public class CardTriggerHandler_AddAbility_SpecialTriggeredAbility
 	{
 		public static bool Prefix(SpecialTriggeredAbility ability, CardTriggerHandler __instance)
 		{
-			Plugin.Log.LogInfo($"Attempting to add spec ability to card trigger handler [{ability}]");
+			Plugin.Log.LogDebug($"Attempting to add spec ability to card trigger handler [{ability}]");
 			if ((int)ability < 25)
 			{
 				return true;
 			}
 			if (!__instance.specialAbilities.Exists(ab => ab.Item1 == ability))
 			{
-				Plugin.Log.LogInfo("-> spec ability does not exist yet, adding");
+				Plugin.Log.LogDebug("-> spec ability does not exist yet, adding...");
 				NewSpecialAbility newAbility = NewSpecialAbility.specialAbilities
 					.Find(x => x.specialTriggeredAbility == ability);
 				Type type = newAbility.abilityBehaviour;

Patches/StatIconInfo.cs

@@ -12,10 +12,9 @@ static void Postfix()
 		{
 			foreach (var ability in NewSpecialAbility.specialAbilities)
 			{
-				// this is never being logged?
 				Plugin.Log.LogDebug($"Attempting to add {ability.specialTriggeredAbility} in StatIconInfo");
 				if (!StatIconInfo.allIconInfo.Exists(x => x == ability.statIconInfo)) {
-					Plugin.Log.LogInfo($"-> Adding {ability.specialTriggeredAbility} in StatIconInfo");
+					Plugin.Log.LogDebug($"-> Adding {ability.specialTriggeredAbility} in StatIconInfo");
 					StatIconInfo.allIconInfo.Add(ability.statIconInfo);
 				}
 			}