From 43f11899cb913f3bbc043437851862103db8c973 Mon Sep 17 00:00:00 2001
From: Lacoi <david@edv-unger.com>
Date: Mon, 21 Aug 2023 15:38:02 +0200
Subject: [PATCH] asm: last fixes for some settings

---
 src/ARKServerManager/Lib/ServerProfile.cs                   | 6 +++---
 .../UserControls/ServerSettingsControl.xaml                 | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ARKServerManager/Lib/ServerProfile.cs b/src/ARKServerManager/Lib/ServerProfile.cs
index 39070be2..ce4821bd 100644
--- a/src/ARKServerManager/Lib/ServerProfile.cs
+++ b/src/ARKServerManager/Lib/ServerProfile.cs
@@ -1839,7 +1839,7 @@ namespace ServerManagerTool.Lib
         }
 
         public static readonly DependencyProperty RandomSupplyCratePointsProperty = DependencyProperty.Register(nameof(RandomSupplyCratePoints), typeof(bool), typeof(ServerProfile), new PropertyMetadata(false));
-        [IniFileEntry(IniFiles.Game, IniSections.Game_ShooterGameMode, ServerProfileCategory.Rules)]
+        [IniFileEntry(IniFiles.GameUserSettings, IniSections.GUS_ServerSettings, ServerProfileCategory.Rules)]
         public bool RandomSupplyCratePoints
         {
             get { return (bool)GetValue(RandomSupplyCratePointsProperty); }
@@ -2175,7 +2175,7 @@ namespace ServerManagerTool.Lib
         }
 
         public static readonly DependencyProperty EnablePlayerJoinedNotificationsProperty = DependencyProperty.Register(nameof(EnablePlayerJoinedNotifications), typeof(bool), typeof(ServerProfile), new PropertyMetadata(false));
-        [IniFileEntry(IniFiles.GameUserSettings, IniSections.GUS_ServerSettings, ServerProfileCategory.ChatAndNotifications, "alwaysNotifyPlayerJoined")]
+        [IniFileEntry(IniFiles.GameUserSettings, IniSections.GUS_ServerSettings, ServerProfileCategory.ChatAndNotifications, "DontAlwaysNotifyPlayerJoined")]
         public bool EnablePlayerJoinedNotifications
         {
             get { return (bool)GetValue(EnablePlayerJoinedNotificationsProperty); }
@@ -2414,7 +2414,7 @@ namespace ServerManagerTool.Lib
             set { SetValue(DinoCharacterHealthRecoveryMultiplierProperty, value); }
         }
 
-        public static readonly DependencyProperty DinoHarvestingDamageMultiplierProperty = DependencyProperty.Register(nameof(DinoHarvestingDamageMultiplier), typeof(float), typeof(ServerProfile), new PropertyMetadata(3.0f));
+        public static readonly DependencyProperty DinoHarvestingDamageMultiplierProperty = DependencyProperty.Register(nameof(DinoHarvestingDamageMultiplier), typeof(float), typeof(ServerProfile), new PropertyMetadata(3.2f));
         [IniFileEntry(IniFiles.Game, IniSections.Game_ShooterGameMode, ServerProfileCategory.Dinos, WriteIfNotValue = 3.0f)]
         public float DinoHarvestingDamageMultiplier
         {
diff --git a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml
index e6e510d3..adfc6a2e 100644
--- a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml
+++ b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml
@@ -1881,6 +1881,7 @@
 
                                         <cctl:CheckBoxAndTextBlock Grid.Row="4" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding EnableExtraStructurePreventionVolumes, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableExtraStructurePreventionVolumesLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableExtraStructurePreventionVolumesTooltip}"/>
                                         <cctl:CheckBoxAndTextBlock Grid.Row="4" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding UseSingleplayerSettings, Mode=TwoWay}" Text="{DynamicResource ServerSettings_UseSingleplayerSettingsLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_UseSingleplayerSettingsTooltip}"/>
