Merge pull request #605 from LmeSzinc/dev

Bug fix

tasks/combat/prepare.py

@@ -64,13 +64,13 @@ class CombatPrepare(StaminaStatus):
                 self.device.screenshot()
 
             data = self.update_stamina_status(image=self.device.image)
+            if timeout.reached():
+                break
             if data.stamina is None:
                 continue
             # Confirm if it is > 240, sometimes just OCR errors
             # if current > 240 and timeout.reached():
             #     break
-            if expect_reduce and timeout.reached():
-                break
             if expect_reduce and data.stamina >= before:
                 continue
             if data.stamina <= 240:

tasks/combat/stamina_status.py

@@ -20,6 +20,8 @@ class StaminaOcr(DigitCounter):
         result = re.sub(r'1240$', '/240', result)
         # 0*0/24 -> 0/240
         result = re.sub(r'24$', '240', result)
+        # * 50/2401+)
+        result = result.replace('/2401', '/240')
         return result