Merge the remaining functions in MoreAlas

module/config/config_generated.py

@@ -34,6 +34,7 @@ class GeneratedConfig:
     # Group `Error`
     Error_HandleError = True
     Error_SaveError = True
+    Error_SaveConfig = True
     Error_OnePushConfig = 'provider: null'
     Error_ScreenshotLength = 1
 
@@ -137,6 +138,7 @@ class GeneratedConfig:
     StopCondition_OilLimit = 1000
     StopCondition_RunCount = 0
     StopCondition_MapAchievement = 'non_stop'  # non_stop, 100_percent_clear, map_3_stars, threat_safe, threat_safe_without_3_stars
+    StopCondition_StopBarrier = '1-1'
     StopCondition_StageIncrease = False
     StopCondition_GetNewShip = False
     StopCondition_ReachLevel = 0
@@ -297,10 +299,13 @@ class GeneratedConfig:
     EventGeneral_PtLimit = 0
     EventGeneral_TimeLimit = datetime.datetime(2020, 1, 1, 0, 0)
 
+    # Group `KeepOil`
+    KeepOil_TimeLimit = datetime.datetime(2020, 1, 1, 0, 0)
+
     # Group `TaskBalancer`
     TaskBalancer_Enable = False
     TaskBalancer_CoinLimit = 10000
-    TaskBalancer_TaskCall = 'Main'  # Main, Main2, Main3
+    TaskBalancer_TaskCall = 'Main'  # Main, Main2, Main3, Main4, Main5, Main6
 
     # Group `EventDaily`
     EventDaily_StageFilter = 'A1 > A2 > A3'
@@ -410,6 +415,7 @@ class GeneratedConfig:
     GeneralShop_Filter = 'BookRedT3 > BookYellowT3 > BookBlueT3 > BookRedT2\n> Cube\n> FoodT6 > FoodT5'
 
     # Group `GuildShop`
+    GuildShop_Enable = True
     GuildShop_Refresh = True
     GuildShop_Filter = 'PlateT4 > BookT3 > PR > CatT3 > Chip > BookT2 > Retrofit > FoodT6 > FoodT5 > CatT2 > BoxT4'
     GuildShop_BOX_T3 = 'ironblood'  # eagle, royal, sakura, ironblood
@@ -426,6 +432,7 @@ class GeneratedConfig:
     GuildShop_PR3 = 'cheshire'  # cheshire, mainz, odin, champagne
 
     # Group `MedalShop2`
+    MedalShop2_Enable = True
     MedalShop2_Filter = 'DR > PR\n> BookRedT3 > BookYellowT3 > BookBlueT3\n> BookRedT2 > BookYellowT2 > BookBlueT2\n> RetrofitT3\n> FoodT6 > FoodT5\n> PlateGeneralT3 > PlateWildT3'
     MedalShop2_RETROFIT_T1 = 'cl'  # dd, cl, bb, cv
     MedalShop2_RETROFIT_T2 = 'cl'  # dd, cl, bb, cv
@@ -435,10 +442,12 @@ class GeneratedConfig:
     MedalShop2_PLATE_T3 = 'general'  # general, gun, torpedo, antiair, plane
 
     # Group `MeritShop`
+    MeritShop_Enable = True
     MeritShop_Refresh = False
     MeritShop_Filter = 'Cube'
 
     # Group `CoreShop`
+    CoreShop_Enable = True
     CoreShop_Filter = 'Array'
 
     # Group `EventShop`
@@ -738,5 +747,27 @@ class GeneratedConfig:
     InstanceRestart_NotifyWhenAutoRestart = False
     InstanceRestart_HasRestarted = 0
 
+    # Group `ExitWhenMaintenance`
+    ExitWhenMaintenance_Enable = False
+    ExitWhenMaintenance_Notify = True
+
+    # Group `Boss`
+    Boss_Name = None
+    Boss_Account = None
+    Boss_Password = None
+    Boss_SecondPassword = None
+
+    # Group `OutDate`
+    OutDate_TimeLimit = datetime.datetime(2020, 1, 1, 0, 0)
+
+    # Group `Comment`
+    Comment_Content = None
+
+    # Group `OthersLogin`
+    OthersLogin_Enable = False
+    OthersLogin_Method = 'stay_there'  # stay_there, close_game
+    OthersLogin_Interval = 60
+    OthersLogin_Notify = True
+
     # Group `Storage`
     Storage_Storage = {}