(1.6.10) KillFeed missing info fix

MxValheim/EventSystem/Experience.cs

@@ -20,12 +20,14 @@ namespace MxValheim.EventSystem
             Dictionary<int, float> biomeBase = new Dictionary<int, float>()
             {
                 { 1, 1.0f },
-                { 2, 1.5f },
+                { 8, 1.5f },
-                { 8, 2.0f },
+                { 2, 2.0f },
                 { 4, 2.5f },
                 { 16, 3.0f },
-                { 256, 3.5f },
+                { 512, 4.0f },
-                { 32, 4.0f },
+                { 64, 2.5f },
+                { 32, 5.0f },
+                { 256, 1.0f },
             };
 
             float rewardExpMulti = biomeBase[((int)biome)];

MxValheim/EventSystem/Patch.cs

@@ -1,9 +1,11 @@
-using HarmonyLib;
+using BepInEx.Bootstrap;
-using Splatform;
+using EpicLoot;
+using HarmonyLib;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Controls;
@@ -35,7 +37,30 @@ namespace MxValheim.EventSystem
             {
                 if (ZRoutedRpc.instance != null)
                 {
-                    ZRoutedRpc.instance.InvokeRoutedRPC(ZRoutedRpc.Everybody, "RPC_MxKillMsg", "", "", "", "", -1);
+                    //ZRoutedRpc.instance.InvokeRoutedRPC(ZRoutedRpc.Everybody, "RPC_MxKillMsg", "", "", "", "", -1);
+                }
+            }
+
+            static void Postfix(RandEventSystem __instance)
+            {
+                RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent();
+                if (activeEvent != null)
+                {
+                    activeEvent.m_eventRange = 200f;
+                }
+            }
+        }
+
+        [HarmonyPatch(typeof(RandEventSystem), nameof(RandEventSystem.FixedUpdate))]
+        public static class EventRadiusPatch
+        {
+            static void Postfix(RandEventSystem __instance)
+            {
+                RandomEvent currentEvent = __instance.GetCurrentRandomEvent();
+
+                if (currentEvent != null)
+                {
+                    currentEvent.m_eventRange = 200f;
                 }
             }
         }
@@ -45,8 +70,11 @@ namespace MxValheim.EventSystem
         {
             static void Prefix(RandEventSystem __instance)
             {
-                __instance.m_eventIntervalMin = 10f;
+                if (MxValheimMod.Config_DebugRandomEventInterval.Value)
-                __instance.m_eventChance = 100f;
+                {
+                    __instance.m_eventIntervalMin = 10f;
+                    __instance.m_eventChance = 100f;
+                }          
             }
         }
 
@@ -63,31 +91,38 @@ namespace MxValheim.EventSystem
                     ZPackage pkg = new ZPackage();
                     pkg.Write(currentRaid.m_name);
                     pkg.Write($"{currentRaid.m_pos}");
-                    Debug.Log($"RPC_SetEvent: {currentRaid.m_pos}");
                     kill = Watcher.eventKill;
                     ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerRemoveEvent", pkg);
 
                     Vector3 playerPos = Player.m_localPlayer.transform.position;
                     float distance = Vector3.Distance(playerPos, currentRaid.m_pos);
 
-                    if (distance <= 96f)
+                    if (distance <= 200f)
                     {
                         Heightmap.Biome currentBiome = EnvMan.instance.GetCurrentBiome();
                         Reward.GiveItemStatic("Coins", Reward.CalculateRewardCoin(Profiles.serverLevel, currentBiome, kill));
                         System.Random rand = new System.Random();
                         Reward.GiveItemStatic("Feathers", rand.Next(5, 20));
-                        if (rand.Next(100) < 50)
+                        float dayPercent = ((float)EnvMan.instance.GetDay() / 10);
+                        if (rand.Next(100) < (50+dayPercent))
                         {
                             Reward.GiveItemRandom(Reward.GetRewardPrefab(Profiles.serverLevel, "food"), 1);
                         }
-                        if (rand.Next(100) < 25)
+                        if (rand.Next(100) < (25+dayPercent))
                         {
                             Reward.GiveItemRandom(Reward.GetRewardPrefab(Profiles.serverLevel, "heal"), 1);
                         }
-                        if (rand.Next(100) < 10)
+                        if (rand.Next(100) < (10+dayPercent))
                         {
-                            Reward.GiveItemRandom(Reward.GetRewardPrefab(Profiles.serverLevel, "metal"), rand.Next(5, 20));
+                            Reward.GiveItemRandom(Reward.GetRewardPrefab(Profiles.serverLevel, "metal"), rand.Next(5, (20+Profiles.serverLevel)));
                         }
+                        if (Chainloader.PluginInfos.ContainsKey("randyknapp.mods.epicloot"))
+                        {
+                            Reward.GiveEpicLootDust();
+                            Reward.GiveEpicLootShard();
+                            Reward.GiveEpicLootEssence();
+                            Reward.GiveEpicLootRune();
+                        }                    
                     }
                 }
             }
