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

Upd: calculate gemsfarming vanguard emotion only

Browse Source
This commit is contained in:
sui-feng-cb
2024-09-20 02:32:05 +08:00
parent 84af3dab2d
commit 64bb890c85
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
module/campaign/gems_farming.py
View File

@@ -545,9 +545,8 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange, GemsEquipmentHandler):
ship = self.get_common_rarity_cv() ship = self.get_common_rarity_cv()
if ship: if ship:
target_ship = min(ship, key=lambda s: (s.level, -s.emotion)) self._ship_change_confirm(min(ship, key=lambda s: (s.level, -s.emotion)).button)
self.set_emotion(target_ship.emotion)
self._ship_change_confirm(target_ship.button)
if self.hard_mode: if self.hard_mode:
self.FLEET_ENTER_FLAGSHIP = self._FLEET_ENTER_FLAGSHIP self.FLEET_ENTER_FLAGSHIP = self._FLEET_ENTER_FLAGSHIP
@@ -562,9 +561,7 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange, GemsEquipmentHandler):
max_level = 70 max_level = 70
ship = self.get_common_rarity_cv(lv=max_level, emotion=0) ship = self.get_common_rarity_cv(lv=max_level, emotion=0)
if ship and self.hard_mode: if ship and self.hard_mode:
target_ship = min(ship, key=lambda s: (s.level, -s.emotion)) self._ship_change_confirm(min(ship, key=lambda s: (s.level, -s.emotion)).button)
self.set_emotion(target_ship.emotion)
self._ship_change_confirm(target_ship.button)
else: else:
if self.hard_mode: if self.hard_mode:
raise RequestHumanTakeover raise RequestHumanTakeover
@@ -622,7 +619,7 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange, GemsEquipmentHandler):
if self.hard_mode: if self.hard_mode:
self.FLEET_ENTER = self._FLEET_ENTER self.FLEET_ENTER = self._FLEET_ENTER
target_ship = max(ship, key=lambda s: s.emotion) target_ship = max(ship, key=lambda s: s.emotion)
self.set_emotion(min(self.get_emotion(), target_ship.emotion)) self.set_emotion(target_ship.emotion)
self._ship_change_confirm(target_ship.button) self._ship_change_confirm(target_ship.button)
logger.info('Change vanguard ship success') logger.info('Change vanguard ship success')
@@ -633,7 +630,7 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange, GemsEquipmentHandler):
ship = self.get_common_rarity_dd(emotion=0) ship = self.get_common_rarity_dd(emotion=0)
if ship and self.hard_mode: if ship and self.hard_mode:
target_ship = max(ship, key=lambda s: s.emotion) target_ship = max(ship, key=lambda s: s.emotion)
self.set_emotion(min(self.get_emotion(), target_ship.emotion)) self.set_emotion(target_ship.emotion)
self._ship_change_confirm(target_ship.button) self._ship_change_confirm(target_ship.button)
else: else:
if self.hard_mode: if self.hard_mode:
@@ -661,12 +658,6 @@ class GemsFarming(CampaignRun, Dock, EquipmentChange, GemsEquipmentHandler):
return super().triggered_stop_condition(oil_check=oil_check) return super().triggered_stop_condition(oil_check=oil_check)
def get_emotion(self):
if self.config.Fleet_FleetOrder == 'fleet1_standby_fleet2_all':
return self.campaign.config.Emotion_Fleet2Value
else:
return self.campaign.config.Emotion_Fleet1Value
def set_emotion(self, emotion): def set_emotion(self, emotion):
if self.config.Fleet_FleetOrder == 'fleet1_standby_fleet2_all': if self.config.Fleet_FleetOrder == 'fleet1_standby_fleet2_all':
self.campaign.config.set_record(Emotion_Fleet2Value=emotion) self.campaign.config.set_record(Emotion_Fleet2Value=emotion)