fix: update assets file

With the addition of the Grand Assault, the Joint Firing Drill button was moved to the top half of where the Tactical Challenge button previously was, and the new Tactical Challenge button is only the lower half.

README.en.md

@@ -12,7 +12,7 @@
 
 The script is still under active development. The following features have been implemented:
 
-- [x] **Cafe** Claim rewards / Interact / Second floor
+- [x] **Cafe** Claim rewards / Interact / Invitation / Second floor
 - [x] **Club** Claim AP
 - [x] **Mailbox** Claim rewards
 - [x] **Bounty** Auto sweep

README.md

@@ -12,7 +12,7 @@
 
 当前脚本还在活跃开发中，已经实现的功能有：
 
-- [x] **咖啡厅** 领取奖励 / 互动 / 第二咖啡厅
+- [x] **咖啡厅** 领取奖励 / 互动 / 邀请 / 第二咖啡厅
 - [x] **公会** 领取体力
 - [x] **邮箱** 领取奖励
 - [x] **悬赏通缉** 自动扫荡

config/template.json

@@ -45,6 +45,13 @@
       "Touch": true,
       "AutoAdjust": true,
       "SecondCafe": true
+    },
+    "Invitation": {
+      "Enable": true,
+      "WaitingHour": 0,
+      "Choice": "list_top",
+      "Name": null,
+      "Substitute": false
     }
   },
   "Circle": {
@@ -74,15 +81,15 @@
       "OnError": "skip"
     },
     "Highway": {
-      "Stage": 1,
+      "Stage": 0,
       "Count": 2
     },
     "DesertRailroad": {
-      "Stage": 1,
+      "Stage": 0,
       "Count": 2
     },
     "Schoolhouse": {
-      "Stage": 1,
+      "Stage": 0,
       "Count": 2
     }
   },
@@ -97,15 +104,15 @@
       "OnError": "skip"
     },
     "Trinity": {
-      "Stage": 1,
+      "Stage": 0,
       "Count": 2
     },
     "Gehenna": {
-      "Stage": 1,
+      "Stage": 0,
       "Count": 2
     },
     "Millennium": {
-      "Stage": 1,
+      "Stage": 0,
       "Count": 2
     }
   },

module/config/argument/args.json

@@ -205,6 +205,38 @@
         "type": "checkbox",
         "value": true
       }
