Fix: Combat should return wave count

This commit is contained in:
LmeSzinc 2024-01-02 03:54:54 +08:00
parent 4cd2e06849
commit 1ba3882eaf

View File

@ -318,7 +318,6 @@ class Combat(CombatInteract, CombatPrepare, CombatState, CombatTeam, CombatSuppo
self.combat_wave_limit = wave_limit self.combat_wave_limit = wave_limit
self.combat_wave_done = 0 self.combat_wave_done = 0
run_count = 0
while 1: while 1:
logger.hr('Combat', level=2) logger.hr('Combat', level=2)
logger.info(f'Combat, team={team}, wave={self.combat_wave_done}/{self.combat_wave_limit}') logger.info(f'Combat, team={team}, wave={self.combat_wave_done}/{self.combat_wave_limit}')
@ -333,9 +332,8 @@ class Combat(CombatInteract, CombatPrepare, CombatState, CombatTeam, CombatSuppo
finish = self.combat_finish() finish = self.combat_finish()
if self._combat_should_reenter(): if self._combat_should_reenter():
continue continue
run_count += 1
if finish: if finish:
break break
logger.attr('CombatRunCount', run_count) logger.attr('combat_wave_done', self.combat_wave_done)
return run_count return self.combat_wave_done