Merge branch 'master' into dev

module/config/argument/argument.yaml

@@ -308,8 +308,8 @@ MaritimeEscort:
   Enable: true
 Coalition:
   Mode:
-    value: tc1
-    option: [ tc1, tc2, tc3, sp, ex ]
+    value: hard
+    option: [ easy, normal, hard, sp, ex ]
   Fleet:
     value: single
     option: [ single, multi ]

module/config/argument/menu.json

@@ -23,11 +23,11 @@
     "page": "setting",
     "tasks": [
       "EventGeneral",
+      "Coalition",
       "Event",
       "Event2",
       "Raid",
       "Hospital",
-      "Coalition",
       "MaritimeEscort",
       "WarArchives"
     ]
@@ -36,13 +36,13 @@
     "menu": "collapse",
     "page": "setting",
     "tasks": [
+      "CoalitionSp",
       "EventA",
       "EventB",
       "EventC",
       "EventD",
       "EventSp",
-      "RaidDaily",
-      "CoalitionSp"
+      "RaidDaily"
     ]
   },
   "Reward": {

module/config/argument/override.yaml

@@ -240,7 +240,7 @@ Coalition:
     AmbushEvade: true
   Coalition:
     Mode:
-      option: [ tc1, tc2, tc3, ex ]
+      option: [ easy, normal, hard, ex ]
   StopCondition:
     MapAchievement: non_stop
     StageIncrease: false

module/config/argument/task.yaml

@@ -71,6 +71,12 @@ Event:
     EventGeneral:
       - EventGeneral
       - TaskBalancer
+    Coalition:
+      - Scheduler
+      - Campaign
+      - Coalition
+      - StopCondition
+      - Emotion
     Event:
       - Scheduler
       - Campaign
@@ -100,12 +106,6 @@ Event:
       - Hospital
       - StopCondition
       - Emotion
-    Coalition:
-      - Scheduler
-      - Campaign
-      - Coalition
-      - StopCondition
-      - Emotion
     MaritimeEscort:
       - Scheduler
       - MaritimeEscort
@@ -126,6 +126,12 @@ EventDaily:
   menu: 'collapse'
   page: 'setting'
   tasks:
+    CoalitionSp:
+      - Scheduler
+      - Campaign
+      - Coalition
+      - StopCondition
+      - Emotion
     EventA:
       - Scheduler
       - EventDaily
@@ -181,12 +187,6 @@ EventDaily:
       - Campaign
       - StopCondition
       - Emotion
-    CoalitionSp:
-      - Scheduler
-      - Campaign
-      - Coalition
-      - StopCondition
-      - Emotion
 
 # ==================== Reward ====================