@@ -113,7 +148,7 @@ namespace MxValheim.EventSystem
                 if (RandEventSystem.instance != null && RandEventSystem.instance.GetActiveEvent() != null)
                 {
                     __instance.m_eventName.text = "";
-                }
+                }                
             }
         }
 
@@ -135,35 +170,54 @@ namespace MxValheim.EventSystem
                         isEventCreature = Traverse.Create(mai).Field<bool>("m_eventCreature").Value;
                     }
 
-                    if (!isEventCreature) return;
+                    if (isEventCreature)
-
-                    RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent();
-                    if (activeEvent != null)
                     {
-                        ZPackage pkg = new ZPackage();
+                        RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent();
-                        pkg.Write(activeEvent.m_name);
+                        if (activeEvent != null)
-                        pkg.Write($"{activeEvent.m_pos}");
-                        ActiveEventData entry = MxValheimMod.ActiveEvents.Find(e => e.Position == activeEvent.m_pos.ToString());
-                        if (entry == null)
-                        {                          
-                            ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerRegisterEvent", pkg);
-                        } else
                         {
-                            ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerSetEventKill", pkg);
+                            ZPackage pkg = new ZPackage();
+                            pkg.Write(activeEvent.m_name);
+                            pkg.Write($"{activeEvent.m_pos}");
+                            ActiveEventData entry = MxValheimMod.ActiveEvents.Find(e => e.Position == activeEvent.m_pos.ToString());
+                            if (entry == null)
+                            {
+                                ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerRegisterEvent", pkg);
+                            }
+                            else
+                            {
+                                ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerSetEventKill", pkg);
+                            }
+                            ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerGetEventKill", pkg);
                         }
-                        ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerGetEventKill", pkg);
-                    }                  
 
-                    int level = __instance.GetLevel();
+                        int level = __instance.GetLevel();
-                    int exp =
+                        int exp =
-                        (level == 1) ? 2 :
+                            (level == 1) ? 4 :
-                        (level == 2) ? 4 :
+                            (level == 2) ? 6 :
-                        (level == 3) ? 6 :
+                            (level == 3) ? 8 :
-                                       6;
+                                           8;
-                    ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_RequestProfile", "Event");
+                        ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_RequestProfile", "Event");
-                    Heightmap.Biome currentBiome = EnvMan.instance.GetCurrentBiome();
+                        Heightmap.Biome currentBiome = EnvMan.instance.GetCurrentBiome();
-                    int expFinal = ((int)(exp * Experience.CalculateExpMultiplier(currentBiome))) + Profiles.serverLevel;
+                        int expFinal = ((int)(exp * Experience.CalculateExpMultiplier(currentBiome))) + Profiles.serverLevel;
-                    Experience.AddExperience(expFinal);
+                        Experience.AddExperience(expFinal);
+                        Color magicPurple = new Color(0.921f, 0.475f, 0.990f);
+                        Vector3 spawnPos = __instance.transform.position + Vector3.up * 1.0f;
+                        DamageText.instance.ShowText(HitData.DamageModifier.Normal, spawnPos, expFinal, true);
+                    } else
+                    {
+                        int level = __instance.GetLevel();
+                        int exp =
+                            (level == 1) ? 2 :
+                            (level == 2) ? 4 :
+                            (level == 3) ? 6 :
+                                           6;
+                        Heightmap.Biome currentBiome = EnvMan.instance.GetCurrentBiome();
+                        int expFinal = ((int)(exp * Experience.CalculateExpMultiplier(currentBiome))) + Profiles.serverLevel;
+                        Experience.AddExperience(expFinal);
+                        Color magicPurple = new Color(0.921f, 0.475f, 0.990f);
+                        Vector3 spawnPos = __instance.transform.position + Vector3.up * 1.0f;
+                        DamageText.instance.ShowText(HitData.DamageModifier.Normal, spawnPos, expFinal, true);
+                    }              
                 }
             }
         }

MxValheim/EventSystem/Reward.cs

