3 Commits
1.6.11 ... main

Author SHA1 Message Date
mikx
7a19c66a24 (1.6.14) EventSystem Added Reagent to reward 2026-03-22 15:40:17 -04:00
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
6 changed files with 305 additions and 62 deletions

View File

@@ -15,6 +15,19 @@ 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>()
@@ -67,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

@@ -87,11 +87,11 @@ 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}");
kill = Watcher.eventKill; points = Watcher.eventPoints;
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;
@@ -100,7 +100,7 @@ namespace MxValheim.EventSystem
if (distance <= 200f) 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));
float dayPercent = ((float)EnvMan.instance.GetDay() / 10); float dayPercent = ((float)EnvMan.instance.GetDay() / 10);
@@ -118,9 +118,11 @@ namespace MxValheim.EventSystem
} }
if (Chainloader.PluginInfos.ContainsKey("randyknapp.mods.epicloot")) if (Chainloader.PluginInfos.ContainsKey("randyknapp.mods.epicloot"))
{ {
Reward.GenRarity();
Reward.GiveEpicLootDust(); Reward.GiveEpicLootDust();
Reward.GiveEpicLootShard(); Reward.GiveEpicLootShard();
Reward.GiveEpicLootEssence(); Reward.GiveEpicLootEssence();
Reward.GiveEpicLootReagent();
Reward.GiveEpicLootRune(); Reward.GiveEpicLootRune();
} }
} }
@@ -170,6 +172,13 @@ namespace MxValheim.EventSystem
isEventCreature = Traverse.Create(mai).Field<bool>("m_eventCreature").Value; isEventCreature = Traverse.Create(mai).Field<bool>("m_eventCreature").Value;
} }
string internalName = __instance.gameObject.name;
int cloneIndex = internalName.IndexOf("(Clone)");
if (cloneIndex != -1)
{
internalName = internalName.Substring(0, cloneIndex);
}
if (isEventCreature) if (isEventCreature)
{ {
RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent(); RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent();
@@ -178,6 +187,7 @@ namespace MxValheim.EventSystem
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)
{ {
@@ -191,32 +201,22 @@ namespace MxValheim.EventSystem
} }
int level = __instance.GetLevel(); int level = __instance.GetLevel();
int exp =
(level == 1) ? 4 :
(level == 2) ? 6 :
(level == 3) ? 8 :
8;
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); Color magicPurple = new Color(0.921f, 0.475f, 0.990f);
Vector3 spawnPos = __instance.transform.position + Vector3.up * 1.0f; Vector3 spawnPos = __instance.transform.position + Vector3.up * 1.0f;
DamageText.instance.ShowText(HitData.DamageModifier.Normal, spawnPos, expFinal, true); DamageText.instance.ShowText(HitData.DamageModifier.Normal, spawnPos, exp, true);
} else } else
{ {
int level = __instance.GetLevel(); int level = __instance.GetLevel();
int exp =
(level == 1) ? 2 :
(level == 2) ? 4 :
(level == 3) ? 6 :
6;
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); Experience.AddExperience(exp);
Color magicPurple = new Color(0.921f, 0.475f, 0.990f); Color magicPurple = new Color(0.921f, 0.475f, 0.990f);
Vector3 spawnPos = __instance.transform.position + Vector3.up * 1.0f; Vector3 spawnPos = __instance.transform.position + Vector3.up * 1.0f;
DamageText.instance.ShowText(HitData.DamageModifier.Normal, spawnPos, expFinal, true); DamageText.instance.ShowText(HitData.DamageModifier.Normal, spawnPos, exp, true);
} }
} }
} }

View File

