Core Keeper: updates for new server build

core-keeper.kvp

@@ -2,10 +2,10 @@ Meta.DisplayName=Core Keeper
 Meta.Description=Core Keeper Dedicated Server
 Meta.OS=Windows, Linux
 Meta.Arch=x86_64
-Meta.Author=Shinynecrid, Greelan
+Meta.Author=Greelan, Shinynecrid
 Meta.URL=https://steamdb.info/app/1621690/
 Meta.DisplayImageSource=steam:1621690
-Meta.EndpointURIFormat=steam://connect/{0}
+Meta.EndpointURIFormat=steam://connect/{ip}:{GenericModule.App.Ports.$QueryPort}
 Meta.ConfigManifest=core-keeperconfig.json
 Meta.MetaConfigManifest=core-keepermetaconfig.json
 Meta.ConfigRoot=core-keeper.kvp
@@ -23,7 +23,7 @@ App.ExecutableLinux=/usr/bin/xvfb-run
 App.WorkingDir=1963720
 App.LinuxCommandLineArgs=-a ./CoreKeeperServer
 App.WindowsCommandLineArgs=
-App.CommandLineArgs={{$PlatformArgs}} -datapath "{{$FullBaseDir}}DedicatedServer" {{$FormattedArgs}} -batchmode -logfile -
+App.CommandLineArgs={{$PlatformArgs}} -port {{ConnectMode}} -datapath "{{$FullBaseDir}}DedicatedServer" {{$FormattedArgs}} -batchmode -logfile -
 App.AppSettings={}
 App.EnvironmentVariables={"LD_LIBRARY_PATH":"{{$FullBaseDir}}linux64:%LD_LIBRARY_PATH%","SteamAppId":"1963720"}
 App.CommandLineParameterFormat=-{0} "{1}"
@@ -37,10 +37,10 @@ App.HasReadableConsole=True
 App.SupportsLiveSettingsChanges=False
 App.LiveSettingChangeCommandFormat=set {0} "{1}"
 App.ApplicationIPBinding=0.0.0.0
-App.Ports=[{"Protocol":"UDP","Port":0,"Ref":"Port","Name":"Port","Description":"Dummy port"}]
+App.Ports=[{"Protocol":"UDP","Port":27015,"Ref":"GamePort","Name":"Game Port","Description":"Port for game traffic"},{"Protocol":"UDP","Port":27016,"Ref":"QueryPort","Name":"Query Port","Description":"Port for Steam query traffic"}]
-App.PrimaryApplicationPortRef=Port
+App.PrimaryApplicationPortRef=GamePort
-App.UniversalSleepApplicationUDPPortRef=Port
+App.UniversalSleepApplicationUDPPortRef=GamePort
-App.UniversalSleepSteamQueryPortRef=Port
+App.UniversalSleepSteamQueryPortRef=QueryPort
 App.MaxUsers=100
 App.UseRandomAdminPassword=False
 App.RemoteAdminPassword=Password123
@@ -49,7 +49,7 @@ App.AdminLoginTransform=None
 App.RCONConnectDelaySeconds=5
 App.RCONConnectRetrySeconds=5
 App.TelnetLoginFormat={0}
-App.UpdateSources=[{"UpdateStageName":"SteamCMD Download","UpdateSourcePlatform":"All","UpdateSource":"SteamCMD","UpdateSourceData":"1963720"},{"UpdateStageName":"Server Config File Download","UpdateSourcePlatform":"All","UpdateSource":"FetchURL","UpdateSourceData":"https://raw.githubusercontent.com/CubeCoders/AMPTemplates/main/core-keeperserverconfig.json","UpdateSourceTarget":"../","OverwriteExistingFiles":true},{"UpdateStageName":"Config Directory Creation","UpdateSourcePlatform":"All","UpdateSource":"CreateDirectory","UpdateSourceArgs":"./core-keeper/1963720/DedicatedServer"},{"UpdateStageName":"Config File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./core-keeper/1963720/DedicatedServer/ServerConfig.json","UpdateSourceArgs":"./core-keeperserverconfig.json","OverwriteExistingFiles":false}]
+App.UpdateSources=[{"UpdateStageName":"SteamCMD Download","UpdateSourcePlatform":"All","UpdateSource":"SteamCMD","UpdateSourceData":"1963720"}]
 App.Compatibility=None
 App.SteamUpdateAnonymousLogin=True
 App.SteamForceLoginPrompt=False

core-keeperconfig.json

