From b9ec452e72fcfa38d8eadc52fa4e9c3ccec3e7f2 Mon Sep 17 00:00:00 2001 From: kanym Date: Tue, 27 Oct 2026 19:25:03 +0100 Subject: [PATCH] fix: Draugh eats Bjorn and Volture meat, Alfar levitation on gamepad Draugh: add BjornMeat -> CookedBjornMeat to the raw-to-cooked table and correct VoltureMeat's cooked name (RoastedVoltureMeat does not exist, CookedVoltureMeat does), so neither raw meat got an EdibleUncooked_ item. Names checked against the SoftRef manifests. Alfar: ZInput "Jump" is the keyboard binding only. Read "JoyJump" and "JoyCrouch" too, as PlayerController does, for levitation and the Archon's climb and descent. Reported by lexsonn. --- JotunnModStub/Alfar/AlfarLevitation.cs | 14 ++++++++++---- JotunnModStub/Draugh/DraughFoodPatches.cs | 4 +++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/JotunnModStub/Alfar/AlfarLevitation.cs b/JotunnModStub/Alfar/AlfarLevitation.cs index 77f6b9d..206c8c7 100644 --- a/JotunnModStub/Alfar/AlfarLevitation.cs +++ b/JotunnModStub/Alfar/AlfarLevitation.cs @@ -48,7 +48,7 @@ namespace RacesOfValheim float target = 0f; if (Time.time - AlfarArchon.StartedAt < 0.6f) target = 4f; // lift off else if (RaceInput.Allowed && JumpHeld()) target = speed; - else if (RaceInput.Allowed && ZInput.GetButton("Crouch")) target = -speed; + else if (RaceInput.Allowed && CrouchHeld()) target = -speed; Vector3 velocity = flyer.linearVelocity; velocity.y = Mathf.Lerp(velocity.y, target, 0.25f); @@ -97,9 +97,15 @@ namespace RacesOfValheim private static bool JumpHeld() { - // ZInput's "Jump" covers the space bar and the pad's jump button alike, and respects the - // controls the player picked in the settings. - return ZInput.GetButton("Jump"); + // "Jump" is the keyboard binding only; the pad's button is a separate "JoyJump", read + // the way PlayerController reads it, kept off while a radial menu has the pad. + return ZInput.GetButton("Jump") || (ZInput.GetButton("JoyJump") && !Hud.InRadial()); + } + + private static bool CrouchHeld() + { + // Same split as jump: PlayerController ORs "Crouch" with "JoyCrouch". + return ZInput.GetButton("Crouch") || (ZInput.GetButton("JoyCrouch") && !Hud.InRadial()); } private static void FlushSpend(Player player) diff --git a/JotunnModStub/Draugh/DraughFoodPatches.cs b/JotunnModStub/Draugh/DraughFoodPatches.cs index ea56d5c..fe57c31 100644 --- a/JotunnModStub/Draugh/DraughFoodPatches.cs +++ b/JotunnModStub/Draugh/DraughFoodPatches.cs @@ -24,11 +24,13 @@ namespace RacesOfValheim { "HareMeat", "CookedHareMeat" }, { "ChickenMeat", "CookedChickenMeat" }, { "BugMeat", "CookedBugMeat" }, - { "VoltureMeat", "RoastedVoltureMeat" }, + { "VoltureMeat", "CookedVoltureMeat" }, { "GreydwarfEye", "DeerStew" }, { "Entrails", "Sausages" }, { "Bloodbag", "BloodPudding" }, { "MooseMeat", "CookedMooseMeat" }, + // Bjorn, the Valheim 1.0 bear. + { "BjornMeat", "CookedBjornMeat" }, // Raw blubber keeps its own name and icon (EdibleUncooked_ copies them from the raw // item) and gives the stats of Seal Meat Soup. { "SealBlubber", "SealSoup" }