From 1c96ebb8903b37510123442d070aae9fae657648 Mon Sep 17 00:00:00 2001
From: Greelan <53196309+Greelan@users.noreply.github.com>
Date: Sat, 17 Dec 2022 12:39:01 +1100
Subject: [PATCH] Icarus: Add settings, branch option, remove player limit
 (#249)

---
 icarus.kvp               |  2 +-
 icarusconfig.json        | 53 +++++++++++++++++++++++++++++++++++++---
 icarusserversettings.ini |  2 ++
 3 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/icarus.kvp b/icarus.kvp
index b0baf02..4ed6922 100644
--- a/icarus.kvp
+++ b/icarus.kvp
@@ -49,7 +49,7 @@ App.AdminMethod=STDIO
 App.AdminLoginTransform=None
 App.RCONConnectDelaySeconds=5
 App.RCONConnectRetrySeconds=5
-App.UpdateSources=[{"UpdateStageName":"SteamCMD Download","UpdateSourcePlatform":"All","UpdateSource":"SteamCMD","UpdateSourceData":"2089300","ForceDownloadPlatform":"Windows"},{"UpdateStageName":"Create Config Directory","UpdateSourcePlatform":"All","UpdateSource":"CreateDirectory","UpdateSourceArgs":"{{$FullBaseDir}}Icarus/Saved/Config/WindowsServer","OverwriteExistingFiles":false},{"UpdateStageName":"Config File Download","UpdateSourcePlatform":"All","UpdateSource":"FetchURL","UpdateSourceData":"https://raw.githubusercontent.com/CubeCoders/AMPTemplates/main/icarusserversettings.ini","UpdateSourceArgs":"ServerSettings.ini","UpdateSourceTarget":"{{$FullBaseDir}}Icarus/Saved/Config/WindowsServer/","OverwriteExistingFiles":false}]
+App.UpdateSources=[{"UpdateStageName":"SteamCMD Download","UpdateSourcePlatform":"All","UpdateSource":"SteamCMD","UpdateSourceData":"2089300","UpdateSourceVersion":"{{ServerBranch}}","ForceDownloadPlatform":"Windows"},{"UpdateStageName":"Create Config Directory","UpdateSourcePlatform":"All","UpdateSource":"CreateDirectory","UpdateSourceArgs":"{{$FullBaseDir}}Icarus/Saved/Config/WindowsServer","OverwriteExistingFiles":false},{"UpdateStageName":"Config File Download","UpdateSourcePlatform":"All","UpdateSource":"FetchURL","UpdateSourceData":"https://raw.githubusercontent.com/CubeCoders/AMPTemplates/main/icarusserversettings.ini","UpdateSourceArgs":"ServerSettings.ini","UpdateSourceTarget":"{{$FullBaseDir}}Icarus/Saved/Config/WindowsServer/","OverwriteExistingFiles":false}]
 App.Compatibility=None
 App.SteamUpdateAnonymousLogin=True
 App.SteamForceLoginPrompt=False
diff --git a/icarusconfig.json b/icarusconfig.json
index 565872d..f54819f 100644
--- a/icarusconfig.json
+++ b/icarusconfig.json
@@ -123,12 +123,11 @@
     {
         "DisplayName":"Player Limit",
         "Category":"Icarus Server Settings",
-        "Description":"Maximum number of players that may connect to the server",
+        "Description":"Maximum number of players that may connect to the server at one time",
         "Keywords":"players,limit",
         "FieldName":"$MaxUsers",
         "InputType":"number",
         "MinValue":"1",
-        "MaxValue":"8",
         "IsFlagArgument":false,
         "ParamFieldName":"/Script/Icarus.DedicatedServerSettings.MaxPlayers",
         "IncludeInCommandLine":false,
@@ -308,7 +307,7 @@
     {
         "DisplayName":"Enable Hardcore",
         "Category":"Icarus Server Settings",
-        "Description":"If set, harcore mode will be enabled when creating a prospect (respawns will be disabled)",
+        "Description":"If set, hardcore mode will be enabled when creating a prospect (respawns will be disabled)",
         "Keywords":"hardcore",
         "FieldName":"Hardcore",
         "InputType":"checkbox",
@@ -352,5 +351,53 @@
         "Placeholder":"300",
         "Suffix":"seconds",
         "EnumValues":{}
+    },
+    {
+        "DisplayName":"Allow Non-Admins To Load Prospects",
+        "Category":"Icarus Server Settings",
+        "Description":"If set, anyone who joins the lobby can create a new prospect or load an existing one. Otherwise, only admins can",
+        "Keywords":"non,admins,create,prospects",
+        "FieldName":"AllowNonAdminsToLaunchProspects",
+        "InputType":"checkbox",
+        "IsFlagArgument":false,
+        "ParamFieldName":"/Script/Icarus.DedicatedServerSettings.AllowNonAdminsToLaunchProspects",
+        "IncludeInCommandLine":false,
+        "DefaultValue":"True",
+        "EnumValues":{
+            "False":"False",
+            "True":"True"
+        }
+    },
+    {
+        "DisplayName":"Allow Non-Admins To Delete Prospects",
+        "Category":"Icarus Server Settings",
+        "Description":"If set, anyone who joins the lobby can delete existing prospects from the server. Otherwise, only admins can",
+        "Keywords":"non,admins,delete,prospects",
+        "FieldName":"AllowNonAdminsToDeleteProspects",
+        "InputType":"checkbox",
+        "IsFlagArgument":false,
+        "ParamFieldName":"/Script/Icarus.DedicatedServerSettings.AllowNonAdminsToDeleteProspects",
+        "IncludeInCommandLine":false,
+        "DefaultValue":"False",
+        "EnumValues":{
+            "False":"False",
+            "True":"True"
+        }
+    },
+    {
+        "DisplayName":"Server Branch",
+        "Category":"SteamCMD and Updates",
+        "Description":"Sets the server branch to install. The client must be on the same version. NOTE: Update the server after switching branches!",
+        "Keywords":"server,branch,depot",
+        "FieldName":"ServerBranch",
+        "InputType":"enum",
+        "IsFlagArgument":false,
+        "ParamFieldName":"ServerBranch",
+        "IncludeInCommandLine":false,
+        "DefaultValue":"public",
+        "EnumValues":{
+            "public":"Public (default)",
+            "experimental":"Experimental"
+        }
     }
 ]
diff --git a/icarusserversettings.ini b/icarusserversettings.ini
index 85ce7ee..53950fc 100644
--- a/icarusserversettings.ini
+++ b/icarusserversettings.ini
@@ -5,6 +5,8 @@ MaxPlayers=8
 AdminPassword=Password123
 ShutdownIfNotJoinedFor=300
 ShutdownIfEmptyFor=300
+AllowNonAdminsToLaunchProspects=True
+AllowNonAdminsToDeleteProspects=False
 LoadProspect=
 CreateProspect=
 ResumeProspect=False