Cleaned up NewSpecialAbility.cs

Added rulebook patching for special abilities
Added SpecialAbilityIdentifier.cs
Refactored StatIconInfo.cs to now point at LoadAbilityData

Author: julian-perge

Models/NewSpecialAbility.cs

@@ -12,26 +12,24 @@ public class NewSpecialAbility
 		public StatIconInfo statIconInfo;
 		public Type abilityBehaviour;
 		public Texture tex;
-		public AbilityIdentifier id;
+		public SpecialAbilityIdentifier id;
 
 		public NewSpecialAbility(
 			StatIconInfo statIconInfo,
 			Type abilityBehaviour,
 			Texture tex,
-			AbilityIdentifier id = null
+			SpecialAbilityIdentifier id
 		)
 		{
-			this.specialTriggeredAbility = (SpecialTriggeredAbility)100 + specialAbilities.Count;
+			specialTriggeredAbility = (SpecialTriggeredAbility)26 + specialAbilities.Count;
 			this.statIconInfo = statIconInfo;
 			this.abilityBehaviour = abilityBehaviour;
 			tex.filterMode = FilterMode.Point;
 			this.tex = tex;
 			this.id = id;
 			specialAbilities.Add(this);
-			// if (id != null)
-			// {
-			// 	id.id = specialTriggeredAbility;
-			// }
+			id.id = specialTriggeredAbility;
+			this.id = id;
 
 			Plugin.Log.LogInfo($"Loaded custom special ability [{statIconInfo.rulebookName}]!");
 		}

Models/SpecialAbilityIdentifier.cs

@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using DiskCardGame;
+
+namespace APIPlugin
+{
+	public class SpecialAbilityIdentifier
+	{
+		private static List<SpecialAbilityIdentifier> ids = new();
+		private string guid;
+		private string name;
+		public SpecialTriggeredAbility id;
+
+		private SpecialAbilityIdentifier(string guid, string name)
+		{
+			this.guid = guid;
+			this.name = name;
+			ids.Add(this);
+		}
+
+		public static SpecialAbilityIdentifier GetID(string guid, string name)
+		{
+			return ids.Exists(x => x.guid == guid && x.name == name)
+				? ids.Find(x => x.guid == guid && x.name == name)
+				: new SpecialAbilityIdentifier(guid, name);
+		}
+
+		public override string ToString()
+		{
+			return $"{guid}({name})";
+		}
+	}
+}

Patches/CardTriggerHandler.cs

@@ -6,7 +6,7 @@
 
 namespace API.Patches
 {
-	[HarmonyPatch(typeof(CardTriggerHandler), "AddAbility", new[] { typeof(Ability) })]
+	[HarmonyPatch(typeof(CardTriggerHandler), "AddAbility", typeof(Ability))]
 	public class CardTriggerHandler_AddAbility_Ability
 	{
 		public static bool Prefix(Ability ability, CardTriggerHandler __instance)
@@ -22,9 +22,9 @@ public static bool Prefix(Ability ability, CardTriggerHandler __instance)
 			// 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))
 			{
-				NewAbility newAbility = NewAbility.abilities.Find((NewAbility x) => x.ability == ability);
+				NewAbility newAbility = NewAbility.abilities.Find(x => x.ability == ability);
 				Type type = newAbility.abilityBehaviour;
-				Component baseC = (Component)__instance;
+				Component baseC = __instance;
 				AbilityBehaviour item = baseC.gameObject.GetComponent(type) as AbilityBehaviour;
 				if (item == null)
 				{
@@ -43,24 +43,23 @@ private static bool AbilityCanStackAndIsNotPassive(Ability ability)
 		}
 	}
 
-	[HarmonyPatch(typeof(CardTriggerHandler), "AddAbility", new[] { typeof(SpecialTriggeredAbility) })]
+	[HarmonyPatch(typeof(CardTriggerHandler), "AddAbility", typeof(SpecialTriggeredAbility))]
 	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}]");
-			if ((int)ability < 99)
+			if ((int)ability < 25)
 			{
 				return true;
 			}
-			// return true if the ability is equal to the ability in the pair OR if ability cannot stack and is passive
 			if (!__instance.specialAbilities.Exists(ab => ab.Item1 == ability))
 			{
-				Plugin.Log.LogInfo($"-> spec ability does not exist yet, adding");
+				Plugin.Log.LogInfo("-> spec ability does not exist yet, adding");
 				NewSpecialAbility newAbility = NewSpecialAbility.specialAbilities
 					.Find(x => x.specialTriggeredAbility == ability);
 				Type type = newAbility.abilityBehaviour;
-				Component baseC = (Component)__instance;
+				Component baseC = __instance;
 				SpecialCardBehaviour item = baseC.gameObject.GetComponent(type) as SpecialCardBehaviour;
 				if (item == null)
 				{

Patches/Rulebook.cs

@@ -35,11 +35,20 @@ public static void Postfix(AbilityMetaCategory metaCategory, RuleBookInfo __inst
 							__instance.FillAbilityPage,
 							Localization.Translate("APPENDIX XII, SUBSECTION I - MOD ABILITIES {0}")));
 					}
-					
+				}
+			}
+
+			if (NewSpecialAbility.specialAbilities.Count > 0)
+			{
+				foreach (PageRangeInfo pageRangeInfo in __instance.pageRanges)
+				{
 					// special abilities
 					if (pageRangeInfo.type == PageRangeType.StatIcons)
 					{
-						List<int> customAbilities = NewAbility.abilities.Select(x => (int)x.ability).ToList();
+						List<int> customAbilities = NewSpecialAbility.specialAbilities
+							.Select(x => (int)x.statIconInfo.iconType).ToList();
+						Plugin.Log.LogInfo(
+							$"Number of custom abilities found to add to rulebook [{customAbilities.Count}]");
 						int min = customAbilities.AsQueryable().Min();
 						int max = customAbilities.AsQueryable().Max();
 						PageRangeInfo pageRange = pageRangeInfo;
@@ -58,4 +67,4 @@ public static void Postfix(AbilityMetaCategory metaCategory, RuleBookInfo __inst
 			}
 		}
 	}
-}
+}

Patches/StatIconInfo.cs

@@ -1,22 +1,22 @@
-using System.Collections.Generic;
 using APIPlugin;
 using DiskCardGame;
 using HarmonyLib;
 
 namespace API.Patches
 {
-	[HarmonyPatch(typeof(StatIconInfo), "AllIconInfo", MethodType.Getter)]
+	[HarmonyPatch(typeof(StatIconInfo), "LoadAbilityData")]
 	public class StatIconInfoPatch
 	{
 		[HarmonyPostfix]
-		static void Postfix(ref List<StatIconInfo> __result)
+		static void Postfix()
 		{
 			foreach (var ability in NewSpecialAbility.specialAbilities)
 			{
 				// this is never being logged?
-				APIPlugin.Plugin.Log.LogInfo($"Adding {ability.statIconInfo.name} in StatIconInfo");
-				if (!__result.Exists(x => x == ability.statIconInfo)) {
-					__result.Add(ability.statIconInfo);
+				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");
+					StatIconInfo.allIconInfo.Add(ability.statIconInfo);
 				}
 			}