Merge remote-tracking branch 'LmeSzinc/master' into dev

# Conflicts:
#	module/config/argument/args.json

module/config/full_config_generated.py

@@ -592,42 +592,6 @@ class FullGeneratedConfig:
     EventGeneral_TaskBalancer_TaskCall = None
     EventGeneral_Storage_Storage = None
 
-    # Task `Coalition`
-    Coalition_Scheduler_Enable = None
-    Coalition_Scheduler_NextRun = None
-    Coalition_Scheduler_Command = None
-    Coalition_Scheduler_SuccessInterval = None
-    Coalition_Scheduler_FailureInterval = None
-    Coalition_Scheduler_ServerUpdate = None
-    Coalition_Campaign_Name = None
-    Coalition_Campaign_Event = None
-    Coalition_Campaign_Mode = None
-    Coalition_Campaign_UseClearMode = None
-    Coalition_Campaign_UseFleetLock = None
-    Coalition_Campaign_UseAutoSearch = None
-    Coalition_Campaign_Use2xBook = None
-    Coalition_Campaign_AmbushEvade = None
-    Coalition_Coalition_Mode = None
-    Coalition_Coalition_Fleet = None
-    Coalition_StopCondition_OilLimit = None
-    Coalition_StopCondition_RunCount = None
-    Coalition_StopCondition_MapAchievement = None
-    Coalition_StopCondition_StageIncrease = None
-    Coalition_StopCondition_GetNewShip = None
-    Coalition_StopCondition_ReachLevel = None
-    Coalition_Emotion_Mode = None
-    Coalition_Emotion_Fleet1Value = None
-    Coalition_Emotion_Fleet1Record = None
-    Coalition_Emotion_Fleet1Control = None
-    Coalition_Emotion_Fleet1Recover = None
-    Coalition_Emotion_Fleet1Oath = None
-    Coalition_Emotion_Fleet2Value = None
-    Coalition_Emotion_Fleet2Record = None
-    Coalition_Emotion_Fleet2Control = None
-    Coalition_Emotion_Fleet2Recover = None
-    Coalition_Emotion_Fleet2Oath = None
-    Coalition_Storage_Storage = None
-
     # Task `Event`
     Event_Scheduler_Enable = None
     Event_Scheduler_NextRun = None
@@ -1027,6 +991,42 @@ class FullGeneratedConfig:
     Hospital_Emotion_Fleet2Oath = None
     Hospital_Storage_Storage = None
 
+    # Task `Coalition`
+    Coalition_Scheduler_Enable = None
+    Coalition_Scheduler_NextRun = None
+    Coalition_Scheduler_Command = None
+    Coalition_Scheduler_SuccessInterval = None
+    Coalition_Scheduler_FailureInterval = None
+    Coalition_Scheduler_ServerUpdate = None
+    Coalition_Campaign_Name = None
+    Coalition_Campaign_Event = None
+    Coalition_Campaign_Mode = None
+    Coalition_Campaign_UseClearMode = None
+    Coalition_Campaign_UseFleetLock = None
+    Coalition_Campaign_UseAutoSearch = None
+    Coalition_Campaign_Use2xBook = None
+    Coalition_Campaign_AmbushEvade = None
+    Coalition_Coalition_Mode = None
+    Coalition_Coalition_Fleet = None
+    Coalition_StopCondition_OilLimit = None
+    Coalition_StopCondition_RunCount = None
+    Coalition_StopCondition_MapAchievement = None
+    Coalition_StopCondition_StageIncrease = None
+    Coalition_StopCondition_GetNewShip = None
+    Coalition_StopCondition_ReachLevel = None
+    Coalition_Emotion_Mode = None
+    Coalition_Emotion_Fleet1Value = None
+    Coalition_Emotion_Fleet1Record = None
+    Coalition_Emotion_Fleet1Control = None
+    Coalition_Emotion_Fleet1Recover = None
+    Coalition_Emotion_Fleet1Oath = None
+    Coalition_Emotion_Fleet2Value = None
+    Coalition_Emotion_Fleet2Record = None
+    Coalition_Emotion_Fleet2Control = None
+    Coalition_Emotion_Fleet2Recover = None
+    Coalition_Emotion_Fleet2Oath = None
+    Coalition_Storage_Storage = None
+
     # Task `MaritimeEscort`
     MaritimeEscort_Scheduler_Enable = None
     MaritimeEscort_Scheduler_NextRun = None
@@ -1106,42 +1106,6 @@ class FullGeneratedConfig:
     WarArchives_EnemyPriority_EnemyScaleBalanceWeight = None
     WarArchives_Storage_Storage = None
 