@@ -1,14 +1,18 @@
-using System;
+using EpicLoot;
+using HarmonyLib;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Navigation;
 using UnityEngine;
 
 namespace MxValheim.EventSystem
 {
     internal class Reward
-    {
+    {       
         public static int CalculateRewardCoin(int level, Heightmap.Biome biome, int kill)
         {
             Dictionary<int, int> biomeBase = new Dictionary<int, int>()
@@ -34,9 +38,9 @@ namespace MxValheim.EventSystem
             string[] metalList = { "CopperOre", "TinOre", "IronScrap", "SilverOre", "BlackMetalScrap", "FlametalOreNew" };
 
             System.Random rng = new System.Random();
-            int foodTier = rng.Next(1, foodList.Length);
+            int foodTier = rng.Next(0, foodList.Length - 1);
-            int healTier = rng.Next(1, healList.Length);
+            int healTier = rng.Next(0, healList.Length - 1);
-            int metalTier = rng.Next(1, metalList.Length);
+            int metalTier = rng.Next(0, metalList.Length - 1);
 
             if (type == "food") return foodList[foodTier];
             if (type == "heal") return healList[healTier];
@@ -44,6 +48,103 @@ namespace MxValheim.EventSystem
             return "Wood";
         }
 
+        public static void GiveEpicLootDust()
+        {
+            System.Random rand = new System.Random();
+
+            int qty = rand.Next(1, Profiles.serverLevel);
+
+            string[] rarity = GetRarityList(Watcher.eventKill);
+
+            string itemName = $"Dust{rarity[rand.Next(0, rarity.Length - 1)]}";
+
+            Player player = Player.m_localPlayer;
+            if (player == null) return;
+
+            GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
+            if (prefab != null)
+            {
+                GiveItemInWorld(itemName, player, qty);
+            }
+            else
+            {
+                Debug.LogWarning($"Item {itemName} not found in ObjectDB!");
+            }
+        }
+
+        public static void GiveEpicLootShard()
+        {
+            System.Random rand = new System.Random();
+
+            int qty = rand.Next(1, Profiles.serverLevel);
+
+            string[] rarity = GetRarityList(Watcher.eventKill);
+
+            string itemName = $"Shard{rarity[rand.Next(0, rarity.Length - 1)]}";
+
+            Player player = Player.m_localPlayer;
+            if (player == null) return;
+
+            GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
+            if (prefab != null)
+            {
+                GiveItemInWorld(itemName, player, qty);
+            }
+            else
+            {
+                Debug.LogWarning($"Item {itemName} not found in ObjectDB!");
+            }
+        }
+
+        public static void GiveEpicLootEssence()
+        {
+            System.Random rand = new System.Random();
+
+            int qty = rand.Next(1, Profiles.serverLevel);
+
+            string[] rarity = GetRarityList(Watcher.eventKill);
+
+            string itemName = $"Essence{rarity[rand.Next(0, rarity.Length - 1)]}";
+
+            Player player = Player.m_localPlayer;
+            if (player == null) return;
+
+            GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
+            if (prefab != null)
+            {
+                GiveItemInWorld(itemName, player, qty);
+            }
+            else
+            {
+                Debug.LogWarning($"Item {itemName} not found in ObjectDB!");
+            }
+        }
+
+        public static void GiveEpicLootRune()
+        {
+            System.Random rand = new System.Random();
+
+            int qty = rand.Next(1, 2);
+
+            string[] rarity = GetRarityList(Watcher.eventKill);
+
+            string itemName = $"Runestone{rarity[rand.Next(0, rarity.Length - 1)]}";
+
+            Player player = Player.m_localPlayer;
+            if (player == null) return;
+
+            GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
+            if (prefab != null)
+            {
+                GiveItemInWorld(itemName, player, qty);
+                SendRewardMessage(player, prefab, itemName, qty);
+            }
+            else
+            {
+                Debug.LogWarning($"Item {itemName} not found in ObjectDB!");
+            }
+        }
+
         public static void GiveItemRandom(string itemName, int qty)
         {
             System.Random rng = new System.Random();
@@ -54,9 +155,7 @@ namespace MxValheim.EventSystem
             GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
             if (prefab != null)
             {
-                player.GetInventory().AddItem(itemName, qty, 1, 0, 0, "");
+                GiveItemInWorld(itemName, player, qty);
-
-                player.Message(MessageHud.MessageType.TopLeft, $"Received {qty}x {itemName}");
             }
             else
             {
@@ -72,9 +171,11 @@ namespace MxValheim.EventSystem
             GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
             if (prefab != null)
             {
-                player.GetInventory().AddItem(itemName, qty, 1, 0, 0, "");
+                GiveItemInWorld(itemName, player, qty);
-
+                if (itemName == "Coins")
-                player.Message(MessageHud.MessageType.TopLeft, $"Received {qty}x {itemName}");
+                {
+                    SendRewardMessage(player, prefab, itemName, qty);
+                }            
             }
             else
             {
@@ -82,6 +183,69 @@ namespace MxValheim.EventSystem
             }
         }
 
+        public static void GiveItemInWorld(string itemName, Player player, int qty)
+        {
+            GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
+            Vector3 spawnPos = player.transform.position + player.transform.forward + Vector3.up;
 
+            GameObject go = UnityEngine.Object.Instantiate(prefab, spawnPos, Quaternion.identity);
+
+            ItemDrop itemDrop = go.GetComponent<ItemDrop>();
+            if (itemDrop != null)
+            {
+                itemDrop.m_itemData.m_stack = qty;
+                ZNetView nview = go.GetComponent<ZNetView>();
+                if (nview != null && nview.IsValid())
+                {
+                    nview.GetZDO().Set("stack", qty);
+                }
+
+                GameObject vfxPrefab = ZNetScene.instance.GetPrefab("vfx_item_spawn");
+                if (vfxPrefab != null)
+                {
+                    UnityEngine.Object.Instantiate(vfxPrefab, spawnPos, Quaternion.identity);
+                }
+
+                GameObject sfxPrefab = ZNetScene.instance.GetPrefab("sfx_item_spawn");
+                if (sfxPrefab != null)
+                {
+                    UnityEngine.Object.Instantiate(sfxPrefab, spawnPos, Quaternion.identity);
+                }
+            }
+        }
+
+        public static void SendRewardMessage(Player player, GameObject prefab, string itemName, int qty)
+        {
+            if (ZRoutedRpc.instance != null)
+            {
+                ItemDrop item = prefab.GetComponent<ItemDrop>();
+                string nameToken = item.m_itemData.m_shared.m_name;
+                ZRoutedRpc.instance.InvokeRoutedRPC(ZRoutedRpc.Everybody, "RPC_MxKillMsg", Player.m_localPlayer.GetHoverName(), qty.ToString(), Localization.instance.Localize(nameToken), itemName, -2);
+            }
+        }
+
+        public static string[] GetRarityList(int victim)
+        {
+            string[] rarity = { };
+            switch (victim)
+            {
+                case <= 1:
+                    rarity = ["Magic"];
+                    break;
+                case > 1 and < 5:
+                    rarity = ["Rare"];
+                    break;
+                case >= 5 and <= 10:
+                    rarity = ["Rare", "Epic"];
+                    break;
+                case >= 11 and <= 20:
+                    rarity = ["Rare", "Epic", "Legendary"];
+                    break;
+                case >= 21:
+                    rarity = ["Rare", "Epic", "Legendary", "Mythic"];
+                    break;
+            }
+            return rarity;
+        }
     }
 }

MxValheim/EventSystem/Watcher.cs

@@ -51,12 +51,18 @@ namespace MxValheim.EventSystem
         {
             string eventName = pkg.ReadString();
             string eventPos = pkg.ReadString();
-
+            
-            int evindex = MxValheimMod.ActiveEvents.FindIndex(e => e.Position.ToString() == eventPos);
+            int evindex = 0;
-
+            UnityEngine.Debug.Log($"RemoveEvent: ActiveEvents Count = {MxValheimMod.ActiveEvents.Count} ( {eventName} / {eventPos} )");
-            eventKill = 0;
+            if (MxValheimMod.ActiveEvents.Count > 0)
-
+            {
-            MxValheimMod.ActiveEvents.RemoveAt(evindex);          
+                evindex = MxValheimMod.ActiveEvents.FindIndex(e => e.Position.ToString() == eventPos);
+                MxValheimMod.ActiveEvents.RemoveAt(evindex);
+            } else if (MxValheimMod.ActiveEvents.Count <= 0 && eventPos != null)
+            {
+                // That's not the best wai to do it, but until i find a better one, it will prevent an event bugging eternaly.
+                MxValheimMod.ActiveEvents.Clear();
+            }   
         }
     }
 }

