TrolLogWeapon.GrabLog gave the picked-up log an out-of-bounds grid position ((99, 99)) to keep it off the visible inventory grid. InventoryGrid.UpdateGui maps every item to a cell with y * width + x and no bounds check, so that position threw ArgumentOutOfRangeException every frame the inventory screen was open - for the player holding it, or anyone else who ever had it in their own pack or a chest. Visible as endless console spam, a frame stall/freeze, and corrupted icons on every other slot for the rest of that update. Now uses Inventory.FindEmptySlot like every other picked-up item, so it renders in a real slot with the normal equipped indicator. Also adds InventoryGridSafetyPatch as a general safety net: any item already sitting at an invalid grid position (existing saves from before this fix, or one handed off through a chest) gets moved to a real slot - or dropped if there's no room - instead of crashing the grid the next time it renders.
143 lines
6.6 KiB
C#
143 lines
6.6 KiB
C#
using HarmonyLib;
|
|
using System.Collections.Generic;
|
|
using UnityEngine;
|
|
using Jotunn.Managers;
|
|
using BepInEx;
|
|
|
|
namespace RacesOfValheim
|
|
{
|
|
public static class TrolLogWeapon
|
|
{
|
|
public static void GrabLog(Humanoid user, TreeLog logTarget)
|
|
{
|
|
if (user == null || logTarget == null) return;
|
|
if (!TrolRace.IsTrol()) return;
|
|
if (BossProgressionManager.GetCurrentProgressionState() < 7) return;
|
|
|
|
var seman = user.GetSEMan();
|
|
if (seman == null) return;
|
|
|
|
if (!seman.HaveStatusEffect("SE_TrolTrueForm".GetStableHashCode()))
|
|
{
|
|
user.Message(MessageHud.MessageType.Center, "You must be in True Form to lift this!");
|
|
return;
|
|
}
|
|
|
|
string logName = Utils.GetPrefabName(logTarget.gameObject);
|
|
if (!logName.EndsWith("_half"))
|
|
{
|
|
logName += "_half";
|
|
}
|
|
string weaponName = "TrolWeapon_" + logName;
|
|
|
|
GameObject weaponPrefab = PrefabManager.Cache.GetPrefab<GameObject>(weaponName);
|
|
if (weaponPrefab == null)
|
|
{
|
|
weaponName = "TrolWeapon_beech_log_half"; // Fallback
|
|
weaponPrefab = PrefabManager.Cache.GetPrefab<GameObject>(weaponName);
|
|
}
|
|
|
|
if (weaponPrefab == null)
|
|
{
|
|
Jotunn.Logger.LogWarning("TrolWeapon prefab not found: " + weaponName);
|
|
return;
|
|
}
|
|
|
|
// Check if already holding a weapon
|
|
ItemDrop.ItemData rightItem = HarmonyLib.Traverse.Create(user).Field<ItemDrop.ItemData>("m_rightItem").Value;
|
|
if (rightItem != null && rightItem.m_dropPrefab != null && rightItem.m_dropPrefab.name.StartsWith("TrolWeapon_"))
|
|
{
|
|
user.Message(MessageHud.MessageType.Center, "You are already holding a log!");
|
|
return;
|
|
}
|
|
|
|
// Play pickup animation
|
|
var zanim = HarmonyLib.Traverse.Create(user).Field("m_zanim").GetValue<ZSyncAnimation>();
|
|
if (zanim != null)
|
|
{
|
|
zanim.SetTrigger("interact");
|
|
}
|
|
|
|
// Unequip current items for safety
|
|
ItemDrop.ItemData currentRight = HarmonyLib.Traverse.Create(user).Field<ItemDrop.ItemData>("m_rightItem").Value;
|
|
if (currentRight != null) user.UnequipItem(currentRight);
|
|
ItemDrop.ItemData currentLeft = HarmonyLib.Traverse.Create(user).Field<ItemDrop.ItemData>("m_leftItem").Value;
|
|
if (currentLeft != null) user.UnequipItem(currentLeft);
|
|
|
|
// A grid position out of the visible grid's bounds ((99, 99), same idea as a "hidden"
|
|
// slot) used to be how this stayed out of the way - but InventoryGrid.UpdateGui maps
|
|
// every single item in the inventory to a grid cell with y * width + x and no bounds
|
|
// check at all, for every player who ever ends up holding this, equipped or not. A
|
|
// position that far out throws ArgumentOutOfRangeException every frame the inventory
|
|
// screen is open, which both floods the log (visible as a stutter/freeze) and aborts
|
|
// the render loop partway through, corrupting every other slot's icon until the item
|
|
// is gone. FindEmptySlot is what every other item picked up in Valheim actually uses -
|
|
// it shows up in the grid like any other equipped weapon instead, which is correct.
|
|
ItemDrop wepDrop = weaponPrefab.GetComponent<ItemDrop>();
|
|
ItemDrop.ItemData newItem = wepDrop.m_itemData.Clone();
|
|
newItem.m_dropPrefab = weaponPrefab;
|
|
|
|
Vector2i gridPos = HarmonyLib.Traverse.Create(user.GetInventory()).Method("FindEmptySlot", false).GetValue<Vector2i>();
|
|
if (gridPos.x == -1)
|
|
{
|
|
user.Message(MessageHud.MessageType.Center, "No room to lift it!");
|
|
return;
|
|
}
|
|
newItem.m_gridPos = gridPos;
|
|
newItem.m_durability = newItem.GetMaxDurability();
|
|
|
|
var m_inventory = HarmonyLib.Traverse.Create(user.GetInventory()).Field<List<ItemDrop.ItemData>>("m_inventory").Value;
|
|
if (m_inventory != null)
|
|
{
|
|
m_inventory.Add(newItem);
|
|
HarmonyLib.Traverse.Create(user.GetInventory()).Method("Changed").GetValue();
|
|
}
|
|
|
|
// Equip it
|
|
user.EquipItem(newItem);
|
|
|
|
// Destroy the log in the world
|
|
ZNetView nview = logTarget.GetComponent<ZNetView>();
|
|
if (nview != null && nview.IsValid())
|
|
{
|
|
nview.ClaimOwnership();
|
|
nview.Destroy();
|
|
}
|
|
else
|
|
{
|
|
UnityEngine.Object.Destroy(logTarget.gameObject);
|
|
}
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// A fallen log already shows a hover prompt in vanilla - its own name, via a HoverText
|
|
/// component vanilla itself attaches (confirmed live: GetComponentInParent<Hoverable>()
|
|
/// on a log resolves to HoverText, not TreeLog itself, which only implements IDestructible).
|
|
/// A first attempt added a second, competing Hoverable component to the same GameObject and
|
|
/// it was never reached - Unity's GetComponentInParent<T>() returns only the first
|
|
/// match, and vanilla's own HoverText was already there first. The fix is to append to
|
|
/// HoverText's own result instead of trying to out-compete it.
|
|
/// </summary>
|
|
[HarmonyPatch(typeof(HoverText), "GetHoverText")]
|
|
public static class Trol_LogHoverText_Patch
|
|
{
|
|
public static void Postfix(HoverText __instance, ref string __result)
|
|
{
|
|
if (Player.m_localPlayer == null || !TrolRace.IsTrol()) return;
|
|
if (BossProgressionManager.GetCurrentProgressionState() < 7) return;
|
|
if (!Player.m_localPlayer.GetSEMan().HaveStatusEffect("SE_TrolTrueForm".GetStableHashCode())) return;
|
|
|
|
TreeLog log = ((Component)__instance).GetComponentInParent<TreeLog>();
|
|
if (log == null) return;
|
|
|
|
// Already holding a log - grabbing again is a no-op in TrolLogWeapon.GrabLog, so no
|
|
// prompt either.
|
|
ItemDrop.ItemData rightItem = HarmonyLib.Traverse.Create(Player.m_localPlayer).Field<ItemDrop.ItemData>("m_rightItem").Value;
|
|
if (rightItem != null && rightItem.m_dropPrefab != null && rightItem.m_dropPrefab.name.StartsWith("TrolWeapon_")) return;
|
|
|
|
string key = TrolConfig.GrabLogKey.Value.MainKey.ToString();
|
|
__result += $"\n[<color=yellow><b>{key}</b></color>] Grab Log";
|
|
}
|
|
}
|
|
}
|