diff --git a/JotunnModStub/Alfar/AlfarDrones.cs b/JotunnModStub/Alfar/AlfarDrones.cs index 5dbbb69..669d0c0 100644 --- a/JotunnModStub/Alfar/AlfarDrones.cs +++ b/JotunnModStub/Alfar/AlfarDrones.cs @@ -335,7 +335,9 @@ namespace RacesOfValheim return true; } - if (target == null || !target.gameObject.activeInHierarchy) target = FindDeposit(); + // A deposit another drone just broke is still there until the end of the frame, with a + // dead network view: drop it and look again. + if (target == null || !target.gameObject.activeInHierarchy || !Live(target)) target = FindDeposit(); Vector3 point = Vector3.zero; Collider area = target != null ? NearestArea(target, out point) : null; if (area == null) { target = null; ai.StopMoving(); return true; } @@ -396,7 +398,8 @@ namespace RacesOfValheim Component deposit = DepositOf(collider); if (deposit == null) continue; - string prefabName = Utils.GetPrefabName(deposit.gameObject); + if (!Live(deposit)) continue; + string prefabName = DepositName(deposit); if (!IsPrecious(prefabName)) continue; float distance = Vector3.Distance(transform.position, deposit.transform.position); @@ -446,23 +449,131 @@ namespace RacesOfValheim // check: a hit with no attacker throws before the area can break. hit.SetAttacker(GetComponent()); - // Overwritten by the RPC patches below if the hit reaches the deposit's owner. - lastHit = "sent, no RPC"; - destructible.Damage(hit); + // Overwritten by the patches below at each step the hit gets through. Vanilla runs the + // RPC on this machine at once when we own the deposit, so `striking` is still set then. + lastHit = "Damage not entered"; + striking = this; + rpcRan = false; + try + { + destructible.Damage(hit); + + // The F8 readout showed the hit entering Damage with every gate open and this + // machine owning the deposit, and the RPC handler never running: the routed call + // left for the network instead of being handled here. When we own the deposit, + // call its own handler directly - the same resistance, tier and break logic, only + // without the routing. + if (!rpcRan && OwnsDeposit(deposit)) StrikeDirect(deposit, area, hit); + } + finally { striking = null; } + } + + private static bool rpcRan; + + private static readonly System.Reflection.MethodInfo DestructibleRpc = AccessTools.Method(typeof(Destructible), "RPC_Damage"); + private static readonly System.Reflection.MethodInfo MineRockRpc = AccessTools.Method(typeof(MineRock), "RPC_Hit"); + private static readonly System.Reflection.MethodInfo MineRockArea = AccessTools.Method(typeof(MineRock), "GetAreaIndex"); + private static readonly System.Reflection.MethodInfo MineRock5Rpc = AccessTools.Method(typeof(MineRock5), "RPC_Damage"); + private static readonly System.Reflection.MethodInfo MineRock5Area = AccessTools.Method(typeof(MineRock5), "GetAreaIndex"); + private static readonly System.Reflection.FieldInfo RpcIdField = AccessTools.Field(typeof(ZRoutedRpc), "m_id"); + + private static bool OwnsDeposit(Component deposit) + { + ZNetView nview = deposit.GetComponent(); + return nview != null && nview.IsValid() && nview.IsOwner(); + } + + private void StrikeDirect(Component deposit, Collider area, HitData hit) + { + long sender = ZDOMan.GetSessionID(); + string entry = lastHit; + try + { + if (deposit is Destructible && DestructibleRpc != null) + { + DestructibleRpc.Invoke(deposit, new object[] { sender, hit }); + } + else if (deposit is MineRock && MineRockRpc != null && MineRockArea != null) + { + int index = (int)MineRockArea.Invoke(deposit, new object[] { area }); + if (index < 0) { lastHit = "direct: collider is not a MineRock area"; return; } + MineRockRpc.Invoke(deposit, new object[] { sender, hit, index }); + } + else if (deposit is MineRock5 && MineRock5Rpc != null && MineRock5Area != null) + { + int index = (int)MineRock5Area.Invoke(deposit, new object[] { area }); + if (index < 0) { lastHit = "direct: collider is not a MineRock5 area"; return; } + MineRock5Rpc.Invoke(deposit, new object[] { sender, hit, index }); + } + else + { + lastHit = $"direct: no handler for {deposit.GetType().Name}"; + return; + } + lastHit = $"direct, {lastHit} | before: {entry}"; + } + catch (System.Exception ex) + { + System.Exception inner = ex.InnerException ?? ex; + lastHit = $"direct failed: {inner.GetType().Name}: {inner.Message}"; + Jotunn.Logger.LogWarning($"[Alfar] Grafvaettir direct hit failed: {inner}"); + } } // ─── F8 diagnostics: what each hit did on arrival ────────────────────── + private static AlfarMiner striking; + private static AlfarMiner MinerOf(HitData hit) { + if (striking != null) return striking; Character attacker = hit != null ? hit.GetAttacker() : null; return attacker != null ? attacker.GetComponent() : null; } + private static readonly System.Reflection.FieldInfo FirstFrameField = AccessTools.Field(typeof(Destructible), "m_firstFrame"); + + /// The gates in front of the RPC: whose deposit it is and whether the view is live. + private static void RecordEntry(Component deposit, string extra) + { + if (striking == null) return; + ZNetView nview = deposit.GetComponent(); + bool valid = nview != null && nview.IsValid(); + long owner = valid ? nview.GetZDO().GetOwner() : -1L; + long me = ZDOMan.GetSessionID(); + Character attacker = striking.GetComponent(); + object rpcId = RpcIdField != null && ZRoutedRpc.instance != null ? RpcIdField.GetValue(ZRoutedRpc.instance) : null; + striking.lastHit = $"Damage entered{extra} valid={valid} owner={owner} session={me} rpcId={rpcId} " + + $"attackerZdo={(attacker != null ? attacker.GetZDOID().ToString() : "none")}, no RPC"; + } + + [HarmonyPatch(typeof(Destructible), nameof(Destructible.Damage))] + public static class Alfar_Miner_DestructibleEnter_Patch + { + public static void Prefix(Destructible __instance) + { + object first = FirstFrameField != null ? FirstFrameField.GetValue(__instance) : null; + RecordEntry(__instance, $" firstFrame={first}"); + } + } + + [HarmonyPatch(typeof(MineRock), nameof(MineRock.Damage))] + public static class Alfar_Miner_MineRockEnter_Patch + { + public static void Prefix(MineRock __instance) => RecordEntry(__instance, ""); + } + + [HarmonyPatch(typeof(MineRock5), nameof(MineRock5.Damage))] + public static class Alfar_Miner_MineRock5Enter_Patch + { + public static void Prefix(MineRock5 __instance) => RecordEntry(__instance, ""); + } + private static void Record(HitData hit, string kind, float before, float after, int minTier) { AlfarMiner miner = MinerOf(hit); if (miner == null) return; + if (miner == striking) rpcRan = true; miner.lastHit = $"{kind} hp {before:0.#}->{after:0.#} dmg {hit.GetTotalDamage():0.#} " + $"pick {hit.m_damage.m_pickaxe:0.#} tier {hit.m_toolTier}/{minTier}"; } @@ -519,6 +630,28 @@ namespace RacesOfValheim } } + private static bool Live(Component deposit) + { + ZNetView nview = deposit.GetComponent(); + return nview != null && nview.IsValid(); + } + + /// + /// The deposit's prefab name, read from its ZDO. Not from the GameObject: MineRock5 renames + /// its own object to "___MineRock5 m_meshFilter" in Awake, so a broken copper vein + /// (rock4_copper_frac) never matched the list and the drones stopped after the first blow. + /// + private static string DepositName(Component deposit) + { + ZNetView nview = deposit.GetComponent(); + if (nview != null && nview.IsValid() && ZNetScene.instance != null) + { + GameObject prefab = ZNetScene.instance.GetPrefab(nview.GetZDO().GetPrefab()); + if (prefab != null) return prefab.name; + } + return Utils.GetPrefabName(deposit.gameObject); + } + private static Component DepositOf(Collider collider) { Component deposit = collider.GetComponentInParent(); @@ -538,7 +671,7 @@ namespace RacesOfValheim if (Physics.Raycast(aim.position, aim.forward, out RaycastHit hit, 50f, ~0, QueryTriggerInteraction.Ignore)) { Component deposit = DepositOf(hit.collider); - string prefabName = deposit != null ? Utils.GetPrefabName(deposit.gameObject) : Utils.GetPrefabName(hit.collider.transform.root.gameObject); + string prefabName = deposit != null ? DepositName(deposit) : Utils.GetPrefabName(hit.collider.transform.root.gameObject); lines.Add($"[RoV graf] look: {hit.collider.name} on {prefabName} " + (deposit != null ? $"{deposit.GetType().Name} listed={IsPrecious(prefabName)}" : "not a deposit")); } @@ -547,7 +680,7 @@ namespace RacesOfValheim foreach (AlfarMiner miner in All) { if (miner == null) continue; - string targetName = miner.target != null ? Utils.GetPrefabName(miner.target.gameObject) : "none"; + string targetName = miner.target != null ? DepositName(miner.target) : "none"; lines.Add($"[RoV graf] miner {Vector3.Distance(miner.transform.position, player.transform.position):0}m away: " + $"target {targetName} dist {miner.lastDistance:0.0} strikes {miner.strikes} " + $"age {Now - miner.bornAt:0}s centre {miner.Centre} r {miner.Radius:0} | last hit: {miner.lastHit}");