MxValheim/KillFeed/Patch.cs

@@ -16,6 +16,8 @@ namespace MxValheim.KillFeed
 {
     public class KillFeed_Patch
     {
+        public static string lastVictimName = "";
+        public static string lastAttackerName = "";
         public static Sprite LoadCustomSprite(string fileName)
         {
             string path = Path.Combine(BepInEx.Paths.PluginPath, "MxValheim", "Icons", fileName);
@@ -74,6 +76,9 @@ namespace MxValheim.KillFeed
             int type = subRemainder % 10;
             // --- DECODING END ---
 
+            // Prevent the spam of multiple "same victim" kill to the feed
+            if (type == 2 && victim == lastVictimName && attacker == lastAttackerName) return;
+
             // Inside OnReceiveKillMsg...
             Sprite biomeSprite = null;
             switch (biomeIndex)
@@ -103,6 +108,7 @@ namespace MxValheim.KillFeed
             string type1Separator = Localization.instance.Localize("$killfeed_format_type1");
             string type2Separator = Localization.instance.Localize("$killfeed_format_type2");
             string type3Separator = Localization.instance.Localize("$killfeed_format_type3");
+            string type4Separator = Localization.instance.Localize("$killfeed_format_type4");
             string eventFormat = $"<color=#00ff06>{victim}</color>";
             string finalMsg = "";
             string attackerFormat = "";
@@ -145,13 +151,7 @@ namespace MxValheim.KillFeed
             finalMsg =
                 (type == 1) ? $"{victimFormat}{type1Separator}{attackerFormat}{distanceFormat}" : // Player Death
                 (type == 2) ? $"{attackerFormat}{type2Separator}{victimFormat}{distanceFormat}" : // Player Killed Something
-                              $"{attackerFormat}{type2Separator}{victimFormat}{distanceFormat}"; // Failsafe
+                              $"{attackerFormat}{type2Separator}{victimFormat}{distanceFormat}"; // Failsafe           
-
-            if (encodedType == -1)
-            {
-                attacker = Player.m_localPlayer?.GetHoverName();
-                finalMsg = $"<color=#00ff06>{attacker.ToUpper()}</color><color=#ffd000>{type3Separator}</color>";
-            }
 
             Sprite weaponIcon = null;
 
@@ -191,7 +191,31 @@ namespace MxValheim.KillFeed
                 borderColor = new Color(0.0196f, 0.250f, 0.00750f);
             }
 
-                lock (_msgQueue)
+            if (encodedType == -1)
+            {
+                finalMsg = $"<color=#32a852>{type3Separator}</color><color=#ffd000>{eventName}</color><color=#32a852>{type4Separator}</color>";
+            }
+
+            if (encodedType == -2)
+            {
+                int qty = Convert.ToInt32(victim);
+                borderColor = new Color(0.0196f, 0.250f, 0.00750f);
+                finalMsg = $"<color=#32a852>{attacker.ToUpper()}{Localization.instance.Localize("$EventSystem_format_reward_Msg_GiveItem")}</color><color=#ffd000>{qty}</color> <color=#32a852>x</color> <color=#ffd000>{victimInternalName}</color><color=#32a852>{Localization.instance.Localize("$EventSystem_format_reward_Msg_GiveItemEnd")}</color>";
+                GameObject itemObj = ObjectDB.instance.GetItemPrefab(weaponPrefab);
+                Sprite itemIcon = null;
+                if (itemObj != null)
+                {
+                    ItemDrop item = itemObj.GetComponent<ItemDrop>();
+                    itemIcon = item?.m_itemData?.m_shared?.m_icons[0];
+                }
+                biomeSprite = LoadCustomSprite("eventsystem_reward.png");
+                weaponIcon = itemIcon;
+            }
+
+            lastVictimName = victim;
+            lastAttackerName = attacker;
+
+            lock (_msgQueue)
             {
                 _msgQueue.Enqueue(finalMsg);
                 _biomeIconQueue.Enqueue(biomeSprite);
@@ -344,6 +368,8 @@ namespace MxValheim.KillFeed
                     }
                     string victimName = __instance.GetHoverName();
 
+                    if (victimName == null) return;
+
                     int type = 0;
                     if (__instance.IsPlayer())
                     { 
@@ -467,8 +493,8 @@ namespace MxValheim.KillFeed
             _weaponIconSlot = iconObj.GetComponent<Image>();
             _weaponIconSlot.preserveAspect = true;
             LayoutElement weaponLayout = iconObj.AddComponent<LayoutElement>();
-            weaponLayout.preferredWidth = 24;
+            weaponLayout.preferredWidth = 32;
-            weaponLayout.preferredHeight = 24;
+            weaponLayout.preferredHeight = 32;
 
             RectTransform iRect = iconObj.GetComponent<RectTransform>();
             iRect.anchorMin = iRect.anchorMax = iRect.pivot = new Vector2(0, 0.5f);
@@ -479,10 +505,8 @@ namespace MxValheim.KillFeed
             GameObject textObj = new GameObject("Text", typeof(RectTransform), typeof(Text));
             textObj.transform.SetParent(panel.transform, false);
             _killText = textObj.GetComponent<Text>();
-            // Important: Text needs to have its "Horizontal Overflow" set to Wrap or Overflow
             _killText.horizontalOverflow = HorizontalWrapMode.Overflow;
 
-            // Attempt to find Valheim's specific font, fallback to Arial if not found
             Font valheimFont = null;
             foreach (Font f in Resources.FindObjectsOfTypeAll<Font>())
             {
@@ -493,7 +517,6 @@ namespace MxValheim.KillFeed
                 }
             }
 
-            // Corrected fallback for older Unity versions used in Valheim
             if (valheimFont == null)
             {
                 valheimFont = Resources.GetBuiltinResource<Font>("Arial.ttf");
@@ -512,8 +535,8 @@ namespace MxValheim.KillFeed
             _victimIconSlot = victimObj.GetComponent<Image>();
             _victimIconSlot.preserveAspect = true;
             LayoutElement victimLayout = victimObj.AddComponent<LayoutElement>();
-            victimLayout.preferredWidth = 24;
+            victimLayout.preferredWidth = 32;
-            victimLayout.preferredHeight = 24;
+            victimLayout.preferredHeight = 32;
 
             RectTransform vRect = victimObj.GetComponent<RectTransform>();
             vRect.anchorMin = vRect.anchorMax = vRect.pivot = new Vector2(1, 0.5f);

MxValheim/MxValheim.cs

@@ -7,7 +7,6 @@ using MxValheim.KillFeed;
 using MxValheim.Patch;
 using MxValheim.Patch.HUD;
 using Newtonsoft.Json;
-using Splatform;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -34,16 +33,10 @@ public class MxValheimMod : BaseUnityPlugin
 
     private const string ModGUID = "ovh.mxdev.mxvalheim";
     private const string ModName = "MxValheim";
-    private const string ModVersion = "1.6.6";
+    private const string ModVersion = "1.6.10";
 
-    public static ConfigEntry<bool> Config_Locked;
+    public static ConfigEntry<bool> Config_DebugRandomEventInterval;
-    public static ConfigEntry<int> Config_OreMultiplier;
-    public static ConfigEntry<float> Config_rangeMultiplier;
     public static ConfigEntry<float> Config_bowDrawSpeedBonusPerLevel;
-    public static ConfigEntry<bool> Config_rainDamage;
-    public static ConfigEntry<float> Config_boatSpeed;
-    public static ConfigEntry<bool> Config_autoDoorCloseEnabled;
-    public static ConfigEntry<float> Config_autoDoorClose;
 
     public static string modPath = Path.Combine(Paths.PluginPath, "MxValheim");
     public static string internalConfigsPath = Path.Combine(modPath, "Configs");
@@ -93,6 +86,8 @@ public class MxValheimMod : BaseUnityPlugin
     public static float _uniqueTimer = 60.0f;
     public static string eventName;
 
+    public static float eventTimer = 0f;
+
     public class ActiveEventData
     {
         public string Name;
@@ -113,19 +108,14 @@ public class MxValheimMod : BaseUnityPlugin
     {
         Instance = this;
 
-        Config_OreMultiplier = Config.Bind("General", "OreMultiplier", 3, "How many items should drop for every 1 ore/scrap found.");
+        Config_DebugRandomEventInterval = Config.Bind("Debug", "DebugRandomEventInterval", false, "Event are triggered really often, to debug my EventSystem logic.");
-        Config_rangeMultiplier = Config.Bind("General", "CraftingRangeMultiplier", 2.0f, "Multiplier for the workbench build/crafting range. Default is 2x.");
         Config_bowDrawSpeedBonusPerLevel = Config.Bind("General", "BowDrawSpeedBonusPercentPerLevel", 1.0f, "Shorten the bow draw speed by this percent for every bow upgrade level.");
-        Config_rainDamage = Config.Bind("General", "RainDamage", true, "Set to true to stop rain damage, false to return to vanilla behavior.");
-        Config_boatSpeed = Config.Bind("General", "BoatSpeedMultiplier", 2.0f, "Your boat/raft will move without wind at a speed multiplied by this value.");
-        Config_autoDoorCloseEnabled = Config.Bind("General", "AutoDoorCloseEnabled", true, "Your doors will auto close if enabled. See AutoDoorCloseTimer for the desired time.");
-        Config_autoDoorClose = Config.Bind("General", "AutoDoorCloseTimer", 5.0f, "Your doors will auto close after the specified timer duration.");
 
         LoadLocalization();
         LoadJsonConfig();
         LoadDoorConfig();
 
-        _doorTimer = MxValheimMod.Config_autoDoorClose.Value;
+        _doorTimer = 2;
 
         //PrefabManager.OnVanillaPrefabsAvailable += InitCustomEnemies;
 
@@ -184,10 +174,13 @@ public class MxValheimMod : BaseUnityPlugin
                 ZRoutedRpc.instance.Register<string, string, string, string, int>("RPC_MxKillMsg",
                     new RoutedMethod<string, string, string, string, int>.Method(kfp.OnReceiveKillMsg));
 
+                ZRoutedRpc.instance.Register<ZPackage>("RPC_ServerAddDoorToQueue", Watcher.RegisterEvent);
+
                 ZRoutedRpc.instance.Register<ZPackage>("RPC_ServerRegisterEvent", Watcher.RegisterEvent);
                 ZRoutedRpc.instance.Register<ZPackage>("RPC_ServerGetEventKill", Watcher.GetEventKill);
                 ZRoutedRpc.instance.Register<ZPackage>("RPC_ServerSetEventKill", Watcher.SetEventKill);
                 ZRoutedRpc.instance.Register<ZPackage>("RPC_ServerRemoveEvent", Watcher.RemoveEvent);
+
                 ZRoutedRpc.instance.Register<int>("RPC_ServerRegisterEventKill", Profiles.ServerSetLevel);
                 ZRoutedRpc.instance.Register<string, string>("RPC_ServerCreateUser", Profiles.ServerReceiveCreateUser);
                 ZRoutedRpc.instance.Register<string>("RPC_RequestProfile", Profiles.ServerHandleProfileRequest);
@@ -239,14 +232,15 @@ public class MxValheimMod : BaseUnityPlugin
                 string timeString = clk.GetFormattedTime();
                 int day = EnvMan.instance.GetDay();
                 string pid = GetUserPlayerID(Player.m_localPlayer).ToString();
-                RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent();            
+                RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent();
+                string separator = $"<color=#677074>][</color>";
                 if (activeEvent == null)
                 {
-                    Clock.m_textComponent.text = $"<color=#32a852>{Localization.instance.Localize("$clock_string_rank")} {Profiles.serverLevel}</color> <color=#677074>|</color> <color=#32a852>{Localization.instance.Localize("$clock_string_day")} {day}</color> <color=#677074>|</color> <color=#d1954a>{timeString}</color>";
+                    Clock.m_textComponent.text = $"<color=#32a852>{Localization.instance.Localize("$clock_string_rank")}</color> <color=#ffd000>{Profiles.serverLevel}</color> {separator} <color=#32a852>{Localization.instance.Localize("$clock_string_day")}</color> <color=#ffd000>{day}</color> {separator} <color=#d1954a>{timeString}</color>";
                 } else
                 {
-                    Clock.m_textComponent.text = $"<color=#ffd000>{eventName}</color> <color=#677074>|</color> <color=#32a852>{Localization.instance.Localize("$clock_string_kill")}</color> <color=#ffd000>{eventKill}</color> <color=#677074>|</color> <color=#32a852>{Localization.instance.Localize("$clock_string_rank")} {Profiles.serverLevel}</color> <color=#677074>|</color> <color=#32a852>{Localization.instance.Localize("$clock_string_day")} {day}</color> <color=#677074>|</color> <color=#d1954a>{timeString}</color>";
+                    Clock.m_textComponent.text = $"<color=#ffd000>{eventName}</color> {separator} <color=#32a852>{Localization.instance.Localize("$clock_string_kill")}</color> <color=#ffd000>{eventKill}</color> {separator} <color=#32a852>{Localization.instance.Localize("$clock_string_rank")}</color> <color=#ffd000>{Profiles.serverLevel}</color> {separator} <color=#32a852>{Localization.instance.Localize("$clock_string_day")}</color> <color=#ffd000>{day}</color> {separator} <color=#d1954a>{timeString}</color>";
-                }            
+                }
             }
         }
 
@@ -261,7 +255,7 @@ public class MxValheimMod : BaseUnityPlugin
             if (_doorTimer <= 0)
             {
                 dpatch.CloseNextDoor(_doorQueueDoor.Dequeue(), _doorQueueNview.Dequeue(), _doorQueueName.Dequeue());
-                _doorTimer = MxValheimMod.Config_autoDoorClose.Value;
+                _doorTimer = 2;
             }
         }
         // Door Logic

MxValheim/MxValheim.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MxValheim</RootNamespace>
     <AssemblyName>MxValheim</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <LangVersion>12.0</LangVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
@@ -52,6 +52,9 @@
     <Reference Include="BepInEx">
       <HintPath>E:\SteamLibrary\steamapps\common\Valheim\BepInEx\core\BepInEx.dll</HintPath>
     </Reference>
+    <Reference Include="EpicLoot">
+      <HintPath>E:\SteamLibrary\steamapps\common\Valheim\BepInEx\plugins\EpicLoot\EpicLoot.dll</HintPath>
+    </Reference>
     <Reference Include="gui_framework">
       <HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\gui_framework.dll</HintPath>
     </Reference>

MxValheim/Patch/CraftingStation.cs

@@ -17,7 +17,7 @@ namespace MxValheim.Patch
                 if (rangeField.FieldExists())
                 {
                     float currentRange = rangeField.GetValue<float>();
-                    rangeField.SetValue(currentRange * MxValheimMod.Config_rangeMultiplier.Value);
+                    rangeField.SetValue(currentRange * 1);
                 }
             }
         }

