From 711cf955c32d582123672e1eabb82a2844c30318 Mon Sep 17 00:00:00 2001
From: Brett Hewitson <bletch1971@hotmail.com>
Date: Wed, 22 Jun 2022 12:25:36 +1000
Subject: [PATCH] Fjordur Settings

- added a checkbox header to the settings to enable/disable.
---
 .../Globalization/en-US/en-US.xaml            |  2 +-
 src/ARKServerManager/Lib/ServerProfile.cs     | 10 +++++++-
 .../UserControls/ServerSettingsControl.xaml   |  8 +++++--
 src/ARKServerManager/VersionFeed.xml          |  5 ++--
 src/ARKServerManager/VersionFeedBeta.xml      | 23 +++++++++++++++++++
 5 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/ARKServerManager/Globalization/en-US/en-US.xaml b/src/ARKServerManager/Globalization/en-US/en-US.xaml
index bd7de73a..855acd75 100644
--- a/src/ARKServerManager/Globalization/en-US/en-US.xaml
+++ b/src/ARKServerManager/Globalization/en-US/en-US.xaml
@@ -1553,7 +1553,7 @@
     <sys:String x:Key="ServerSettings_HexagonCostMultiplierLabel">Hexagon Cost Multiplier</sys:String>
     <sys:String x:Key="ServerSettings_HexagonCostMultiplierTooltip">Specifies the multiplier for the hexagon cost of items.</sys:String>
 
-    <sys:String x:Key="ServerSettings_FjordurLabel">Fjordur</sys:String>
+    <sys:String x:Key="ServerSettings_FjordurLabel">Enable Fjordur Settings</sys:String>
     <sys:String x:Key="ServerSettings_UseFjordurTraversalBuffLabel">Enable Fjordur Biome Teleport</sys:String>
     <sys:String x:Key="ServerSettings_UseFjordurTraversalBuffTooltip">If enabled, will allow biome teleport on Fjordur map.</sys:String>
 
diff --git a/src/ARKServerManager/Lib/ServerProfile.cs b/src/ARKServerManager/Lib/ServerProfile.cs
index af7aad08..5c95a7cd 100644
--- a/src/ARKServerManager/Lib/ServerProfile.cs
+++ b/src/ARKServerManager/Lib/ServerProfile.cs
@@ -1811,8 +1811,16 @@ namespace ServerManagerTool.Lib
             set { SetValue(HexagonCostMultiplierProperty, value); }
         }
 
+        public static readonly DependencyProperty EnableFjordurSettingsProperty = DependencyProperty.Register(nameof(EnableFjordurSettings), typeof(bool), typeof(ServerProfile), new PropertyMetadata(false));
+        [DataMember]
+        public bool EnableFjordurSettings
+        {
+            get { return (bool)GetValue(EnableFjordurSettingsProperty); }
+            set { SetValue(EnableFjordurSettingsProperty, value); }
+        }
+
         public static readonly DependencyProperty UseFjordurTraversalBuffProperty = DependencyProperty.Register(nameof(UseFjordurTraversalBuff), typeof(bool), typeof(ServerProfile), new PropertyMetadata(true));
-        [IniFileEntry(IniFiles.GameUserSettings, IniSections.GUS_ServerSettings, ServerProfileCategory.Rules)]
+        [IniFileEntry(IniFiles.GameUserSettings, IniSections.GUS_ServerSettings, ServerProfileCategory.Rules, ConditionedOn = nameof(EnableFjordurSettings))]
         public bool UseFjordurTraversalBuff
         {
             get { return (bool)GetValue(UseFjordurTraversalBuffProperty); }
diff --git a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml
index 57b8a468..42cdc15d 100644
--- a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml
+++ b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml
@@ -2149,8 +2149,12 @@
                                         </Grid>
                                     </GroupBox>
 
-                                    <GroupBox Header="{DynamicResource ServerSettings_FjordurLabel}" Style="{StaticResource GroupBoxStyle}">
-                                        <Grid>
+                                    <GroupBox Style="{StaticResource GroupBoxStyle}">
+                                        <GroupBox.Header>
+                                            <cctl:CheckBoxAndTextBlock IsChecked="{Binding EnableFjordurSettings, Mode=TwoWay}" Text="{DynamicResource ServerSettings_FjordurLabel}" />
+                                        </GroupBox.Header>
+
+                                        <Grid IsEnabled="{Binding EnableFjordurSettings}">
                                             <Grid.RowDefinitions>
                                                 <RowDefinition/>
                                             </Grid.RowDefinitions>
diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml
index af092914..1e2934ba 100644
--- a/src/ARKServerManager/VersionFeed.xml
+++ b/src/ARKServerManager/VersionFeed.xml
@@ -9,8 +9,8 @@
 
   <entry>
     <id>urn:uuid:FF41F7AB-66B0-4504-9F2C-2E1325DB50E2</id>
-    <title>1.1.434 (1.1.434.1)</title>
-    <summary>1.1.434.1</summary>
+    <title>1.1.434 (1.1.434.2)</title>
+    <summary>1.1.434.2</summary>
     <link href="" />
     <updated>2022-06-22T00:00:00Z</updated>
     <content type="xhtml">
@@ -20,6 +20,7 @@
           <br/>
           <ul>
             <li>3rd Party Libraries - updated all library to latest versions.</li>
+            <li>Fjordur Settings - added checkbox to enable/disable settings.</li>
           </ul>
         </p>
       </div>
diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml
index 7117fcbb..91d94595 100644
--- a/src/ARKServerManager/VersionFeedBeta.xml
+++ b/src/ARKServerManager/VersionFeedBeta.xml
@@ -7,6 +7,29 @@
   <link href="http://arkservermanager.freeforums.net/" />
   <updated>2022-06-22T00:00:00Z</updated>
 
+  <entry>
+    <id>urn:uuid:F3965FC7-685F-47DF-9E5B-3BA4D928127F</id>
+    <title>1.1.434 (1.1.434.2)</title>
+    <summary>1.1.434.2</summary>
+    <link href="" />
+    <updated>2022-06-22T00:00:00Z</updated>
+    <content type="xhtml">
+      <div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
+        <p>
+          <u style="font-size: .9em;">CHANGE</u>
+          <br/>
+          <ul>
+            <li>Fjordur Settings - added checkbox to enable/disable settings.</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
+
   <entry>
     <id>urn:uuid:FF41F7AB-66B0-4504-9F2C-2E1325DB50E2</id>
     <title>1.1.434 (1.1.434.1)</title>