fix a bug of index change (#1)

TitaniumLithium · web-flow · commit 142163fc274e · 2020-05-06T15:00:07.000+08:00
fix a bug that unexpectedly skipping to smelt some weapons because of index change.
diff --git a/TLSmithingFasterMod/TLSmithingFasterCraftingCampaignBehaviorDoSmeltingPatch.cs b/TLSmithingFasterMod/TLSmithingFasterCraftingCampaignBehaviorDoSmeltingPatch.cs
@@ -36,7 +36,8 @@ public static void Postfix(ref CraftingCampaignBehavior __instance, Hero hero, I
                         }
                     }
                     int item_num = itemRoster.GetItemNumber(itemRoster.GetItemAtIndex(i));
-                    for (int j = 0; j < item_num && !IsLocked && itemRoster.GetItemAtIndex(i).IsCraftedWeapon; j++)
+                    int j;
+                    for (j = 0; j < item_num && !IsLocked && itemRoster.GetItemAtIndex(i).IsCraftedWeapon; j++)
                     {
                         __instance.DoSmelting(hero, itemRoster.GetItemAtIndex(i));
                         maxcounts--;
@@ -46,6 +47,11 @@ public static void Postfix(ref CraftingCampaignBehavior __instance, Hero hero, I
                             return;
                         }
                     }
+                    if (j == item_num)
+                    {
+                        i--;
+                        max_item_count--;
+                    }
                     IsLocked = false;
                 }
                 TLSmithingFasterOperationCounts.Flag = false;
@@ -70,7 +76,8 @@ public static void Postfix(ref CraftingCampaignBehavior __instance, Hero hero, I
                         }
                     }
                     int item_num = itemRoster.GetItemNumber(itemRoster.GetItemAtIndex(i));
-                    for (int j = 0; j < item_num && !IsLocked && itemRoster.GetItemAtIndex(i).IsCraftedWeapon; j++)
+                    int j;
+                    for (j = 0; j < item_num && !IsLocked && itemRoster.GetItemAtIndex(i).IsCraftedWeapon; j++)
                     {
                         __instance.DoSmelting(hero, itemRoster.GetItemAtIndex(i));
                         maxcounts--;
@@ -80,6 +87,11 @@ public static void Postfix(ref CraftingCampaignBehavior __instance, Hero hero, I
                             return;
                         }
                     }
+                    if (j == item_num)
+                    {
+                        i--;
+                        max_item_count--;
+                    }
                     IsLocked = false;
                 }
                 TLSmithingFasterOperationCounts.Flag = false;

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ public static void Postfix(ref CraftingCampaignBehavior __instance, Hero hero, I`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`int item_num = itemRoster.GetItemNumber(itemRoster.GetItemAtIndex(i));`
`39`		`- for (int j = 0; j < item_num && !IsLocked && itemRoster.GetItemAtIndex(i).IsCraftedWeapon; j++)`
	`39`	`+ int j;`
	`40`	`+ for (j = 0; j < item_num && !IsLocked && itemRoster.GetItemAtIndex(i).IsCraftedWeapon; j++)`
`40`	`41`	`{`
`41`	`42`	`__instance.DoSmelting(hero, itemRoster.GetItemAtIndex(i));`
`42`	`43`	`maxcounts--;`
`@@ -46,6 +47,11 @@ public static void Postfix(ref CraftingCampaignBehavior __instance, Hero hero, I`
`46`	`47`	`return;`
`47`	`48`	`}`
`48`	`49`	`}`
	`50`	`+ if (j == item_num)`
	`51`	`+ {`
	`52`	`+ i--;`
	`53`	`+ max_item_count--;`
	`54`	`+ }`
`49`	`55`	`IsLocked = false;`
`50`	`56`	`}`
`51`	`57`	`TLSmithingFasterOperationCounts.Flag = false;`
`@@ -70,7 +76,8 @@ public static void Postfix(ref CraftingCampaignBehavior __instance, Hero hero, I`
`70`	`76`	`}`
`71`	`77`	`}`
`72`	`78`	`int item_num = itemRoster.GetItemNumber(itemRoster.GetItemAtIndex(i));`
`73`		`- for (int j = 0; j < item_num && !IsLocked && itemRoster.GetItemAtIndex(i).IsCraftedWeapon; j++)`
	`79`	`+ int j;`
	`80`	`+ for (j = 0; j < item_num && !IsLocked && itemRoster.GetItemAtIndex(i).IsCraftedWeapon; j++)`
`74`	`81`	`{`
`75`	`82`	`__instance.DoSmelting(hero, itemRoster.GetItemAtIndex(i));`
`76`	`83`	`maxcounts--;`
`@@ -80,6 +87,11 @@ public static void Postfix(ref CraftingCampaignBehavior __instance, Hero hero, I`
`80`	`87`	`return;`
`81`	`88`	`}`
`82`	`89`	`}`
	`90`	`+ if (j == item_num)`
	`91`	`+ {`
	`92`	`+ i--;`
	`93`	`+ max_item_count--;`
	`94`	`+ }`
`83`	`95`	`IsLocked = false;`
`84`	`96`	`}`
`85`	`97`	`TLSmithingFasterOperationCounts.Flag = false;`