Now shift smelting will only smelt selected weapons. (#5)

Now shift smelting will only smelt selected weapons.

Author: TitaniumLithium

TLSmithingFasterMod/TLSmithingFasterCraftingCampaignBehaviorDoSmeltingPatch.cs

@@ -20,54 +20,21 @@ public static void Postfix(ref CraftingCampaignBehavior __instance, Hero hero, E
                 TLSmithingFasterOperationCounts.Flag = true;
                 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 = ItemRosterElements.Length;
-                for (int i = 0; i < max_item_count && maxcounts > 0; i++)
+                for (int i = 0;i < maxcounts; i++)
                 {
-                    itemRoster = MobileParty.MainParty.ItemRoster;
-                    ItemRosterElements = itemRoster.GetCopyOfAllElements();
-                    foreach (EquipmentElement EquipmentElement in locks)
-                    {
-                        if (EquipmentElement.IsEqualTo(ItemRosterElements[i].EquipmentElement))
-                        {
-                            IsLocked = true;
-                            break;
-                        }
-                    }
-                    int item_num = ItemRosterElements[i].Amount;
-                    int j;
-                    for (j = 0; j < item_num && !IsLocked && ItemRosterElements[i].EquipmentElement.Item.IsCraftedWeapon; j++)
-                    {
-                        __instance.DoSmelting(hero, ItemRosterElements[i].EquipmentElement);
-                        maxcounts--;
-                        if (maxcounts <= 0)
-                        {
-                            TLSmithingFasterOperationCounts.Flag = false;
-                            return;
-                        }
-                    }
-                    if (j == item_num)
-                    {
-                        i--;
-                        max_item_count--;
-                    }
-                    IsLocked = false;
+                    __instance.DoSmelting(hero, equipmentElement);
                 }
                 TLSmithingFasterOperationCounts.Flag = false;
             }
             if (topScreen != null && Input.IsKeyDown(InputKey.LeftControl) && !TLSmithingFasterOperationCounts.Flag)
             {
                 TLSmithingFasterOperationCounts.Flag = true;
-                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 = ItemRosterElements.Length;
-                for (int i = 0; i < max_item_count && maxcounts > 0; i++)
+                for (int i = 0; i < max_item_count; i++)
                 {
                     itemRoster = MobileParty.MainParty.ItemRoster;
                     ItemRosterElements = itemRoster.GetCopyOfAllElements();
@@ -83,13 +50,13 @@ public static void Postfix(ref CraftingCampaignBehavior __instance, Hero hero, E
                     int j;
                     for (j = 0; j < item_num && !IsLocked && ItemRosterElements[i].EquipmentElement.Item.IsCraftedWeapon; j++)
                     {
-                        __instance.DoSmelting(hero, ItemRosterElements[i].EquipmentElement);
-                        maxcounts--;
+                        int maxcounts = TLSmithingFasterOperationCounts.GetMaxCounts(ref __instance, hero, ItemRosterElements[i].EquipmentElement);
                         if (maxcounts <= 0)
                         {
                             TLSmithingFasterOperationCounts.Flag = false;
                             return;
                         }
+                        __instance.DoSmelting(hero, ItemRosterElements[i].EquipmentElement);
                     }
                     if (j == item_num)
                     {

TLSmithingFasterMod/TLSmithingFasterSubModule.cs

@@ -15,7 +15,7 @@ protected override void OnSubModuleLoad()
         protected override void OnBeforeInitialModuleScreenSetAsRoot()
         {
             base.OnBeforeInitialModuleScreenSetAsRoot();
-            InformationManager.DisplayMessage(new InformationMessage("TLSmithingFasterMod e1.3.0.1 is successfully loaded."));
+            InformationManager.DisplayMessage(new InformationMessage("TLSmithingFasterMod e1.3.0.2 is successfully loaded."));
         }
     }
 }