Skip to content

Commit 09106da

Browse files
LmeSzincLmeSzinc
authored
Merge pull request #1726 from LmeSzinc/bug_fix
Bug fix
2 parents b2a1448 + 6968e77 commit 09106da

15 files changed

Lines changed: 113 additions & 38 deletions

File tree

‎assets/en/os_handler/ASH_POPUP_CHECK.png‎

2.81 KB
Loading

‎config/template.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1464,7 +1464,7 @@
14641464
"OpsiGeneral": {
14651465
"OpsiGeneral": {
14661466
"UseLogger": true,
1467-
"BuyActionPoint": false,
1467+
"BuyActionPointLimit": 0,
14681468
"OilLimit": 1000,
14691469
"RepairThreshold": 0.4,
14701470
"DoRandomMapEvent": true,

‎module/config/argument/args.json‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7479,9 +7479,17 @@
74797479
"type": "checkbox",
74807480
"value": true
74817481
},
7482-
"BuyActionPoint": {
7483-
"type": "checkbox",
7484-
"value": false
7482+
"BuyActionPointLimit": {
7483+
"type": "select",
7484+
"value": 0,
7485+
"option": [
7486+
0,
7487+
1,
7488+
2,
7489+
3,
7490+
4,
7491+
5
7492+
]
74857493
},
74867494
"OilLimit": {
74877495
"type": "input",

‎module/config/argument/argument.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,9 @@ OpsiAshAssist:
526526
Tier: 15
527527
OpsiGeneral:
528528
UseLogger: true
529-
BuyActionPoint: false
529+
BuyActionPointLimit:
530+
value: 0
531+
option: [0, 1, 2, 3, 4, 5]
530532
OilLimit: 1000
531533
RepairThreshold: 0.4
532534
DoRandomMapEvent: true

‎module/config/config_generated.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ class GeneratedConfig:
332332

333333
# Group `OpsiGeneral`
334334
OpsiGeneral_UseLogger = True
335-
OpsiGeneral_BuyActionPoint = False
335+
OpsiGeneral_BuyActionPointLimit = 0 # 0, 1, 2, 3, 4, 5
336336
OpsiGeneral_OilLimit = 1000
337337
OpsiGeneral_RepairThreshold = 0.4
338338
OpsiGeneral_DoRandomMapEvent = True

‎module/config/config_updater.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from module.base.timer import timer
88
from module.config.redirect_utils.shop_filter import bp_redirect
99
from module.config.redirect_utils.utils import upload_redirect, api_redirect
10+
from module.config.redirect_utils.os_handler import action_point_redirect
1011
from module.config.server import to_server, to_package, VALID_PACKAGE, VALID_CHANNEL_PACKAGE, VALID_SERVER_LIST
1112
from module.config.utils import *
1213

@@ -472,7 +473,8 @@ class ConfigUpdater:
472473
'Alas.DropRecord.MeowfficerTalent', upload_redirect),
473474
('Alas.DropRecord.SaveCombat', 'Alas.DropRecord.CombatRecord', upload_redirect),
474475
('Alas.DropRecord.SaveMeowfficer', 'Alas.DropRecord.MeowfficerBuy', upload_redirect),
475-
('Alas.Emulator.PackageName', 'Alas.DropRecord.API', api_redirect)
476+
('Alas.Emulator.PackageName', 'Alas.DropRecord.API', api_redirect),
477+
('OpsiGeneral.OpsiGeneral.BuyActionPoint', 'OpsiGeneral.OpsiGeneral.BuyActionPointLimit', action_point_redirect)
476478
]
477479

478480
@cached_property

‎module/config/i18n/en-US.json‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1929,9 +1929,15 @@
19291929
"name": "Use Logger(s)",
19301930
"help": "Use all coordinate loggers when entering the storage"
19311931
},
1932-
"BuyActionPoint": {
1933-
"name": "Buy AP",
1934-
"help": "Restore AP through oil first then AP boxes"
1932+
"BuyActionPointLimit": {
1933+
"name": "Buy AP X time(s)",
1934+
"help": "Maximum number of buying AP.",
1935+
"0": "Don't buy",
1936+
"1": "1 (1000oil, 100AP)",
1937+
"2": "2 (2000oil, 200AP)",
1938+
"3": "3 (4000oil, 400AP)",
1939+
"4": "4 (6000oil, 600AP)",
1940+
"5": "5 (10000oil, 1000AP)"
19351941
},
19361942
"OilLimit": {
19371943
"name": "Keep Oil Above X",

‎module/config/i18n/ja-JP.json‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1929,9 +1929,15 @@
19291929
"name": "OpsiGeneral.UseLogger.name",
19301930
"help": "OpsiGeneral.UseLogger.help"
19311931
},
1932-
"BuyActionPoint": {
1933-
"name": "OpsiGeneral.BuyActionPoint.name",
1934-
"help": "OpsiGeneral.BuyActionPoint.help"
1932+
"BuyActionPointLimit": {
1933+
"name": "OpsiGeneral.BuyActionPointLimit.name",
1934+
"help": "OpsiGeneral.BuyActionPointLimit.help",
1935+
"0": "0",
1936+
"1": "1",
1937+
"2": "2",
1938+
"3": "3",
1939+
"4": "4",
1940+
"5": "5"
19351941
},
19361942
"OilLimit": {
19371943
"name": "OpsiGeneral.OilLimit.name",

‎module/config/i18n/zh-CN.json‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1929,9 +1929,15 @@
19291929
"name": "使用坐标记录仪",
19301930
"help": "每次进入仓库的时候，使用所有的使用坐标记录仪"
19311931
},
1932-
"BuyActionPoint": {
1933-
"name": "买行动力",
1934-
"help": "用石油买行动力，行动力不足时，优先买行动力，再开箱子"
1932+
"BuyActionPointLimit": {
1933+
"name": "买行动力X次",
1934+
"help": "买行动力的最大次数",
1935+
"0": "不买",
1936+
"1": "1次 (1000油, 100行动力)",
1937+
"2": "2次 (2000油, 200行动力)",
1938+
"3": "3次 (4000油, 400行动力)",
1939+
"4": "4次 (6000油, 600行动力)",
1940+
"5": "5次 (10000油, 1000行动力)"
19351941
},
19361942
"OilLimit": {
19371943
"name": "买行动力时，保留 X 点石油",

‎module/config/i18n/zh-TW.json‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1929,9 +1929,15 @@
19291929
"name": "使用坐標記錄儀",
19301930
"help": "每次進入倉庫的時候，使用所有的使用坐標記錄儀"
19311931
},
1932-
"BuyActionPoint": {
1933-
"name": "買行動力",
1934-
"help": "用石油買行動力，行動力不足時，優先買行動力，再開箱子"
1932+
"BuyActionPointLimit": {
1933+
"name": "買行動力X次",
1934+
"help": "買行動力的最大次數",
1935+
"0": "不買",
1936+
"1": "1次 (1000油, 100行動力)",
1937+
"2": "2次 (2000油, 200行動力)",
1938+
"3": "3次 (4000油, 400行動力)",
1939+
"4": "4次 (6000油, 400行動力)",
1940+
"5": "5次 (10000油, 1000行動力)"
19351941
},
19361942
"OilLimit": {
19371943
"name": "買行動力時，保留 X 點石油",

0 commit comments

Comments
 (0)