Merge/refactor rendering2

CraftMagicItems.sln

@@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.30104.148
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CraftMagicItems", "CraftMagicItems\CraftMagicItems.csproj", "{9379C37F-B226-4F81-893D-372F0CCEAAE5}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CraftMagicItemsTests", "CraftMagicItemsTests\CraftMagicItemsTests.csproj", "{FDC2E2FA-48A9-4F1B-9C9B-1B1D43628884}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug (2.1)|Any CPU = Debug (2.1)|Any CPU
@@ -22,6 +24,14 @@ Global
 		{9379C37F-B226-4F81-893D-372F0CCEAAE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9379C37F-B226-4F81-893D-372F0CCEAAE5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9379C37F-B226-4F81-893D-372F0CCEAAE5}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{FDC2E2FA-48A9-4F1B-9C9B-1B1D43628884}.Debug (2.1)|Any CPU.ActiveCfg = Debug (2.1)|Any CPU
+		{FDC2E2FA-48A9-4F1B-9C9B-1B1D43628884}.Debug (2.1)|Any CPU.Build.0 = Debug (2.1)|Any CPU
+		{FDC2E2FA-48A9-4F1B-9C9B-1B1D43628884}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDC2E2FA-48A9-4F1B-9C9B-1B1D43628884}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDC2E2FA-48A9-4F1B-9C9B-1B1D43628884}.Release (2.1)|Any CPU.ActiveCfg = Release|Any CPU
+		{FDC2E2FA-48A9-4F1B-9C9B-1B1D43628884}.Release (2.1)|Any CPU.Build.0 = Release|Any CPU
+		{FDC2E2FA-48A9-4F1B-9C9B-1B1D43628884}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDC2E2FA-48A9-4F1B-9C9B-1B1D43628884}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

CraftMagicItems/Accessors.cs

