diff --git a/conan-exiles.kvp b/conan-exiles.kvp index 9544e0f..8ed276f 100644 --- a/conan-exiles.kvp +++ b/conan-exiles.kvp @@ -2,15 +2,16 @@ Meta.DisplayName=Conan Exiles Meta.Description=Conan Exiles Dedicated Server Meta.OS=Windows, Linux Meta.Arch=x86_64 -Meta.Author=IceOfWraith, Greelan, eNcrypt +Meta.Author=Greelan, IceOfWraith, eNcrypt Meta.URL=https://store.steampowered.com/app/440900/Conan_Exiles/ Meta.DisplayImageSource=steam:440900 Meta.EndpointURIFormat=steam://connect/{ip}:{GenericModule.App.ApplicationPort3} Meta.ConfigManifest=conan-exilesconfig.json Meta.MetaConfigManifest=conan-exilesmetaconfig.json Meta.ConfigRoot=conan-exiles.kvp -Meta.MinAMPVersion=2.3.2.0 +Meta.MinAMPVersion=2.3.2.8 Meta.SpecificDockerImage= +Meta.DockerRequired=False Meta.ContainerPolicy=Supported Meta.Prerequsites=[] Meta.ConfigReleaseState=NotSpecified @@ -20,14 +21,14 @@ App.BaseDirectory=./conan-exiles/443030/ App.ExecutableWin=443030\ConanSandbox\Binaries\Win64\ConanSandboxServer-Win64-Test.exe App.ExecutableLinux=/usr/bin/xvfb-run App.WorkingDir=443030/ConanSandbox/Binaries/Win64 -App.LinuxCommandLineArgs=-a "{{$FullRootDir}}1580130/proton" run "./ConanSandboxServer-Win64-Test.exe" +App.LinuxCommandLineArgs=-a "{{$FullRootDir}}1493710/proton" run "./ConanSandboxServer-Win64-Test.exe" App.WindowsCommandLineArgs= -App.CommandLineArgs={{$PlatformArgs}} -log -ServerName="{{ServerName}}" -RconEnabled=1 -RconPassword="{{$RemoteAdminPassword}}" {{$FormattedArgs}} +App.CommandLineArgs={{$PlatformArgs}} {{Map}}{{CustomMap}} -log -Port={{$ApplicationPort1}} RconPort={{$RemoteAdminPort}} -RconEnabled=1 -RconPassword="{{$RemoteAdminPassword}}" -MaxPlayers={{$MaxUsers}} {{$FormattedArgs}} App.AppSettings={} -App.EnvironmentVariables={"LD_LIBRARY_PATH":"./linux64:%LD_LIBRARY_PATH%","SteamAppId":"440900","STEAM_COMPAT_DATA_PATH":"{{$FullRootDir}}1580130","STEAM_COMPAT_CLIENT_INSTALL_PATH":"{{$FullRootDir}}1580130"} -App.CommandLineParameterFormat=-{0}={1} +App.EnvironmentVariables={"LD_LIBRARY_PATH":"./linux64:%LD_LIBRARY_PATH%","SteamAppId":"440900","STEAM_COMPAT_DATA_PATH":"{{$FullRootDir}}1493710","STEAM_COMPAT_CLIENT_INSTALL_PATH":"{{$FullRootDir}}1493710"} +App.CommandLineParameterFormat=-{0}="{1}" App.CommandLineParameterDelimiter= -App.ExitMethod=String +App.ExitMethod=OS_CLOSE App.ExitTimeout=30 App.ExitString=exit App.ExitFile=app_exit.lck @@ -43,18 +44,19 @@ App.RemoteAdminPort=25575 App.MaxUsers=40 App.UseRandomAdminPassword=False App.RemoteAdminPassword=Password123 -App.AdminMethod=SourceRCON +App.AdminMethod=STDIO App.AdminLoginTransform=None App.RCONConnectDelaySeconds=5 App.RCONConnectRetrySeconds=5 -App.UpdateSources=[{"UpdateStageName":"SteamCMD and Conan Exiles Download","UpdateSourcePlatform":"All","UpdateSource":"SteamCMD","UpdateSourceData":"443030","ForceDownloadPlatform":"Windows"},{"UpdateStageName":"Proton Compatibility Layer","UpdateSourcePlatform":"Linux","UpdateSource":"SteamCMD","UpdateSourceData":"1580130"},{"UpdateStageName":"ServerSettings File Download","UpdateSourcePlatform":"All","UpdateSource":"FetchURL","UpdateSourceData":"https://github.com/CubeCoders/AMPTemplates/raw/main/conan-exilesconfigsettings.ini","UpdateSourceTarget":"../","OverwriteExistingFiles":true},{"UpdateStageName":"Config Directory Creation","UpdateSourcePlatform":"All","UpdateSource":"CreateDirectory","UpdateSourceArgs":"./conan-exiles/443030/ConanSandbox/Saved/Config/WindowsServer","OverwriteExistingFiles":false},{"UpdateStageName":"ServerSettings File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./conan-exiles/443030/ConanSandbox/Saved/Config/WindowsServer/ServerSettings.ini","UpdateSourceArgs":"./conan-exilesconfigsettings.ini","OverwriteExistingFiles":false}] +App.TelnetLoginFormat={0} +App.UpdateSources=[{"UpdateStageName":"SteamCMD and Conan Exiles Download","UpdateSourcePlatform":"All","UpdateSource":"SteamCMD","UpdateSourceData":"443030","ForceDownloadPlatform":"Windows"},{"UpdateStageName":"Proton Compatibility Layer","UpdateSourcePlatform":"Linux","UpdateSource":"SteamCMD","UpdateSourceData":"1493710"},{"UpdateStageName":"ServerSettings File Download","UpdateSourcePlatform":"All","UpdateSource":"FetchURL","UpdateSourceData":"https://github.com/CubeCoders/AMPTemplates/raw/main/conan-exilesconfigsettings.ini","UpdateSourceTarget":"../","OverwriteExistingFiles":true},{"UpdateStageName":"Config Directory Creation","UpdateSourcePlatform":"All","UpdateSource":"CreateDirectory","UpdateSourceArgs":"./conan-exiles/443030/ConanSandbox/Saved/Config/WindowsServer","OverwriteExistingFiles":false},{"UpdateStageName":"ServerSettings File Copy","UpdateSourcePlatform":"All","UpdateSource":"CopyFilePath","UpdateSourceData":"./conan-exiles/443030/ConanSandbox/Saved/Config/WindowsServer/ServerSettings.ini","UpdateSourceArgs":"./conan-exilesconfigsettings.ini","OverwriteExistingFiles":false}] 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.UniversalSleepApplicationUDPPort=1 +App.UniversalSleepSteamQueryPort=3 App.WakeupMode=Any App.ApplicationReadyMode=RegexMatch App.TemplateMatchRegex={{(\$?[\w]+)}} @@ -62,14 +64,14 @@ Console.FilterMatchRegex= Console.FilterMatchReplacement= Console.ThrowawayMessageRegex=^(WARNING|ERROR): Shader.+$ Console.AppReadyRegex=^LogGameMode:Display: Match State Changed from WaitingToStart to InProgress$ -Console.UserJoinRegex=^User (?.+?) \((?-?d+)\) connected from \[::ffff:(?.+?)\]$ -Console.UserLeaveRegex=^User (?.+?) \((?-?d+)\) disconnected\. Reason: (.+?)$ -Console.UserChatRegex=^(?.+?): (?.+)$ +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= Console.UserActions={} -Limits.SleepMode=True +Limits.SleepMode=False Limits.SleepOnStart=False Limits.SleepDelayMinutes=5 Limits.DozeDelay=2 diff --git a/conan-exilesconfig.json b/conan-exilesconfig.json index 06c471c..ea6a429 100644 --- a/conan-exilesconfig.json +++ b/conan-exilesconfig.json @@ -1,43 +1,4 @@ [ - { - "DisplayName":"Game Port", - "Category":"Server Settings", - "Description":"", - "Keywords":"", - "FieldName":"$ApplicationPort1", - "InputType":"number", - "IsFlagArgument":false, - "Hidden":true, - "ParamFieldName":"Port", - "IncludeInCommandLine":true, - "DefaultValue":"7777" - }, - { - "DisplayName":"Query Port", - "Category":"Server Settings", - "Description":"", - "Keywords":"", - "FieldName":"$ApplicationPort3", - "InputType":"number", - "IsFlagArgument":false, - "Hidden":true, - "ParamFieldName":"QueryPort", - "IncludeInCommandLine":true, - "DefaultValue":"27015" - }, - { - "DisplayName":"RCON Port", - "Category":"Server Settings", - "Description":"", - "Keywords":"", - "FieldName":"$RemoteAdminPort", - "InputType":"number", - "IsFlagArgument":false, - "Hidden":true, - "ParamFieldName":"RconPort", - "IncludeInCommandLine":true, - "DefaultValue":"25575" - }, { "DisplayName":"Server Name", "Category":"Server Settings", @@ -47,9 +8,39 @@ "InputType":"text", "IsFlagArgument":false, "ParamFieldName":"ServerName", - "IncludeInCommandLine":false, + "IncludeInCommandLine":true, "DefaultValue":"Conan Exiles Server - Powered by AMP" }, + { + "DisplayName":"Map", + "Category":"Server Settings", + "Description":"Sets the map to load on startup", + "Keywords":"map", + "FieldName":"Map", + "InputType":"enum", + "IsFlagArgument":false, + "ParamFieldName":"Map", + "IncludeInCommandLine":false, + "DefaultValue":"/Game/Maps/ConanSandbox/ConanSandbox", + "EnumValues":{ + "":"Custom", + "/Game/Maps/ConanSandbox/ConanSandbox":"Exiled Lands", + "/Game/DLC_EXT/DLC_Siptah/Maps/DLC_Isle_of_Siptah":"Isle of Siptah" + } + }, + { + "DisplayName":"Custom Map", + "Category":"Server Settings", + "Description":"If using a custom map, enter it here. Choose Custom from the Map option.", + "Keywords":"custom,map", + "FieldName":"CustomMap", + "InputType":"text", + "IsFlagArgument":false, + "ParamFieldName":"CustomMap", + "IncludeInCommandLine":false, + "DefaultValue":"", + "Placeholder":"/Game/Mods/Savage_Wilds/Savage_Wilds" + }, { "DisplayName":"Player Limit", "Category":"Server Settings", @@ -59,7 +50,7 @@ "InputType":"number", "IsFlagArgument":false, "ParamFieldName":"MaxPlayers", - "IncludeInCommandLine":true, + "IncludeInCommandLine":false, "DefaultValue":"40", "Suffix":"players" }, @@ -71,9 +62,10 @@ "FieldName":"ServerPassword", "InputType":"password", "IsFlagArgument":false, - "ParamFieldName":"ServerSettings.ServerPassword", - "IncludeInCommandLine":false, - "DefaultValue":"" + "ParamFieldName":"ServerPassword", + "IncludeInCommandLine":true, + "DefaultValue":"", + "SkipIfEmpty": true }, { "DisplayName":"Admin Password", diff --git a/conan-exilesmetaconfig.json b/conan-exilesmetaconfig.json index 3c7f6f9..b671c20 100644 --- a/conan-exilesmetaconfig.json +++ b/conan-exilesmetaconfig.json @@ -5,4 +5,4 @@ "ConfigType": "ini", "ConfigFormatRegex": "^(?.+?)=(?.*?)$" } -] \ No newline at end of file +] \ No newline at end of file