From 4de523de0e91f30866de9dc82bf14546fb6293d8 Mon Sep 17 00:00:00 2001 From: IceOfWraith <96364530+IceOfWraith@users.noreply.github.com> Date: Mon, 12 Jun 2023 16:58:24 -0500 Subject: [PATCH] 7D2D a21 Update (#385) * 7D2D a21 Update Tentative changes for the upcoming a21 release. * Final updates pre-review * Review fixes * Update seven-days-to-dieconfig.json --- seven-days-settings210.xml | 202 +++++++++++++++++++++++++++++++ seven-days-to-die.kvp | 2 +- seven-days-to-dieconfig.json | 120 +++++++++++++++--- seven-days-to-diemetaconfig.json | 27 +---- seven-days-to-dieupdates.json | 54 +-------- 5 files changed, 309 insertions(+), 96 deletions(-) create mode 100644 seven-days-settings210.xml diff --git a/seven-days-settings210.xml b/seven-days-settings210.xml new file mode 100644 index 0000000..1586fa1 --- /dev/null +++ b/seven-days-settings210.xml @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/seven-days-to-die.kvp b/seven-days-to-die.kvp index e63411b..d0f7126 100644 --- a/seven-days-to-die.kvp +++ b/seven-days-to-die.kvp @@ -37,7 +37,7 @@ App.HasReadableConsole=True App.SupportsLiveSettingsChanges=False App.LiveSettingChangeCommandFormat=set {0} "{1}" App.ApplicationIPBinding=0.0.0.0 -App.Ports=[{"Protocol":"Both","Port":26900,"Offset":0,"Range":1,"Ref":"ServerPort","Name":"Server and Steam Port","Description":"Main game traffic and Steam Query port","ChildPorts":null},{"Protocol":"TCP","Port":26901,"Offset":0,"Range":1,"Ref":"ControlPanelPort","Name":"Control Panel Port","Description":"Web panel access port","ChildPorts":null},{"Protocol":"UDP","Port":26902,"Offset":0,"Range":1,"Ref":"AdditionalPort","Name":"Server Additional Port","Description":"Unknown use at this time","ChildPorts":null},{"Protocol":"TCP","Port":27020,"Offset":0,"Range":1,"Ref":"RemoteAdminPort","Name":"RCON Port","Description":"RCON traffic port","ChildPorts":null}] +App.Ports=[{"Protocol":"Both","Port":26900,"Offset":0,"Range":1,"Ref":"ServerPort","Name":"Server and Steam Port","Description":"Main game traffic and Steam Query port","ChildPorts":null},{"Protocol":"TCP","Port":26901,"Offset":0,"Range":1,"Ref":"ControlPanelPort","Name":"Control Panel Port","Description":"Web panel access port","ChildPorts":null},{"Protocol":"TCP","Port":26902,"Offset":0,"Range":1,"Ref":"RemoteAdminPort","Name":"RCON Port","Description":"RCON traffic port","ChildPorts":null}] App.MaxUsers=8 App.UseRandomAdminPassword=True App.RemoteAdminPassword= diff --git a/seven-days-to-dieconfig.json b/seven-days-to-dieconfig.json index 6c9d0c9..c71af72 100644 --- a/seven-days-to-dieconfig.json +++ b/seven-days-to-dieconfig.json @@ -209,14 +209,14 @@ "True": "true" } },{ - "DisplayName":"Control Panel Enabled", + "DisplayName":"Control Panel / Web Dashboard Enabled", "Category":"7d2d - Server Settings", - "Description":"Enable/Disable the web control panel.", - "Keywords":"Control,Panel,Enabled", + "Description":"Enable/Disable the web control panel / web dashboard.", + "Keywords":"Control,Panel,Web,Dashboard,Enabled", "FieldName":"ControlPanelEnabled", "InputType":"checkbox", "IsFlagArgument":false, - "ParamFieldName":"/ServerSettings/property[@name='ControlPanelEnabled']/@value", + "ParamFieldName":"/ServerSettings/property[@name='ControlPanelEnabled']/@value | /ServerSettings/property[@name='WebDashboardEnabled']/@value", "IncludeInCommandLine":false, "DefaultValue":"false", "EnumValues":{ @@ -224,14 +224,14 @@ "True": "true" } },{ - "DisplayName":"Control Panel Port", + "DisplayName":"Control Panel / Web Dashboard Port", "Category":"7d2d - Server Settings", - "Description":"Port of the control panel webpage.", + "Description":"Port of the control panel / web dashboard webpage.", "Keywords":"", "FieldName":"$ControlPanelPort", "InputType":"number", "IsFlagArgument":false, - "ParamFieldName":"/ServerSettings/property[@name='ControlPanelPort']/@value", + "ParamFieldName":"/ServerSettings/property[@name='ControlPanelPort']/@value | /ServerSettings/property[@name='WebDashboardPort']/@value", "IncludeInCommandLine":false, "DefaultValue":"8080", "EnumValues":{}, @@ -239,15 +239,43 @@ },{ "DisplayName":"Control Panel Password", "Category":"7d2d - Server Settings", - "Description":"Password to gain entry to the control panel.", + "Description":"Password to gain entry to the control panel. This only applies to game version 20.7 and below.", "Keywords":"Control,Panel,Password", "FieldName":"ControlPanelPassword", - "InputType":"RandomPassword", + "InputType":"password", "IsFlagArgument":false, "ParamFieldName":"/ServerSettings/property[@name='ControlPanelPassword']/@value", "IncludeInCommandLine":false, - "DefaultValue":"CHANGEME", + "DefaultValue":"{{newguid()}}", "EnumValues":{} + },{ + "DisplayName":"Web Dashboard URL", + "Category":"7d2d - Server Settings", + "Description":"External URL to the web dashboard if not just using the public IP of the server, e.g. if the web dashboard is behind a reverse proxy. Needs to be the full URL, like \"https://domainOfReverseProxy.tld:1234/\". Can be left empty if directly using the public IP and dashboard port. Only applies to game version 21.0 and above.", + "Keywords":"Web,Dashboard,URL", + "FieldName":"WebDashboardUrl", + "InputType":"text", + "IsFlagArgument":false, + "ParamFieldName":"/ServerSettings/property[@name='WebDashboardUrl']/@value", + "IncludeInCommandLine":false, + "DefaultValue":"", + "Placeholder":"https://domainOfReverseProxy.tld:1234/", + "EnumValues":{} + },{ + "DisplayName":"Web Dashboard Map Rendering Enabled", + "Category":"7d2d - Server Settings", + "Description":"Enable/disable rendering of the map to tile images while exploring it. This is used e.g. by the web dashboard to display a view of the map.", + "Keywords":"Web,Dashboard,Map,Rendering", + "FieldName":"EnableMapRendering", + "InputType":"checkbox", + "IsFlagArgument":false, + "ParamFieldName":"/ServerSettings/property[@name='EnableMapRendering']/@value", + "IncludeInCommandLine":false, + "DefaultValue":"false", + "EnumValues":{ + "False": "false", + "True": "true" + } },{ "DisplayName":"Telnet Enabled", "Category":"7d2d - Server Settings", @@ -395,7 +423,7 @@ },{ "DisplayName":"World Gen Size", "Category":"7d2d - Gameplay Settings", - "Description":"If RWG this controls the width and height of the created world. It is also used in combination with WorldGenSeed to create the internal RWG seed thus also creating a unique map name even if using the same WorldGenSeed. Has to be a multiple of 2048 between 2048 and 16384, though large map sizes will take long to generate / download / load.", + "Description":"If RWG, this controls the width and height of the created world. Officially supported sizes are between 6144 and 10240 and must be a multiple of 2048, e.g. 6144, 8192, 10240.", "Keywords":"World,Gen,Size", "FieldName":"WorldGenSize", "InputType":"number", @@ -627,6 +655,21 @@ "DefaultValue":"45", "EnumValues":{}, "Suffix": "minutes" + },{ + "DisplayName":"Allow Spawn Near Backpack", + "Category":"7d2d - Gameplay Settings", + "Description":"Allow players to respawn near their last dropped backpack when they die.", + "Keywords":"Allow,Spawn,Near,Backpack", + "FieldName":"AllowSpawnNearBackpack", + "InputType":"checkbox", + "IsFlagArgument":false, + "ParamFieldName":"/ServerSettings/property[@name='AllowSpawnNearBackpack']/@value", + "IncludeInCommandLine":false, + "DefaultValue":"false", + "EnumValues":{ + "False": "false", + "True": "true" + } },{ "DisplayName":"Max Spawned Zombies", "Category":"7d2d - Gameplay Settings", @@ -673,6 +716,20 @@ "11": "11", "12": "12" } + },{ + "DisplayName":"Max Queued Mesh Layers", + "Category":"7d2d - Gameplay Settings", + "Description":"Maximum amount of Chunk mesh layers that can be enqueued during mesh generation. Reducing this will improve memory usage but may increase Chunk generation time.", + "Keywords":"Max,Queued,Mesh,Layers", + "FieldName":"MaxQueuedMeshLayers", + "InputType":"number", + "IsFlagArgument":false, + "ParamFieldName":"/ServerSettings/property[@name='MaxQueuedMeshLayers']/@value", + "IncludeInCommandLine":false, + "DefaultValue":"1000", + "Placeholder":"1000", + "EnumValues":{}, + "Suffix": "chunks" },{ "DisplayName":"Enemy Spawn Mode", "Category":"7d2d - Gameplay Settings", @@ -893,7 +950,7 @@ "IsFlagArgument":false, "ParamFieldName":"/ServerSettings/property[@name='AirDropMarker']/@value", "IncludeInCommandLine":false, - "DefaultValue":"false", + "DefaultValue":"true", "EnumValues":{ "False": "false", "True": "true" @@ -938,7 +995,7 @@ "IsFlagArgument":false, "ParamFieldName":"/ServerSettings/property[@name='LandClaimCount']/@value", "IncludeInCommandLine":false, - "DefaultValue":"1", + "DefaultValue":"3", "EnumValues":{}, "Suffix": "claims" },{ @@ -1092,10 +1149,10 @@ "EnumValues":{}, "Suffix": "items" },{ - "DisplayName":"TwitchServerPermission", + "DisplayName":"Twitch Server Permission Level", "Category":"7d2d - Gameplay Settings", "Description":"Required permission level to use twitch integration on the server.", - "Keywords":"Twitch,Server,Permission", + "Keywords":"Twitch,Server,Permission,Level", "FieldName":"TwitchServerPermission", "InputType":"number", "IsFlagArgument":false, @@ -1119,6 +1176,36 @@ "False": "false", "True": "true" } + },{ + "DisplayName":"Max Chunk Age", + "Category":"7d2d - Server Settings", + "Description":"The number of in-game days which must pass since visiting a chunk before it will reset to its original state if not revisited or protected (e.g. by a land claim or bedroll being in close proximity).", + "Keywords":"Max,Chunk,Age", + "FieldName":"MaxChunkAge", + "InputType":"number", + "IsFlagArgument":false, + "ParamFieldName":"/ServerSettings/property[@name='MaxChunkAge']/@value", + "IncludeInCommandLine":false, + "DefaultValue":"-1", + "Placeholder":"-1", + "MinValue":"-1", + "EnumValues":{}, + "Suffix": "days" + },{ + "DisplayName":"Save Data Limit", + "Category":"7d2d - Server Settings", + "Description":"The maximum disk space allowance for each saved game in megabytes (MB). Saved chunks may be forceably reset to their original states to free up space when this limit is reached. Negative values disable the limit.", + "Keywords":"Save,Data,Limit", + "FieldName":"SaveDataLimit", + "InputType":"number", + "IsFlagArgument":false, + "ParamFieldName":"/ServerSettings/property[@name='SaveDataLimit']/@value", + "IncludeInCommandLine":false, + "DefaultValue":"-1", + "Placeholder":"-1", + "MinValue":"-1", + "EnumValues":{}, + "Suffix": "mb" },{ "DisplayName":"Release Stream", "Category":"SteamCMD and Updates", @@ -1147,7 +1234,8 @@ "seven-days-settings184": "18.4", "seven-days-settings196": "19.6", "seven-days-settings200-203": "20.0 to 20.3", - "seven-days-settings204": "20.4 and Higher", + "seven-days-settings204": "20.4 to 20.7", + "seven-days-settings210": "21.0 and Higher", "seven-days-settings-undead-legacy-stable": "Undead Legacy Stable", "seven-days-settings-undead-legacy-experimental": "Undead Legacy Experimental" } diff --git a/seven-days-to-diemetaconfig.json b/seven-days-to-diemetaconfig.json index b5eed71..b1b5f78 100644 --- a/seven-days-to-diemetaconfig.json +++ b/seven-days-to-diemetaconfig.json @@ -1,31 +1,6 @@ [ { - "ConfigFile": "seven-days-settings184.xml", - "AutoMap": true, - "ConfigType": "xml" - }, - { - "ConfigFile": "seven-days-settings196.xml", - "AutoMap": true, - "ConfigType": "xml" - }, - { - "ConfigFile": "seven-days-settings200-203.xml", - "AutoMap": true, - "ConfigType": "xml" - }, - { - "ConfigFile": "seven-days-settings204.xml", - "AutoMap": true, - "ConfigType": "xml" - }, - { - "ConfigFile": "seven-days-settings-undead-legacy-stable.xml", - "AutoMap": true, - "ConfigType": "xml" - }, - { - "ConfigFile": "seven-days-settings-undead-legacy-experimental.xml", + "ConfigFile": "{{ConfigFile}}.xml", "AutoMap": true, "ConfigType": "xml" } diff --git a/seven-days-to-dieupdates.json b/seven-days-to-dieupdates.json index 11798bf..7d4bdcd 100644 --- a/seven-days-to-dieupdates.json +++ b/seven-days-to-dieupdates.json @@ -17,41 +17,9 @@ "UpdateStageName": "Settings File Download", "UpdateSourcePlatform": "All", "UpdateSource": "FetchURL", - "UpdateSourceData": "https://github.com/CubeCoders/AMPTemplates/raw/main/seven-days-settings184.xml", + "UpdateSourceData": "https://github.com/CubeCoders/AMPTemplates/raw/main/{{ConfigFile}}.xml", "UpdateSourceTarget": "./294420", "OverwriteExistingFiles": false, - "UpdateSourceConditionSetting": "ConfigFile", - "UpdateSourceConditionValue": "seven-days-settings184" - }, - { - "UpdateStageName": "Settings File Download", - "UpdateSourcePlatform": "All", - "UpdateSource": "FetchURL", - "UpdateSourceData": "https://github.com/CubeCoders/AMPTemplates/raw/main/seven-days-settings196.xml", - "UpdateSourceTarget": "./294420", - "OverwriteExistingFiles": false, - "UpdateSourceConditionSetting": "ConfigFile", - "UpdateSourceConditionValue": "seven-days-settings196" - }, - { - "UpdateStageName": "Settings File Download", - "UpdateSourcePlatform": "All", - "UpdateSource": "FetchURL", - "UpdateSourceData": "https://github.com/CubeCoders/AMPTemplates/raw/main/seven-days-settings200-203.xml", - "UpdateSourceTarget": "./294420", - "OverwriteExistingFiles": false, - "UpdateSourceConditionSetting": "ConfigFile", - "UpdateSourceConditionValue": "seven-days-settings200-203" - }, - { - "UpdateStageName": "Settings File Download", - "UpdateSourcePlatform": "All", - "UpdateSource": "FetchURL", - "UpdateSourceData": "https://github.com/CubeCoders/AMPTemplates/raw/main/seven-days-settings204.xml", - "UpdateSourceTarget": "./294420", - "OverwriteExistingFiles": false, - "UpdateSourceConditionSetting": "ConfigFile", - "UpdateSourceConditionValue": "seven-days-settings204" }, { "UpdateStageName": "UMOD Windows", @@ -79,26 +47,6 @@ "UpdateSourceConditionValue": "true", "DeleteAfterExtract": true }, - { - "UpdateStageName": "Settings File Download", - "UpdateSourcePlatform": "All", - "UpdateSource": "FetchURL", - "UpdateSourceData": "https://github.com/CubeCoders/AMPTemplates/raw/main/seven-days-settings-undead-legacy-stable.xml", - "UpdateSourceTarget": "./294420", - "OverwriteExistingFiles": false, - "UpdateSourceConditionSetting": "ConfigFile", - "UpdateSourceConditionValue": "seven-days-settings-undead-legacy-stable" - }, - { - "UpdateStageName": "Settings File Download", - "UpdateSourcePlatform": "All", - "UpdateSource": "FetchURL", - "UpdateSourceData": "https://github.com/CubeCoders/AMPTemplates/raw/main/seven-days-settings-undead-legacy-experimental.xml", - "UpdateSourceTarget": "./294420", - "OverwriteExistingFiles": false, - "UpdateSourceConditionSetting": "ConfigFile", - "UpdateSourceConditionValue": "seven-days-settings-undead-legacy-experimental" - }, { "UpdateStageName": "Download Undead Legacy Stable", "UpdateSourcePlatform": "All",