Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8b504d02e0 | ||
|
|
e23307fe27 | ||
|
|
40cff792e0 | ||
|
|
21426f5b4c |
@@ -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;
|
||||||
@@ -35,7 +36,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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -45,8 +69,11 @@ 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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -63,14 +90,13 @@ namespace MxValheim.EventSystem
|
|||||||
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}");
|
|
||||||
kill = Watcher.eventKill;
|
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, kill));
|
||||||
@@ -88,6 +114,13 @@ 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.GiveEpicLootDust();
|
||||||
|
Reward.GiveEpicLootShard();
|
||||||
|
Reward.GiveEpicLootEssence();
|
||||||
|
Reward.GiveEpicLootRune();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
@@ -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,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 = { "Rare", "Epic", "Legendary", "Mythic" };
|
||||||
|
|
||||||
|
string itemName = $"Dust{rarity[rand.Next(0, rarity.Length - 1)]}";
|
||||||
|
|
||||||
|
Player player = Player.m_localPlayer;
|
||||||
|
if (player == null) return;
|
||||||
|
|
||||||
|
GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
|
||||||
|
if (prefab != null)
|
||||||
|
{
|
||||||
|
player.GetInventory().AddItem(itemName, qty, 1, 0, 0, "");
|
||||||
|
}
|
||||||
|
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 = { "Rare", "Epic", "Legendary", "Mythic" };
|
||||||
|
|
||||||
|
string itemName = $"Shard{rarity[rand.Next(0, rarity.Length - 1)]}";
|
||||||
|
|
||||||
|
Player player = Player.m_localPlayer;
|
||||||
|
if (player == null) return;
|
||||||
|
|
||||||
|
GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
|
||||||
|
if (prefab != null)
|
||||||
|
{
|
||||||
|
player.GetInventory().AddItem(itemName, qty, 1, 0, 0, "");
|
||||||
|
}
|
||||||
|
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 = { "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, "");
|
||||||
|
}
|
||||||
|
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 = { "Rare", "Epic", "Legendary", "Mythic" };
|
||||||
|
|
||||||
|
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, "");
|
||||||
|
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();
|
||||||
@@ -55,8 +154,6 @@ namespace MxValheim.EventSystem
|
|||||||
if (prefab != null)
|
if (prefab != null)
|
||||||
{
|
{
|
||||||
player.GetInventory().AddItem(itemName, qty, 1, 0, 0, "");
|
player.GetInventory().AddItem(itemName, qty, 1, 0, 0, "");
|
||||||
|
|
||||||
player.Message(MessageHud.MessageType.TopLeft, $"Received {qty}x {itemName}");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -73,8 +170,10 @@ namespace MxValheim.EventSystem
|
|||||||
if (prefab != null)
|
if (prefab != null)
|
||||||
{
|
{
|
||||||
player.GetInventory().AddItem(itemName, qty, 1, 0, 0, "");
|
player.GetInventory().AddItem(itemName, qty, 1, 0, 0, "");
|
||||||
|
if (itemName == "Coins")
|
||||||
player.Message(MessageHud.MessageType.TopLeft, $"Received {qty}x {itemName}");
|
{
|
||||||
|
SendRewardMessage(player, prefab, itemName, qty);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -82,6 +181,14 @@ namespace MxValheim.EventSystem
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,11 +52,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)
|
||||||
|
{
|
||||||
MxValheimMod.ActiveEvents.RemoveAt(evindex);
|
evindex = MxValheimMod.ActiveEvents.FindIndex(e => e.Position.ToString() == eventPos);
|
||||||
|
MxValheimMod.ActiveEvents.RemoveAt(evindex);
|
||||||
|
} else if (MxValheimMod.ActiveEvents.Count <= 0 && eventPos != null)
|
||||||
|
{
|
||||||
|
// That's not the best wai to do it, but until i find a better one, it will prevent an event bugging eternaly.
|
||||||
|
MxValheimMod.ActiveEvents.Clear();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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,7 +191,30 @@ namespace MxValheim.KillFeed
|
|||||||
borderColor = new Color(0.0196f, 0.250f, 0.00750f);
|
borderColor = new Color(0.0196f, 0.250f, 0.00750f);
|
||||||
}
|
}
|
||||||
|
|
||||||
lock (_msgQueue)
|
if (encodedType == -1)
|
||||||
|
{
|
||||||
|
finalMsg = $"<color=#32a852>{type3Separator}</color><color=#ffd000>{eventName}</color><color=#32a852>{type4Separator}</color>";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (encodedType == -2)
|
||||||
|
{
|
||||||
|
int qty = Convert.ToInt32(victim);
|
||||||
|
borderColor = new Color(0.0196f, 0.250f, 0.00750f);
|
||||||
|
finalMsg = $"<color=#32a852>{attacker.ToUpper()}{Localization.instance.Localize("$EventSystem_format_reward_Msg_GiveItem")}</color><color=#ffd000>{qty} {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 = itemIcon;
|
||||||
|
}
|
||||||
|
|
||||||
|
lastVictimName = victim;
|
||||||
|
lastAttackerName = attacker;
|
||||||
|
|
||||||
|
lock (_msgQueue)
|
||||||
{
|
{
|
||||||
_msgQueue.Enqueue(finalMsg);
|
_msgQueue.Enqueue(finalMsg);
|
||||||
_biomeIconQueue.Enqueue(biomeSprite);
|
_biomeIconQueue.Enqueue(biomeSprite);
|
||||||
@@ -479,10 +502,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 +514,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");
|
||||||
|
|||||||
@@ -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.8";
|
||||||
|
|
||||||
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,6 +86,8 @@ 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;
|
||||||
@@ -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>{eventKill}</color> {separator} <color=#32a852>{Localization.instance.Localize("$clock_string_rank")}</color> <color=#ffd000>{Profiles.serverLevel}</color> {separator} <color=#32a852>{Localization.instance.Localize("$clock_string_day")}</color> <color=#ffd000>{day}</color> {separator} <color=#d1954a>{timeString}</color>";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -261,7 +255,7 @@ public class MxValheimMod : BaseUnityPlugin
|
|||||||
if (_doorTimer <= 0)
|
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
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|||||||
@@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,13 @@
|
|||||||

|

|
||||||
|
|
||||||
## 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
|
||||||
|
- 
|
||||||
|
- 
|
||||||
|
|
||||||
## 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.
|
||||||
|
|||||||
Reference in New Issue
Block a user