From ceb5ea30443788ad66e560a9d8968575edd4af87 Mon Sep 17 00:00:00 2001
From: James Manker <jamesmanker@pm.me>
Date: Sat, 19 Mar 2022 01:35:45 -0500
Subject: [PATCH] Finalize Settings

These are the last settings that should be needed for an initial release. Everything seems to function as intended.
---
 mordhau-config.json     | 10 +++++-----
 mordhau-metaconfig.json |  6 +++---
 mordhau.kvp             | 20 ++++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/mordhau-config.json b/mordhau-config.json
index bb0d898..f21e616 100644
--- a/mordhau-config.json
+++ b/mordhau-config.json
@@ -28,14 +28,14 @@
     {
         "DisplayName": "RCON Password",
         "Category": "Server Config",
-        "Description": "RconPassword",
+        "Description": "The password to access RCON clients. AMP has RCON built in the console.",
         "Keywords": "RconPassword",
-        "FieldName": "RconPassword",
+        "FieldName": "$RemoteAdminPassword",
         "InputType": "RandomPassword",
         "IsFlagArgument": false,
         "ParamFieldName": "/Script/Mordhau.MordhauGameSession.RconPassword",
         "IncludeInCommandLine": false,
-        "DefaultValue": "",
+        "DefaultValue": "Password123",
         "EnumValues": {}
     },
     {
@@ -56,7 +56,7 @@
         "Category": "Server Config",
         "Description": "Max players that can join at a time.",
         "Keywords": "Max,players,Slots",
-        "FieldName": "MaxSlots",
+        "FieldName": "$MaxUsers",
         "InputType": "number",
         "IsFlagArgument": false,
         "ParamFieldName": "/Script/Mordhau.MordhauGameSession.MaxSlots",
@@ -90,7 +90,7 @@
         "IsFlagArgument": false,
         "ParamFieldName": "map",
         "IncludeInCommandLine": false,
-        "DefaultValue": "/FeitoriaMap/BR_Feitoria",
+        "DefaultValue": "/Game/Mordhau/Maps/FeitoriaMap/BR_Feitoria",
         "EnumValues": {
             "/Game/Mordhau/Maps/FeitoriaMap/BR_Feitoria":"BR_Feitoria",
             "/Game/Mordhau/Maps/Grad/BR_Grad":"BR_Grad",
diff --git a/mordhau-metaconfig.json b/mordhau-metaconfig.json
index b05cde6..bbd829b 100644
--- a/mordhau-metaconfig.json
+++ b/mordhau-metaconfig.json
@@ -1,12 +1,12 @@
 [
   {
-    "ConfigFile": "Mordhau/Binaries/Win64/Mordhau/Binaries/Win64/Mordhau/Saved/Config/WindowsServer/Game.ini",
+    "ConfigFile": "Mordhau/Saved/Config/WindowsServer/Game.ini",
     "AutoMap": true,
     "ConfigType": "ini"
   },
   {
-    "ConfigFile": "Mordhau/Binaries/Win64/Mordhau/Binaries/Win64/Mordhau/Saved/Config/LinuxServer/Game.ini",
+    "ConfigFile": "Mordhau/Saved/Config/LinuxServer/Game.ini",
     "AutoMap": true,
     "ConfigType": "ini"
   }
-] 
\ No newline at end of file
+]
\ No newline at end of file
diff --git a/mordhau.kvp b/mordhau.kvp
index c9ad1e0..3ac0eb5 100644
--- a/mordhau.kvp
+++ b/mordhau.kvp
@@ -21,11 +21,11 @@ App.BaseDirectory=./mordhau/629800/
 App.ExecutableWin=629800\Mordhau\Binaries\Win64\MordhauServer-Win64-Shipping.exe
 App.ExecutableLinux=629800/Mordhau/Binaries/Linux/MordhauServer-Linux-Shipping
 App.WorkingDir=629800
-App.LinuxCommandLineArgs=Mordhau -GAMEINI="./Mordhau/Binaries/Win64/Mordhau/Saved/Config/LinuxServer/Game.ini" -ENGINEINI="./Mordhau/Binaries/Win64/Mordhau/Saved/Config/LinuxServer/Engine.ini"
-App.WindowsCommandLineArgs=-GAMEINI="./Mordhau/Binaries/Win64/Mordhau/Saved/Config/WindowsServer/Game.ini" -ENGINEINI="./Mordhau/Binaries/Win64/Mordhau/Saved/Config/WindowsServer/Engine.ini"
-App.CommandLineArgs={{map}} -Port={{$ApplicationPort1}} -QueryPort={{$ApplicationPort2}} -Beaconport={{$ApplicationPort3}} {{$FormattedArgs}} {{$PlatformArgs}}
+App.LinuxCommandLineArgs=Mordhau
+App.WindowsCommandLineArgs=
+App.CommandLineArgs={{$PlatformArgs}} {{map}} -Port={{$ApplicationPort1}} -QueryPort={{$ApplicationPort2}} -Beaconport={{$ApplicationPort3}} {{$FormattedArgs}}
 App.AppSettings={}
-App.EnvironmentVariables={"LD_LIBRARY_PATH":"./linux64:%LD_LIBRARY_PATH%","SteamAppId":"629760"}
+App.EnvironmentVariables={"LD_LIBRARY_PATH":"{{$FullBaseDir}}linux64:{{$FullRootDir}}linux64:./linux64:%LD_LIBRARY_PATH%","SteamAppId":"629760"}
 App.CommandLineParameterFormat=-{0}={1}
 App.CommandLineParameterDelimiter= 
 App.ExitMethod=OS_CLOSE
@@ -46,8 +46,8 @@ App.UseRandomAdminPassword=False
 App.RemoteAdminPassword=Password123
 App.AdminMethod=SourceRCON
 App.AdminLoginTransform=None
-App.RCONConnectDelaySeconds=5
-App.RCONConnectRetrySeconds=5
+App.RCONConnectDelaySeconds=30
+App.RCONConnectRetrySeconds=15
 App.TelnetLoginFormat={0}
 App.UpdateSources=[{"UpdateStageName":"SteamCMD Download","UpdateSourcePlatform":"All","UpdateSource":"SteamCMD","UpdateSourceData":"629800"},{"UpdateStageName":"Start Server","UpdateSourcePlatform":"All","UpdateSource":"StartApplication"},{"UpdateStageName":"Wait For Server Start","UpdateSourcePlatform":"All","UpdateSource":"WaitForStartupComplete"},{"UpdateStageName":"Stop Server","UpdateSourcePlatform":"All","UpdateSource":"ShutdownApplication"}]
 App.Compatibility=None
@@ -63,10 +63,10 @@ App.TemplateMatchRegex={{(\$?[\w]+)}}
 Console.FilterMatchRegex=
 Console.FilterMatchReplacement=
 Console.ThrowawayMessageRegex=^(WARNING|ERROR): Shader.+$
-Console.AppReadyRegex=^LogInit\: Display\: Starting Game.$
-Console.UserJoinRegex=^User (?<username>.+?) \((?<userid>-?d+)\) connected from \[::ffff:(?<endpoint>.+?)\]$
-Console.UserLeaveRegex=^User (?<username>.+?) \((?<userid>-?d+)\) disconnected\. Reason: (.+?)$
-Console.UserChatRegex=^(?<username>.+?): (?<message>.+)$
+Console.AppReadyRegex=^.*LogInit\: Display\: Starting Game.$
+Console.UserJoinRegex=
+Console.UserLeaveRegex=
+Console.UserChatRegex=
 Console.UpdateAvailableRegex=^\[\d\d:\d\d:\d\d\] \[INFO\] A new server update is available! v[\d\.]+.$
 Console.SuppressLogAtStart=False
 Console.ActivateLogRegex=