From babe804c9b7b814b7e0068ee771f075b99197e6a Mon Sep 17 00:00:00 2001
From: Greelan <53196309+Greelan@users.noreply.github.com>
Date: Thu, 9 Mar 2023 21:25:39 +1100
Subject: [PATCH] ARK:SE: IP binding updates (#295)

* Add ARK: Survival Evolved

* Final updates

* Update ark-seconfig.json

* Update ark-seconfig.json

* Update ark-seupdates.json

* Update chat regex

* Metaconfig updates

* Final final updates

* Settings tweaks

* Update settings descriptions

* Gotta be final, right?

* IceOfWraith made me do it

* Update ark-seconfig.json

* Fix player whitelist

* IP binding updates
---
 ark-se.kvp        | 3 ++-
 ark-seconfig.json | 8 +++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ark-se.kvp b/ark-se.kvp
index 902ab90..4c8a40e 100644
--- a/ark-se.kvp
+++ b/ark-se.kvp
@@ -27,7 +27,7 @@ App.ExecutableLinux=376030/ShooterGame/Binaries/Linux/ShooterGameServer
 App.WorkingDir=376030/ShooterGame/Binaries/Win64
 App.LinuxCommandLineArgs=
 App.WindowsCommandLineArgs=
-App.CommandLineArgs={{Map}}?listen?Port={{$GamePort}}?QueryPort={{$QueryPort}}?RCONEnabled=True?RCONServerGameLogBuffer=600?RCONPort={{$RCONPort}}?ServerAdminPassword={{$RemoteAdminPassword}}?SessionName="{{SessionName}}"?{{$FormattedArgs}}{{OverrideOfficialDifficulty}}{{CustomOptions}} {{automanagedmods}}{{exclusivejoin}}{{BattlEye}}{{crossplay}}{{epiconly}}{{UseVivox}}{{insecure}}{{EnableIdlePlayerKick}}{{ForceAllowCaveFlyers}}{{nodinos}}{{PreventHibernation}}{{ForceRespawnDinos}}{{DisableRailgunPVP}}{{UseStructureStasisGrid}}{{AutoDestroyStructures}}{{NoTransferFromFiltering}} -ActiveEvent={{ActiveEvent}} -PublicIPForEpic={{PublicIPForEpic}} -culture={{culture}} -ClusterDirOverride="{{ClusterDirOverride}}" -clusterid={{clusterid}} {{CustomFlags}} -servergamelog
+App.CommandLineArgs={{Map}}?listen?Port={{$GamePort}}?QueryPort={{$QueryPort}}?RCONEnabled=True?RCONServerGameLogBuffer=600?RCONPort={{$RCONPort}}?ServerAdminPassword={{$RemoteAdminPassword}}?SessionName="{{SessionName}}"?MultiHome={{$ApplicationIPBinding}}?{{$FormattedArgs}}{{OverrideOfficialDifficulty}}{{CustomOptions}} {{automanagedmods}}{{exclusivejoin}}{{BattlEye}}{{crossplay}}{{epiconly}}{{UseVivox}}{{insecure}}{{EnableIdlePlayerKick}}{{ForceAllowCaveFlyers}}{{nodinos}}{{PreventHibernation}}{{ForceRespawnDinos}}{{DisableRailgunPVP}}{{UseStructureStasisGrid}}{{AutoDestroyStructures}}{{NoTransferFromFiltering}} -ActiveEvent={{ActiveEvent}} -PublicIPForEpic={{PublicIPForEpic}} -culture={{culture}} -ClusterDirOverride="{{ClusterDirOverride}}" -clusterid={{clusterid}} {{CustomFlags}} -servergamelog
 App.UseLinuxIOREDIR=False
 App.AppSettings={}
 App.EnvironmentVariables={"LD_LIBRARY_PATH":"{{$FullBaseDir}}linux64:{{$FullRootDir}}linux64:%LD_LIBRARY_PATH%","SteamAppId":"346110"}
@@ -72,6 +72,7 @@ App.TemplateMatchRegex={{(\$?[\w]+)}}
 Console.FilterMatchRegex=
 Console.FilterMatchReplacement=
 Console.ThrowawayMessageRegex=^(Keep Alive|\[S_API FAIL\] SteamAPI_Init\(\) failed; SteamAPI_IsSteamRunning\(\) failed\.|Server received, But no response!! \n |Setting breakpad minidump AppID = 346110)$
+Console.AppReadyRegex=^$
 Console.UserJoinRegex=^[\d\.]+_[\d\.]+: (?<username>.+?) joined this ARK!\n \n $
 Console.UserLeaveRegex=^[\d\.]+_[\d\.]+: (?<username>.+?) left this ARK!\n \n $
 Console.UserChatRegex=^[\d\.]+_[\d\.]+:( | )(?<username>.+?)( | )\((?:.+?)\): (?<message>.+)\n \n $
diff --git a/ark-seconfig.json b/ark-seconfig.json
index 18b8bc0..f527659 100644
--- a/ark-seconfig.json
+++ b/ark-seconfig.json
@@ -237,15 +237,13 @@
     {
         "DisplayName":"MultiHome IP Binding",
         "Category":"ARK Server Settings",
-        "Description":"Sets the binding of the server. Default is blank. Change to internal interface IP if required. NOTE: Also change App.ApplicationIPBinding in GenericModule.kvp for the instance, or the AMP console will not work",
+        "Description":"If required, you can change the binding of the server and RCON to an internal interface IP by editing App.ApplicationIPBinding in GenericModule.kvp for the instance. Stop the instance (not just the server) first. Ensure AMP itself can reach that IP or the console will not work",
         "Keywords":"ip,binding,address,multihome",
         "FieldName":"MultiHome",
-        "InputType":"text",
+        "InputType":"hidden",
         "IsFlagArgument":false,
         "ParamFieldName":"MultiHome",
-        "IncludeInCommandLine":true,
-        "SkipIfEmpty":true,
-        "DefaultValue":"",
+        "IncludeInCommandLine":false,
         "EnumValues":{}
     },
     {