@@ -1,14 +1,28 @@
 [
+    {
+        "DisplayName":"Game ID",
+        "Category":"Server Settings",
+        "Description":"Sets the Game ID for the server. Needs to be at least 23 characters and alphanumeric, excluding Y,y,x,0,O. Empty or not valid means a new Game ID will be generated at server start",
+        "Keywords":"game,id",
+        "FieldName":"gameid",
+        "InputType":"text",
+        "IsFlagArgument":false,
+        "ParamFieldName":"gameid",
+        "IncludeInCommandLine":true,
+        "DefaultValue":"",
+        "Placeholder":"WThaEN6779QIU2j7sczKmGfIG1bD",
+        "EnumValues":{}
+    },
     {
         "DisplayName":"World",
         "Category":"Server Settings",
-        "Description":"Set the index of the world to be loaded from the worlds folder",
+        "Description":"Sets the index of the world to be loaded from the worlds folder",
         "Keywords":"world,index",
         "FieldName":"world",
         "InputType":"number",
         "IsFlagArgument":false,
         "ParamFieldName":"world",
-        "IncludeInCommandLine":false,
+        "IncludeInCommandLine":true,
         "DefaultValue":"0",
         "EnumValues":{}
     },
@@ -17,11 +31,12 @@
         "Category":"Server Settings",
         "Description":"Sets the name to use for the server",
         "Keywords":"world",
-        "FieldName":"worldName",
+        "FieldName":"worldname",
         "InputType":"text",
         "IsFlagArgument":false,
-        "ParamFieldName":"worldName",
+        "ParamFieldName":"worldname",
-        "IncludeInCommandLine":false,
+        "IncludeInCommandLine":true,
+        "SkipIfEmpty":true,
         "DefaultValue":"Core Keeper Server Powered by AMP",
         "EnumValues":{}
     },
@@ -30,14 +45,30 @@
         "Category":"Server Settings",
         "Description":"Sets the seed to use to generate a new world. Set to 0 to generate a random seed",
         "Keywords":"seed,world",
-        "FieldName":"worldSeed",
+        "FieldName":"worldseed",
         "InputType":"number",
         "IsFlagArgument":false,
-        "ParamFieldName":"worldSeed",
+        "ParamFieldName":"worldseed",
-        "IncludeInCommandLine":false,
+        "IncludeInCommandLine":true,
         "DefaultValue":"0",
         "EnumValues":{}
     },
+    {
+        "DisplayName":"World Mode",
+        "Category":"Server Settings",
+        "Description":"Sets whether to use normal or hard mode for the world",
+        "Keywords":"world,mode",
+        "FieldName":"worldmode",
+        "InputType":"enum",
+        "IsFlagArgument":false,
+        "ParamFieldName":"worldmode",
+        "IncludeInCommandLine":true,
+        "DefaultValue":"0",
+        "EnumValues":{
+            "0":"Normal",
+            "1":"Hard"
+        }
+    },   
     {
         "DisplayName":"Player Limit",
         "Category":"Server Settings",
@@ -46,10 +77,41 @@
         "FieldName":"$MaxUsers",
         "InputType":"number",
         "IsFlagArgument":false,
-        "ParamFieldName":"maxNumberPlayers",
+        "ParamFieldName":"maxplayers",
-        "IncludeInCommandLine":false,
+        "IncludeInCommandLine":true,
         "DefaultValue":"100",
-        "suffix":"players",
+        "Suffix":"players",
+        "EnumValues":{}
+    },
+    {
+        "DisplayName":"Connection Mode",
+        "Category":"Server Settings",
+        "Description":"Sets the connection mode - either through the Steam relay network (no ports required), or via a direct port connection on the Game Port",
+        "Keywords":"steam,relay,network,port",
+        "FieldName":"ConnectMode",
+        "InputType":"enum",
+        "IsFlagArgument":false,
+        "ParamFieldName":"ConnectMode",
+        "IncludeInCommandLine":false,
+        "DefaultValue":"{{$GamePort}}",
+        "EnumValues":{
+            "":"Steam Relay Network",
+            "{{$GamePort}}":"Direct Port Connection"
+        }
+    },    
+    {
+        "DisplayName":"Server IP Binding",
+        "Category":"Server Settings",
+        "Description":"Sets the interface IP that the server will bind to. Default is 0.0.0.0. Only used if the Steam relay network is not used",
+        "Keywords":"ip,binding",
+        "FieldName":"ip",
+        "InputType":"text",
+        "IsFlagArgument":false,
+        "ParamFieldName":"ip",
+        "IncludeInCommandLine":true,
+        "SkipIfEmpty":true,
+        "DefaultValue":"0.0.0.0",
+        "Placeholder":"0.0.0.0",
         "EnumValues":{}
     }    
 ]

core-keepermetaconfig.json

@@ -1,7 +1 @@
-[
+[]
-    {
-        "ConfigFile":"DedicatedServer/ServerConfig.json",
-        "AutoMap":true,
-        "ConfigType":"json"
-    }
-]