Merge pull request #62 from timotheeg/simpler_state_transition

Update state without checking values
alex-ong · Jul 7, 2021 · 488beeb · 488beeb
2 parents efeeb68 + 6a755a3
commit 488beeb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/nestris_ocr/scan_strat/base_strategy.py b/nestris_ocr/scan_strat/base_strategy.py
@@ -30,7 +30,7 @@ def __init__(self):
         self.start_level = None
         self.field = None
         self.preview = None
-        self.gameid = 0
+        self.gameid = 1
         self.piece_stats = PieceStatAccumulator()
         self.gamestate = GameState.MENU
         self.cur_piece = None

diff --git a/nestris_ocr/scan_strat/naive_strategy.py b/nestris_ocr/scan_strat/naive_strategy.py
@@ -26,6 +26,7 @@
 class NaiveStrategy(BaseStrategy):
     def __init__(self, *args):
         super(NaiveStrategy, self).__init__(*args)
+        self.gamestate = GameState.IN_GAME  # allows starting OCR mid-game
         self.tasks = self.setup_tasks()
         self.interpolate = config["calibration.color_interpolation"]
 
@@ -83,7 +84,7 @@ def update_menu(self):
 
         if self.lines and self.score and self.level:
             self.gamestate = GameState.IN_GAME
-            if self.lines == "000" and self.score == "000000":
+            if (self.lines == "000" or self.lines == "025") and self.score == "000000":
                 return True
 
         return False