From d030909a853d7a1be8a4f469f2ddd4a51e72014e Mon Sep 17 00:00:00 2001 From: Greelan <53196309+Greelan@users.noreply.github.com> Date: Sun, 20 Feb 2022 18:20:32 +1100 Subject: [PATCH 1/4] Pavlov: update GitHub path for base config download Now points to CubeCoders repo --- pavlov-vr.kvp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pavlov-vr.kvp b/pavlov-vr.kvp index e0e5ffa..9a0c4b3 100755 --- a/pavlov-vr.kvp +++ b/pavlov-vr.kvp @@ -46,7 +46,7 @@ App.AdminLoginTransform=MD5_Lower App.RCONConnectDelaySeconds=0 App.RCONConnectRetrySeconds=5 App.TelnetLoginFormat={0} -App.UpdateSources=[{"UpdateStageName":"SteamCMD Download","UpdateSourcePlatform":"Linux","UpdateSource":"SteamCMD","UpdateSourceData":"622970"},{"UpdateStageName":"Config File Download","UpdateSourcePlatform":"Linux","UpdateSource":"FetchURL","UpdateSourceData":"https://raw.githubusercontent.com/Greelan/AMPTemplates/pavlov-vr/pavlov-vrconfigfile.ini","UpdateSourceTarget":"../","OverwriteExistingFiles":true},{"UpdateStageName":"Create Logs Directory","UpdateSourcePlatform":"Linux","UpdateSource":"CreateDirectory","UpdateSourceArgs":"./pavlovserver/622970/Pavlov/Saved/Logs","OverwriteExistingFiles":false},{"UpdateStageName":"Create Config Directory","UpdateSourcePlatform":"Linux","UpdateSource":"CreateDirectory","UpdateSourceArgs":"./pavlovserver/622970/Pavlov/Saved/Config/LinuxServer","OverwriteExistingFiles":false},{"UpdateStageName":"Create Maps Directory","UpdateSourcePlatform":"Linux","UpdateSource":"CreateDirectory","UpdateSourceArgs":"./pavlovserver/622970/Pavlov/Saved/maps","OverwriteExistingFiles":false},{"UpdateStageName":"Copy Config File","UpdateSourcePlatform":"Linux","UpdateSource":"CopyFilePath","UpdateSourceData":"./pavlovserver/622970/Pavlov/Saved/Config/LinuxServer/Game.ini","UpdateSourceArgs":"./pavlov-vrconfigfile.ini","OverwriteExistingFiles":false}] +App.UpdateSources=[{"UpdateStageName":"SteamCMD Download","UpdateSourcePlatform":"Linux","UpdateSource":"SteamCMD","UpdateSourceData":"622970"},{"UpdateStageName":"Config File Download","UpdateSourcePlatform":"Linux","UpdateSource":"FetchURL","UpdateSourceData":"https://raw.githubusercontent.com/CubeCoders/AMPTemplates/main/pavlov-vrconfigfile.ini","UpdateSourceTarget":"../","OverwriteExistingFiles":true},{"UpdateStageName":"Create Logs Directory","UpdateSourcePlatform":"Linux","UpdateSource":"CreateDirectory","UpdateSourceArgs":"./pavlovserver/622970/Pavlov/Saved/Logs","OverwriteExistingFiles":false},{"UpdateStageName":"Create Config Directory","UpdateSourcePlatform":"Linux","UpdateSource":"CreateDirectory","UpdateSourceArgs":"./pavlovserver/622970/Pavlov/Saved/Config/LinuxServer","OverwriteExistingFiles":false},{"UpdateStageName":"Create Maps Directory","UpdateSourcePlatform":"Linux","UpdateSource":"CreateDirectory","UpdateSourceArgs":"./pavlovserver/622970/Pavlov/Saved/maps","OverwriteExistingFiles":false},{"UpdateStageName":"Copy Config File","UpdateSourcePlatform":"Linux","UpdateSource":"CopyFilePath","UpdateSourceData":"./pavlovserver/622970/Pavlov/Saved/Config/LinuxServer/Game.ini","UpdateSourceArgs":"./pavlov-vrconfigfile.ini","OverwriteExistingFiles":false}] App.Compatibility=None App.SteamUpdateAnonymousLogin=True App.SteamForceLoginPrompt=False @@ -63,4 +63,4 @@ Console.UserChatRegex= Console.UpdateAvailableRegex= Console.SuppressLogAtStart=False Console.ActivateLogRegex= -Console.UserActions={} \ No newline at end of file +Console.UserActions={} From b07a047f61e992187d476c614581de7f1118a3e8 Mon Sep 17 00:00:00 2001 From: Greelan <53196309+Greelan@users.noreply.github.com> Date: Sun, 20 Feb 2022 19:57:28 +1100 Subject: [PATCH 2/4] Pavlov: clean up ini references --- pavlov-vrconfig.json | 32 ++++++++++++++++---------------- pavlov-vrmetaconfig.json | 5 ++--- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/pavlov-vrconfig.json b/pavlov-vrconfig.json index dd71e6f..17546b9 100755 --- a/pavlov-vrconfig.json +++ b/pavlov-vrconfig.json @@ -7,7 +7,7 @@ "FieldName": "ServerName", "InputType": "text", "IsFlagArgument": false, - "ParamFieldName": "ServerName", + "ParamFieldName": "/Script/Pavlov.DedicatedServer.ServerName", "IncludeInCommandLine": false, "DefaultValue": "Pavlov VR Server - Powered by AMP" }, @@ -19,9 +19,9 @@ "FieldName": "bEnabled", "InputType": "checkbox", "IsFlagArgument": false, - "ParamFieldName": "bEnabled", + "ParamFieldName": "/Script/Pavlov.DedicatedServer.bEnabled", "IncludeInCommandLine": false, - "DefaultValue": "true", + "DefaultValue": "false", "EnumValues": { "False": "false", "True": "true" @@ -35,7 +35,7 @@ "FieldName": "ApiKey", "InputType": "password", "IsFlagArgument": false, - "ParamFieldName": "ApiKey", + "ParamFieldName": "/Script/Pavlov.DedicatedServer.ApiKey", "IncludeInCommandLine": false, "DefaultValue": "" }, @@ -47,7 +47,7 @@ "FieldName": "Password", "InputType": "password", "IsFlagArgument": false, - "ParamFieldName": "Password", + "ParamFieldName": "/Script/Pavlov.DedicatedServer.Password", "IncludeInCommandLine": false, "DefaultValue": "0000" }, @@ -71,7 +71,7 @@ "FieldName": "bSecured", "InputType": "checkbox", "IsFlagArgument": false, - "ParamFieldName": "bSecured", + "ParamFieldName": "/Script/Pavlov.DedicatedServer.bSecured", "IncludeInCommandLine": false, "DefaultValue": "true", "EnumValues": { @@ -87,7 +87,7 @@ "FieldName": "bCustomServer", "InputType": "checkbox", "IsFlagArgument": false, - "ParamFieldName": "bCustomServer", + "ParamFieldName": "/Script/Pavlov.DedicatedServer.bCustomServer", "IncludeInCommandLine": false, "DefaultValue": "true", "EnumValues": { @@ -103,7 +103,7 @@ "FieldName": "bCompetitive", "InputType": "checkbox", "IsFlagArgument": false, - "ParamFieldName": "bCompetitive", + "ParamFieldName": "/Script/Pavlov.DedicatedServer.bCompetitive", "IncludeInCommandLine": false, "DefaultValue": "false", "EnumValues": { @@ -119,7 +119,7 @@ "FieldName": "$MaxUsers", "InputType": "number", "IsFlagArgument": false, - "ParamFieldName": "MaxPlayers", + "ParamFieldName": "/Script/Pavlov.DedicatedServer.MaxPlayers", "IncludeInCommandLine": false, "DefaultValue": "10", "Suffix": "players" @@ -132,7 +132,7 @@ "FieldName": "bWhitelist", "InputType": "checkbox", "IsFlagArgument": false, - "ParamFieldName": "bWhitelist", + "ParamFieldName": "/Script/Pavlov.DedicatedServer.bWhitelist", "IncludeInCommandLine": false, "DefaultValue": "false", "EnumValues": { @@ -187,7 +187,7 @@ "FieldName": "RefreshListTime", "InputType": "number", "IsFlagArgument": false, - "ParamFieldName": "RefreshListTime", + "ParamFieldName": "/Script/Pavlov.DedicatedServer.RefreshListTime", "IncludeInCommandLine": false, "DefaultValue": "120", "Suffix": "seconds" @@ -200,7 +200,7 @@ "FieldName": "TickRate", "InputType": "number", "IsFlagArgument": false, - "ParamFieldName": "TickRate", + "ParamFieldName": "/Script/Pavlov.DedicatedServer.TickRate", "IncludeInCommandLine": false, "DefaultValue": "90" }, @@ -212,7 +212,7 @@ "FieldName": "TimeLimit", "InputType": "number", "IsFlagArgument": false, - "ParamFieldName": "TimeLimit", + "ParamFieldName": "/Script/Pavlov.DedicatedServer.TimeLimit", "IncludeInCommandLine": false, "DefaultValue": "60" }, @@ -224,7 +224,7 @@ "FieldName": "BalanceTableURL", "InputType": "text", "IsFlagArgument": false, - "ParamFieldName": "BalanceTableURL", + "ParamFieldName": "/Script/Pavlov.DedicatedServer.BalanceTableURL", "IncludeInCommandLine": false, "DefaultValue": "vankruptgames/BalancingTable/main" }, @@ -236,7 +236,7 @@ "FieldName": "LimitedAmmoType", "InputType": "enum", "IsFlagArgument": false, - "ParamFieldName": "LimitedAmmoType", + "ParamFieldName": "/Script/Pavlov.DedicatedServer.LimitedAmmoType", "IncludeInCommandLine": false, "DefaultValue": "0", "EnumValues": { @@ -256,7 +256,7 @@ "FieldName": "bVerboseLogging", "InputType": "checkbox", "IsFlagArgument": false, - "ParamFieldName": "bVerboseLogging", + "ParamFieldName": "/Script/Pavlov.DedicatedServer.bVerboseLogging", "IncludeInCommandLine": false, "DefaultValue": "false", "EnumValues": { diff --git a/pavlov-vrmetaconfig.json b/pavlov-vrmetaconfig.json index 37ebc92..40dd8ed 100755 --- a/pavlov-vrmetaconfig.json +++ b/pavlov-vrmetaconfig.json @@ -2,8 +2,7 @@ { "ConfigFile": "Pavlov/Saved/Config/LinuxServer/Game.ini", "AutoMap": true, - "ConfigType": "kvp", - "ConfigFormat": "{0}={1}", + "ConfigType": "ini", "ConfigFormatRegex": "^(?.+?)=(?.*?)$" }, { @@ -20,4 +19,4 @@ } ] } -] \ No newline at end of file +] From fa21c6ea67ca8766d3698e1efbf697a3e7ba88b7 Mon Sep 17 00:00:00 2001 From: Greelan <53196309+Greelan@users.noreply.github.com> Date: Sun, 20 Feb 2022 20:02:48 +1100 Subject: [PATCH 3/4] Pavlov: Change setting default to match manifest --- pavlov-vrconfigfile.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pavlov-vrconfigfile.ini b/pavlov-vrconfigfile.ini index 1830929..fb720ce 100755 --- a/pavlov-vrconfigfile.ini +++ b/pavlov-vrconfigfile.ini @@ -1,6 +1,6 @@ [/Script/Pavlov.DedicatedServer] ServerName=Pavlov VR Server - Powered by AMP -bEnabled=true +bEnabled=false MaxPlayers=10 ApiKey= bSecured=true From 27d4933e031ed7725bec89c2b6ec9a1ac7bc9247 Mon Sep 17 00:00:00 2001 From: Greelan <53196309+Greelan@users.noreply.github.com> Date: Mon, 21 Feb 2022 14:11:04 +1100 Subject: [PATCH 4/4] Pavlov: Fix enums and bEnabled setting --- pavlov-vrconfig.json | 50 ++++++++++++++++++++++++----------------- pavlov-vrconfigfile.ini | 2 +- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/pavlov-vrconfig.json b/pavlov-vrconfig.json index 17546b9..831ff86 100755 --- a/pavlov-vrconfig.json +++ b/pavlov-vrconfig.json @@ -9,23 +9,22 @@ "IsFlagArgument": false, "ParamFieldName": "/Script/Pavlov.DedicatedServer.ServerName", "IncludeInCommandLine": false, - "DefaultValue": "Pavlov VR Server - Powered by AMP" + "DefaultValue": "Pavlov VR Server - Powered by AMP", + "EnumValues": {} }, { "DisplayName": "Include in Server List", "Category": "Server Settings", - "Description": "Requires an API key to be set", - "Keywords": "server list", + "Description": "", + "Keywords": "", "FieldName": "bEnabled", - "InputType": "checkbox", + "InputType": "text", + "Hidden": true, "IsFlagArgument": false, "ParamFieldName": "/Script/Pavlov.DedicatedServer.bEnabled", "IncludeInCommandLine": false, - "DefaultValue": "false", - "EnumValues": { - "False": "false", - "True": "true" - } + "DefaultValue": "true", + "EnumValues": {} }, { "DisplayName": "API Key", @@ -37,7 +36,8 @@ "IsFlagArgument": false, "ParamFieldName": "/Script/Pavlov.DedicatedServer.ApiKey", "IncludeInCommandLine": false, - "DefaultValue": "" + "DefaultValue": "", + "EnumValues": {} }, { "DisplayName": "Server Password", @@ -49,7 +49,8 @@ "IsFlagArgument": false, "ParamFieldName": "/Script/Pavlov.DedicatedServer.Password", "IncludeInCommandLine": false, - "DefaultValue": "0000" + "DefaultValue": "0000", + "EnumValues": {} }, { "DisplayName": "RCON Password", @@ -61,7 +62,8 @@ "IsFlagArgument": false, "ParamFieldName": "", "IncludeInCommandLine": false, - "DefaultValue": "Password123" + "DefaultValue": "Password123", + "EnumValues": {} }, { "DisplayName": "Enable Valve Anti-Cheat (Steam VAC)", @@ -122,7 +124,8 @@ "ParamFieldName": "/Script/Pavlov.DedicatedServer.MaxPlayers", "IncludeInCommandLine": false, "DefaultValue": "10", - "Suffix": "players" + "Suffix": "players", + "EnumValues": {} }, { "DisplayName": "Enable Whitelist", @@ -151,7 +154,8 @@ "ParamFieldName": "whitelist", "IncludeInCommandLine": false, "DefaultValue": "", - "Special": "listfile:./pavlovserver/622970/Pavlov/Saved/Config/whitelist.txt" + "Special": "listfile:./pavlovserver/622970/Pavlov/Saved/Config/whitelist.txt", + "EnumValues": {} }, { "DisplayName": "Blacklisted Players", @@ -164,7 +168,8 @@ "ParamFieldName": "blacklist", "IncludeInCommandLine": false, "DefaultValue": "", - "Special": "listfile:./pavlovserver/622970/Pavlov/Saved/Config/blacklist.txt" + "Special": "listfile:./pavlovserver/622970/Pavlov/Saved/Config/blacklist.txt", + "EnumValues": {} }, { "DisplayName": "Server Moderators", @@ -177,7 +182,8 @@ "ParamFieldName": "mods", "IncludeInCommandLine": false, "DefaultValue": "", - "Special": "listfile:./pavlovserver/622970/Pavlov/Saved/Config/mods.txt" + "Special": "listfile:./pavlovserver/622970/Pavlov/Saved/Config/mods.txt", + "EnumValues": {} }, { "DisplayName": "Refresh Interval", @@ -190,7 +196,8 @@ "ParamFieldName": "/Script/Pavlov.DedicatedServer.RefreshListTime", "IncludeInCommandLine": false, "DefaultValue": "120", - "Suffix": "seconds" + "Suffix": "seconds", + "EnumValues": {} }, { "DisplayName": "Server Tick Rate", @@ -202,7 +209,8 @@ "IsFlagArgument": false, "ParamFieldName": "/Script/Pavlov.DedicatedServer.TickRate", "IncludeInCommandLine": false, - "DefaultValue": "90" + "DefaultValue": "90", + "EnumValues": {} }, { "DisplayName": "Map Time Limit", @@ -214,7 +222,8 @@ "IsFlagArgument": false, "ParamFieldName": "/Script/Pavlov.DedicatedServer.TimeLimit", "IncludeInCommandLine": false, - "DefaultValue": "60" + "DefaultValue": "60", + "EnumValues": {} }, { "DisplayName": "Balance Table URL", @@ -226,7 +235,8 @@ "IsFlagArgument": false, "ParamFieldName": "/Script/Pavlov.DedicatedServer.BalanceTableURL", "IncludeInCommandLine": false, - "DefaultValue": "vankruptgames/BalancingTable/main" + "DefaultValue": "vankruptgames/BalancingTable/main", + "EnumValues": {} }, { "DisplayName": "Limited Ammo Mode", diff --git a/pavlov-vrconfigfile.ini b/pavlov-vrconfigfile.ini index fb720ce..31605a5 100755 --- a/pavlov-vrconfigfile.ini +++ b/pavlov-vrconfigfile.ini @@ -1,6 +1,6 @@ [/Script/Pavlov.DedicatedServer] +bEnabled=true ServerName=Pavlov VR Server - Powered by AMP -bEnabled=false MaxPlayers=10 ApiKey= bSecured=true