(1.6.14) EventSystem Added Reagent to reward

MxValheim/EventSystem/Experience.cs

@@ -15,17 +15,32 @@ namespace MxValheim.EventSystem
             return (level * 100);
         }
 
+        public static int CalculateExperience(string enemyInternalName, int level, Heightmap.Biome biome)
+        {
+            Dictionary<int, float> levelMulti = new Dictionary<int, float>
+            {
+                { 1, 1.0f },
+                { 2, 1.5f },
+                { 3, 2.0f },
+                { 4, 2.5f },
+            };
+            int expfinal = (int)(EnemiesExpValue[enemyInternalName] * levelMulti[level]);
+            return expfinal;
+        }
+
         public static float CalculateExpMultiplier(Heightmap.Biome biome)
         {
             Dictionary<int, float> biomeBase = new Dictionary<int, float>()
             {
                 { 1, 1.0f },
-                { 2, 1.5f },
-                { 8, 2.0f },
+                { 8, 1.5f },
+                { 2, 2.0f },
                 { 4, 2.5f },
                 { 16, 3.0f },
-                { 256, 3.5f },
-                { 32, 4.0f },
+                { 512, 4.0f },
+                { 64, 2.5f },
+                { 32, 5.0f },
+                { 256, 1.0f },
             };
 
             float rewardExpMulti = biomeBase[((int)biome)];
@@ -65,5 +80,81 @@ namespace MxValheim.EventSystem
                 Clock.m_barFill.offsetMax = Vector2.zero;
             }
         }
+
+        public static Dictionary<string, int> EnemiesExpValue = new Dictionary<string, int>
+    {
+        // --- Meadows ---
+        { "Boar", 10 },
+        { "Neck", 10 },
+        { "Greyling", 15 },
+
+        // --- Black Forest ---
+        { "Greydwarf", 20 },
+        { "Greydwarf_Elite", 30 },
+        { "Greydwarf_Shaman", 30 },
+        { "Troll", 100 },
+        { "Ghost", 100 },
+        { "Skeleton", 30 },
+        { "Skeleton_NoArcher", 30 }, // Melee only variant
+
+        // --- Swamp ---
+        { "Blob", 20 },
+        { "BlobElite", 30 }, // Oozer
+        { "Draugr", 40 },
+        { "Draugr_Elite", 50 },
+        { "Draugr_Ranged", 40 },
+        { "Leech", 20 },
+        { "Surtling", 40 },
+        { "Wraith", 100 },
+        { "Abomination", 200 },
+
+        // --- Mountains ---
+        { "Bat", 10 },
+        { "Hatchling", 50 },
+        { "Fenring", 50 },
+        { "Fenring_Cultist", 50 },
+        { "StoneGolem", 100 },
+        { "Ulv", 100 },
+        { "Wolf", 30 },
+
+        // --- Plains ---
+        { "Deathsquito", 10 },
+        { "Fuling", 50 },
+        { "FulingBerserker", 60 },
+        { "FulingShaman", 60 },
+        { "Lox", 200 },
+        { "Growth", 10 },
+
+        // --- Mistlands ---
+        { "Gjall", 100 },
+        { "Seeker", 40 },
+        { "SeekerBrute", 100 }, // Seeker Soldier
+        { "SeekerBrood", 100 },
+        { "Tick", 20 },
+        { "Dverger", 50 },
+
+        // --- Ashlands ---
+        { "Asksvin", 50 },
+        { "Charred_Melee", 50 },  // Charred Warrior
+        { "Charred_Archer", 50 }, // Charred Marksman
+        { "Charred_Mage", 50 },   // Charred Warlock
+        { "Charred_Twitcher", 50 },
+        { "FallenValkyrie", 200 },
+        { "Morgen", 300 },
+        { "BonemawSerpent", 200 },
+        { "Voltures", 50 },
+
+        // --- Ocean ---
+        { "Serpent", 500 },
+
+        // --- Bosses ---
+        { "Eikthyr", 100 },
+        { "gd_king", 200 },      // The Elder
+        { "Bonemass", 300 },
+        { "Dragon", 400 },        // Moder
+        { "GoblinKing", 500 },    // Yagluth
+        { "SeekerQueen", 600 },
+        { "Fader", 800 }
+    };
     }
 }

MxValheim/EventSystem/Patch.cs

@@ -5,6 +5,7 @@ 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;
@@ -29,15 +30,6 @@ namespace MxValheim.EventSystem
             }
         }
 
-        [HarmonyPatch(typeof(RandEventSystem), nameof(RandEventSystem.Awake))]
-        public static class EventRadiusPatch
-        {
-            static void Postfix(RandEventSystem __instance)
-            {
-                
-            }
-        }
-
         [HarmonyPatch(typeof(RandEventSystem), nameof(RandEventSystem.StartRandomEvent))]
         public static class DebugRaidFrequency
         {
@@ -45,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;
                 }
             }
         }
@@ -59,13 +74,7 @@ namespace MxValheim.EventSystem
                 {
                     __instance.m_eventIntervalMin = 10f;
                     __instance.m_eventChance = 100f;
-                }
-                RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent();
-                if (activeEvent != null)
-                {
-                    activeEvent.m_eventRange = 200f;
-                    activeEvent.m_duration = 10f;
-                }
+                }          
             }
         }
 
@@ -78,40 +87,44 @@ namespace MxValheim.EventSystem
                 RandomEvent currentRaid = ActiveEventField(__instance);              
                 if (string.IsNullOrEmpty(eventName) && currentRaid != null)
                 {
-                    int kill = 0;
+                    int points = 0;
                     ZPackage pkg = new ZPackage();
                     pkg.Write(currentRaid.m_name);
                     pkg.Write($"{currentRaid.m_pos}");
-                    kill = Watcher.eventKill;
+                    points = Watcher.eventPoints;
                     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));
+                        Reward.GiveItemStatic("Coins", Reward.CalculateRewardCoin(Profiles.serverLevel, currentBiome, points));
                         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.GiveEpicLootLowMats();
+                            Reward.GenRarity();
+                            Reward.GiveEpicLootDust();
+                            Reward.GiveEpicLootShard();
                             Reward.GiveEpicLootEssence();
+                            Reward.GiveEpicLootReagent();
                             Reward.GiveEpicLootRune();
-                        }                   
+                        }                    
                     }
                 }
             }
@@ -159,35 +172,52 @@ namespace MxValheim.EventSystem
                         isEventCreature = Traverse.Create(mai).Field<bool>("m_eventCreature").Value;
                     }
 
-                    if (!isEventCreature) return;
-
-                    RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent();
-                    if (activeEvent != null)
+                    string internalName = __instance.gameObject.name;
+                    int cloneIndex = internalName.IndexOf("(Clone)");
+                    if (cloneIndex != -1)
                     {
-                        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);
-                    }                  
+                        internalName = internalName.Substring(0, cloneIndex);
+                    }
 
-                    int level = __instance.GetLevel();
-                    int exp =
-                        (level == 1) ? 2 :
-                        (level == 2) ? 4 :
-                        (level == 3) ? 6 :
-                                       6;
-                    ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_RequestProfile", "Event");
-                    Heightmap.Biome currentBiome = EnvMan.instance.GetCurrentBiome();
-                    int expFinal = ((int)(exp * Experience.CalculateExpMultiplier(currentBiome))) + Profiles.serverLevel;
-                    Experience.AddExperience(expFinal);
+                    if (isEventCreature)
+                    {
+                        RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent();
+                        if (activeEvent != null)
+                        {
+                            ZPackage pkg = new ZPackage();
+                            pkg.Write(activeEvent.m_name);
+                            pkg.Write($"{activeEvent.m_pos}");                       
+                            pkg.Write(Reward.EnemiesPointValue[internalName]);
+                            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);
+                        }
+
+                        int level = __instance.GetLevel();
+                        Heightmap.Biome currentBiome = EnvMan.instance.GetCurrentBiome();
+                        int exp = Experience.CalculateExperience(internalName, level, currentBiome);
+                        ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_RequestProfile", "Event");
+                        Experience.AddExperience(exp);
+                        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, exp, true);
+                    } else
+                    {
+                        int level = __instance.GetLevel();
+                        Heightmap.Biome currentBiome = EnvMan.instance.GetCurrentBiome();
+                        int exp = Experience.CalculateExperience(internalName, level, currentBiome);                 
+                        Experience.AddExperience(exp);
+                        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, exp, true);
+                    }              
                 }
             }
         }

