diff --git a/config/template.json b/config/template.json index b3bad0499a..b135daa803 100644 --- a/config/template.json +++ b/config/template.json @@ -337,7 +337,10 @@ "CoinLimit": 10000, "TaskCall": "Main" }, - "EventStorage": { + "CampaignStorage": { + "Oil": {}, + "Coin": {}, + "Gem": {}, "Pt": {} } }, @@ -1128,12 +1131,6 @@ "PresetFilter": "cube", "CustomFilter": "DailyEvent > Gem-4 > Gem-2 > Gem-8 > ExtraCube-0:30\n> UrgentCube-1:30 > UrgentCube-1:45 > UrgentCube-3\n> ExtraDrill-5:20 > ExtraDrill-2 > ExtraDrill-3:20\n> UrgentCube-2:15 > UrgentCube-4\n> ExtraDrill-1 > UrgentCube-6 > ExtraCube-1:30\n> ExtraDrill-2:40 > ExtraDrill-0:20\n> Major > DailyChip > DailyResource\n> ExtraPart-0:30 > ExtraOil-1 > UrgentBox-6\n> ExtraCube-3 > ExtraPart-1 > UrgentBox-3\n> ExtraCube-4 > ExtraPart-1:30 > ExtraOil-4\n> UrgentBox-1 > ExtraCube-5 > UrgentBox-1\n> ExtraCube-8 > ExtraOil-8\n> UrgentDrill-4 > UrgentDrill-2:40 > UrgentDrill-2\n> UrgentDrill-1 > UrgentDrill-1:30 > UrgentDrill-1:10\n> Extra-0:20 > Extra-0:30 > Extra-1:00 > Extra-1:30 > Extra-2:00\n> shortest", "DoMajorCommission": false - }, - "ItemStorage": { - "Oil": {}, - "Coin": {}, - "Gem": {}, - "Cube": {} } }, "Tactical": { @@ -1376,12 +1373,6 @@ }, "CoreShop": { "Filter": "Array" - }, - "ShopStorage": { - "Merit": {}, - "Core": {}, - "Medal": {}, - "GuildCoin": {} } }, "Shipyard": { @@ -1420,6 +1411,9 @@ "Amount": 1, "UseTicket": true, "UseDrill": false + }, + "GachaStorage": { + "Cube": {} } }, "Freebies": { diff --git a/module/config/argument/args.json b/module/config/argument/args.json index d78b84e4d3..12c4d565cf 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1862,7 +1862,31 @@ ] } }, - "EventStorage": { + "CampaignStorage": { + "Oil": { + "type": "stored", + "value": {}, + "display": "hide", + "stored": "StoredOil", + "order": 1, + "color": "#000000" + }, + "Coin": { + "type": "stored", + "value": {}, + "display": "hide", + "stored": "StoredCoin", + "order": 2, + "color": "#FFAA33" + }, + "Gem": { + "type": "stored", + "value": {}, + "display": "hide", + "stored": "StoredInt", + "order": 3, + "color": "#FF3333" + }, "Pt": { "type": "stored", "value": {}, @@ -6451,40 +6475,6 @@ "type": "checkbox", "value": false } - }, - "ItemStorage": { - "Oil": { - "type": "stored", - "value": {}, - "display": "hide", - "stored": "StoredOil", - "order": 1, - "color": "#000000" - }, - "Coin": { - "type": "stored", - "value": {}, - "display": "hide", - "stored": "StoredCoin", - "order": 2, - "color": "#FFAA33" - }, - "Gem": { - "type": "stored", - "value": {}, - "display": "hide", - "stored": "StoredInt", - "order": 3, - "color": "#FF3333" - }, - "Cube": { - "type": "stored", - "value": {}, - "display": "hide", - "stored": "StoredInt", - "order": 8, - "color": "#33FFFF" - } } }, "Tactical": { @@ -7586,40 +7576,6 @@ "type": "textarea", "value": "Array" } - }, - "ShopStorage": { - "Merit": { - "type": "stored", - "value": {}, - "display": "hide", - "stored": "StoredInt", - "order": 9, - "color": "#FFFF00" - }, - "Core": { - "type": "stored", - "value": {}, - "display": "hide", - "stored": "StoredInt", - "order": 10, - "color": "#AAAAAA" - }, - "Medal": { - "type": "stored", - "value": {}, - "display": "hide", - "stored": "StoredInt", - "order": 11, - "color": "#FFDD00" - }, - "GuildCoin": { - "type": "stored", - "value": {}, - "display": "hide", - "stored": "StoredInt", - "order": 12, - "color": "#AAAAAA" - } } }, "Shipyard": { @@ -7797,6 +7753,16 @@ "type": "checkbox", "value": false } + }, + "GachaStorage": { + "Cube": { + "type": "stored", + "value": {}, + "display": "hide", + "stored": "StoredInt", + "order": 5, + "color": "#33FFFF" + } } }, "Freebies": { @@ -7963,7 +7929,7 @@ "value": {}, "display": "hide", "stored": "StoredInt", - "order": 5, + "order": 7, "color": "#FF8800" }, "PurpleCoin": { @@ -7971,7 +7937,7 @@ "value": {}, "display": "hide", "stored": "StoredInt", - "order": 7, + "order": 8, "color": "#7700BB" }, "ActionPoint": { diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index d0daddf543..b81053d148 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -278,6 +278,23 @@ GemsFarming: value: any option: [ any, aulick_or_foote , cassin_or_downes ] CommissionLimit: true +CampaignStorage: + Oil: + stored: StoredOil + order: 1 + color: "#000000" + Coin: + stored: StoredCoin + order: 2 + color: "#FFAA33" + Gem: + stored: StoredInt + order: 3 + color: "#FF3333" + Pt: + stored: StoredInt + order: 4 + color: "#00BFFF" # ==================== Event ==================== @@ -308,11 +325,6 @@ Coalition: Fleet: value: single option: [ single, multi ] -EventStorage: - Pt: - stored: StoredInt - order: 4 - color: "#00BFFF" # ==================== Reward ==================== @@ -526,23 +538,6 @@ MeritShop: CoreShop: Filter: |- Array -ShopStorage: - Merit: - stored: StoredInt - order: 9 - color: "#FFFF00" - Core: - stored: StoredInt - order: 10 - color: "#AAAAAA" - Medal: - stored: StoredInt - order: 11 - color: "#FFDD00" - GuildCoin: - stored: StoredInt - order: 12 - color: "#AAAAAA" ShipyardDr: ResearchSeries: value: 2 @@ -587,22 +582,10 @@ SupplyPack: option: [ 0, 1, 2, 3, 4, 5, 6 ] Minigame: Collect: false -ItemStorage: - Oil: - stored: StoredOil - order: 1 - color: "#000000" - Coin: - stored: StoredCoin - order: 2 - color: "#FFAA33" - Gem: - stored: StoredInt - order: 3 - color: "#FF3333" +GachaStorage: Cube: stored: StoredInt - order: 8 + order: 5 color: "#33FFFF" # ==================== Daily ==================== @@ -738,11 +721,11 @@ OpsiHazard1Leveling: OpsiStorage: YellowCoin: stored: StoredInt - order: 5 + order: 7 color: "#FF8800" PurpleCoin: stored: StoredInt - order: 7 + order: 8 color: "#7700BB" ActionPoint: stored: StoredInt diff --git a/module/config/argument/stored.json b/module/config/argument/stored.json index ebdb3979b5..f221a32b7a 100644 --- a/module/config/argument/stored.json +++ b/module/config/argument/stored.json @@ -1,8 +1,8 @@ { "Oil": { "name": "Oil", - "path": "Commission.ItemStorage.Oil", - "i18n": "ItemStorage.Oil.name", + "path": "EventGeneral.CampaignStorage.Oil", + "i18n": "CampaignStorage.Oil.name", "stored": "StoredOil", "attrs": { "time": "2020-01-01 00:00:00", @@ -14,8 +14,8 @@ }, "Coin": { "name": "Coin", - "path": "Commission.ItemStorage.Coin", - "i18n": "ItemStorage.Coin.name", + "path": "EventGeneral.CampaignStorage.Coin", + "i18n": "CampaignStorage.Coin.name", "stored": "StoredCoin", "attrs": { "time": "2020-01-01 00:00:00", @@ -27,8 +27,8 @@ }, "Gem": { "name": "Gem", - "path": "Commission.ItemStorage.Gem", - "i18n": "ItemStorage.Gem.name", + "path": "EventGeneral.CampaignStorage.Gem", + "i18n": "CampaignStorage.Gem.name", "stored": "StoredInt", "attrs": { "time": "2020-01-01 00:00:00", @@ -39,8 +39,8 @@ }, "Pt": { "name": "Pt", - "path": "EventGeneral.EventStorage.Pt", - "i18n": "EventStorage.Pt.name", + "path": "EventGeneral.CampaignStorage.Pt", + "i18n": "CampaignStorage.Pt.name", "stored": "StoredInt", "attrs": { "time": "2020-01-01 00:00:00", @@ -49,17 +49,17 @@ "order": 4, "color": "#00BFFF" }, - "YellowCoin": { - "name": "YellowCoin", - "path": "OpsiGeneral.OpsiStorage.YellowCoin", - "i18n": "OpsiStorage.YellowCoin.name", + "Cube": { + "name": "Cube", + "path": "Gacha.GachaStorage.Cube", + "i18n": "GachaStorage.Cube.name", "stored": "StoredInt", "attrs": { "time": "2020-01-01 00:00:00", "value": 0 }, "order": 5, - "color": "#FF8800" + "color": "#33FFFF" }, "ActionPoint": { "name": "ActionPoint", @@ -73,76 +73,28 @@ "order": 6, "color": "#0000FF" }, - "PurpleCoin": { - "name": "PurpleCoin", - "path": "OpsiGeneral.OpsiStorage.PurpleCoin", - "i18n": "OpsiStorage.PurpleCoin.name", + "YellowCoin": { + "name": "YellowCoin", + "path": "OpsiGeneral.OpsiStorage.YellowCoin", + "i18n": "OpsiStorage.YellowCoin.name", "stored": "StoredInt", "attrs": { "time": "2020-01-01 00:00:00", "value": 0 }, "order": 7, - "color": "#7700BB" + "color": "#FF8800" }, - "Cube": { - "name": "Cube", - "path": "Commission.ItemStorage.Cube", - "i18n": "ItemStorage.Cube.name", + "PurpleCoin": { + "name": "PurpleCoin", + "path": "OpsiGeneral.OpsiStorage.PurpleCoin", + "i18n": "OpsiStorage.PurpleCoin.name", "stored": "StoredInt", "attrs": { "time": "2020-01-01 00:00:00", "value": 0 }, "order": 8, - "color": "#33FFFF" - }, - "Merit": { - "name": "Merit", - "path": "ShopOnce.ShopStorage.Merit", - "i18n": "ShopStorage.Merit.name", - "stored": "StoredInt", - "attrs": { - "time": "2020-01-01 00:00:00", - "value": 0 - }, - "order": 9, - "color": "#FFFF00" - }, - "Core": { - "name": "Core", - "path": "ShopOnce.ShopStorage.Core", - "i18n": "ShopStorage.Core.name", - "stored": "StoredInt", - "attrs": { - "time": "2020-01-01 00:00:00", - "value": 0 - }, - "order": 10, - "color": "#AAAAAA" - }, - "Medal": { - "name": "Medal", - "path": "ShopOnce.ShopStorage.Medal", - "i18n": "ShopStorage.Medal.name", - "stored": "StoredInt", - "attrs": { - "time": "2020-01-01 00:00:00", - "value": 0 - }, - "order": 11, - "color": "#FFDD00" - }, - "GuildCoin": { - "name": "GuildCoin", - "path": "ShopOnce.ShopStorage.GuildCoin", - "i18n": "ShopStorage.GuildCoin.name", - "stored": "StoredInt", - "attrs": { - "time": "2020-01-01 00:00:00", - "value": 0 - }, - "order": 12, - "color": "#AAAAAA" + "color": "#7700BB" } } \ No newline at end of file diff --git a/module/config/argument/task.yaml b/module/config/argument/task.yaml index c278296b16..bdec3563f0 100644 --- a/module/config/argument/task.yaml +++ b/module/config/argument/task.yaml @@ -71,7 +71,7 @@ Event: EventGeneral: - EventGeneral - TaskBalancer - - EventStorage + - CampaignStorage Event: - Scheduler - Campaign @@ -193,7 +193,6 @@ Reward: Commission: - Scheduler - Commission - - ItemStorage Tactical: - Scheduler - Tactical @@ -242,7 +241,6 @@ DailyMission: - MedalShop2 - MeritShop - CoreShop - - ShopStorage Shipyard: - Scheduler - ShipyardDr @@ -250,6 +248,7 @@ DailyMission: Gacha: - Scheduler - Gacha + - GachaStorage Freebies: - Scheduler - BattlePass diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 02dfcfb466..dade87c9e9 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -154,6 +154,12 @@ class GeneratedConfig: GemsFarming_CommonDD = 'any' # any, aulick_or_foote, cassin_or_downes GemsFarming_CommissionLimit = True + # Group `CampaignStorage` + CampaignStorage_Oil = {} + CampaignStorage_Coin = {} + CampaignStorage_Gem = {} + CampaignStorage_Pt = {} + # Group `EventGeneral` EventGeneral_PtLimit = 0 EventGeneral_TimeLimit = datetime.datetime(2020, 1, 1, 0, 0) @@ -180,9 +186,6 @@ class GeneratedConfig: # Group `Coalition` Coalition_Fleet = 'single' # single, multi - # Group `EventStorage` - EventStorage_Pt = {} - # Group `Commission` Commission_PresetFilter = 'cube' # cube, cube_24h, chip, chip_24h, oil, custom Commission_CustomFilter = 'DailyEvent > Gem-4 > Gem-2 > Gem-8 > ExtraCube-0:30\n> UrgentCube-1:30 > UrgentCube-1:45 > UrgentCube-3\n> ExtraDrill-5:20 > ExtraDrill-2 > ExtraDrill-3:20\n> UrgentCube-2:15 > UrgentCube-4\n> ExtraDrill-1 > UrgentCube-6 > ExtraCube-1:30\n> ExtraDrill-2:40 > ExtraDrill-0:20\n> Major > DailyChip > DailyResource\n> ExtraPart-0:30 > ExtraOil-1 > UrgentBox-6\n> ExtraCube-3 > ExtraPart-1 > UrgentBox-3\n> ExtraCube-4 > ExtraPart-1:30 > ExtraOil-4\n> UrgentBox-1 > ExtraCube-5 > UrgentBox-1\n> ExtraCube-8 > ExtraOil-8\n> UrgentDrill-4 > UrgentDrill-2:40 > UrgentDrill-2\n> UrgentDrill-1 > UrgentDrill-1:30 > UrgentDrill-1:10\n> Extra-0:20 > Extra-0:30 > Extra-1:00 > Extra-1:30 > Extra-2:00\n> shortest' @@ -291,12 +294,6 @@ class GeneratedConfig: # Group `CoreShop` CoreShop_Filter = 'Array' - # Group `ShopStorage` - ShopStorage_Merit = {} - ShopStorage_Core = {} - ShopStorage_Medal = {} - ShopStorage_GuildCoin = {} - # Group `ShipyardDr` ShipyardDr_ResearchSeries = 2 # 2, 3 ShipyardDr_ShipIndex = 0 # 0, 1, 2, 3, 4, 5, 6 @@ -334,11 +331,8 @@ class GeneratedConfig: # Group `Minigame` Minigame_Collect = False - # Group `ItemStorage` - ItemStorage_Oil = {} - ItemStorage_Coin = {} - ItemStorage_Gem = {} - ItemStorage_Cube = {} + # Group `GachaStorage` + GachaStorage_Cube = {} # Group `Daily` Daily_UseDailySkip = True diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 12c2569c23..55c47ed475 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -1162,6 +1162,28 @@ "help": "When running 7x24, prevent having a lot of urgent commissions and not being able to complete daily commissions. It is recommended to select only short-terms and high-yields in the commission filter" } }, + "CampaignStorage": { + "_info": { + "name": "CampaignStorage._info.name", + "help": "CampaignStorage._info.help" + }, + "Oil": { + "name": "Oil", + "help": "" + }, + "Coin": { + "name": "Coin", + "help": "" + }, + "Gem": { + "name": "Gem", + "help": "" + }, + "Pt": { + "name": "Event Pt", + "help": "" + } + }, "EventGeneral": { "_info": { "name": "Event General Settings", @@ -1261,16 +1283,6 @@ "multi": "Coalition Battle" } }, - "EventStorage": { - "_info": { - "name": "EventStorage._info.name", - "help": "EventStorage._info.help" - }, - "Pt": { - "name": "Event Pt", - "help": "" - } - }, "Commission": { "_info": { "name": "Commission Settings", @@ -1791,28 +1803,6 @@ "help": "All options have been defined at \nHowever unlike other shops, only Chip and Array are supported\nALAS does not browse, scroll, or recognize any other items displayed besides those two" } }, - "ShopStorage": { - "_info": { - "name": "ShopStorage._info.name", - "help": "ShopStorage._info.help" - }, - "Merit": { - "name": "Merit", - "help": "" - }, - "Core": { - "name": "Core Data", - "help": "" - }, - "Medal": { - "name": "Medal", - "help": "" - }, - "GuildCoin": { - "name": "Guild Coin", - "help": "" - } - }, "ShipyardDr": { "_info": { "name": "DR Blueprints Purchase Settings", @@ -1987,22 +1977,10 @@ "help": "" } }, - "ItemStorage": { + "GachaStorage": { "_info": { - "name": "ItemStorage._info.name", - "help": "ItemStorage._info.help" - }, - "Oil": { - "name": "Oil", - "help": "" - }, - "Coin": { - "name": "Coin", - "help": "" - }, - "Gem": { - "name": "Gem", - "help": "" + "name": "GachaStorage._info.name", + "help": "GachaStorage._info.help" }, "Cube": { "name": "Cube", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 611d40e0c3..83548513b5 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -1162,6 +1162,28 @@ "help": "GemsFarming.CommissionLimit.help" } }, + "CampaignStorage": { + "_info": { + "name": "CampaignStorage._info.name", + "help": "CampaignStorage._info.help" + }, + "Oil": { + "name": "CampaignStorage.Oil.name", + "help": "CampaignStorage.Oil.help" + }, + "Coin": { + "name": "CampaignStorage.Coin.name", + "help": "CampaignStorage.Coin.help" + }, + "Gem": { + "name": "CampaignStorage.Gem.name", + "help": "CampaignStorage.Gem.help" + }, + "Pt": { + "name": "CampaignStorage.Pt.name", + "help": "CampaignStorage.Pt.help" + } + }, "EventGeneral": { "_info": { "name": "EventGeneral._info.name", @@ -1261,16 +1283,6 @@ "multi": "multi" } }, - "EventStorage": { - "_info": { - "name": "EventStorage._info.name", - "help": "EventStorage._info.help" - }, - "Pt": { - "name": "EventStorage.Pt.name", - "help": "EventStorage.Pt.help" - } - }, "Commission": { "_info": { "name": "Commission._info.name", @@ -1791,28 +1803,6 @@ "help": "CoreShop.Filter.help" } }, - "ShopStorage": { - "_info": { - "name": "ShopStorage._info.name", - "help": "ShopStorage._info.help" - }, - "Merit": { - "name": "ShopStorage.Merit.name", - "help": "ShopStorage.Merit.help" - }, - "Core": { - "name": "ShopStorage.Core.name", - "help": "ShopStorage.Core.help" - }, - "Medal": { - "name": "ShopStorage.Medal.name", - "help": "ShopStorage.Medal.help" - }, - "GuildCoin": { - "name": "ShopStorage.GuildCoin.name", - "help": "ShopStorage.GuildCoin.help" - } - }, "ShipyardDr": { "_info": { "name": "ShipyardDr._info.name", @@ -1987,26 +1977,14 @@ "help": "Minigame.Collect.help" } }, - "ItemStorage": { + "GachaStorage": { "_info": { - "name": "ItemStorage._info.name", - "help": "ItemStorage._info.help" - }, - "Oil": { - "name": "ItemStorage.Oil.name", - "help": "ItemStorage.Oil.help" - }, - "Coin": { - "name": "ItemStorage.Coin.name", - "help": "ItemStorage.Coin.help" - }, - "Gem": { - "name": "ItemStorage.Gem.name", - "help": "ItemStorage.Gem.help" + "name": "GachaStorage._info.name", + "help": "GachaStorage._info.help" }, "Cube": { - "name": "ItemStorage.Cube.name", - "help": "ItemStorage.Cube.help" + "name": "GachaStorage.Cube.name", + "help": "GachaStorage.Cube.help" } }, "Daily": { diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 40de62e6a7..f4dee087e2 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -1162,6 +1162,28 @@ "help": "在7x24运行时防止紧急委托数量过多做不完每日委托，建议在委托过滤器仅选择短时长高收益委托" } }, + "CampaignStorage": { + "_info": { + "name": "CampaignStorage._info.name", + "help": "" + }, + "Oil": { + "name": "石油", + "help": "" + }, + "Coin": { + "name": "物资", + "help": "" + }, + "Gem": { + "name": "钻石", + "help": "" + }, + "Pt": { + "name": "活动PT", + "help": "" + } + }, "EventGeneral": { "_info": { "name": "活动通用设置", @@ -1261,16 +1283,6 @@ "multi": "多队出击" } }, - "EventStorage": { - "_info": { - "name": "EventStorage._info.name", - "help": "EventStorage._info.help" - }, - "Pt": { - "name": "活动PT", - "help": "" - } - }, "Commission": { "_info": { "name": "委托", @@ -1791,28 +1803,6 @@ "help": "" } }, - "ShopStorage": { - "_info": { - "name": "ShopStorage._info.name", - "help": "ShopStorage._info.help" - }, - "Merit": { - "name": "功勋", - "help": "" - }, - "Core": { - "name": "核心数据", - "help": "" - }, - "Medal": { - "name": "勋章", - "help": "" - }, - "GuildCoin": { - "name": "舰队币", - "help": "" - } - }, "ShipyardDr": { "_info": { "name": "彩科研图纸购买设置", @@ -1987,22 +1977,10 @@ "help": "" } }, - "ItemStorage": { + "GachaStorage": { "_info": { - "name": "ItemStorage._info.name", - "help": "ItemStorage._info.help" - }, - "Oil": { - "name": "石油", - "help": "" - }, - "Coin": { - "name": "物资", - "help": "" - }, - "Gem": { - "name": "钻石", - "help": "" + "name": "GachaStorage._info.name", + "help": "GachaStorage._info.help" }, "Cube": { "name": "魔方", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 356b1500a3..8fdaa99e88 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -1162,6 +1162,28 @@ "help": "在7x24運行時防止緊急委託數量過多做不完每日委託，建議在委託過濾器僅選擇短時長高收益委託" } }, + "CampaignStorage": { + "_info": { + "name": "CampaignStorage._info.name", + "help": "CampaignStorage._info.help" + }, + "Oil": { + "name": "石油", + "help": "" + }, + "Coin": { + "name": "物資", + "help": "" + }, + "Gem": { + "name": "鑽石", + "help": "" + }, + "Pt": { + "name": "活動PT", + "help": "" + } + }, "EventGeneral": { "_info": { "name": "活動通用設定", @@ -1261,16 +1283,6 @@ "multi": "多隊出擊" } }, - "EventStorage": { - "_info": { - "name": "EventStorage._info.name", - "help": "EventStorage._info.help" - }, - "Pt": { - "name": "活動PT", - "help": "" - } - }, "Commission": { "_info": { "name": "委託", @@ -1791,28 +1803,6 @@ "help": "" } }, - "ShopStorage": { - "_info": { - "name": "ShopStorage._info.name", - "help": "ShopStorage._info.help" - }, - "Merit": { - "name": "勳章", - "help": "" - }, - "Core": { - "name": "覈心數據", - "help": "" - }, - "Medal": { - "name": "勳章", - "help": "" - }, - "GuildCoin": { - "name": "艦隊幣", - "help": "" - } - }, "ShipyardDr": { "_info": { "name": "彩科研圖紙購買設定", @@ -1987,22 +1977,10 @@ "help": "" } }, - "ItemStorage": { + "GachaStorage": { "_info": { - "name": "ItemStorage._info.name", - "help": "ItemStorage._info.help" - }, - "Oil": { - "name": "石油", - "help": "" - }, - "Coin": { - "name": "物資", - "help": "" - }, - "Gem": { - "name": "鑽石", - "help": "" + "name": "GachaStorage._info.name", + "help": "GachaStorage._info.help" }, "Cube": { "name": "魔方", diff --git a/module/config/stored/stored_generated.py b/module/config/stored/stored_generated.py index b808d0e28b..6a51a0cc43 100644 --- a/module/config/stored/stored_generated.py +++ b/module/config/stored/stored_generated.py @@ -11,15 +11,11 @@ # ``` python -m module/config/config_updater.py ``` class StoredGenerated: - Pt = StoredInt("EventGeneral.EventStorage.Pt") - Oil = StoredOil("Commission.ItemStorage.Oil") - Coin = StoredCoin("Commission.ItemStorage.Coin") - Gem = StoredInt("Commission.ItemStorage.Gem") - Cube = StoredInt("Commission.ItemStorage.Cube") - Merit = StoredInt("ShopOnce.ShopStorage.Merit") - Core = StoredInt("ShopOnce.ShopStorage.Core") - Medal = StoredInt("ShopOnce.ShopStorage.Medal") - GuildCoin = StoredInt("ShopOnce.ShopStorage.GuildCoin") + Oil = StoredOil("EventGeneral.CampaignStorage.Oil") + Coin = StoredCoin("EventGeneral.CampaignStorage.Coin") + Gem = StoredInt("EventGeneral.CampaignStorage.Gem") + Pt = StoredInt("EventGeneral.CampaignStorage.Pt") + Cube = StoredInt("Gacha.GachaStorage.Cube") YellowCoin = StoredInt("OpsiGeneral.OpsiStorage.YellowCoin") PurpleCoin = StoredInt("OpsiGeneral.OpsiStorage.PurpleCoin") ActionPoint = StoredInt("OpsiGeneral.OpsiStorage.ActionPoint") diff --git a/module/shop/shop_status.py b/module/shop/shop_status.py index 3c8312c2db..d1df2769de 100644 --- a/module/shop/shop_status.py +++ b/module/shop/shop_status.py @@ -44,7 +44,6 @@ def status_get_medal(self): in: page_shop, medal shop """ amount = OCR_SHOP_MEDAL.ocr(self.device.image) - self.config.stored.Medal.value = amount return amount def status_get_merit(self): @@ -56,7 +55,6 @@ def status_get_merit(self): in: page_shop, merit shop """ amount = OCR_SHOP_MERIT.ocr(self.device.image) - self.config.stored.Merit.value = amount return amount def status_get_guild_coins(self): @@ -68,7 +66,6 @@ def status_get_guild_coins(self): in: page_shop, guild shop """ amount = OCR_SHOP_GUILD_COINS.ocr(self.device.image) - self.config.stored.GuildCoin.value = amount return amount def status_get_core(self): @@ -80,7 +77,6 @@ def status_get_core(self): in: page_shop, core shop """ amount = OCR_SHOP_CORE.ocr(self.device.image) - self.config.stored.Core.value = amount return amount def status_get_voucher(self):