Fixed bug

indjev99 · Jan 26, 2022 · 09d22e6 · 09d22e6
1 parent 2388c3e
commit 09d22e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/max.model b/max.model
diff --git a/src/Despirala-Engine.cpp b/src/Despirala-Engine.cpp
@@ -999,7 +999,7 @@ void simRegMove(State& s, Occurs& occurs, int extraDice, int reward, Config& con
     {
         if (!instaDone && s.goods > 0) rolls = chooseNumRolls(config);
 
-        won = rolls >= 0 && rolls <= s.goods;
+        won = instaDone || (rolls > 0 && rolls <= s.goods);
         if (!won) rolls = s.goods;
     }
     else
@@ -1012,9 +1012,6 @@ void simRegMove(State& s, Occurs& occurs, int extraDice, int reward, Config& con
         won = isDone(occurs);
     }
 
-    s.goods -= rolls;
-    if (won) s.score += reward;
-
     if (!instaDone && s.goods > 0 && config.logMode == LOG_WRITE) config.logOut << (won ? rolls : -1) << std::endl;
 
     if (!config.manualRolls && config.verbose)
@@ -1023,6 +1020,9 @@ void simRegMove(State& s, Occurs& occurs, int extraDice, int reward, Config& con
         else std::cout << "Didn't complete the combination." << std::endl;
     }
 
+    s.goods -= rolls;
+    if (won) s.score += reward;
+
     s.updateExpScore(getScore(s.free, s.goods), instaDone ? R_NONE : R_LUCK, config.evalLM);
 
     if (won && config.verbose)