Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aaf9bf22dd | ||
|
|
d706e173b8 | ||
|
|
6a8a09e2f6 | ||
|
|
d0f7a156c7 | ||
|
|
cb93f20b18 | ||
|
|
2291d1c162 | ||
|
|
fb68bb61e2 | ||
|
|
e1a15adad6 | ||
|
|
c724674b5a | ||
|
|
ee50214043 | ||
|
|
11f6384db6 | ||
|
|
4dcd7504da | ||
|
|
48445db561 | ||
|
|
ba2091d6f9 |
51
MxValheim/EventSystem/Experience.cs
Normal file
51
MxValheim/EventSystem/Experience.cs
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
using MxValheim.Patch.HUD;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace MxValheim.EventSystem
|
||||||
|
{
|
||||||
|
internal class Experience
|
||||||
|
{
|
||||||
|
public static int GetRequiredExpByLevel(int level)
|
||||||
|
{
|
||||||
|
return (level * 100);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void AddExperience(string playerid, int amount)
|
||||||
|
{
|
||||||
|
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_RequestProfile", playerid);
|
||||||
|
int level = Profiles.playerLevel;
|
||||||
|
int exp = Profiles.playerExperience;
|
||||||
|
exp += amount;
|
||||||
|
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerSetUserExperience", playerid, exp);
|
||||||
|
exp = Profiles.playerExperience;
|
||||||
|
int maxexp = GetRequiredExpByLevel(level);
|
||||||
|
UpdateProgressBar(playerid);
|
||||||
|
if (exp >= maxexp)
|
||||||
|
{
|
||||||
|
exp -= maxexp;
|
||||||
|
level++;
|
||||||
|
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerSetUserLevel", playerid, level);
|
||||||
|
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerSetUserExperience", playerid, exp);
|
||||||
|
UpdateProgressBar(playerid);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void UpdateProgressBar(string playerid)
|
||||||
|
{
|
||||||
|
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_RequestProfile", playerid);
|
||||||
|
float expPercentage = ((float)Profiles.playerExperience / GetRequiredExpByLevel(Profiles.playerLevel));
|
||||||
|
|
||||||
|
if (Clock.m_barFill != null)
|
||||||
|
{
|
||||||
|
Clock.m_barFill.anchorMax = new Vector2(expPercentage, 1);
|
||||||
|
Clock.m_barFill.offsetMin = Vector2.zero;
|
||||||
|
Clock.m_barFill.offsetMax = Vector2.zero;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
161
MxValheim/EventSystem/Patch.cs
Normal file
161
MxValheim/EventSystem/Patch.cs
Normal file
@@ -0,0 +1,161 @@
|
|||||||
|
using HarmonyLib;
|
||||||
|
using Splatform;
|
||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows.Controls;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
using static MxValheimMod;
|
||||||
|
using Canvas = UnityEngine.Canvas;
|
||||||
|
using Image = UnityEngine.UI.Image;
|
||||||
|
|
||||||
|
namespace MxValheim.EventSystem
|
||||||
|
{
|
||||||
|
internal class EventSystem_Patch
|
||||||
|
{
|
||||||
|
// --- 3. HARMONY PATCHES ---
|
||||||
|
|
||||||
|
[HarmonyPatch(typeof(Player), nameof(Player.Awake))]
|
||||||
|
public static class PlayerAwakePatch
|
||||||
|
{
|
||||||
|
static void Postfix(Player __instance)
|
||||||
|
{
|
||||||
|
// Only trigger for the actual human player, not NPCs/Dummies
|
||||||
|
if (__instance == Player.m_localPlayer)
|
||||||
|
{
|
||||||
|
string pid = GetUserPlayerID(Player.m_localPlayer).ToString();
|
||||||
|
ZLog.Log($"[ProfileSystem] Spawning finished. Requesting profile for {pid}");
|
||||||
|
|
||||||
|
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_RequestProfile", pid);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[HarmonyPatch(typeof(RandEventSystem), nameof(RandEventSystem.FixedUpdate))]
|
||||||
|
public static class DebugRaidFrequency
|
||||||
|
{
|
||||||
|
static void Prefix(RandEventSystem __instance)
|
||||||
|
{
|
||||||
|
// Use a small timer check so we don't spam the logic every single frame
|
||||||
|
// though for debugging, forcing these values is fine.
|
||||||
|
__instance.m_eventIntervalMin = 10f;
|
||||||
|
__instance.m_eventChance = 100f;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[HarmonyPatch(typeof(RandEventSystem), nameof(RandEventSystem.FixedUpdate))]
|
||||||
|
public static class TimerFreezePatch
|
||||||
|
{
|
||||||
|
static void Prefix(RandEventSystem __instance)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[HarmonyPatch(typeof(Hud), nameof(Hud.Update))]
|
||||||
|
public static class Hud_MonitorPatch
|
||||||
|
{
|
||||||
|
private static RandomEvent _lastKnownEvent = null;
|
||||||
|
|
||||||
|
static void Postfix()
|
||||||
|
{
|
||||||
|
// 1. Safety check: Ensure the system exists
|
||||||
|
if (RandEventSystem.instance == null) return;
|
||||||
|
|
||||||
|
RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent();
|
||||||
|
|
||||||
|
// 2. Logic: Detection
|
||||||
|
if (activeEvent != null && _lastKnownEvent == null)
|
||||||
|
{
|
||||||
|
Debug.Log($"MxEvent: HUD Heartbeat detected Raid Start: {activeEvent.m_name}");
|
||||||
|
_lastKnownEvent = activeEvent;
|
||||||
|
|
||||||
|
// Force HUD Creation and Display
|
||||||
|
//UpdateWave(true);
|
||||||
|
}
|
||||||
|
else if (activeEvent == null && _lastKnownEvent != null)
|
||||||
|
{
|
||||||
|
Debug.Log("MxEvent: HUD Heartbeat detected Raid End.");
|
||||||
|
string pid = GetUserPlayerID(Player.m_localPlayer).ToString();
|
||||||
|
Heightmap.Biome currentBiome = EnvMan.instance.GetCurrentBiome();
|
||||||
|
Reward.GiveItemStatic("Coins",Reward.CalculateRewardCoin(Profiles.playerLevel, currentBiome));
|
||||||
|
System.Random rand = new System.Random();
|
||||||
|
Reward.GiveItemStatic("Feathers", rand.Next(1,10));
|
||||||
|
if (rand.Next(100) < 50)
|
||||||
|
{
|
||||||
|
Reward.GiveItemRandom(Reward.GetRewardPrefab(Profiles.playerLevel, "food"), 1);
|
||||||
|
}
|
||||||
|
if (rand.Next(100) < 25)
|
||||||
|
{
|
||||||
|
Reward.GiveItemRandom(Reward.GetRewardPrefab(Profiles.playerLevel, "heal"), 1);
|
||||||
|
}
|
||||||
|
if (rand.Next(100) < 10)
|
||||||
|
{
|
||||||
|
Reward.GiveItemRandom(Reward.GetRewardPrefab(Profiles.playerLevel, "metal"), 1);
|
||||||
|
}
|
||||||
|
_lastKnownEvent = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[HarmonyPatch(typeof(Character), nameof(Character.ApplyDamage))]
|
||||||
|
public static class DeathNotifier
|
||||||
|
{
|
||||||
|
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;
|
||||||
|
|
||||||
|
// 2. Check if a raid is active
|
||||||
|
RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent();
|
||||||
|
if (activeEvent == null) return;
|
||||||
|
Debug.Log("MxEvent: Confirmed Active Event!");
|
||||||
|
|
||||||
|
Vector3 playerPos = Player.m_localPlayer.transform.position;
|
||||||
|
string pid = GetUserPlayerID(Player.m_localPlayer).ToString();
|
||||||
|
Debug.Log($"EventSystem:ApplyDamage User {pid}");
|
||||||
|
float distance = Vector3.Distance(playerPos, activeEvent.m_pos);
|
||||||
|
Debug.Log($"MxEvent: Distance: {distance}");
|
||||||
|
|
||||||
|
if (distance <= 96f)
|
||||||
|
{
|
||||||
|
int level = __instance.GetLevel();
|
||||||
|
int exp =
|
||||||
|
(level == 1) ? 2:
|
||||||
|
(level == 2) ? 3:
|
||||||
|
(level == 3) ? 4:
|
||||||
|
5;
|
||||||
|
|
||||||
|
Experience.AddExperience(pid, exp);
|
||||||
|
|
||||||
|
/* Send the update
|
||||||
|
ZRoutedRpc.instance.InvokeRoutedRPC(
|
||||||
|
ZRoutedRpc.Everybody,
|
||||||
|
"RPC_UpdateRaidHUD",
|
||||||
|
$"PHASE: {CurrentPhase}",
|
||||||
|
KillsInCurrentPhase,
|
||||||
|
GetTargetForPhase(CurrentPhase)
|
||||||
|
);*/
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hide HUD when raid ends
|
||||||
|
[HarmonyPatch(typeof(RandEventSystem), nameof(RandEventSystem.ResetRandomEvent))]
|
||||||
|
[HarmonyPostfix]
|
||||||
|
static void OnRaidEnd()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
167
MxValheim/EventSystem/Profiles.cs
Normal file
167
MxValheim/EventSystem/Profiles.cs
Normal file
@@ -0,0 +1,167 @@
|
|||||||
|
using Newtonsoft.Json;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace MxValheim.EventSystem
|
||||||
|
{
|
||||||
|
internal class Profiles
|
||||||
|
{
|
||||||
|
public class ProfileRoot
|
||||||
|
{
|
||||||
|
public string playerid { get; set; }
|
||||||
|
public string player_name { get; set; }
|
||||||
|
public int level { get; set; }
|
||||||
|
public int experience { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool userExists = false;
|
||||||
|
public static int playerLevel = 1;
|
||||||
|
public static int playerExperience = 0;
|
||||||
|
|
||||||
|
|
||||||
|
public static void ServerUserExists(string playerid)
|
||||||
|
{
|
||||||
|
// Check to ensure this is actually the server running this
|
||||||
|
ZNet zn = new ZNet();
|
||||||
|
if (!zn.IsDedicated()) return;
|
||||||
|
string profilePath = Path.Combine(MxValheimMod.internalDataEventSystemPath, $"{playerid}.json");
|
||||||
|
|
||||||
|
if (File.Exists(profilePath)) userExists = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void ServerReceiveCreateUser(long sender, string playerid, string playerName)
|
||||||
|
{
|
||||||
|
// Check to ensure this is actually the server running this
|
||||||
|
ZNet zn = new ZNet();
|
||||||
|
if (!zn.IsDedicated()) return;
|
||||||
|
|
||||||
|
string profilePath = Path.Combine(MxValheimMod.internalDataEventSystemPath, $"{playerid}.json");
|
||||||
|
|
||||||
|
ProfileRoot pr = new ProfileRoot
|
||||||
|
{
|
||||||
|
playerid = playerid,
|
||||||
|
player_name = playerName,
|
||||||
|
level = 1,
|
||||||
|
experience = 0
|
||||||
|
};
|
||||||
|
|
||||||
|
var raw = JsonConvert.SerializeObject(pr, Formatting.Indented);
|
||||||
|
File.WriteAllText(profilePath, raw);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void ServerHandleProfileRequest(long sender, string playerid)
|
||||||
|
{
|
||||||
|
// Check to ensure this is actually the server running this
|
||||||
|
ZNet zn = new ZNet();
|
||||||
|
if (!zn.IsDedicated()) return;
|
||||||
|
|
||||||
|
ZNetPeer peer = ZNet.instance.GetPeer(sender);
|
||||||
|
|
||||||
|
string profilePath = Path.Combine(MxValheimMod.internalDataEventSystemPath, $"{playerid}.json");
|
||||||
|
|
||||||
|
if (File.Exists(profilePath))
|
||||||
|
{
|
||||||
|
string rawJson = File.ReadAllText(profilePath);
|
||||||
|
// Send ONLY to the 'sender' who requested it
|
||||||
|
ZRoutedRpc.instance.InvokeRoutedRPC(sender, "RPC_ClientReceiveProfile", rawJson);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ProfileRoot pr = new ProfileRoot
|
||||||
|
{
|
||||||
|
playerid = playerid,
|
||||||
|
player_name = peer.m_playerName,
|
||||||
|
level = 1,
|
||||||
|
experience = 0
|
||||||
|
};
|
||||||
|
|
||||||
|
var raw = JsonConvert.SerializeObject(pr, Formatting.Indented);
|
||||||
|
File.WriteAllText(profilePath, raw);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void RequestCreateUser(string playerid, Player player)
|
||||||
|
{
|
||||||
|
string playerName = player.GetHoverName();
|
||||||
|
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerCreateUser", playerid, playerName);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void ClientLoadProfile(long sender, string json)
|
||||||
|
{
|
||||||
|
ProfileRoot loadedProfile = JsonConvert.DeserializeObject<ProfileRoot>(json);
|
||||||
|
|
||||||
|
playerLevel = loadedProfile.level;
|
||||||
|
playerExperience = loadedProfile.experience;
|
||||||
|
|
||||||
|
//ZLog.Log($"[Client] Profile loaded! Level: {loadedProfile.level}");
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void CreateUser(string playerid, Player player)
|
||||||
|
{
|
||||||
|
// We only send the raw data; we let the server handle the file I/O
|
||||||
|
string playerName = player?.GetHoverName() ?? "Unknown";
|
||||||
|
|
||||||
|
// Invoke the RPC on the Server (0 is the server ID)
|
||||||
|
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerCreateUser", playerid, playerName);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void ServerSetUserExperience(long sender, string playerid, int exp)
|
||||||
|
{
|
||||||
|
// Check to ensure this is actually the server running this
|
||||||
|
ZNet zn = new ZNet();
|
||||||
|
if (!zn.IsDedicated()) return;
|
||||||
|
|
||||||
|
string profilePath = Path.Combine(MxValheimMod.internalDataEventSystemPath, $"{playerid}.json");
|
||||||
|
ProfileRoot pro = JsonConvert.DeserializeObject<ProfileRoot>(File.ReadAllText(profilePath));
|
||||||
|
ProfileRoot pr = new ProfileRoot
|
||||||
|
{
|
||||||
|
playerid = playerid,
|
||||||
|
player_name = pro.player_name,
|
||||||
|
level = pro.level,
|
||||||
|
experience = exp
|
||||||
|
};
|
||||||
|
var raw = JsonConvert.SerializeObject(pr, Formatting.Indented);
|
||||||
|
File.WriteAllText(profilePath, raw);
|
||||||
|
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_RequestProfile", playerid);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void SetUserExperience(string playerid, int exp)
|
||||||
|
{
|
||||||
|
string profilePath = Path.Combine(MxValheimMod.internalDataEventSystemPath, $"{playerid}.json");
|
||||||
|
ProfileRoot pro = JsonConvert.DeserializeObject<ProfileRoot>(File.ReadAllText(profilePath));
|
||||||
|
ProfileRoot pr = new ProfileRoot
|
||||||
|
{
|
||||||
|
playerid = playerid,
|
||||||
|
player_name = pro.player_name,
|
||||||
|
level = pro.level,
|
||||||
|
experience = exp
|
||||||
|
};
|
||||||
|
var raw = JsonConvert.SerializeObject(pr, Formatting.Indented);
|
||||||
|
File.WriteAllText(profilePath, raw);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void ServerSetUserLevel(long sender, string playerid, int level)
|
||||||
|
{
|
||||||
|
// Check to ensure this is actually the server running this
|
||||||
|
ZNet zn = new ZNet();
|
||||||
|
if (!zn.IsDedicated()) return;
|
||||||
|
|
||||||
|
string profilePath = Path.Combine(MxValheimMod.internalDataEventSystemPath, $"{playerid}.json");
|
||||||
|
ProfileRoot pro = JsonConvert.DeserializeObject<ProfileRoot>(File.ReadAllText(profilePath));
|
||||||
|
ProfileRoot pr = new ProfileRoot
|
||||||
|
{
|
||||||
|
playerid = playerid,
|
||||||
|
player_name = pro.player_name,
|
||||||
|
level = level,
|
||||||
|
experience = pro.experience
|
||||||
|
};
|
||||||
|
var raw = JsonConvert.SerializeObject(pr, Formatting.Indented);
|
||||||
|
File.WriteAllText(profilePath, raw);
|
||||||
|
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_RequestProfile", playerid);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
87
MxValheim/EventSystem/Reward.cs
Normal file
87
MxValheim/EventSystem/Reward.cs
Normal file
@@ -0,0 +1,87 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace MxValheim.EventSystem
|
||||||
|
{
|
||||||
|
internal class Reward
|
||||||
|
{
|
||||||
|
public static int CalculateRewardCoin(int level, Heightmap.Biome biome)
|
||||||
|
{
|
||||||
|
Dictionary<int, int> biomeBase = new Dictionary<int, int>()
|
||||||
|
{
|
||||||
|
{ 1, 10 },
|
||||||
|
{ 2, 20 },
|
||||||
|
{ 4, 30 },
|
||||||
|
{ 8, 40 },
|
||||||
|
{ 16, 50 },
|
||||||
|
{ 512, 60 },
|
||||||
|
{ 64, 70 },
|
||||||
|
};
|
||||||
|
|
||||||
|
int rewardCoin = biomeBase[((int)biome)] * level;
|
||||||
|
|
||||||
|
return rewardCoin;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string GetRewardPrefab(int level, string type)
|
||||||
|
{
|
||||||
|
string[] foodList = { "OnionSoup", "CarrotSoup", "DeerStew", "Salad", "SerpentStew", "WolfMeatSkewer" };
|
||||||
|
string[] healList = { "MeadHealthMinor", "MeadHealthMedium", "MeadHealthMajor", "MeadHealthLingering" };
|
||||||
|
string[] metalList = { "CopperOre", "TinOre", "IronScrap", "SilverOre", "BlackMetalScrap", "FlametalOreNew" };
|
||||||
|
|
||||||
|
System.Random rng = new System.Random();
|
||||||
|
int foodTier = rng.Next(1, foodList.Length);
|
||||||
|
int healTier = rng.Next(1, healList.Length);
|
||||||
|
int metalTier = rng.Next(1, metalList.Length);
|
||||||
|
|
||||||
|
if (type == "food") return foodList[foodTier];
|
||||||
|
if (type == "heal") return healList[healTier];
|
||||||
|
if (type == "metal") return metalList[metalTier];
|
||||||
|
return "Wood";
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void GiveItemRandom(string itemName, int qty)
|
||||||
|
{
|
||||||
|
System.Random rng = new System.Random();
|
||||||
|
|
||||||
|
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 GiveItemStatic(string itemName, int qty)
|
||||||
|
{
|
||||||
|
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!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
using HarmonyLib;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using UnityEngine;
|
|
||||||
|
|
||||||
namespace MxValheim.KillFeed
|
|
||||||
{
|
|
||||||
internal class Chat_Patch
|
|
||||||
{
|
|
||||||
[HarmonyPatch(typeof(Chat), nameof(Chat.Awake))]
|
|
||||||
class ChatLimitPatch
|
|
||||||
{
|
|
||||||
static void Postfix(Chat __instance)
|
|
||||||
{
|
|
||||||
// 1. Update the UI component (The most important part for typing)
|
|
||||||
if (__instance.m_input != null)
|
|
||||||
{
|
|
||||||
__instance.m_input.characterLimit = 1000;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 2. Try to find the internal length field (it might be m_maxLength or m_maxMessageLength)
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var field = AccessTools.Field(typeof(Chat), "m_maxMessageLength")
|
|
||||||
?? AccessTools.Field(typeof(Chat), "m_maxLength");
|
|
||||||
|
|
||||||
if (field != null)
|
|
||||||
{
|
|
||||||
field.SetValue(__instance, 1000);
|
|
||||||
UnityEngine.Debug.Log($"KillFeed: Set {field.Name} to 1000.");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
UnityEngine.Debug.LogWarning("KillFeed: Could not find a length field in Chat. Logic might use InputField limit only.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
UnityEngine.Debug.LogWarning($"KillFeed: Non-critical error setting chat limit: {e.Message}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
65
MxValheim/KillFeed/NPCIcon.cs
Normal file
65
MxValheim/KillFeed/NPCIcon.cs
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace MxValheim.KillFeed
|
||||||
|
{
|
||||||
|
internal class NPCIcon
|
||||||
|
{
|
||||||
|
Dictionary<string, string> valheimTrophies = new Dictionary<string, string>
|
||||||
|
{
|
||||||
|
// Meadows
|
||||||
|
{ "Boar", "TrophyBoar" },
|
||||||
|
{ "Deer", "TrophyDeer" },
|
||||||
|
{ "Neck", "TrophyNeck" },
|
||||||
|
{ "Eikthyr", "TrophyEikthyr" },
|
||||||
|
|
||||||
|
// Black Forest
|
||||||
|
{ "Greydwarf", "TrophyGreydwarf" },
|
||||||
|
{ "Greydwarf_Shaman", "TrophyGreydwarfShaman" },
|
||||||
|
{ "Greydwarf_Elite", "TrophyGreydwarfBrute" },
|
||||||
|
{ "Skeleton", "TrophySkeleton" },
|
||||||
|
{ "Skeleton_Poison", "TrophySkeletonPoison" },
|
||||||
|
{ "Ghost", "TrophyGhost" },
|
||||||
|
{ "Troll", "TrophyTroll" },
|
||||||
|
{ "gd_king", "TrophyTheElder" },
|
||||||
|
|
||||||
|
// Swamp
|
||||||
|
{ "Blob", "TrophyBlob" },
|
||||||
|
{ "Draugr", "TrophyDraugr" },
|
||||||
|
{ "Draugr_Elite", "TrophyDraugrElite" },
|
||||||
|
{ "Leech", "TrophyLeech" },
|
||||||
|
{ "Surtling", "TrophySurtling" },
|
||||||
|
{ "Wraith", "TrophyWraith" },
|
||||||
|
{ "Abomination", "TrophyAbomination" },
|
||||||
|
{ "Bonemass", "TrophyBonemass" },
|
||||||
|
|
||||||
|
// Mountains
|
||||||
|
{ "Wolf", "TrophyWolf" },
|
||||||
|
{ "Fenring", "TrophyFenring" },
|
||||||
|
{ "StoneGolem", "TrophyStoneGolem" },
|
||||||
|
{ "Drake", "TrophyDrake" },
|
||||||
|
{ "Ulv", "TrophyUlv" },
|
||||||
|
{ "Cultist", "TrophyCultist" },
|
||||||
|
{ "Dragon", "TrophyModer" },
|
||||||
|
|
||||||
|
// Plains
|
||||||
|
{ "Lox", "TrophyLox" },
|
||||||
|
{ "Deathsquito", "TrophyDeathsquito" },
|
||||||
|
{ "Goblin", "TrophyGoblin" },
|
||||||
|
{ "GoblinBrute", "TrophyGoblinBrute" },
|
||||||
|
{ "GoblinShaman", "TrophyGoblinShaman" },
|
||||||
|
{ "Growth", "TrophyGrowth" },
|
||||||
|
{ "GoblinKing", "TrophyGoblinKing" },
|
||||||
|
|
||||||
|
// Mistlands
|
||||||
|
{ "Seeker", "TrophySeeker" },
|
||||||
|
{ "SeekerBrute", "TrophySeekerBrute" },
|
||||||
|
{ "Gjall", "TrophyGjall" },
|
||||||
|
{ "Tick", "TrophyTick" },
|
||||||
|
{ "SeekerQueen", "TrophySeekerQueen" }
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,8 +2,12 @@
|
|||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Reflection.Emit;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using UnityEngine.Diagnostics;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
using static MxValheimMod;
|
using static MxValheimMod;
|
||||||
|
|
||||||
@@ -11,26 +15,84 @@ namespace MxValheim.KillFeed
|
|||||||
{
|
{
|
||||||
public class KillFeed_Patch
|
public class KillFeed_Patch
|
||||||
{
|
{
|
||||||
public static void SendKillToAll(string attacker, string victim, string weaponPrefab, int type)
|
public static void SendKillToAll(string attacker, string victim, string victimInternalName, string weaponPrefab, int encodedType)
|
||||||
{
|
{
|
||||||
if (ZRoutedRpc.instance != null)
|
if (ZRoutedRpc.instance != null)
|
||||||
{
|
{
|
||||||
ZRoutedRpc.instance.InvokeRoutedRPC(ZRoutedRpc.Everybody, "RPC_MxKillMsg", attacker, victim, weaponPrefab, type);
|
ZRoutedRpc.instance.InvokeRoutedRPC(ZRoutedRpc.Everybody, "RPC_MxKillMsg", attacker, victim, victimInternalName, weaponPrefab, encodedType);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnReceiveKillMsg(long sender, string attacker, string victim, string weaponPrefab, int type)
|
public void OnReceiveKillMsg(long sender, string attacker, string victim, string victimInternalName, string weaponPrefab, int encodedType)
|
||||||
{
|
{
|
||||||
ZNet zn = new ZNet();
|
ZNet zn = new ZNet();
|
||||||
if (zn.IsDedicated()) return;
|
if (zn.IsDedicated()) return;
|
||||||
|
if (attacker == "The World") return;
|
||||||
|
|
||||||
string finalMsg = (type == 1) ? $"<color=#FF3333>☠</color> {victim} a été tué par {attacker}" :
|
float distance = (encodedType / 1000) / 10.0f;
|
||||||
(type == 2) ? $"{attacker} a tué {victim}" :
|
int remainder = encodedType % 1000;
|
||||||
$"{attacker} a tué {victim}";
|
bool isBoss = (remainder >= 100);
|
||||||
|
int level = (remainder % 100) / 10;
|
||||||
|
int type = remainder % 10;
|
||||||
|
|
||||||
|
Sprite victimIcon = GetCreatureIcon(victimInternalName);
|
||||||
|
|
||||||
|
GameObject prefab = ZNetScene.instance.GetPrefab(victimInternalName);
|
||||||
|
string localizedVictim = victimInternalName;
|
||||||
|
if (prefab != null)
|
||||||
|
{
|
||||||
|
Character c = prefab.GetComponent<Character>();
|
||||||
|
if (c != null) localizedVictim = c.m_name;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Message Format Variables
|
||||||
|
string type1Separator = Localization.instance.Localize("$killfeed_format_type1");
|
||||||
|
string type2Separator = Localization.instance.Localize("$killfeed_format_type2");
|
||||||
|
string finalMsg = "";
|
||||||
|
string attackerFormat = "";
|
||||||
|
string victimFormat = "";
|
||||||
|
string distanceFormat = "";
|
||||||
|
string starFormat = "";
|
||||||
|
string crossFormat = "";
|
||||||
|
// Format Message in Divided Section
|
||||||
|
starFormat = "<color=#fffb00>★</color>";
|
||||||
|
crossFormat = "<color=#a0a3a1>✝</color>";
|
||||||
|
attackerFormat = $"<color=#00ff06>{attacker.ToUpper()}</color>";
|
||||||
|
|
||||||
|
if (type == 1)
|
||||||
|
{
|
||||||
|
victimFormat = $"{crossFormat} <color=#00ff06>{victim.ToUpper()}</color>";
|
||||||
|
} else if(type == 2)
|
||||||
|
{
|
||||||
|
switch (level)
|
||||||
|
{
|
||||||
|
case 1:
|
||||||
|
victimFormat = $"<color=#00ff06>{victim.ToUpper()}</color>";
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
victimFormat = $"{starFormat} <color=#00ff06>{victim.ToUpper()}</color>";
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
victimFormat = $"{starFormat}{starFormat} <color=#00ff06>{victim.ToUpper()}</color>";
|
||||||
|
break;
|
||||||
|
case 4:
|
||||||
|
victimFormat = $"{starFormat}{starFormat}{starFormat} <color=#00ff06>{victim.ToUpper()}</color>";
|
||||||
|
break;
|
||||||
|
case 5:
|
||||||
|
victimFormat = $"{starFormat}{starFormat}{starFormat}{starFormat} <color=#00ff06>{victim.ToUpper()}</color>";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
distanceFormat = $"{Localization.instance.Localize("$killfeed_format_distance_before")}<color=#9402f5>{distance:F1}m</color>{Localization.instance.Localize("$killfeed_format_distance_after")}";
|
||||||
|
|
||||||
|
finalMsg =
|
||||||
|
(type == 1) ? $"{victimFormat}{type1Separator}{attackerFormat}{distanceFormat}": // Player Death
|
||||||
|
(type == 2) ? $"{attackerFormat}{type2Separator}{victimFormat}{distanceFormat}": // Player Killed Something
|
||||||
|
$"{attackerFormat}{type2Separator}{victimFormat}{distanceFormat}"; // Failsafe
|
||||||
|
|
||||||
Sprite weaponIcon = null;
|
Sprite weaponIcon = null;
|
||||||
|
|
||||||
// Only check ObjectDB if we are actually in a world
|
|
||||||
if (ObjectDB.instance != null && !string.IsNullOrEmpty(weaponPrefab))
|
if (ObjectDB.instance != null && !string.IsNullOrEmpty(weaponPrefab))
|
||||||
{
|
{
|
||||||
GameObject itemObj = ObjectDB.instance.GetItemPrefab(weaponPrefab);
|
GameObject itemObj = ObjectDB.instance.GetItemPrefab(weaponPrefab);
|
||||||
@@ -41,88 +103,38 @@ namespace MxValheim.KillFeed
|
|||||||
{
|
{
|
||||||
weaponIcon = itemDrop.m_itemData.m_shared.m_icons[0];
|
weaponIcon = itemDrop.m_itemData.m_shared.m_icons[0];
|
||||||
}
|
}
|
||||||
|
} else
|
||||||
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (type == 1)
|
||||||
|
{ // Player
|
||||||
|
borderColor = new Color(0.545f, 0f, 0f);
|
||||||
|
}
|
||||||
|
else if (isBoss)
|
||||||
|
{ // Boss
|
||||||
|
borderColor = new Color(0.545f, 0.361f, 0f);
|
||||||
|
}
|
||||||
|
else if (level >= 2)
|
||||||
|
{ // 1-Star +
|
||||||
|
borderColor = new Color(0.525f, 0.545f, 0f);
|
||||||
|
}
|
||||||
|
else if (level < 2)
|
||||||
|
{
|
||||||
|
borderColor = new Color(0.141f, 0.141f, 0.153f);
|
||||||
|
}
|
||||||
|
|
||||||
lock (_msgQueue)
|
lock (_msgQueue)
|
||||||
{
|
{
|
||||||
_msgQueue.Enqueue(finalMsg);
|
_msgQueue.Enqueue(finalMsg);
|
||||||
|
_borderColQueue.Enqueue(borderColor);
|
||||||
_iconQueue.Enqueue(weaponIcon);
|
_iconQueue.Enqueue(weaponIcon);
|
||||||
|
_victimIconQueue.Enqueue(victimIcon);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[HarmonyPatch(typeof(Character), nameof(Character.Damage))]
|
public void ShowNextMessage(string msg, Sprite weaponIcon, Sprite victimIcon, Color borderColor)
|
||||||
public static class DamageTracker
|
|
||||||
{
|
|
||||||
static void Prefix(Character __instance, HitData hit)
|
|
||||||
{
|
|
||||||
if (__instance == null || hit == null) return;
|
|
||||||
|
|
||||||
Character attacker = hit.GetAttacker();
|
|
||||||
if (attacker != null)
|
|
||||||
{
|
|
||||||
string weaponName = "Unknown";
|
|
||||||
|
|
||||||
// If the attacker is a player, get their current weapon
|
|
||||||
if (attacker.IsPlayer())
|
|
||||||
{
|
|
||||||
Player player = attacker as Player;
|
|
||||||
if (player != null && player.GetCurrentWeapon() != null)
|
|
||||||
{
|
|
||||||
weaponName = player.GetCurrentWeapon().m_dropPrefab?.name ?? "Hands";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// If it's a monster, we just use their hover name (e.g., "Troll")
|
|
||||||
weaponName = attacker.GetHoverName();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Store the data for the Postfix to use
|
|
||||||
_activeTrackers[__instance] = new KillData
|
|
||||||
{
|
|
||||||
attackerName = attacker.GetHoverName(),
|
|
||||||
weaponPrefabName = weaponName
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[HarmonyPatch(typeof(Character), nameof(Character.ApplyDamage))]
|
|
||||||
public static class DeathNotifier
|
|
||||||
{
|
|
||||||
// The parameter names MUST match the game's: hit, showDamageText, triggerEffects, mod
|
|
||||||
static void Postfix(Character __instance, HitData hit, bool showDamageText, bool triggerEffects, HitData.DamageModifier mod)
|
|
||||||
{
|
|
||||||
// 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;
|
|
||||||
|
|
||||||
_activeTrackers.TryGetValue(__instance, out KillData data);
|
|
||||||
|
|
||||||
string attackerName = data?.attackerName ?? hit.GetAttacker()?.GetHoverName() ?? "The World";
|
|
||||||
string weaponName = data?.weaponPrefabName ?? "";
|
|
||||||
string victimName = __instance.GetHoverName();
|
|
||||||
|
|
||||||
int type = 0;
|
|
||||||
if (__instance.IsPlayer()) type = 1;
|
|
||||||
else if (attackerName == Player.m_localPlayer?.GetHoverName()) type = 2;
|
|
||||||
|
|
||||||
if (ZRoutedRpc.instance != null)
|
|
||||||
{
|
|
||||||
ZRoutedRpc.instance.InvokeRoutedRPC(ZRoutedRpc.Everybody, "RPC_MxKillMsg",
|
|
||||||
attackerName, victimName, weaponName, type);
|
|
||||||
}
|
|
||||||
|
|
||||||
_activeTrackers.Remove(__instance);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ShowNextMessage(string msg, Sprite icon)
|
|
||||||
{
|
{
|
||||||
if (_hudRoot == null) CreateCustomHud();
|
if (_hudRoot == null) CreateCustomHud();
|
||||||
|
|
||||||
@@ -140,13 +152,146 @@ namespace MxValheim.KillFeed
|
|||||||
}
|
}
|
||||||
|
|
||||||
_killText.text = msg;
|
_killText.text = msg;
|
||||||
_weaponIconSlot.sprite = icon;
|
_border.effectColor = borderColor;
|
||||||
_weaponIconSlot.gameObject.SetActive(icon != null);
|
_border.enabled = true;
|
||||||
|
// Weapon icon (Left)
|
||||||
|
_weaponIconSlot.sprite = weaponIcon;
|
||||||
|
_weaponIconSlot.enabled = (weaponIcon != null);
|
||||||
|
// Victim icon (Right)
|
||||||
|
if (_victimIconSlot != null)
|
||||||
|
{
|
||||||
|
_victimIconSlot.sprite = victimIcon;
|
||||||
|
_victimIconSlot.enabled = (victimIcon != null);
|
||||||
|
}
|
||||||
|
_weaponIconSlot.gameObject.SetActive(weaponIcon != null);
|
||||||
|
_victimIconSlot.gameObject.SetActive(victimIcon != null);
|
||||||
|
_panelImage.rectTransform.localScale = (borderColor != Color.white) ? new Vector3(1.1f, 1.1f, 1.1f) : Vector3.one;
|
||||||
_hudRoot.SetActive(true);
|
_hudRoot.SetActive(true);
|
||||||
_canvasGroup.alpha = 1f;
|
_canvasGroup.alpha = 1f;
|
||||||
_displayTimer = 5.0f;
|
_displayTimer = 5.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private Sprite GetCreatureIcon(string creatureName)
|
||||||
|
{
|
||||||
|
if (ObjectDB.instance == null) return null;
|
||||||
|
|
||||||
|
// Clean the name (remove "(Clone)" if it somehow slipped through)
|
||||||
|
string cleanName = creatureName.Replace("(Clone)", "").Trim();
|
||||||
|
|
||||||
|
// List of common trophies that don't follow the exact pattern if needed
|
||||||
|
// But for most (Boar, Greyling, Neck, Deer), this works:
|
||||||
|
string replace = cleanName.Replace("_","");
|
||||||
|
string trophyName = "Trophy" + replace;
|
||||||
|
|
||||||
|
GameObject trophyObj = ObjectDB.instance.GetItemPrefab(trophyName);
|
||||||
|
if (trophyObj != null)
|
||||||
|
{
|
||||||
|
ItemDrop item = trophyObj.GetComponent<ItemDrop>();
|
||||||
|
return item?.m_itemData?.m_shared?.m_icons[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
[HarmonyPatch(typeof(Character), nameof(Character.Damage))]
|
||||||
|
public static class DamageTracker
|
||||||
|
{
|
||||||
|
static void Prefix(Character __instance, HitData hit)
|
||||||
|
{
|
||||||
|
if (__instance == null || hit == null) return;
|
||||||
|
|
||||||
|
Character attacker = hit.GetAttacker();
|
||||||
|
if (attacker != null)
|
||||||
|
{
|
||||||
|
string weaponId = "";
|
||||||
|
if (attacker is Player p)
|
||||||
|
{
|
||||||
|
// IMPORTANT: Use .m_dropPrefab.name to get "AxeStone"
|
||||||
|
// Do NOT use .m_shared.m_name which returns "$item_axe_stone"
|
||||||
|
ItemDrop.ItemData currentWeapon = p.GetCurrentWeapon();
|
||||||
|
if (currentWeapon != null && currentWeapon.m_dropPrefab != null)
|
||||||
|
{
|
||||||
|
weaponId = currentWeapon.m_dropPrefab.name;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_activeTrackers[__instance] = new KillData
|
||||||
|
{
|
||||||
|
attackerName = attacker.GetHoverName(),
|
||||||
|
weaponPrefabName = weaponId
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[HarmonyPatch(typeof(Character), nameof(Character.ApplyDamage))]
|
||||||
|
public static class DeathNotifier
|
||||||
|
{
|
||||||
|
// The parameter names MUST match the game's: hit, showDamageText, triggerEffects, mod
|
||||||
|
static void Postfix(Character __instance, HitData hit, bool showDamageText, bool triggerEffects, HitData.DamageModifier mod)
|
||||||
|
{
|
||||||
|
// Check if the character is dead or just died
|
||||||
|
if (__instance.GetHealth() <= 0f)
|
||||||
|
{
|
||||||
|
ZNetView nview = __instance.GetComponent<ZNetView>();
|
||||||
|
|
||||||
|
// Prevent inter-npc kill
|
||||||
|
if (!__instance.IsPlayer() && !hit.GetAttacker().IsPlayer()) return;
|
||||||
|
|
||||||
|
// This check should now pass because ApplyDamage happens before the object is invalidated
|
||||||
|
if (nview == null || !nview.IsValid() || !nview.IsOwner()) return;
|
||||||
|
|
||||||
|
float distance = 0f;
|
||||||
|
Character attacker = hit.GetAttacker();
|
||||||
|
if (attacker != null)
|
||||||
|
{
|
||||||
|
Debug.Log($"KillFeed:ApplyDamage Attacker is {attacker} {attacker.transform.position}/{__instance.transform.position}");
|
||||||
|
distance = Vector3.Distance(attacker.transform.position, __instance.transform.position);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Use Utils.GetPrefabName to get "Boar" instead of "Sanglier" or "Boar(Clone)"
|
||||||
|
string internalName = __instance.gameObject.name;
|
||||||
|
int cloneIndex = internalName.IndexOf("(Clone)");
|
||||||
|
if (cloneIndex != -1)
|
||||||
|
{
|
||||||
|
internalName = internalName.Substring(0, cloneIndex);
|
||||||
|
}
|
||||||
|
|
||||||
|
_activeTrackers.TryGetValue(__instance, out KillData data);
|
||||||
|
|
||||||
|
string attackerName = data?.attackerName ?? hit.GetAttacker()?.GetHoverName() ?? "The World";
|
||||||
|
string weaponName = "";
|
||||||
|
if (data != null && !string.IsNullOrEmpty(data.weaponPrefabName))
|
||||||
|
{
|
||||||
|
weaponName = data.weaponPrefabName;
|
||||||
|
}
|
||||||
|
else if (hit.GetAttacker() is Player p)
|
||||||
|
{
|
||||||
|
// Fallback: If tracker missed it, get current player's weapon
|
||||||
|
weaponName = p.GetCurrentWeapon()?.m_dropPrefab?.name ?? "";
|
||||||
|
}
|
||||||
|
string victimName = __instance.GetHoverName();
|
||||||
|
|
||||||
|
int type = 0;
|
||||||
|
if (__instance.IsPlayer()) type = 1;
|
||||||
|
else if (attackerName == Player.m_localPlayer?.GetHoverName()) type = 2;
|
||||||
|
|
||||||
|
int level = __instance.GetLevel();
|
||||||
|
bool isBoss = __instance.IsBoss();
|
||||||
|
|
||||||
|
int distInt = (int)(Math.Min(distance, 999f) * 10);
|
||||||
|
int encodedType = type + (level * 10) + (isBoss ? 100 : 0) + (distInt * 1000);
|
||||||
|
|
||||||
|
if (ZRoutedRpc.instance != null)
|
||||||
|
{
|
||||||
|
ZRoutedRpc.instance.InvokeRoutedRPC(ZRoutedRpc.Everybody, "RPC_MxKillMsg",
|
||||||
|
attackerName, victimName, internalName, weaponName, encodedType);
|
||||||
|
}
|
||||||
|
|
||||||
|
_activeTrackers.Remove(__instance);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void CreateCustomHud()
|
private void CreateCustomHud()
|
||||||
{
|
{
|
||||||
GameObject oldRoot = GameObject.Find("MxKillFeed_Root");
|
GameObject oldRoot = GameObject.Find("MxKillFeed_Root");
|
||||||
@@ -172,6 +317,21 @@ namespace MxValheim.KillFeed
|
|||||||
_panelImage = panel.GetComponent<Image>();
|
_panelImage = panel.GetComponent<Image>();
|
||||||
_panelImage.color = new Color(0, 0, 0, 0.6f); // More transparent/sleek
|
_panelImage.color = new Color(0, 0, 0, 0.6f); // More transparent/sleek
|
||||||
|
|
||||||
|
// 1. Add Layout Group to handle the horizontal row
|
||||||
|
HorizontalLayoutGroup layout = panel.AddComponent<HorizontalLayoutGroup>();
|
||||||
|
layout.childAlignment = TextAnchor.MiddleCenter;
|
||||||
|
layout.spacing = 10f;
|
||||||
|
layout.padding = new RectOffset(15, 15, 5, 5); // Internal margins
|
||||||
|
layout.childControlWidth = true; // Let the layout control widths
|
||||||
|
layout.childControlHeight = true;
|
||||||
|
layout.childForceExpandWidth = false;
|
||||||
|
|
||||||
|
// 2. Add the Content Size Fitter (The "Stretcher")
|
||||||
|
ContentSizeFitter fitter = panel.AddComponent<ContentSizeFitter>();
|
||||||
|
fitter.horizontalFit = ContentSizeFitter.FitMode.PreferredSize;
|
||||||
|
fitter.verticalFit = ContentSizeFitter.FitMode.PreferredSize;
|
||||||
|
|
||||||
|
|
||||||
// Try to find the "sunken" wood panel style if shout_field isn't your vibe
|
// Try to find the "sunken" wood panel style if shout_field isn't your vibe
|
||||||
foreach (Sprite s in Resources.FindObjectsOfTypeAll<Sprite>())
|
foreach (Sprite s in Resources.FindObjectsOfTypeAll<Sprite>())
|
||||||
{
|
{
|
||||||
@@ -194,6 +354,9 @@ namespace MxValheim.KillFeed
|
|||||||
iconObj.transform.SetParent(panel.transform, false);
|
iconObj.transform.SetParent(panel.transform, false);
|
||||||
_weaponIconSlot = iconObj.GetComponent<Image>();
|
_weaponIconSlot = iconObj.GetComponent<Image>();
|
||||||
_weaponIconSlot.preserveAspect = true;
|
_weaponIconSlot.preserveAspect = true;
|
||||||
|
LayoutElement weaponLayout = iconObj.AddComponent<LayoutElement>();
|
||||||
|
weaponLayout.preferredWidth = 24;
|
||||||
|
weaponLayout.preferredHeight = 24;
|
||||||
|
|
||||||
RectTransform iRect = iconObj.GetComponent<RectTransform>();
|
RectTransform iRect = iconObj.GetComponent<RectTransform>();
|
||||||
iRect.anchorMin = iRect.anchorMax = iRect.pivot = new Vector2(0, 0.5f);
|
iRect.anchorMin = iRect.anchorMax = iRect.pivot = new Vector2(0, 0.5f);
|
||||||
@@ -204,6 +367,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;
|
||||||
|
|
||||||
// Attempt to find Valheim's specific font, fallback to Arial if not found
|
// Attempt to find Valheim's specific font, fallback to Arial if not found
|
||||||
Font valheimFont = null;
|
Font valheimFont = null;
|
||||||
@@ -223,85 +388,37 @@ namespace MxValheim.KillFeed
|
|||||||
}
|
}
|
||||||
|
|
||||||
_killText.font = valheimFont;
|
_killText.font = valheimFont;
|
||||||
_killText.fontSize = 18;
|
_killText.fontSize = 12;
|
||||||
_killText.alignment = TextAnchor.MiddleLeft;
|
_killText.alignment = TextAnchor.MiddleLeft;
|
||||||
_killText.supportRichText = true;
|
_killText.supportRichText = true;
|
||||||
_killText.color = Color.white;
|
_killText.color = Color.white;
|
||||||
|
|
||||||
|
|
||||||
|
// 4. Victim Portrait Slot
|
||||||
|
GameObject victimObj = new GameObject("VictimIcon", typeof(RectTransform), typeof(Image));
|
||||||
|
victimObj.transform.SetParent(panel.transform, false);
|
||||||
|
_victimIconSlot = victimObj.GetComponent<Image>();
|
||||||
|
_victimIconSlot.preserveAspect = true;
|
||||||
|
LayoutElement victimLayout = victimObj.AddComponent<LayoutElement>();
|
||||||
|
victimLayout.preferredWidth = 24;
|
||||||
|
victimLayout.preferredHeight = 24;
|
||||||
|
|
||||||
|
RectTransform vRect = victimObj.GetComponent<RectTransform>();
|
||||||
|
vRect.anchorMin = vRect.anchorMax = vRect.pivot = new Vector2(1, 0.5f);
|
||||||
|
vRect.anchoredPosition = new Vector2(-8, 0);
|
||||||
|
vRect.sizeDelta = new Vector2(30, 30);
|
||||||
|
|
||||||
RectTransform tRect = textObj.GetComponent<RectTransform>();
|
RectTransform tRect = textObj.GetComponent<RectTransform>();
|
||||||
tRect.anchorMin = Vector2.zero;
|
tRect.anchorMin = Vector2.zero;
|
||||||
tRect.anchorMax = Vector2.one;
|
tRect.anchorMax = Vector2.one;
|
||||||
tRect.offsetMin = new Vector2(40, 0);
|
tRect.offsetMin = new Vector2(40, 0);
|
||||||
tRect.offsetMax = new Vector2(-10, 0);
|
tRect.offsetMax = new Vector2(-40, 0);
|
||||||
|
|
||||||
|
_border = panel.AddComponent<Outline>();
|
||||||
|
_border.effectDistance = new Vector2(2, 2);
|
||||||
|
_border.enabled = false; // Off by default
|
||||||
|
|
||||||
_hudRoot.SetActive(false);
|
_hudRoot.SetActive(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
public void CreateCustomHud()
|
|
||||||
{
|
|
||||||
_hudRoot = new GameObject("MxKillFeed_Root");
|
|
||||||
UnityEngine.Object.DontDestroyOnLoad(_hudRoot);
|
|
||||||
|
|
||||||
Canvas c = _hudRoot.AddComponent<Canvas>();
|
|
||||||
c.renderMode = RenderMode.ScreenSpaceOverlay;
|
|
||||||
c.sortingOrder = 10000;
|
|
||||||
|
|
||||||
// Add a Scaler to ensure it looks right on all resolutions
|
|
||||||
CanvasScaler scaler = _hudRoot.AddComponent<CanvasScaler>();
|
|
||||||
scaler.uiScaleMode = CanvasScaler.ScaleMode.ScaleWithScreenSize;
|
|
||||||
scaler.referenceResolution = new Vector2(1920, 1080);
|
|
||||||
|
|
||||||
_canvasGroup = _hudRoot.AddComponent<CanvasGroup>();
|
|
||||||
|
|
||||||
GameObject panel = new GameObject("Background", typeof(RectTransform), typeof(Image));
|
|
||||||
panel.transform.SetParent(_hudRoot.transform, false);
|
|
||||||
_panelImage = panel.GetComponent<Image>();
|
|
||||||
|
|
||||||
// Fallback: Set a solid color first in case the sprite search fails
|
|
||||||
_panelImage.color = new Color(0, 0, 0, 0.8f);
|
|
||||||
|
|
||||||
foreach (Sprite s in Resources.FindObjectsOfTypeAll<Sprite>())
|
|
||||||
{
|
|
||||||
if (s.name == "shout_field")
|
|
||||||
{
|
|
||||||
_panelImage.sprite = s;
|
|
||||||
_panelImage.type = Image.Type.Sliced;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
RectTransform pRect = panel.GetComponent<RectTransform>();
|
|
||||||
pRect.anchorMin = pRect.anchorMax = pRect.pivot = new Vector2(0.5f, 0.95f);
|
|
||||||
pRect.anchoredPosition = Vector2.zero; // Center top
|
|
||||||
pRect.sizeDelta = new Vector2(550, 40);
|
|
||||||
pRect.localScale = Vector3.one; // FORCE SCALE TO 1
|
|
||||||
|
|
||||||
// Icon
|
|
||||||
GameObject iconObj = new GameObject("Icon", typeof(RectTransform), typeof(Image));
|
|
||||||
iconObj.transform.SetParent(panel.transform, false);
|
|
||||||
_weaponIconSlot = iconObj.GetComponent<Image>();
|
|
||||||
_weaponIconSlot.preserveAspect = true;
|
|
||||||
RectTransform iRect = iconObj.GetComponent<RectTransform>();
|
|
||||||
iRect.anchorMin = iRect.anchorMax = iRect.pivot = new Vector2(0, 0.5f);
|
|
||||||
iRect.anchoredPosition = new Vector2(10, 0);
|
|
||||||
iRect.sizeDelta = new Vector2(30, 30);
|
|
||||||
|
|
||||||
// Text
|
|
||||||
GameObject textObj = new GameObject("Text", typeof(RectTransform), typeof(Text));
|
|
||||||
textObj.transform.SetParent(panel.transform, false);
|
|
||||||
_killText = textObj.GetComponent<Text>();
|
|
||||||
_killText.font = Resources.GetBuiltinResource<Font>("Arial.ttf");
|
|
||||||
_killText.fontSize = 18;
|
|
||||||
_killText.alignment = TextAnchor.MiddleLeft;
|
|
||||||
_killText.supportRichText = true;
|
|
||||||
textObj.AddComponent<Outline>().effectColor = Color.black;
|
|
||||||
|
|
||||||
RectTransform tRect = textObj.GetComponent<RectTransform>();
|
|
||||||
tRect.anchorMin = Vector2.zero; tRect.anchorMax = Vector2.one;
|
|
||||||
tRect.offsetMin = new Vector2(50, 0); tRect.offsetMax = new Vector2(-10, 0);
|
|
||||||
|
|
||||||
_hudRoot.SetActive(false);
|
|
||||||
}*/
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,25 +1,34 @@
|
|||||||
using BepInEx;
|
using BepInEx;
|
||||||
using BepInEx.Configuration;
|
using BepInEx.Configuration;
|
||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
|
using MxValheim.EventSystem;
|
||||||
using MxValheim.KillFeed;
|
using MxValheim.KillFeed;
|
||||||
|
using MxValheim.Patch;
|
||||||
|
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;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Reflection;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Xml;
|
using System.Xml;
|
||||||
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
using static MxValheim.Patch.Doors_Patch;
|
||||||
|
|
||||||
[BepInPlugin(ModGUID, ModName, ModVersion)]
|
[BepInPlugin(ModGUID, ModName, ModVersion)]
|
||||||
public class MxValheimMod : BaseUnityPlugin
|
public class MxValheimMod : BaseUnityPlugin
|
||||||
{
|
{
|
||||||
public static MxValheimMod Instance; // Singleton reference
|
public static MxValheimMod Instance; // Singleton reference
|
||||||
public static KillFeed_Patch kfp = new KillFeed_Patch();
|
public static KillFeed_Patch kfp = new KillFeed_Patch();
|
||||||
|
public static Doors_Patch dpatch = new Doors_Patch();
|
||||||
|
|
||||||
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.5.0";
|
private const string ModVersion = "1.6.0";
|
||||||
|
|
||||||
public static ConfigEntry<bool> Config_Locked;
|
public static ConfigEntry<bool> Config_Locked;
|
||||||
public static ConfigEntry<int> Config_OreMultiplier;
|
public static ConfigEntry<int> Config_OreMultiplier;
|
||||||
@@ -30,27 +39,48 @@ public class MxValheimMod : BaseUnityPlugin
|
|||||||
public static ConfigEntry<bool> Config_autoDoorCloseEnabled;
|
public static ConfigEntry<bool> Config_autoDoorCloseEnabled;
|
||||||
public static ConfigEntry<float> Config_autoDoorClose;
|
public static ConfigEntry<float> Config_autoDoorClose;
|
||||||
|
|
||||||
private static string WeightConfigPath => Path.Combine(Paths.ConfigPath, "mxvalheim.custom_weights.json");
|
public static string modPath = Path.Combine(Paths.PluginPath, "MxValheim");
|
||||||
|
public static string internalConfigsPath = Path.Combine(modPath, "Configs");
|
||||||
|
public static string internalDataPath = Path.Combine(modPath, "Data");
|
||||||
|
public static string internalDataEventSystemPath = Path.Combine(internalDataPath, "EventSystem");
|
||||||
|
public static string WeightConfigPath => Path.Combine(internalConfigsPath, "items_weight.json");
|
||||||
|
public static string AutoDoorConfigPath => Path.Combine(internalConfigsPath, "auto_doors.json");
|
||||||
|
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 bool initExpBar = true;
|
||||||
|
|
||||||
// Data structures
|
// Data structures
|
||||||
public class KillData
|
public class KillData
|
||||||
{
|
{
|
||||||
public string attackerName;
|
public string attackerName;
|
||||||
public string weaponPrefabName;
|
public string weaponPrefabName;
|
||||||
|
public int victimLevel;
|
||||||
|
public bool isBoss;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static GameObject _hudRoot;
|
public static GameObject _hudRoot;
|
||||||
public static Text _killText;
|
public static Text _killText;
|
||||||
public static Image _weaponIconSlot;
|
public static Image _weaponIconSlot;
|
||||||
|
public static Image _victimIconSlot;
|
||||||
public static Image _panelImage;
|
public static Image _panelImage;
|
||||||
|
public static Outline _border;
|
||||||
|
public static Color borderColor = Color.white;
|
||||||
public static CanvasGroup _canvasGroup;
|
public static CanvasGroup _canvasGroup;
|
||||||
|
public static float _fadeDuration = 0.5f;
|
||||||
public static float _displayTimer;
|
public static float _displayTimer;
|
||||||
|
|
||||||
public static readonly Queue<string> _msgQueue = new Queue<string>();
|
public static readonly Queue<string> _msgQueue = new Queue<string>();
|
||||||
|
public static readonly Queue<Color> _borderColQueue = new Queue<Color>();
|
||||||
public static readonly Queue<Sprite> _iconQueue = new Queue<Sprite>();
|
public static readonly Queue<Sprite> _iconQueue = new Queue<Sprite>();
|
||||||
|
public static readonly Queue<Sprite> _victimIconQueue = new Queue<Sprite>();
|
||||||
public static readonly Dictionary<Character, KillData> _activeTrackers = new Dictionary<Character, KillData>();
|
public static readonly Dictionary<Character, KillData> _activeTrackers = new Dictionary<Character, KillData>();
|
||||||
|
|
||||||
|
public static readonly Queue<ZNetView> _doorQueueNview = new Queue<ZNetView>();
|
||||||
|
public static readonly Queue<Door> _doorQueueDoor = new Queue<Door>();
|
||||||
|
public static readonly Queue<string> _doorQueueName = new Queue<string>();
|
||||||
|
public static float _doorTimer;
|
||||||
|
|
||||||
void Awake()
|
void Awake()
|
||||||
{
|
{
|
||||||
Instance = this;
|
Instance = this;
|
||||||
@@ -63,12 +93,39 @@ public class MxValheimMod : BaseUnityPlugin
|
|||||||
Config_autoDoorCloseEnabled = Config.Bind("General", "AutoDoorCloseEnabled", true, "Your doors will auto close if enabled. See AutoDoorCloseTimer for the desired time.");
|
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.");
|
Config_autoDoorClose = Config.Bind("General", "AutoDoorCloseTimer", 5.0f, "Your doors will auto close after the specified timer duration.");
|
||||||
|
|
||||||
|
LoadLocalization();
|
||||||
LoadJsonConfig();
|
LoadJsonConfig();
|
||||||
|
LoadDoorConfig();
|
||||||
|
|
||||||
|
_doorTimer = MxValheimMod.Config_autoDoorClose.Value;
|
||||||
|
|
||||||
Harmony harmony = new Harmony(ModGUID);
|
Harmony harmony = new Harmony(ModGUID);
|
||||||
harmony.PatchAll();
|
harmony.PatchAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[HarmonyPatch(typeof(Localization), nameof(Localization.SetupLanguage))]
|
||||||
|
public static class Localization_SetupLanguage_Patch
|
||||||
|
{
|
||||||
|
public static void Postfix()
|
||||||
|
{
|
||||||
|
LoadLocalization();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- TEST COMMAND: Type 'testkill' in F5 console ---
|
||||||
|
[HarmonyPatch(typeof(Terminal), nameof(Terminal.InputText))]
|
||||||
|
public static class ConsoleInputPatch
|
||||||
|
{
|
||||||
|
static void Postfix(Terminal __instance)
|
||||||
|
{
|
||||||
|
string text = __instance.m_input.text;
|
||||||
|
if (text.ToLower() == "listicons")
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
[HarmonyPatch(typeof(Game), nameof(Game.Start))]
|
[HarmonyPatch(typeof(Game), nameof(Game.Start))]
|
||||||
public static class GameStartPatch
|
public static class GameStartPatch
|
||||||
{
|
{
|
||||||
@@ -77,25 +134,93 @@ 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
|
// We use the explicit 'Method' delegate to avoid the ArgumentException
|
||||||
ZRoutedRpc.instance.Register<string, string, string, int>("RPC_MxKillMsg",
|
ZRoutedRpc.instance.Register<string, string, string, string, int>("RPC_MxKillMsg",
|
||||||
new RoutedMethod<string, string, string, int>.Method(kfp.OnReceiveKillMsg));
|
new RoutedMethod<string, string, string, string, int>.Method(kfp.OnReceiveKillMsg));
|
||||||
|
|
||||||
Debug.Log("MxValheimMod: RPC Registered successfully with explicit delegate.");
|
ZRoutedRpc.instance.Register<string, string>("RPC_ServerCreateUser", Profiles.ServerReceiveCreateUser);
|
||||||
|
ZRoutedRpc.instance.Register<string>("RPC_RequestProfile", Profiles.ServerHandleProfileRequest);
|
||||||
|
ZRoutedRpc.instance.Register<string>("RPC_ClientReceiveProfile", Profiles.ClientLoadProfile);
|
||||||
|
ZRoutedRpc.instance.Register<string>("RPC_UpdateProgressBar", Profiles.ClientLoadProfile);
|
||||||
|
ZRoutedRpc.instance.Register<string, int>("RPC_ServerSetUserExperience", Profiles.ServerSetUserExperience);
|
||||||
|
ZRoutedRpc.instance.Register<string, int>("RPC_ServerSetUserLevel", Profiles.ServerSetUserLevel);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Update()
|
void Update()
|
||||||
{
|
{
|
||||||
// Use the game's native check for dedicated servers
|
// Only run if we are actually in the game world
|
||||||
|
if (Player.m_localPlayer != null)
|
||||||
|
{
|
||||||
|
string pid = GetUserPlayerID(Player.m_localPlayer).ToString();
|
||||||
|
Experience.UpdateProgressBar(pid);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only run if we are actually in the game world
|
||||||
|
if (Player.m_localPlayer != null)
|
||||||
|
{
|
||||||
|
if (Splash.m_canvasObject == null)
|
||||||
|
{
|
||||||
|
Splash spl = new Splash();
|
||||||
|
spl.CreateOverlay();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Splash.m_textComponent != null)
|
||||||
|
{
|
||||||
|
Splash.m_textComponent.text = $"<color=#677074>Mx</color><color=#d1954a>Valheim {MxValheimMod.ModVersion}</color>";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Clock.m_canvasObject == null)
|
||||||
|
{
|
||||||
|
Clock clk = new Clock();
|
||||||
|
clk.CreateOverlay();
|
||||||
|
if (initExpBar)
|
||||||
|
{
|
||||||
|
string pid = GetUserPlayerID(Player.m_localPlayer).ToString();
|
||||||
|
Experience.UpdateProgressBar(pid);
|
||||||
|
initExpBar = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Clock.m_textComponent != null)
|
||||||
|
{
|
||||||
|
Clock clk = new Clock();
|
||||||
|
string timeString = clk.GetFormattedTime();
|
||||||
|
int day = EnvMan.instance.GetDay();
|
||||||
|
string pid = GetUserPlayerID(Player.m_localPlayer).ToString();
|
||||||
|
Clock.m_textComponent.text = $"<color=#32a852>{Localization.instance.Localize("$clock_string_rank")} {Profiles.playerLevel}</color> <color=#677074>|</color> <color=#32a852>{Localization.instance.Localize("$clock_string_day")} {day}</color> <color=#677074>|</color> <color=#d1954a>{timeString}</color>";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Door Logic
|
||||||
|
if (_doorQueueNview.Count > 0)
|
||||||
|
{
|
||||||
|
if (_doorTimer > 0)
|
||||||
|
{
|
||||||
|
_doorTimer -= Time.deltaTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_doorTimer <= 0)
|
||||||
|
{
|
||||||
|
dpatch.CloseNextDoor(_doorQueueDoor.Dequeue(), _doorQueueNview.Dequeue(), _doorQueueName.Dequeue());
|
||||||
|
_doorTimer = MxValheimMod.Config_autoDoorClose.Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Door Logic
|
||||||
|
/////////////
|
||||||
|
|
||||||
|
|
||||||
|
// KillFeed Logic
|
||||||
ZNet zn = new ZNet();
|
ZNet zn = new ZNet();
|
||||||
if (zn.IsDedicated() || Player.m_localPlayer == null) return;
|
if (zn.IsDedicated() || Player.m_localPlayer == null) return;
|
||||||
|
|
||||||
if (_msgQueue == null || _msgQueue.Count == 0 && _displayTimer <= 0) return;
|
if (_msgQueue == null || _msgQueue.Count == 0 && _displayTimer <= 0) return;
|
||||||
|
|
||||||
// Logic to trigger next message
|
// Logic to trigger next message
|
||||||
if (_msgQueue.Count > 0 && _displayTimer <= 0)
|
if (_msgQueue.Count > 0 && _displayTimer <= 0)
|
||||||
{
|
{
|
||||||
kfp.ShowNextMessage(_msgQueue.Dequeue(), _iconQueue.Dequeue());
|
borderColor = new Color(0.141f, 0.141f, 0.153f);
|
||||||
|
kfp.ShowNextMessage(_msgQueue.Dequeue(), _iconQueue.Dequeue(), _victimIconQueue.Dequeue(), _borderColQueue.Dequeue());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_displayTimer > 0)
|
if (_displayTimer > 0)
|
||||||
@@ -110,7 +235,6 @@ public class MxValheimMod : BaseUnityPlugin
|
|||||||
if (_displayTimer > 4.5f)
|
if (_displayTimer > 4.5f)
|
||||||
{ // Fading in (first 0.5s)
|
{ // Fading in (first 0.5s)
|
||||||
_canvasGroup.alpha = (5f - _displayTimer) * 2;
|
_canvasGroup.alpha = (5f - _displayTimer) * 2;
|
||||||
pRect.anchoredPosition = new Vector2(0, -20 - ((5f - _displayTimer) * 20)); // Slide down
|
|
||||||
}
|
}
|
||||||
else if (_displayTimer < 1f)
|
else if (_displayTimer < 1f)
|
||||||
{ // Fading out (last 1s)
|
{ // Fading out (last 1s)
|
||||||
@@ -125,23 +249,57 @@ public class MxValheimMod : BaseUnityPlugin
|
|||||||
|
|
||||||
if (_displayTimer <= 0 && _hudRoot != null) _hudRoot.SetActive(false);
|
if (_displayTimer <= 0 && _hudRoot != null) _hudRoot.SetActive(false);
|
||||||
}
|
}
|
||||||
|
// KillFeed Logic
|
||||||
|
/////////////////
|
||||||
}
|
}
|
||||||
|
|
||||||
[HarmonyPatch(typeof(Terminal), nameof(Terminal.InputText))]
|
public static long GetUserPlayerID(Player player)
|
||||||
public static class ConsoleInputPatch
|
|
||||||
{
|
{
|
||||||
static void Postfix(Terminal __instance)
|
return player.GetPlayerID();
|
||||||
{
|
}
|
||||||
// 2. Get the text safely. Valheim often uses m_input.text
|
|
||||||
string text = __instance.m_input?.text;
|
|
||||||
Debug.Log($"MxKillFeed: {text}");
|
|
||||||
if (string.IsNullOrEmpty(text)) return;
|
|
||||||
|
|
||||||
if (text.ToLower().Trim() == "testkill")
|
public static void LoadLocalization()
|
||||||
{
|
{
|
||||||
// Trigger the message directly on the local client
|
if (Localization.instance == null) return;
|
||||||
KillFeed_Patch kfp = new KillFeed_Patch();
|
|
||||||
kfp.OnReceiveKillMsg(0, "Developer", "Testing Dummy", "AxeFlint", 2);
|
string modPath = Path.Combine(Paths.PluginPath, "MxValheim");
|
||||||
|
string translationsPath = Path.Combine(modPath, "Translations");
|
||||||
|
string lang = Localization.instance.GetSelectedLanguage();
|
||||||
|
string filePath = Path.Combine(translationsPath, $"{lang}.json");
|
||||||
|
|
||||||
|
if (!File.Exists(filePath))
|
||||||
|
{
|
||||||
|
filePath = Path.Combine(translationsPath, "English.json");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (File.Exists(filePath))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
string json = File.ReadAllText(filePath);
|
||||||
|
var dict = JsonConvert.DeserializeObject<Dictionary<string, string>>(json);
|
||||||
|
|
||||||
|
// Get the method via Reflection to bypass "Inaccessible" errors
|
||||||
|
MethodInfo addWordMethod = typeof(Localization).GetMethod("AddWord",
|
||||||
|
BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
|
||||||
|
|
||||||
|
if (addWordMethod != null)
|
||||||
|
{
|
||||||
|
foreach (var entry in dict)
|
||||||
|
{
|
||||||
|
// Parameters: (instance to run on, array of arguments)
|
||||||
|
addWordMethod.Invoke(Localization.instance, new object[] { entry.Key, entry.Value });
|
||||||
|
}
|
||||||
|
Debug.Log($"[MxValheim] Successfully injected {dict.Count} strings for {lang}.");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Debug.LogError("[MxValheim] Critical Error: Could not find AddWord method in game code.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
Debug.LogError($"[MxValheim] Error loading JSON: {e.Message}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -169,6 +327,15 @@ public class MxValheimMod : BaseUnityPlugin
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void LoadDoorConfig()
|
||||||
|
{
|
||||||
|
if (System.IO.File.Exists(AutoDoorConfigPath))
|
||||||
|
{
|
||||||
|
string json = System.IO.File.ReadAllText(AutoDoorConfigPath);
|
||||||
|
CachedConfig = JsonConvert.DeserializeObject<DoorRoot>(json);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
internal static void ShowKillMessage(string v)
|
internal static void ShowKillMessage(string v)
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
throw new NotImplementedException();
|
||||||
|
|||||||
@@ -35,32 +35,49 @@
|
|||||||
<Reference Include="0Harmony">
|
<Reference Include="0Harmony">
|
||||||
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\BepInEx\core\0Harmony.dll</HintPath>
|
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\BepInEx\core\0Harmony.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Assembly-CSharp-publicized">
|
<Reference Include="assembly_googleanalytics">
|
||||||
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\Assembly-CSharp-publicized.dll</HintPath>
|
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\assembly_googleanalytics.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="assembly_valheim-publicized">
|
<Reference Include="assembly_guiutils_publicized">
|
||||||
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\assembly_valheim-publicized.dll</HintPath>
|
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\publicized_assemblies\assembly_guiutils_publicized.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="assembly_utils, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\assembly_utils.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="assembly_valheim_publicized">
|
||||||
|
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\publicized_assemblies\assembly_valheim_publicized.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<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="gui_framework, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
<Reference Include="gui_framework">
|
||||||
|
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\gui_framework.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>
|
||||||
|
<Reference Include="PresentationFramework" />
|
||||||
<Reference Include="Splatform, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
<Reference Include="Splatform, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
|
<Reference Include="System.Drawing" />
|
||||||
<Reference Include="System.Xml.Linq" />
|
<Reference Include="System.Xml.Linq" />
|
||||||
<Reference Include="System.Data.DataSetExtensions" />
|
<Reference Include="System.Data.DataSetExtensions" />
|
||||||
<Reference Include="Microsoft.CSharp" />
|
<Reference Include="Microsoft.CSharp" />
|
||||||
<Reference Include="System.Data" />
|
<Reference Include="System.Data" />
|
||||||
<Reference Include="System.Net.Http" />
|
<Reference Include="System.Net.Http" />
|
||||||
<Reference Include="System.Xml" />
|
<Reference Include="System.Xml" />
|
||||||
<Reference Include="Unity.TextMeshPro, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
<Reference Include="Unity.TextMeshPro">
|
||||||
|
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\Unity.TextMeshPro.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<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.AssetBundleModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
|
<SpecificVersion>False</SpecificVersion>
|
||||||
|
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\UnityEngine.AssetBundleModule.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="UnityEngine.CoreModule">
|
<Reference Include="UnityEngine.CoreModule">
|
||||||
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
|
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
@@ -68,7 +85,9 @@
|
|||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
|
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="UnityEngine.TextRenderingModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" />
|
<Reference Include="UnityEngine.TextRenderingModule">
|
||||||
|
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
<SpecificVersion>False</SpecificVersion>
|
<SpecificVersion>False</SpecificVersion>
|
||||||
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\UnityEngine.UI.dll</HintPath>
|
<HintPath>E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\UnityEngine.UI.dll</HintPath>
|
||||||
@@ -79,27 +98,37 @@
|
|||||||
</Reference>
|
</Reference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="KillFeed\Chat.cs" />
|
<Compile Include="EventSystem\Experience.cs" />
|
||||||
|
<Compile Include="EventSystem\Patch.cs" />
|
||||||
|
<Compile Include="EventSystem\Profiles.cs" />
|
||||||
|
<Compile Include="EventSystem\Reward.cs" />
|
||||||
|
<Compile Include="KillFeed\NPCIcon.cs" />
|
||||||
<Compile Include="KillFeed\Patch.cs" />
|
<Compile Include="KillFeed\Patch.cs" />
|
||||||
<Compile Include="MxValheim.cs" />
|
<Compile Include="MxValheim.cs" />
|
||||||
<Compile Include="Patch\Bow.cs" />
|
<Compile Include="Patch\Bow.cs" />
|
||||||
<Compile Include="Patch\CraftingStation.cs" />
|
<Compile Include="Patch\CraftingStation.cs" />
|
||||||
<Compile Include="Patch\Doors.cs" />
|
<Compile Include="Patch\Doors.cs" />
|
||||||
|
<Compile Include="Patch\HUD\Clock.cs" />
|
||||||
|
<Compile Include="Patch\HUD\Splash.cs" />
|
||||||
<Compile Include="Patch\Items.cs" />
|
<Compile Include="Patch\Items.cs" />
|
||||||
<Compile Include="Patch\Ores.cs" />
|
<Compile Include="Patch\Ores.cs" />
|
||||||
<Compile Include="Patch\WearNTear.cs" />
|
<Compile Include="Patch\WearNTear.cs" />
|
||||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<Analyzer Include="E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\assembly_googleanalytics.dll" />
|
||||||
<Analyzer Include="E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\assembly_guiutils.dll" />
|
<Analyzer Include="E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\assembly_guiutils.dll" />
|
||||||
|
<Analyzer Include="E:\SteamLibrary\steamapps\common\Valheim\Valheim_Data\Managed\assembly_utils.dll" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
copy /Y "$(TargetDir)$(TargetName).dll" "E:\SteamLibrary\steamapps\common\Valheim\BepInEx\plugins\"
|
copy /Y "$(TargetDir)$(TargetName).dll" "E:\SteamLibrary\steamapps\common\Valheim\BepInEx\plugins\MxValheim\"
|
||||||
copy /Y "$(TargetDir)$(TargetName).pdb" "E:\SteamLibrary\steamapps\common\Valheim\BepInEx\plugins\"
|
copy /Y "$(TargetDir)$(TargetName).pdb" "E:\SteamLibrary\steamapps\common\Valheim\BepInEx\plugins\MxValheim\"
|
||||||
|
|
||||||
copy /Y "$(TargetDir)$(TargetName).dll" "R:\Server\valdev\BepInEx\plugins\"
|
copy /Y "$(TargetDir)$(TargetName).dll" "R:\Server\valdev\BepInEx\plugins\MxValheim\"
|
||||||
copy /Y "$(TargetDir)$(TargetName).pdb" "R:\Server\valdev\BepInEx\plugins\"</PostBuildEvent>
|
copy /Y "$(TargetDir)$(TargetName).pdb" "R:\Server\valdev\BepInEx\plugins\MxValheim\"
|
||||||
|
if exist "E:\SteamLibrary\steamapps\common\Valheim\BepInEx\plugins\MxValheim.zip" del "E:\SteamLibrary\steamapps\common\Valheim\BepInEx\plugins\MxValheim.zip"
|
||||||
|
"C:\Program Files\7-Zip\7z.exe" a -tzip "E:\SteamLibrary\steamapps\common\Valheim\BepInEx\plugins\MxValheim.zip" "E:\SteamLibrary\steamapps\common\Valheim\BepInEx\plugins\MxValheim\*"</PostBuildEvent>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@@ -1,48 +1,67 @@
|
|||||||
using BepInEx;
|
using BepInEx;
|
||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
|
using Newtonsoft.Json;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.Diagnostics;
|
using UnityEngine.Diagnostics;
|
||||||
|
using static MxValheimMod;
|
||||||
|
|
||||||
namespace MxValheim.Patch
|
namespace MxValheim.Patch
|
||||||
{
|
{
|
||||||
internal class Doors
|
public class Doors_Patch
|
||||||
{
|
{
|
||||||
|
public class DoorRoot
|
||||||
|
{
|
||||||
|
public List<string> ignoreList { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
[HarmonyPatch(typeof(Door), nameof(Door.Interact))]
|
[HarmonyPatch(typeof(Door), nameof(Door.Interact))]
|
||||||
static class Door_Interact_Patch
|
public static class DoorTracker
|
||||||
{
|
{
|
||||||
static void Postfix(Door __instance, Humanoid character, bool hold, bool alt, ZNetView ___m_nview)
|
static void Postfix(Door __instance, Humanoid character, bool hold, bool alt, ZNetView ___m_nview)
|
||||||
{
|
{
|
||||||
string prefabName = ___m_nview.GetPrefabName();
|
ZNetView nview = __instance.GetComponent<ZNetView>();
|
||||||
|
if (nview != null && nview.IsValid())
|
||||||
|
{
|
||||||
|
// Get the prefab hash and look up the name in the master list
|
||||||
|
int prefabHash = nview.GetZDO().GetPrefab();
|
||||||
|
string prefabName = ZNetScene.instance.GetPrefab(prefabHash).name;
|
||||||
|
|
||||||
|
if (MxValheimMod.CachedConfig?.ignoreList != null)
|
||||||
|
if (MxValheimMod.CachedConfig.ignoreList.Contains(prefabName)) return;
|
||||||
|
|
||||||
if (hold || alt || ___m_nview == null || !___m_nview.IsValid()) return;
|
if (hold || alt || ___m_nview == null || !___m_nview.IsValid()) return;
|
||||||
// Prevent closing of swamp iron gate
|
|
||||||
if (prefabName == "piece_crypt_door") return;
|
|
||||||
|
|
||||||
// Get state: 0 is closed
|
// Get state: 0 is closed
|
||||||
int state = ___m_nview.GetZDO().GetInt("state");
|
int state = ___m_nview.GetZDO().GetInt("state");
|
||||||
|
|
||||||
if (state != 0)
|
if (state == 0) return;
|
||||||
|
|
||||||
|
lock (_doorQueueNview)
|
||||||
{
|
{
|
||||||
// Start coroutine on the door object itself
|
Debug.Log($"AutoDoor:Door.Interact Adding \"{prefabName}\" to queue.");
|
||||||
__instance.StartCoroutine(CloseDoorAfterDelay(__instance, ___m_nview));
|
_doorQueueNview.Enqueue(nview);
|
||||||
|
_doorQueueDoor.Enqueue(__instance);
|
||||||
|
_doorQueueName.Enqueue(prefabName);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static IEnumerator CloseDoorAfterDelay(Door door, ZNetView nview)
|
public void CloseNextDoor(Door door, ZNetView nview, string doorName)
|
||||||
{
|
{
|
||||||
yield return new WaitForSeconds(MxValheimMod.Config_autoDoorClose.Value);
|
|
||||||
|
|
||||||
// Verify the door still exists and is still open before closing
|
|
||||||
if (door != null && nview != null && nview.IsValid())
|
if (door != null && nview != null && nview.IsValid())
|
||||||
{
|
{
|
||||||
if (nview.GetZDO().GetInt("state") != 0)
|
if (nview.GetZDO().GetInt("state") != 0)
|
||||||
{
|
{
|
||||||
// Directly invoke the RPC with '0' (closed).
|
Debug.Log($"AutoDoor:CloseNextDoor Closing door \"{doorName}\".");
|
||||||
// This avoids the 'Null' player error in Door.Interact
|
|
||||||
ZDO zd0 = nview.GetZDO();
|
ZDO zd0 = nview.GetZDO();
|
||||||
zd0.Set("state", 0);
|
zd0.Set("state", 0);
|
||||||
}
|
} else
|
||||||
|
{
|
||||||
|
Debug.Log($"AutoDoor:CloseNextDoor Door \"{doorName}\" was already closed.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
91
MxValheim/Patch/HUD/Clock.cs
Normal file
91
MxValheim/Patch/HUD/Clock.cs
Normal file
@@ -0,0 +1,91 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
|
||||||
|
namespace MxValheim.Patch.HUD
|
||||||
|
{
|
||||||
|
internal class Clock
|
||||||
|
{
|
||||||
|
public static GameObject m_canvasObject;
|
||||||
|
public static Text m_textComponent;
|
||||||
|
public static RectTransform m_barFill;
|
||||||
|
|
||||||
|
// This replaces the missing GetTimeString() method
|
||||||
|
public string GetFormattedTime()
|
||||||
|
{
|
||||||
|
// Get fractional day (0.0 to 1.0)
|
||||||
|
float fraction = EnvMan.instance.GetDayFraction();
|
||||||
|
|
||||||
|
// Convert to hours and minutes
|
||||||
|
float totalHours = fraction * 24f;
|
||||||
|
int hours = Mathf.FloorToInt(totalHours);
|
||||||
|
int minutes = Mathf.FloorToInt((totalHours - hours) * 60f);
|
||||||
|
|
||||||
|
return $"{hours:00}:{minutes:00}";
|
||||||
|
}
|
||||||
|
|
||||||
|
public void CreateOverlay()
|
||||||
|
{
|
||||||
|
m_canvasObject = new GameObject("ModdedCanvas");
|
||||||
|
Canvas canvas = m_canvasObject.AddComponent<Canvas>();
|
||||||
|
canvas.renderMode = RenderMode.ScreenSpaceOverlay;
|
||||||
|
canvas.sortingOrder = 999;
|
||||||
|
|
||||||
|
// --- CLOCK PANEL ---
|
||||||
|
GameObject panelObj = new GameObject("TextBackground");
|
||||||
|
panelObj.transform.SetParent(m_canvasObject.transform, false);
|
||||||
|
panelObj.AddComponent<Image>().color = new Color(0, 0, 0, 0.5f);
|
||||||
|
|
||||||
|
ContentSizeFitter fitter = panelObj.AddComponent<ContentSizeFitter>();
|
||||||
|
fitter.horizontalFit = ContentSizeFitter.FitMode.PreferredSize;
|
||||||
|
fitter.verticalFit = ContentSizeFitter.FitMode.PreferredSize;
|
||||||
|
|
||||||
|
HorizontalLayoutGroup layout = panelObj.AddComponent<HorizontalLayoutGroup>();
|
||||||
|
layout.padding = new RectOffset(15, 15, 5, 5);
|
||||||
|
|
||||||
|
RectTransform panelRect = panelObj.GetComponent<RectTransform>();
|
||||||
|
panelRect.anchorMin = new Vector2(0.5f, 1.0f);
|
||||||
|
panelRect.anchorMax = new Vector2(0.5f, 1.0f);
|
||||||
|
panelRect.pivot = new Vector2(0.5f, 1.0f);
|
||||||
|
panelRect.anchoredPosition = new Vector2(0, -5);
|
||||||
|
|
||||||
|
// --- TEXT ---
|
||||||
|
GameObject textObj = new GameObject("ModdedText");
|
||||||
|
textObj.transform.SetParent(panelObj.transform, false);
|
||||||
|
m_textComponent = textObj.AddComponent<Text>();
|
||||||
|
m_textComponent.font = Resources.GetBuiltinResource<Font>("Arial.ttf");
|
||||||
|
m_textComponent.fontSize = 18;
|
||||||
|
m_textComponent.color = Color.white;
|
||||||
|
|
||||||
|
// --- PROGRESS BAR CONTAINER ---
|
||||||
|
// This sits under the main rectangle
|
||||||
|
GameObject barBgObj = new GameObject("BarBackground");
|
||||||
|
barBgObj.transform.SetParent(m_canvasObject.transform, false);
|
||||||
|
barBgObj.AddComponent<Image>().color = new Color(0.1f, 0.1f, 0.1f, 0.8f); // Dark background
|
||||||
|
|
||||||
|
RectTransform barBgRect = barBgObj.GetComponent<RectTransform>();
|
||||||
|
barBgRect.anchorMin = new Vector2(0.5f, 1.0f);
|
||||||
|
barBgRect.anchorMax = new Vector2(0.5f, 1.0f);
|
||||||
|
barBgRect.pivot = new Vector2(0.5f, 1.0f);
|
||||||
|
// Positioned below the clock panel (Clock is 35px high + 5px gap = -40)
|
||||||
|
barBgRect.anchoredPosition = new Vector2(0, -45);
|
||||||
|
barBgRect.sizeDelta = new Vector2(180, 8); // Match width of clock, small height
|
||||||
|
|
||||||
|
// --- PROGRESS BAR FILL ---
|
||||||
|
GameObject fillObj = new GameObject("BarFill");
|
||||||
|
fillObj.transform.SetParent(barBgObj.transform, false);
|
||||||
|
fillObj.AddComponent<Image>().color = Color.yellow; // Classic Valheim XP color
|
||||||
|
|
||||||
|
m_barFill = fillObj.GetComponent<RectTransform>();
|
||||||
|
m_barFill.anchorMin = new Vector2(0, 0);
|
||||||
|
m_barFill.anchorMax = new Vector2(0.5f, 1); // This X value (0.5) will be updated via code
|
||||||
|
m_barFill.pivot = new Vector2(0, 0.5f);
|
||||||
|
m_barFill.offsetMin = Vector2.zero;
|
||||||
|
m_barFill.offsetMax = Vector2.zero;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
75
MxValheim/Patch/HUD/Splash.cs
Normal file
75
MxValheim/Patch/HUD/Splash.cs
Normal file
@@ -0,0 +1,75 @@
|
|||||||
|
using HarmonyLib;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
|
||||||
|
namespace MxValheim.Patch.HUD
|
||||||
|
{
|
||||||
|
internal class Splash
|
||||||
|
{
|
||||||
|
public static GameObject m_canvasObject;
|
||||||
|
public static Text m_textComponent;
|
||||||
|
|
||||||
|
public void CreateOverlay()
|
||||||
|
{
|
||||||
|
// 1. Create a dedicated Canvas for our mod
|
||||||
|
m_canvasObject = new GameObject("ModdedCanvas");
|
||||||
|
Canvas canvas = m_canvasObject.AddComponent<Canvas>();
|
||||||
|
canvas.renderMode = RenderMode.ScreenSpaceOverlay; // Always stays on top
|
||||||
|
canvas.sortingOrder = 100; // Higher than standard HUD
|
||||||
|
|
||||||
|
m_canvasObject.AddComponent<CanvasScaler>();
|
||||||
|
m_canvasObject.AddComponent<GraphicRaycaster>();
|
||||||
|
|
||||||
|
// 2. Create the Text Object
|
||||||
|
GameObject textObj = new GameObject("ModdedText");
|
||||||
|
textObj.transform.SetParent(m_canvasObject.transform, false);
|
||||||
|
|
||||||
|
m_textComponent = textObj.AddComponent<Text>();
|
||||||
|
|
||||||
|
// Attempt to find Valheim's specific font, fallback to Arial if not found
|
||||||
|
Font valheimFont = null;
|
||||||
|
foreach (Font f in Resources.FindObjectsOfTypeAll<Font>())
|
||||||
|
{
|
||||||
|
if (f.name == "AveriaSerifLibre-Bold")
|
||||||
|
{
|
||||||
|
valheimFont = f;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Corrected fallback for older Unity versions used in Valheim
|
||||||
|
if (valheimFont == null)
|
||||||
|
{
|
||||||
|
valheimFont = Resources.GetBuiltinResource<Font>("Arial.ttf");
|
||||||
|
}
|
||||||
|
|
||||||
|
m_textComponent.font = valheimFont;
|
||||||
|
m_textComponent.fontSize = 24;
|
||||||
|
m_textComponent.color = Color.yellow; // Bright yellow to stand out
|
||||||
|
m_textComponent.alignment = TextAnchor.UpperRight;
|
||||||
|
m_textComponent.supportRichText = true;
|
||||||
|
|
||||||
|
// This prevents the text from vanishing if the box is too small
|
||||||
|
m_textComponent.horizontalOverflow = HorizontalWrapMode.Overflow;
|
||||||
|
m_textComponent.verticalOverflow = VerticalWrapMode.Overflow;
|
||||||
|
|
||||||
|
// Add Shadow so it's visible in snow
|
||||||
|
var shadow = textObj.AddComponent<Shadow>();
|
||||||
|
shadow.effectColor = Color.black;
|
||||||
|
shadow.effectDistance = new Vector2(2, 2);
|
||||||
|
|
||||||
|
// 3. Position it
|
||||||
|
RectTransform rect = textObj.GetComponent<RectTransform>();
|
||||||
|
rect.anchorMin = new Vector2(1, 1);
|
||||||
|
rect.anchorMax = new Vector2(1, 1);
|
||||||
|
rect.pivot = new Vector2(1, 1);
|
||||||
|
rect.anchoredPosition = new Vector2(-10, -5); // Top Right
|
||||||
|
rect.sizeDelta = new Vector2(300, 100);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
10
README.md
10
README.md
@@ -1,9 +1,13 @@
|
|||||||

|

|
||||||
|
|
||||||
## MxValheim
|
## MxValheim
|
||||||
Official Mx Valheim 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.**
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
- Enhanced Event System with level and reward based on current biome.
|
||||||
|
- Display the day and the formated time in-game.
|
||||||
|
- Use your client language with built-in localization.
|
||||||
- Kill Feed with custom UI showing player kill and death.
|
- 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\config\mxvalheim.custom_weights.json".
|
||||||
- Ore drop multiplier. (Value available in the generated config.)
|
- Ore drop multiplier. (Value available in the generated config.)
|
||||||
@@ -13,8 +17,8 @@ Official Mx Valheim Mod.
|
|||||||
- Auto close doors after a specified amount of time. (Enable/Disable and configure desired time in the generated config.)
|
- Auto close doors after a specified amount of time. (Enable/Disable and configure desired time in the generated config.)
|
||||||
|
|
||||||
## How-To Install
|
## How-To Install
|
||||||
1. Download the latest dll.
|
1. Download the latest zip.
|
||||||
2. Copy it to your (Client/Server) "BepInEx\plugins".
|
2. Copy the zip content to your (Client/Server) "BepInEx\plugins\MxValheim\".
|
||||||
3. Run your (Client/Server) at least one time.
|
3. Run your (Client/Server) at least one time.
|
||||||
4. Tweaks the config in "BepInEx\config\ovh.mxdev.mxvalheim.cfg" to your liking.
|
4. Tweaks the config in "BepInEx\config\ovh.mxdev.mxvalheim.cfg" to your liking.
|
||||||
5. Enjoy!
|
5. Enjoy!
|
||||||
Reference in New Issue
Block a user