+    },
+    "Invitation": {
+      "Enable": {
+        "type": "checkbox",
+        "value": true
+      },
+      "WaitingHour": {
+        "type": "select",
+        "value": 0,
+        "option": [
+          0,
+          3,
+          6,
+          9
+        ]
+      },
+      "Choice": {
+        "type": "select",
+        "value": "list_top",
+        "option": [
+          "list_top",
+          "by_name"
+        ]
+      },
+      "Name": {
+        "type": "textarea",
+        "value": null
+      },
+      "Substitute": {
+        "type": "checkbox",
+        "value": false
+      }
     }
   },
   "Circle": {
@@ -300,8 +332,9 @@
     "Highway": {
       "Stage": {
         "type": "select",
-        "value": 1,
+        "value": 0,
         "option": [
+          0,
           1,
           2,
           3,
@@ -310,7 +343,8 @@
           6,
           7,
           8,
-          9
+          9,
+          10
         ]
       },
       "Count": {
@@ -321,8 +355,9 @@
     "DesertRailroad": {
       "Stage": {
         "type": "select",
-        "value": 1,
+        "value": 0,
         "option": [
+          0,
           1,
           2,
           3,
@@ -331,7 +366,8 @@
           6,
           7,
           8,
-          9
+          9,
+          10
         ]
       },
       "Count": {
@@ -342,8 +378,9 @@
     "Schoolhouse": {
       "Stage": {
         "type": "select",
-        "value": 1,
+        "value": 0,
         "option": [
+          0,
           1,
           2,
           3,
@@ -352,7 +389,8 @@
           6,
           7,
           8,
-          9
+          9,
+          10
         ]
       },
       "Count": {
@@ -400,8 +438,9 @@
     "Trinity": {
       "Stage": {
         "type": "select",
-        "value": 1,
+        "value": 0,
         "option": [
+          0,
           1,
           2,
           3,
@@ -416,8 +455,9 @@
     "Gehenna": {
       "Stage": {
         "type": "select",
-        "value": 1,
+        "value": 0,
         "option": [
+          0,
           1,
           2,
           3,
@@ -432,8 +472,9 @@
     "Millennium": {
       "Stage": {
         "type": "select",
-        "value": 1,
+        "value": 0,
         "option": [
+          0,
           1,
           2,
           3,

module/config/argument/argument.yaml

@@ -80,6 +80,18 @@ Cafe:
   Touch: true
   AutoAdjust: true
   SecondCafe: true
+Invitation:
+  Enable: true
+  WaitingHour:
+    value: 0
+    option: [ 0, 3, 6, 9 ]
+  Choice:
+    value: list_top
+    option: [ list_top, by_name ]
+  Name:
+    value: null
+    type: textarea
+  Substitute: false
 
 Bounty:
   OnError:
@@ -88,18 +100,18 @@ Bounty:
 
 Highway:
   Stage:
-    value: 1
+    value: 0
-    option: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
   Count: 2
 DesertRailroad:
   Stage:
-    value: 1
+    value: 0
-    option: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
   Count: 2
 Schoolhouse:
   Stage:
-    value: 1
+    value: 0
-    option: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
   Count: 2
 
 Scrimmage:
@@ -109,18 +121,18 @@ Scrimmage:
 
 Trinity:
   Stage:
-    value: 1
+    value: 0
-    option: [ 1, 2, 3, 4 ]
+    option: [ 0, 1, 2, 3, 4 ]
   Count: 2
 Gehenna:
   Stage:
-    value: 1
+    value: 0
-    option: [ 1, 2, 3, 4 ]
+    option: [ 0, 1, 2, 3, 4 ]
   Count: 2
 Millennium:
   Stage:
-    value: 1
+    value: 0
-    option: [ 1, 2, 3, 4 ]
+    option: [ 0, 1, 2, 3, 4 ]
   Count: 2
 
 TacticalChallenge:

module/config/argument/task.yaml

@@ -25,6 +25,7 @@ Daily:
     Cafe:
       - Scheduler
       - Cafe
+      - Invitation
     Circle:
       - Scheduler
     Mail:

module/config/config_generated.py

@@ -45,34 +45,41 @@ class GeneratedConfig:
     Cafe_AutoAdjust = True
     Cafe_SecondCafe = True
 
+    # Group `Invitation`
+    Invitation_Enable = True
+    Invitation_WaitingHour = 0  # 0, 3, 6, 9
+    Invitation_Choice = 'list_top'  # list_top, by_name
+    Invitation_Name = None
+    Invitation_Substitute = False
+
     # Group `Bounty`
     Bounty_OnError = 'skip'  # stop, skip
 
     # Group `Highway`
-    Highway_Stage = 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9
+    Highway_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
     Highway_Count = 2
 
     # Group `DesertRailroad`
-    DesertRailroad_Stage = 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9
+    DesertRailroad_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
     DesertRailroad_Count = 2
 
     # Group `Schoolhouse`
-    Schoolhouse_Stage = 1  # 1, 2, 3, 4, 5, 6, 7, 8, 9
+    Schoolhouse_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
     Schoolhouse_Count = 2
 
     # Group `Scrimmage`
     Scrimmage_OnError = 'skip'  # stop, skip
 
     # Group `Trinity`
-    Trinity_Stage = 1  # 1, 2, 3, 4
+    Trinity_Stage = 0  # 0, 1, 2, 3, 4
     Trinity_Count = 2
 
     # Group `Gehenna`
-    Gehenna_Stage = 1  # 1, 2, 3, 4
+    Gehenna_Stage = 0  # 0, 1, 2, 3, 4
     Gehenna_Count = 2
 
     # Group `Millennium`
-    Millennium_Stage = 1  # 1, 2, 3, 4
+    Millennium_Stage = 0  # 0, 1, 2, 3, 4
     Millennium_Count = 2
 
     # Group `TacticalChallenge`

module/config/i18n/en-US.json

@@ -218,7 +218,39 @@
     },
     "SecondCafe": {
       "name": "Second Floor",
-      "help": "JP server only\nEnable auto switch to second floor and perform interaction"
+      "help": "Enable auto switch to second floor and perform interaction"
+    }
+  },
+  "Invitation": {
+    "_info": {
+      "name": "Invitation Settings",
+      "help": ""
+    },
+    "Enable": {
+      "name": "Enable",
+      "help": "Enable cafe invitation"
+    },
+    "WaitingHour": {
+      "name": "Invitation Condition",
+      "help": "Choose whether to invite students based on the remaining time before next cafe refresh\nThis is for obtaining maximum student interation and maximum affection when AFK. Recommended option:\n24*7 AFK:\t\t Choose \"If 9 more hours remaining\"\nNormal usage:\t Choose \"Invite immediately\"",
+      "0": "Invite immediately",
+      "3": "If 3 more hours remaining",
+      "6": "If 6 more hours remaining",
+      "9": "If 9 more hours remaining"
+    },
+    "Choice": {
+      "name": "Choose Inviting Student",
+      "help": "Top first student of list: Invite the student at the top first of the list\nBy name: Invite the student with the name you set below",
+      "list_top": "Top first student of list",
+      "by_name": "By name"
+    },
+    "Name": {
+      "name": "Inviting Student Name",
+      "help": "Fill in the name of the student to be invited. Use in-game text language. Use > to connect multiple students. Example:\nJP: ホシノ(水着) > 御坂美琴 > ユズ\nOVERSEA: Hoshino(Swimsuit) > Yuuka > Kayoko(New Year)"
+    },
+    "Substitute": {
+      "name": "Replace existing student",
+      "help": "Whether to replace the existing student with their alt.\nIf not, try to match the next student"
     }
   },
   "Bounty": {
@@ -241,6 +273,7 @@
     "Stage": {
       "name": "Select Stage",
       "help": "",
+      "0": "Auto select",
       "1": "01 - Overpass A",
       "2": "02 - Overpass B",
       "3": "03 - Overpass C",
@@ -249,7 +282,8 @@
       "6": "06 - Overpass F",
       "7": "07 - Overpass G",
       "8": "08 - Overpass H",
-      "9": "09 - Overpass I"
+      "9": "09 - Overpass I",
+      "10": "10 - Overpass J"
     },
     "Count": {
       "name": "Sweep X times",
@@ -264,6 +298,7 @@
     "Stage": {
       "name": "Select Stage",
       "help": "",
+      "0": "Auto select",
       "1": "01 - Abandoned Train A",
       "2": "02 - Abandoned Train B",
       "3": "03 - Abandoned Train C",
@@ -272,7 +307,8 @@
       "6": "06 - Abandoned Train F",
       "7": "07 - Abandoned Train G",
       "8": "08 - Abandoned Train H",
-      "9": "09 - Abandoned Train I"
+      "9": "09 - Abandoned Train I",
+      "10": "10 - Abandoned Train J"
     },
     "Count": {
       "name": "Sweep X times",
@@ -287,6 +323,7 @@
     "Stage": {
       "name": "Select Stage",
       "help": "",
+      "0": "Auto select",
       "1": "01 - Besieged Classroom A",
       "2": "02 - Besieged Classroom B",
       "3": "03 - Besieged Classroom C",
@@ -295,7 +332,8 @@
       "6": "06 - Besieged Classroom F",
       "7": "07 - Besieged Classroom G",
       "8": "08 - Besieged Classroom H",
-      "9": "09 - Besieged Classroom I"
+      "9": "09 - Besieged Classroom I",
+      "10": "10 - Besieged Classroom J"
     },
     "Count": {
       "name": "Sweep X times",
@@ -322,6 +360,7 @@
     "Stage": {
       "name": "Select Stage",
       "help": "",
+      "0": "Auto select",
       "1": "01 - Trinity A",
       "2": "02 - Trinity B",
       "3": "03 - Trinity C",
@@ -340,6 +379,7 @@
     "Stage": {
       "name": "Select Stage",
       "help": "",
+      "0": "Auto select",
       "1": "01 - Gehenna A",
       "2": "02 - Gehenna B",
       "3": "03 - Gehenna C",
@@ -358,6 +398,7 @@
     "Stage": {
       "name": "Select Stage",
       "help": "",
+      "0": "Auto select",
       "1": "01 - Millennium A",
       "2": "02 - Millennium B",
       "3": "03 - Millennium C",

module/config/i18n/zh-CN.json

@@ -218,7 +218,39 @@
     },
     "SecondCafe": {
       "name": "第二咖啡厅",
-      "help": "仅支持日服\n自动切换第二咖啡厅进行互动点击"
+      "help": "自动切换第二咖啡厅进行互动点击"
+    }
+  },
+  "Invitation": {
+    "_info": {
+      "name": "邀请设置",
+      "help": ""
+    },
+    "Enable": {
+      "name": "启用",
+      "help": "是否启用咖啡厅邀请功能"
+    },
+    "WaitingHour": {
+      "name": "邀请条件",
+      "help": "根据距离下一次咖啡厅刷新的时长，选择是否邀请学生\n此项设立是为了后台挂机最大化收益，使得邀请券能被最大化利用。推荐选项：\n常驻挂机：\t选择“离下次刷新 9 小时以上”\n非常驻挂机：\t选择“不等待刷新，立即邀请”，或根据自己挂机时长选择",
+      "0": "不等待刷新，立即邀请",
+      "3": "离下次刷新 3 小时以上",
+      "6": "离下次刷新 6 小时以上",
+      "9": "离下次刷新 9 小时以上"
+    },
+    "Choice": {
+      "name": "选择邀请学生",
+      "help": "按列表第一个：优先邀请列表中第一个学生，若失败则则尝试下一个\n按名字：优先邀请下方填写学生名的第一个，若失败则尝试下一个",
+      "list_top": "按列表第一个",
+      "by_name": "按名字"
+    },
+    "Name": {
+      "name": "邀请学生名",
+      "help": "填写要邀请的学生的名字，使用游戏内语言填写，多个学生使用 > 连接。例：\n日服：\tホシノ(水着) > 御坂美琴 > ユズ\n国际服：\tHoshino(Swimsuit) > Yuuka > Kayoko(New Year)"
+    },
+    "Substitute": {
+      "name": "是否替换已存在学生",
+      "help": "若咖啡厅已存在所邀请学生的不同服装，选择是否替换该学生\n若不替换，则尝试匹配下一位学生"
     }
   },
   "Bounty": {
@@ -241,6 +273,7 @@
     "Stage": {
       "name": "选择关卡",
       "help": "",
+      "0": "自动选择",
       "1": "01 - 高架公路 A",
       "2": "02 - 高架公路 B",
       "3": "03 - 高架公路 C",
@@ -249,7 +282,8 @@
       "6": "06 - 高架公路 F",
       "7": "07 - 高架公路 G",
       "8": "08 - 高架公路 H",
-      "9": "09 - 高架公路 I"
+      "9": "09 - 高架公路 I",
+      "10": "10 - 高架公路 J"
     },
     "Count": {
       "name": "扫荡次数",
@@ -264,6 +298,7 @@
     "Stage": {
       "name": "选择关卡",
       "help": "",
+      "0": "自动选择",
       "1": "01 - 被遗弃的列车 A",
       "2": "02 - 被遗弃的列车 B",
       "3": "03 - 被遗弃的列车 C",
@@ -272,7 +307,8 @@
       "6": "06 - 被遗弃的列车 F",
       "7": "07 - 被遗弃的列车 G",
       "8": "08 - 被遗弃的列车 H",
-      "9": "09 - 被遗弃的列车 I"
+      "9": "09 - 被遗弃的列车 I",
+      "10": "10 - 被遗弃的列车 J"
     },
     "Count": {
       "name": "扫荡次数",
@@ -287,6 +323,7 @@
     "Stage": {
       "name": "选择关卡",
       "help": "",
+      "0": "自动选择",
       "1": "01 - 被袭击的教室 A",
       "2": "02 - 被袭击的教室 B",
       "3": "03 - 被袭击的教室 C",
@@ -295,7 +332,8 @@
       "6": "06 - 被袭击的教室 F",
       "7": "07 - 被袭击的教室 G",
       "8": "08 - 被袭击的教室 H",
-      "9": "09 - 被袭击的教室 I"
+      "9": "09 - 被袭击的教室 I",
+      "10": "10 - 被袭击的教室 J"
     },
     "Count": {
       "name": "扫荡次数",
@@ -322,6 +360,7 @@
     "Stage": {
       "name": "选择关卡",
       "help": "",
+      "0": "自动选择",
       "1": "01 - 三一 A",
       "2": "02 - 三一 B",
       "3": "03 - 三一 C",
@@ -340,6 +379,7 @@
     "Stage": {
       "name": "选择关卡",
       "help": "",
+      "0": "自动选择",
       "1": "01 - 格黑娜 A",
       "2": "02 - 格黑娜 B",
       "3": "03 - 格黑娜 C",
@@ -358,6 +398,7 @@
     "Stage": {
       "name": "选择关卡",
       "help": "",
+      "0": "自动选择",
       "1": "01 - 千年 A",
       "2": "02 - 千年 B",
       "3": "03 - 千年 C",