@@ -37,74 +37,39 @@ namespace CraftMagicItems {
     public delegate TResult FastStaticInvoker<in T1, in T2, in T3, out TResult>(T1 arg1, T2 arg2, T3 arg3);
 
     public class Accessors {
-        public static Harmony12.AccessTools.FieldRef<TClass, TResult> CreateFieldRef<TClass, TResult>(string name) {
+        public static HarmonyLib.AccessTools.FieldRef<TClass, TResult> CreateFieldRef<TClass, TResult>(string name) {
             var classType = typeof(TClass);
             var resultType = typeof(TResult);
-            var fieldInfo = Harmony12.AccessTools.Field(classType, name);
+            var fieldInfo = HarmonyLib.AccessTools.Field(classType, name);
             if (fieldInfo == null) {
                 throw new Exception($"{classType} does not contain field {name}");
             }
 
-            if (!resultType.IsAssignableFrom(fieldInfo.FieldType)) {
+            if (!resultType.IsAssignableFrom(fieldInfo.FieldType) && (!fieldInfo.FieldType.IsEnum || resultType != typeof(int))) {
                 throw new InvalidCastException($"Cannot cast field type {resultType} as {fieldInfo.FieldType} for class {classType} field {name}");
             }
 
-            var fieldRef = Harmony12.AccessTools.FieldRefAccess<TClass, TResult>(name);
+            var fieldRef = HarmonyLib.AccessTools.FieldRefAccess<TClass, TResult>(name);
             return fieldRef;
         }
 
-        public static FastGetter CreateGetter(Type classType, Type resultType, string name) {
-            var fieldInfo = Harmony12.AccessTools.Field(classType, name);
-            var propInfo = Harmony12.AccessTools.Property(classType, name);
-            if (fieldInfo == null && propInfo == null) {
-                throw new Exception($"{classType} does not contain field or property {name}");
-            }
-
-            bool isProp = propInfo != null;
-            Type memberType = isProp ? propInfo.PropertyType : fieldInfo.FieldType;
-            string memberTypeName = isProp ? "property" : "field";
-            if (!resultType.IsAssignableFrom(memberType)) {
-                throw new InvalidCastException($"Cannot cast field type {resultType} as {memberType} for class {classType} {memberTypeName} {name}");
-            }
-
-            var handler = isProp ? Harmony12.FastAccess.CreateGetterHandler(propInfo) : Harmony12.FastAccess.CreateGetterHandler(fieldInfo);
-            return new FastGetter(handler);
-        }
-
-        public static FastGetter<TClass, TResult> CreateGetter<TClass, TResult>(string name) {
+        public static FastSetter<TClass, TValue> CreateSetter<TClass, TValue>(string name) {
             var classType = typeof(TClass);
-            var resultType = typeof(TResult);
-            var handler = CreateGetter(classType, resultType, name);
-            return instance => (TResult) handler.Invoke(instance);
-        }
-
-        public static FastSetter CreateSetter(Type classType, Type valueType, string name) {
-            var propertyInfo = Harmony12.AccessTools.Property(classType, name);
-            var fieldInfo = Harmony12.AccessTools.Field(classType, name);
-            if (propertyInfo == null && fieldInfo == null) {
+            var propertySetter = HarmonyLib.AccessTools.PropertySetter(classType, name);
+            if (propertySetter == null) {
                 throw new Exception($"{classType} does not contain a field or property {name}");
             }
-
-            var isProperty = propertyInfo != null;
-            var memberType = isProperty ? propertyInfo.PropertyType : fieldInfo.FieldType;
-            var memberTypeName = isProperty ? "property" : "field";
+            var propertyInfo = HarmonyLib.AccessTools.Property(classType, name);
+            var memberType = propertyInfo.PropertyType;
+            var valueType = typeof(TValue);
             if (!valueType.IsAssignableFrom(memberType) && (!memberType.IsEnum || valueType != typeof(int))) {
-                throw new Exception($"Cannot cast property type {valueType} as {memberType} for class {classType} {memberTypeName} {name}");
+                throw new Exception($"Cannot cast property type {valueType} as {memberType} for class {classType} property {name}");
             }
-
-            var handler = isProperty ? Harmony12.FastAccess.CreateSetterHandler(propertyInfo) : Harmony12.FastAccess.CreateSetterHandler(fieldInfo);
-            return new FastSetter(handler);
-        }
-
-        public static FastSetter<TClass, TValue> CreateSetter<TClass, TValue>(string name) {
-            var classType = typeof(TClass);
-            var valueType = typeof(TValue);
-            var handler = CreateSetter(classType, valueType, name);
-            return (instance, value) => handler.Invoke(instance, value);
+            return new FastSetter<TClass, TValue>(HarmonyLib.AccessTools.MethodDelegate<Action<TClass, TValue>>(propertySetter));
         }
 
         private static MethodInfo GetMethodInfoValidated(Type classType, string name, Type resultType, Type[] args, Type[] typeArgs) {
-            var methodInfo = Harmony12.AccessTools.Method(classType, name, args, typeArgs);
+            var methodInfo = HarmonyLib.AccessTools.Method(classType, name, args, typeArgs);
             if (methodInfo == null) {
                 var argString = string.Join(", ", args.Select(t => t.ToString()));
                 throw new Exception($"{classType} does not contain method {name} with arguments {argString}");
@@ -119,7 +84,7 @@ private static MethodInfo GetMethodInfoValidated(Type classType, string name, Ty
 
         private static FastInvoker CreateInvoker(Type classType, string name, Type resultType, Type[] args, Type[] typeArgs = null) {
             var methodInfo = GetMethodInfoValidated(classType, name, resultType, args, typeArgs);
-            return new FastInvoker(Harmony12.MethodInvoker.GetHandler(methodInfo));
+            return new FastInvoker(HarmonyLib.MethodInvoker.GetHandler(methodInfo));
         }
 
         public static FastInvoker<TClass, TResult> CreateInvoker<TClass, TResult>(string name) {
@@ -156,9 +121,9 @@ public static FastInvoker<TClass, T1, T2, T3, TResult> CreateInvoker<TClass, T1,
 
         private class StaticFastInvokeHandler {
             private readonly Type classType;
-            private readonly Harmony12.FastInvokeHandler invoker;
+            private readonly HarmonyLib.FastInvokeHandler invoker;
 
-            public StaticFastInvokeHandler(Type classType, Harmony12.FastInvokeHandler invoker) {
+            public StaticFastInvokeHandler(Type classType, HarmonyLib.FastInvokeHandler invoker) {
                 this.classType = classType;
                 this.invoker = invoker;
             }
@@ -170,7 +135,7 @@ public object Invoke(params object[] args) {
 
         private static FastStaticInvoker CreateStaticInvoker(Type classType, string name, Type resultType, Type[] args, Type[] typeArgs = null) {
             var methodInfo = GetMethodInfoValidated(classType, name, resultType, args, typeArgs);
-            return new StaticFastInvokeHandler(classType, Harmony12.MethodInvoker.GetHandler(methodInfo)).Invoke;
+            return new StaticFastInvokeHandler(classType, HarmonyLib.MethodInvoker.GetHandler(methodInfo)).Invoke;
         }
 
         public static FastStaticInvoker<TResult> CreateStaticInvoker<TResult>(Type classType, string name) {

CraftMagicItems/AfterBuild.bat

@@ -6,10 +6,10 @@ xcopy CraftMagicItems.dll CraftMagicItems || goto :error
 xcopy ..\..\..\Info.json CraftMagicItems || goto :error
 xcopy /E /I ..\..\..\L10n CraftMagicItems\L10n || goto :error
 xcopy /E /I ..\..\..\Icons CraftMagicItems\Icons || goto :error
-xcopy /E /I ..\..\..\Data CraftMagicItems\Data || goto :error
+xcopy /E /I Data CraftMagicItems\Data || goto :error
 "C:\Program Files\7-Zip\7z.exe" a CraftMagicItems.zip CraftMagicItems || goto :error
 
-"C:\Program Files\7-Zip\7z.exe" a CraftMagicItems-Source.zip ..\..\*.cs ..\..\..\L10n ..\..\..\Icons ..\..\..\Data || goto :error
+"C:\Program Files\7-Zip\7z.exe" a CraftMagicItems-Source.zip ..\..\*.cs ..\..\..\L10n ..\..\..\Icons Data || goto :error
 
 goto :EOF
 

CraftMagicItems/BondedItemComponent.cs

@@ -1,3 +1,4 @@
+using CraftMagicItems.Localization;
 using Kingmaker;
 using Kingmaker.Items;
 using Kingmaker.Items.Slots;
@@ -43,7 +44,7 @@ public void HandleEquipmentSlotUpdated(ItemSlot slot, ItemEntity previousItem) {
         }
 
         // If the owner of a bonded object casts a spell when not wielding it, they need to make a Concentration check or lose the spell.
-        [Harmony12.HarmonyPatch(typeof(UnitUseAbility), "MakeConcentrationCheckIfCastingIsDifficult")]
+        [HarmonyLib.HarmonyPatch(typeof(UnitUseAbility), "MakeConcentrationCheckIfCastingIsDifficult")]
         // ReSharper disable once UnusedMember.Local
         private static class UnitUseAbilityMakeConcentrationCheckIfCastingIsDifficultPatch {
             // ReSharper disable once UnusedMember.Local
@@ -52,7 +53,7 @@ private static void Postfix(UnitUseAbility __instance) {
                 var bondedComponent = Main.GetBondedItemComponentForCaster(caster.Descriptor);
                 if (bondedComponent != null && bondedComponent.ownerItem != null && bondedComponent.ownerItem.Wielder != caster.Descriptor) {
                     Main.AddBattleLogMessage(
-                        Main.L10NFormat(caster, "craftMagicItems-logMessage-not-wielding-bonded-item", bondedComponent.ownerItem.Name),
+                        LocalizationHelper.FormatLocalizedString(caster, "craftMagicItems-logMessage-not-wielding-bonded-item", bondedComponent.ownerItem.Name),
                         new L10NString("craftMagicItems-bonded-item-glossary"));
                     // Concentration checks have no way of overriding the DC, so contrive some fake damage to give a DC of 20 + spell level.
                     var ruleDamage = new RuleDealDamage(caster, caster, null);

CraftMagicItems/Config/DictionaryData.cs

@@ -0,0 +1,53 @@
+using System.Collections.Generic;
+using Kingmaker.Blueprints.Items;
+using Kingmaker.Blueprints.Items.Equipment;
+using Kingmaker.Enums.Damage;
+
+namespace CraftMagicItems.Config
+{
+    /// <summary>
+    ///     Class containing all of the loaded dictionaries of data that are loaded
+    ///     from config files or game resources
+    /// </summary>
+    public class DictionaryData
+    {
+        /// <summary>Collection of items that are related to spells</summary>
+        public readonly Dictionary<UsableItemType, Dictionary<string, List<BlueprintItemEquipment>>> SpellIdToItem;
+
+        /// <summary>Crafting data loaded fron JSON files and its hierarchy</summary>
+        public readonly Dictionary<string, List<ItemCraftingData>> SubCraftingData;
+
+        /// <summary>Collection of items matching type of blueprint (shield, armor, weapon)</summary>
+        public readonly Dictionary<string, BlueprintItem> TypeToItem;
+
+        /// <summary>Collection of various item blueprints, keyed on enchantment blueprint ID</summary>
+        public readonly Dictionary<string, List<BlueprintItemEquipment>> EnchantmentIdToItem;
+
+        /// <summary>Collection of various recipies, keyed on enchantment blueprint ID</summary>
+        public readonly Dictionary<string, List<RecipeData>> EnchantmentIdToRecipe;
+
+        /// <summary>Collection of various recipies, keyed on physical material</summary>
+        public readonly Dictionary<PhysicalDamageMaterial, List<RecipeData>> MaterialToRecipe;
+
+        /// <summary>Collection of various enchantment costs, keyed on enchantment blueprint ID</summary>
+        public readonly Dictionary<string, int> EnchantmentIdToCost;
+
+        /// <summary>Array of item crafting data read from JSON file</summary>
+        public ItemCraftingData[] ItemCraftingData;
+
+        /// <summary>Array of custom loot data read from JSON file</summary>
+        public CustomLootItem[] CustomLootItems;
+
+        /// <summary>Default constructor</summary>
+        public DictionaryData()
+        {
+            SpellIdToItem = new Dictionary<UsableItemType, Dictionary<string, List<BlueprintItemEquipment>>>();
+            SubCraftingData = new Dictionary<string, List<ItemCraftingData>>();
+            TypeToItem = new Dictionary<string, BlueprintItem>();
+            EnchantmentIdToItem = new Dictionary<string, List<BlueprintItemEquipment>>();
+            EnchantmentIdToRecipe = new Dictionary<string, List<RecipeData>>();
+            MaterialToRecipe = new Dictionary<PhysicalDamageMaterial, List<RecipeData>>();
+            EnchantmentIdToCost = new Dictionary<string, int>();
+        }
+    }
+}

CraftMagicItems/Config/Selections.cs

@@ -0,0 +1,71 @@
+using System.Collections.Generic;
+using CraftMagicItems.UI;
+using Kingmaker.Blueprints.Items;
+using Kingmaker.Blueprints.Items.Equipment;
+using Kingmaker.EntitySystem.Entities;
+
+namespace CraftMagicItems.Config
+{
+    /// <summary>Class containing the selections from the UI</summary>
+    public class Selections
+    {
+        /// <summary>Currently selected index for a given setting</summary>
+        /// <remarks>
+        ///     TODO: This should probably be broken up for ease of maintenance
+        /// </remarks>
+        public readonly Dictionary<string, int> SelectedIndex = new Dictionary<string, int>();
+
+        /// <summary>
+        ///     The currently-selected caster level with which to create an item (wand, scroll, potion, item effect, etc.)
+        ///     i.e.: "cast {spell} as an Nth level caster"
+        /// </summary>
+        public int SelectedCasterLevel;
+
+        /// <summary>Flag indicating whether to ONLY display currently prepared/available spells</summary>
+        public bool SelectedShowPreparedSpells;
+
+        /// <summary>Is a double weapon's second side selected?</summary>
+        public bool SelectedDoubleWeaponSecondEnd;
+
+        /// <summary>Is a shield's weapon (bash, spikes, etc.) seleted?</summary>
+        public bool SelectedShieldWeapon;
+
+        /// <summary>Selected times that an item can cast a given spell per day</summary>
+        public int SelectedCastsPerDay;
+
+        /// <summary>Currently selected base item blueprint</summary>
+        public BlueprintItemEquipment SelectedBaseBlueprint;
+
+        /// <summary>User-entered custom name for the item</summary>
+        public string SelectedCustomName;
+
+        /// <summary>Has the user selected to bond with a new item</summary>
+        public bool SelectedBondWithNewObject;
+
+        /// <summary>Currently selected crafter/caster</summary>
+        public UnitEntityData CurrentCaster;
+
+        /// <summary>Currently-selected crafting section to render</summary>
+        public OpenSection CurrentSection = OpenSection.CraftMagicItemsSection;
+
+        /// <summary>Blueprint that is currently being upgraded</summary>
+        public BlueprintItem UpgradingBlueprint;
+
+
+        /// <summary>Retrieves the select index in <see cref="SelectedIndex" /> matching the key of <paramref name="label" /></summary>
+        /// <param name="label">Label used as a key to search on</param>
+        /// <returns>The selected index value, or 0 if <paramref name="label" /> cannot be found</returns>
+        public int GetSelectionIndex(string label)
+        {
+            return SelectedIndex.ContainsKey(label) ? SelectedIndex[label] : 0;
+        }
+
+        /// <summary>Sets the <see cref="SelectedIndex" /> matching the key of <paramref name="label" /></summary>
+        /// <param name="label">Label used as a key to search on</param>
+        /// <param name="value">Value to assign</param>
+        public void SetSelectionIndex(string label, int value)
+        {
+            SelectedIndex[label] = value;
+        }
+    }
+}

CraftMagicItems/Constants/Areas.cs

@@ -0,0 +1,24 @@
+namespace CraftMagicItems.Constants
+{
+    /// <summary>Class containing unique identifiers for area blueprints</summary>
+    public static class Areas
+    {
+        /// <summary>Collection of blueprint unique identifiers for "safe" areas</summary>
+        public static readonly string[] SafeBlueprintAreaGuids =
+        {
+            "141f6999dada5a842a46bb3f029c287a", // Dire Narlmarches village
+            "e0852647faf68a641a0a5ec5436fc0bf", // Dunsward village
+            "537acbd9039b6a04f915dfc21572affb", // Glenebon village
+            "3ddf191773e8c2f448d31289b8d654bf", // Kamelands village
+            "f1b76870cc69e6a479c767cbe3c8a8ca", // North Narlmarches village
+            "ea3788bcdf33d884baffc34440ff620f", // Outskirts village
+            "e7292eab463c4924c8f14548545e25b7", // Silverstep village
+            "7c4a954c65e8d7146a6edc00c498a582", // South Narlmarches village
+            "7d9616b3807840c47ba3b2ab380c55a0", // Tors of Levenies village
+            "653811192a3fcd148816384a9492bd08", // Secluded Lodge
+            "fd1b6fa9f788ca24e86bd922a10da080", // Tenebrous Depths start hub
+            "c49315fe499f0e5468af6f19242499a2", // Tenebrous Depths start hub (Roguelike)
+                                                // TODO: camp outside the capital?
+        };
+    }
+}

CraftMagicItems/Constants/ClassBlueprints.cs

@@ -0,0 +1,15 @@
+namespace CraftMagicItems.Constants
+{
+    /// <summary>Contains constants for class/archetype blueprint unique identifiers</summary>
+    public static class ClassBlueprints
+    {
+        /// <summary>Blueprint for Alchemist class progression</summary>
+        public const string AlchemistProgressionGuid = "efd55ff9be2fda34981f5b9c83afe4f1";
+
+        /// <summary>Blueprint for Alchemist Grenadier archetype</summary>
+        public const string AlchemistGrenadierArchetypeGuid = "6af888a7800b3e949a40f558ff204aae";
+
+        /// <summary>Blueprint for Wizard Scroll Savant archetype</summary>
+        public const string ScrollSavantArchetypeGuid = "f43c78692a4e10d43a38bd6aedf53c1b";
+    }
+}