Opt: Better arrangement of meowfficer settings

2026-03-12 14:27:00 +08:00 · 2022-03-07 20:27:34 +08:00
parent cfa384825b
commit 309cedf60b
15 changed files with 291 additions and 213 deletions
--- a/module/config/argument/args.json
+++ b/module/config/argument/args.json
@@ -4297,6 +4297,71 @@
      }
    }
  },
+  "Meowfficer": {
+    "Scheduler": {
+      "Enable": {
+        "type": "checkbox",
+        "value": false
+      },
+      "NextRun": {
+        "type": "input",
+        "value": "2020-01-01 00:00:00",
+        "validate": "datetime"
+      },
+      "Command": {
+        "type": "disable",
+        "value": "Meowfficer"
+      },
+      "SuccessInterval": {
+        "type": "disable",
+        "value": 30
+      },
+      "FailureInterval": {
+        "type": "disable",
+        "value": 30
+      },
+      "ServerUpdate": {
+        "type": "disable",
+        "value": "00:00"
+      }
+    },
+    "Meowfficer": {
+      "BuyAmount": {
+        "type": "input",
+        "value": 1
+      },
+      "FortChoreMeowfficer": {
+        "type": "checkbox",
+        "value": true
+      }
+    },
+    "MeowfficerTrain": {
+      "Enable": {
+        "type": "checkbox",
+        "value": false
+      },
+      "Mode": {
+        "type": "select",
+        "value": "seamlessly",
+        "option": [
+          "seamlessly",
+          "once_a_day"
+        ]
+      },
+      "RetainTalentedGold": {
+        "type": "checkbox",
+        "value": true
+      },
+      "RetainTalentedPurple": {
+        "type": "checkbox",
+        "value": true
+      },
+      "EnhanceIndex": {
+        "type": "input",
+        "value": 1
+      }
+    }
+  },
  "Guild": {
    "Scheduler": {
      "Enable": {
@@ -4648,61 +4713,6 @@
      }
    }
  },
