sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 00:28:20 +08:00
Code Activity

Fix: Limit expected emotion reduce to 29 at max

Browse Source
This commit is contained in:
LmeSzinc
2023-04-11 22:44:21 +08:00
parent 37f932688e
commit 5105b4bfec
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module/combat/emotion.py
View File

@@ -133,6 +133,13 @@ class FleetEmotion:
f'Fleet {self.fleet} Recover Location=\"Docks\" can not be used together, ' f'Fleet {self.fleet} Recover Location=\"Docks\" can not be used together, '
'please check your emotion settings') 'please check your emotion settings')
raise RequestHumanTakeover raise RequestHumanTakeover
# In 14-4 with 2X book, expected emotion reduce is 32, can't keep happy bonus (>120),
# otherwise will infinite task delay
if self.control == 'keep_exp_bonus' and expected_reduce >= 29:
expected_reduce = 29
logger.info(f'Fleet {self.fleet} expected_reduce is limited to 29 '
f'when Emotion Control=\"Keep Happy Bonus\"')
recover_count = (self.limit + expected_reduce - self.current) // self.speed recover_count = (self.limit + expected_reduce - self.current) // self.speed
recovered = (int(datetime.now().timestamp()) // 360 + recover_count + 1) * 360 recovered = (int(datetime.now().timestamp()) // 360 + recover_count + 1) * 360
return datetime.fromtimestamp(recovered) return datetime.fromtimestamp(recovered)