Merge branch 'feature/util_additions_V2' of https://github.com/julian-perge/InscryptionAPI into julian-perge-feature/util_additions_V2

Author: IngoHHacks

Models/CustomCard.cs Models/Custom/CustomCard.csModels/CustomCard.cs renamed to Models/Custom/CustomCard.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using DiskCardGame;
 using UnityEngine;
+
 #pragma warning disable 169
 
 namespace APIPlugin

Models/CustomRegion.cs Models/Custom/CustomRegion.csModels/CustomRegion.cs renamed to Models/Custom/CustomRegion.cs

@@ -17,7 +17,7 @@ private AbilityIdentifier(string guid, string name)
 			ids.Add(this);
 		}
 
-		public static AbilityIdentifier GetAbilityIdentifier(string guid, string name)
+		public static AbilityIdentifier GetID(string guid, string name)
 		{
 			return ids.Exists(x => x.guid == guid && x.name == name)
 				? ids.Find(x => x.guid == guid && x.name == name)

Models/AbilityIdentifier.cs Models/Identifiers/AbilityIdentifier.csModels/AbilityIdentifier.cs renamed to Models/Identifiers/AbilityIdentifier.cs

@@ -4,10 +4,11 @@ namespace APIPlugin
 {
 	public class EvolveIdentifier
 	{
-    private string name;
-    private int turnsToEvolve;
+		private string name;
+		private int turnsToEvolve;
 		private CardModificationInfo mods;
 		private EvolveParams evolution;
+
 		public EvolveParams Evolution
 		{
 			get
@@ -26,6 +27,7 @@ public EvolveParams Evolution
 						}
 					}
 				}
+
 				return this.evolution;
 			}
 		}
@@ -34,28 +36,28 @@ public EvolveIdentifier(string name, int turnsToEvolve, CardModificationInfo mod
 		{
 			this.name = name;
 			this.turnsToEvolve = turnsToEvolve;
-      this.mods = mods;
+			this.mods = mods;
 		}
 
 		private void SetParams(CardInfo card)
 		{
-			EvolveParams evolution = new EvolveParams();
+			EvolveParams _evolution = new EvolveParams();
 
-			evolution.turnsToEvolve = this.turnsToEvolve;
+			_evolution.turnsToEvolve = this.turnsToEvolve;
 
-			evolution.evolution = card;
+			_evolution.evolution = card;
 
 			if (this.mods != null)
 			{
-				evolution.evolution.mods.Add(this.mods);
+				_evolution.evolution.mods.Add(this.mods);
 			}
 
-			this.evolution = evolution;
+			this.evolution = _evolution;
 		}
 
 		public override string ToString()
 		{
 			return name;
 		}
 	}
-}
+}