Merge pull request #6 from julian-perge/feature/util_additions

ScottWilson0903 · web-flow · commit 45fb15e23afe · 2021-11-18T15:41:04.000Z
Additions to CardUtil and NewCard.
diff --git a/Models/CustomCard.cs b/Models/CustomCard.cs
@@ -9,6 +9,7 @@ namespace APIPlugin
 	public class CustomCard
 	{
 		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();
@@ -39,16 +40,13 @@ public class CustomCard
 		public bool? flipPortraitForStrafe;
 		public bool? onePerDeck;
 		public List<CardAppearanceBehaviour.Appearance> appearanceBehaviour;
-		[IgnoreMapping]
-		public Texture2D tex;
-		[IgnoreMapping]
-		public Texture2D altTex;
+		[IgnoreMapping] public Texture2D tex;
+		[IgnoreMapping] public Texture2D altTex;
 		public Texture titleGraphic;
-		[IgnoreMapping]
-		public Texture2D pixelTex;
+		[IgnoreMapping] public Texture2D pixelTex;
 		public GameObject animatedPortrait;
 		public List<Texture> decals;
-		public List<AbilityIdentifier> abilityId;
+		public List<AbilityIdentifier> abilityIdList = new();
 		public EvolveIdentifier evolveId;
 		public IceCubeIdentifier iceCubeId;
 		public TailIdentifier tailId;
@@ -71,6 +69,7 @@ public CustomCard(
 				foreach (var id in abilityIdParam.Where(id => id.id != 0))
 				{
 					this.abilities.Add(id.id);
+          abilitiesToRemove.Add(id);
 				}
 				
 				foreach (AbilityIdentifier id in abilitiesToRemove)
@@ -90,6 +89,7 @@ public CustomCard(
 				foreach (var id in specialAbilityIdParam.Where(id => id.id != 0))
 				{
 					this.specialAbilities.Add(id.id);
+          specialAbilitiesToRemove.Add(id);
 				}
 				
 				foreach (SpecialAbilityIdentifier id in specialAbilitiesToRemove)
@@ -134,22 +134,26 @@ public CardInfo AdjustCard(CardInfo card)
 				card.portraitTex = Sprite.Create(tex, CardUtils.DefaultCardArtRect, CardUtils.DefaultVector2);
 				card.portraitTex.name = "portrait_" + name;
 			}
+
 			if (this.altTex is not null)
 			{
 				altTex.name = "portrait_" + name;
 				altTex.filterMode = FilterMode.Point;
 				card.alternatePortrait = Sprite.Create(altTex, CardUtils.DefaultCardArtRect, CardUtils.DefaultVector2);
 				card.alternatePortrait.name = "portrait_" + name;
 			}
+
 			if (this.pixelTex is not null)
 			{
 				pixelTex.name = "portrait_" + name;
 				pixelTex.filterMode = FilterMode.Point;
-				card.pixelPortrait = Sprite.Create(pixelTex, CardUtils.DefaultCardPixelArtRect, CardUtils.DefaultVector2);
+				card.pixelPortrait =
+					Sprite.Create(pixelTex, CardUtils.DefaultCardPixelArtRect, CardUtils.DefaultVector2);
 				card.pixelPortrait.name = "portrait_" + name;
 			}
+
 			Plugin.Log.LogInfo($"Adjusted default card {name}!");
 			return card;
 		}
 	}
