diff --git a/JotunnModStub/HeldItemScaleFix.cs b/JotunnModStub/HeldItemScaleFix.cs new file mode 100644 index 0000000..fb7ab1e --- /dev/null +++ b/JotunnModStub/HeldItemScaleFix.cs @@ -0,0 +1,48 @@ +using HarmonyLib; +using UnityEngine; + +namespace RacesOfValheim +{ + /// + /// 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. + /// + [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; + } + } +}