fix: Draugh Ashlands meats, rebindable flight keys, Geisli on gamepad

Draugh: add AsksvinMeat and BoneMawSerpentMeat to the shared raw-to-cooked
table; the Aswid blood refinery no longer adds them on its own copy.

DirectedFlight (drake, bat): read ZInput Forward/Backward/Run instead of
raw W, S and Shift, so keys rebound in the settings work.

Geisli: the pad has no free button in vanilla's Classic layout, so the
beam is held on the pad's secondary attack, bare-handed or in the
Archon form, as Skadi's Cold Spell does. The unarmed kick is swallowed
while it fires. RaceInput.EmptyHanded is shared with Skadi. Compendium
text mentions the pad in English, Italian and Russian.
This commit is contained in:
kanym 2026-10-27 19:33:17 +01:00
commit db9aac2bf6
9 changed files with 55 additions and 18 deletions

View file

@ -305,6 +305,34 @@ namespace RacesOfValheim
// ─── Geisli: the beam ────────────────────────────────────────────────
/// <summary>
/// The pad's way to hold the beam. Every pad button is taken in vanilla's Classic layout, so,
/// like Skadi's Cold Spell, the beam borrows the secondary attack: bare-handed, or in the
/// archon form, which has no weapons anyway. The radial entry only gives a single press,
/// which cannot hold a beam.
/// </summary>
private static bool PadBeamHeld(Player player) =>
!RaceInput.RadialOpen && RaceInput.PadAttackHeld(2) &&
(AlfarArchon.Active || RaceInput.EmptyHanded(player));
/// <summary>
/// Swallows the unarmed secondary (the kick) while the pad's secondary attack is the beam,
/// the same way SkadiAttackPatch does for the Cold Spell.
/// </summary>
[HarmonyPatch(typeof(Humanoid), "StartAttack")]
public static class Alfar_GeisliPadKick_Patch
{
public static bool Prefix(Humanoid __instance, bool secondaryAttack, ref bool __result)
{
if (!secondaryAttack || __instance != Player.m_localPlayer) return true;
Player player = (Player)__instance;
if (!AlfarVisuals.IsAlfarPlayer(player) || !Unlocked(AlfarPowerConfig.GeisliState)) return true;
if (!PadBeamHeld(player)) return true;
__result = false;
return false;
}
}
private static LineRenderer beamLine;
private static readonly List<LineRenderer> beamArcs = new List<LineRenderer>();
private static GameObject beamFx;
@ -324,7 +352,7 @@ namespace RacesOfValheim
private static void TickBeam(Player player)
{
bool wanted = RaceInput.Allowed && !player.IsDead() && Unlocked(AlfarPowerConfig.GeisliState) &&
AlfarPowerConfig.GeisliKey.Value.IsPressedIgnoringHeldKeys();
(AlfarPowerConfig.GeisliKey.Value.IsPressedIgnoringHeldKeys() || PadBeamHeld(player));
if (!wanted)
{