diff --git a/src/ARKServerManager/App.config b/src/ARKServerManager/App.config index f771f5ed..046e242e 100644 --- a/src/ARKServerManager/App.config +++ b/src/ARKServerManager/App.config @@ -915,6 +915,15 @@ + + False + + + False + + + False + diff --git a/src/ARKServerManager/Config.Designer.cs b/src/ARKServerManager/Config.Designer.cs index f7cffc57..15319015 100644 --- a/src/ARKServerManager/Config.Designer.cs +++ b/src/ARKServerManager/Config.Designer.cs @@ -3256,5 +3256,50 @@ namespace ServerManagerTool { this["TaskSchedulerPassword"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ProfileSyncServerModIdsEnabled + { + get + { + return ((bool)(this["ProfileSyncServerModIdsEnabled"])); + } + set + { + this["ProfileSyncServerModIdsEnabled"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ProfileSyncCrossArkClusterIdEnabled + { + get + { + return ((bool)(this["ProfileSyncCrossArkClusterIdEnabled"])); + } + set + { + this["ProfileSyncCrossArkClusterIdEnabled"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ProfileSyncAutoShutdownEnabled + { + get + { + return ((bool)(this["ProfileSyncAutoShutdownEnabled"])); + } + set + { + this["ProfileSyncAutoShutdownEnabled"] = value; + } + } } } diff --git a/src/ARKServerManager/Globalization/en-US/en-US.xaml b/src/ARKServerManager/Globalization/en-US/en-US.xaml index ff1c4631..e2a91459 100644 --- a/src/ARKServerManager/Globalization/en-US/en-US.xaml +++ b/src/ARKServerManager/Globalization/en-US/en-US.xaml @@ -592,6 +592,14 @@ If enabled, the SotF settings will be managed by the server manager. WARNING: While any of these options are disabled, the server manager will not read or write the associated overrides settings. Re-enabling any of these options will cause ALL existing associated overrides to be removed from the config file. + Custom Profile Sync Options + Enable Sync for ModIDs + If enabled, on profile sync the ModIDs are still synced. + Enable Sync for ClusterID + If enabled, on profile sync the ClusterID is still synced. + Enable Sync for Auto Shutdown Time + If enabled, on profile sync the Auto Shutdown Time Settings are still synced. + Custom Level Options Player Level Increase: The amount of XP to be increased when adding a new custom level. diff --git a/src/ARKServerManager/Lib/ServerProfile.cs b/src/ARKServerManager/Lib/ServerProfile.cs index 1eff4e29..53178029 100644 --- a/src/ARKServerManager/Lib/ServerProfile.cs +++ b/src/ARKServerManager/Lib/ServerProfile.cs @@ -6071,7 +6071,10 @@ namespace ServerManagerTool.Lib private void SyncAdministrationSection(ServerProfile sourceProfile) { - //this.SetValue(ServerModIdsProperty, sourceProfile.ServerModIds); + if (Config.Default.ProfileSyncServerModIdsEnabled) + { + this.SetValue(ServerModIdsProperty, sourceProfile.ServerModIds); + } this.SetValue(AutoSavePeriodMinutesProperty, sourceProfile.AutoSavePeriodMinutes); @@ -6111,7 +6114,11 @@ namespace ServerManagerTool.Lib this.SetValue(EnablePublicIPForEpicProperty, sourceProfile.EnablePublicIPForEpic); this.SetValue(OutputServerLogProperty, sourceProfile.OutputServerLog); //this.SetValue(AltSaveDirectoryNameProperty, sourceProfile.AltSaveDirectoryName); - this.SetValue(CrossArkClusterIdProperty, sourceProfile.CrossArkClusterId); + if (Config.Default.ProfileSyncCrossArkClusterIdEnabled) + { + this.SetValue(CrossArkClusterIdProperty, sourceProfile.CrossArkClusterId); + this.SetValue(ClusterDirOverrideProperty, sourceProfile.ClusterDirOverride); + } this.SetValue(ClusterDirOverrideProperty, sourceProfile.ClusterDirOverride); this.SetValue(SecureSendArKPayloadProperty, sourceProfile.SecureSendArKPayload); this.SetValue(UseItemDupeCheckProperty, sourceProfile.UseItemDupeCheck); @@ -6151,14 +6158,20 @@ namespace ServerManagerTool.Lib this.SetValue(AutoStartOnLoginProperty, sourceProfile.AutoStartOnLogin); this.SetValue(EnableAutoShutdown1Property, sourceProfile.EnableAutoShutdown1); - this.SetValue(AutoShutdownTime1Property, sourceProfile.AutoShutdownTime1); - this.SetValue(ShutdownDaysOfTheWeek1Property, sourceProfile.ShutdownDaysOfTheWeek1); + if (Config.Default.ProfileSyncAutoShutdownEnabled) + { + this.SetValue(AutoShutdownTime1Property, sourceProfile.AutoShutdownTime1); + this.SetValue(ShutdownDaysOfTheWeek1Property, sourceProfile.ShutdownDaysOfTheWeek1); + } this.SetValue(RestartAfterShutdown1Property, sourceProfile.RestartAfterShutdown1); this.SetValue(UpdateAfterShutdown1Property, sourceProfile.UpdateAfterShutdown1); this.SetValue(EnableAutoShutdown2Property, sourceProfile.EnableAutoShutdown2); - this.SetValue(AutoShutdownTime2Property, sourceProfile.AutoShutdownTime2); - this.SetValue(ShutdownDaysOfTheWeek2Property, sourceProfile.ShutdownDaysOfTheWeek2); + if (Config.Default.ProfileSyncAutoShutdownEnabled) + { + this.SetValue(AutoShutdownTime2Property, sourceProfile.AutoShutdownTime2); + this.SetValue(ShutdownDaysOfTheWeek2Property, sourceProfile.ShutdownDaysOfTheWeek2); + } this.SetValue(RestartAfterShutdown2Property, sourceProfile.RestartAfterShutdown2); this.SetValue(UpdateAfterShutdown2Property, sourceProfile.UpdateAfterShutdown2); diff --git a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml index 95d120ad..12972666 100644 --- a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml +++ b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml @@ -266,6 +266,28 @@ + + + + + + + + + + + + + + + + + + + + + @@ -285,7 +307,7 @@ - + @@ -306,7 +328,7 @@ - + @@ -328,7 +350,7 @@ - + diff --git a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml index 14549d7f..f0d40213 100644 --- a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml +++ b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml @@ -1102,9 +1102,9 @@