Skip to content

Commit aa08764

Browse files
committed
Fix: check_reduce in GemsFarming
1 parent d0e7200 commit aa08764

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

module/campaign/gems_farming.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,13 @@ def check_reduce(self, battle):
3737
Raise:
3838
CampaignEnd: Pause current task to prevent emotion control in the future.
3939
"""
40-
41-
try:
42-
super().check_reduce(battle)
43-
except ScriptEnd:
40+
if not self.is_calculate:
41+
return
42+
43+
recovered, delay = self._check_reduce(battle)
44+
if delay:
4445
self.config.GEMS_EMOTION_TRIGGERED = True
45-
self.config.task_delay(minute=0) # to undo emotion delay
46+
logger.info('Detect low emotion, pause current task')
4647
raise CampaignEnd('Emotion control')
4748

4849
def wait(self, fleet_index):

module/combat/emotion.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ def _check_reduce(self, battle):
230230
self.record()
231231
self.show()
232232
recovered = max([f.get_recovered(b) for f, b in zip(self.fleets, battle)])
233-
delay = recover_count > datetime.now()
233+
delay = recovered > datetime.now()
234234
return recovered, delay
235235

236236
def check_reduce(self, battle):

0 commit comments

Comments
 (0)