Fixed an OptimalItem() Bug

- Prevented the OptimalItem() method from highlighting an already maxed upgrade item.
Cons-Cat · Jan 28, 2020 · 8de975f · 8de975f
1 parent a6c0e67
commit 8de975f
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 16 deletions.
diff --git a/Source/.vs/Source/v16/.suo b/Source/.vs/Source/v16/.suo
diff --git a/Source/.vs/Source/v16/Server/sqlite3/storage.ide b/Source/.vs/Source/v16/Server/sqlite3/storage.ide
diff --git a/Source/Renderer.cs b/Source/Renderer.cs
@@ -711,25 +711,28 @@ private uint OptimalItem()
                     // Do not consider upgrades for agents that do not exist.
                     if (agentCount[i].value > 0)
                     {
-                        // Divide each Upgrade's price by its immediate income rate.
-                        MassiveNumber calcNumber2 = new MassiveNumber();
-                        calcNumber2.value = upgraPrice[i].value;
-                        calcNumber2.echelon = upgraPrice[i].echelon;
+                        if (upgraCount[i].value < 3)
+                        {
+                            // Divide each Upgrade's price by its immediate income rate.
+                            MassiveNumber calcNumber2 = new MassiveNumber();
+                            calcNumber2.value = upgraPrice[i].value;
+                            calcNumber2.echelon = upgraPrice[i].echelon;
 
-                        MassiveNumber UpgradeIncome = new MassiveNumber();
-                        UpgradeIncome.value = agentCount[i].Mult(upgraIncomeMult[i] + 1, 1);
-                        UpgradeIncome.UpdateEchelon();
+                            MassiveNumber UpgradeIncome = new MassiveNumber();
+                            UpgradeIncome.value = agentCount[i].Mult(upgraIncomeMult[i] + 1, 1);
+                            UpgradeIncome.UpdateEchelon();
 
-                        calcNumber2.value = UpgradeIncome.Div(upgraPrice[i].value, upgraPrice[i].echelon);
-                        calcNumber2.UpdateEchelon();
+                            calcNumber2.value = UpgradeIncome.Div(upgraPrice[i].value, upgraPrice[i].echelon);
+                            calcNumber2.UpdateEchelon();
 
-                        // If this is the shortest time to break even.
-                        if (!calcNumber2.IsGreaterThan(tempNumber))
-                        {
-                            returnRow = i;
-                            optimalIsAgent = false;         // Side effect.
-                            tempNumber.value = calcNumber2.value;
-                            tempNumber.echelon = calcNumber2.echelon;
+                            // If this is the shortest time to break even.
+                            if (!calcNumber2.IsGreaterThan(tempNumber))
+                            {
+                                returnRow = i;
+                                optimalIsAgent = false;         // Side effect.
+                                tempNumber.value = calcNumber2.value;
+                                tempNumber.echelon = calcNumber2.echelon;
+                            }
                         }
                     }
                 }

diff --git a/Source/bin/Debug/Source.exe b/Source/bin/Debug/Source.exe
diff --git a/Source/bin/Debug/Source.pdb b/Source/bin/Debug/Source.pdb
diff --git a/Source/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Source/obj/Debug/DesignTimeResolveAssemblyReferences.cache
diff --git a/Source/obj/Debug/Source.csprojAssemblyReference.cache b/Source/obj/Debug/Source.csprojAssemblyReference.cache
diff --git a/Source/obj/Debug/Source.exe b/Source/obj/Debug/Source.exe
diff --git a/Source/obj/Debug/Source.pdb b/Source/obj/Debug/Source.pdb