-}
+}
diff --git a/Models/EvolveIdentifier.cs b/Models/EvolveIdentifier.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using DiskCardGame;
-using UnityEngine;
 
 namespace APIPlugin
 {
diff --git a/Models/IceCubeIdentifier.cs b/Models/IceCubeIdentifier.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using DiskCardGame;
-using UnityEngine;
 
 namespace APIPlugin
 {
diff --git a/Models/NewCard.cs b/Models/NewCard.cs
@@ -26,20 +26,21 @@ public static void Add(CardInfo card, List<AbilityIdentifier> abilityIdsParam =
 			Plugin.Log.LogInfo($"Loaded custom card {card.name}!");
 		}
 
+
 		// TODO Implement a handler for custom appearanceBehaviour - in particular custom card backs
 		// TODO Change parameter order, and function setter call order to make more sense
 		// TODO Rename parameters to be more user friendly
-		public static void Add(string name, List<CardMetaCategory> metaCategories, CardComplexity cardComplexity,
-			CardTemple temple, string displayedName, int baseAttack, int baseHealth,
-			string description = null,
-			bool hideAttackAndHealth = false, int cost = 0, int bonesCost = 0, int energyCost = 0,
+		public static void Add(string name, string displayedName, int baseAttack, int baseHealth,
+			List<CardMetaCategory> metaCategories, CardComplexity cardComplexity, CardTemple temple,
+			string description = null, bool hideAttackAndHealth = false,
+			int bloodCost = 0, int bonesCost = 0, int energyCost = 0,
 			List<GemType> gemsCost = null, SpecialStatIcon specialStatIcon = SpecialStatIcon.None,
 			List<Tribe> tribes = null, List<Trait> traits = null, List<SpecialTriggeredAbility> specialAbilities = null,
 			List<Ability> abilities = null, List<AbilityIdentifier> abilityIdsParam = null, 
 			List<SpecialAbilityIdentifier> specialAbilitiesIdsParam = null, EvolveParams evolveParams = null,
 			string defaultEvolutionName = null, TailParams tailParams = null, IceCubeParams iceCubeParams = null,
 			bool flipPortraitForStrafe = false, bool onePerDeck = false,
-			List<CardAppearanceBehaviour.Appearance> appearanceBehaviour = null, Texture2D tex = null,
+			List<CardAppearanceBehaviour.Appearance> appearanceBehaviour = null, Texture2D defaultTex = null,
 			Texture2D altTex = null, Texture titleGraphic = null, Texture2D pixelTex = null,
 			GameObject animatedPortrait = null, List<Texture> decals = null, EvolveIdentifier evolveId = null,
 			IceCubeIdentifier iceCubeId = null, TailIdentifier tailId = null)
@@ -108,7 +109,7 @@ public static void Add(string name, List<CardMetaCategory> metaCategories, CardC
 			}
 
 			// costs
-			card.cost = cost;
+			card.cost = bloodCost;
 			card.bonesCost = bonesCost;
 			card.energyCost = energyCost;
 
@@ -118,7 +119,7 @@ public static void Add(string name, List<CardMetaCategory> metaCategories, CardC
 			}
 
 			// textures
-			DetermineAndSetCardArt(name, card, tex, altTex, pixelTex);
+			DetermineAndSetCardArt(name, card, defaultTex, altTex, pixelTex);
 
 			if (animatedPortrait is not null)
 			{
@@ -152,16 +153,16 @@ private static void HandleIdentifiers(
 			IceCubeIdentifier iceCubeId,
 			TailIdentifier tailId)
 		{
-			// Handle AbilityIdentifier
-			List<AbilityIdentifier> toRemove = new List<AbilityIdentifier>();
+			List<AbilityIdentifier> abilitiesToRemove = new List<AbilityIdentifier>();
 			if (abilityIdsParam is not null)
 			{
 				foreach (var id in abilityIdsParam.Where(id => id.id != 0))
 				{
 					card.abilities.Add(id.id);
+          abilitiesToRemove.Add(id);
 				}
 
-				foreach (AbilityIdentifier id in toRemove)
+				foreach (AbilityIdentifier id in abilitiesToRemove)
 				{
 					abilityIdsParam.Remove(id);
 				}
@@ -173,11 +174,18 @@ private static void HandleIdentifiers(
 			}
 			
 			// Handle SpecialAbilityIds
+      List<SpecialAbilityIdentifier> specialAbilitiesToRemove = new List<AbilityIdentifier>();
 			if (specialAbilitiesIdsParam is not null)
 			{
 				foreach (var id in specialAbilitiesIdsParam.Where(id => id.id != 0))
 				{
 					card.specialAbilities.Add(id.id);
+          specialAbilitiesToRemove.Add(id);
+				}
+        
+        foreach (SpecialAbilityIdentifier id in specialAbilitiesToRemove)
+				{
+					specialAbilitiesIdsParam.Remove(id);
 				}
 
 				if (specialAbilitiesIdsParam.Count > 0)
@@ -207,15 +215,15 @@ private static void HandleIdentifiers(
 
 		private static void DetermineAndSetCardArt(
 			string name, CardInfo card,
-			Texture2D tex, Texture2D altTex, Texture2D pixelTex)
+			Texture2D defaultTex, Texture2D altTex, Texture2D pixelTex)
 		{
 			var newName = "portrait_" + name;
-			if (tex is not null)
+			if (defaultTex is not null)
 			{
-				tex.name = newName;
-				tex.filterMode = FilterMode.Point;
+				defaultTex.name = newName;
+				defaultTex.filterMode = FilterMode.Point;
 
-				card.portraitTex = Sprite.Create(tex, CardUtils.DefaultCardArtRect, CardUtils.DefaultVector2);
+				card.portraitTex = Sprite.Create(defaultTex, CardUtils.DefaultCardArtRect, CardUtils.DefaultVector2);
 				card.portraitTex.name = newName;
 			}
 
diff --git a/Models/TailIdentifier.cs b/Models/TailIdentifier.cs
@@ -1,17 +1,15 @@
-using System;
-using System.Collections.Generic;
 using DiskCardGame;
 using UnityEngine;
-using CardLoaderPlugin.lib;
 
 namespace APIPlugin
 {
 	public class TailIdentifier
 	{
-    private string name;
+		private string name;
 		private CardModificationInfo mods;
 		private Texture2D tailLostTex;
 		private TailParams tail;
+
 		public TailParams Tail
 		{
 			get
@@ -37,7 +35,7 @@ public TailParams Tail
 		public TailIdentifier(string name, Texture2D tailLostTex = null, CardModificationInfo mods = null)
 		{
 			this.name = name;
-      this.mods = mods;
+			this.mods = mods;
 			this.tailLostTex = tailLostTex;
 		}
 
diff --git a/Patches/ChapterSelectMenu.cs b/Patches/ChapterSelectMenu.cs
@@ -28,7 +28,7 @@ public static void Prefix()
 					}
 				}
 				ScriptableObjectLoader<CardInfo>.allData = official.Concat(NewCard.cards).ToList();
-				Plugin.Log.LogInfo($"Loaded custom cards into data");
+				Plugin.Log.LogInfo($"Loaded {NewCard.cards.Count} custom cards into data");
 			}
 		}
 	}
diff --git a/Patches/LoadingScreenManager.cs b/Patches/LoadingScreenManager.cs
@@ -29,7 +29,7 @@ public static void Prefix()
 				}
 
 				ScriptableObjectLoader<CardInfo>.allData = official.Concat(NewCard.cards).ToList();
-				Plugin.Log.LogInfo($"Loaded custom cards into data");
+				Plugin.Log.LogInfo($"Loaded {NewCard.cards.Count} custom cards into data");
 			}
 
 			if (ScriptableObjectLoader<AbilityInfo>.allData == null)
@@ -41,7 +41,7 @@ public static void Prefix()
 				}
 
 				ScriptableObjectLoader<AbilityInfo>.allData = official;
-				Plugin.Log.LogInfo($"Loaded custom abilities into data");
+				Plugin.Log.LogInfo($"Loaded {NewAbility.abilities.Count} custom abilities into data");
 			}
 		}
 	}
