diff --git a/JotunnModStub/Fenrir/FenrirBehaviors.cs b/JotunnModStub/Fenrir/FenrirBehaviors.cs index 557531c..fca4262 100644 --- a/JotunnModStub/Fenrir/FenrirBehaviors.cs +++ b/JotunnModStub/Fenrir/FenrirBehaviors.cs @@ -323,7 +323,8 @@ namespace RacesOfValheim GameObject fireVfx = ZNetScene.instance.GetPrefab("fx_fenring_flames"); if (fireVfx == null) return null; - GameObject instance = Object.Instantiate(fireVfx, player.transform.position + Vector3.up * 1.5f + player.transform.forward, player.transform.rotation, player.transform); + GameObject instance = Object.Instantiate(fireVfx, MouthPoint(player), player.transform.rotation, player.transform); + instance.AddComponent().Player = player; // Aumentiamo la durata delle particelle del 20% foreach (ParticleSystem ps in instance.GetComponentsInChildren()) @@ -334,6 +335,41 @@ namespace RacesOfValheim return instance; } + // Bone names the breath leaves from, mouth first. Matched by name anywhere under the form. + private static readonly string[] MouthBones = { "Jaw", "Head" }; + + /// + /// Where the Cultist's breath starts: just ahead of the form's jaw (or head), so it leaves the + /// mouth at whatever size the form stands. It used to be a fixed 1.5 m above the player's + /// feet, chest height on a Cultist, which is the "fire starts too low" report. Falls back on + /// that fixed point if the form has neither bone. + /// + public static Vector3 MouthPoint(Player player) => MouthPoint(player, FindMouth(player)); + + public static Vector3 MouthPoint(Player player, Transform bone) + { + Transform body = player.transform; + return bone != null + ? bone.position + body.forward * 0.3f + : body.position + Vector3.up * 1.5f + body.forward; + } + + public static Transform FindMouth(Player player) + { + foreach (string wanted in MouthBones) + { + foreach (Transform child in player.transform) + { + if (child.name == "Visual" || !child.gameObject.activeInHierarchy) continue; + foreach (Transform t in child.GetComponentsInChildren()) + { + if (string.Equals(t.name, wanted, System.StringComparison.OrdinalIgnoreCase)) return t; + } + } + } + return null; + } + public static void PublishFire(bool on) { Player player = Player.m_localPlayer; @@ -1665,4 +1701,31 @@ namespace RacesOfValheim } } + /// + /// Keeps the Cultist's breath at its mouth: on the Jaw bone (fenring_cultist rig: + /// .../Neck/Head/Jaw), facing where the player faces. Placed every LateUpdate, after the form's + /// Animator has moved the head, rather than parented to the bone, so the flames point where the + /// player aims and not wherever the jaw happens to tilt. The same on every client's copy. + /// + internal class CultistFlameFollow : MonoBehaviour + { + public Player Player; + private Transform mouth; + private float nextLook; + + private void LateUpdate() + { + if (Player == null) return; + + // The form can be rebuilt under the same flames; look again now and then if lost. + if (mouth == null && Time.time >= nextLook) + { + nextLook = Time.time + 0.5f; + mouth = FenrirAttackSync.FindMouth(Player); + } + + transform.SetPositionAndRotation(FenrirAttackSync.MouthPoint(Player, mouth), Player.transform.rotation); + } + } + }