mirror of
https://github.com/sui-feng-cb/AzurLaneAutoScript1.git
synced 2026-07-13 10:58:02 +08:00
Add: GemsFarming hard mode (#5598)
* Refactor: delete equipment change usage in alas * Refactor: class GemsFarming * Add: assets for equipment code * Add: config for equipment code * Add: class EquipmentCodeHandler * Add: config for equipment code in GemsFarming * Add: GemsFarming equipment change * Add: submarine support for GemsFarming * Add: config for emotion control in GemsFarming * Add: GemsFarming emotion control * Add: assets for hard mode of GemsFarming * Upd: asset FLEET_ENTER and FLEET_ENTER_FLAGSHIP * Add: GemsFarming hard mode * Fix: handle empty fleet in gemsfarming hard mode * Add: check control method before equipment code usage * Opt: use self.device.click for Hierarchy button in fastinput_ime_enable * Chore: abstract set_fastinput_ime method for EquipmentCodeHandler * Opt: use fleet1 emotion to represent attack fleet's emotion and hide fleet2 emotion * Opt: use HardNotSatisfied to delay gemsfarming hard * Opt: put emotion setting of gemsfarming to last
This commit is contained in:
@@ -1599,6 +1599,14 @@
|
||||
}
|
||||
},
|
||||
"GemsFarming": {
|
||||
"ChangeFlagship": {
|
||||
"type": "select",
|
||||
"value": "ship",
|
||||
"option": [
|
||||
"ship",
|
||||
"ship_equip"
|
||||
]
|
||||
},
|
||||
"CommonCV": {
|
||||
"type": "select",
|
||||
"value": "any",
|
||||
@@ -1615,7 +1623,8 @@
|
||||
"value": "ship",
|
||||
"option": [
|
||||
"disabled",
|
||||
"ship"
|
||||
"ship",
|
||||
"ship_equip"
|
||||
]
|
||||
},
|
||||
"CommonDD": {
|
||||
@@ -1634,6 +1643,17 @@
|
||||
"value": true
|
||||
}
|
||||
},
|
||||
"EquipmentCode": {
|
||||
"ExportToConfig": {
|
||||
"type": "checkbox",
|
||||
"value": true
|
||||
},
|
||||
"Config": {
|
||||
"type": "textarea",
|
||||
"value": "DD: null\nbogue: null\nhermes: null\nlangley: null\nranger: null",
|
||||
"mode": "yaml"
|
||||
}
|
||||
},
|
||||
"Campaign": {
|
||||
"Name": {
|
||||
"type": "input",
|
||||
@@ -1831,6 +1851,131 @@
|
||||
"display": "display"
|
||||
}
|
||||
},
|
||||
"Submarine": {
|
||||
"Fleet": {
|
||||
"type": "select",
|
||||
"value": 0,
|
||||
"option": [
|
||||
0,
|
||||
1,
|
||||
2
|
||||
]
|
||||
},
|
||||
"Mode": {
|
||||
"type": "select",
|
||||
"value": "do_not_use",
|
||||
"option": [
|
||||
"do_not_use",
|
||||
"hunt_only"
|
||||
],
|
||||
"display": "display"
|
||||
},
|
||||
"AutoSearchMode": {
|
||||
"type": "select",
|
||||
"value": "sub_standby",
|
||||
"option": [
|
||||
"sub_standby",
|
||||
"sub_auto_call"
|
||||
],
|
||||
"display": "hide"
|
||||
},
|
||||
"DistanceToBoss": {
|
||||
"type": "select",
|
||||
"value": "use_open_ocean_support",
|
||||
"option": [
|
||||
"to_boss_position",
|
||||
"1_grid_to_boss",
|
||||
"2_grid_to_boss",
|
||||
"use_open_ocean_support"
|
||||
],
|
||||
"display": "hide"
|
||||
}
|
||||
},
|
||||
"Emotion": {
|
||||
"Mode": {
|
||||
"type": "select",
|
||||
"value": "calculate_ignore",
|
||||
"option": [
|
||||
"calculate",
|
||||
"ignore",
|
||||
"calculate_ignore"
|
||||
],
|
||||
"display": "hide"
|
||||
},
|
||||
"Fleet1Value": {
|
||||
"type": "input",
|
||||
"value": 119
|
||||
},
|
||||
"Fleet1Record": {
|
||||
"type": "datetime",
|
||||
"value": "2020-01-01 00:00:00",
|
||||
"validate": "datetime",
|
||||
"display": "disabled"
|
||||
},
|
||||
"Fleet1Control": {
|
||||
"type": "select",
|
||||
"value": "prevent_red_face",
|
||||
"option": [
|
||||
"keep_exp_bonus",
|
||||
"prevent_green_face",
|
||||
"prevent_yellow_face",
|
||||
"prevent_red_face"
|
||||
],
|
||||
"display": "hide"
|
||||
},
|
||||
"Fleet1Recover": {
|
||||
"type": "select",
|
||||
"value": "not_in_dormitory",
|
||||
"option": [
|
||||
"not_in_dormitory",
|
||||
"dormitory_floor_1",
|
||||
"dormitory_floor_2"
|
||||
],
|
||||
"display": "hide"
|
||||
},
|
||||
"Fleet1Oath": {
|
||||
"type": "checkbox",
|
||||
"value": false,
|
||||
"display": "hide"
|
||||
},
|
||||
"Fleet2Value": {
|
||||
"type": "input",
|
||||
"value": 119,
|
||||
"display": "hide"
|
||||
},
|
||||
"Fleet2Record": {
|
||||
"type": "datetime",
|
||||
"value": "2020-01-01 00:00:00",
|
||||
"validate": "datetime",
|
||||
"display": "hide"
|
||||
},
|
||||
"Fleet2Control": {
|
||||
"type": "select",
|
||||
"value": "prevent_red_face",
|
||||
"option": [
|
||||
"keep_exp_bonus",
|
||||
"prevent_green_face",
|
||||
"prevent_yellow_face",
|
||||
"prevent_red_face"
|
||||
],
|
||||
"display": "hide"
|
||||
},
|
||||
"Fleet2Recover": {
|
||||
"type": "select",
|
||||
"value": "not_in_dormitory",
|
||||
"option": [
|
||||
"not_in_dormitory",
|
||||
"dormitory_floor_1",
|
||||
"dormitory_floor_2"
|
||||
],
|
||||
"display": "hide"
|
||||
},
|
||||
"Fleet2Oath": {
|
||||
"type": "checkbox",
|
||||
"value": false,
|
||||
"display": "hide"
|
||||
}
|
||||
},
|
||||
"Storage": {
|
||||
"Storage": {
|
||||
"type": "storage",
|
||||
|
||||
@@ -266,16 +266,25 @@ C124LargeLeveling:
|
||||
value: 3
|
||||
option: [ 3, 4, 5 ]
|
||||
GemsFarming:
|
||||
ChangeFlagship:
|
||||
value: ship
|
||||
option: [ ship, ship_equip ]
|
||||
CommonCV:
|
||||
value: any
|
||||
option: [ any, langley, bogue, ranger, hermes ]
|
||||
ChangeVanguard:
|
||||
value: ship
|
||||
option: [ disabled, ship ]
|
||||
option: [ disabled, ship, ship_equip ]
|
||||
CommonDD:
|
||||
value: any
|
||||
option: [ any, favourite, aulick_or_foote , cassin_or_downes, z20_or_z21 ]
|
||||
CommissionLimit: true
|
||||
EquipmentCode:
|
||||
ExportToConfig: true
|
||||
Config:
|
||||
type: textarea
|
||||
mode: yaml
|
||||
value: |-
|
||||
|
||||
# ==================== Event ====================
|
||||
|
||||
|
||||
@@ -6,6 +6,15 @@
|
||||
|
||||
# ==================== Farm ====================
|
||||
|
||||
GemsFarming:
|
||||
EquipmentCode:
|
||||
Config: |-
|
||||
DD: null
|
||||
bogue: null
|
||||
hermes: null
|
||||
langley: null
|
||||
ranger: null
|
||||
|
||||
# ==================== Event ====================
|
||||
|
||||
EventA:
|
||||
|
||||
@@ -44,6 +44,23 @@ GemsFarming:
|
||||
display: display
|
||||
value: fleet1_all_fleet2_standby
|
||||
option: [ fleet1_all_fleet2_standby, fleet1_standby_fleet2_all ]
|
||||
Emotion:
|
||||
Mode: calculate_ignore
|
||||
Fleet1Control: prevent_red_face
|
||||
Fleet1Recover: not_in_dormitory
|
||||
Fleet1Oath: false
|
||||
Fleet2Value: 119
|
||||
Fleet2Record: 2020-01-01 00:00:00
|
||||
Fleet2Control: prevent_red_face
|
||||
Fleet2Recover: not_in_dormitory
|
||||
Fleet2Oath: false
|
||||
Submarine:
|
||||
Mode:
|
||||
display: display
|
||||
value: do_not_use
|
||||
option: [ do_not_use, hunt_only ]
|
||||
AutoSearchMode: sub_standby
|
||||
DistanceToBoss: use_open_ocean_support
|
||||
|
||||
# ==================== Event ====================
|
||||
|
||||
|
||||
@@ -58,9 +58,12 @@ Farm:
|
||||
GemsFarming:
|
||||
- Scheduler
|
||||
- GemsFarming
|
||||
- EquipmentCode
|
||||
- Campaign
|
||||
- StopCondition
|
||||
- Fleet
|
||||
- Submarine
|
||||
- Emotion
|
||||
|
||||
# ==================== Event ====================
|
||||
|
||||
|
||||
Reference in New Issue
Block a user