Wolf, Ulv, Fenring and Cultist all hid the player by scaling the Visual child to a thousandth of its size. That has quietly stopped working: the scale reset that keeps a non-Trol player at normal height runs from a postfix on the same update and puts the scale straight back to 1, so the man reappeared standing inside his own wolf a frame after transforming. Fenrir is not one of the races listed as sizing itself, so nothing exempted it from that reset. Use PlayerVisualHider, the same fix Skadi and the Aswid already carry: renderers go off with forceRenderingOff and are re-swept periodically, so nothing that touches the transform can undo it, and the Animator is never disabled - which is what made reverting look like respawning back when this was solved for the dragon forms. Both the local form and the copy other players see are switched over; the remote path in ZdoVisualSync used the same scale trick and had the same bug.
339 lines
14 KiB
C#
339 lines
14 KiB
C#
using HarmonyLib;
|
|
using UnityEngine;
|
|
using System.Collections.Generic;
|
|
|
|
namespace RacesOfValheim
|
|
{
|
|
[HarmonyPatch(typeof(Player), "Awake")]
|
|
public static class Player_Awake_VisualSync_Patch
|
|
{
|
|
public static void Postfix(Player __instance)
|
|
{
|
|
if (__instance.gameObject.GetComponent<RacesVisualController>() == null)
|
|
{
|
|
__instance.gameObject.AddComponent<RacesVisualController>();
|
|
}
|
|
}
|
|
}
|
|
|
|
[HarmonyPatch(typeof(Player), "OnSpawned")]
|
|
public static class Player_OnSpawned_Sync_Patch
|
|
{
|
|
public static void Postfix(Player __instance)
|
|
{
|
|
ZNetView nview = __instance.GetComponent<ZNetView>();
|
|
if (__instance == Player.m_localPlayer && nview != null && nview.IsValid())
|
|
{
|
|
if (__instance.m_customData.TryGetValue("Race", out string race))
|
|
{
|
|
nview.GetZDO().Set("RacesOfValheim_Race", race);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
public class RacesVisualController : MonoBehaviour
|
|
{
|
|
private Player m_player;
|
|
private string m_lastFenrirForm = "";
|
|
private string m_lastSkadiForm = "";
|
|
private GameObject m_currentFormInstance = null;
|
|
private GameObject m_fireAuraVFX = null;
|
|
private float m_lastFlightLog = 0f;
|
|
|
|
private void Awake()
|
|
{
|
|
m_player = GetComponent<Player>();
|
|
}
|
|
|
|
private void Update()
|
|
{
|
|
if (m_player == null) return;
|
|
ZNetView nview = m_player.GetComponent<ZNetView>();
|
|
if (nview == null || !nview.IsValid()) return;
|
|
if (m_player == Player.m_localPlayer) return; // Local player handles their own visuals in Race scripts
|
|
|
|
if (m_player.IsDead())
|
|
{
|
|
RevertAllVisuals();
|
|
return;
|
|
}
|
|
|
|
string race = nview.GetZDO().GetString("RacesOfValheim_Race", "Human");
|
|
|
|
if (race == "Skeleton")
|
|
{
|
|
UpdateSkeletonVisuals();
|
|
}
|
|
else if (race == "Fenrir")
|
|
{
|
|
UpdateFenrirVisuals();
|
|
}
|
|
else if (race == "Skadi")
|
|
{
|
|
UpdateSkadiVisuals();
|
|
}
|
|
else if (race == "Aswid")
|
|
{
|
|
UpdateAswidVisuals();
|
|
}
|
|
else if (race == "Trol")
|
|
{
|
|
// Managed externally in TrolPatches.cs
|
|
}
|
|
else if (race == DvergarConfig.RaceId)
|
|
{
|
|
// Scale is handled for every player by the Player.Update postfix; this only keeps
|
|
// the hood and the hidden helmet asserted between equipment refreshes.
|
|
DvergarVisuals.ApplyHood(m_player);
|
|
}
|
|
else
|
|
{
|
|
RevertAllVisuals();
|
|
}
|
|
}
|
|
|
|
private void UpdateAswidVisuals()
|
|
{
|
|
// Empty for now, relying on VisEquipment patch
|
|
}
|
|
|
|
private void UpdateSkeletonVisuals()
|
|
{
|
|
ZNetView nview = m_player.GetComponent<ZNetView>();
|
|
int state = nview.GetZDO().GetInt("RacesOfValheim_SkeletonState", 0);
|
|
var rules = SkeletonProgression.GetRules(state);
|
|
|
|
// Hide hair and beard
|
|
VisEquipment vis = m_player.GetComponent<VisEquipment>();
|
|
if (vis != null)
|
|
{
|
|
vis.SetHairItem("");
|
|
vis.SetBeardItem("");
|
|
|
|
// Hide Helmet
|
|
var helmetObj = HarmonyLib.Traverse.Create(vis).Field<GameObject>("m_helmetItemInstance").Value;
|
|
if (helmetObj != null && helmetObj.transform.localScale != Vector3.zero)
|
|
{
|
|
helmetObj.transform.localScale = Vector3.zero;
|
|
}
|
|
|
|
// Scale Body Armor
|
|
string[] armorFields = { "m_chestItemInstances", "m_legItemInstances", "m_shoulderItemInstances" };
|
|
foreach (string field in armorFields)
|
|
{
|
|
var armorList = HarmonyLib.Traverse.Create(vis).Field<List<GameObject>>(field).Value;
|
|
if (armorList != null)
|
|
{
|
|
foreach (GameObject armor in armorList)
|
|
{
|
|
if (armor != null && Mathf.Abs(armor.transform.localScale.x - 1.05f) > 0.01f)
|
|
{
|
|
armor.transform.localScale = new Vector3(1.05f, 1.05f, 1.05f);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// Hide Jaw for Charred Twitcher
|
|
if (vis.m_bodyModel != null && vis.m_bodyModel.bones != null)
|
|
{
|
|
foreach (Transform bone in vis.m_bodyModel.bones)
|
|
{
|
|
if (bone != null && bone.name.ToLower().Contains("jaw"))
|
|
{
|
|
if (state >= 8)
|
|
{
|
|
if (bone.localScale != Vector3.zero) bone.localScale = Vector3.zero;
|
|
}
|
|
else
|
|
{
|
|
if (bone.localScale == Vector3.zero) bone.localScale = Vector3.one;
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// Apply Scale
|
|
Vector3 targetScale = rules.ScaleMultiplier;
|
|
if (m_player.transform.localScale != targetScale)
|
|
{
|
|
m_player.transform.localScale = targetScale;
|
|
}
|
|
|
|
// Fire Aura VFX
|
|
EnsureFireAuraVFX(rules.FireAura);
|
|
}
|
|
|
|
private void UpdateFenrirVisuals()
|
|
{
|
|
ZNetView nview = m_player.GetComponent<ZNetView>();
|
|
string currentForm = nview.GetZDO().GetString("RacesOfValheim_FenrirForm", "");
|
|
|
|
if (currentForm != m_lastFenrirForm)
|
|
{
|
|
// Form changed
|
|
if (m_currentFormInstance != null) Destroy(m_currentFormInstance);
|
|
|
|
Transform playerVisual = m_player.transform.Find("Visual");
|
|
if (playerVisual != null)
|
|
{
|
|
if (string.IsNullOrEmpty(currentForm))
|
|
{
|
|
PlayerVisualHider.Show(playerVisual, "fenrir-remote-revert");
|
|
}
|
|
else
|
|
{
|
|
// Same story as the local form: the scale trick this used to hide the body
|
|
// is undone every frame by the reset that keeps non-Trol players at normal
|
|
// size, so other players saw the man standing in his own wolf too.
|
|
PlayerVisualHider.Hide(playerVisual, "fenrir-remote-form");
|
|
GameObject prefab = Jotunn.Managers.PrefabManager.Cache.GetPrefab<GameObject>(currentForm);
|
|
if (prefab != null)
|
|
{
|
|
Transform visual = prefab.transform.Find("Visual");
|
|
if (visual != null)
|
|
{
|
|
m_currentFormInstance = Instantiate(visual.gameObject, m_player.transform);
|
|
m_currentFormInstance.transform.localPosition = Vector3.zero;
|
|
m_currentFormInstance.transform.localRotation = Quaternion.identity;
|
|
Component animEvent = m_currentFormInstance.GetComponent("AnimEvent");
|
|
if (animEvent != null) Destroy(animEvent);
|
|
|
|
// Clean up colliders on remote visuals
|
|
foreach (var col in m_currentFormInstance.GetComponentsInChildren<Collider>())
|
|
{
|
|
Destroy(col);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
m_lastFenrirForm = currentForm;
|
|
}
|
|
}
|
|
|
|
private void UpdateSkadiVisuals()
|
|
{
|
|
ZNetView nview = m_player.GetComponent<ZNetView>();
|
|
string currentForm = nview.GetZDO().GetString("RacesOfValheim_SkadiForm", "");
|
|
|
|
// Flight lives in Character.m_flying, which DrakeFormBehavior only ever sets on the
|
|
// flying player's own client. Observers left it false, so their copy of the character
|
|
// kept running grounded motion under gravity and sank to the terrain no matter what
|
|
// altitude was replicated. Mirror the flag from the ZDO so remote copies stay airborne.
|
|
bool flying = nview.GetZDO().GetBool(DrakeFormBehavior.FlyingKey, false);
|
|
HarmonyLib.Traverse.Create(m_player).Field("m_flying").SetValue(flying);
|
|
|
|
// Setting m_flying alone only helps if the remote copy runs Character motion at all.
|
|
// Gravity on its rigidbody is what actually drags the body to the terrain while the
|
|
// replicated position says otherwise, so switch that off directly for the duration.
|
|
Rigidbody body = m_player.GetComponent<Rigidbody>();
|
|
if (body != null && body.useGravity == flying)
|
|
{
|
|
body.useGravity = !flying;
|
|
}
|
|
|
|
if (Time.time - m_lastFlightLog > 2f)
|
|
{
|
|
m_lastFlightLog = Time.time;
|
|
Jotunn.Logger.LogInfo(
|
|
$"[SkadiSync] remote '{m_player.GetPlayerName()}' form='{currentForm}' flying={flying} " +
|
|
$"y={m_player.transform.position.y:F1} gravity={(body != null ? body.useGravity.ToString() : "no-body")}");
|
|
}
|
|
}
|
|
|
|
private void RevertAllVisuals()
|
|
{
|
|
if (m_player.transform.localScale != Vector3.one) m_player.transform.localScale = Vector3.one;
|
|
|
|
Transform playerVisual = m_player.transform.Find("Visual");
|
|
// Also clears a hidden body left behind if a remote player died mid-transformation.
|
|
PlayerVisualHider.Show(playerVisual, "zdosync-revert");
|
|
|
|
if (m_currentFormInstance != null) Destroy(m_currentFormInstance);
|
|
EnsureFireAuraVFX(false);
|
|
|
|
Animator anim = m_player.GetComponentInChildren<Animator>();
|
|
if (anim != null)
|
|
{
|
|
Transform headBone = anim.GetBoneTransform(HumanBodyBones.Head);
|
|
if (headBone != null)
|
|
{
|
|
Transform eyes = headBone.Find("AswidEyes");
|
|
if (eyes != null) Destroy(eyes.gameObject);
|
|
}
|
|
}
|
|
|
|
m_lastFenrirForm = "";
|
|
m_lastSkadiForm = "";
|
|
}
|
|
|
|
private void EnsureFireAuraVFX(bool enable)
|
|
{
|
|
if (enable)
|
|
{
|
|
if (m_fireAuraVFX == null)
|
|
{
|
|
GameObject sourceVFX = Jotunn.Managers.PrefabManager.Cache.GetPrefab<GameObject>("vfx_smoke") ??
|
|
Jotunn.Managers.PrefabManager.Cache.GetPrefab<GameObject>("vfx_surtling_death");
|
|
|
|
m_fireAuraVFX = new GameObject("SkeletonFireAuraVFX");
|
|
m_fireAuraVFX.transform.SetParent(m_player.transform, false);
|
|
m_fireAuraVFX.transform.localPosition = new Vector3(0, 1f, 0);
|
|
|
|
if (sourceVFX != null)
|
|
{
|
|
ParticleSystem[] pss = sourceVFX.GetComponentsInChildren<ParticleSystem>();
|
|
if (pss.Length > 0)
|
|
{
|
|
ParticleSystem ps = m_fireAuraVFX.AddComponent<ParticleSystem>();
|
|
var main = ps.main;
|
|
main.loop = true;
|
|
main.duration = 1f;
|
|
main.startLifetime = 1.5f;
|
|
main.startSize = new ParticleSystem.MinMaxCurve(1.5f, 3f);
|
|
main.startSpeed = 0f;
|
|
main.simulationSpace = ParticleSystemSimulationSpace.World;
|
|
|
|
var renderer = m_fireAuraVFX.GetComponent<ParticleSystemRenderer>();
|
|
renderer.material = pss[0].GetComponent<ParticleSystemRenderer>().material;
|
|
|
|
var shape = ps.shape;
|
|
shape.shapeType = ParticleSystemShapeType.Sphere;
|
|
shape.radius = 4.5f;
|
|
|
|
var emission = ps.emission;
|
|
emission.rateOverTime = 40f;
|
|
|
|
var colorOverLifetime = ps.colorOverLifetime;
|
|
colorOverLifetime.enabled = true;
|
|
Gradient grad = new Gradient();
|
|
grad.SetKeys(
|
|
new GradientColorKey[] {
|
|
new GradientColorKey(new Color(1f, 0.8f, 0.2f), 0.0f),
|
|
new GradientColorKey(new Color(1f, 0.3f, 0.0f), 0.5f),
|
|
new GradientColorKey(new Color(0.2f, 0.0f, 0.0f), 1.0f)
|
|
},
|
|
new GradientAlphaKey[] {
|
|
new GradientAlphaKey(0.0f, 0.0f),
|
|
new GradientAlphaKey(0.6f, 0.2f),
|
|
new GradientAlphaKey(0.6f, 0.8f),
|
|
new GradientAlphaKey(0.0f, 1.0f)
|
|
}
|
|
);
|
|
colorOverLifetime.color = grad;
|
|
}
|
|
}
|
|
}
|
|
if (!m_fireAuraVFX.activeSelf) m_fireAuraVFX.SetActive(true);
|
|
}
|
|
else
|
|
{
|
|
if (m_fireAuraVFX != null && m_fireAuraVFX.activeSelf) m_fireAuraVFX.SetActive(false);
|
|
}
|
|
}
|
|
}
|
|
}
|