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

Opt: Uniform the name of zone types in OpSi

Browse Source 
obscured to obscure
siren logger to abyssal
This commit is contained in:
LmeSzinc
2021-12-06 21:21:49 +08:00
parent caf51858e9
commit 4a392407a0
18 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module/os/globe_operation.py
View File

@@ -5,8 +5,8 @@ from module.os.assets import *
from module.os_handler.action_point import ActionPointHandler
from module.os_handler.map_event import MapEventHandler
ZONE_TYPES = [ZONE_DANGEROUS, ZONE_SAFE, ZONE_OBSCURE, ZONE_LOGGER, ZONE_STRONGHOLD]
ZONE_SELECT = [SELECT_DANGEROUS, SELECT_SAFE, SELECT_OBSCURE, SELECT_LOGGER, SELECT_STRONGHOLD]
ZONE_TYPES = [ZONE_DANGEROUS, ZONE_SAFE, ZONE_OBSCURE, ZONE_ABYSSAL, ZONE_STRONGHOLD]
ZONE_SELECT = [SELECT_DANGEROUS, SELECT_SAFE, SELECT_OBSCURE, SELECT_ABYSSAL, SELECT_STRONGHOLD]
ASSETS_PINNED_ZONE = ZONE_TYPES + [ZONE_ENTRANCE, ZONE_SWITCH, ZONE_PINNED]
@@ -42,14 +42,14 @@ class GlobeOperation(ActionPointHandler, MapEventHandler):
button (Button):
Returns:
str: DANGEROUS, SAFE, OBSCURE, LOGGER, STRONGHOLD.
str: DANGEROUS, SAFE, OBSCURE, ABYSSAL, STRONGHOLD.
"""
return button.name.split('_')[1]
def get_zone_pinned_name(self):
"""
Returns:
str: DANGEROUS, SAFE, OBSCURE, LOGGER, STRONGHOLD, or ''.
str: DANGEROUS, SAFE, OBSCURE, ABYSSAL, STRONGHOLD, or ''.
"""
pinned = self.get_zone_pinned()
if pinned is not None:
@@ -137,7 +137,7 @@ class GlobeOperation(ActionPointHandler, MapEventHandler):
"""
Args:
types (tuple[str], list[str], str): Zone types, or a list of them.
Available types: DANGEROUS, SAFE, OBSCURE, LOGGER, STRONGHOLD.
Available types: DANGEROUS, SAFE, OBSCURE, ABYSSAL, STRONGHOLD.
Try the the first selection in type list, if not available, try the next one.
Do nothing if no selection satisfied input.