@@ -13,7 +13,9 @@ 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>()
{ {
@@ -26,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" };
@@ -54,9 +64,9 @@ namespace MxValheim.EventSystem
int qty = rand.Next(1, Profiles.serverLevel); int qty = rand.Next(1, Profiles.serverLevel);
string[] rarity = GetRarityList(Watcher.eventKill); string[] rarity = GetRarityList(Watcher.eventPoints);
string itemName = $"Dust{rarity[rand.Next(0, rarity.Length - 1)]}"; string itemName = $"Dust{globalRarity}";
Player player = Player.m_localPlayer; Player player = Player.m_localPlayer;
if (player == null) return; if (player == null) return;
@@ -64,7 +74,7 @@ namespace MxValheim.EventSystem
GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName); GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
if (prefab != null) if (prefab != null)
{ {
GiveItemInWorld(itemName, player, qty); GiveItemSafe(itemName, player, qty);
} }
else else
{ {
@@ -78,9 +88,9 @@ namespace MxValheim.EventSystem
int qty = rand.Next(1, Profiles.serverLevel); int qty = rand.Next(1, Profiles.serverLevel);
string[] rarity = GetRarityList(Watcher.eventKill); string[] rarity = GetRarityList(Watcher.eventPoints);
string itemName = $"Shard{rarity[rand.Next(0, rarity.Length - 1)]}"; string itemName = $"Shard{globalRarity}";
Player player = Player.m_localPlayer; Player player = Player.m_localPlayer;
if (player == null) return; if (player == null) return;
@@ -88,7 +98,7 @@ namespace MxValheim.EventSystem
GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName); GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
if (prefab != null) if (prefab != null)
{ {
GiveItemInWorld(itemName, player, qty); GiveItemSafe(itemName, player, qty);
} }
else else
{ {
@@ -102,9 +112,9 @@ namespace MxValheim.EventSystem
int qty = rand.Next(1, Profiles.serverLevel); int qty = rand.Next(1, Profiles.serverLevel);
string[] rarity = GetRarityList(Watcher.eventKill); string[] rarity = GetRarityList(Watcher.eventPoints);
string itemName = $"Essence{rarity[rand.Next(0, rarity.Length - 1)]}"; string itemName = $"Essence{globalRarity}";
Player player = Player.m_localPlayer; Player player = Player.m_localPlayer;
if (player == null) return; if (player == null) return;
@@ -112,7 +122,31 @@ namespace MxValheim.EventSystem
GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName); GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
if (prefab != null) if (prefab != null)
{ {
GiveItemInWorld(itemName, player, qty); GiveItemSafe(itemName, player, qty);
}
else
{
Debug.LogWarning($"Item {itemName} not found in ObjectDB!");
}
}
public static void GiveEpicLootReagent()
{
System.Random rand = new System.Random();
int qty = rand.Next(1, Profiles.serverLevel);
string[] rarity = GetRarityList(Watcher.eventPoints);
string itemName = $"Reagent{globalRarity}";
Player player = Player.m_localPlayer;
if (player == null) return;
GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
if (prefab != null)
{
GiveItemSafe(itemName, player, qty);
} }
else else
{ {
@@ -126,9 +160,9 @@ namespace MxValheim.EventSystem
int qty = rand.Next(1, 2); int qty = rand.Next(1, 2);
string[] rarity = GetRarityList(Watcher.eventKill); string[] rarity = GetRarityList(Watcher.eventPoints);
string itemName = $"Runestone{rarity[rand.Next(0, rarity.Length - 1)]}"; string itemName = $"Runestone{globalRarity}";
Player player = Player.m_localPlayer; Player player = Player.m_localPlayer;
if (player == null) return; if (player == null) return;
@@ -136,7 +170,7 @@ namespace MxValheim.EventSystem
GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName); GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
if (prefab != null) if (prefab != null)
{ {
GiveItemInWorld(itemName, player, qty); GiveItemSafe(itemName, player, qty);
SendRewardMessage(player, prefab, itemName, qty); SendRewardMessage(player, prefab, itemName, qty);
} }
else else
@@ -155,7 +189,7 @@ namespace MxValheim.EventSystem
GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName); GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
if (prefab != null) if (prefab != null)
{ {
GiveItemInWorld(itemName, player, qty); GiveItemSafe(itemName, player, qty);
} }
else else
{ {
@@ -171,7 +205,7 @@ namespace MxValheim.EventSystem
GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName); GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
if (prefab != null) if (prefab != null)
{ {
GiveItemInWorld(itemName, player, qty); GiveItemSafe(itemName, player, qty);
if (itemName == "Coins") if (itemName == "Coins")
{ {
SendRewardMessage(player, prefab, itemName, qty); SendRewardMessage(player, prefab, itemName, qty);
@@ -183,6 +217,22 @@ 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) public static void GiveItemInWorld(string itemName, Player player, int qty)
{ {
GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName); GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
@@ -224,28 +274,105 @@ namespace MxValheim.EventSystem
} }
} }
public static string[] GetRarityList(int victim) public static string[] GetRarityList(int point)
{ {
string[] rarity = { }; string[] rarity = { };
switch (victim) switch (point)
{ {
case < 1: case < 100:
rarity = ["Magic"]; rarity = ["Magic"];
break; break;
case >= 1 and < 5: case >= 100 and < 500:
rarity = ["Rare"]; rarity = ["Rare"];
break; break;
case >= 5 and <= 10: case >= 500 and <= 1000:
rarity = ["Epic"]; rarity = ["Epic"];
break; break;
case >= 11 and <= 20: case >= 1001 and <= 2000:
rarity = ["Epic", "Legendary"]; rarity = ["Epic", "Legendary"];
break; break;
case >= 21: case >= 2001:
rarity = ["Epic", "Legendary", "Mythic"]; rarity = ["Epic", "Legendary", "Mythic"];
break; break;
} }
return rarity; return rarity;
} }
public static Dictionary<string, int> EnemiesPointValue = new Dictionary<string, int>
{
// --- Meadows ---
{ "Boar", 10 },
{ "Neck", 10 },
{ "Greyling", 20 },
// --- Black Forest ---
{ "Greydwarf", 20 },
{ "Greydwarf_Elite", 50 },
{ "Greydwarf_Shaman", 50 },
{ "Troll", 250 },
{ "Ghost", 100 },
{ "Skeleton", 60 },
{ "Skeleton_NoArcher", 60 }, // Melee only variant
{ "Skeleton_Poison", 60 },
// --- Swamp ---
{ "Blob", 50 },
{ "BlobElite", 80 }, // Oozer
{ "Draugr", 100 },
{ "Draugr_Elite", 150 },
{ "Draugr_Ranged", 100 },
{ "Leech", 50 },
{ "Surtling", 80 },
{ "Wraith", 100 },
{ "Abomination", 300 },
// --- Mountains ---
{ "Bat", 50 },
{ "Hatchling", 150 },
{ "Fenring", 150 },
{ "Fenring_Cultist", 150 },
{ "StoneGolem", 200 },
{ "Ulv", 200 },
{ "Wolf", 100 },
// --- Plains ---
{ "Deathsquito", 50 },
{ "Fuling", 100 },
{ "FulingBerserker", 250 },
{ "FulingShaman", 150 },
{ "Lox", 300 },
{ "Growth", 50 },
// --- Mistlands ---
{ "Gjall", 50 },
{ "Seeker", 100 },
{ "SeekerBrute", 300 }, // Seeker Soldier
{ "SeekerBrood", 150 },
{ "Tick", 50 },
{ "Dverger", 200 },
// --- Ashlands ---
{ "Asksvin", 50 },
{ "Charred_Melee", 100 }, // Charred Warrior
{ "Charred_Archer", 100 }, // Charred Marksman
{ "Charred_Mage", 100 }, // Charred Warlock
{ "Charred_Twitcher", 100 },
{ "FallenValkyrie", 400 },
{ "Morgen", 300 },
{ "BonemawSerpent", 300 },
{ "Voltures", 100 },
// --- Ocean ---
{ "Serpent", 500 },
// --- Bosses ---
{ "Eikthyr", 100 },
{ "gd_king", 101 }, // The Elder
{ "Bonemass", 102 },
{ "Dragon", 103 }, // Moder
{ "GoblinKing", 104 }, // Yagluth
{ "SeekerQueen", 105 },
{ "Fader", 106 }
};
} }
} }

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);
} }
@@ -60,7 +63,7 @@ namespace MxValheim.EventSystem
MxValheimMod.ActiveEvents.RemoveAt(evindex); MxValheimMod.ActiveEvents.RemoveAt(evindex);
} else if (MxValheimMod.ActiveEvents.Count <= 0 && eventPos != null) } else if (MxValheimMod.ActiveEvents.Count <= 0 && eventPos != null)
{ {
// That's not the best wai to do it, but until i find a better one, it will prevent an event bugging eternaly. // 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(); MxValheimMod.ActiveEvents.Clear();
} }
} }

