9 Commits

Author SHA1 Message Date
mikx
01fdd9794c (1.6.13) EventSystem Exp Revamp + Reward Fix 2026-03-20 15:33:27 -04:00
mikx
9eab8c7aa3 (1.6.12) EventSystem Score System 2026-03-18 18:02:53 -04:00
mikx
75d951eefe (1.6.11) EventSystem Reward Rarity Tweaks 2026-03-17 02:07:05 -04:00
mikx
b6dec0efa6 (1.6.10) KillFeed missing info fix 2026-03-03 04:47:30 -05:00
mikx
19a6a2f62d (1.6.9) Major EventSystem Update (see release) 2026-03-01 00:36:07 -05:00
mikx
8b504d02e0 (1.6.8) EventSystem Tweaks/Fix + KillFeed Multi-Use 2026-02-26 04:57:24 -05:00
mikx
e23307fe27 (1.6.7) EventSystem EpicLoot Reward + AutoDoor Fix 2026-02-23 16:00:53 -05:00
mikx
40cff792e0 (1.6.6) Readme Fix 2026-02-21 05:47:29 -05:00
mikx
21426f5b4c (1.6.6) Readme Update 2026-02-21 05:46:00 -05:00
12 changed files with 602 additions and 137 deletions

View File

@@ -15,17 +15,32 @@ namespace MxValheim.EventSystem
return (level * 100); 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) public static float CalculateExpMultiplier(Heightmap.Biome biome)
{ {
Dictionary<int, float> biomeBase = new Dictionary<int, float>() Dictionary<int, float> biomeBase = new Dictionary<int, float>()
{ {
{ 1, 1.0f }, { 1, 1.0f },
{ 2, 1.5f }, { 8, 1.5f },
{ 8, 2.0f }, { 2, 2.0f },
{ 4, 2.5f }, { 4, 2.5f },
{ 16, 3.0f }, { 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)]; float rewardExpMulti = biomeBase[((int)biome)];
@@ -65,5 +80,81 @@ namespace MxValheim.EventSystem
Clock.m_barFill.offsetMax = Vector2.zero; 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 }
};
} }
} }

View File

@@ -1,9 +1,11 @@
using HarmonyLib; using BepInEx.Bootstrap;
using Splatform; using EpicLoot;
using HarmonyLib;
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Controls; using System.Windows.Controls;
@@ -35,7 +37,30 @@ namespace MxValheim.EventSystem
{ {
if (ZRoutedRpc.instance != null) 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;
} }
} }
} }
@@ -44,11 +69,14 @@ namespace MxValheim.EventSystem
public static class TimerFreezePatch public static class TimerFreezePatch
{ {
static void Prefix(RandEventSystem __instance) static void Prefix(RandEventSystem __instance)
{
if (MxValheimMod.Config_DebugRandomEventInterval.Value)
{ {
__instance.m_eventIntervalMin = 10f; __instance.m_eventIntervalMin = 10f;
__instance.m_eventChance = 100f; __instance.m_eventChance = 100f;
} }
} }
}
[HarmonyPatch(typeof(RandEventSystem), nameof(RandEventSystem.RPC_SetEvent))] [HarmonyPatch(typeof(RandEventSystem), nameof(RandEventSystem.RPC_SetEvent))]
public static class RandEventEndPatch public static class RandEventEndPatch
@@ -59,34 +87,42 @@ namespace MxValheim.EventSystem
RandomEvent currentRaid = ActiveEventField(__instance); RandomEvent currentRaid = ActiveEventField(__instance);
if (string.IsNullOrEmpty(eventName) && currentRaid != null) if (string.IsNullOrEmpty(eventName) && currentRaid != null)
{ {
int kill = 0; int points = 0;
ZPackage pkg = new ZPackage(); ZPackage pkg = new ZPackage();
pkg.Write(currentRaid.m_name); pkg.Write(currentRaid.m_name);
pkg.Write($"{currentRaid.m_pos}"); pkg.Write($"{currentRaid.m_pos}");
Debug.Log($"RPC_SetEvent: {currentRaid.m_pos}"); points = Watcher.eventPoints;
kill = Watcher.eventKill;
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerRemoveEvent", pkg); ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerRemoveEvent", pkg);
Vector3 playerPos = Player.m_localPlayer.transform.position; Vector3 playerPos = Player.m_localPlayer.transform.position;
float distance = Vector3.Distance(playerPos, currentRaid.m_pos); float distance = Vector3.Distance(playerPos, currentRaid.m_pos);
if (distance <= 96f) if (distance <= 200f)
{ {
Heightmap.Biome currentBiome = EnvMan.instance.GetCurrentBiome(); 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(); System.Random rand = new System.Random();
Reward.GiveItemStatic("Feathers", rand.Next(5, 20)); 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); 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); 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.GenRarity();
Reward.GiveEpicLootDust();
Reward.GiveEpicLootShard();
Reward.GiveEpicLootEssence();
Reward.GiveEpicLootRune();
} }
} }
} }
@@ -135,19 +171,28 @@ namespace MxValheim.EventSystem
isEventCreature = Traverse.Create(mai).Field<bool>("m_eventCreature").Value; isEventCreature = Traverse.Create(mai).Field<bool>("m_eventCreature").Value;
} }
if (!isEventCreature) return; string internalName = __instance.gameObject.name;
int cloneIndex = internalName.IndexOf("(Clone)");
if (cloneIndex != -1)
{
internalName = internalName.Substring(0, cloneIndex);
}
if (isEventCreature)
{
RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent(); RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent();
if (activeEvent != null) if (activeEvent != null)
{ {
ZPackage pkg = new ZPackage(); ZPackage pkg = new ZPackage();
pkg.Write(activeEvent.m_name); pkg.Write(activeEvent.m_name);
pkg.Write($"{activeEvent.m_pos}"); pkg.Write($"{activeEvent.m_pos}");
pkg.Write(Reward.EnemiesPointValue[internalName]);
ActiveEventData entry = MxValheimMod.ActiveEvents.Find(e => e.Position == activeEvent.m_pos.ToString()); ActiveEventData entry = MxValheimMod.ActiveEvents.Find(e => e.Position == activeEvent.m_pos.ToString());
if (entry == null) if (entry == null)
{ {
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerRegisterEvent", pkg); ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerRegisterEvent", pkg);
} else }
else
{ {
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerSetEventKill", pkg); ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerSetEventKill", pkg);
} }
@@ -155,15 +200,23 @@ namespace MxValheim.EventSystem
} }
int level = __instance.GetLevel(); 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(); Heightmap.Biome currentBiome = EnvMan.instance.GetCurrentBiome();
int expFinal = ((int)(exp * Experience.CalculateExpMultiplier(currentBiome))) + Profiles.serverLevel; int exp = Experience.CalculateExperience(internalName, level, currentBiome);
Experience.AddExperience(expFinal); 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);
}
} }
} }
} }

View File

@@ -1,15 +1,21 @@
using System; using EpicLoot;
using HarmonyLib;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Navigation;
using UnityEngine; using UnityEngine;
namespace MxValheim.EventSystem namespace MxValheim.EventSystem
{ {
internal class Reward 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>() Dictionary<int, int> biomeBase = new Dictionary<int, int>()
{ {
@@ -22,11 +28,19 @@ namespace MxValheim.EventSystem
{ 32, 70 }, { 32, 70 },
}; };
int rewardCoin = (biomeBase[((int)biome)] * level) + (biomeBase[((int)biome)] * kill); int rewardCoin = (biomeBase[((int)biome)] * level) + points;
return rewardCoin; 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) public static string GetRewardPrefab(int level, string type)
{ {
string[] foodList = { "OnionSoup", "CarrotSoup", "DeerStew", "Salad", "SerpentStew", "WolfMeatSkewer" }; string[] foodList = { "OnionSoup", "CarrotSoup", "DeerStew", "Salad", "SerpentStew", "WolfMeatSkewer" };
@@ -34,9 +48,9 @@ namespace MxValheim.EventSystem
string[] metalList = { "CopperOre", "TinOre", "IronScrap", "SilverOre", "BlackMetalScrap", "FlametalOreNew" }; string[] metalList = { "CopperOre", "TinOre", "IronScrap", "SilverOre", "BlackMetalScrap", "FlametalOreNew" };
System.Random rng = new System.Random(); 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 == "food") return foodList[foodTier];
if (type == "heal") return healList[healTier]; if (type == "heal") return healList[healTier];
@@ -44,6 +58,103 @@ namespace MxValheim.EventSystem
return "Wood"; return "Wood";
} }
public static void GiveEpicLootDust()
{
System.Random rand = new System.Random();
int qty = rand.Next(1, Profiles.serverLevel);
string[] rarity = GetRarityList(Watcher.eventPoints);
string itemName = $"Dust{globalRarity}";
Player player = Player.m_localPlayer;
if (player == null) return;
GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
if (prefab != null)
{
GiveItemSafe(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.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
{
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.eventPoints);
string itemName = $"Essence{globalRarity}";
Player player = Player.m_localPlayer;
if (player == null) return;
GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
if (prefab != null)
{
GiveItemSafe(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.eventPoints);
string itemName = $"Runestone{globalRarity}";
Player player = Player.m_localPlayer;
if (player == null) return;
GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
if (prefab != null)
{
GiveItemSafe(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) public static void GiveItemRandom(string itemName, int qty)
{ {
System.Random rng = new System.Random(); System.Random rng = new System.Random();
@@ -54,9 +165,7 @@ namespace MxValheim.EventSystem
GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName); GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
if (prefab != null) if (prefab != null)
{ {
player.GetInventory().AddItem(itemName, qty, 1, 0, 0, ""); GiveItemSafe(itemName, player, qty);
player.Message(MessageHud.MessageType.TopLeft, $"Received {qty}x {itemName}");
} }
else else
{ {
@@ -72,9 +181,11 @@ namespace MxValheim.EventSystem
GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName); GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
if (prefab != null) if (prefab != null)
{ {
player.GetInventory().AddItem(itemName, qty, 1, 0, 0, ""); GiveItemSafe(itemName, player, qty);
if (itemName == "Coins")
player.Message(MessageHud.MessageType.TopLeft, $"Received {qty}x {itemName}"); {
SendRewardMessage(player, prefab, itemName, qty);
}
} }
else else
{ {
@@ -82,6 +193,161 @@ 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
// --- 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 }
};
} }
} }

View File

@@ -10,7 +10,7 @@ namespace MxValheim.EventSystem
{ {
internal class Watcher internal class Watcher
{ {
public static int eventKill = 0; public static int eventPoints = 0;
public static void GetEventKill(long sender, ZPackage pkg) 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); 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) public static void SetEventKill(long sender, ZPackage pkg)
{ {
string eventName = pkg.ReadString(); string eventName = pkg.ReadString();
string eventPos = pkg.ReadString(); string eventPos = pkg.ReadString();
int killPoints = pkg.ReadInt();
int evindex = MxValheimMod.ActiveEvents.FindIndex(e => e.Position.ToString() == eventPos); 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); MxValheimMod.ActiveEvents.RemoveAt(evindex);
int newKill = evKill+1; int newPoints = eventPoints + killPoints;
eventKill = newKill; eventPoints = newPoints;
MxValheimMod.ActiveEventData newData = new MxValheimMod.ActiveEventData(eventName, eventPos, newKill); MxValheimMod.ActiveEventData newData = new MxValheimMod.ActiveEventData(eventName, eventPos, newPoints);
MxValheimMod.ActiveEvents.Add(newData); MxValheimMod.ActiveEvents.Add(newData);
} }
public static void RegisterEvent(long sender, ZPackage pkg) public static void RegisterEvent(long sender, ZPackage pkg)
{ {
eventPoints = 0;
string eventName = pkg.ReadString(); string eventName = pkg.ReadString();
string eventPos = 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); MxValheimMod.ActiveEvents.Add(newData);
} }
@@ -52,11 +55,17 @@ namespace MxValheim.EventSystem
string eventName = pkg.ReadString(); string eventName = pkg.ReadString();
string eventPos = 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)
{
evindex = MxValheimMod.ActiveEvents.FindIndex(e => e.Position.ToString() == eventPos);
MxValheimMod.ActiveEvents.RemoveAt(evindex); 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();
}
} }
} }
} }

View File

@@ -16,6 +16,8 @@ namespace MxValheim.KillFeed
{ {
public class KillFeed_Patch public class KillFeed_Patch
{ {
public static string lastVictimName = "";
public static string lastAttackerName = "";
public static Sprite LoadCustomSprite(string fileName) public static Sprite LoadCustomSprite(string fileName)
{ {
string path = Path.Combine(BepInEx.Paths.PluginPath, "MxValheim", "Icons", fileName); string path = Path.Combine(BepInEx.Paths.PluginPath, "MxValheim", "Icons", fileName);
@@ -74,6 +76,9 @@ namespace MxValheim.KillFeed
int type = subRemainder % 10; int type = subRemainder % 10;
// --- DECODING END --- // --- DECODING END ---
// Prevent the spam of multiple "same victim" kill to the feed
if (type == 2 && victim == lastVictimName && attacker == lastAttackerName) return;
// Inside OnReceiveKillMsg... // Inside OnReceiveKillMsg...
Sprite biomeSprite = null; Sprite biomeSprite = null;
switch (biomeIndex) switch (biomeIndex)
@@ -103,6 +108,7 @@ namespace MxValheim.KillFeed
string type1Separator = Localization.instance.Localize("$killfeed_format_type1"); string type1Separator = Localization.instance.Localize("$killfeed_format_type1");
string type2Separator = Localization.instance.Localize("$killfeed_format_type2"); string type2Separator = Localization.instance.Localize("$killfeed_format_type2");
string type3Separator = Localization.instance.Localize("$killfeed_format_type3"); string type3Separator = Localization.instance.Localize("$killfeed_format_type3");
string type4Separator = Localization.instance.Localize("$killfeed_format_type4");
string eventFormat = $"<color=#00ff06>{victim}</color>"; string eventFormat = $"<color=#00ff06>{victim}</color>";
string finalMsg = ""; string finalMsg = "";
string attackerFormat = ""; string attackerFormat = "";
@@ -147,12 +153,6 @@ namespace MxValheim.KillFeed
(type == 2) ? $"{attackerFormat}{type2Separator}{victimFormat}{distanceFormat}" : // Player Killed Something (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; Sprite weaponIcon = null;
if (ObjectDB.instance != null && !string.IsNullOrEmpty(weaponPrefab)) if (ObjectDB.instance != null && !string.IsNullOrEmpty(weaponPrefab))
@@ -191,6 +191,30 @@ namespace MxValheim.KillFeed
borderColor = new Color(0.0196f, 0.250f, 0.00750f); borderColor = new Color(0.0196f, 0.250f, 0.00750f);
} }
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) lock (_msgQueue)
{ {
_msgQueue.Enqueue(finalMsg); _msgQueue.Enqueue(finalMsg);
@@ -344,6 +368,8 @@ namespace MxValheim.KillFeed
} }
string victimName = __instance.GetHoverName(); string victimName = __instance.GetHoverName();
if (victimName == null || victimName == "") return;
int type = 0; int type = 0;
if (__instance.IsPlayer()) if (__instance.IsPlayer())
{ {
@@ -467,8 +493,8 @@ namespace MxValheim.KillFeed
_weaponIconSlot = iconObj.GetComponent<Image>(); _weaponIconSlot = iconObj.GetComponent<Image>();
_weaponIconSlot.preserveAspect = true; _weaponIconSlot.preserveAspect = true;
LayoutElement weaponLayout = iconObj.AddComponent<LayoutElement>(); LayoutElement weaponLayout = iconObj.AddComponent<LayoutElement>();
weaponLayout.preferredWidth = 24; weaponLayout.preferredWidth = 32;
weaponLayout.preferredHeight = 24; weaponLayout.preferredHeight = 32;
RectTransform iRect = iconObj.GetComponent<RectTransform>(); RectTransform iRect = iconObj.GetComponent<RectTransform>();
iRect.anchorMin = iRect.anchorMax = iRect.pivot = new Vector2(0, 0.5f); 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)); GameObject textObj = new GameObject("Text", typeof(RectTransform), typeof(Text));
textObj.transform.SetParent(panel.transform, false); textObj.transform.SetParent(panel.transform, false);
_killText = textObj.GetComponent<Text>(); _killText = textObj.GetComponent<Text>();
// Important: Text needs to have its "Horizontal Overflow" set to Wrap or Overflow
_killText.horizontalOverflow = HorizontalWrapMode.Overflow; _killText.horizontalOverflow = HorizontalWrapMode.Overflow;
// Attempt to find Valheim's specific font, fallback to Arial if not found
Font valheimFont = null; Font valheimFont = null;
foreach (Font f in Resources.FindObjectsOfTypeAll<Font>()) 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) if (valheimFont == null)
{ {
valheimFont = Resources.GetBuiltinResource<Font>("Arial.ttf"); valheimFont = Resources.GetBuiltinResource<Font>("Arial.ttf");
@@ -512,8 +535,8 @@ namespace MxValheim.KillFeed
_victimIconSlot = victimObj.GetComponent<Image>(); _victimIconSlot = victimObj.GetComponent<Image>();
_victimIconSlot.preserveAspect = true; _victimIconSlot.preserveAspect = true;
LayoutElement victimLayout = victimObj.AddComponent<LayoutElement>(); LayoutElement victimLayout = victimObj.AddComponent<LayoutElement>();
victimLayout.preferredWidth = 24; victimLayout.preferredWidth = 32;
victimLayout.preferredHeight = 24; victimLayout.preferredHeight = 32;
RectTransform vRect = victimObj.GetComponent<RectTransform>(); RectTransform vRect = victimObj.GetComponent<RectTransform>();
vRect.anchorMin = vRect.anchorMax = vRect.pivot = new Vector2(1, 0.5f); vRect.anchorMin = vRect.anchorMax = vRect.pivot = new Vector2(1, 0.5f);

View File

@@ -7,7 +7,6 @@ using MxValheim.KillFeed;
using MxValheim.Patch; using MxValheim.Patch;
using MxValheim.Patch.HUD; using MxValheim.Patch.HUD;
using Newtonsoft.Json; using Newtonsoft.Json;
using Splatform;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
@@ -34,16 +33,10 @@ public class MxValheimMod : BaseUnityPlugin
private const string ModGUID = "ovh.mxdev.mxvalheim"; private const string ModGUID = "ovh.mxdev.mxvalheim";
private const string ModName = "MxValheim"; private const string ModName = "MxValheim";
private const string ModVersion = "1.6.6"; private const string ModVersion = "1.6.13";
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<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 modPath = Path.Combine(Paths.PluginPath, "MxValheim");
public static string internalConfigsPath = Path.Combine(modPath, "Configs"); public static string internalConfigsPath = Path.Combine(modPath, "Configs");
@@ -93,17 +86,19 @@ public class MxValheimMod : BaseUnityPlugin
public static float _uniqueTimer = 60.0f; public static float _uniqueTimer = 60.0f;
public static string eventName; public static string eventName;
public static float eventTimer = 0f;
public class ActiveEventData public class ActiveEventData
{ {
public string Name; public string Name;
public string Position; 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; Name = name;
Position = pos; Position = pos;
Kills = kills; Points = points;
} }
} }
@@ -113,19 +108,14 @@ public class MxValheimMod : BaseUnityPlugin
{ {
Instance = this; 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_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(); LoadLocalization();
LoadJsonConfig(); LoadJsonConfig();
LoadDoorConfig(); LoadDoorConfig();
_doorTimer = MxValheimMod.Config_autoDoorClose.Value; _doorTimer = 2;
//PrefabManager.OnVanillaPrefabsAvailable += InitCustomEnemies; //PrefabManager.OnVanillaPrefabsAvailable += InitCustomEnemies;
@@ -184,10 +174,13 @@ public class MxValheimMod : BaseUnityPlugin
ZRoutedRpc.instance.Register<string, string, string, string, int>("RPC_MxKillMsg", ZRoutedRpc.instance.Register<string, string, string, string, int>("RPC_MxKillMsg",
new RoutedMethod<string, string, string, string, int>.Method(kfp.OnReceiveKillMsg)); 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_ServerRegisterEvent", Watcher.RegisterEvent);
ZRoutedRpc.instance.Register<ZPackage>("RPC_ServerGetEventKill", Watcher.GetEventKill); ZRoutedRpc.instance.Register<ZPackage>("RPC_ServerGetEventKill", Watcher.GetEventKill);
ZRoutedRpc.instance.Register<ZPackage>("RPC_ServerSetEventKill", Watcher.SetEventKill); ZRoutedRpc.instance.Register<ZPackage>("RPC_ServerSetEventKill", Watcher.SetEventKill);
ZRoutedRpc.instance.Register<ZPackage>("RPC_ServerRemoveEvent", Watcher.RemoveEvent); ZRoutedRpc.instance.Register<ZPackage>("RPC_ServerRemoveEvent", Watcher.RemoveEvent);
ZRoutedRpc.instance.Register<int>("RPC_ServerRegisterEventKill", Profiles.ServerSetLevel); ZRoutedRpc.instance.Register<int>("RPC_ServerRegisterEventKill", Profiles.ServerSetLevel);
ZRoutedRpc.instance.Register<string, string>("RPC_ServerCreateUser", Profiles.ServerReceiveCreateUser); ZRoutedRpc.instance.Register<string, string>("RPC_ServerCreateUser", Profiles.ServerReceiveCreateUser);
ZRoutedRpc.instance.Register<string>("RPC_RequestProfile", Profiles.ServerHandleProfileRequest); ZRoutedRpc.instance.Register<string>("RPC_RequestProfile", Profiles.ServerHandleProfileRequest);
@@ -240,12 +233,13 @@ public class MxValheimMod : BaseUnityPlugin
int day = EnvMan.instance.GetDay(); int day = EnvMan.instance.GetDay();
string pid = GetUserPlayerID(Player.m_localPlayer).ToString(); 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) 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 } 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>";
} }
} }
} }
@@ -261,7 +255,7 @@ public class MxValheimMod : BaseUnityPlugin
if (_doorTimer <= 0) if (_doorTimer <= 0)
{ {
dpatch.CloseNextDoor(_doorQueueDoor.Dequeue(), _doorQueueNview.Dequeue(), _doorQueueName.Dequeue()); dpatch.CloseNextDoor(_doorQueueDoor.Dequeue(), _doorQueueNview.Dequeue(), _doorQueueName.Dequeue());
_doorTimer = MxValheimMod.Config_autoDoorClose.Value; _doorTimer = 2;
} }
} }
// Door Logic // Door Logic

View File

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

View File

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

View File

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

View File

@@ -53,10 +53,9 @@ namespace MxValheim.Patch.HUD
canvas.renderMode = RenderMode.ScreenSpaceOverlay; canvas.renderMode = RenderMode.ScreenSpaceOverlay;
canvas.sortingOrder = 999; canvas.sortingOrder = 999;
// --- CLOCK PANEL ---
GameObject panelObj = new GameObject("TextBackground"); GameObject panelObj = new GameObject("TextBackground");
panelObj.transform.SetParent(m_canvasObject.transform, false); 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>(); ContentSizeFitter fitter = panelObj.AddComponent<ContentSizeFitter>();
fitter.horizontalFit = ContentSizeFitter.FitMode.PreferredSize; fitter.horizontalFit = ContentSizeFitter.FitMode.PreferredSize;
@@ -71,36 +70,48 @@ namespace MxValheim.Patch.HUD
panelRect.pivot = new Vector2(0.5f, 1.0f); panelRect.pivot = new Vector2(0.5f, 1.0f);
panelRect.anchoredPosition = new Vector2(0, -5); panelRect.anchoredPosition = new Vector2(0, -5);
// --- TEXT ---
GameObject textObj = new GameObject("ModdedText"); GameObject textObj = new GameObject("ModdedText");
textObj.transform.SetParent(panelObj.transform, false); textObj.transform.SetParent(panelObj.transform, false);
m_textComponent = textObj.AddComponent<Text>(); 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.fontSize = 18;
m_textComponent.color = Color.white; m_textComponent.color = Color.white;
// --- PROGRESS BAR CONTAINER ---
// This sits under the main rectangle
GameObject barBgObj = new GameObject("BarBackground"); GameObject barBgObj = new GameObject("BarBackground");
barBgObj.transform.SetParent(m_canvasObject.transform, false); 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>(); RectTransform barBgRect = barBgObj.GetComponent<RectTransform>();
barBgRect.anchorMin = new Vector2(0.5f, 1.0f); barBgRect.anchorMin = new Vector2(0.5f, 1.0f);
barBgRect.anchorMax = new Vector2(0.5f, 1.0f); barBgRect.anchorMax = new Vector2(0.5f, 1.0f);
barBgRect.pivot = 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.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 --- // --- PROGRESS BAR FILL ---
GameObject fillObj = new GameObject("BarFill"); GameObject fillObj = new GameObject("BarFill");
fillObj.transform.SetParent(barBgObj.transform, false); 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 = fillObj.GetComponent<RectTransform>();
m_barFill.anchorMin = new Vector2(0, 0); 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.pivot = new Vector2(0, 0.5f);
m_barFill.offsetMin = Vector2.zero; m_barFill.offsetMin = Vector2.zero;
m_barFill.offsetMax = Vector2.zero; m_barFill.offsetMax = Vector2.zero;

View File

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

View File

@@ -1,15 +1,26 @@
![logo](https://mxio.ovh/gaming/valheim/mxvalheim.png) ![logo](https://mxio.ovh/gaming/valheim/mxvalheim_valtint.png)
## MxValheim ## MxValheim
Official **MxValheim Server** Mod. Official **MxValheim Server** Mod.
**This mod is created to be used Client/Server side. A lot of features are not working in solo mode.** **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/)
## Features ## Features
- Enhanced Event System with level and reward based on current biome. - Enhanced Event System with level and reward based on current biome.
- Display the day and the formated time in-game. - Display the day and the formated time in-game.
- Use your client language with built-in localization. - Use your client language with built-in localization.
- Kill Feed with custom UI showing player kill and death. - 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.) - Ore drop multiplier. (Value available in the generated config.)
- Workbench crafting range 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.) - Reduce Bow draw time for each upgrade level. (Value available in the generated config.)