diff --git a/config/template.ini b/config/template.ini index 38e7d8324..06fdd44ba 100644 --- a/config/template.ini +++ b/config/template.ini @@ -246,7 +246,6 @@ ammo_pick_up_124 = 3 command = c124_leveling [Gems_farming] -gems_auto_search_farming = yes gems_stage = 2-4 gems_fleet_1 = 1 gems_fleet_2 = 6 diff --git a/module/campaign/gems_farming.py b/module/campaign/gems_farming.py index f019fee26..eb2373aaa 100644 --- a/module/campaign/gems_farming.py +++ b/module/campaign/gems_farming.py @@ -226,7 +226,7 @@ class GemsFarming(CampaignRun, EquipmentChange): logger.hr('Triggered lv32 limit') return True - if self.config.GEMS_AUTO_SEARCH_FARMING and self.campaign.config.GEMS_EMOTION_TRIGGRED: + if self.config.ENABLE_AUTO_SEARCH and self.campaign.config.GEMS_EMOTION_TRIGGRED: self._trigger_emotion = True logger.hr('Triggered emotion limit') return True @@ -235,7 +235,7 @@ class GemsFarming(CampaignRun, EquipmentChange): - @Config.when(GEMS_AUTO_SEARCH_FARMING=True) + @Config.when(ENABLE_AUTO_SEARCH=True) def run(self, name, folder='campaign_main', total=0): name = name.lower() if not name[0].isdigit(): @@ -260,7 +260,6 @@ class GemsFarming(CampaignRun, EquipmentChange): STOP_IF_MAP_REACH='no', ENABLE_EMOTION_REDUCE=False, IGNORE_LOW_EMOTION_WARN=True, - GEMS_AUTO_SEARCH_FARMING = True, ) self._trigger_lv32 = False @@ -280,7 +279,7 @@ class GemsFarming(CampaignRun, EquipmentChange): backup.recover() break - @Config.when(GEMS_AUTO_SEARCH_FARMING=False) + @Config.when(ENABLE_AUTO_SEARCH=False) def run(self, name, folder='campaign_main', total=0): name = name.lower() diff --git a/module/config/config.py b/module/config/config.py index dbec09df3..73f6a970d 100644 --- a/module/config/config.py +++ b/module/config/config.py @@ -129,7 +129,6 @@ class AzurLaneConfig: """ gems_farming """ - GEMS_AUTO_SEARCH_FARMING = True GEMS_STAGE = '2-4' GEMS_FLEET_1 = 1 GEMS_FLEET_2 = 6 @@ -889,7 +888,6 @@ class AzurLaneConfig: # Gems_farming option = config['Gems_farming'] - self.GEMS_AUTO_SEARCH_FARMING = to_bool(option['gems_auto_search_farming']) self.GEMS_STAGE = option['gems_stage'] self.GEMS_FLEET_1 = int(option['gems_fleet_1']) self.GEMS_FLEET_2 = int(option['gems_fleet_2']) diff --git a/module/map/map_fleet_preparation.py b/module/map/map_fleet_preparation.py index c791b8bad..54e2a0514 100644 --- a/module/map/map_fleet_preparation.py +++ b/module/map/map_fleet_preparation.py @@ -211,12 +211,12 @@ class FleetPreparation(ModuleBase): def check_flag_ship_level(self): ''' check flag ship level - turn LV32_TRIGGERED true if in GEMS_AUTO_SEARCH_FARMING + turn LV32_TRIGGERED true if in ENABLE_AUTO_SEARCH ''' level_ocr = LevelOcr(buttons=FLEET_1_FLAG_SHIP_LEVEL, name='FLAG SHIP LEVEL') flag_ship_level = level_ocr.ocr(self.device.image) - if self.config.GEMS_AUTO_SEARCH_FARMING: + if self.config.ENABLE_AUTO_SEARCH: if flag_ship_level > 32: self.config.LV32_TRIGGERED = True self.config.GEMS_LEVEL_CHECK = False