From 3e25077cc7c743418d33155f05b82dbaa8a4d74e Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Fri, 8 Jul 2022 17:33:44 +1000 Subject: [PATCH] Server Setting Changes - tribe alliance checkbox fixed. - custom harvest multiplier checkbox fixed. --- .../Lib/Model/ResourceClassMultiplier.cs | 13 +++++++++- .../UserControls/ServerSettingsControl.xaml | 2 +- src/ARKServerManager/VersionFeed.xml | 10 ++++++-- src/ARKServerManager/VersionFeedBeta.xml | 24 +++++++++++++++++++ .../Model/AggregateIniValueList.cs | 3 ++- 5 files changed, 47 insertions(+), 5 deletions(-) diff --git a/src/ARKServerManager/Lib/Model/ResourceClassMultiplier.cs b/src/ARKServerManager/Lib/Model/ResourceClassMultiplier.cs index 5183d1e1..f4e43fbd 100644 --- a/src/ARKServerManager/Lib/Model/ResourceClassMultiplier.cs +++ b/src/ARKServerManager/Lib/Model/ResourceClassMultiplier.cs @@ -30,10 +30,21 @@ namespace ServerManagerTool.Lib this.FirstOrDefault(r => r.IsEquivalent(item)).Multiplier = item.Multiplier; } - IsEnabled = (Count > 0); + IsEnabled = this.Any(d => d.ShouldSave()); Sort(AggregateIniValue.SortKeySelector); } + public override void Reset() + { + Clear(); + + if (this._resetFunc != null) + this.AddRange(this._resetFunc()); + + IsEnabled = this.Any(d => d.ShouldSave()); + + this.Sort(AggregateIniValue.SortKeySelector); + } public override IEnumerable ToIniValues() { diff --git a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml index c83b6e07..d6874399 100644 --- a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml +++ b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml @@ -2005,7 +2005,7 @@ - + diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml index caf90ef1..11a91768 100644 --- a/src/ARKServerManager/VersionFeed.xml +++ b/src/ARKServerManager/VersionFeed.xml @@ -9,13 +9,19 @@ urn:uuid:7E95E486-1977-42F0-9AD6-8DB89A81A877 - 1.1.435 (1.1.435.2) - 1.1.435.2 + 1.1.435 (1.1.435.3) + 1.1.435.3 2022-07-08T00:00:00Z

+ BUGFIX +
+

    +
  • Server Settings - Rules Section - Enable Tribe Alliance - fixed the checkbox, so that it enables/disables per profile.
    • +
  • Server Settings - Environment Section - Custom Harvest Amount Multiplier - fixed the checkbox, so that it enables/disables when there are changes or unknown resources.
    • +
CHANGE
    diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml index f4d3304e..ac0ca425 100644 --- a/src/ARKServerManager/VersionFeedBeta.xml +++ b/src/ARKServerManager/VersionFeedBeta.xml @@ -7,6 +7,30 @@ 2022-07-08T00:00:00Z + + urn:uuid:7E95E486-1977-42F0-9AD6-8DB89A81A877 + 1.1.435 (1.1.435.3) + 1.1.435.3 + + 2022-07-08T00:00:00Z + +
    +

    + BUGFIX +
    +

      +
    • Server Settings - Rules Section - Enable Tribe Alliance - fixed the checkbox, so that it enables/disables per profile.
      • +
    • Server Settings - Environment Section - Custom Harvest Amount Multiplier - fixed the checkbox, so that it enables/disables when there are changes or unknown resources.
      • +
    +

    +
    +     + + bletch + bletch1971@hotmail.com + +     + urn:uuid:7E95E486-1977-42F0-9AD6-8DB89A81A877 1.1.435 (1.1.435.2) diff --git a/src/ServerManager.Common/Model/AggregateIniValueList.cs b/src/ServerManager.Common/Model/AggregateIniValueList.cs index 87630037..7604acb7 100644 --- a/src/ServerManager.Common/Model/AggregateIniValueList.cs +++ b/src/ServerManager.Common/Model/AggregateIniValueList.cs @@ -48,11 +48,12 @@ namespace ServerManagerTool.Common.Model this.Sort(AggregateIniValue.SortKeySelector); } - public void Reset() + public virtual void Reset() { this.Clear(); if (this._resetFunc != null) this.AddRange(this._resetFunc()); + IsEnabled = (Count > 0); this.Sort(AggregateIniValue.SortKeySelector); }