ATITD-Tools/Desert-Paint-Lab Changeset

Changeset - 3463e3d12e78

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Jason Maltzen (jmaltzen) - 6 years ago 2018-05-18 18:07:15
jason.maltzen@unsanctioned.net

Fix a bug where recipe generation could use up to 1 more than MaxConcentration

1 file changed with 16 insertions and 7 deletions:

RecipeGenerator.cs

0 comments (0 inline, 0 general)

RecipeGenerator.cs

➞

Show inline comments

@@ ... / @@ -188,8 +188,16 @@ namespace DesertPaintLab @@
+            }
             costSortedReagents.Sort(new ReagentCostSort());
+        }
         // Generate paint recipes.
         // minConcentration - the minimum permitted concentration in a recipe (10 for paint, 50 for ribbons)
         // maxConcentration - the maximum concentrataion for a recipe
         // minReagents - the minimum number of ingredients in a recipe
         // maxReagents - the maximum number of ingredients allowed in a recipe
         // fullQuantityDepth - at this depth of ingredient or below, allow up to fullQuantity of any reagent
         // fullQuantity - the maximum amount of any reagent to permit up to the full quantity depth. After that, reagents are limited by the
         //                per-reagent value
         public void BeginRecipeGeneration(uint minConcentration, uint maxConcentration, uint minReagents, uint maxReagents, uint fullQuantityDepth, uint fullQuantity)
+        {
             if (running)
+            {
@@ ... / @@ -491,9 +499,11 @@ namespace DesertPaintLab @@
                 if (ok)
+                {
                     if (Mode == SearchType.DEPTH_FIRST)
+                    {
                         uint targetQuantity = (node.ReagentCount <= FullQuantityDepth) ? ((uint)node.ReagentCount * FullQuantity) : node.MaxConcentration + 1;
                         uint targetQuantity = (node.ReagentCount <= FullQuantityDepth)
                             ? ((uint)node.ReagentCount * FullQuantity)
                             : node.MaxConcentration + 1;
                         do {
                             --targetQuantity;
                             node.InitForQuantity(targetQuantity);
                         } while (targetQuantity > MinConcentration && (node.CurrentTargetQuantity != node.UsedQuantity));
@@ ... / @@ -509,20 +519,19 @@ namespace DesertPaintLab @@
                     else
+                    {
                         // breadth-first search
                         uint targetQuantity = MinConcentration-1;
                         uint quantityLimit = (node.ReagentCount <= FullQuantityDepth) ? (FullQuantity * (uint)node.ReagentCount) : node.MaxConcentration;
                         uint quantityLimit = (node.ReagentCount <= FullQuantityDepth)
                             ? (FullQuantity * (uint)node.ReagentCount)
                             : node.MaxConcentration;
                         do {
                             ++targetQuantity;
                             node.InitForQuantity(targetQuantity);
-                        } while ((targetQuantity <= quantityLimit) && (node.CurrentTargetQuantity != node.UsedQuantity));
                         } while ((targetQuantity < quantityLimit) && (node.CurrentTargetQuantity != node.UsedQuantity));
                         while ((ok = IterateBreadthFirst(node)) && !requestCancel)
+                        {
                             if (Progress != null)
+                            {
                                 Progress(this, null);
+                            }
                             Progress?.Invoke(this, null);
+                        }
+                    }
                     if (ok)
+                    {

0 comments (0 inline, 0 general)