Vampiric Aura was centered 2m in front of the player instead of on them, and its Blood Magic scaling only ever added up to +1 damage at level 100; rebalanced to a 1 base + up to 5 scaled split. Aswid Bat Form, Skadi Cold Spell, Skadi Drake/Moder Form and Fenrir Wolf Form all borrow the native "gpower" animator trigger for its arms-raised casting pose. That clip carries a baked-in Animation Event that calls Player.ActivateGuardianPower(), which fired regardless of who triggered the animation - borrowing it silently cast the player's real Guardian Power (and burned its cooldown) whenever one was available. Added a brief, time-based suppression window in RaceInput around each borrowed trigger so only that one call is swallowed. Also includes AswidSpectralClaw.cs, a boss-scaled bare-fist damage item for Aswid, currently disabled pending equip-state fixes. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
65 lines
2.8 KiB
C#
65 lines
2.8 KiB
C#
using System.Reflection;
|
|
using HarmonyLib;
|
|
using UnityEngine;
|
|
|
|
namespace RacesOfValheim
|
|
{
|
|
/// <summary>
|
|
/// Gate for race ability input.
|
|
///
|
|
/// UnityEngine.Input reads the device directly, so abilities bound to keys or mouse buttons
|
|
/// kept firing while the map, the inventory, a chest, the chat or a menu had focus - dragging
|
|
/// an item inside a container also swung the transformed attack, for instance. Valheim runs
|
|
/// its own controls through Player.TakeInput, which reports false for exactly those states
|
|
/// (InventoryGui covers the backpack and chests alike), so mirror that instead of maintaining
|
|
/// a parallel list of GUI checks that would drift as the game changes.
|
|
/// </summary>
|
|
public static class RaceInput
|
|
{
|
|
// Not public on Player, hence the reflection; resolved once rather than per frame.
|
|
private static readonly MethodInfo TakeInputMethod = AccessTools.Method(typeof(Player), "TakeInput");
|
|
|
|
public static bool Allowed
|
|
{
|
|
get
|
|
{
|
|
Player player = Player.m_localPlayer;
|
|
if (player == null) return false;
|
|
|
|
// Fail open: if a game update ever renames the method, abilities stay usable
|
|
// rather than silently going dead.
|
|
if (TakeInputMethod == null) return true;
|
|
|
|
return (bool)TakeInputMethod.Invoke(player, null);
|
|
}
|
|
}
|
|
|
|
// Aswid/Skadi/Fenrir all borrow the native "gpower" Animator trigger to get its
|
|
// arms-raised cast gesture for their own transformations. The "gpower" clip carries a
|
|
// baked-in Animation Event that calls Player.ActivateGuardianPower() partway through -
|
|
// that fires no matter who requested the animation, so borrowing the trigger silently
|
|
// cast the player's real Guardian Power (and put it on cooldown) whenever it happened
|
|
// to be available. Races set this right before SetTrigger("gpower") to swallow that one
|
|
// call. Time-based rather than a plain latch, so a skipped/interrupted animation can't
|
|
// leave the real power blocked forever.
|
|
public static float SuppressGuardianPowerUntil = -1f;
|
|
|
|
public static void SuppressGuardianPowerBriefly(float seconds = 2f)
|
|
{
|
|
SuppressGuardianPowerUntil = Time.time + seconds;
|
|
}
|
|
}
|
|
|
|
[HarmonyPatch(typeof(Player), "ActivateGuardianPower")]
|
|
public static class Player_ActivateGuardianPower_SuppressBorrowed_Patch
|
|
{
|
|
public static bool Prefix(Player __instance)
|
|
{
|
|
if (__instance != Player.m_localPlayer) return true;
|
|
if (Time.time > RaceInput.SuppressGuardianPowerUntil) return true;
|
|
|
|
RaceInput.SuppressGuardianPowerUntil = -1f; // one-shot: don't block real future casts
|
|
return false;
|
|
}
|
|
}
|
|
}
|