diff --git a/Plugin.cs b/Plugin.cs
@@ -27,7 +27,7 @@ private void Awake()
       Logger.LogInfo($"Loaded {PluginName}!");
       Plugin.Log = base.Logger;
 
-      configEnergy = Config.Bind("Energy","Energy Refresh",true,"Max energy increaces and energy refreshes at end of turn");
+      configEnergy = Config.Bind("Energy","Energy Refresh",true,"Max energy increases and energy refreshes at end of turn");
       configDrone = Config.Bind("Energy","Energy Drone",false,"Drone is visible to display energy (requires Energy Refresh)");
       configMox = Config.Bind("Mox","Mox Refresh",false,"Mox refreshes at end of battle");
       configDroneMox = Config.Bind("Mox","Mox Drone",false,"Drone displays mox (requires Energy Drone and Mox Refresh)");
diff --git a/Utils/AbilityInfoUtils.cs b/Utils/AbilityInfoUtils.cs
@@ -0,0 +1,23 @@
+﻿using System.Collections.Generic;
+using DiskCardGame;
+using UnityEngine;
+
+namespace APIPlugin
+{
+	public class AbilityInfoUtils
+	{
+		public static AbilityInfo CreateInfoWithDefaultSettings(string rulebookName, string rulebookDescription)
+		{
+			AbilityInfo info = ScriptableObject.CreateInstance<AbilityInfo>();
+			info.powerLevel = 0;
+			info.rulebookName = rulebookName;
+			info.rulebookDescription = rulebookDescription;
+			info.metaCategories = new List<AbilityMetaCategory>()
+			{
+				AbilityMetaCategory.Part1Modular, AbilityMetaCategory.Part1Rulebook
+			};
+
+			return info;
+		}
+	}
+}
diff --git a/Utils/CardUtils.cs b/Utils/CardUtils.cs

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`	`1`	`using DiskCardGame;`
`4`		`-using UnityEngine;`
`5`	`2`
`6`	`3`	`namespace APIPlugin`
`7`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,20 +26,21 @@ public static void Add(CardInfo card, List<AbilityIdentifier> abilityIdsParam =`
`26`	`26`	`Plugin.Log.LogInfo($"Loaded custom card {card.name}!");`
`27`	`27`	`}`
`28`	`28`
	`29`	`+`
