Add: freebies module / task encompasses running BattlePass, DataKey, Mail, and SupplyPack together

Upd: BattlePass, DataKey, and SupplyPack modified to run as sub-tasks under Freebies

module/config/argument/args.json

@@ -5846,18 +5846,6 @@
       "CollectWeeklyMission": {
         "type": "checkbox",
         "value": true
-      },
-      "CollectMail": {
-        "type": "checkbox",
-        "value": false
-      },
-      "MailFilter": {
-        "type": "textarea",
-        "value": "Merit"
-      },
-      "DeleteMail": {
-        "type": "checkbox",
-        "value": false
       }
     }
   },
@@ -6280,7 +6268,7 @@
       }
     }
   },
-  "DataKey": {
+  "Freebies": {
     "Scheduler": {
       "Enable": {
         "type": "checkbox",
@@ -6293,85 +6281,7 @@
       },
       "Command": {
         "type": "input",
-        "value": "DataKey",
-        "display": "hide"
-      },
-      "SuccessInterval": {
-        "type": "input",
-        "value": 30,
-        "display": "hide"
-      },
-      "FailureInterval": {
-        "type": "input",
-        "value": 30,
-        "display": "hide"
-      },
-      "ServerUpdate": {
-        "type": "input",
-        "value": "00:00",
-        "display": "hide"
-      }
-    },
-    "DataKey": {
-      "ForceGet": {
-        "type": "checkbox",
-        "value": false
-      }
-    }
-  },
-  "SupplyPack": {
-    "Scheduler": {
-      "Enable": {
-        "type": "checkbox",
-        "value": true
-      },
-      "NextRun": {
-        "type": "datetime",
-        "value": "2020-01-01 00:00:00",
-        "validate": "datetime"
-      },
-      "Command": {
-        "type": "input",
-        "value": "SupplyPack",
-        "display": "hide"
-      },
-      "SuccessInterval": {
-        "type": "input",
-        "value": 30,
-        "display": "hide"
-      },
-      "FailureInterval": {
-        "type": "input",
-        "value": 30,
-        "display": "hide"
-      },
-      "ServerUpdate": {
-        "type": "input",
-        "value": "00:00",
-        "display": "hide"
-      }
-    },
-    "SupplyPack": {
-      "WeeklyFreeSupplyPack": {
-        "type": "checkbox",
-        "value": true
-      }
-    }
-  },
-  "BattlePass": {
-    "Scheduler": {
-      "Enable": {
-        "type": "checkbox",
-        "value": true
-      },
-      "NextRun": {
-        "type": "datetime",
-        "value": "2020-01-01 00:00:00",
-        "validate": "datetime"
-      },
-      "Command": {
-        "type": "input",
-        "value": "BattlePass",
+        "value": "Freebies",
         "display": "hide"
       },
       "SuccessInterval": {
@@ -6395,6 +6305,36 @@
         "type": "checkbox",
         "value": true
       }
+    },
+    "DataKey": {
+      "Get": {
+        "type": "checkbox",
+        "value": true
+      },
+      "ForceGet": {
+        "type": "checkbox",
+        "value": false
+      }
+    },
+    "Mail": {
+      "Collect": {
+        "type": "checkbox",
+        "value": true
+      },
+      "Filter": {
+        "type": "textarea",
+        "value": "Merit"
+      },
+      "Delete": {
+        "type": "checkbox",
+        "value": false
+      }
+    },
+    "SupplyPack": {
+      "WeeklyFreeSupplyPack": {
+        "type": "checkbox",
+        "value": true
+      }
     }
   },
   "MetaReward": {

module/config/argument/argument.yaml

@@ -360,10 +360,6 @@ Reward:
   CollectExp: true
   CollectMission: true
   CollectWeeklyMission: true
-  CollectMail: false
-  MailFilter: |-
-    Merit
-  DeleteMail: false
 GeneralShop:
   UseGems: false
   Refresh: false
@@ -458,12 +454,18 @@ Gacha:
     option: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
   UseTicket: true
   UseDrill: false
-DataKey:
-  ForceGet: false
-SupplyPack:
-  WeeklyFreeSupplyPack: true
 BattlePass:
   BattlePassReward: true
+DataKey:
+  Get: true
+  ForceGet: false
+Mail:
+  Collect: true
+  Filter: |-
+    Merit
+  Delete: false
+SupplyPack:
+  WeeklyFreeSupplyPack: true
 MetaReward:
   MetaReward: true
 

module/config/argument/default.yaml

@@ -51,13 +51,7 @@ Reward:
 
 # ==================== DailyReward ====================
 
-DataKey:
-  Scheduler:
-    Enable: true
-SupplyPack:
-  Scheduler:
-    Enable: true
-BattlePass:
+Freebies:
   Scheduler:
     Enable: true
 MetaReward:

module/config/argument/menu.json

@@ -38,9 +38,7 @@
       "ShopOnce",
       "Shipyard",
       "Gacha",
-      "DataKey",
-      "SupplyPack",
-      "BattlePass",
+      "Freebies",
       "MetaReward"
     ],
     "DailyMission": [

module/config/argument/override.yaml

@@ -260,17 +260,7 @@ Gacha:
     SuccessInterval: 30
     FailureInterval: 30
     ServerUpdate: 00:00
-DataKey:
-  Scheduler:
-    SuccessInterval: 30
-    FailureInterval: 30
-    ServerUpdate: 00:00
-SupplyPack:
-  Scheduler:
-    SuccessInterval: 30
-    FailureInterval: 30
-    ServerUpdate: 00:00
-BattlePass:
+Freebies:
   Scheduler:
     SuccessInterval: 30
     FailureInterval: 30

module/config/argument/task.yaml

@@ -187,15 +187,12 @@ Shipyard:
 Gacha:
   - Scheduler
   - Gacha
-DataKey:
-  - Scheduler
-  - DataKey
-SupplyPack:
-  - Scheduler
-  - SupplyPack
-BattlePass:
+Freebies:
   - Scheduler
   - BattlePass
+  - DataKey
+  - Mail
+  - SupplyPack
 MetaReward:
   - Scheduler
   - MetaReward