Merge branch 'main' of https://github.com/CubeCoders/AMPTemplates

Author: Greelan

humanitz.kvp

@@ -21,7 +21,7 @@ Meta.Prerequisites=[]
 Meta.ExtraContainerPackages=[]
 Meta.ConfigReleaseState=NotSpecified
 Meta.NoCommercialUsage=False
-Meta.ConfigVersion=3
+Meta.ConfigVersion=4
 Meta.ReleaseNotes=
 Meta.BreakingReleaseNotes=
 Meta.ImportableExtensions=[]
@@ -42,9 +42,9 @@ App.AppSettings={}
 App.EnvironmentVariables={"LD_LIBRARY_PATH":"{{$FullBaseDir}}linux64:%LD_LIBRARY_PATH%","SteamAppId":"1766060"}
 App.CommandLineParameterFormat=-{0}={1}
 App.CommandLineParameterDelimiter= 
-App.ExitMethod=OS_CLOSE
-App.ExitTimeout=30
-App.ExitString=stop
+App.ExitMethod=String
+App.ExitTimeout=15
+App.ExitString=shutdown
 App.ExitFile=app_exit.lck
 App.HasWriteableConsole=True
 App.HasReadableConsole=True
@@ -55,15 +55,15 @@ App.ForceIPBinding=False
 App.SupportsIPv6=False
 App.ApplicationIPBinding=0.0.0.0
 App.Ports=@IncludeJson[humanitzports.json]
-App.AdminPortRef=0
+App.AdminPortRef=RCONPort
 App.PrimaryApplicationPortRef=GamePort
 App.UniversalSleepApplicationUDPPortRef=GamePort
 App.UniversalSleepSteamQueryPortRef=QueryPort
 App.MaxUsers=16
-App.UseRandomAdminPassword=False
-App.PersistRandomPassword=False
+App.UseRandomAdminPassword=True
+App.PersistRandomPassword=True
 App.RemoteAdminPassword=
-App.AdminMethod=STDIO
+App.AdminMethod=SourceRCON
 App.IgnoreSTDOUTAfterRCON=False
 App.AdminLoginTransform=None
 App.LoginTransformPrefix=
@@ -89,8 +89,8 @@ Console.FilterMatchRegex=
 Console.FilterMatchReplacement=
 Console.ThrowawayMessageRegex=^(WARNING|ERROR): Shader.+$
 Console.AppReadyRegex=^\[[\d\.]+-[\d\.:]+\]\[[\d ]+\]LogInit: Display: Engine is initialized\. Leaving FEngineLoop::Init\(\)$
-Console.UserJoinRegex=^$
-Console.UserLeaveRegex=^$
+Console.UserJoinRegex=^\[[\d\.]+-[\d\.:]+\]\[[\d ]+\]LogKaiHelper: Player Connected (?<username>.+?) NetID\((?<userid>.+?)\)$
+Console.UserLeaveRegex=^\[[\d\.]+-[\d\.:]+\]\[[\d ]+\]LogKaiHelper: Player Disconnected (?<username>.+?) NetID\((?<userid>.+?)\)$
 Console.UserChatRegex=^$
 Console.UpdateAvailableRegex=^\[\d\d:\d\d:\d\d\] \[INFO\] A new server update is available! v[\d\.]+.$
 Console.MetricsRegex=

humanitzconfig.json

@@ -1,4 +1,41 @@
 [
+    {
+        "DisplayName": "Enable RCON",
+        "Category": "HumanitZ:stadia_controller",
+        "Subcategory": "Server:dns:1",
+        "Description": "",
+        "Keywords": "",
+        "FieldName": "RCONEnabled",
+        "InputType": "text",
+        "Hidden": true,
+        "ParamFieldName": "Host Settings.RCONEnabled",
+        "DefaultValue": "true",
+        "EnumValues": {}
+    },
+    {
+        "DisplayName": "RCON Port",
+        "Category": "HumanitZ:stadia_controller",
+        "Subcategory": "Server:dns:1",
+        "Description": "",
+        "Keywords": "",
+        "FieldName": "$RCONPort",
+        "InputType": "number",
+        "Hidden": true,
+        "ParamFieldName": "Host Settings.RConPort",
+        "EnumValues": {}
+    },
+    {
+        "DisplayName": "RCON Password",
+        "Category": "HumanitZ:stadia_controller",
+        "Subcategory": "Server:dns:1",
+        "Description": "",
+        "Keywords": "",
+        "FieldName": "$RemoteAdminPassword",
+        "InputType": "text",
+        "Hidden": true,
+        "ParamFieldName": "Host Settings.RCONPass",
+        "EnumValues": {}
+    },
     {
         "DisplayName": "Server Name",
         "Category": "HumanitZ:stadia_controller",

humanitzports.json

@@ -7,10 +7,17 @@
         "Description": "Port for game traffic"
     },
     {
-        "Protocol": "Both",
+        "Protocol": "UDP",
         "Port": 27015,
         "Ref": "QueryPort",
         "Name": "Query Port",
         "Description": "Port for query traffic"
+    },
+    {
+        "Protocol": "TCP",
+        "Port": 8888,
+        "Ref": "RCONPort",
+        "Name": "RCON Port",
+        "Description": "Port for RCON traffic"
     }
 ]