Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
75d951eefe | ||
|
|
b6dec0efa6 | ||
|
|
19a6a2f62d | ||
|
|
8b504d02e0 |
@@ -20,12 +20,14 @@ namespace MxValheim.EventSystem
|
||||
Dictionary<int, float> biomeBase = new Dictionary<int, float>()
|
||||
{
|
||||
{ 1, 1.0f },
|
||||
{ 2, 1.5f },
|
||||
{ 8, 2.0f },
|
||||
{ 8, 1.5f },
|
||||
{ 2, 2.0f },
|
||||
{ 4, 2.5f },
|
||||
{ 16, 3.0f },
|
||||
{ 256, 3.5f },
|
||||
{ 32, 4.0f },
|
||||
{ 512, 4.0f },
|
||||
{ 64, 2.5f },
|
||||
{ 32, 5.0f },
|
||||
{ 256, 1.0f },
|
||||
};
|
||||
|
||||
float rewardExpMulti = biomeBase[((int)biome)];
|
||||
|
||||
@@ -5,6 +5,7 @@ using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Controls;
|
||||
@@ -29,15 +30,6 @@ namespace MxValheim.EventSystem
|
||||
}
|
||||
}
|
||||
|
||||
[HarmonyPatch(typeof(RandEventSystem), nameof(RandEventSystem.Awake))]
|
||||
public static class EventRadiusPatch
|
||||
{
|
||||
static void Postfix(RandEventSystem __instance)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
[HarmonyPatch(typeof(RandEventSystem), nameof(RandEventSystem.StartRandomEvent))]
|
||||
public static class DebugRaidFrequency
|
||||
{
|
||||
@@ -45,7 +37,30 @@ namespace MxValheim.EventSystem
|
||||
{
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -59,13 +74,7 @@ namespace MxValheim.EventSystem
|
||||
{
|
||||
__instance.m_eventIntervalMin = 10f;
|
||||
__instance.m_eventChance = 100f;
|
||||
}
|
||||
RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent();
|
||||
if (activeEvent != null)
|
||||
{
|
||||
activeEvent.m_eventRange = 200f;
|
||||
activeEvent.m_duration = 10f;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -88,30 +97,32 @@ namespace MxValheim.EventSystem
|
||||
Vector3 playerPos = Player.m_localPlayer.transform.position;
|
||||
float distance = Vector3.Distance(playerPos, currentRaid.m_pos);
|
||||
|
||||
if (distance <= 96f)
|
||||
if (distance <= 200f)
|
||||
{
|
||||
Heightmap.Biome currentBiome = EnvMan.instance.GetCurrentBiome();
|
||||
Reward.GiveItemStatic("Coins", Reward.CalculateRewardCoin(Profiles.serverLevel, currentBiome, kill));
|
||||
System.Random rand = new System.Random();
|
||||
Reward.GiveItemStatic("Feathers", rand.Next(5, 20));
|
||||
if (rand.Next(100) < 50)
|
||||
float dayPercent = ((float)EnvMan.instance.GetDay() / 10);
|
||||
if (rand.Next(100) < (50+dayPercent))
|
||||
{
|
||||
Reward.GiveItemRandom(Reward.GetRewardPrefab(Profiles.serverLevel, "food"), 1);
|
||||
}
|
||||
if (rand.Next(100) < 25)
|
||||
if (rand.Next(100) < (25+dayPercent))
|
||||
{
|
||||
Reward.GiveItemRandom(Reward.GetRewardPrefab(Profiles.serverLevel, "heal"), 1);
|
||||
}
|
||||
if (rand.Next(100) < 10)
|
||||
if (rand.Next(100) < (10+dayPercent))
|
||||
{
|
||||
Reward.GiveItemRandom(Reward.GetRewardPrefab(Profiles.serverLevel, "metal"), rand.Next(5, 20));
|
||||
Reward.GiveItemRandom(Reward.GetRewardPrefab(Profiles.serverLevel, "metal"), rand.Next(5, (20+Profiles.serverLevel)));
|
||||
}
|
||||
if (Chainloader.PluginInfos.ContainsKey("randyknapp.mods.epicloot"))
|
||||
{
|
||||
Reward.GiveEpicLootLowMats();
|
||||
Reward.GiveEpicLootDust();
|
||||
Reward.GiveEpicLootShard();
|
||||
Reward.GiveEpicLootEssence();
|
||||
Reward.GiveEpicLootRune();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -159,35 +170,54 @@ namespace MxValheim.EventSystem
|
||||
isEventCreature = Traverse.Create(mai).Field<bool>("m_eventCreature").Value;
|
||||
}
|
||||
|
||||
if (!isEventCreature) return;
|
||||
|
||||
RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent();
|
||||
if (activeEvent != null)
|
||||
if (isEventCreature)
|
||||
{
|
||||
ZPackage pkg = new ZPackage();
|
||||
pkg.Write(activeEvent.m_name);
|
||||
pkg.Write($"{activeEvent.m_pos}");
|
||||
ActiveEventData entry = MxValheimMod.ActiveEvents.Find(e => e.Position == activeEvent.m_pos.ToString());
|
||||
if (entry == null)
|
||||
{
|
||||
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerRegisterEvent", pkg);
|
||||
} else
|
||||
RandomEvent activeEvent = RandEventSystem.instance.GetActiveEvent();
|
||||
if (activeEvent != null)
|
||||
{
|
||||
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerSetEventKill", pkg);
|
||||
ZPackage pkg = new ZPackage();
|
||||
pkg.Write(activeEvent.m_name);
|
||||
pkg.Write($"{activeEvent.m_pos}");
|
||||
ActiveEventData entry = MxValheimMod.ActiveEvents.Find(e => e.Position == activeEvent.m_pos.ToString());
|
||||
if (entry == null)
|
||||
{
|
||||
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerRegisterEvent", pkg);
|
||||
}
|
||||
else
|
||||
{
|
||||
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerSetEventKill", pkg);
|
||||
}
|
||||
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerGetEventKill", pkg);
|
||||
}
|
||||
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_ServerGetEventKill", pkg);
|
||||
}
|
||||
|
||||
int level = __instance.GetLevel();
|
||||
int exp =
|
||||
(level == 1) ? 2 :
|
||||
(level == 2) ? 4 :
|
||||
(level == 3) ? 6 :
|
||||
6;
|
||||
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_RequestProfile", "Event");
|
||||
Heightmap.Biome currentBiome = EnvMan.instance.GetCurrentBiome();
|
||||
int expFinal = ((int)(exp * Experience.CalculateExpMultiplier(currentBiome))) + Profiles.serverLevel;
|
||||
Experience.AddExperience(expFinal);
|
||||
int level = __instance.GetLevel();
|
||||
int exp =
|
||||
(level == 1) ? 4 :
|
||||
(level == 2) ? 6 :
|
||||
(level == 3) ? 8 :
|
||||
8;
|
||||
ZRoutedRpc.instance.InvokeRoutedRPC(0, "RPC_RequestProfile", "Event");
|
||||
Heightmap.Biome currentBiome = EnvMan.instance.GetCurrentBiome();
|
||||
int expFinal = ((int)(exp * Experience.CalculateExpMultiplier(currentBiome))) + Profiles.serverLevel;
|
||||
Experience.AddExperience(expFinal);
|
||||
Color magicPurple = new Color(0.921f, 0.475f, 0.990f);
|
||||
Vector3 spawnPos = __instance.transform.position + Vector3.up * 1.0f;
|
||||
DamageText.instance.ShowText(HitData.DamageModifier.Normal, spawnPos, expFinal, true);
|
||||
} else
|
||||
{
|
||||
int level = __instance.GetLevel();
|
||||
int exp =
|
||||
(level == 1) ? 2 :
|
||||
(level == 2) ? 4 :
|
||||
(level == 3) ? 6 :
|
||||
6;
|
||||
Heightmap.Biome currentBiome = EnvMan.instance.GetCurrentBiome();
|
||||
int expFinal = ((int)(exp * Experience.CalculateExpMultiplier(currentBiome))) + Profiles.serverLevel;
|
||||
Experience.AddExperience(expFinal);
|
||||
Color magicPurple = new Color(0.921f, 0.475f, 0.990f);
|
||||
Vector3 spawnPos = __instance.transform.position + Vector3.up * 1.0f;
|
||||
DamageText.instance.ShowText(HitData.DamageModifier.Normal, spawnPos, expFinal, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,16 +1,18 @@
|
||||
using EpicLoot;
|
||||
using HarmonyLib;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Navigation;
|
||||
using UnityEngine;
|
||||
|
||||
namespace MxValheim.EventSystem
|
||||
{
|
||||
internal class Reward
|
||||
{
|
||||
{
|
||||
public static int CalculateRewardCoin(int level, Heightmap.Biome biome, int kill)
|
||||
{
|
||||
Dictionary<int, int> biomeBase = new Dictionary<int, int>()
|
||||
@@ -46,16 +48,15 @@ namespace MxValheim.EventSystem
|
||||
return "Wood";
|
||||
}
|
||||
|
||||
public static void GiveEpicLootLowMats()
|
||||
public static void GiveEpicLootDust()
|
||||
{
|
||||
System.Random rand = new System.Random();
|
||||
|
||||
int qty = rand.Next(5,10);
|
||||
int qty = rand.Next(1, Profiles.serverLevel);
|
||||
|
||||
string[] rarity = { "Magic", "Rare", "Epic", "Legendary", "Mythic" };
|
||||
string[] type = { "Dust", "Shard", "Fragment" };
|
||||
string[] rarity = GetRarityList(Watcher.eventKill);
|
||||
|
||||
string itemName = $"{type[rand.Next(0, type.Length - 1)]}{rarity[rand.Next(0, rarity.Length - 1)]}";
|
||||
string itemName = $"Dust{rarity[rand.Next(0, rarity.Length - 1)]}";
|
||||
|
||||
Player player = Player.m_localPlayer;
|
||||
if (player == null) return;
|
||||
@@ -63,9 +64,31 @@ namespace MxValheim.EventSystem
|
||||
GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
|
||||
if (prefab != null)
|
||||
{
|
||||
player.GetInventory().AddItem(itemName, qty, 1, 0, 0, "");
|
||||
GiveItemInWorld(itemName, player, qty);
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.LogWarning($"Item {itemName} not found in ObjectDB!");
|
||||
}
|
||||
}
|
||||
|
||||
player.Message(MessageHud.MessageType.TopLeft, $"Received {qty}x {itemName}");
|
||||
public static void GiveEpicLootShard()
|
||||
{
|
||||
System.Random rand = new System.Random();
|
||||
|
||||
int qty = rand.Next(1, Profiles.serverLevel);
|
||||
|
||||
string[] rarity = GetRarityList(Watcher.eventKill);
|
||||
|
||||
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)
|
||||
{
|
||||
GiveItemInWorld(itemName, player, qty);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -77,9 +100,9 @@ namespace MxValheim.EventSystem
|
||||
{
|
||||
System.Random rand = new System.Random();
|
||||
|
||||
int qty = rand.Next(1, 5);
|
||||
int qty = rand.Next(1, Profiles.serverLevel);
|
||||
|
||||
string[] rarity = { "Magic", "Rare", "Epic", "Legendary", "Mythic" };
|
||||
string[] rarity = GetRarityList(Watcher.eventKill);
|
||||
|
||||
string itemName = $"Essence{rarity[rand.Next(0, rarity.Length - 1)]}";
|
||||
|
||||
@@ -89,9 +112,7 @@ namespace MxValheim.EventSystem
|
||||
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}");
|
||||
GiveItemInWorld(itemName, player, qty);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -103,9 +124,9 @@ namespace MxValheim.EventSystem
|
||||
{
|
||||
System.Random rand = new System.Random();
|
||||
|
||||
int qty = 1;
|
||||
int qty = rand.Next(1, 2);
|
||||
|
||||
string[] rarity = { "Magic", "Rare", "Epic" };
|
||||
string[] rarity = GetRarityList(Watcher.eventKill);
|
||||
|
||||
string itemName = $"Runestone{rarity[rand.Next(0, rarity.Length - 1)]}";
|
||||
|
||||
@@ -115,9 +136,8 @@ namespace MxValheim.EventSystem
|
||||
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}");
|
||||
GiveItemInWorld(itemName, player, qty);
|
||||
SendRewardMessage(player, prefab, itemName, qty);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -135,9 +155,7 @@ namespace MxValheim.EventSystem
|
||||
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}");
|
||||
GiveItemInWorld(itemName, player, qty);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -153,9 +171,11 @@ namespace MxValheim.EventSystem
|
||||
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}");
|
||||
GiveItemInWorld(itemName, player, qty);
|
||||
if (itemName == "Coins")
|
||||
{
|
||||
SendRewardMessage(player, prefab, itemName, qty);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -163,6 +183,69 @@ namespace MxValheim.EventSystem
|
||||
}
|
||||
}
|
||||
|
||||
public static void GiveItemInWorld(string itemName, Player player, int qty)
|
||||
{
|
||||
GameObject prefab = ObjectDB.instance.GetItemPrefab(itemName);
|
||||
Vector3 spawnPos = player.transform.position + player.transform.forward + Vector3.up;
|
||||
|
||||
GameObject go = UnityEngine.Object.Instantiate(prefab, spawnPos, Quaternion.identity);
|
||||
|
||||
ItemDrop itemDrop = go.GetComponent<ItemDrop>();
|
||||
if (itemDrop != null)
|
||||
{
|
||||
itemDrop.m_itemData.m_stack = qty;
|
||||
ZNetView nview = go.GetComponent<ZNetView>();
|
||||
if (nview != null && nview.IsValid())
|
||||
{
|
||||
nview.GetZDO().Set("stack", qty);
|
||||
}
|
||||
|
||||
GameObject vfxPrefab = ZNetScene.instance.GetPrefab("vfx_item_spawn");
|
||||
if (vfxPrefab != null)
|
||||
{
|
||||
UnityEngine.Object.Instantiate(vfxPrefab, spawnPos, Quaternion.identity);
|
||||
}
|
||||
|
||||
GameObject sfxPrefab = ZNetScene.instance.GetPrefab("sfx_item_spawn");
|
||||
if (sfxPrefab != null)
|
||||
{
|
||||
UnityEngine.Object.Instantiate(sfxPrefab, spawnPos, Quaternion.identity);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void SendRewardMessage(Player player, GameObject prefab, string itemName, int qty)
|
||||
{
|
||||
if (ZRoutedRpc.instance != null)
|
||||
{
|
||||
ItemDrop item = prefab.GetComponent<ItemDrop>();
|
||||
string nameToken = item.m_itemData.m_shared.m_name;
|
||||
ZRoutedRpc.instance.InvokeRoutedRPC(ZRoutedRpc.Everybody, "RPC_MxKillMsg", Player.m_localPlayer.GetHoverName(), qty.ToString(), Localization.instance.Localize(nameToken), itemName, -2);
|
||||
}
|
||||
}
|
||||
|
||||
public static string[] GetRarityList(int victim)
|
||||
{
|
||||
string[] rarity = { };
|
||||
switch (victim)
|
||||
{
|
||||
case < 1:
|
||||
rarity = ["Magic"];
|
||||
break;
|
||||
case >= 1 and < 5:
|
||||
rarity = ["Rare"];
|
||||
break;
|
||||
case >= 5 and <= 10:
|
||||
rarity = ["Epic"];
|
||||
break;
|
||||
case >= 11 and <= 20:
|
||||
rarity = ["Epic", "Legendary"];
|
||||
break;
|
||||
case >= 21:
|
||||
rarity = ["Epic", "Legendary", "Mythic"];
|
||||
break;
|
||||
}
|
||||
return rarity;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -51,12 +51,18 @@ namespace MxValheim.EventSystem
|
||||
{
|
||||
string eventName = pkg.ReadString();
|
||||
string eventPos = pkg.ReadString();
|
||||
|
||||
int evindex = MxValheimMod.ActiveEvents.FindIndex(e => e.Position.ToString() == eventPos);
|
||||
|
||||
eventKill = 0;
|
||||
|
||||
MxValheimMod.ActiveEvents.RemoveAt(evindex);
|
||||
|
||||
int evindex = 0;
|
||||
UnityEngine.Debug.Log($"RemoveEvent: ActiveEvents Count = {MxValheimMod.ActiveEvents.Count} ( {eventName} / {eventPos} )");
|
||||
if (MxValheimMod.ActiveEvents.Count > 0)
|
||||
{
|
||||
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 static string lastVictimName = "";
|
||||
public static string lastAttackerName = "";
|
||||
public static Sprite LoadCustomSprite(string fileName)
|
||||
{
|
||||
string path = Path.Combine(BepInEx.Paths.PluginPath, "MxValheim", "Icons", fileName);
|
||||
@@ -74,6 +76,9 @@ namespace MxValheim.KillFeed
|
||||
int type = subRemainder % 10;
|
||||
// --- DECODING END ---
|
||||
|
||||
// Prevent the spam of multiple "same victim" kill to the feed
|
||||
if (type == 2 && victim == lastVictimName && attacker == lastAttackerName) return;
|
||||
|
||||
// Inside OnReceiveKillMsg...
|
||||
Sprite biomeSprite = null;
|
||||
switch (biomeIndex)
|
||||
@@ -103,6 +108,7 @@ namespace MxValheim.KillFeed
|
||||
string type1Separator = Localization.instance.Localize("$killfeed_format_type1");
|
||||
string type2Separator = Localization.instance.Localize("$killfeed_format_type2");
|
||||
string type3Separator = Localization.instance.Localize("$killfeed_format_type3");
|
||||
string type4Separator = Localization.instance.Localize("$killfeed_format_type4");
|
||||
string eventFormat = $"<color=#00ff06>{victim}</color>";
|
||||
string finalMsg = "";
|
||||
string attackerFormat = "";
|
||||
@@ -145,13 +151,7 @@ namespace MxValheim.KillFeed
|
||||
finalMsg =
|
||||
(type == 1) ? $"{victimFormat}{type1Separator}{attackerFormat}{distanceFormat}" : // Player Death
|
||||
(type == 2) ? $"{attackerFormat}{type2Separator}{victimFormat}{distanceFormat}" : // Player Killed Something
|
||||
$"{attackerFormat}{type2Separator}{victimFormat}{distanceFormat}"; // Failsafe
|
||||
|
||||
if (encodedType == -1)
|
||||
{
|
||||
attacker = Player.m_localPlayer?.GetHoverName();
|
||||
finalMsg = $"<color=#00ff06>{attacker.ToUpper()}</color><color=#ffd000>{type3Separator}</color>";
|
||||
}
|
||||
$"{attackerFormat}{type2Separator}{victimFormat}{distanceFormat}"; // Failsafe
|
||||
|
||||
Sprite weaponIcon = null;
|
||||
|
||||
@@ -191,7 +191,31 @@ namespace MxValheim.KillFeed
|
||||
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=#ffd000>{attacker.ToUpper()}</color><color=#32a852>{Localization.instance.Localize("$EventSystem_format_reward_Msg_GiveItem")}</color><color=#ffd000>{qty}</color> <color=#32a852>x</color> <color=#ffd000>{victimInternalName}</color><color=#32a852>{Localization.instance.Localize("$EventSystem_format_reward_Msg_GiveItemEnd")}</color>";
|
||||
GameObject itemObj = ObjectDB.instance.GetItemPrefab(weaponPrefab);
|
||||
Sprite itemIcon = null;
|
||||
if (itemObj != null)
|
||||
{
|
||||
ItemDrop item = itemObj.GetComponent<ItemDrop>();
|
||||
itemIcon = item?.m_itemData?.m_shared?.m_icons[0];
|
||||
}
|
||||
biomeSprite = LoadCustomSprite("eventsystem_reward.png");
|
||||
weaponIcon = itemIcon;
|
||||
}
|
||||
|
||||
lastVictimName = victim;
|
||||
lastAttackerName = attacker;
|
||||
|
||||
lock (_msgQueue)
|
||||
{
|
||||
_msgQueue.Enqueue(finalMsg);
|
||||
_biomeIconQueue.Enqueue(biomeSprite);
|
||||
@@ -344,6 +368,8 @@ namespace MxValheim.KillFeed
|
||||
}
|
||||
string victimName = __instance.GetHoverName();
|
||||
|
||||
if (victimName == null || victimName == "") return;
|
||||
|
||||
int type = 0;
|
||||
if (__instance.IsPlayer())
|
||||
{
|
||||
@@ -467,8 +493,8 @@ namespace MxValheim.KillFeed
|
||||
_weaponIconSlot = iconObj.GetComponent<Image>();
|
||||
_weaponIconSlot.preserveAspect = true;
|
||||
LayoutElement weaponLayout = iconObj.AddComponent<LayoutElement>();
|
||||
weaponLayout.preferredWidth = 24;
|
||||
weaponLayout.preferredHeight = 24;
|
||||
weaponLayout.preferredWidth = 32;
|
||||
weaponLayout.preferredHeight = 32;
|
||||
|
||||
RectTransform iRect = iconObj.GetComponent<RectTransform>();
|
||||
iRect.anchorMin = iRect.anchorMax = iRect.pivot = new Vector2(0, 0.5f);
|
||||
@@ -479,10 +505,8 @@ namespace MxValheim.KillFeed
|
||||
GameObject textObj = new GameObject("Text", typeof(RectTransform), typeof(Text));
|
||||
textObj.transform.SetParent(panel.transform, false);
|
||||
_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
|
||||
Font valheimFont = null;
|
||||
foreach (Font f in Resources.FindObjectsOfTypeAll<Font>())
|
||||
{
|
||||
@@ -493,7 +517,6 @@ namespace MxValheim.KillFeed
|
||||
}
|
||||
}
|
||||
|
||||
// Corrected fallback for older Unity versions used in Valheim
|
||||
if (valheimFont == null)
|
||||
{
|
||||
valheimFont = Resources.GetBuiltinResource<Font>("Arial.ttf");
|
||||
@@ -512,8 +535,8 @@ namespace MxValheim.KillFeed
|
||||
_victimIconSlot = victimObj.GetComponent<Image>();
|
||||
_victimIconSlot.preserveAspect = true;
|
||||
LayoutElement victimLayout = victimObj.AddComponent<LayoutElement>();
|
||||
victimLayout.preferredWidth = 24;
|
||||
victimLayout.preferredHeight = 24;
|
||||
victimLayout.preferredWidth = 32;
|
||||
victimLayout.preferredHeight = 32;
|
||||
|
||||
RectTransform vRect = victimObj.GetComponent<RectTransform>();
|
||||
vRect.anchorMin = vRect.anchorMax = vRect.pivot = new Vector2(1, 0.5f);
|
||||
|
||||
@@ -33,7 +33,7 @@ public class MxValheimMod : BaseUnityPlugin
|
||||
|
||||
private const string ModGUID = "ovh.mxdev.mxvalheim";
|
||||
private const string ModName = "MxValheim";
|
||||
private const string ModVersion = "1.6.7";
|
||||
private const string ModVersion = "1.6.11";
|
||||
|
||||
public static ConfigEntry<bool> Config_DebugRandomEventInterval;
|
||||
public static ConfigEntry<float> Config_bowDrawSpeedBonusPerLevel;
|
||||
@@ -232,14 +232,15 @@ public class MxValheimMod : BaseUnityPlugin
|
||||
string timeString = clk.GetFormattedTime();
|
||||
int day = EnvMan.instance.GetDay();
|
||||
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)
|
||||
{
|
||||
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
|
||||
{
|
||||
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>";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -53,13 +53,13 @@ namespace MxValheim.Patch
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void CloseNextDoor(Door door, ZNetView nview, string doorName)
|
||||
{
|
||||
if (door != null && nview != null && nview.IsValid())
|
||||
{
|
||||
nview.ClaimOwnership();
|
||||
if (nview.GetZDO().GetInt("state") != 0)
|
||||
{
|
||||
Debug.Log($"AutoDoor: Closing door \"{doorName}\".");
|
||||
|
||||
@@ -53,10 +53,9 @@ namespace MxValheim.Patch.HUD
|
||||
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);
|
||||
panelObj.AddComponent<Image>().color = new Color(0, 0, 0, 0.8f);
|
||||
|
||||
ContentSizeFitter fitter = panelObj.AddComponent<ContentSizeFitter>();
|
||||
fitter.horizontalFit = ContentSizeFitter.FitMode.PreferredSize;
|
||||
@@ -71,36 +70,48 @@ namespace MxValheim.Patch.HUD
|
||||
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");
|
||||
|
||||
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.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
|
||||
barBgObj.AddComponent<Image>().color = new Color(0.1f, 0.1f, 0.1f, 0.8f);
|
||||
|
||||
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
|
||||
barBgRect.sizeDelta = new Vector2(180, 8);
|
||||
|
||||
// --- PROGRESS BAR FILL ---
|
||||
GameObject fillObj = new GameObject("BarFill");
|
||||
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.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.offsetMin = Vector2.zero;
|
||||
m_barFill.offsetMax = Vector2.zero;
|
||||
|
||||
Reference in New Issue
Block a user