View File

@@ -12,6 +12,7 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text;
using System.Threading; using System.Threading;
using System.Xml; using System.Xml;
using TMPro; using TMPro;
@@ -33,7 +34,7 @@ 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.11"; private const string ModVersion = "1.6.14";
public static ConfigEntry<bool> Config_DebugRandomEventInterval; public static ConfigEntry<bool> Config_DebugRandomEventInterval;
public static ConfigEntry<float> Config_bowDrawSpeedBonusPerLevel; public static ConfigEntry<float> Config_bowDrawSpeedBonusPerLevel;
@@ -44,6 +45,10 @@ public class MxValheimMod : BaseUnityPlugin
public static string internalDataEventSystem = Path.Combine(internalDataPath, "EventSystem.json"); public static string internalDataEventSystem = Path.Combine(internalDataPath, "EventSystem.json");
public static string DropConfigPath => Path.Combine(internalConfigsPath, "items_drop.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 EnemyExpConfigPath => Path.Combine(internalConfigsPath, "enemies_expvalue.mx");
public static Dictionary<string, int> EnemyExpSettings = new Dictionary<string, int>();
public static string EnemyRewardConfigPath => Path.Combine(internalConfigsPath, "enemies_rewardvalue.mx");
public static Dictionary<string, int> EnemyRewardSettings = new Dictionary<string, int>();
public static string AutoDoorConfigPath => Path.Combine(internalConfigsPath, "auto_doors.json"); public static 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>();
@@ -92,13 +97,13 @@ public class MxValheimMod : BaseUnityPlugin
{ {
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;
} }
} }
@@ -239,7 +244,7 @@ public class MxValheimMod : BaseUnityPlugin
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>"; 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> {separator} <color=#32a852>{Localization.instance.Localize("$clock_string_kill")}</color> <color=#ffd000>{eventKill}</color> {separator} <color=#32a852>{Localization.instance.Localize("$clock_string_rank")}</color> <color=#ffd000>{Profiles.serverLevel}</color> {separator} <color=#32a852>{Localization.instance.Localize("$clock_string_day")}</color> <color=#ffd000>{day}</color> {separator} <color=#d1954a>{timeString}</color>"; 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>";
} }
} }
} }
@@ -376,9 +381,21 @@ public class MxValheimMod : BaseUnityPlugin
File.WriteAllText(DropConfigPath, JsonConvert.SerializeObject(DropSettings, Newtonsoft.Json.Formatting.Indented)); File.WriteAllText(DropConfigPath, JsonConvert.SerializeObject(DropSettings, Newtonsoft.Json.Formatting.Indented));
} }
byte[] jsonEncryptedB64 = null;
json = File.ReadAllText(DropConfigPath); json = File.ReadAllText(DropConfigPath);
DropSettings = JsonConvert.DeserializeObject<Dictionary<string, int>>(json); DropSettings = JsonConvert.DeserializeObject<Dictionary<string, int>>(json);
Logger.LogInfo($"Successfully parsed {DropSettings.Count} items."); Logger.LogInfo($"Successfully parsed {DropSettings.Count} items.");
/*jsonEncryptedB64 = Convert.FromBase64String(File.ReadAllText(EnemyRewardConfigPath));
json = Encoding.UTF8.GetString(jsonEncryptedB64);
EnemyRewardSettings = JsonConvert.DeserializeObject<Dictionary<string, int>>(json);
Logger.LogInfo($"Successfully parsed {EnemyRewardSettings.Count} enemy reward value.");
jsonEncryptedB64 = Convert.FromBase64String(File.ReadAllText(EnemyExpConfigPath));
json = Encoding.UTF8.GetString(jsonEncryptedB64);
EnemyExpSettings = JsonConvert.DeserializeObject<Dictionary<string, int>>(json);
Logger.LogInfo($"Successfully parsed {EnemyExpSettings.Count} enemy exp value.");*/
} }
public void LoadDoorConfig() public void LoadDoorConfig()

View File

@@ -4,6 +4,13 @@
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 ## Dependencies
- ![BepInEx for Valheim](https://thunderstore.io/c/valheim/p/denikson/BepInExPack_Valheim/) - ![BepInEx for Valheim](https://thunderstore.io/c/valheim/p/denikson/BepInExPack_Valheim/)
- ![Jotunn](https://thunderstore.io/c/valheim/p/ValheimModding/Jotunn/) - ![Jotunn](https://thunderstore.io/c/valheim/p/ValheimModding/Jotunn/)
@@ -13,7 +20,7 @@ Official **MxValheim Server** Mod.
- Display the day and the formated time in-game. - 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.)