Added IsChildTemplate to replaceable fields

Tied with IsTemplate flag since it seems related.
Designer225 · Sep 28, 2020 · 6911c46 · 6911c46
1 parent aebdfe1
commit 6911c46
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/CustomTroopUpgrades/.vs/CustomTroopUpgrades/v16/.suo b/CustomTroopUpgrades/.vs/CustomTroopUpgrades/v16/.suo
diff --git a/CustomTroopUpgrades/CustomTroopUpgradesCore.cs b/CustomTroopUpgrades/CustomTroopUpgradesCore.cs
@@ -103,30 +103,27 @@ public static void ApplyOperations(CustomTroopUpgrades upgrades, Game g = null)
         private static readonly FieldInfo IsBasicHeroField =
             typeof(BasicCharacterObject).GetField("_isBasicHero", AllAccessFlag);
 
-        private static readonly PropertyInfo UpgradeTargetsProperty =
-            typeof(CharacterObject).GetProperty(nameof(CharacterObject.UpgradeTargets), AllAccessFlag);
-
-        private static readonly PropertyInfo UpgradeRequiresItemFromCategoryProperty =
-            typeof(CharacterObject).GetProperty(nameof(CharacterObject.UpgradeRequiresItemFromCategory), AllAccessFlag);
-
         private static readonly PropertyInfo DefaultFormationClassProperty =
             typeof(BasicCharacterObject).GetProperty(nameof(BasicCharacterObject.DefaultFormationClass), AllAccessFlag);
 
         private static readonly FieldInfo DynamicBodyPropertiesField =
             typeof(BasicCharacterObject).GetField("_dynamicBodyProperties", AllAccessFlag);
 
-        private static readonly PropertyInfo StaticBodyPropertiesProperty =
-            typeof(Hero).GetProperty("StaticBodyProperties", AllAccessFlag);
-
         private static readonly PropertyInfo FormationPositionPreferenceProperty =
             typeof(BasicCharacterObject).GetProperty(nameof(BasicCharacterObject.FormationPositionPreference), AllAccessFlag);
 
-        private static readonly PropertyInfo OccupationProperty =
-            typeof(CharacterObject).GetProperty(nameof(CharacterObject.Occupation), AllAccessFlag);
-
         private static readonly FieldInfo CharacterSkillsField =
             typeof(BasicCharacterObject).GetField("_characterSkills", AllAccessFlag);
 
+        private static readonly PropertyInfo UpgradeTargetsProperty =
+            typeof(CharacterObject).GetProperty(nameof(CharacterObject.UpgradeTargets), AllAccessFlag);
+
+        private static readonly PropertyInfo UpgradeRequiresItemFromCategoryProperty =
+            typeof(CharacterObject).GetProperty(nameof(CharacterObject.UpgradeRequiresItemFromCategory), AllAccessFlag);
+
+        private static readonly PropertyInfo OccupationProperty =
+            typeof(CharacterObject).GetProperty(nameof(CharacterObject.Occupation), AllAccessFlag);
+
         private static readonly FieldInfo CharacterTraitsField =
             typeof(CharacterObject).GetField("_characterTraits", AllAccessFlag);
 
@@ -142,9 +139,15 @@ public static void ApplyOperations(CustomTroopUpgrades upgrades, Game g = null)
         private static readonly PropertyInfo IsTemplateProperty =
             typeof(CharacterObject).GetProperty(nameof(CharacterObject.IsTemplate), AllAccessFlag);
 
+        private static readonly PropertyInfo IsChildTemplateProperty =
+            typeof(CharacterObject).GetProperty(nameof(CharacterObject.IsChildTemplate), AllAccessFlag);
+
         private static readonly FieldInfo PersonaField =
             typeof(CharacterObject).GetField("_persona", AllAccessFlag);
 
+        private static readonly PropertyInfo StaticBodyPropertiesProperty =
+            typeof(Hero).GetProperty("StaticBodyProperties", AllAccessFlag);
+
         internal static void ApplyReplaceOperations(CustomTroopUpgrades upgrades, List<CharacterObject> objectList)
         {
             foreach (CustomTroopReplaceOperation operation in upgrades.CustomTroopReplaceOps)
@@ -214,7 +217,10 @@ internal static void ApplyReplaceOperations(CustomTroopUpgrades upgrades, List<C
                 else
                     destination.InitializeEquipmentsOnLoad(destination.AllEquipments.ToList());
                 if (replaceFlag.HasFlag(ReplaceFlags.IsTemplate))
+                {
                     IsTemplateProperty.SetValue(destination, source.IsTemplate);
+                    IsChildTemplateProperty.SetValue(destination, source.IsChildTemplate);
+                }
                 if (replaceFlag.HasFlag(ReplaceFlags.Persona))
                     PersonaField.SetValue(destination, PersonaField.GetValue(source));
             }

diff --git a/SubModule.xml b/SubModule.xml
@@ -1,7 +1,7 @@
 <Module>
 	<Name value="Custom Troop Upgrade And Replacer Mod"/>
 	<Id value="CustomTroopUpgrades"/>
-	<Version value="v0.4.1"/>
+	<Version value="v0.5.1"/>
 	<SingleplayerModule value="true"/>
 	<MultiplayerModule value="false"/>
 	<Official value="false"/>

diff --git a/bin/Win64_Shipping_Client/CustomTroopUpgrades.dll b/bin/Win64_Shipping_Client/CustomTroopUpgrades.dll
diff --git a/bin/Win64_Shipping_Client/CustomTroopUpgrades.pdb b/bin/Win64_Shipping_Client/CustomTroopUpgrades.pdb