+                                        <cctl:CheckBoxAndTextBlock Grid.Row="4" Grid.Column="2" Margin="5,5,5,0" IsChecked="{Binding DisableCustomFoldersInTributeInventories, Mode=TwoWay}" Text="{DynamicResource ServerSettings_DisableCustomFoldersInTributeInventoriesLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisableCustomFoldersInTributeInventoriesTooltip}"/>
 
                                         <cctl:CheckBoxAndTextBlock Grid.Row="5" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding DisableLootCrates, Mode=TwoWay}" Text="{DynamicResource ServerSettings_DisableLootCratesLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisableLootCratesTooltip}" />
                                         <cctl:CheckBoxAndTextBlock Grid.Row="5" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding AllowCrateSpawnsOnTopOfStructures, Mode=TwoWay}" Text="{DynamicResource ServerSettings_AllowCrateSpawnsOnTopOfStructuresLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_AllowCrateSpawnsOnTopOfStructuresTooltip}" />
@@ -1984,7 +1985,6 @@
                                             </Grid.ColumnDefinitions>
 
                                             <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding NoTransferFromFiltering, Mode=TwoWay}" Text="{DynamicResource ServerSettings_NoTransferFromFilteringLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_NoTransferFromFilteringTooltip}"/>
-                                            <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="0" Margin="5,5,5,0" IsChecked="{Binding DisableCustomFoldersInTributeInventories, Mode=TwoWay}" Text="{DynamicResource ServerSettings_DisableCustomFoldersInTributeInventoriesLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_DisableCustomFoldersInTributeInventoriesTooltip}"/>
 
                                             <cctl:CheckBoxAndTextBlock Grid.Row="2" Grid.Column="0" Margin="5,5,5,5" IsChecked="{Binding OverrideTributeCharacterExpirationSeconds, Mode=TwoWay}" Text="{DynamicResource ServerSettings_OverrideTributeCharacterExpirationSecondsLabel}" HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_OverrideTributeCharacterExpirationSecondsTooltip}"/>
                                             <cctl:AnnotatedSlider Grid.Row="2" Grid.Column="1" Margin="1" IsEnabled="{Binding OverrideTributeCharacterExpirationSeconds}" Value="{Binding TributeCharacterExpirationSeconds, Converter={StaticResource TributeExpirationConverter}}" Suffix="{DynamicResource SliderUnits_Minutes}" Minimum="1" Maximum="20000" SmallChange="1" LargeChange="5" TickFrequency="60" LabelRelativeWidth="Auto" ToolTip="{DynamicResource ServerSettings_OverrideTributeCharacterExpirationSecondsTooltip}" />
@@ -2382,7 +2382,7 @@
                                     <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="0" Margin="5" IsChecked="{Binding EnableProximityChat, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnableProximityChatLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnableProximityChatTooltip}"/>
 
                                     <cctl:CheckBoxAndTextBlock Grid.Row="0" Grid.Column="1" Margin="5,5,5,0" IsChecked="{Binding EnablePlayerLeaveNotifications, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnablePlayerLeftLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnablePlayerLeftTooltip}"/>
-                                    <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="1" Margin="5" IsChecked="{Binding EnablePlayerJoinedNotifications, Mode=TwoWay}" Text="{DynamicResource ServerSettings_EnablePlayerJoinedLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnablePlayerJoinedTooltip}"/>
+                                    <cctl:CheckBoxAndTextBlock Grid.Row="1" Grid.Column="1" Margin="5" IsChecked="{Binding EnablePlayerJoinedNotifications, Mode=TwoWay, Converter={StaticResource InvertBooleanConverter}}" Text="{DynamicResource ServerSettings_EnablePlayerJoinedLabel}" HorizontalAlignment="Left" ToolTip="{DynamicResource ServerSettings_EnablePlayerJoinedTooltip}"/>
                                 </Grid>
                             </Grid>
                         </Expander>