Commit graph

8 commits

Author SHA1 Message Date
Ferdinando
ce671e7124 jotunn 2.30 compatibility + minor bugs 2026-09-10 19:14:05 +02:00
Ferdinando
6193b3ee2d 1.0 compatibility 2026-09-10 18:05:24 +02:00
c2212df322 Merge branch 'war-vulture' into main
Brings in v1.4.3-v1.4.5 work: Trol's Hammer, Bone Servants, War Vulture
craftability, and the Aswid/Fenrir timed-claws rework, on top of the
bugfixes merged into main since v1.4.2.

Resolved conflicts in 7 files where main's post-v1.4.2 fixes overlapped
war-vulture's claws rework:
- README.md, manifest.json: took war-vulture's v1.4.5 content (main
  hadn't touched either since the v1.4.2 release).
- RacesOfValheim.cs: plugin version -> 1.4.5.
- RaceClaws.cs: kept war-vulture's lazy EnsureRoster() fix for the
  Fenrir claw-registration bug over main's belt-and-suspenders
  Register(this), and dropped the now-stale comment referencing the
  removed static constructor. Main's SetupDragItem race-ownership fix
  carried through untouched.
- AswidConfig.cs/AswidRace.cs/AswidPatches.cs: adopted war-vulture's
  single-key design (I toggles both Vampiric Aura and Devour together)
  to match the documented v1.4.5 trader-safety fix, removing a duplicate
  AuraEnabled field the two branches had each declared independently.
  Kept main's IsDownIgnoringHeldKeys() input fix on top.
- RaceCompendium.cs: kept main's fact-checked Aswid/Fenrir entries
  (war-vulture's copies were pre-fix stubs, one referencing a
  nonexistent variable) and layered in war-vulture's timed-claws
  wording.

Build verified clean (0 errors) after resolution.
2026-08-18 17:36:42 +02:00
Ferdinando
0aa1dc4dc8 warvulture 2026-08-16 07:44:44 +02:00
da602a9b44 fix(sverm): take the carapace off a player who is no longer a Sverm
ApplyCarapace had no removal path - it returned early for a non-Sverm
without restoring anything - and its only caller sat behind an
`if (isSverm)`, so the removal branch could not have run even if it had
existed. The carapace is a plain visual override written with
SetChestItem and friends, and nothing in the game corrects that on its
own, so the chitin stayed on after a race change. Equipping anything
only appeared to fix it: that was Valheim's own refresh writing the real
gear back over ours.

ApplyCarapace now restores the three slots from what the player actually
has equipped - the same values Humanoid.SetupVisEquipment writes, but
only for the slots we overrode, so it cannot disturb another race's
visuals or a weapon mid-swap. A CarapaceMark component tracks who is
wearing it so the restore fires once rather than every tick, and dies
with the GameObject so it cannot leak. The caller is unconditional now,
matching ApplyEyes/ApplyClaws/ApplySpines, which all already strip
themselves from whoever is not a Sverm.
2026-08-12 17:55:10 +02:00
3f09c7cf3f fix(visuals): measure the skull's facing from the bind pose, for all three clawed races
The eye frame was read from the head bone's pose ON THE FRAME THE EYES
WERE BUILT, snapped to the nearest axis, then cached for the life of the
eyes. Catch the head a few degrees into a turn and the snap picks the
neighbouring axis, and the pair stays wrong until something rebuilds it.

Each race met this separately and each added the same guard - do not
build while attached, mid-attack or asleep - which caught the loud cases
and left the quiet one: a race change rebuilds while the rig is still
settling, which is none of those three. That is why resetting into a
race could break the placement while logging out and back in silently
fixed it. The logout was never a fix, only a rebuild at a calmer moment,
and no fourth guard condition would have closed it - the read itself had
to stop depending on when it happens.

sharedMesh.bindposes[headBone] is the rig as authored: no animation in
it, no timing, the same answer on frame one and frame ten thousand. A
rebuild is now deterministic and a bad moment cannot exist. Falls back to
the live read, warning once, on a rig that carries no bind pose.

Lives in one shared RigBindPose rather than in three copies. The three
eye implementations are separate files by design - they differ in what
they hang and how it is coloured - but this is the one piece of maths
where a divergence would be a bug in whichever copy got fixed second,
and it had already been fixed twice. The three now-dead private
SnapToAxis copies go with it.

Also updates the Aswid eye defaults to the values dialled in on screen:
forward 0.013, height 0.004, yaw 22.068.
2026-08-12 17:33:46 +02:00
028c34be3c fix(visuals): stop Aswid and Sverm eyes measuring their facing off the wrong transform
Both files built their eye holder's forward/up axes from headBone.root
- the top of whatever hierarchy the head bone (from
VisEquipment.m_bodyModel's own bone array) happens to sit in. That
does not reliably resolve back to the player, so the measurement came
out wrong on every single build rather than on an occasional
bad-timing one - which is why resetting the race or logging out never
fixed it for Aswid, only starting a fresh build at the same wrong
reference every time.

DvergarVisuals.BuildEyes already reads player.transform directly and
does not have this problem - its own eye glitches are the ordinary
bad-pose-timing kind the attach/attack/sleep guard mostly covers,
which is why relogging (a fresh, differently-timed build) usually
fixes it. AswidVisuals and SvermVisuals now do the same.

Also gives SvermVisuals.ApplyEyes the same attach/attack/sleep guard
Aswid and Dvergar already had before building fresh, which it was
missing entirely.
2026-08-12 13:44:59 +02:00
Ferdinando
1d66b00374 warvulture 2026-08-11 16:30:20 +02:00