From f91d2bd30f3dec422e4dfb80cf819018c688bdc6 Mon Sep 17 00:00:00 2001
From: Greelan <53196309+Greelan@users.noreply.github.com>
Date: Sat, 25 Mar 2023 03:43:56 +1100
Subject: [PATCH] ARK:SE: remove deprecated -NoTransferFromFiltering setting
 and fix OverrideOfficialDifficulty setting (#310)

---
 ark-se.kvp        |  2 +-
 ark-seconfig.json | 31 +++++++------------------------
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/ark-se.kvp b/ark-se.kvp
index f4bc769..49b3b9e 100644
--- a/ark-se.kvp
+++ b/ark-se.kvp
@@ -27,7 +27,7 @@ App.ExecutableLinux=376030/ShooterGame/Binaries/Linux/ShooterGameServer
 App.WorkingDir=376030/ShooterGame/Binaries/Win64
 App.LinuxCommandLineArgs=
 App.WindowsCommandLineArgs=
-App.CommandLineArgs={{Map}}?listen?Port={{$GamePort}}?QueryPort={{$QueryPort}}?RCONEnabled=True?RCONServerGameLogBuffer=600?RCONPort={{$RCONPort}}?ServerAdminPassword={{$RemoteAdminPassword}}?SessionName="{{SessionName}}"?MultiHome={{$ApplicationIPBinding}}?{{$FormattedArgs}}{{OverrideOfficialDifficulty}}{{CustomOptions}} {{automanagedmods}}{{exclusivejoin}}{{BattlEye}}{{crossplay}}{{epiconly}}{{UseVivox}}{{insecure}}{{EnableIdlePlayerKick}}{{ForceAllowCaveFlyers}}{{nodinos}}{{PreventHibernation}}{{ForceRespawnDinos}}{{DisableRailgunPVP}}{{UseStructureStasisGrid}}{{AutoDestroyStructures}}{{NoTransferFromFiltering}} -ActiveEvent={{ActiveEvent}} -PublicIPForEpic={{PublicIPForEpic}} -culture={{culture}} -ClusterDirOverride="{{ClusterDirOverride}}" -clusterid={{clusterid}} {{CustomFlags}} -servergamelog
+App.CommandLineArgs={{Map}}?listen?Port={{$GamePort}}?QueryPort={{$QueryPort}}?RCONEnabled=True?RCONServerGameLogBuffer=600?RCONPort={{$RCONPort}}?ServerAdminPassword={{$RemoteAdminPassword}}?SessionName="{{SessionName}}"?MultiHome={{$ApplicationIPBinding}}?{{$FormattedArgs}}{{CustomOptions}} {{automanagedmods}}{{exclusivejoin}}{{BattlEye}}{{crossplay}}{{epiconly}}{{UseVivox}}{{insecure}}{{EnableIdlePlayerKick}}{{ForceAllowCaveFlyers}}{{nodinos}}{{PreventHibernation}}{{ForceRespawnDinos}}{{DisableRailgunPVP}}{{UseStructureStasisGrid}}{{AutoDestroyStructures}} -ActiveEvent={{ActiveEvent}} -PublicIPForEpic={{PublicIPForEpic}} -culture={{culture}} -ClusterDirOverride="{{ClusterDirOverride}}" -clusterid={{clusterid}} {{CustomFlags}} -servergamelog
 App.UseLinuxIOREDIR=False
 App.AppSettings={}
 App.EnvironmentVariables={"LD_LIBRARY_PATH":"{{$FullBaseDir}}linux64:{{$FullRootDir}}linux64:%LD_LIBRARY_PATH%","SteamAppId":"346110"}
diff --git a/ark-seconfig.json b/ark-seconfig.json
index 51f5a27..2048493 100644
--- a/ark-seconfig.json
+++ b/ark-seconfig.json
@@ -566,18 +566,17 @@
     {
         "DisplayName":"Override Official Difficulty",
         "Category":"ARK Gameplay Settings",
-        "Description":"If enabled, sets to 5 the default server difficulty level (instead of 4)",
+        "Description":"Sets the default server difficulty level, allowing it to go above the default 4.0. Be careful not to go too high!",
         "Keywords":"override,official,difficulty,overrideofficialdifficulty",
         "FieldName":"OverrideOfficialDifficulty",
-        "InputType":"checkbox",
+        "InputType":"number",
+        "MinValue":"0",
         "IsFlagArgument":false,
         "ParamFieldName":"OverrideOfficialDifficulty",
-        "IncludeInCommandLine":false,
-        "DefaultValue":"",
-        "EnumValues":{
-            "False":"",
-            "True":"?OverrideOfficialDifficulty=5.0"
-        }
+        "IncludeInCommandLine":true,
+        "DefaultValue":"4.0",
+        "Placeholder":"4.0",
+        "EnumValues":{}
     },
     {
         "DisplayName":"Enable Crosshair",
@@ -2021,22 +2020,6 @@
         "DefaultValue":"",
         "EnumValues":{}
     },
-    {
-        "DisplayName":"Filter Transfers",
-        "Category":"ARK Cluster Settings",
-        "Description":"If set, prevents uploads from and downloads to servers that are not part of the cluster",
-        "Keywords":"filter,data,transfer,cluster,notransferfromfiltering",
-        "FieldName":"NoTransferFromFiltering",
-        "InputType":"checkbox",
-        "IsFlagArgument":false,
-        "ParamFieldName":"NoTransferFromFiltering",
-        "IncludeInCommandLine":false,
-        "DefaultValue":"",
-        "EnumValues":{
-            "False":"",
-            "True":"-NoTransferFromFiltering "
-        }
-    },
     {
         "DisplayName":"Prevent Character Download",
         "Category":"ARK Cluster Settings",