apply hotfix change

TitaniumLithium · TitaniumLithium · commit db26211ac3c7 · 2020-05-07T14:35:21.000+08:00
apply hotfix change to this mod.
diff --git a/TLSmithingFasterMod/TLSmithingFasterCraftingCampaignBehaviorDoSmeltingPatch.cs b/TLSmithingFasterMod/TLSmithingFasterCraftingCampaignBehaviorDoSmeltingPatch.cs
@@ -12,34 +12,36 @@ namespace TLSmithingFasterMod
     [HarmonyPatch(typeof(CraftingCampaignBehavior), "DoSmelting")]
     public class TLSmithingFasterCraftingCampaignBehaviorDoSmeltingPatch
     {
-        public static void Postfix(ref CraftingCampaignBehavior __instance, Hero hero, ItemObject item)
+        public static void Postfix(ref CraftingCampaignBehavior __instance, Hero hero, EquipmentElement equipmentElement)
         {
             ScreenBase topScreen = ScreenManager.TopScreen;
             if (topScreen != null && Input.IsKeyDown(InputKey.LeftShift) && !TLSmithingFasterOperationCounts.Flag)
             {
                 TLSmithingFasterOperationCounts.Flag = true;
-                int maxcounts = TLSmithingFasterOperationCounts.GetMaxCounts(ref __instance, hero, item);
+                int maxcounts = TLSmithingFasterOperationCounts.GetMaxCounts(ref __instance, hero, equipmentElement);
                 maxcounts = Math.Min(maxcounts, 4);
                 IEnumerable<EquipmentElement> locks = Campaign.Current.GetCampaignBehavior<InventoryLockTracker>().GetLocks();
                 ItemRoster itemRoster = MobileParty.MainParty.ItemRoster;
+                ItemRosterElement[] ItemRosterElements = itemRoster.GetCopyOfAllElements();
                 bool IsLocked = false;
-                int max_item_count = itemRoster.Count;
+                int max_item_count = ItemRosterElements.Length;
                 for (int i = 0; i < max_item_count && maxcounts > 0; i++)
                 {
                     itemRoster = MobileParty.MainParty.ItemRoster;
+                    ItemRosterElements = itemRoster.GetCopyOfAllElements();
                     foreach (EquipmentElement EquipmentElement in locks)
                     {
-                        if (EquipmentElement.Item == itemRoster.GetItemAtIndex(i))
+                        if (EquipmentElement.IsEqualTo(ItemRosterElements[i].EquipmentElement))
                         {
                             IsLocked = true;
                             break;
                         }
                     }
-                    int item_num = itemRoster.GetItemNumber(itemRoster.GetItemAtIndex(i));
+                    int item_num = ItemRosterElements[i].Amount;
                     int j;
-                    for (j = 0; j < item_num && !IsLocked && itemRoster.GetItemAtIndex(i).IsCraftedWeapon; j++)
+                    for (j = 0; j < item_num && !IsLocked && ItemRosterElements[i].EquipmentElement.Item.IsCraftedWeapon; j++)
                     {
-                        __instance.DoSmelting(hero, itemRoster.GetItemAtIndex(i));
+                        __instance.DoSmelting(hero, ItemRosterElements[i].EquipmentElement);
                         maxcounts--;
                         if (maxcounts <= 0)
                         {
@@ -59,27 +61,29 @@ public static void Postfix(ref CraftingCampaignBehavior __instance, Hero hero, I
             if (topScreen != null && Input.IsKeyDown(InputKey.LeftControl) && !TLSmithingFasterOperationCounts.Flag)
             {
                 TLSmithingFasterOperationCounts.Flag = true;
-                int maxcounts = TLSmithingFasterOperationCounts.GetMaxCounts(ref __instance, hero, item);
+                int maxcounts = TLSmithingFasterOperationCounts.GetMaxCounts(ref __instance, hero, equipmentElement);
                 IEnumerable<EquipmentElement> locks = Campaign.Current.GetCampaignBehavior<InventoryLockTracker>().GetLocks();
                 ItemRoster itemRoster = MobileParty.MainParty.ItemRoster;
+                ItemRosterElement[] ItemRosterElements = itemRoster.GetCopyOfAllElements();
                 bool IsLocked = false;
-                int max_item_count = itemRoster.Count;
+                int max_item_count = ItemRosterElements.Length;
                 for (int i = 0; i < max_item_count && maxcounts > 0; i++)
                 {
                     itemRoster = MobileParty.MainParty.ItemRoster;
+                    ItemRosterElements = itemRoster.GetCopyOfAllElements();
                     foreach (EquipmentElement EquipmentElement in locks)
                     {
-                        if (EquipmentElement.Item == itemRoster.GetItemAtIndex(i))
+                        if (EquipmentElement.IsEqualTo(ItemRosterElements[i].EquipmentElement))
                         {
                             IsLocked = true;
                             break;
                         }
                     }
-                    int item_num = itemRoster.GetItemNumber(itemRoster.GetItemAtIndex(i));
+                    int item_num = ItemRosterElements[i].Amount;
                     int j;
-                    for (j = 0; j < item_num && !IsLocked && itemRoster.GetItemAtIndex(i).IsCraftedWeapon; j++)
+                    for (j = 0; j < item_num && !IsLocked && ItemRosterElements[i].EquipmentElement.Item.IsCraftedWeapon; j++)
                     {
-                        __instance.DoSmelting(hero, itemRoster.GetItemAtIndex(i));
+                        __instance.DoSmelting(hero, ItemRosterElements[i].EquipmentElement);
                         maxcounts--;
                         if (maxcounts <= 0)
                         {
diff --git a/TLSmithingFasterMod/TLSmithingFasterOperationCounts.cs b/TLSmithingFasterMod/TLSmithingFasterOperationCounts.cs
@@ -31,10 +31,10 @@ public static int GetMaxCounts(ref CraftingCampaignBehavior instance, Hero hero,
             }
             return result;
         }
-        public static int GetMaxCounts(ref CraftingCampaignBehavior instance, Hero hero, ItemObject item)
+        public static int GetMaxCounts(ref CraftingCampaignBehavior instance, Hero hero, EquipmentElement equipmentElement)
         {
             ItemRoster itemRoster = MobileParty.MainParty.ItemRoster;
-            int energyCostForSmelting = Campaign.Current.Models.SmithingModel.GetEnergyCostForSmelting(item, hero);
+            int energyCostForSmelting = Campaign.Current.Models.SmithingModel.GetEnergyCostForSmelting(equipmentElement.Item, hero);
             int result = instance.GetHeroCraftingStamina(hero) / energyCostForSmelting;
             string charcoal = "charcoal";
             int charcoal_num = 0;
diff --git a/TLSmithingFasterMod/TLSmithingFasterSubModule.cs b/TLSmithingFasterMod/TLSmithingFasterSubModule.cs
@@ -15,7 +15,7 @@ protected override void OnSubModuleLoad()
         protected override void OnBeforeInitialModuleScreenSetAsRoot()
         {
             base.OnBeforeInitialModuleScreenSetAsRoot();
-            InformationManager.DisplayMessage(new InformationMessage("TL Smithing Faster Mod beta1.3.0.2 is successfully loaded. HarmonyLib 2.0.0.10"));
+            InformationManager.DisplayMessage(new InformationMessage("TL Smithing Faster Mod beta1.3.0.3 is successfully loaded. HarmonyLib 2.0.0.10"));
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,34 +12,36 @@ namespace TLSmithingFasterMod`
`12`	`12`	`[HarmonyPatch(typeof(CraftingCampaignBehavior), "DoSmelting")]`
`13`	`13`	`public class TLSmithingFasterCraftingCampaignBehaviorDoSmeltingPatch`
`14`	`14`	`{`
`15`		`- public static void Postfix(ref CraftingCampaignBehavior __instance, Hero hero, ItemObject item)`
	`15`	`+ public static void Postfix(ref CraftingCampaignBehavior __instance, Hero hero, EquipmentElement equipmentElement)`
`16`	`16`	`{`
`17`	`17`	`ScreenBase topScreen = ScreenManager.TopScreen;`
`18`	`18`	`if (topScreen != null && Input.IsKeyDown(InputKey.LeftShift) && !TLSmithingFasterOperationCounts.Flag)`
`19`	`19`	`{`
`20`	`20`	`TLSmithingFasterOperationCounts.Flag = true;`
`21`		`- int maxcounts = TLSmithingFasterOperationCounts.GetMaxCounts(ref __instance, hero, item);`
	`21`	`+ int maxcounts = TLSmithingFasterOperationCounts.GetMaxCounts(ref __instance, hero, equipmentElement);`
`22`	`22`	`maxcounts = Math.Min(maxcounts, 4);`
`23`	`23`	`IEnumerable<EquipmentElement> locks = Campaign.Current.GetCampaignBehavior<InventoryLockTracker>().GetLocks();`
`24`	`24`	`ItemRoster itemRoster = MobileParty.MainParty.ItemRoster;`
	`25`	`+ ItemRosterElement[] ItemRosterElements = itemRoster.GetCopyOfAllElements();`
`25`	`26`	`bool IsLocked = false;`
`26`		`- int max_item_count = itemRoster.Count;`
	`27`	`+ int max_item_count = ItemRosterElements.Length;`
`27`	`28`	`for (int i = 0; i < max_item_count && maxcounts > 0; i++)`
`28`	`29`	`{`
`29`	`30`	`itemRoster = MobileParty.MainParty.ItemRoster;`
	`31`	`+ ItemRosterElements = itemRoster.GetCopyOfAllElements();`
`30`	`32`	`foreach (EquipmentElement EquipmentElement in locks)`
`31`	`33`	`{`
`32`		`- if (EquipmentElement.Item == itemRoster.GetItemAtIndex(i))`
	`34`	`+ if (EquipmentElement.IsEqualTo(ItemRosterElements[i].EquipmentElement))`
`33`	`35`	`{`
`34`	`36`	`IsLocked = true;`
`35`	`37`	`break;`
`36`	`38`	`}`
`37`	`39`	`}`
`38`		`- int item_num = itemRoster.GetItemNumber(itemRoster.GetItemAtIndex(i));`
	`40`	`+ int item_num = ItemRosterElements[i].Amount;`
`39`	`41`	`int j;`
`40`		`- for (j = 0; j < item_num && !IsLocked && itemRoster.GetItemAtIndex(i).IsCraftedWeapon; j++)`
	`42`	`+ for (j = 0; j < item_num && !IsLocked && ItemRosterElements[i].EquipmentElement.Item.IsCraftedWeapon; j++)`
`41`	`43`	`{`
`42`		`- __instance.DoSmelting(hero, itemRoster.GetItemAtIndex(i));`
	`44`	`+ __instance.DoSmelting(hero, ItemRosterElements[i].EquipmentElement);`
`43`	`45`	`maxcounts--;`
`44`	`46`	`if (maxcounts <= 0)`
`45`	`47`	`{`
`@@ -59,27 +61,29 @@ public static void Postfix(ref CraftingCampaignBehavior __instance, Hero hero, I`
`59`	`61`	`if (topScreen != null && Input.IsKeyDown(InputKey.LeftControl) && !TLSmithingFasterOperationCounts.Flag)`
`60`	`62`	`{`
`61`	`63`	`TLSmithingFasterOperationCounts.Flag = true;`
`62`		`- int maxcounts = TLSmithingFasterOperationCounts.GetMaxCounts(ref __instance, hero, item);`
	`64`	`+ int maxcounts = TLSmithingFasterOperationCounts.GetMaxCounts(ref __instance, hero, equipmentElement);`
`63`	`65`	`IEnumerable<EquipmentElement> locks = Campaign.Current.GetCampaignBehavior<InventoryLockTracker>().GetLocks();`
`64`	`66`	`ItemRoster itemRoster = MobileParty.MainParty.ItemRoster;`
	`67`	`+ ItemRosterElement[] ItemRosterElements = itemRoster.GetCopyOfAllElements();`
`65`	`68`	`bool IsLocked = false;`
`66`		`- int max_item_count = itemRoster.Count;`
	`69`	`+ int max_item_count = ItemRosterElements.Length;`
`67`	`70`	`for (int i = 0; i < max_item_count && maxcounts > 0; i++)`
`68`	`71`	`{`
`69`	`72`	`itemRoster = MobileParty.MainParty.ItemRoster;`
	`73`	`+ ItemRosterElements = itemRoster.GetCopyOfAllElements();`
`70`	`74`	`foreach (EquipmentElement EquipmentElement in locks)`
`71`	`75`	`{`
`72`		`- if (EquipmentElement.Item == itemRoster.GetItemAtIndex(i))`
	`76`	`+ if (EquipmentElement.IsEqualTo(ItemRosterElements[i].EquipmentElement))`
`73`	`77`	`{`
`74`	`78`	`IsLocked = true;`
`75`	`79`	`break;`
`76`	`80`	`}`
`77`	`81`	`}`
`78`		`- int item_num = itemRoster.GetItemNumber(itemRoster.GetItemAtIndex(i));`
	`82`	`+ int item_num = ItemRosterElements[i].Amount;`
`79`	`83`	`int j;`
`80`		`- for (j = 0; j < item_num && !IsLocked && itemRoster.GetItemAtIndex(i).IsCraftedWeapon; j++)`
	`84`	`+ for (j = 0; j < item_num && !IsLocked && ItemRosterElements[i].EquipmentElement.Item.IsCraftedWeapon; j++)`
`81`	`85`	`{`
`82`		`- __instance.DoSmelting(hero, itemRoster.GetItemAtIndex(i));`
	`86`	`+ __instance.DoSmelting(hero, ItemRosterElements[i].EquipmentElement);`
`83`	`87`	`maxcounts--;`
`84`	`88`	`if (maxcounts <= 0)`
`85`	`89`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,10 @@ public static int GetMaxCounts(ref CraftingCampaignBehavior instance, Hero hero,`
`31`	`31`	`}`
`32`	`32`	`return result;`
`33`	`33`	`}`
`34`		`- public static int GetMaxCounts(ref CraftingCampaignBehavior instance, Hero hero, ItemObject item)`
	`34`	`+ public static int GetMaxCounts(ref CraftingCampaignBehavior instance, Hero hero, EquipmentElement equipmentElement)`
`35`	`35`	`{`
`36`	`36`	`ItemRoster itemRoster = MobileParty.MainParty.ItemRoster;`
`37`		`- int energyCostForSmelting = Campaign.Current.Models.SmithingModel.GetEnergyCostForSmelting(item, hero);`
	`37`	`+ int energyCostForSmelting = Campaign.Current.Models.SmithingModel.GetEnergyCostForSmelting(equipmentElement.Item, hero);`
`38`	`38`	`int result = instance.GetHeroCraftingStamina(hero) / energyCostForSmelting;`
`39`	`39`	`string charcoal = "charcoal";`
`40`	`40`	`int charcoal_num = 0;`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ protected override void OnSubModuleLoad()`
`15`	`15`	`protected override void OnBeforeInitialModuleScreenSetAsRoot()`
`16`	`16`	`{`
`17`	`17`	`base.OnBeforeInitialModuleScreenSetAsRoot();`
`18`		`- InformationManager.DisplayMessage(new InformationMessage("TL Smithing Faster Mod beta1.3.0.2 is successfully loaded. HarmonyLib 2.0.0.10"));`
	`18`	`+ InformationManager.DisplayMessage(new InformationMessage("TL Smithing Faster Mod beta1.3.0.3 is successfully loaded. HarmonyLib 2.0.0.10"));`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`}`