Combined changes

.gitignore

@@ -337,4 +337,5 @@ ASALocalRun/
 .localhistory/
 
 # BeatPulse healthcheck temp database
-healthchecksdb
+healthchecksdb
+Loki/SharedItemData.old1.csv

Loki/Beard.cs

@@ -5,20 +5,13 @@ namespace Loki
 {
     public readonly struct Beard
     {
-        private static readonly Beard[] SensibleBeards = 
-        {
-            new Beard(Loki.Properties.Resources.B_No_beard, "BeardNone"),
-            new Beard(Loki.Properties.Resources.B_Braided_2, "Beard5"),
-            new Beard(Loki.Properties.Resources.B_Braided_2, "Beard6"),
-            new Beard(Loki.Properties.Resources.B_Braided_3, "Beard9"),
-            new Beard(Loki.Properties.Resources.B_Braided_4, "Beard10"),
-            new Beard(Loki.Properties.Resources.B_Long_1, "Beard1"),
-            new Beard(Loki.Properties.Resources.B_Long_2, "Beard2"),
-            new Beard(Loki.Properties.Resources.B_Short_1, "Beard3"),
-            new Beard(Loki.Properties.Resources.B_Short_2, "Beard4"),
-            new Beard(Loki.Properties.Resources.B_Short_3, "Beard7"),
-            new Beard(Loki.Properties.Resources.B_Thick_1, "Beard8"),
-        };
+        private static readonly IEnumerable<Beard> SensibleBeards = 
+            ItemDb.AllItems
+                .Where(i => 
+                    i.ItemType == ItemType.Customization 
+                    && i.ItemName.ToLower().Contains("beard"))
+                .Select(i => 
+                    new Beard(i.DisplayName, i.ItemName));
 
         private static readonly IEnumerable<Beard> SillyBeards = 
             ItemDb.AllItems.Where(i => i.ItemType == ItemType.Trophy)

Loki/Biome.cs

@@ -12,6 +12,6 @@ public enum Biome
         DeepNorth = 64,
         Ocean = 256,
         Mistlands = 512,
-        BiomesMax = 513,
+        All = 895,
     }
 }

Loki/BoolToLocalizedTextConverter.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Loki
+{
+    public class BoolToLocalizedTextConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+            {
+                return null;
+            }
+
+            if (value is bool boolValue)
+            {
+                var localizedText = boolValue  
+                    ? Loki.Properties.Resources.BoolTrueText 
+                    : Loki.Properties.Resources.BoolFalseText;
+                return localizedText ?? value.ToString();
+            }
+
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

Loki/CharacterFile.cs

@@ -50,9 +50,20 @@ public string FilePath
 
         public static CharacterFile[] LoadCharacterFiles()
         {
-            string localLowPath = Shell32.GetKnownFolderPath(Shell32.LocalLowId);
-            string charactersPath = Path.Join(localLowPath, @"IronGate\Valheim\characters");
-            return Directory.EnumerateFiles(charactersPath, "*.fch").Select(FromPath).ToArray();
+
+            // Explicit load of a character file            
+            if (!string.IsNullOrEmpty(MainWindow.explicitlyLoadThisFile))
+            {
+                // File to open given by command line arg (ie "open with -> Loki")
+                return new CharacterFile[] { FromPath(MainWindow.explicitlyLoadThisFile) };
+            }
+            else
+            {
+                // Standard behaviour: open all character files in Valheim local save directory
+                string localLowPath = Shell32.GetKnownFolderPath(Shell32.LocalLowId);
+                string charactersPath = Path.Join(localLowPath, @"IronGate\Valheim\characters_local");
+                return Directory.EnumerateFiles(charactersPath, "*.fch").Select(FromPath).ToArray();
+            }
         }
 
         public static CharacterFile FromPath(string characterFilePath)

Loki/Commands.cs

@@ -12,5 +12,14 @@ public static class Commands
 
         public static RoutedUICommand RestoreCharacter =
             new RoutedUICommand("Restore", nameof(RestoreCharacter), typeof(Commands));
+
+        public static RoutedUICommand ModifyAllSkills =
+            new RoutedUICommand("ModifySkills", nameof(ModifyAllSkills), typeof(Commands));
+
+        public static RoutedUICommand RepairInventoryItems = 
+            new RoutedUICommand("RepairItems", nameof(RepairInventoryItems), typeof(Commands));
+
+        public static RoutedUICommand FillInventoryStacks =
+            new RoutedUICommand("FillStacks", nameof(RepairInventoryItems), typeof(Commands));
     }
 }

