From 5040b6e143305eaa8b4444acf690750d10c01c07 Mon Sep 17 00:00:00 2001
From: Greelan <53196309+Greelan@users.noreply.github.com>
Date: Sun, 12 Jun 2022 13:35:56 +1000
Subject: [PATCH 1/2] Fix world gen

---
 core-keeper.kvp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core-keeper.kvp b/core-keeper.kvp
index 5201654..92b49aa 100644
--- a/core-keeper.kvp
+++ b/core-keeper.kvp
@@ -10,20 +10,20 @@ Meta.ConfigManifest=core-keeperconfig.json
 Meta.MetaConfigManifest=core-keepermetaconfig.json
 Meta.ConfigRoot=core-keeper.kvp
 Meta.MinAMPVersion=2.3.3.0
-Meta.SpecificDockerImage=
+Meta.SpecificDockerImage=cubecoders/ampbase:xvfb
 Meta.DockerRequired=False
-Meta.ContainerPolicy=Supported
+Meta.ContainerPolicy=Recommended
 Meta.Prerequsites=[]
 Meta.ConfigReleaseState=NotSpecified
 App.DisplayName=Core Keeper
 App.RootDir=./core-keeper/
 App.BaseDirectory=./core-keeper/1963720/
 App.ExecutableWin=1963720\CoreKeeperServer.exe
-App.ExecutableLinux=1963720/CoreKeeperServer
+App.ExecutableLinux=/usr/bin/xvfb-run
 App.WorkingDir=1963720
-App.LinuxCommandLineArgs=
+App.LinuxCommandLineArgs=-a ./CoreKeeperServer
 App.WindowsCommandLineArgs=
-App.CommandLineArgs={{$PlatformArgs}} -datapath "{{$FullBaseDir}}DedicatedServer" {{$FormattedArgs}} -batchmode -nographics -logfile -
+App.CommandLineArgs={{$PlatformArgs}} -datapath "{{$FullBaseDir}}DedicatedServer" {{$FormattedArgs}} -batchmode -logfile -
 App.AppSettings={}
 App.EnvironmentVariables={"LD_LIBRARY_PATH":"{{$FullBaseDir}}linux64:%LD_LIBRARY_PATH%","SteamAppId":"1963720"}
 App.CommandLineParameterFormat=-{0} "{1}"
@@ -54,9 +54,9 @@ App.Compatibility=None
 App.SteamUpdateAnonymousLogin=True
 App.SteamForceLoginPrompt=False
 App.RapidStartup=False
-App.MonitorChildProcess=False
-App.MonitorChildProcessWaitMs=100
-App.MonitorChildProcessName=
+App.MonitorChildProcess=True
+App.MonitorChildProcessWaitMs=2000
+App.MonitorChildProcessName=CoreKeeperServer
 App.SupportsUniversalSleep=False
 App.WakeupMode=Any
 App.ApplicationReadyMode=RegexMatch

From cbb17a47c3b5f7352b8f13a3b5d5dba69fc9d0df Mon Sep 17 00:00:00 2001
From: Greelan <53196309+Greelan@users.noreply.github.com>
Date: Sun, 12 Jun 2022 23:01:26 +1000
Subject: [PATCH 2/2] Suppress "normal" Wine errors on first start

---
 core-keeper.kvp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core-keeper.kvp b/core-keeper.kvp
index 92b49aa..e011903 100644
--- a/core-keeper.kvp
+++ b/core-keeper.kvp
@@ -63,7 +63,7 @@ App.ApplicationReadyMode=RegexMatch
 App.TemplateMatchRegex={{(\$?[\w]+)}}
 Console.FilterMatchRegex=
 Console.FilterMatchReplacement=
-Console.ThrowawayMessageRegex=^(WARNING|ERROR): Shader.+$
+Console.ThrowawayMessageRegex=^((WARNING|ERROR): Shader.+|\d+:err:ole:.*|Could not find Wine Gecko.*)$
 Console.AppReadyRegex=^Started session with Game ID .+$
 Console.UserJoinRegex=^Successful authentication from (?<userid>.+?)$
 Console.UserLeaveRegex=^Disconnected from (?<userid>.+?)$