From c839732fd926d9571d6c39bf7a111f0bfa324cf8 Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Tue, 27 Aug 2024 11:53:34 +0800
Subject: [PATCH] Fix: Stamina status wasn't updated before checking

---
 tasks/combat/combat.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tasks/combat/combat.py b/tasks/combat/combat.py
index cf05487c6..55728654f 100644
--- a/tasks/combat/combat.py
+++ b/tasks/combat/combat.py
@@ -32,13 +32,12 @@ class Combat(CombatInteract, CombatPrepare, CombatState, CombatTeam, CombatSuppo
         """
         self.combat_waves = 1
         cost = self.combat_get_wave_cost()
-        if self.config.stored.TrailblazePower.value < self.combat_wave_cost:
+        current = self.combat_get_trailblaze_power()
+        if current < self.combat_wave_cost:
             if self._try_get_more_trablaize_power(self.combat_wave_cost):
                 current = self.config.stored.TrailblazePower.value
             else:
                 return False
-        else:
-            current = self.combat_get_trailblaze_power()
 
         if cost == 10:
             # Calyx
@@ -61,7 +60,7 @@ class Combat(CombatInteract, CombatPrepare, CombatState, CombatTeam, CombatSuppo
 
         # Check limits
         if self.config.stored.TrailblazePower.value < self.combat_wave_cost:
-            return False
+            return self._try_get_more_trablaize_power(self.combat_wave_cost)
         if self.combat_waves <= 0:
             logger.info('Combat wave limited, cannot continue combat')
             return False
@@ -220,9 +219,6 @@ class Combat(CombatInteract, CombatPrepare, CombatState, CombatTeam, CombatSuppo
         if self.obtain_frequent_check:
             logger.info('Exit combat to check obtained items')
             return False
-        if self.combat_waves <= 0:
-            logger.warning(f'combat_waves {self.combat_waves} <= 0 in _combat_can_again, revise to 1')
-            self.combat_waves = 1
         # Wave limit
         if self.combat_wave_limit:
             if self.combat_wave_done + self.combat_waves > self.combat_wave_limit: