5 Commits
1.6.4 ... 1.6.7

Author SHA1 Message Date
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
mikx
366e2f5570 (1.6.6) Event Enemies Detection + Kill Count 2026-02-21 05:38:58 -05:00
mikx
90bb020a44 (1.6.5) Item Drops Settings from Json 2026-02-18 17:20:30 -05:00
15 changed files with 766 additions and 137 deletions

View File

@@ -15,7 +15,7 @@ namespace MxValheim.EventSystem
return (level * 100); return (level * 100);
} }
public static float CalculateExpMultiplier(int level, 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>()
{ {

View File

@@ -1,5 +1,6 @@
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;
@@ -28,6 +29,15 @@ namespace MxValheim.EventSystem
} }
} }
[HarmonyPatch(typeof(RandEventSystem), nameof(RandEventSystem.Awake))]
public static class EventRadiusPatch
{
static void Postfix(RandEventSystem __instance)
{
}
}
[HarmonyPatch(typeof(RandEventSystem), nameof(RandEventSystem.StartRandomEvent))] [HarmonyPatch(typeof(RandEventSystem), nameof(RandEventSystem.StartRandomEvent))]
public static class DebugRaidFrequency public static class DebugRaidFrequency
{ {
@@ -45,8 +55,17 @@ namespace MxValheim.EventSystem
{ {
static void Prefix(RandEventSystem __instance) static void Prefix(RandEventSystem __instance)
{ {
//__instance.m_eventIntervalMin = 10f; if (MxValheimMod.Config_DebugRandomEventInterval.Value)
//__instance.m_eventChance = 100f; {
__instance.m_eventIntervalMin = 10f;
__instance.m_eventChance = 100f;
}
RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent();
if (activeEvent != null)
{
activeEvent.m_eventRange = 200f;
activeEvent.m_duration = 10f;
}
} }
} }
@@ -56,16 +75,23 @@ namespace MxValheim.EventSystem
private static readonly AccessTools.FieldRef<RandEventSystem, RandomEvent> ActiveEventField = AccessTools.FieldRefAccess<RandEventSystem, RandomEvent>("m_activeEvent"); private static readonly AccessTools.FieldRef<RandEventSystem, RandomEvent> ActiveEventField = AccessTools.FieldRefAccess<RandEventSystem, RandomEvent>("m_activeEvent");
static void Prefix(RandEventSystem __instance, string eventName) static void Prefix(RandEventSystem __instance, string eventName)
{ {
RandomEvent currentRaid = ActiveEventField(__instance); RandomEvent currentRaid = ActiveEventField(__instance);
if (string.IsNullOrEmpty(eventName) && currentRaid != null) if (string.IsNullOrEmpty(eventName) && currentRaid != null)
{ {
int kill = 0;
ZPackage pkg = new ZPackage();
pkg.Write(currentRaid.m_name);
pkg.Write($"{currentRaid.m_pos}");
kill = Watcher.eventKill;
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 <= 96f)
{ {
Heightmap.Biome currentBiome = EnvMan.instance.GetCurrentBiome(); Heightmap.Biome currentBiome = EnvMan.instance.GetCurrentBiome();
Reward.GiveItemStatic("Coins", Reward.CalculateRewardCoin(Profiles.serverLevel, currentBiome)); Reward.GiveItemStatic("Coins", Reward.CalculateRewardCoin(Profiles.serverLevel, currentBiome, kill));
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) if (rand.Next(100) < 50)
@@ -80,6 +106,12 @@ namespace MxValheim.EventSystem
{ {
Reward.GiveItemRandom(Reward.GetRewardPrefab(Profiles.serverLevel, "metal"), rand.Next(5, 20)); Reward.GiveItemRandom(Reward.GetRewardPrefab(Profiles.serverLevel, "metal"), rand.Next(5, 20));
} }
if (Chainloader.PluginInfos.ContainsKey("randyknapp.mods.epicloot"))
{
Reward.GiveEpicLootLowMats();
Reward.GiveEpicLootEssence();
Reward.GiveEpicLootRune();
}
} }
} }
} }
@@ -102,12 +134,10 @@ namespace MxValheim.EventSystem
} }
} }
// Hiding the yellow persistent text at the top center
if (RandEventSystem.instance != null && RandEventSystem.instance.GetActiveEvent() != null) if (RandEventSystem.instance != null && RandEventSystem.instance.GetActiveEvent() != null)
{ {
// We set the text to an empty string so it doesn't render
__instance.m_eventName.text = ""; __instance.m_eventName.text = "";
} }
} }
} }
@@ -116,66 +146,48 @@ namespace MxValheim.EventSystem
{ {
static void Postfix(Character __instance) static void Postfix(Character __instance)
{ {
// Check if the character is dead or just died
if (__instance.GetHealth() <= 0f) if (__instance.GetHealth() <= 0f)
{ {
ZNetView nview = __instance.GetComponent<ZNetView>(); ZNetView nview = __instance.GetComponent<ZNetView>();
// This check should now pass because ApplyDamage happens before the object is invalidated
if (nview == null || !nview.IsValid() || !nview.IsOwner()) return; if (nview == null || !nview.IsValid() || !nview.IsOwner()) return;
// 2. Check if a raid is active MonsterAI mai = __instance.GetComponent<MonsterAI>();
bool isEventCreature = false;
if (mai != null)
{
isEventCreature = Traverse.Create(mai).Field<bool>("m_eventCreature").Value;
}
if (!isEventCreature) return;
RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent(); RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent();
if (activeEvent == null) return; if (activeEvent != null)
Vector3 playerPos = Player.m_localPlayer.transform.position;
float distance = Vector3.Distance(playerPos, activeEvent.m_pos);
MonsterAI mai = __instance.GetComponent<MonsterAI>();
bool isEventCreature = false;
if (mai != null)
{ {
isEventCreature = Traverse.Create(mai).Field<bool>("m_eventCreature").Value; ZPackage pkg = new ZPackage();
} pkg.Write(activeEvent.m_name);
Debug.Log($"EventSystem: Event Enemy {nview.GetZDO().GetBool(ZDOVars.s_eventCreature, isEventCreature)}"); 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);
}
if (distance <= 96f) int level = __instance.GetLevel();
{ int exp =
int level = __instance.GetLevel(); (level == 1) ? 2 :
int exp = (level == 2) ? 4 :
(level == 1) ? 2 : (level == 3) ? 6 :
(level == 2) ? 4 : 6;
(level == 3) ? 6 : ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_RequestProfile", "Event");
6; Heightmap.Biome currentBiome = EnvMan.instance.GetCurrentBiome();
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_RequestProfile", "Event"); int expFinal = ((int)(exp * Experience.CalculateExpMultiplier(currentBiome))) + Profiles.serverLevel;
Heightmap.Biome currentBiome = EnvMan.instance.GetCurrentBiome(); Experience.AddExperience(expFinal);
int expFinal = (int)(exp * Experience.CalculateExpMultiplier(Profiles.serverLevel, currentBiome));
Experience.AddExperience(expFinal);
}
}
}
}
[HarmonyPatch(typeof(Character), nameof(Character.ApplyDamage))]
public static class DeathNotifierEvent
{
static void Postfix(Character __instance)
{
// Check if the character is dead or just died
if (__instance.GetHealth() <= 0f)
{
ZNetView nview = __instance.GetComponent<ZNetView>();
// This check should now pass because ApplyDamage happens before the object is invalidated
if (nview == null || !nview.IsValid() || !nview.IsOwner()) return;
MonsterAI mai = __instance.GetComponent<MonsterAI>();
bool isEventCreature = false;
if (mai != null)
{
isEventCreature = Traverse.Create(mai).Field<bool>("m_eventCreature").Value;
}
Debug.Log($"EventSystem: Event Enemy {nview.GetZDO().GetBool(ZDOVars.s_eventCreature, isEventCreature)}");
} }
} }
} }

View File

@@ -20,7 +20,6 @@ namespace MxValheim.EventSystem
public static int serverLevel = 1; public static int serverLevel = 1;
public static int serverExperience = 0; public static int serverExperience = 0;
public static void ServerUserExists(string playerid) public static void ServerUserExists(string playerid)
{ {
// Check to ensure this is actually the server running this // Check to ensure this is actually the server running this

View File

@@ -0,0 +1,158 @@
using HarmonyLib;
using Jotunn.Configs;
using Jotunn.Entities;
using Jotunn.Managers;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnityEngine;
using static DropTable;
namespace MxValheim.EventSystem.RandomUnique
{
internal class SpawnManager
{
public class SpawnConditionsData
{
public bool WorldSpawnEnabled;
public string Biome;
public float SpawnChance;
public int MaxSpawned;
public float SpawnInterval;
public float SpawnDistance;
public bool SpawnInForest;
public bool SpawnOutsideForest;
public float MinAltitude;
public float MaxAltitude;
public int MinGroupSize;
public int MaxGroupSize;
public bool SpawnAtDay;
public bool SpawnAtNight;
public int MinLevel;
}
public class DropData
{
public string ItemName;
public int Min;
public int Max;
public float Chance;
public bool OnePerPlayer;
}
public class EquipmentData
{
public string RightHand;
public string LeftHand;
public string Chest;
public string Legs;
public string Back;
}
public class EnemyTemplate
{
public string PrefabToClone;
public string InternalName;
public string HoverName;
public string Faction;
public float Health;
public float Speed;
public float Scale;
public ColorData ColorTint;
public SpawnConditionsData SpawnConditions;
public List<DropData> DropTable;
public EquipmentData Equipment;
}
public class ColorData
{
public float r;
public float g;
public float b;
public float intensity;
}
public static void RegisterWithWorldSpawn(GameObject customEnemy, EnemyTemplate data)
{
var spawnConfig = new SpawnConfig
{
Name = data.InternalName + "_Spawn",
WorldSpawnEnabled = data.SpawnConditions.WorldSpawnEnabled,
Biome = (Heightmap.Biome)Enum.Parse(typeof(Heightmap.Biome), data.SpawnConditions.Biome),
SpawnChance = data.SpawnConditions.SpawnChance,
MaxSpawned = data.SpawnConditions.MaxSpawned,
SpawnInterval = data.SpawnConditions.SpawnInterval,
SpawnDistance = data.SpawnConditions.SpawnDistance,
SpawnInForest = data.SpawnConditions.SpawnInForest,
SpawnOutsideForest = data.SpawnConditions.SpawnOutsideForest,
MinAltitude = data.SpawnConditions.MinAltitude,
MaxAltitude = data.SpawnConditions.MaxAltitude,
MinGroupSize = data.SpawnConditions.MinGroupSize,
MaxGroupSize = data.SpawnConditions.MaxGroupSize,
SpawnAtDay = !data.SpawnConditions.SpawnAtDay,
SpawnAtNight = data.SpawnConditions.SpawnAtNight,
MinLevel = data.SpawnConditions.MinLevel,
};
var creatureConfig = new CreatureConfig();
creatureConfig.Name = data.HoverName;
creatureConfig.AddSpawnConfig(spawnConfig);
CreatureManager.Instance.AddCreature(new CustomCreature(customEnemy, true, creatureConfig));
Debug.Log($"[MxValheim] {data.InternalName} registered correctly with CreatureConfig!");
}
[HarmonyPatch(typeof(Hud), nameof(Hud.Update))]
public static class Hud_Update_SpawnManager
{
static void Postfix(Hud __instance)
{
if (Player.m_localPlayer == null || !Player.m_localPlayer.IsDead()) return;
if (MxValheimMod._uniqueTimer > 0)
{
MxValheimMod._uniqueTimer -= Time.deltaTime;
}
if (MxValheimMod._uniqueTimer <= 0)
{
int pb = GetPlayerBiomeIndex(Player.m_localPlayer);
System.Random rand = new System.Random();
if (rand.Next(100) < 25)
{
switch (pb)
{
case 1: break;
}
}
MxValheimMod._uniqueTimer = 60.0f;
}
}
}
public static int GetPlayerBiomeIndex(Player player)
{
int biomeIndex = 0;
Heightmap.Biome currentBiome = player.GetCurrentBiome();
Debug.Log($"KillFeed: {currentBiome}");
if (currentBiome == Heightmap.Biome.Meadows) biomeIndex = 1;
else if (currentBiome == Heightmap.Biome.BlackForest) biomeIndex = 2;
else if (currentBiome == Heightmap.Biome.Swamp) biomeIndex = 3;
else if (currentBiome == Heightmap.Biome.Mountain) biomeIndex = 4;
else if (currentBiome == Heightmap.Biome.Plains) biomeIndex = 5;
else if (currentBiome == Heightmap.Biome.Mistlands) biomeIndex = 6;
else if (currentBiome == Heightmap.Biome.DeepNorth) biomeIndex = 7;
else if (currentBiome == Heightmap.Biome.AshLands) biomeIndex = 8;
else if (currentBiome == Heightmap.Biome.Ocean) biomeIndex = 9;
return biomeIndex;
}
}
}

View File

@@ -0,0 +1,265 @@
using Jotunn.Managers;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnityEngine;
using static MxValheim.EventSystem.RandomUnique.SpawnManager;
namespace MxValheim.EventSystem.RandomUnique
{
internal class UniqueManager
{
public static void LoadAllTemplates()
{
string uniqueFolder = Path.Combine(MxValheimMod.internalDataPath, "UniqueEnemy");
if (!Directory.Exists(uniqueFolder))
{
Directory.CreateDirectory(uniqueFolder);
}
string[] jsonFiles = Directory.GetFiles(uniqueFolder, "*.json");
foreach (string filePath in jsonFiles)
{
try
{
string jsonContent = File.ReadAllText(filePath);
LoadEnemyFromJson(jsonContent);
Debug.Log($"Loaded custom enemy from: {Path.GetFileName(filePath)}");
}
catch (System.Exception ex)
{
Debug.LogError($"Failed to load {filePath}: {ex.Message}");
}
}
}
public static void LoadEnemyFromJson(string jsonContent)
{
var data = JsonConvert.DeserializeObject<EnemyTemplate>(jsonContent);
GameObject customEnemy = PrefabManager.Instance.CreateClonedPrefab(data.InternalName, data.PrefabToClone);
Character character = customEnemy.GetComponent<Character>();
if (character != null)
{
character.m_name = data.HoverName;
character.m_health = data.Health;
character.m_speed = data.Speed;
character.m_faction = Character.Faction.Boss;
}
customEnemy.transform.localScale = new Vector3(data.Scale, data.Scale, data.Scale);
PrefabManager.Instance.AddPrefab(customEnemy);
Debug.Log($"Successfully injected {data.InternalName} into Valheim!");
}
public static List<EnemyTemplate> LoadTemplatesFromFolder()
{
List<EnemyTemplate> loadedTemplates = new List<EnemyTemplate>();
string configFolder = Path.Combine(MxValheimMod.internalDataPath, "UniqueEnemy");
if (!Directory.Exists(configFolder))
{
Directory.CreateDirectory(configFolder);
return loadedTemplates;
}
string[] files = Directory.GetFiles(configFolder, "*.json");
foreach (string file in files)
{
try
{
string json = File.ReadAllText(file);
EnemyTemplate template = JsonConvert.DeserializeObject<EnemyTemplate>(json);
if (template != null)
{
loadedTemplates.Add(template);
Debug.Log($"Loaded template: {template.InternalName} from {Path.GetFileName(file)}");
}
}
catch (Exception ex)
{
Debug.Log($"Error loading JSON file {file}: {ex.Message}");
}
}
return loadedTemplates;
}
public static void ApplyEquipment(GameObject customEnemy, EnemyTemplate data)
{
Humanoid humanoid = customEnemy.GetComponent<Humanoid>();
if (humanoid == null) return;
humanoid.m_defaultItems = new GameObject[0];
List<GameObject> equipmentList = new List<GameObject>();
void AddToGear(string prefabName)
{
if (string.IsNullOrEmpty(prefabName)) return;
GameObject item = ObjectDB.instance.GetItemPrefab(prefabName);
if (item != null) equipmentList.Add(item);
}
AddToGear(data.Equipment.RightHand);
AddToGear(data.Equipment.LeftHand);
AddToGear(data.Equipment.Chest);
AddToGear(data.Equipment.Legs);
AddToGear(data.Equipment.Back);
humanoid.m_defaultItems = equipmentList.ToArray();
}
public static void ApplyDropTable(GameObject customEnemy, EnemyTemplate data)
{
CharacterDrop dropComp = customEnemy.GetComponent<CharacterDrop>();
if (dropComp == null)
{
dropComp = customEnemy.AddComponent<CharacterDrop>();
}
dropComp.m_drops.Clear();
foreach (var dropInfo in data.DropTable)
{
GameObject itemPrefab = ObjectDB.instance.GetItemPrefab(dropInfo.ItemName);
if (itemPrefab != null)
{
CharacterDrop.Drop newDrop = new CharacterDrop.Drop
{
m_prefab = itemPrefab,
m_amountMin = dropInfo.Min,
m_amountMax = dropInfo.Max,
m_chance = dropInfo.Chance,
m_onePerPlayer = dropInfo.OnePerPlayer
};
dropComp.m_drops.Add(newDrop);
}
}
}
public static void ApplyStats(GameObject customEnemy, EnemyTemplate data)
{
Character character = customEnemy.GetComponent<Character>();
if (character != null)
{
character.m_name = data.HoverName;
if (!string.IsNullOrEmpty(data.Faction) &&
Enum.TryParse(data.Faction, out Character.Faction factionEnum))
{
character.m_faction = factionEnum;
}
else
{
character.m_faction = Character.Faction.Undead;
}
typeof(Character).GetField("m_maxHealth", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)
?.SetValue(character, data.Health);
character.m_health = data.Health;
typeof(Character).GetField("m_tamed", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)
?.SetValue(character, false);
var tameable = customEnemy.GetComponent<Tameable>();
if (tameable != null)
{
UnityEngine.Object.DestroyImmediate(tameable);
}
var procreation = customEnemy.GetComponent<Procreation>();
if (procreation != null) UnityEngine.Object.DestroyImmediate(procreation);
character.m_speed = data.Speed;
character.m_runSpeed = data.Speed * 1.5f;
}
BaseAI ai = customEnemy.GetComponent<BaseAI>();
if (ai != null && character != null)
{
typeof(BaseAI).GetField("m_character", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)?.SetValue(ai, character);
typeof(BaseAI).GetField("m_aggravated", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)?.SetValue(ai, true);
ai.m_viewRange = 50f;
}
Rigidbody rb = customEnemy.GetComponent<Rigidbody>();
if (rb != null)
{
rb.isKinematic = false;
rb.useGravity = true;
}
ZNetView nview = customEnemy.GetComponent<ZNetView>();
if (nview != null)
{
nview.m_type = ZDO.ObjectType.Default;
nview.m_syncInitialScale = true;
}
UnityEngine.AI.NavMeshAgent agent = customEnemy.GetComponent<UnityEngine.AI.NavMeshAgent>();
if (agent != null)
{
agent.enabled = true;
agent.updatePosition = true;
agent.updateRotation = true;
agent.stoppingDistance = 1.0f;
}
nview.GetZDO()?.Set("m_eventCreature", true);
customEnemy.transform.localScale = Vector3.one * data.Scale;
if (nview != null)
{
nview.SetLocalScale(customEnemy.transform.localScale);
}
}
public static void ApplyColorTint(GameObject customEnemy, EnemyTemplate data)
{
if (data.ColorTint == null) return;
// Convert JSON floats to a Unity Color object
Color customColor = new Color(data.ColorTint.r, data.ColorTint.g, data.ColorTint.b);
// Find all renderers (body, head, etc.)
var renderers = customEnemy.GetComponentsInChildren<Renderer>();
foreach (var renderer in renderers)
{
// We use 'material' (singular) to create a unique instance for THIS enemy
foreach (var mat in renderer.materials)
{
// '_Color' is the standard main tint property in most Valheim shaders
if (mat.HasProperty("_Color"))
{
mat.SetColor("_Color", customColor);
}
// Optional: If you want them to GLOW slightly, set the Emission
if (mat.HasProperty("_EmissionColor"))
{
mat.SetColor("_EmissionColor", customColor * 0.5f);
mat.EnableKeyword("_EMISSION");
}
}
}
}
}
}

View File

@@ -1,6 +1,8 @@
using System; using EpicLoot;
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 UnityEngine; using UnityEngine;
@@ -9,7 +11,7 @@ namespace MxValheim.EventSystem
{ {
internal class Reward internal class Reward
{ {
public static int CalculateRewardCoin(int level, Heightmap.Biome biome) public static int CalculateRewardCoin(int level, Heightmap.Biome biome, int kill)
{ {
Dictionary<int, int> biomeBase = new Dictionary<int, int>() Dictionary<int, int> biomeBase = new Dictionary<int, int>()
{ {
@@ -22,7 +24,7 @@ namespace MxValheim.EventSystem
{ 32, 70 }, { 32, 70 },
}; };
int rewardCoin = biomeBase[((int)biome)] * level; int rewardCoin = (biomeBase[((int)biome)] * level) + (biomeBase[((int)biome)] * kill);
return rewardCoin; return rewardCoin;
} }
@@ -34,9 +36,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 +46,85 @@ namespace MxValheim.EventSystem
return "Wood"; return "Wood";
} }
public static void GiveEpicLootLowMats()
{
System.Random rand = new System.Random();
int qty = rand.Next(5,10);
string[] rarity = { "Magic", "Rare", "Epic", "Legendary", "Mythic" };
string[] type = { "Dust", "Shard", "Fragment" };
string itemName = $"{type[rand.Next(0, type.Length - 1)]}{rarity[rand.Next(0, rarity.Length - 1)]}";
Player player = Player.m_localPlayer;
if (player == null) return;
GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
if (prefab != null)
{
player.GetInventory().AddItem(itemName, qty, 1, 0, 0, "");
player.Message(MessageHud.MessageType.TopLeft, $"Received {qty}x {itemName}");
}
else
{
Debug.LogWarning($"Item {itemName} not found in ObjectDB!");
}
}
public static void GiveEpicLootEssence()
{
System.Random rand = new System.Random();
int qty = rand.Next(1, 5);
string[] rarity = { "Magic", "Rare", "Epic", "Legendary", "Mythic" };
string itemName = $"Essence{rarity[rand.Next(0, rarity.Length - 1)]}";
Player player = Player.m_localPlayer;
if (player == null) return;
GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
if (prefab != null)
{
player.GetInventory().AddItem(itemName, qty, 1, 0, 0, "");
player.Message(MessageHud.MessageType.TopLeft, $"Received {qty}x {itemName}");
}
else
{
Debug.LogWarning($"Item {itemName} not found in ObjectDB!");
}
}
public static void GiveEpicLootRune()
{
System.Random rand = new System.Random();
int qty = 1;
string[] rarity = { "Magic", "Rare", "Epic" };
string itemName = $"Runestone{rarity[rand.Next(0, rarity.Length - 1)]}";
Player player = Player.m_localPlayer;
if (player == null) return;
GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
if (prefab != null)
{
player.GetInventory().AddItem(itemName, qty, 1, 0, 0, "");
player.Message(MessageHud.MessageType.TopLeft, $"Received {qty}x {itemName}");
}
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();

View File

@@ -0,0 +1,62 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnityEngine;
namespace MxValheim.EventSystem
{
internal class Watcher
{
public static int eventKill = 0;
public static void GetEventKill(long sender, ZPackage pkg)
{
string eventName = pkg.ReadString();
string eventPos = pkg.ReadString();
int evindex = MxValheimMod.ActiveEvents.FindIndex(e => e.Position.ToString() == eventPos);
eventKill = MxValheimMod.ActiveEvents[evindex].Kills;
}
public static void SetEventKill(long sender, ZPackage pkg)
{
string eventName = pkg.ReadString();
string eventPos = pkg.ReadString();
int evindex = MxValheimMod.ActiveEvents.FindIndex(e => e.Position.ToString() == eventPos);
int evKill = MxValheimMod.ActiveEvents[evindex].Kills;
MxValheimMod.ActiveEvents.RemoveAt(evindex);
int newKill = evKill+1;
eventKill = newKill;
MxValheimMod.ActiveEventData newData = new MxValheimMod.ActiveEventData(eventName, eventPos, newKill);
MxValheimMod.ActiveEvents.Add(newData);
}
public static void RegisterEvent(long sender, ZPackage pkg)
{
string eventName = pkg.ReadString();
string eventPos = pkg.ReadString();
MxValheimMod.ActiveEventData newData = new MxValheimMod.ActiveEventData(eventName, eventPos, 1);
MxValheimMod.ActiveEvents.Add(newData);
}
public static void RemoveEvent(long sender, ZPackage pkg)
{
string eventName = pkg.ReadString();
string eventPos = pkg.ReadString();
int evindex = MxValheimMod.ActiveEvents.FindIndex(e => e.Position.ToString() == eventPos);
eventKill = 0;
MxValheimMod.ActiveEvents.RemoveAt(evindex);
}
}
}

View File

@@ -1,12 +1,12 @@
using BepInEx; using BepInEx;
using BepInEx.Configuration; using BepInEx.Configuration;
using HarmonyLib; using HarmonyLib;
using Jotunn.Managers;
using MxValheim.EventSystem; using MxValheim.EventSystem;
using MxValheim.KillFeed; 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;
@@ -16,10 +16,15 @@ using System.Threading;
using System.Xml; using System.Xml;
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI; using UnityEngine.UI;
using static MxValheim.EventSystem.RandomUnique.SpawnManager;
using static MxValheim.EventSystem.RandomUnique.UniqueManager;
using static MxValheim.EventSystem.Watcher;
using static MxValheim.Patch.Doors_Patch; using static MxValheim.Patch.Doors_Patch;
[BepInPlugin(ModGUID, ModName, ModVersion)] [BepInPlugin(ModGUID, ModName, ModVersion)]
[BepInDependency(Jotunn.Main.ModGuid)]
public class MxValheimMod : BaseUnityPlugin public class MxValheimMod : BaseUnityPlugin
{ {
public static MxValheimMod Instance; // Singleton reference public static MxValheimMod Instance; // Singleton reference
@@ -28,29 +33,24 @@ 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.4"; private const string ModVersion = "1.6.7";
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");
public static string internalDataPath = Path.Combine(modPath, "Data"); public static string internalDataPath = Path.Combine(modPath, "Data");
public static string internalDataEventSystem = Path.Combine(internalDataPath, "EventSystem.json"); 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 WeightConfigPath => Path.Combine(internalConfigsPath, "items_weight.json");
public static string AutoDoorConfigPath => Path.Combine(internalConfigsPath, "auto_doors.json"); public static string AutoDoorConfigPath => Path.Combine(internalConfigsPath, "auto_doors.json");
public static DoorRoot CachedConfig; public static DoorRoot CachedConfig;
public static Dictionary<string, float> WeightSettings = new Dictionary<string, float>(); public static Dictionary<string, float> WeightSettings = new Dictionary<string, float>();
public static Dictionary<string, int> DropSettings = new Dictionary<string, int>();
public static bool initExpBar = true; public static bool initExpBar = true;
// Data structures
public class KillData public class KillData
{ {
public string attackerName; public string attackerName;
@@ -83,30 +83,65 @@ public class MxValheimMod : BaseUnityPlugin
public static readonly Queue<string> _doorQueueName = new Queue<string>(); public static readonly Queue<string> _doorQueueName = new Queue<string>();
public static float _doorTimer; public static float _doorTimer;
public static float _uniqueTimer = 60.0f;
public static string eventName; public static string eventName;
public static float eventTimer = 0f;
public class ActiveEventData
{
public string Name;
public string Position;
public int Kills;
public ActiveEventData(string name, string pos, int kills)
{
Name = name;
Position = pos;
Kills = kills;
}
}
public static List<ActiveEventData> ActiveEvents = new List<ActiveEventData>();
void Awake() void Awake()
{ {
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;
Harmony harmony = new Harmony(ModGUID); Harmony harmony = new Harmony(ModGUID);
harmony.PatchAll(); harmony.PatchAll();
} }
private void InitCustomEnemies()
{
List<EnemyTemplate> templates = LoadTemplatesFromFolder();
foreach (var data in templates)
{
GameObject customEnemy = PrefabManager.Instance.CreateClonedPrefab(data.InternalName, data.PrefabToClone);
ApplyStats(customEnemy, data);
ApplyColorTint(customEnemy, data);
ApplyDropTable(customEnemy, data);
ApplyEquipment(customEnemy, data);
RegisterWithWorldSpawn(customEnemy, data);
}
PrefabManager.OnVanillaPrefabsAvailable -= InitCustomEnemies;
}
[HarmonyPatch(typeof(Localization), nameof(Localization.SetupLanguage))] [HarmonyPatch(typeof(Localization), nameof(Localization.SetupLanguage))]
public static class Localization_SetupLanguage_Patch public static class Localization_SetupLanguage_Patch
{ {
@@ -116,7 +151,6 @@ public class MxValheimMod : BaseUnityPlugin
} }
} }
// --- TEST COMMAND: Type 'testkill' in F5 console ---
[HarmonyPatch(typeof(Terminal), nameof(Terminal.InputText))] [HarmonyPatch(typeof(Terminal), nameof(Terminal.InputText))]
public static class ConsoleInputPatch public static class ConsoleInputPatch
{ {
@@ -137,10 +171,17 @@ public class MxValheimMod : BaseUnityPlugin
{ {
if (ZRoutedRpc.instance != null && kfp != null) if (ZRoutedRpc.instance != null && kfp != null)
{ {
// We use the explicit 'Method' delegate to avoid the ArgumentException
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_ServerGetEventKill", Watcher.GetEventKill);
ZRoutedRpc.instance.Register<ZPackage>("RPC_ServerSetEventKill", Watcher.SetEventKill);
ZRoutedRpc.instance.Register<ZPackage>("RPC_ServerRemoveEvent", Watcher.RemoveEvent);
ZRoutedRpc.instance.Register<int>("RPC_ServerRegisterEventKill", Profiles.ServerSetLevel);
ZRoutedRpc.instance.Register<string, string>("RPC_ServerCreateUser", Profiles.ServerReceiveCreateUser); ZRoutedRpc.instance.Register<string, string>("RPC_ServerCreateUser", Profiles.ServerReceiveCreateUser);
ZRoutedRpc.instance.Register<string>("RPC_RequestProfile", Profiles.ServerHandleProfileRequest); ZRoutedRpc.instance.Register<string>("RPC_RequestProfile", Profiles.ServerHandleProfileRequest);
ZRoutedRpc.instance.Register<string>("RPC_ClientReceiveProfile", Profiles.LoadProfile); ZRoutedRpc.instance.Register<string>("RPC_ClientReceiveProfile", Profiles.LoadProfile);
@@ -191,13 +232,13 @@ public class MxValheimMod : BaseUnityPlugin
string timeString = clk.GetFormattedTime(); string timeString = clk.GetFormattedTime();
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();
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")} {Profiles.serverLevel}</color> <color=#677074>|</color> <color=#32a852>{Localization.instance.Localize("$clock_string_day")} {day}</color> <color=#677074>|</color> <color=#d1954a>{timeString}</color>";
} else } else
{ {
Clock.m_textComponent.text = $"<color=#ffd000>{eventName}</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> <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>";
} }
} }
} }
@@ -213,7 +254,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
@@ -314,32 +355,34 @@ public class MxValheimMod : BaseUnityPlugin
} }
} }
private bool LoadJsonConfig() private void LoadJsonConfig()
{ {
try string json = "";
{
if (!File.Exists(WeightConfigPath))
{
WeightSettings = new Dictionary<string, float> { { "Wood", 1.0f }, { "Stone", 1.0f } };
File.WriteAllText(WeightConfigPath, JsonConvert.SerializeObject(WeightSettings, Newtonsoft.Json.Formatting.Indented));
return true;
}
string json = File.ReadAllText(WeightConfigPath); if (!File.Exists(WeightConfigPath))
WeightSettings = JsonConvert.DeserializeObject<Dictionary<string, float>>(json);
Logger.LogInfo($"Successfully parsed {WeightSettings.Count} items.");
return true;
}
catch (Exception ex)
{ {
Logger.LogWarning($"Could not read JSON (might be busy): {ex.Message}"); WeightSettings = new Dictionary<string, float> { { "Wood", 1.0f }, { "Stone", 1.0f } };
return false; File.WriteAllText(WeightConfigPath, JsonConvert.SerializeObject(WeightSettings, Newtonsoft.Json.Formatting.Indented));
} }
json = File.ReadAllText(WeightConfigPath);
WeightSettings = JsonConvert.DeserializeObject<Dictionary<string, float>>(json);
Logger.LogInfo($"Successfully parsed {WeightSettings.Count} items.");
if (!File.Exists(DropConfigPath))
{
DropSettings = new Dictionary<string, int> { { "Wood", 3 }, { "CopperOre", 3 }, { "TinOre", 3 }, { "IronScrap", 3 }, { "SilverOre", 3 }, { "Obsidian", 3 }, { "BlackMetalScrap", 3 }, { "BlackMarble", 3 }, { "FlametalOreNew", 3 } };
File.WriteAllText(DropConfigPath, JsonConvert.SerializeObject(DropSettings, Newtonsoft.Json.Formatting.Indented));
}
json = File.ReadAllText(DropConfigPath);
DropSettings = JsonConvert.DeserializeObject<Dictionary<string, int>>(json);
Logger.LogInfo($"Successfully parsed {DropSettings.Count} items.");
} }
public void LoadDoorConfig() public void LoadDoorConfig()
{ {
if (System.IO.File.Exists(AutoDoorConfigPath)) if (File.Exists(AutoDoorConfigPath))
{ {
string json = System.IO.File.ReadAllText(AutoDoorConfigPath); string json = System.IO.File.ReadAllText(AutoDoorConfigPath);
CachedConfig = JsonConvert.DeserializeObject<DoorRoot>(json); CachedConfig = JsonConvert.DeserializeObject<DoorRoot>(json);

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,9 +52,15 @@
<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>
<Reference Include="Jotunn">
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\BepInEx\plugins\Jotunn.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json"> <Reference Include="Newtonsoft.Json">
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\BepInEx\plugins\Newtonsoft.Json.dll</HintPath> <HintPath>E:\SteamLibrary\steamapps\common\Valheim\BepInEx\plugins\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
@@ -75,6 +81,10 @@
<Reference Include="UnityEngine"> <Reference Include="UnityEngine">
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\UnityEngine.dll</HintPath> <HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\UnityEngine.dll</HintPath>
</Reference> </Reference>
<Reference Include="UnityEngine.AIModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\UnityEngine.AIModule.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.AssetBundleModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="UnityEngine.AssetBundleModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\UnityEngine.AssetBundleModule.dll</HintPath> <HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\UnityEngine.AssetBundleModule.dll</HintPath>
@@ -110,7 +120,10 @@
<Compile Include="EventSystem\Experience.cs" /> <Compile Include="EventSystem\Experience.cs" />
<Compile Include="EventSystem\Patch.cs" /> <Compile Include="EventSystem\Patch.cs" />
<Compile Include="EventSystem\Profiles.cs" /> <Compile Include="EventSystem\Profiles.cs" />
<Compile Include="EventSystem\RandomUnique\SpawnManager.cs" />
<Compile Include="EventSystem\RandomUnique\UniqueManager.cs" />
<Compile Include="EventSystem\Reward.cs" /> <Compile Include="EventSystem\Reward.cs" />
<Compile Include="EventSystem\Watcher.cs" />
<Compile Include="KillFeed\NPCIcon.cs" /> <Compile Include="KillFeed\NPCIcon.cs" />
<Compile Include="KillFeed\Patch.cs" /> <Compile Include="KillFeed\Patch.cs" />
<Compile Include="MxValheim.cs" /> <Compile Include="MxValheim.cs" />

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,36 +32,42 @@ 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)
{ {
if (door != null && nview != null && nview.IsValid()) if (door != null && nview != null && nview.IsValid())
{ {
nview.ClaimOwnership();
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

@@ -15,13 +15,10 @@ namespace MxValheim.Patch.HUD
public static Text m_textComponent; public static Text m_textComponent;
public static RectTransform m_barFill; public static RectTransform m_barFill;
// This replaces the missing GetTimeString() method
public string GetFormattedTime() public string GetFormattedTime()
{ {
// Get fractional day (0.0 to 1.0)
float fraction = EnvMan.instance.GetDayFraction(); float fraction = EnvMan.instance.GetDayFraction();
// Convert to hours and minutes
float totalHours = fraction * 24f; float totalHours = fraction * 24f;
int hours = Mathf.FloorToInt(totalHours); int hours = Mathf.FloorToInt(totalHours);
int minutes = Mathf.FloorToInt((totalHours - hours) * 60f); int minutes = Mathf.FloorToInt((totalHours - hours) * 60f);
@@ -32,25 +29,20 @@ namespace MxValheim.Patch.HUD
[HarmonyPatch(typeof(MessageHud), nameof(MessageHud.ShowMessage))] [HarmonyPatch(typeof(MessageHud), nameof(MessageHud.ShowMessage))]
public static class HideEventMessage_Patch public static class HideEventMessage_Patch
{ {
// We use a Prefix to check the message before it is displayed
static bool Prefix(MessageHud.MessageType type, string text) static bool Prefix(MessageHud.MessageType type, string text)
{ {
// Check if a raid is active
if (RandEventSystem.instance != null) if (RandEventSystem.instance != null)
{ {
RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent(); RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent();
if (activeEvent != null) if (activeEvent != null)
{ {
// If the message text matches the start or end message of the raid, block it
if (text == activeEvent.GetHudText()) if (text == activeEvent.GetHudText())
{ {
Debug.Log("Reached msg logic!!!");
// Returning false tells Harmony to skip the original method (don't show text)
return false; return false;
} }
} }
} }
return true; // Show all other messages (health, items, etc.) normally return true;
} }
} }

View File

@@ -14,17 +14,13 @@ namespace MxValheim.Patch
{ {
if (__result == null || __result.Count == 0) return; if (__result == null || __result.Count == 0) return;
int countToAdd = MxValheimMod.Config_OreMultiplier.Value - 1;
if (countToAdd <= 0) return;
List<GameObject> extraDrops = new List<GameObject>(); List<GameObject> extraDrops = new List<GameObject>();
foreach (var item in __result) foreach (var item in __result)
{ {
string name = item.name.ToLower(); if (item != null && MxValheimMod.DropSettings.TryGetValue(item.name, out int newDropMulti))
if (name.Contains("ore") || name.Contains("scrap"))
{ {
for (int i = 0; i < countToAdd; i++) for (int i = 0; i < newDropMulti; i++)
{ {
extraDrops.Add(item); extraDrops.Add(item);
} }

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,9 +1,13 @@
![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.**
## 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.