MxValheim/Patch/Doors.cs

@@ -20,7 +20,7 @@ namespace MxValheim.Patch
         [HarmonyPatch(typeof(Door), nameof(Door.Interact))]
         public static class DoorTracker
         {
-            static void Postfix(Door __instance, Humanoid character, bool hold, bool alt, ZNetView ___m_nview)
+            static void Postfix(Door __instance)
             {
                 ZNetView nview = __instance.GetComponent<ZNetView>();
                 if (nview != null && nview.IsValid())
@@ -32,23 +32,29 @@ namespace MxValheim.Patch
                     if (MxValheimMod.CachedConfig?.ignoreList != null)
                         if (MxValheimMod.CachedConfig.ignoreList.Contains(prefabName)) return;
 
-                    if (hold || alt || ___m_nview == null || !___m_nview.IsValid()) return;
+                    nview.ClaimOwnership();
 
                     // Get state: 0 is closed
-                    int state = ___m_nview.GetZDO().GetInt("state");
+                    int state = nview.GetZDO().GetInt("state");
 
-                    if (state == 0) return;              
+                    if (state == 0) return;
+
+                    ZPackage pkg = new ZPackage();
+                    pkg.Write(nview);
+                    pkg.Write(__instance);
+                    pkg.Write(prefabName);
 
                     lock (_doorQueueNview)
                     {
-                        Debug.Log($"AutoDoor:Door.Interact Adding \"{prefabName}\" to queue.");
+                        Debug.Log($"AutoDoor: Adding \"{prefabName}\" to queue.");
                         _doorQueueNview.Enqueue(nview);
                         _doorQueueDoor.Enqueue(__instance);
                         _doorQueueName.Enqueue(prefabName);
                     }
                 }
             }
