Merge pull request #10 from rr222cy/0.3.2

0.3.2
roos-robert · Mar 6, 2021 · 3547fea · 3547fea
2 parents 0effc6d + 4f84bc8
commit 3547fea
Show file tree

Hide file tree

Showing 17 changed files with 100 additions and 80 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ ValheimPlus Manager makes the installation and configuration of ValheimPlus on W
 - Backup your game client data and server client data
 ## Roadmap
 - Server list manager, join servers from the Manager
-- Backup your configuration files
+- Backup your configuration files (to send to friends for example)
 - Swapping between different config files
 - Management of server admins
 - Uninstall ValheimPlus from game client/server client

diff --git a/ValheimPlusManagerTests/Data/SettingsDALTests.cs b/ValheimPlusManagerTests/Data/SettingsDALTests.cs
@@ -1,10 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using ValheimPlusManager.Data;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace ValheimPlusManager.Data.Tests
 {

diff --git a/ValheimPlusManagerTests/MainWindowTests.cs b/ValheimPlusManagerTests/MainWindowTests.cs
@@ -1,10 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using ValheimPlusManager;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using ValheimPlusManager.Models;
 
 namespace ValheimPlusManager.Tests

diff --git a/ValheimPlusManagerTests/SupportClasses/FileManagerTests.cs b/ValheimPlusManagerTests/SupportClasses/FileManagerTests.cs
@@ -1,10 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using ValheimPlusManager.SupportClasses;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace ValheimPlusManager.SupportClasses.Tests
 {
@@ -15,7 +10,7 @@ public class FileManagerTests
         public void CopyFromToServerBackupTest()
         {
             bool success = FileManager.CopyFromTo(String.Format("C:/Users/{0}/AppData/LocalLow/IronGate", Environment.UserName), String.Format("C:/ValheimServerBackups/{0}", DateTime.Now.ToString("yyyy-MM-dd-HHmm")));
-            
+
             Assert.IsTrue(success);
         }
 

diff --git a/ValheimPlusManagerTests/SupportClasses/UpdateManagerTests.cs b/ValheimPlusManagerTests/SupportClasses/UpdateManagerTests.cs
@@ -1,9 +1,4 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using ValheimPlusManager.SupportClasses;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace ValheimPlusManager.SupportClasses.Tests

diff --git a/ValheimPlusManagerTests/SupportClasses/ValidationManagerTests.cs b/ValheimPlusManagerTests/SupportClasses/ValidationManagerTests.cs
@@ -1,12 +1,6 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using ValheimPlusManager.SupportClasses;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using ValheimPlusManager.Models;
 using ValheimPlusManager.Data;
+using ValheimPlusManager.Models;
 
 namespace ValheimPlusManager.SupportClasses.Tests
 {

diff --git a/ValheimPlusManagerWPF/ConfigurationManagerWindow.xaml b/ValheimPlusManagerWPF/ConfigurationManagerWindow.xaml
@@ -29,7 +29,7 @@
             <ColumnDefinition Width="275" />
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
-        
+
         <Grid Grid.Row="0" Grid.Column="0">
             <Label Content="Settings to enable" Style="{StaticResource MaterialDesignLabel}" FontSize="24" Margin="10,1,0,0"/>
             <ListView Grid.Column="0" Grid.ColumnSpan="2">
@@ -203,6 +203,7 @@
                         <TextBox PreviewTextInput="IntValidationTextBox" Width="450" Text="{Binding extraPlayerCountNearby}" materialDesign:HintAssist.Hint="Adds additional players to the difficulty calculation in multiplayer unrelated to the actual amount" Style="{StaticResource MaterialDesignFloatingHintTextBox}" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,170,0,0" />
                         <TextBox PreviewTextInput="IntValidationTextBox" Width="450" Text="{Binding setFixedPlayerCountTo}" materialDesign:HintAssist.Hint="Sets the nearby player count always to this value + extraPlayerCountNearby" Style="{StaticResource MaterialDesignFloatingHintTextBox}" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,220,0,0" />
                         <TextBox PreviewTextInput="IntValidationTextBox" Width="450" Text="{Binding difficultyScaleRange}" materialDesign:HintAssist.Hint="The range in meters at which other players count towards nearby players for the difficulty scale" Style="{StaticResource MaterialDesignFloatingHintTextBox}" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,270,0,0" />
+                        <CheckBox Content="Disable all portals" IsChecked="{Binding disablePortals}" HorizontalAlignment="Left" Margin="10,330,0,0" VerticalAlignment="Top"/>
                     </Grid>
                 </TabItem>
                 <TabItem IsEnabled="{Binding hotkeysSettingsEnabled}" Header="Hotkeys">
@@ -235,6 +236,7 @@
                         <TextBox PreviewTextInput="FloatValidationTextBox" Width="350" Text="{Binding copperOreGathering}" materialDesign:HintAssist.Hint="Copper ore" Style="{StaticResource MaterialDesignFloatingHintTextBox}" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,420,0,0" />
                         <TextBox PreviewTextInput="FloatValidationTextBox" Width="350" Text="{Binding silverOreGathering}" materialDesign:HintAssist.Hint="Silver ore" Style="{StaticResource MaterialDesignFloatingHintTextBox}" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,470,0,0" />
                         <TextBox PreviewTextInput="FloatValidationTextBox" Width="350" Text="{Binding chitinGathering}" materialDesign:HintAssist.Hint="Chitin" Style="{StaticResource MaterialDesignFloatingHintTextBox}" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,520,0,0" />
+                        <TextBox PreviewTextInput="FloatValidationTextBox" Width="530" Text="{Binding dropChanceGathering}" materialDesign:HintAssist.Hint="Modify the chance to drop resources from resource nodes affected by this category" Style="{StaticResource MaterialDesignFloatingHintTextBox}" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,570,0,0" />
                     </Grid>
                 </TabItem>
                 <TabItem IsEnabled="{Binding kilnSettingsEnabled}" Header="Kiln">
@@ -264,6 +266,7 @@
                         <TextBox PreviewTextInput="IntValidationTextBox" Width="382" Text="{Binding baseAutoPickUpRange}" materialDesign:HintAssist.Hint="Increase auto pickup range of all items" Style="{StaticResource MaterialDesignFloatingHintTextBox}" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,170,0,0" />
                         <TextBox PreviewTextInput="IntValidationTextBox" Width="382" Text="{Binding baseUnarmedDamage}" materialDesign:HintAssist.Hint="The base unarmed damage multiplied by your skill level" Style="{StaticResource MaterialDesignFloatingHintTextBox}" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,220,0,0" />
                         <CheckBox Content="Disable all types of camera shake" IsChecked="{Binding disableCameraShake}" HorizontalAlignment="Left" Margin="10,280,0,0" VerticalAlignment="Top"/>
+                        <CheckBox Content="Do not permit to place a crop within the grow radius of another crop" IsChecked="{Binding cropNotifier}" HorizontalAlignment="Left" Margin="10,320,0,0" VerticalAlignment="Top"/>
                     </Grid>
                 </TabItem>
                 <TabItem IsEnabled="{Binding serverSettingsEnabled}" Header="Server">
@@ -339,7 +342,8 @@
                         <TextBox PreviewTextInput="IntValidationTextBox" Width="382" Text="{Binding stone}" materialDesign:HintAssist.Hint="Stone" Style="{StaticResource MaterialDesignFloatingHintTextBox}" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,140,0,0" />
                         <TextBox PreviewTextInput="IntValidationTextBox" Width="382" Text="{Binding iron}" materialDesign:HintAssist.Hint="Iron" Style="{StaticResource MaterialDesignFloatingHintTextBox}" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,190,0,0" />
                         <TextBox PreviewTextInput="IntValidationTextBox" Width="382" Text="{Binding hardWood}" materialDesign:HintAssist.Hint="Hardwood" Style="{StaticResource MaterialDesignFloatingHintTextBox}" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,240,0,0" />
-                        <CheckBox Content="Disables the entire structural integrity system and allows for placement in free air, does not prevent building damage." IsChecked="{Binding disableStructuralIntegrity}" HorizontalAlignment="Left" Margin="10,300,0,0" VerticalAlignment="Top"/>
+                        <CheckBox Content="Disables the entire structural integrity system and allows for placement in free air, does not prevent building damage" IsChecked="{Binding disableStructuralIntegrity}" HorizontalAlignment="Left" Margin="10,300,0,0" VerticalAlignment="Top"/>
+                        <CheckBox Content="Disables any damage from anything to all player built structures" IsChecked="{Binding disableDamageToPlayerStructures}" HorizontalAlignment="Left" Margin="10,340,0,0" VerticalAlignment="Top"/>
                     </Grid>
                 </TabItem>
                 <TabItem IsEnabled="{Binding experienceSettingsEnabled}" Header="Experience">
@@ -383,7 +387,7 @@
                 </TabItem>
             </TabControl>
         </Grid>
-        
+
         <Grid Grid.Row="1" Grid.ColumnSpan="2">
             <Border BorderThickness="0,1,0,0" BorderBrush="#FFE5E5E5" Grid.Row="1" Grid.ColumnSpan="2" />
             <Button x:Name="saveChangesButton" Grid.Row="1" Grid.Column="1" Content="Save all changes" Margin="13" HorizontalAlignment="Right" VerticalAlignment="Bottom" Click="saveChangesButton_Click"/>

diff --git a/ValheimPlusManagerWPF/ConfigurationManagerWindow.xaml.cs b/ValheimPlusManagerWPF/ConfigurationManagerWindow.xaml.cs
@@ -3,8 +3,6 @@
 using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Threading;
 using ValheimPlusManager.Models;
 using ValheimPlusManager.SupportClasses;
 

diff --git a/ValheimPlusManagerWPF/MainPage.xaml.cs b/ValheimPlusManagerWPF/MainPage.xaml.cs
@@ -1,20 +1,10 @@
 using MaterialDesignThemes.Wpf;
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using ValheimPlusManager.Data;
 using ValheimPlusManager.Models;
 using ValheimPlusManager.SupportClasses;
@@ -46,12 +36,8 @@ public void FetchSettings()
                 // Fetching path settings
                 Settings = SettingsDAL.GetSettings();
 
-                //System.Diagnostics.FileVersionInfo fvo =
-                //System.Diagnostics.FileVersionInfo.GetVersionInfo(String.Format("{0}BepInEx/plugins/ValheimPlus.dll", Settings.ClientInstallationPath));
-
-                //string versionNumber = fvo.FileVersion;
-
-                //statusLabel.Content = versionNumber;
+                // Fetch current versions and update settings if needed
+                UpdateManager.CheckCurrentVersion(Settings);
 
                 // Checking paths and installation status
                 UISettingsInit();
@@ -118,6 +104,7 @@ private async void installClientUpdateButton_Click(object sender, RoutedEventArg
                     statusSnackBar.MessageQueue.Enqueue("Success! Game client updated to latest version");
                     installClientUpdateButton.Content = "Update installed!";
                     installClientUpdateButton.IsEnabled = false;
+                    statusLabel.Visibility = Visibility.Hidden;
                 }
             }
         }
@@ -250,6 +237,7 @@ private async void installServerUpdateButton_Click(object sender, RoutedEventArg
                     statusSnackBar.MessageQueue.Enqueue("Success! Server client updated to latest version");
                     installServerUpdateButton.Content = "Update installed!";
                     installServerUpdateButton.IsEnabled = false;
+                    statusLabel.Visibility = Visibility.Hidden;
                 }
             }
         }