-    # Task `CoalitionSp`
-    CoalitionSp_Scheduler_Enable = None
-    CoalitionSp_Scheduler_NextRun = None
-    CoalitionSp_Scheduler_Command = None
-    CoalitionSp_Scheduler_SuccessInterval = None
-    CoalitionSp_Scheduler_FailureInterval = None
-    CoalitionSp_Scheduler_ServerUpdate = None
-    CoalitionSp_Campaign_Name = None
-    CoalitionSp_Campaign_Event = None
-    CoalitionSp_Campaign_Mode = None
-    CoalitionSp_Campaign_UseClearMode = None
-    CoalitionSp_Campaign_UseFleetLock = None
-    CoalitionSp_Campaign_UseAutoSearch = None
-    CoalitionSp_Campaign_Use2xBook = None
-    CoalitionSp_Campaign_AmbushEvade = None
-    CoalitionSp_Coalition_Mode = None
-    CoalitionSp_Coalition_Fleet = None
-    CoalitionSp_StopCondition_OilLimit = None
-    CoalitionSp_StopCondition_RunCount = None
-    CoalitionSp_StopCondition_MapAchievement = None
-    CoalitionSp_StopCondition_StageIncrease = None
-    CoalitionSp_StopCondition_GetNewShip = None
-    CoalitionSp_StopCondition_ReachLevel = None
-    CoalitionSp_Emotion_Mode = None
-    CoalitionSp_Emotion_Fleet1Value = None
-    CoalitionSp_Emotion_Fleet1Record = None
-    CoalitionSp_Emotion_Fleet1Control = None
-    CoalitionSp_Emotion_Fleet1Recover = None
-    CoalitionSp_Emotion_Fleet1Oath = None
-    CoalitionSp_Emotion_Fleet2Value = None
-    CoalitionSp_Emotion_Fleet2Record = None
-    CoalitionSp_Emotion_Fleet2Control = None
-    CoalitionSp_Emotion_Fleet2Recover = None
-    CoalitionSp_Emotion_Fleet2Oath = None
-    CoalitionSp_Storage_Storage = None
-
     # Task `EventA`
     EventA_Scheduler_Enable = None
     EventA_Scheduler_NextRun = None
@@ -1465,6 +1429,42 @@ class FullGeneratedConfig:
     RaidDaily_Emotion_Fleet2Oath = None
     RaidDaily_Storage_Storage = None
 
+    # Task `CoalitionSp`
+    CoalitionSp_Scheduler_Enable = None
+    CoalitionSp_Scheduler_NextRun = None
+    CoalitionSp_Scheduler_Command = None
+    CoalitionSp_Scheduler_SuccessInterval = None
+    CoalitionSp_Scheduler_FailureInterval = None
+    CoalitionSp_Scheduler_ServerUpdate = None
+    CoalitionSp_Campaign_Name = None
+    CoalitionSp_Campaign_Event = None
+    CoalitionSp_Campaign_Mode = None
+    CoalitionSp_Campaign_UseClearMode = None
+    CoalitionSp_Campaign_UseFleetLock = None
+    CoalitionSp_Campaign_UseAutoSearch = None
+    CoalitionSp_Campaign_Use2xBook = None
+    CoalitionSp_Campaign_AmbushEvade = None
+    CoalitionSp_Coalition_Mode = None
+    CoalitionSp_Coalition_Fleet = None
+    CoalitionSp_StopCondition_OilLimit = None
+    CoalitionSp_StopCondition_RunCount = None
+    CoalitionSp_StopCondition_MapAchievement = None
+    CoalitionSp_StopCondition_StageIncrease = None
+    CoalitionSp_StopCondition_GetNewShip = None
+    CoalitionSp_StopCondition_ReachLevel = None
+    CoalitionSp_Emotion_Mode = None
+    CoalitionSp_Emotion_Fleet1Value = None
+    CoalitionSp_Emotion_Fleet1Record = None
+    CoalitionSp_Emotion_Fleet1Control = None
+    CoalitionSp_Emotion_Fleet1Recover = None
+    CoalitionSp_Emotion_Fleet1Oath = None
+    CoalitionSp_Emotion_Fleet2Value = None
+    CoalitionSp_Emotion_Fleet2Record = None
+    CoalitionSp_Emotion_Fleet2Control = None
+    CoalitionSp_Emotion_Fleet2Recover = None
+    CoalitionSp_Emotion_Fleet2Oath = None
+    CoalitionSp_Storage_Storage = None
+
     # Task `Commission`
     Commission_Scheduler_Enable = None
     Commission_Scheduler_NextRun = None