MxValheim/EventSystem/Reward.cs

@@ -1,17 +1,21 @@
 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)
+        private static string globalRarity = "Magic";
+
+        public static int CalculateRewardCoin(int level, Heightmap.Biome biome, int points)
         {
             Dictionary<int, int> biomeBase = new Dictionary<int, int>()
             {
@@ -24,13 +28,21 @@ namespace MxValheim.EventSystem
                 { 32, 70 },
             };
 
-            int rewardCoin = (biomeBase[((int)biome)] * level) + (biomeBase[((int)biome)] * kill);
+            int rewardCoin = (biomeBase[((int)biome)] * level) + points;
 
             return rewardCoin;
-        }      
+        }
+
+        public static void GenRarity()
+        {
+            string[] rarity = GetRarityList(Watcher.eventPoints);
+
+            System.Random rand = new System.Random();
+            globalRarity = rarity[rand.Next(0, rarity.Length - 1)];
+        }
 
         public static string GetRewardPrefab(int level, string type)
-        {           
+        {
             string[] foodList = { "OnionSoup", "CarrotSoup", "DeerStew", "Salad", "SerpentStew", "WolfMeatSkewer" };
             string[] healList = { "MeadHealthMinor", "MeadHealthMedium", "MeadHealthMajor", "MeadHealthLingering" };
             string[] metalList = { "CopperOre", "TinOre", "IronScrap", "SilverOre", "BlackMetalScrap", "FlametalOreNew" };
@@ -46,16 +58,15 @@ namespace MxValheim.EventSystem
             return "Wood";
         }
 
-        public static void GiveEpicLootLowMats()
+        public static void GiveEpicLootDust()
         {
             System.Random rand = new System.Random();
 
-            int qty = rand.Next(5,10);
+            int qty = rand.Next(1, Profiles.serverLevel);
 
-            string[] rarity = { "Magic", "Rare", "Epic", "Legendary", "Mythic" };
-            string[] type = { "Dust", "Shard", "Fragment" };
+            string[] rarity = GetRarityList(Watcher.eventPoints);
 
-            string itemName = $"{type[rand.Next(0, type.Length - 1)]}{rarity[rand.Next(0, rarity.Length - 1)]}";
+            string itemName = $"Dust{globalRarity}";
 
             Player player = Player.m_localPlayer;
             if (player == null) return;
@@ -63,9 +74,31 @@ namespace MxValheim.EventSystem
             GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
             if (prefab != null)
             {
-                player.GetInventory().AddItem(itemName, qty, 1, 0, 0, "");
+                GiveItemSafe(itemName, player, qty);
+            }
+            else
+            {
+                Debug.LogWarning($"Item {itemName} not found in ObjectDB!");
+            }
+        }
 
-                player.Message(MessageHud.MessageType.TopLeft, $"Received {qty}x {itemName}");
+        public static void GiveEpicLootShard()
+        {
+            System.Random rand = new System.Random();
+
+            int qty = rand.Next(1, Profiles.serverLevel);
+
+            string[] rarity = GetRarityList(Watcher.eventPoints);
+
+            string itemName = $"Shard{globalRarity}";
+
+            Player player = Player.m_localPlayer;
+            if (player == null) return;
+
+            GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
+            if (prefab != null)
+            {
+                GiveItemSafe(itemName, player, qty);
             }
             else
             {
@@ -77,11 +110,11 @@ namespace MxValheim.EventSystem
         {
             System.Random rand = new System.Random();
 
-            int qty = rand.Next(1, 5);
+            int qty = rand.Next(1, Profiles.serverLevel);
 
-            string[] rarity = { "Magic", "Rare", "Epic", "Legendary", "Mythic" };
+            string[] rarity = GetRarityList(Watcher.eventPoints);
 
-            string itemName = $"Essence{rarity[rand.Next(0, rarity.Length - 1)]}";
+            string itemName = $"Essence{globalRarity}";
 
             Player player = Player.m_localPlayer;
             if (player == null) return;
@@ -89,9 +122,31 @@ namespace MxValheim.EventSystem
             GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
             if (prefab != null)
             {
-                player.GetInventory().AddItem(itemName, qty, 1, 0, 0, "");
+                GiveItemSafe(itemName, player, qty);
+            }
+            else
+            {
+                Debug.LogWarning($"Item {itemName} not found in ObjectDB!");
+            }
+        }
 
-                player.Message(MessageHud.MessageType.TopLeft, $"Received {qty}x {itemName}");
+        public static void GiveEpicLootReagent()
+        {
+            System.Random rand = new System.Random();
+
+            int qty = rand.Next(1, Profiles.serverLevel);
+
+            string[] rarity = GetRarityList(Watcher.eventPoints);
+
+            string itemName = $"Reagent{globalRarity}";
+
+            Player player = Player.m_localPlayer;
+            if (player == null) return;
+
+            GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
+            if (prefab != null)
+            {
+                GiveItemSafe(itemName, player, qty);
             }
             else
             {
@@ -103,11 +158,11 @@ namespace MxValheim.EventSystem
         {
             System.Random rand = new System.Random();
 
-            int qty = 1;
+            int qty = rand.Next(1, 2);
 
-            string[] rarity = { "Magic", "Rare", "Epic" };
+            string[] rarity = GetRarityList(Watcher.eventPoints);
 
-            string itemName = $"Runestone{rarity[rand.Next(0, rarity.Length - 1)]}";
+            string itemName = $"Runestone{globalRarity}";
 
             Player player = Player.m_localPlayer;
             if (player == null) return;
@@ -115,9 +170,8 @@ namespace MxValheim.EventSystem
             GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
             if (prefab != null)
             {
-                player.GetInventory().AddItem(itemName, qty, 1, 0, 0, "");
-
-                player.Message(MessageHud.MessageType.TopLeft, $"Received {qty}x {itemName}");
+                GiveItemSafe(itemName, player, qty);
+                SendRewardMessage(player, prefab, itemName, qty);
             }
             else
             {
@@ -135,9 +189,7 @@ namespace MxValheim.EventSystem
             GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
             if (prefab != null)
             {
-                player.GetInventory().AddItem(itemName, qty, 1, 0, 0, "");
-
-                player.Message(MessageHud.MessageType.TopLeft, $"Received {qty}x {itemName}");
+                GiveItemSafe(itemName, player, qty);
             }
             else
             {
@@ -153,9 +205,11 @@ namespace MxValheim.EventSystem
             GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
             if (prefab != null)
             {
-                player.GetInventory().AddItem(itemName, qty, 1, 0, 0, "");
-
-                player.Message(MessageHud.MessageType.TopLeft, $"Received {qty}x {itemName}");
+                GiveItemSafe(itemName, player, qty);
+                if (itemName == "Coins")
+                {
+                    SendRewardMessage(player, prefab, itemName, qty);
+                }
             }
             else
             {
@@ -163,6 +217,162 @@ namespace MxValheim.EventSystem
             }
         }
 
+        public static void GiveItemSafe(string itemName, Player player, int qty)
+        {
+            GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
+            if (prefab == null) return;
 
+            ItemDrop itemDrop = prefab.GetComponent<ItemDrop>();
+            if (itemDrop == null) return;
+
+            ItemDrop.ItemData result = player.GetInventory().AddItem(itemName, qty, 1, 0, 0, "");
+
+            if (result == null)
+            {
+                GiveItemInWorld(itemName, player, qty);
+            }
+        }
+
+        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 point)
+        {
+            string[] rarity = { };
+            switch (point)
+            {
+                case < 100:
+                    rarity = ["Magic"];
+                    break;
+                case >= 100 and < 500:
+                    rarity = ["Rare"];
+                    break;
+                case >= 500 and <= 1000:
+                    rarity = ["Epic"];
+                    break;
+                case >= 1001 and <= 2000:
+                    rarity = ["Epic", "Legendary"];
+                    break;
+                case >= 2001:
+                    rarity = ["Epic", "Legendary", "Mythic"];
+                    break;
+            }
+            return rarity;
+        }
+
+        public static Dictionary<string, int> EnemiesPointValue = new Dictionary<string, int>
+    {
+        // --- Meadows ---
+        { "Boar", 10 },
+        { "Neck", 10 },
+        { "Greyling", 20 },
+
+        // --- Black Forest ---
+        { "Greydwarf", 20 },
+        { "Greydwarf_Elite", 50 },
+        { "Greydwarf_Shaman", 50 },
+        { "Troll", 250 },
+        { "Ghost", 100 },
+        { "Skeleton", 60 },
+        { "Skeleton_NoArcher", 60 }, // Melee only variant
+        { "Skeleton_Poison", 60 },
+
+        // --- Swamp ---
+        { "Blob", 50 },
+        { "BlobElite", 80 }, // Oozer
+        { "Draugr", 100 },
+        { "Draugr_Elite", 150 },
+        { "Draugr_Ranged", 100 },
+        { "Leech", 50 },
+        { "Surtling", 80 },
+        { "Wraith", 100 },
+        { "Abomination", 300 },
+
+        // --- Mountains ---
+        { "Bat", 50 },
+        { "Hatchling", 150 },
+        { "Fenring", 150 },
+        { "Fenring_Cultist", 150 },
+        { "StoneGolem", 200 },
+        { "Ulv", 200 },
+        { "Wolf", 100 },
+
+        // --- Plains ---
+        { "Deathsquito", 50 },
+        { "Fuling", 100 },
+        { "FulingBerserker", 250 },
+        { "FulingShaman", 150 },
+        { "Lox", 300 },
+        { "Growth", 50 },
+
+        // --- Mistlands ---
+        { "Gjall", 50 },
+        { "Seeker", 100 },
+        { "SeekerBrute", 300 }, // Seeker Soldier
+        { "SeekerBrood", 150 },
+        { "Tick", 50 },
+        { "Dverger", 200 },
+
+        // --- Ashlands ---
+        { "Asksvin", 50 },
+        { "Charred_Melee", 100 },  // Charred Warrior
+        { "Charred_Archer", 100 }, // Charred Marksman
+        { "Charred_Mage", 100 },   // Charred Warlock
+        { "Charred_Twitcher", 100 },
+        { "FallenValkyrie", 400 },
+        { "Morgen", 300 },
+        { "BonemawSerpent", 300 },
+        { "Voltures", 100 },
+
+        // --- Ocean ---
+        { "Serpent", 500 },
+
+        // --- Bosses ---
+        { "Eikthyr", 100 },
+        { "gd_king", 101 },      // The Elder
+        { "Bonemass", 102 },
+        { "Dragon", 103 },        // Moder
+        { "GoblinKing", 104 },    // Yagluth
+        { "SeekerQueen", 105 },
+        { "Fader", 106 }
+    };
     }
 }

MxValheim/EventSystem/Watcher.cs

@@ -10,7 +10,7 @@ namespace MxValheim.EventSystem
 {
     internal class Watcher
     {
-        public static int eventKill = 0;
+        public static int eventPoints = 0;
 
         public static void GetEventKill(long sender, ZPackage pkg)
         {
@@ -19,31 +19,34 @@ namespace MxValheim.EventSystem
 
             int evindex = MxValheimMod.ActiveEvents.FindIndex(e => e.Position.ToString() == eventPos);
 
-            eventKill = MxValheimMod.ActiveEvents[evindex].Kills;       
+            eventPoints = MxValheimMod.ActiveEvents[evindex].Points;       
         }
 
         public static void SetEventKill(long sender, ZPackage pkg)
         {
             string eventName = pkg.ReadString();
             string eventPos = pkg.ReadString();
+            int killPoints = pkg.ReadInt();
 
             int evindex = MxValheimMod.ActiveEvents.FindIndex(e => e.Position.ToString() == eventPos);
-            int evKill = MxValheimMod.ActiveEvents[evindex].Kills;
+            int evPoints = MxValheimMod.ActiveEvents[evindex].Points;
 
             MxValheimMod.ActiveEvents.RemoveAt(evindex);
-            int newKill = evKill+1;
-            eventKill = newKill;
+            int newPoints = eventPoints + killPoints;
+            eventPoints = newPoints;
 
-            MxValheimMod.ActiveEventData newData = new MxValheimMod.ActiveEventData(eventName, eventPos, newKill);
+            MxValheimMod.ActiveEventData newData = new MxValheimMod.ActiveEventData(eventName, eventPos, newPoints);
             MxValheimMod.ActiveEvents.Add(newData);
         }
 
         public static void RegisterEvent(long sender, ZPackage pkg)
         {
+            eventPoints = 0;
             string eventName = pkg.ReadString();
             string eventPos = pkg.ReadString();
+            int killPoints = pkg.ReadInt();
 
-            MxValheimMod.ActiveEventData newData = new MxValheimMod.ActiveEventData(eventName, eventPos, 1);
+            MxValheimMod.ActiveEventData newData = new MxValheimMod.ActiveEventData(eventName, eventPos, killPoints);
             MxValheimMod.ActiveEvents.Add(newData);
         }
 
@@ -51,12 +54,18 @@ namespace MxValheim.EventSystem
         {
             string eventName = pkg.ReadString();
             string eventPos = pkg.ReadString();
-
-            int evindex = MxValheimMod.ActiveEvents.FindIndex(e => e.Position.ToString() == eventPos);
-
-            eventKill = 0;
-
-            MxValheimMod.ActiveEvents.RemoveAt(evindex);          
+            
+            int evindex = 0;
+            UnityEngine.Debug.Log($"RemoveEvent: ActiveEvents Count = {MxValheimMod.ActiveEvents.Count} ( {eventName} / {eventPos} )");
+            if (MxValheimMod.ActiveEvents.Count > 0)
+            {
+                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 way 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
-
-            if (encodedType == -1)
-            {
-                attacker = Player.m_localPlayer?.GetHoverName();
-                finalMsg = $"<color=#00ff06>{attacker.ToUpper()}</color><color=#ffd000>{type3Separator}</color>";
-            }
+                              $"{attackerFormat}{type2Separator}{victimFormat}{distanceFormat}"; // Failsafe           
 
             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=#ffd000>{attacker.ToUpper()}</color><color=#32a852>{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 || victimName == "") 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.preferredHeight = 24;
+            weaponLayout.preferredWidth = 32;
+            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.preferredHeight = 24;
+            victimLayout.preferredWidth = 32;
+            victimLayout.preferredHeight = 32;
 
             RectTransform vRect = victimObj.GetComponent<RectTransform>();
             vRect.anchorMin = vRect.anchorMax = vRect.pivot = new Vector2(1, 0.5f);

MxValheim/MxValheim.cs

@@ -12,6 +12,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Text;
 using System.Threading;
 using System.Xml;
 using TMPro;
@@ -33,7 +34,7 @@ public class MxValheimMod : BaseUnityPlugin
 
     private const string ModGUID = "ovh.mxdev.mxvalheim";
     private const string ModName = "MxValheim";
-    private const string ModVersion = "1.6.7";
+    private const string ModVersion = "1.6.14";
 
     public static ConfigEntry<bool> Config_DebugRandomEventInterval;
     public static ConfigEntry<float> Config_bowDrawSpeedBonusPerLevel;
@@ -44,6 +45,10 @@ public class MxValheimMod : BaseUnityPlugin
     public static string internalDataEventSystem = Path.Combine(internalDataPath, "EventSystem.json");
     public static string DropConfigPath => Path.Combine(internalConfigsPath, "items_drop.json");
     public static string WeightConfigPath => Path.Combine(internalConfigsPath, "items_weight.json");
+    public static string EnemyExpConfigPath => Path.Combine(internalConfigsPath, "enemies_expvalue.mx");
+    public static Dictionary<string, int> EnemyExpSettings = new Dictionary<string, int>();
+    public static string EnemyRewardConfigPath => Path.Combine(internalConfigsPath, "enemies_rewardvalue.mx");
+    public static Dictionary<string, int> EnemyRewardSettings = new Dictionary<string, int>();
     public static string AutoDoorConfigPath => Path.Combine(internalConfigsPath, "auto_doors.json");
     public static DoorRoot CachedConfig;
     public static Dictionary<string, float> WeightSettings = new Dictionary<string, float>();
@@ -92,13 +97,13 @@ public class MxValheimMod : BaseUnityPlugin
     {
         public string Name;
         public string Position;
-        public int Kills;
+        public int Points;
 
-        public ActiveEventData(string name, string pos, int kills)
+        public ActiveEventData(string name, string pos, int points)
         {
             Name = name;
             Position = pos;
-            Kills = kills;
+            Points = points;
         }
     }
 
@@ -232,14 +237,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>{eventPoints}</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>";
+                }
             }
         }
 
@@ -375,9 +381,21 @@ public class MxValheimMod : BaseUnityPlugin
             File.WriteAllText(DropConfigPath, JsonConvert.SerializeObject(DropSettings, Newtonsoft.Json.Formatting.Indented));
         }
 
+        byte[] jsonEncryptedB64 = null;
+
         json = File.ReadAllText(DropConfigPath);
         DropSettings = JsonConvert.DeserializeObject<Dictionary<string, int>>(json);
         Logger.LogInfo($"Successfully parsed {DropSettings.Count} items.");
+
+        /*jsonEncryptedB64 = Convert.FromBase64String(File.ReadAllText(EnemyRewardConfigPath));
+        json = Encoding.UTF8.GetString(jsonEncryptedB64);
+        EnemyRewardSettings = JsonConvert.DeserializeObject<Dictionary<string, int>>(json);
+        Logger.LogInfo($"Successfully parsed {EnemyRewardSettings.Count} enemy reward value.");
+
+        jsonEncryptedB64 = Convert.FromBase64String(File.ReadAllText(EnemyExpConfigPath));
+        json = Encoding.UTF8.GetString(jsonEncryptedB64);
+        EnemyExpSettings = JsonConvert.DeserializeObject<Dictionary<string, int>>(json);
+        Logger.LogInfo($"Successfully parsed {EnemyExpSettings.Count} enemy exp value.");*/
     }
 
     public void LoadDoorConfig()

MxValheim/Patch/Doors.cs

@@ -53,13 +53,13 @@ namespace MxValheim.Patch
                     }
                 }
             }
