fix(visuals): weapons and shields drawn by a resized player match their size
VisEquipment.AttachItem parents the item with SetParent(joint), which keeps its world size, so on a scaled model the item's local scale was divided by the model's. A Trol drew items 23% too small at base size, and after sheathing in True Form they came back at human size on a 2.5x body. The item is now scaled back by the joint's scale, as if parented without keeping world size, and follows the model from there.
This commit is contained in:
parent
19d331789a
commit
598d709af1
1 changed files with 48 additions and 0 deletions
48
JotunnModStub/HeldItemScaleFix.cs
Normal file
48
JotunnModStub/HeldItemScaleFix.cs
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
using HarmonyLib;
|
||||
using UnityEngine;
|
||||
|
||||
namespace RacesOfValheim
|
||||
{
|
||||
/// <summary>
|
||||
/// Makes a weapon or shield drawn by a resized player come out at that player's size.
|
||||
///
|
||||
/// VisEquipment.AttachItem instantiates the item and then calls transform.SetParent(joint),
|
||||
/// and SetParent keeps the object's WORLD size by default. On a normal player the hand joint
|
||||
/// sits at world scale 1, so nothing changes. On a player whose model we have resized, Unity
|
||||
/// divides the item's local scale by the joint's scale to keep it at a human's size:
|
||||
///
|
||||
/// Trol at 1.3, draws a mace -> mace local 0.77, world 1.0 (should be 1.3)
|
||||
/// then True Form grows to 2.5 -> mace world 1.92 (should be 2.5)
|
||||
/// sheathe and draw again (R) -> mace world 1.0 on a 2.5 body
|
||||
///
|
||||
/// Items already in hand grow along with the model afterwards, being its children, which is why
|
||||
/// the report only showed up after R. Measured in game with an F8 dump: joint 2.5, items 1.92.
|
||||
///
|
||||
/// Multiplying back by the joint's scale gives exactly what SetParent(joint, false) would have
|
||||
/// given. From there the item is an ordinary child of the hand and follows every later change
|
||||
/// of size on its own: progression tiers, True Form, the grow and shrink animation, the config.
|
||||
/// It covers every race that resizes its model or its root the same way, and remote players
|
||||
/// too, since each client attaches its own copy.
|
||||
///
|
||||
/// Armor (attach_skin) is skinned to the body's bones and follows them whatever its own scale,
|
||||
/// so it is left alone. So are creatures: this is for players only.
|
||||
/// </summary>
|
||||
[HarmonyPatch(typeof(VisEquipment), "AttachItem")]
|
||||
internal static class HeldItemScaleFix
|
||||
{
|
||||
private static void Postfix(VisEquipment __instance, GameObject __result)
|
||||
{
|
||||
if (__result == null || !__instance.m_isPlayer) return;
|
||||
|
||||
Transform joint = __result.transform.parent;
|
||||
if (joint == null) return;
|
||||
if (__instance.m_bodyModel != null && joint == __instance.m_bodyModel.transform.parent) return;
|
||||
|
||||
// Every scale in the chain is uniform, so one axis tells the whole story.
|
||||
float jointScale = joint.lossyScale.x;
|
||||
if (jointScale <= 0f || Mathf.Abs(jointScale - 1f) < 0.001f) return;
|
||||
|
||||
__result.transform.localScale *= jointScale;
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue