From 678314256c1a6347556348e5db112b861cc7ea3f Mon Sep 17 00:00:00 2001
From: southnode <95715917+southnode@users.noreply.github.com>
Date: Thu, 23 Mar 2023 14:11:38 +1100
Subject: [PATCH] Update Mordhau (#309)

* Update Mordhau

Add in SteamWorkshopDownloadLocation (even though the mods are on mod.io), add in custom map in the enum for starting map & mode, and add additional box to specify custom map

* Update mordhau-config.json

* Update mordhau-config.json

* Update mordhau.kvp

Bump MinAMPVersion
Remove SteamWorkshopDownloadLocation due to mordhau not utilising steam workshop mods
---
 mordhau-config.json | 44 +++++++++++++++++++++++++++++---------------
 mordhau.kvp         |  5 +++--
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/mordhau-config.json b/mordhau-config.json
index 705c2ed..8924b3c 100644
--- a/mordhau-config.json
+++ b/mordhau-config.json
@@ -26,17 +26,16 @@
         "EnumValues": {}
     },
     {
-        "DisplayName": "RCON Password",
-        "Category": "Server Config",
-        "Description": "The password to access RCON clients. AMP has RCON built in the console.",
-        "Keywords": "RconPassword",
-        "FieldName": "$RemoteAdminPassword",
-        "InputType": "RandomPassword",
-        "IsFlagArgument": false,
-        "ParamFieldName": "/Script/Mordhau.MordhauGameSession.RconPassword",
-        "IncludeInCommandLine": false,
-        "DefaultValue": "Password123",
-        "EnumValues": {}
+        "DisplayName":"RCON Password",
+        "Category":"Server Config",
+        "Description":"See the Security and Privacy menu for configurable options for the server's RCON",
+        "Keywords":"console,password,rcon",
+        "FieldName":"$RemoteAdminPassword",
+        "InputType":"hidden",
+        "IsFlagArgument":false,
+        "ParamFieldName":"/Script/Mordhau.MordhauGameSession.RconPassword",
+        "IncludeInCommandLine":false,
+        "EnumValues":{}
     },
     {
         "DisplayName": "Admin Password",
@@ -44,11 +43,11 @@
         "Description": "The password to become admin in the server.",
         "Keywords": "Admin,Password",
         "FieldName": "AdminPassword",
-        "InputType": "RandomPassword",
+        "InputType": "Password",
         "IsFlagArgument": false,
         "ParamFieldName": "/Script/Mordhau.MordhauGameSession.AdminPassword",
         "IncludeInCommandLine": false,
-        "DefaultValue": "Password123",
+        "DefaultValue": "{{newguid()}}",
         "EnumValues": {}
     },
     {
@@ -186,9 +185,24 @@
             "/Game/Mordhau/Maps/Arena_Map/TF_Arena":"TF_Arena",
             "/Game/Mordhau/Maps/Cortile/TF_Cortile":"TF_Cortile",
             "/Game/Mordhau/Maps/Highlands/TF_Highlands":"TF_Highlands",
-            "/Game/Mordhau/Maps/Truce/TF_Truce":"TF_Truce"
+            "/Game/Mordhau/Maps/Truce/TF_Truce":"TF_Truce",
+            "{{CustomMapText}}": "Custom Map"
         }
-    },
+      },
+      {
+        "DisplayName": "Custom Map",
+        "Category": "Server Config",
+        "Description": "Enter a custom map. Must select \"Custom Map\" in the Starting Map & Mode drop-down. This is the same as the folder name the map is stored under.",
+        "Keywords": "Custom,Map",
+        "FieldName": "CustomMapText",
+        "InputType": "text",
+        "IsFlagArgument": false,
+        "ParamFieldName": "CustomMapText",
+        "IncludeInCommandLine": false,
+        "DefaultValue": "",
+        "Placeholder": "SkrimJaw",
+        "EnumValues": {}
+      },
     {
         "DisplayName": "RconPort",
         "Category": "Server Config",
diff --git a/mordhau.kvp b/mordhau.kvp
index b2d587a..ee97f1f 100644
--- a/mordhau.kvp
+++ b/mordhau.kvp
@@ -2,14 +2,14 @@ Meta.DisplayName=Mordhau
 Meta.Description=Mordhau Dedicated Server
 Meta.OS=Windows, Linux
 Meta.Arch=x86_64
-Meta.Author=Moses, IceOfWraith
+Meta.Author=Moses, IceOfWraith, southnode-zac
 Meta.URL=https://store.steampowered.com/app/629760/MORDHAU/
 Meta.DisplayImageSource=steam:629760
 Meta.EndpointURIFormat=steam://connect/{ip}:{GenericModule.App.ApplicationPort2}
 Meta.ConfigManifest=mordhau-config.json
 Meta.MetaConfigManifest=mordhau-metaconfig.json
 Meta.ConfigRoot=mordhau.kvp
-Meta.MinAMPVersion=2.3.0.8
+Meta.MinAMPVersion=2.4.3.0
 Meta.SpecificDockerImage=
 Meta.DockerRequired=False
 Meta.ContainerPolicy=Supported
@@ -20,6 +20,7 @@ App.RootDir=./mordhau/
 App.BaseDirectory=./mordhau/629800/
 App.ExecutableWin=629800\Mordhau\Binaries\Win64\MordhauServer-Win64-Shipping.exe
 App.ExecutableLinux=629800/Mordhau/Binaries/Linux/MordhauServer-Linux-Shipping
+App.SteamWorkshopDownloadLocation=
 App.WorkingDir=629800
 App.LinuxCommandLineArgs=Mordhau
 App.WindowsCommandLineArgs=