-        }    
+
+        }
 
         public void CloseNextDoor(Door door, ZNetView nview, string doorName)
         {
@@ -56,12 +62,12 @@ namespace MxValheim.Patch
             {
                 if (nview.GetZDO().GetInt("state") != 0)
                 {
-                    Debug.Log($"AutoDoor:CloseNextDoor Closing door \"{doorName}\".");
+                    Debug.Log($"AutoDoor: Closing door \"{doorName}\".");
                     ZDO zd0 = nview.GetZDO();
                     zd0.Set("state", 0);
                 } else
                 {
-                    Debug.Log($"AutoDoor:CloseNextDoor Door \"{doorName}\" was already closed.");
+                    Debug.Log($"AutoDoor: Door \"{doorName}\" was already closed.");
                 }
             }
         }

MxValheim/Patch/HUD/Clock.cs

@@ -53,10 +53,9 @@ namespace MxValheim.Patch.HUD
             canvas.renderMode = RenderMode.ScreenSpaceOverlay;
             canvas.sortingOrder = 999;
 
-            // --- CLOCK PANEL ---
             GameObject panelObj = new GameObject("TextBackground");
             panelObj.transform.SetParent(m_canvasObject.transform, false);
-            panelObj.AddComponent<Image>().color = new Color(0, 0, 0, 0.5f);
+            panelObj.AddComponent<Image>().color = new Color(0, 0, 0, 0.8f);
 
             ContentSizeFitter fitter = panelObj.AddComponent<ContentSizeFitter>();
             fitter.horizontalFit = ContentSizeFitter.FitMode.PreferredSize;
