From c244575c94aee4340c579c138c3b68ac076461b9 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Thu, 28 Jan 2021 00:43:06 +0800 Subject: [PATCH] Fix: _emotion_expected_reduce when using one fleet to clear all --- module/campaign/campaign_base.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/module/campaign/campaign_base.py b/module/campaign/campaign_base.py index d7c61a530..f9d26cb93 100644 --- a/module/campaign/campaign_base.py +++ b/module/campaign/campaign_base.py @@ -137,10 +137,16 @@ class CampaignBase(CampaignUI, Map, AutoSearchCombat): @cached_property def _emotion_expected_reduce(self): + """ + Returns: + tuple(int): Mob fleet emotion reduce, BOSS fleet emotion reduce + """ for data in self.MAP.spawn_data: if 'boss' in data: battle = data.get('battle') reduce = (battle * 2, 2) + if self.config.AUTO_SEARCH_SETTING in ['fleet1_boss_fleet2_mob', 'fleet1_standby_fleet2_all']: + reduce = (reduce[0] + reduce[1], 0) return reduce logger.warning('No boss data found in spawn_data')