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

Opt: Re-organise CalculateEmotion and IgnoreLowEmotionWarn

Browse Source
This commit is contained in:
LmeSzinc
2023-02-18 01:19:04 +08:00
parent b63cf43568
commit d191d16649
18 changed files with 211 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/campaign/gems_farming.py
View File

@@ -24,7 +24,7 @@ class GemsCampaignOverride(CampaignBase):
If GEMS_LOW_EMOTION_WITHDRAW is True, withdraw combat and change flag ship
"""
if self.config.GemsFarming_LowEmotionRetreat:
if not self.config.Emotion_IgnoreLowEmotionWarn:
if not self.emotion.is_ignore:
return False
if self.handle_popup_cancel('IGNORE_LOW_EMOTION'):
self.config.GEMS_EMOTION_TRIGGRED = True

2
module/campaign/run.py
View File

@@ -108,7 +108,7 @@ class CampaignRun(CampaignEvent):
Returns:
bool: If triggered a restart condition.
"""
if not self.campaign.config.Emotion_IgnoreLowEmotionWarn:
if not self.campaign.emotion.is_ignore:
if self.campaign.emotion.triggered_bug():
logger.info('Triggered restart avoid emotion bug')
return True