diff --git a/ValheimPlusManagerWPF/MainWindow.xaml b/ValheimPlusManagerWPF/MainWindow.xaml
@@ -59,7 +59,7 @@
                     <materialDesign:Card Padding="16" Margin="16">
                         <Grid>
                             <TextBlock Style="{DynamicResource MaterialDesignHeadline4TextBlock}" Text="ValheimPlus Manager" FontWeight="Normal"/>
-                            <TextBlock Style="{DynamicResource MaterialDesignCaptionTextBlock}" Text="Version 0.3.1" FontWeight="Normal" Margin="3,40,0,0"/>
+                            <TextBlock Style="{DynamicResource MaterialDesignCaptionTextBlock}" Text="Version 0.3.2" FontWeight="Normal" Margin="3,40,0,0"/>
                         </Grid>
                     </materialDesign:Card>
                 </StackPanel>

diff --git a/ValheimPlusManagerWPF/MainWindow.xaml.cs b/ValheimPlusManagerWPF/MainWindow.xaml.cs
@@ -1,12 +1,5 @@
 using MaterialDesignThemes.Wpf;
-using System;
-using System.Diagnostics;
-using System.IO;
 using System.Windows;
-using System.Windows.Media;
-using ValheimPlusManager.Data;
-using ValheimPlusManager.Models;
-using ValheimPlusManager.SupportClasses;
 
 namespace ValheimPlusManager
 {

diff --git a/ValheimPlusManagerWPF/Models/ValheimPlusConf.cs b/ValheimPlusManagerWPF/Models/ValheimPlusConf.cs
@@ -95,6 +95,7 @@ public class ValheimPlusConf
         public int setFixedPlayerCountTo { get; set; } = 0;
         //public float autoSaveInterval { get; set; } = 1200;
         public int difficultyScaleRange { get; set; } = 200;
+        public bool disablePortals { get; set; } = false;
 
         // Hotkeys
         public bool hotkeysSettingsEnabled { get; set; } = false;
@@ -121,6 +122,7 @@ public class ValheimPlusConf
         public float copperOreGathering { get; set; } = 0;
         public float silverOreGathering { get; set; } = 0;
         public float chitinGathering { get; set; } = 0;
+        public float dropChanceGathering { get; set; } = 0;
 
         // Kiln
         public bool kilnSettingsEnabled { get; set; } = false;
@@ -144,6 +146,7 @@ public class ValheimPlusConf
         public float baseAutoPickUpRange { get; set; } = 2;
         public bool disableCameraShake { get; set; } = false;
         public float baseUnarmedDamage { get; set; } = 0;
+        public bool cropNotifier { get; set; } = false;
 
         // Server
         public bool serverSettingsEnabled { get; set; } = false;
@@ -201,6 +204,7 @@ public class ValheimPlusConf
         public float iron { get; set; } = 0;
         public float hardWood { get; set; } = 0;
         public bool disableStructuralIntegrity { get; set; } = false;
+        public bool disableDamageToPlayerStructures { get; set; } = false;
 
         // Experience
         public bool experienceSettingsEnabled { get; set; } = false;

diff --git a/ValheimPlusManagerWPF/ServerListManagerPage.xaml.cs b/ValheimPlusManagerWPF/ServerListManagerPage.xaml.cs
@@ -1,17 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows.Controls;
 
 namespace ValheimPlusManager
 {