`29`	`30`	`// TODO Implement a handler for custom appearanceBehaviour - in particular custom card backs`
`30`	`31`	`// TODO Change parameter order, and function setter call order to make more sense`
`31`	`32`	`// TODO Rename parameters to be more user friendly`
`32`		`- public static void Add(string name, List<CardMetaCategory> metaCategories, CardComplexity cardComplexity,`
`33`		`- CardTemple temple, string displayedName, int baseAttack, int baseHealth,`
`34`		`- string description = null,`
`35`		`- bool hideAttackAndHealth = false, int cost = 0, int bonesCost = 0, int energyCost = 0,`
	`33`	`+ public static void Add(string name, string displayedName, int baseAttack, int baseHealth,`
	`34`	`+ List<CardMetaCategory> metaCategories, CardComplexity cardComplexity, CardTemple temple,`
	`35`	`+ string description = null, bool hideAttackAndHealth = false,`
	`36`	`+ int bloodCost = 0, int bonesCost = 0, int energyCost = 0,`
`36`	`37`	`List<GemType> gemsCost = null, SpecialStatIcon specialStatIcon = SpecialStatIcon.None,`
`37`	`38`	`List<Tribe> tribes = null, List<Trait> traits = null, List<SpecialTriggeredAbility> specialAbilities = null,`
`38`	`39`	`List<Ability> abilities = null, List<AbilityIdentifier> abilityIdsParam = null,`
`39`	`40`	`List<SpecialAbilityIdentifier> specialAbilitiesIdsParam = null, EvolveParams evolveParams = null,`
`40`	`41`	`string defaultEvolutionName = null, TailParams tailParams = null, IceCubeParams iceCubeParams = null,`
`41`	`42`	`bool flipPortraitForStrafe = false, bool onePerDeck = false,`
`42`		`- List<CardAppearanceBehaviour.Appearance> appearanceBehaviour = null, Texture2D tex = null,`
	`43`	`+ List<CardAppearanceBehaviour.Appearance> appearanceBehaviour = null, Texture2D defaultTex = null,`
`43`	`44`	`Texture2D altTex = null, Texture titleGraphic = null, Texture2D pixelTex = null,`
`44`	`45`	`GameObject animatedPortrait = null, List<Texture> decals = null, EvolveIdentifier evolveId = null,`
`45`	`46`	`IceCubeIdentifier iceCubeId = null, TailIdentifier tailId = null)`
`@@ -108,7 +109,7 @@ public static void Add(string name, List<CardMetaCategory> metaCategories, CardC`
`108`	`109`	`}`
`109`	`110`
`110`	`111`	`// costs`
`111`		`- card.cost = cost;`
	`112`	`+ card.cost = bloodCost;`
`112`	`113`	`card.bonesCost = bonesCost;`
`113`	`114`	`card.energyCost = energyCost;`
`114`	`115`
`@@ -118,7 +119,7 @@ public static void Add(string name, List<CardMetaCategory> metaCategories, CardC`
`118`	`119`	`}`
`119`	`120`
`120`	`121`	`// textures`
`121`		`- DetermineAndSetCardArt(name, card, tex, altTex, pixelTex);`
	`122`	`+ DetermineAndSetCardArt(name, card, defaultTex, altTex, pixelTex);`
`122`	`123`
`123`	`124`	`if (animatedPortrait is not null)`
`124`	`125`	`{`
`@@ -152,16 +153,16 @@ private static void HandleIdentifiers(`
`152`	`153`	`IceCubeIdentifier iceCubeId,`
`153`	`154`	`TailIdentifier tailId)`
`154`	`155`	`{`
`155`		`- // Handle AbilityIdentifier`
`156`		`- List<AbilityIdentifier> toRemove = new List<AbilityIdentifier>();`
	`156`	`+ List<AbilityIdentifier> abilitiesToRemove = new List<AbilityIdentifier>();`
`157`	`157`	`if (abilityIdsParam is not null)`
`158`	`158`	`{`
`159`	`159`	`foreach (var id in abilityIdsParam.Where(id => id.id != 0))`
`160`	`160`	`{`
`161`	`161`	`card.abilities.Add(id.id);`
	`162`	`+ abilitiesToRemove.Add(id);`
`162`	`163`	`}`
`163`	`164`
`164`		`- foreach (AbilityIdentifier id in toRemove)`
	`165`	`+ foreach (AbilityIdentifier id in abilitiesToRemove)`
