Merge branch 'fix-skadi-race'

This commit is contained in:
kanym 2026-08-01 13:50:25 +02:00
commit 51a23202ff
14 changed files with 397 additions and 87 deletions

View file

@ -521,7 +521,7 @@ namespace RacesOfValheim
ZNetView nview = __instance.GetComponent<ZNetView>();
if (nview != null && nview.IsValid() && nview.GetZDO().GetString("RacesOfValheim_Race", "Human") == "Aswid")
{
if (__instance == Player.m_localPlayer && Input.GetKeyDown(KeyCode.I))
if (__instance == Player.m_localPlayer && RaceInput.Allowed && Input.GetKeyDown(KeyCode.I))
{
AswidRace.DevourEnabled = !AswidRace.DevourEnabled;
string msg = AswidRace.DevourEnabled ? "Devour Ability: ENABLED" : "Devour Ability: DISABLED";

View file

@ -504,8 +504,7 @@ namespace RacesOfValheim
int state = BossProgressionManager.GetCurrentProgressionState();
bool takeInput = HarmonyLib.Traverse.Create(Player.m_localPlayer).Method("TakeInput").GetValue<bool>();
if (takeInput)
if (RaceInput.Allowed)
{
if (Input.GetKeyDown(KeyCode.G)) { TryTransformWithRules(AswidProgression.GetGKeyRules(state)); return; }
if (Input.GetKeyDown(KeyCode.H)) { TryToggleMistForm(); return; }