@@ -71,36 +70,48 @@ namespace MxValheim.Patch.HUD
             panelRect.pivot = new Vector2(0.5f, 1.0f);
             panelRect.anchoredPosition = new Vector2(0, -5);
 
-            // --- TEXT ---
             GameObject textObj = new GameObject("ModdedText");
             textObj.transform.SetParent(panelObj.transform, false);
             m_textComponent = textObj.AddComponent<Text>();
-            m_textComponent.font = Resources.GetBuiltinResource<Font>("Arial.ttf");
+
+            Font valheimFont = null;
+            foreach (Font f in Resources.FindObjectsOfTypeAll<Font>())
+            {
+                if (f.name == "AveriaSerifLibre-Bold")
+                {
+                    valheimFont = f;
+                    break;
+                }
+            }
+
+            if (valheimFont == null)
+            {
+                valheimFont = Resources.GetBuiltinResource<Font>("Arial.ttf");
+            }
+
+            m_textComponent.font = valheimFont;
             m_textComponent.fontSize = 18;
             m_textComponent.color = Color.white;
 
-            // --- PROGRESS BAR CONTAINER ---
-            // This sits under the main rectangle
             GameObject barBgObj = new GameObject("BarBackground");
             barBgObj.transform.SetParent(m_canvasObject.transform, false);
