Merge pull request #1574 from zhou525/dev_1375_pr

Dossier Beacon and OneHitMode

module/config/argument/args.json

@@ -7462,19 +7462,62 @@
         "type": "textarea",
         "value": "ActionPoint > PurpleCoins"
       }
+    }
+  },
+  "OpsiAshBeacon": {
+    "Scheduler": {
+      "Enable": {
+        "type": "checkbox",
+        "value": false
+      },
+      "NextRun": {
+        "type": "datetime",
+        "value": "2020-01-01 00:00:00",
+        "validate": "datetime"
+      },
+      "Command": {
+        "type": "input",
+        "value": "OpsiAshBeacon",
+        "display": "hide"
+      },
+      "SuccessInterval": {
+        "type": "input",
+        "value": 30,
+        "display": "hide"
+      },
+      "FailureInterval": {
+        "type": "input",
+        "value": 30,
+        "display": "hide"
+      },
+      "ServerUpdate": {
+        "type": "input",
+        "value": "00:00",
+        "display": "hide"
+      }
     },
     "OpsiAshBeacon": {
       "AshAttack": {
         "type": "checkbox",
         "value": true
       },
-      "EnsureFullyCollected": {
+      "OneHitMode": {
         "type": "checkbox",
         "value": true
       },
       "RequestAssist": {
         "type": "checkbox",
         "value": true
+      },
+      "EnsureFullyCollected": {
+        "type": "checkbox",
+        "value": true
+      }
+    },
+    "OpsiDossierBeacon": {
+      "Enable": {
+        "type": "checkbox",
+        "value": true
       }
     }
   },

module/config/argument/argument.yaml

@@ -531,8 +531,11 @@ OpsiGeneral:
     ActionPoint > PurpleCoins
 OpsiAshBeacon:
   AshAttack: true
-  EnsureFullyCollected: true
+  OneHitMode: true
   RequestAssist: true
+  EnsureFullyCollected: true
+OpsiDossierBeacon:
+  Enable: true
 OpsiFleetFilter:
   Filter: |-
     Fleet-4 > CallSubmarine > Fleet-2 > Fleet-3 > Fleet-1

module/config/argument/menu.json

@@ -52,6 +52,7 @@
     ],
     "Opsi": [
       "OpsiGeneral",
+      "OpsiAshBeacon",
       "OpsiAshAssist",
       "OpsiExplore",
       "OpsiShop",

module/config/argument/override.yaml

@@ -336,6 +336,11 @@ OpsiAshAssist:
     SuccessInterval: 30
     FailureInterval: 30
     ServerUpdate: 00:00
+OpsiAshBeacon:
+  Scheduler:
+    SuccessInterval: 30
+    FailureInterval: 30
+    ServerUpdate: 00:00
 OpsiExplore:
   Scheduler:
     SuccessInterval: 0

module/config/argument/task.yaml

@@ -235,7 +235,10 @@ WarArchives:
 
 OpsiGeneral:
   - OpsiGeneral
+OpsiAshBeacon:
+  - Scheduler
   - OpsiAshBeacon
+  - OpsiDossierBeacon
 OpsiAshAssist:
   - Scheduler
   - OpsiAshAssist