Loki/EnumConverter.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+using System.Windows;
+
+namespace Loki
+{
+    public class EnumConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+            {
+                return null;
+            }
+
+            if (targetType.IsEnum)
+            {
+                // int -> Enum
+                return Enum.ToObject(targetType, value);
+            }
+
+            if (value.GetType().IsEnum)
+            {
+                // Enum -> int
+                return System.Convert.ChangeType(value, Enum.GetUnderlyingType(value.GetType()));
+            }
+
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            // Same conversion for both directions
+            return Convert(value, targetType, parameter, culture);
+        }
+    }
+}

Loki/Hair.cs

@@ -5,25 +5,13 @@ namespace Loki
 {
     public readonly struct Hair
     {
-        private static readonly Hair[] SensibleHairs =
-        {
-            new Hair(Loki.Properties.Resources.No_hair, "HairNone"),
-            new Hair(Loki.Properties.Resources.Braided_1, "Hair3"),
-            new Hair(Loki.Properties.Resources.Braided_2, "Hair11"),
-            new Hair(Loki.Properties.Resources.Braided_3, "Hair12"),
-            new Hair(Loki.Properties.Resources.Braided_4, "Hair6"),
-            new Hair(Loki.Properties.Resources.Long_1, "Hair1"),
-            new Hair(Loki.Properties.Resources.Ponytail_1, "Hair2"),
-            new Hair(Loki.Properties.Resources.Ponytail_2, "Hair4"),
-            new Hair(Loki.Properties.Resources.Ponytail_3, "Hair7"),
-            new Hair(Loki.Properties.Resources.Ponytail_4, "Hair5"),
-            new Hair(Loki.Properties.Resources.Short_1, "Hair8"),
-            new Hair(Loki.Properties.Resources.Short_2, "Hair13"),
-            new Hair(Loki.Properties.Resources.Side_Swept_1, "Hair9"),
-            new Hair(Loki.Properties.Resources.Side_Swept_2, "Hair10"),
-            new Hair(Loki.Properties.Resources.Side_Swept_3, "Hair14"),
-            new Hair(Loki.Properties.Resources.Blob_hair, "TrophyBlob"),
-        };
+        private static readonly IEnumerable<Hair> SensibleHairs =
+            ItemDb.AllItems
+                .Where(i =>
+                    i.ItemType == ItemType.Customization
+                    && i.ItemName.ToLower().Contains("hair"))
+                .Select(i =>
+                    new Hair(i.DisplayName, i.ItemName));
 
         private static readonly IEnumerable<Hair> SillyHairs =
             ItemDb.AllItems.Where(i => i.ItemType == ItemType.Trophy)

Loki/InventoryListItem.cs

@@ -43,13 +43,17 @@ private static InventoryListItem CreateListItem(SharedItemData itemData)
                 ItemType.Legs => Loki.Properties.Resources.Legs,
                 ItemType.Hands => Loki.Properties.Resources.Hands,
                 ItemType.Trophy => Loki.Properties.Resources.Trophy,
-                ItemType.TwoHandedWeapon => Loki.Properties.Resources.Trophy,
+                ItemType.TwoHandedWeapon => Loki.Properties.Resources.Two_Handed_Weapon,
                 ItemType.Torch => Loki.Properties.Resources.Torch,
                 ItemType.Misc => Loki.Properties.Resources.Miscellaneous,
                 ItemType.Shoulder => Loki.Properties.Resources.Shoulder,
                 ItemType.Utility => Loki.Properties.Resources.Utility,
                 ItemType.Tool => Loki.Properties.Resources.Tool,
                 ItemType.AttachAtgeir => Loki.Properties.Resources.Attach_Atgeir,
+                ItemType.Fish => Loki.Properties.Resources.Fish,
+                ItemType.TwoHandedWeaponLeft => Loki.Properties.Resources.Two_Handed_Weapon_Left,
+                ItemType.AmmoNonEquipable => Loki.Properties.Resources.Ammo_Non_Equipable,
+                ItemType.Trinket => Loki.Properties.Resources.Trinket,
                 _ => Loki.Properties.Resources.Unknown,
             };
             return new InventoryListItem(displayName, category, itemData);

Loki/InventorySlotEditor.xaml

@@ -167,7 +167,7 @@
     </UserControl.Resources>
 
 
-    <Border CornerRadius="4" x:Name="LayoutRoot" AllowDrop="True" Drop="BorderDrop">
+    <Border CornerRadius="4" x:Name="LayoutRoot" AllowDrop="True" Drop="BorderDrop" MouseMove="BorderMouseMove">
         <Border.Style>
             <Style TargetType="Border">
                 <Setter Property="Background" Value="DarkGray"/>

Loki/InventorySlotEditor.xaml.cs

@@ -22,19 +22,48 @@ private void BorderDrop(object sender, DragEventArgs e)
         {
             if (e.Data.GetData(typeof(SharedItemData)) is SharedItemData itemData)
             {
+                // drop from item picker
                 if (this.DataContext is InventorySlot slot)
                 {
                     var customData = new List<(string, string)>();
                     slot.Item = new Item(itemData.ItemName, itemData.MaxStack, (float)itemData.MaxDurability, slot.Position,
-                        false, 1, 0, MainWindow.selectedPlayerProfile.PlayerId, MainWindow.selectedPlayerProfile.PlayerName, customData);
+                        false, 1, 0, MainWindow.selectedPlayerProfile.PlayerId, MainWindow.selectedPlayerProfile.PlayerName, customData, 0, false);
+                }
+            }
+            else if (e.Data.GetData(typeof(InventorySlot)) is InventorySlot sourceSlot)
+            {
+                // drop from inventory slot
+                if (this.DataContext is InventorySlot slot && sourceSlot != slot)
+                {
+                    var targetSlotItem = slot.Item;
+                    slot.Item = sourceSlot.Item;
+                    sourceSlot.Item = targetSlotItem;
+                }
+            }
+        }
+
+        private void BorderMouseMove(object sender, MouseEventArgs e)
+        {
+            if (e.Source is TextBox)
+            {
+                // TextBox has its own Drag&Drop functionality and would raise an InvalidOperationException
+                return;
+            }
+
+            if (sender is FrameworkElement element && e.LeftButton == MouseButtonState.Pressed)
+            {
+                if (element.DataContext is InventorySlot slot && slot.Item != null)
+                {
+                    var data = new DataObject(slot);
+                    DragDrop.DoDragDrop(element, data, DragDropEffects.Move);
                 }
             }
         }
 
         private void StackEditPreviewMouseDown(object sender, MouseButtonEventArgs e)
         {
-            if (sender is TextBox {IsKeyboardFocusWithin: false} txtStack) 
-            {  
+            if (sender is TextBox { IsKeyboardFocusWithin: false } txtStack)
+            {
                 txtStack.SelectAll();
                 txtStack.Focus();
                 e.Handled = true;

Loki/Item.cs

@@ -77,10 +77,10 @@ public string CrafterName {
 
         public bool HasCrafterTag => CrafterId != 0;
 
-        public double MaxDurability => SharedData.MaxDurability + Math.Max(0, Quality - 1) * SharedData.DurabilityPerLevel;
+        public double MaxDurability => SharedData == null ? 0d : SharedData.MaxDurability + Math.Max(0, Quality - 1) * SharedData.DurabilityPerLevel;
 
 
-        public Item(string name, int stack, float durability, Vector2i pos, bool equiped, int quality, int variant, long crafterId, string crafterName, List<(string, string)> itemData)
+        public Item(string name, int stack, float durability, Vector2i pos, bool equiped, int quality, int variant, long crafterId, string crafterName, List<(string, string)> itemData, int worldLevel, bool pickedUp)
         {
             Name = name;
             Stack = stack;
@@ -99,12 +99,15 @@ public Item(string name, int stack, float durability, Vector2i pos, bool equiped
             }
 
             ItemData = itemData;
-
+            WorldLevel = worldLevel;
+            PickedUp = pickedUp;
         }
 
         [CanBeNull] // Can be null if the item is unrecognised (very new update not accounted for etc.)
         public SharedItemData SharedData { get; }
         public List<(string, string)> ItemData { get; }
+        public int WorldLevel { get; }
+        public bool PickedUp { get; }
 
         public bool HasQualityLevels => SharedData?.MaxQuality > 1;
 

Loki/Loki.csproj

@@ -30,6 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="CsvHelper" Version="30.0.1" />
     <PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.103" />
     <PackageReference Include="GitVersion.MsBuild" Version="5.11.1">
       <PrivateAssets>all</PrivateAssets>
@@ -73,4 +74,10 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="SharedItemData.csv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>