diff --git a/src/ARKServerManager/App.config b/src/ARKServerManager/App.config
index 1edd45d2..5e0b1729 100644
--- a/src/ARKServerManager/App.config
+++ b/src/ARKServerManager/App.config
@@ -915,6 +915,9 @@
Normal
+
+ Online Player Count:
+
diff --git a/src/ARKServerManager/Config.Designer.cs b/src/ARKServerManager/Config.Designer.cs
index 15ebb99b..1b59df29 100644
--- a/src/ARKServerManager/Config.Designer.cs
+++ b/src/ARKServerManager/Config.Designer.cs
@@ -3252,5 +3252,17 @@ namespace ServerManagerTool {
return ((string)(this["DiscordUrl"]));
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("Online Player Count:")]
+ public string Alert_OnlinePlayerCountChange {
+ get {
+ return ((string)(this["Alert_OnlinePlayerCountChange"]));
+ }
+ set {
+ this["Alert_OnlinePlayerCountChange"] = value;
+ }
+ }
}
}
diff --git a/src/ARKServerManager/Config.settings b/src/ARKServerManager/Config.settings
index 6d250841..5ec4aaa1 100644
--- a/src/ARKServerManager/Config.settings
+++ b/src/ARKServerManager/Config.settings
@@ -893,5 +893,8 @@
https://discord.gg/cJdHJSG
+
+ Online Player Count:
+
\ No newline at end of file
diff --git a/src/ARKServerManager/Globalization/en-US/en-US.xaml b/src/ARKServerManager/Globalization/en-US/en-US.xaml
index f2cd02c9..59b93a3f 100644
--- a/src/ARKServerManager/Globalization/en-US/en-US.xaml
+++ b/src/ARKServerManager/Globalization/en-US/en-US.xaml
@@ -713,6 +713,8 @@
This message will be displayed when the status of the server changes.Mod Update Detected:This message will be displayed when the server manager detects one or more mods are out of date.
+ Online Player Count Change:
+ This message will be displayed when the online player count changes.Force Respawn Dinos Warning:This message will be displayed when the server is being started and a wild dino wipe is scheduled.
diff --git a/src/ARKServerManager/Lib/ServerRuntime.cs b/src/ARKServerManager/Lib/ServerRuntime.cs
index e96e67bf..48018475 100644
--- a/src/ARKServerManager/Lib/ServerRuntime.cs
+++ b/src/ARKServerManager/Lib/ServerRuntime.cs
@@ -333,6 +333,10 @@ namespace ServerManagerTool.Lib
break;
}
+ if (this.Players != update.OnlinePlayerCount)
+ {
+ PluginHelper.Instance.ProcessAlert(AlertType.OnlinePlayerCountChanged, this.ProfileSnapshot.ProfileName, $"{Config.Default.Alert_OnlinePlayerCountChange} {update.OnlinePlayerCount}");
+ }
this.Players = update.OnlinePlayerCount;
this.MaxPlayers = update.ServerInfo?.MaxPlayers ?? this.ProfileSnapshot.MaxPlayerCount;
diff --git a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml
index 280c9b69..43e3daac 100644
--- a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml
+++ b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml
@@ -8,7 +8,6 @@
xmlns:globcntrls="clr-namespace:WPFSharp.Globalizer.Controls;assembly=WPFSharp.Globalizer"
mc:Ignorable="d"
d:DesignWidth="800"
- FocusManager.FocusedElement="{Binding ElementName=DataPathTextBox}"
x:Name="GlobalSettings">
@@ -77,7 +76,7 @@
-
+
@@ -571,6 +570,7 @@
+
@@ -613,9 +613,12 @@
-
-
-
+
+
+
+
+
+
diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml
index dc6ab8c6..b7074deb 100644
--- a/src/ARKServerManager/VersionFeedBeta.xml
+++ b/src/ARKServerManager/VersionFeedBeta.xml
@@ -7,10 +7,35 @@
2022-06-22T00:00:00Z
+
+ urn:uuid:F3965FC7-685F-47DF-9E5B-3BA4D928127F
+ 1.1.434 (1.1.434.4)
+ 1.1.434.4
+
+ 2022-06-22T00:00:00Z
+
+
+
+ CHANGE
+
+
+
Availability Status - Changed the Waiting for Publication status into two new statuses, to clarify the issue.
+
Server Monitor - Added a Ports column that shows the main server ports.
+
zh-CN Translation file updated.
+
+
+
+
+
+ bletch
+ bletch1971@hotmail.com
+
+
+
urn:uuid:F3965FC7-685F-47DF-9E5B-3BA4D928127F1.1.434 (1.1.434.3)
- 1.1.434.2
+ 1.1.434.32022-06-22T00:00:00Z
diff --git a/src/ConanServerManager/App.config b/src/ConanServerManager/App.config
index 939747ba..cdf520e2 100644
--- a/src/ConanServerManager/App.config
+++ b/src/ConanServerManager/App.config
@@ -690,6 +690,9 @@
Normal
+
+ Online Player Count:
+
\ No newline at end of file
diff --git a/src/ConanServerManager/Config.Designer.cs b/src/ConanServerManager/Config.Designer.cs
index 36f47b63..d7a1b810 100644
--- a/src/ConanServerManager/Config.Designer.cs
+++ b/src/ConanServerManager/Config.Designer.cs
@@ -2435,5 +2435,17 @@ namespace ServerManagerTool {
return ((string)(this["DiscordUrl"]));
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("Online Player Count:")]
+ public string Alert_OnlinePlayerCountChange {
+ get {
+ return ((string)(this["Alert_OnlinePlayerCountChange"]));
+ }
+ set {
+ this["Alert_OnlinePlayerCountChange"] = value;
+ }
+ }
}
}
diff --git a/src/ConanServerManager/Config.settings b/src/ConanServerManager/Config.settings
index 19adc3af..ad4d3960 100644
--- a/src/ConanServerManager/Config.settings
+++ b/src/ConanServerManager/Config.settings
@@ -668,5 +668,8 @@
https://discord.gg/cJdHJSG
+
+ Online Player Count:
+
\ No newline at end of file
diff --git a/src/ConanServerManager/Globalization/en-US/en-US.xaml b/src/ConanServerManager/Globalization/en-US/en-US.xaml
index 8b52f612..54ec2898 100644
--- a/src/ConanServerManager/Globalization/en-US/en-US.xaml
+++ b/src/ConanServerManager/Globalization/en-US/en-US.xaml
@@ -870,8 +870,8 @@
This message will be displayed when the status of the server changes.Mod Update Detected:This message will be displayed when the server manager detects one or more mods are out of date.
- Force Respawn Creatures Warning:
- This message will be displayed when the server is being started and a wild creature wipe is scheduled.
+ Online Player Count Change:
+ This message will be displayed when the online player count changes.Enable Discord BotYou will need to restart the server manager if you change any settings for the Discord Bot.
diff --git a/src/ConanServerManager/Lib/ServerRuntime.cs b/src/ConanServerManager/Lib/ServerRuntime.cs
index 930a4f4a..16f39e83 100644
--- a/src/ConanServerManager/Lib/ServerRuntime.cs
+++ b/src/ConanServerManager/Lib/ServerRuntime.cs
@@ -332,6 +332,10 @@ namespace ServerManagerTool.Lib
break;
}
+ if (this.Players != update.OnlinePlayerCount)
+ {
+ PluginHelper.Instance.ProcessAlert(AlertType.OnlinePlayerCountChanged, this.ProfileSnapshot.ProfileName, $"{Config.Default.Alert_OnlinePlayerCountChange} {update.OnlinePlayerCount}");
+ }
this.Players = update.OnlinePlayerCount;
this.MaxPlayers = update.ServerInfo?.MaxPlayers ?? this.ProfileSnapshot.MaxPlayerCount;
diff --git a/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml b/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml
index c88b4c5c..23adb37f 100644
--- a/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml
+++ b/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml
@@ -8,7 +8,6 @@
xmlns:gctl="clr-namespace:WPFSharp.Globalizer.Controls;assembly=WPFSharp.Globalizer"
mc:Ignorable="d"
d:DesignWidth="800"
- FocusManager.FocusedElement="{Binding ElementName=DataPathTextBox}"
x:Name="GlobalSettings">
@@ -79,7 +78,7 @@
-
+
@@ -519,6 +518,7 @@
+
@@ -561,6 +561,9 @@
+
+
+
diff --git a/src/Plugin.Common/Enums/AlertTypeEnum.cs b/src/Plugin.Common/Enums/AlertTypeEnum.cs
index ff88e7af..4cd9b98a 100644
--- a/src/Plugin.Common/Enums/AlertTypeEnum.cs
+++ b/src/Plugin.Common/Enums/AlertTypeEnum.cs
@@ -11,5 +11,6 @@
UpdateResults,
ServerStatusChange,
ModUpdateDetected,
+ OnlinePlayerCountChanged,
}
}
diff --git a/src/Plugin.Discord/Globalization/en-US/en-US.xaml b/src/Plugin.Discord/Globalization/en-US/en-US.xaml
index db83bd89..4e2fd917 100644
--- a/src/Plugin.Discord/Globalization/en-US/en-US.xaml
+++ b/src/Plugin.Discord/Globalization/en-US/en-US.xaml
@@ -8,6 +8,7 @@
BackupErrorMod Update Detected
+ Online Player Count ChangeShutdownShutdown MessageShutdown Reason