-            barBgObj.AddComponent<Image>().color = new Color(0.1f, 0.1f, 0.1f, 0.8f); // Dark background
+            barBgObj.AddComponent<Image>().color = new Color(0.1f, 0.1f, 0.1f, 0.8f);
 
             RectTransform barBgRect = barBgObj.GetComponent<RectTransform>();
             barBgRect.anchorMin = new Vector2(0.5f, 1.0f);
             barBgRect.anchorMax = new Vector2(0.5f, 1.0f);
             barBgRect.pivot = new Vector2(0.5f, 1.0f);
-            // Positioned below the clock panel (Clock is 35px high + 5px gap = -40)
             barBgRect.anchoredPosition = new Vector2(0, -45);
-            barBgRect.sizeDelta = new Vector2(180, 8); // Match width of clock, small height
+            barBgRect.sizeDelta = new Vector2(180, 8);
 
             // --- PROGRESS BAR FILL ---
             GameObject fillObj = new GameObject("BarFill");
             fillObj.transform.SetParent(barBgObj.transform, false);
-            fillObj.AddComponent<Image>().color = Color.yellow; // Classic Valheim XP color
+            fillObj.AddComponent<Image>().color = Color.yellow;
 
             m_barFill = fillObj.GetComponent<RectTransform>();
             m_barFill.anchorMin = new Vector2(0, 0);
-            m_barFill.anchorMax = new Vector2(0.5f, 1); // This X value (0.5) will be updated via code
+            m_barFill.anchorMax = new Vector2(0.5f, 1);
             m_barFill.pivot = new Vector2(0, 0.5f);
             m_barFill.offsetMin = Vector2.zero;
             m_barFill.offsetMax = Vector2.zero;

MxValheim/Patch/WearNTear.cs

@@ -10,8 +10,6 @@ namespace MxValheim.Patch
         {
             static void Postfix(WearNTear __instance, ref bool __result)
             {
-                if (!MxValheimMod.Config_rainDamage.Value) return;
-
                 __result = true;
             }
         }

README.md

@@ -1,9 +1,13 @@
-![logo](https://mxio.ovh/gaming/valheim/mxvalheim.png)
+![logo](https://mxio.ovh/gaming/valheim/mxvalheim_valtint.png)
 
 ## MxValheim
 Official **MxValheim Server** Mod.  
 **This mod is created to be used Client/Server side. A lot of features are not working in solo mode.**
 
+## Dependencies
+- ![BepInEx for Valheim](https://thunderstore.io/c/valheim/p/denikson/BepInExPack_Valheim/)
+- ![Jotunn](https://thunderstore.io/c/valheim/p/ValheimModding/Jotunn/)
+
 ## Features
 - Enhanced Event System with level and reward based on current biome.
 - Display the day and the formated time in-game.