From 22948ee9798c74c2234eea2e84c321a2b4be48be Mon Sep 17 00:00:00 2001
From: James Manker <jamesmanker@pm.me>
Date: Tue, 24 May 2022 12:30:22 -0500
Subject: [PATCH] Add Proton Support for V Rising

This adds Proton support to V Rising using the latest beta experimental branch. Also implemented the new port mapping method.

This requires xvfb as well. You will at least need to run:
`sudo apt install xvfb`

And if there are issues running you may be missing further dependencies. Try running these"
`sudo dpkg --add-architecture i386`
'sudo apt update'
`sudo apt install wine wine32 wine64`

This does not currently work in Docker!
---
 v-rising.kvp | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/v-rising.kvp b/v-rising.kvp
index deaa64a..a9d2514 100644
--- a/v-rising.kvp
+++ b/v-rising.kvp
@@ -1,8 +1,8 @@
 Meta.DisplayName=V Rising
 Meta.Description=V Rising Dedicated Server
-Meta.OS=Windows
+Meta.OS=Windows, Linux
 Meta.Arch=x86_64
-Meta.Author=Tempus Thales
+Meta.Author=Tempus Thales, IceOfWraith
 Meta.URL=https://store.steampowered.com/app/1604030/V_Rising/
 Meta.DisplayImageSource=steam:1604030
 Meta.EndpointURIFormat=steam://connect/{ip}:{GenericModule.App.ApplicationPort2}
@@ -19,13 +19,14 @@ App.DisplayName=V Rising
 App.RootDir=./v-rising/
 App.BaseDirectory=./v-rising/1829350/
 App.ExecutableWin=1829350\VRisingServer.exe
-App.ExecutableLinux=1829350/
+App.ExecutableLinux=/usr/bin/xvfb-run
 App.WorkingDir=1829350
-App.LinuxCommandLineArgs=
+App.LinuxCommandLineArgs=-a "{{$FullRootDir}}1493710/proton" run "./VRisingServer.exe"
 App.WindowsCommandLineArgs=
-App.CommandLineArgs=-persistentDataPath ./save-data
+App.CommandLineArgs={{$PlatformArgs}} -persistentDataPath ./save-data
+App.UseLinuxIOREDIR=False
 App.AppSettings={}
-App.EnvironmentVariables={"LD_LIBRARY_PATH":"./linux64:%LD_LIBRARY_PATH%","SteamAppId":"1604030"}
+App.EnvironmentVariables={"LD_LIBRARY_PATH":"./linux64:%LD_LIBRARY_PATH%","SteamAppId":"1604030","STEAM_COMPAT_DATA_PATH":"{{$FullRootDir}}1493710","STEAM_COMPAT_CLIENT_INSTALL_PATH":"{{$FullRootDir}}1493710"}
 App.CommandLineParameterFormat=-{0} "{1}"
 App.CommandLineParameterDelimiter= 
 App.ExitMethod=CtrlC
@@ -37,10 +38,11 @@ App.HasReadableConsole=True
 App.SupportsLiveSettingsChanges=False
 App.LiveSettingChangeCommandFormat=set {0} "{1}"
 App.ApplicationIPBinding=0.0.0.0
-App.ApplicationPort1=9876
-App.ApplicationPort2=9877
-App.ApplicationPort3=0
-App.RemoteAdminPort=0
+App.Ports=[{"Protocol":2,"Port":9876,"Offset":0,"Range":1,"Ref":"ApplicationPort1","Name":"Application Port 1","Description":"","ChildPorts":null},{"Protocol":2,"Port":9877,"Offset":0,"Range":1,"Ref":"ApplicationPort2","Name":"Application Port 2","Description":"","ChildPorts":null}]
+App.AdminPortRef=RemoteAdminPort
+App.PrimaryApplicationPortRef=ApplicationPort1
+App.UniversalSleepApplicationUDPPortRef=ApplicationPort1
+App.UniversalSleepSteamQueryPortRef=ApplicationPort2
 App.MaxUsers=40
 App.UseRandomAdminPassword=False
 App.RemoteAdminPassword=Password123
@@ -49,14 +51,12 @@ App.AdminLoginTransform=None
 App.RCONConnectDelaySeconds=5
 App.RCONConnectRetrySeconds=5
 App.TelnetLoginFormat={0}
-App.UpdateSources=[{"UpdateStageName": "SteamCMD Download","UpdateSourcePlatform": "All", "UpdateSource": "SteamCMD", "UpdateSourceData": "1829350"}]
+App.UpdateSources=[{"UpdateStageName":"SteamCMD Download","UpdateSourcePlatform":"All","UpdateSource":"SteamCMD","UpdateSourceData":"1829350"},{"UpdateStageName":"Proton Compatibility Layer","UpdateSourcePlatform":"Linux","UpdateSource":"SteamCMD","UpdateSourceData":"1493710","UpdateSourceVersion":"bleeding-edge"}]
 App.Compatibility=None
 App.SteamUpdateAnonymousLogin=True
 App.SteamForceLoginPrompt=False
 App.RapidStartup=False
-App.SupportsUniversalSleep=False
-App.UniversalSleepApplicationUDPPort=27015
-App.UniversalSleepSteamQueryPort=27016
+App.SupportsUniversalSleep=True
 App.WakeupMode=Any
 App.ApplicationReadyMode=Immediate
 App.TemplateMatchRegex={{(\$?[\w]+)}}
@@ -68,6 +68,7 @@ Console.UserJoinRegex=^User '{Steam (?<userid>\d+)}' '\d+', approvedUserIndex: \
 Console.UserLeaveRegex=^User '{Steam (?<userid>\d+)}' disconnected. approvedUserIndex: \d+ Reason: (.+?) (.+?)$
 Console.UserChatRegex=^(?<username>.+?): (?<message>.+)$
 Console.UpdateAvailableRegex=^\[\d\d:\d\d:\d\d\] \[INFO\] A new server update is available! v[\d\.]+.$
+Console.MetricsRegex=
 Console.SuppressLogAtStart=False
 Console.ActivateLogRegex=
 Console.UserActions={}