-        }      
+
+        }
 
         public void CloseNextDoor(Door door, ZNetView nview, string doorName)
         {
             if (door != null && nview != null && nview.IsValid())
             {
-                nview.ClaimOwnership();
                 if (nview.GetZDO().GetInt("state") != 0)
                 {
                     Debug.Log($"AutoDoor: Closing door \"{doorName}\".");

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;

README.md

@@ -4,6 +4,13 @@
 Official **MxValheim Server** Mod.  
 **This mod is created to be used Client/Server side. A lot of features are not working in solo mode.**
 
+## Roadmap
+- **1.6.12** Revamped EventSystem Reward System based on enemy difficulty.
+- **1.6.13** Revamped Experience System based on enemy difficulty.
+- **1.7.x** Drop Multiplier Revamp & Stamina System Revamp
+- **1.8.x** Random Mini Boss System
+- **1.9.x** Biome Random Quest System
+
 ## Dependencies
 - ![BepInEx for Valheim](https://thunderstore.io/c/valheim/p/denikson/BepInExPack_Valheim/)
 - ![Jotunn](https://thunderstore.io/c/valheim/p/ValheimModding/Jotunn/)
@@ -13,7 +20,7 @@ Official **MxValheim Server** Mod.
 - Display the day and the formated time in-game.
 - Use your client language with built-in localization.
 - Kill Feed with custom UI showing player kill and death.
-- Tweak individual item(s) weight in "BepInEx\config\mxvalheim.custom_weights.json".
+- Tweak individual item(s) weight in "BepInEx\plugins\MxValheim\Configs\items_weight.json".
 - Ore drop multiplier. (Value available in the generated config.)
 - Workbench crafting range multiplier. (Value available in the generated config.)
 - Reduce Bow draw time for each upgrade level. (Value available in the generated config.)