`165`	`166`	`{`
`166`	`167`	`abilityIdsParam.Remove(id);`
`167`	`168`	`}`
`@@ -173,11 +174,18 @@ private static void HandleIdentifiers(`
`173`	`174`	`}`
`174`	`175`
`175`	`176`	`// Handle SpecialAbilityIds`
	`177`	`+ List<SpecialAbilityIdentifier> specialAbilitiesToRemove = new List<AbilityIdentifier>();`
`176`	`178`	`if (specialAbilitiesIdsParam is not null)`
`177`	`179`	`{`
`178`	`180`	`foreach (var id in specialAbilitiesIdsParam.Where(id => id.id != 0))`
`179`	`181`	`{`
`180`	`182`	`card.specialAbilities.Add(id.id);`
	`183`	`+ specialAbilitiesToRemove.Add(id);`
	`184`	`+ }`
	`185`	`+`
	`186`	`+ foreach (SpecialAbilityIdentifier id in specialAbilitiesToRemove)`
	`187`	`+ {`
	`188`	`+ specialAbilitiesIdsParam.Remove(id);`
`181`	`189`	`}`
`182`	`190`
`183`	`191`	`if (specialAbilitiesIdsParam.Count > 0)`
`@@ -207,15 +215,15 @@ private static void HandleIdentifiers(`
`207`	`215`
`208`	`216`	`private static void DetermineAndSetCardArt(`
`209`	`217`	`string name, CardInfo card,`
`210`		`- Texture2D tex, Texture2D altTex, Texture2D pixelTex)`
	`218`	`+ Texture2D defaultTex, Texture2D altTex, Texture2D pixelTex)`
`211`	`219`	`{`
`212`	`220`	`var newName = "portrait_" + name;`
`213`		`- if (tex is not null)`
	`221`	`+ if (defaultTex is not null)`
`214`	`222`	`{`
`215`		`- tex.name = newName;`
`216`		`- tex.filterMode = FilterMode.Point;`
	`223`	`+ defaultTex.name = newName;`
	`224`	`+ defaultTex.filterMode = FilterMode.Point;`
`217`	`225`
`218`		`- card.portraitTex = Sprite.Create(tex, CardUtils.DefaultCardArtRect, CardUtils.DefaultVector2);`
	`226`	`+ card.portraitTex = Sprite.Create(defaultTex, CardUtils.DefaultCardArtRect, CardUtils.DefaultVector2);`
`219`	`227`	`card.portraitTex.name = newName;`
`220`	`228`	`}`
`221`	`229`
Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,15 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`	`1`	`using DiskCardGame;`
`4`	`2`	`using UnityEngine;`
`5`		`-using CardLoaderPlugin.lib;`
`6`	`3`
`7`	`4`	`namespace APIPlugin`
`8`	`5`	`{`
`9`	`6`	`public class TailIdentifier`
`10`	`7`	`{`
`11`		`- private string name;`
	`8`	`+ private string name;`
`12`	`9`	`private CardModificationInfo mods;`
`13`	`10`	`private Texture2D tailLostTex;`
`14`	`11`	`private TailParams tail;`
	`12`	`+`
`15`	`13`	`public TailParams Tail`
`16`	`14`	`{`
`17`	`15`	`get`
`@@ -37,7 +35,7 @@ public TailParams Tail`
`37`	`35`	`public TailIdentifier(string name, Texture2D tailLostTex = null, CardModificationInfo mods = null)`
`38`	`36`	`{`
`39`	`37`	`this.name = name;`
`40`		`- this.mods = mods;`
	`38`	`+ this.mods = mods;`
`41`	`39`	`this.tailLostTex = tailLostTex;`
`42`	`40`	`}`
`43`	`41`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public static void Prefix()`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`ScriptableObjectLoader<CardInfo>.allData = official.Concat(NewCard.cards).ToList();`
`31`		`- Plugin.Log.LogInfo($"Loaded custom cards into data");`
	`31`	`+ Plugin.Log.LogInfo($"Loaded {NewCard.cards.Count} custom cards into data");`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public static void Prefix()`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`ScriptableObjectLoader<CardInfo>.allData = official.Concat(NewCard.cards).ToList();`
`32`		`- Plugin.Log.LogInfo($"Loaded custom cards into data");`
	`32`	`+ Plugin.Log.LogInfo($"Loaded {NewCard.cards.Count} custom cards into data");`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`if (ScriptableObjectLoader<AbilityInfo>.allData == null)`
`@@ -41,7 +41,7 @@ public static void Prefix()`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`ScriptableObjectLoader<AbilityInfo>.allData = official;`
`44`		`- Plugin.Log.LogInfo($"Loaded custom abilities into data");`
	`44`	`+ Plugin.Log.LogInfo($"Loaded {NewAbility.abilities.Count} custom abilities into data");`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`	`}`