-  "Meowfficer": {
-    "Scheduler": {
-      "Enable": {
-        "type": "checkbox",
-        "value": false
-      },
-      "NextRun": {
-        "type": "input",
-        "value": "2020-01-01 00:00:00",
-        "validate": "datetime"
-      },
-      "Command": {
-        "type": "disable",
-        "value": "Meowfficer"
-      },
-      "SuccessInterval": {
-        "type": "disable",
-        "value": 30
-      },
-      "FailureInterval": {
-        "type": "disable",
-        "value": 30
-      },
-      "ServerUpdate": {
-        "type": "disable",
-        "value": "00:00"
-      }
-    },
-    "Meowfficer": {
-      "BuyAmount": {
-        "type": "input",
-        "value": 1
-      },
-      "EnhanceIndex": {
-        "type": "input",
-        "value": 0
-      },
-      "TrainMeowfficer": {
-        "type": "checkbox",
-        "value": false
-      },
-      "RetainTalentedGold": {
-        "type": "checkbox",
-        "value": true
-      },
-      "RetainTalentedPurple": {
-        "type": "checkbox",
-        "value": false
-      },
-      "FortChoreMeowfficer": {
-        "type": "checkbox",
-        "value": true
-      }
-    }
-  },
  "Shipyard": {
    "Scheduler": {
      "Enable": {
--- a/module/config/argument/argument.yaml
+++ b/module/config/argument/argument.yaml
@@ -278,11 +278,15 @@ Dorm:
  FeedFilter: 20000 > 10000 > 5000 > 3000 > 2000 > 1000
 Meowfficer:
  BuyAmount: 1
-  EnhanceIndex: 0
-  TrainMeowfficer: false
-  RetainTalentedGold: true
-  RetainTalentedPurple: false
  FortChoreMeowfficer: true
+MeowfficerTrain:
+  Enable: false
+  Mode:
+    value: seamlessly
+    option: [seamlessly, once_a_day]
+  RetainTalentedGold: true
+  RetainTalentedPurple: true
+  EnhanceIndex: 1
 GuildLogistics:
  Enable: true
  SelectNewMission: false
--- a/module/config/argument/menu.json
+++ b/module/config/argument/menu.json
@@ -27,13 +27,13 @@
      "Tactical",
      "Research",
      "Dorm",
+      "Meowfficer",
      "Guild",
      "Reward"
    ],
    "DailyReward": [
      "ShopFrequent",
      "ShopOnce",
-      "Meowfficer",
      "Shipyard",
      "Gacha",
      "DataKey",
--- a/module/config/argument/task.yaml
+++ b/module/config/argument/task.yaml
@@ -130,6 +130,10 @@ Research:
 Dorm:
  - Scheduler
  - Dorm
+Meowfficer:
+  - Scheduler
+  - Meowfficer
+  - MeowfficerTrain
 Guild:
  - Scheduler
  - GuildLogistics
@@ -149,9 +153,6 @@ ShopOnce:
  - MedalShop
  - MeritShop
  - CoreShop
-Meowfficer:
-  - Scheduler
-  - Meowfficer
 Shipyard:
  - Scheduler
  - Shipyard
--- a/module/config/config_generated.py
+++ b/module/config/config_generated.py
@@ -194,12 +194,15 @@ class GeneratedConfig:

    # Group `Meowfficer`
    Meowfficer_BuyAmount = 1
-    Meowfficer_EnhanceIndex = 0
-    Meowfficer_TrainMeowfficer = False
-    Meowfficer_RetainTalentedGold = True
-    Meowfficer_RetainTalentedPurple = False
    Meowfficer_FortChoreMeowfficer = True

+    # Group `MeowfficerTrain`
+    MeowfficerTrain_Enable = False
+    MeowfficerTrain_Mode = 'seamlessly'  # seamlessly, once_a_day
+    MeowfficerTrain_RetainTalentedGold = True
+    MeowfficerTrain_RetainTalentedPurple = True
+    MeowfficerTrain_EnhanceIndex = 1
+
    # Group `GuildLogistics`
    GuildLogistics_Enable = True
    GuildLogistics_SelectNewMission = False
--- a/module/config/i18n/en-US.json
+++ b/module/config/i18n/en-US.json
@@ -118,6 +118,10 @@
      "name": "Dorm",
      "help": ""
    },
+    "Meowfficer": {
+      "name": "Meowfficer",
+      "help": ""
+    },
    "Guild": {
      "name": "Guild",
      "help": ""
@@ -134,10 +138,6 @@
      "name": "Shop Once",
      "help": ""
    },
-    "Meowfficer": {
-      "name": "Meowfficer",
-      "help": ""
-    },
    "Shipyard": {
      "name": "Shipyard",
      "help": ""
@@ -1116,27 +1116,39 @@
      "name": "Buy Amount",
      "help": "The 1st meowfficer box purchase everyday is free"
    },
-    "EnhanceIndex": {
-      "name": "Enhance Index",
-      "help": "Index of target meowfficer to enhance; assists with freeing up cattery space automatically.\nInput 0 to turn off, otherwise limit is 1 ~ 12; indices are in ascending order from left to right of the 4 x 3 grid.\nAlas will turn this off temporarily if common box stock is detected to be low (<= 20)"
-    },
-    "TrainMeowfficer": {
-      "name": "Collect Trained Meowfficer",
-      "help": "Queue and collect trained meowfficer(s).\n1 of 2 actions will be executed depending on conditions:\n- If EnhanceIndex = 0; collects 1 trained meowfficer each day. On Sunday Alas empties the training queue, fills it autonomously (SR boxes first), then lastly clears cattery space just as enhance would.\n- If EnhanceIndex > 0; Alas empties the training queue in preparation for tomorrow's enhance step then fills it manually (common boxes first)"
-    },
-    "RetainTalentedGold": {
-      "name": "Retain Talented SR Meowfficer(s)",
-      "help": "During collection, SR cats are examined for special talent abilities i.e. has no tiers or is colored rainbow.\nIf detected these are locked to prevent being used as feed material. Players must manually check and enhance themselves an SR meowfficer's personal skill"
-    },
-    "RetainTalentedPurple": {
-      "name": "Retain Talented Elite Meowfficer(s)",
-      "help": "During collection, Elite cats are examined for special talent abilities i.e. has no tiers or is colored rainbow.\nIf detected these are locked to prevent being used as feed material. Players must manually check and enhance themselves an Elite meowfficer's personal skill"
-    },
    "FortChoreMeowfficer": {
      "name": "Do Fort Chores",
      "help": "Completes all 3 chores; clean, feed, and play with meowfficer to get fort exp"
    }
  },
+  "MeowfficerTrain": {
+    "_info": {
+      "name": "Meowfficer Training Settings",
+      "help": ""
+    },
+    "Enable": {
+      "name": "Enable Meowfficer Training",
+      "help": ""
+    },
+    "Mode": {
+      "name": "Meowfficer Training Mode",
+      "help": "Train Seamlessly means collecting trained meowfficer(s) every 2.5 ~ 3.5 hours.\nTrain Once a Day means collecting 1 trained meowfficer each day; emptying the training queue and do the enhancing on Sunday in order to finish weekly mission.",
+      "seamlessly": "Train Seamlessly",
+      "once_a_day": "Train Once a Day"
+    },
+    "RetainTalentedGold": {
+      "name": "Retain Talented SR Meowfficer(s)",
+      "help": "During collection, SR cats are examined for special talent abilities i.e. has no tiers or is colored rainbow.\nIf detected these are locked to prevent being used as feed material. Players must manually check and enhance themselves an SR meowfficer's personal skill."
+    },
+    "RetainTalentedPurple": {
+      "name": "Retain Talented Elite Meowfficer(s)",
+      "help": "During collection, Elite cats are examined for special talent abilities i.e. has no tiers or is colored rainbow.\nIf detected these are locked to prevent being used as feed material. Players must manually check and enhance themselves an Elite meowfficer's personal skill."
+    },
+    "EnhanceIndex": {
+      "name": "Enhance Index",
+      "help": "Index of target meowfficer to enhance. Limited in 1 ~ 12; indices are in ascending order from left to right of the 4 x 3 grid."
+    }
+  },
  "GuildLogistics": {
    "_info": {
      "name": "Guild Logistics Settings",
--- a/module/config/i18n/ja-JP.json
+++ b/module/config/i18n/ja-JP.json
@@ -118,6 +118,10 @@
      "name": "Task.Dorm.name",
      "help": "Task.Dorm.help"
    },
+    "Meowfficer": {
+      "name": "Task.Meowfficer.name",
+      "help": "Task.Meowfficer.help"
+    },
    "Guild": {
      "name": "Task.Guild.name",
      "help": "Task.Guild.help"
@@ -134,10 +138,6 @@
      "name": "Task.ShopOnce.name",
      "help": "Task.ShopOnce.help"
    },
-    "Meowfficer": {
-      "name": "Task.Meowfficer.name",
-      "help": "Task.Meowfficer.help"
-    },
    "Shipyard": {
      "name": "Task.Shipyard.name",
      "help": "Task.Shipyard.help"
@@ -1116,27 +1116,39 @@
      "name": "Meowfficer.BuyAmount.name",
      "help": "Meowfficer.BuyAmount.help"
    },
-    "EnhanceIndex": {
-      "name": "Meowfficer.EnhanceIndex.name",
-      "help": "Meowfficer.EnhanceIndex.help"
-    },
-    "TrainMeowfficer": {
-      "name": "Meowfficer.TrainMeowfficer.name",
-      "help": "Meowfficer.TrainMeowfficer.help"
-    },
-    "RetainTalentedGold": {
-      "name": "Meowfficer.RetainTalentedGold.name",
-      "help": "Meowfficer.RetainTalentedGold.help"
-    },
-    "RetainTalentedPurple": {
-      "name": "Meowfficer.RetainTalentedPurple.name",
-      "help": "Meowfficer.RetainTalentedPurple.help"
-    },
    "FortChoreMeowfficer": {
      "name": "Meowfficer.FortChoreMeowfficer.name",
      "help": "Meowfficer.FortChoreMeowfficer.help"
    }
  },
+  "MeowfficerTrain": {
+    "_info": {
+      "name": "MeowfficerTrain._info.name",
+      "help": "MeowfficerTrain._info.help"
+    },
+    "Enable": {
+      "name": "MeowfficerTrain.Enable.name",
+      "help": "MeowfficerTrain.Enable.help"
+    },
+    "Mode": {
+      "name": "MeowfficerTrain.Mode.name",
+      "help": "MeowfficerTrain.Mode.help",
+      "seamlessly": "seamlessly",
+      "once_a_day": "once_a_day"
+    },
+    "RetainTalentedGold": {
+      "name": "MeowfficerTrain.RetainTalentedGold.name",
+      "help": "MeowfficerTrain.RetainTalentedGold.help"
+    },
+    "RetainTalentedPurple": {
+      "name": "MeowfficerTrain.RetainTalentedPurple.name",
+      "help": "MeowfficerTrain.RetainTalentedPurple.help"
+    },
+    "EnhanceIndex": {
+      "name": "MeowfficerTrain.EnhanceIndex.name",
+      "help": "MeowfficerTrain.EnhanceIndex.help"
+    }
+  },
  "GuildLogistics": {
    "_info": {
      "name": "GuildLogistics._info.name",
--- a/module/config/i18n/zh-CN.json
+++ b/module/config/i18n/zh-CN.json
@@ -118,6 +118,10 @@
      "name": "后宅",
      "help": ""
    },
+    "Meowfficer": {
+      "name": "指挥喵",
+      "help": ""
+    },
    "Guild": {
      "name": "大舰队",
      "help": ""
@@ -134,10 +138,6 @@
      "name": "其他商店",
      "help": ""
    },
-    "Meowfficer": {
-      "name": "指挥喵",
-      "help": ""
-    },
    "Shipyard": {
      "name": "开发船坞",
      "help": ""
@@ -1116,25 +1116,37 @@
      "name": "每天买 X 个猫箱",
      "help": "每日第一个猫箱免费"
    },
-    "EnhanceIndex": {
-      "name": "强化第 X 只猫",
-      "help": "1 ~ 12，填0不强化"
+    "FortChoreMeowfficer": {
+      "name": "喵窝互动",
+      "help": "清扫、喂食和逗猫"
+    }
+  },
+  "MeowfficerTrain": {
+    "_info": {
+      "name": "指挥喵训练",
+      "help": ""
    },
-    "TrainMeowfficer": {
-      "name": "训练指挥喵",
-      "help": "当 \"强化第 X 只猫\" 为 0 时，每天收一只, 周日收获全部，以完成每日任务\n当 \"强化第 X 只猫\" 大于 0 时，开蓝猫箱然后喂猫"
+    "Enable": {
+      "name": "开启指挥喵训练",
+      "help": ""
+    },
+    "Mode": {
+      "name": "训练模式",
+      "help": "无缝练猫将每隔 2.5 ~ 3.5 小时收取指挥猫\n每天收一只意思是每天收一只，周日收全部、强化并重新填充队列，以完成每周任务",
+      "seamlessly": "无缝练猫",
+      "once_a_day": "每天收一只"
    },
    "RetainTalentedGold": {
      "name": "锁定带特殊天赋的金猫",
-      "help": ""
+      "help": "收取指挥猫时锁定特殊天赋的猫，被锁定的猫将不会被用于强化，用户需要手动检查并解锁不需要的猫"
    },
    "RetainTalentedPurple": {
      "name": "锁定带特殊天赋的紫猫",
-      "help": ""
+      "help": "收取指挥猫时锁定特殊天赋的猫，被锁定的猫将不会被用于强化，用户需要手动检查并解锁不需要的猫"
    },
-    "FortChoreMeowfficer": {
-      "name": "喵窝互动",
-      "help": "清扫, 喂食和逗猫"
+    "EnhanceIndex": {
+      "name": "用无特殊天赋的猫给第 X 只猫强化",
+      "help": "猫仓库的第 X 只猫，限制在 1 ~ 12，顺序从左上到右下"
    }
  },
  "GuildLogistics": {
--- a/module/config/i18n/zh-TW.json
+++ b/module/config/i18n/zh-TW.json
@@ -118,6 +118,10 @@
      "name": "後宅",
      "help": ""
    },
+    "Meowfficer": {
+      "name": "指揮喵",
+      "help": ""
+    },
    "Guild": {
      "name": "大艦隊",
      "help": ""
@@ -134,10 +138,6 @@
      "name": "其餘商店",
      "help": ""
    },
-    "Meowfficer": {
-      "name": "指揮喵",
-      "help": ""
-    },
    "Shipyard": {
      "name": "開發船塢",
      "help": ""
@@ -1116,27 +1116,39 @@
      "name": "每天買 X 個貓箱",
      "help": "每日第一個貓箱免費"
    },
-    "EnhanceIndex": {
-      "name": "強化第 X 隻貓",
-      "help": "1 ~ 12，填0不強化"
-    },
-    "TrainMeowfficer": {
-      "name": "訓練指揮喵",
-      "help": "當 \"強化第 X 隻貓\" 為 0 時，每天收一隻, 週日收穫全部，以完成每日任務\n當 \"強化第 X 隻貓\" 大於 0 時，開藍貓箱然後餵貓"
-    },
-    "RetainTalentedGold": {
-      "name": "鎖定帶特殊天賦的金貓",
-      "help": ""
-    },
-    "RetainTalentedPurple": {
-      "name": "鎖定帶特殊天賦的紫貓",
-      "help": ""
-    },
    "FortChoreMeowfficer": {
      "name": "喵窩互動",
      "help": "清掃、餵食和逗貓"
    }
  },
+"MeowfficerTrain": {
+    "_info": {
+      "name": "指揮喵訓練",
+      "help": ""
+    },
+    "Enable": {
+      "name": "開啟指揮喵訓練",
+      "help": ""
+    },
+    "Mode": {
+      "name": "訓練模式",
+      "help": "無縫練貓將每隔 2.5 ~ 3.5 小時收取指揮貓\n每天收一隻意思是每天收一隻，週日收全部、強化並重新填充隊列，以完成每週任務",
+      "seamlessly": "無縫練貓",
+      "once_a_day": "每天收一隻"
+    },
+    "RetainTalentedGold": {
+      "name": "鎖定帶特殊天賦的金貓",
+      "help": "收取指揮貓時鎖定特殊天賦的貓，被鎖定的貓將不會被用於強化，用戶需要手動檢查並解鎖不需要的貓"
+    },
+    "RetainTalentedPurple": {
+      "name": "鎖定帶特殊天賦的紫貓",
+      "help": "收取指揮貓時鎖定特殊天賦的貓，被鎖定的貓將不會被用於強化，用戶需要手動檢查並解鎖不需要的貓"
+    },
+    "EnhanceIndex": {
+      "name": "用無特殊天賦的貓給第 X 隻貓強化",
+      "help": "貓倉庫的第 X 隻貓，限制在 1 ~ 12，順序從左上到右下"
+    }
+  },
  "GuildLogistics": {
    "_info": {
      "name": "大艦隊後勤",