jotunn 2.30 compatibility + minor bugs
This commit is contained in:
parent
6193b3ee2d
commit
ce671e7124
14 changed files with 107 additions and 49 deletions
|
|
@ -188,24 +188,25 @@ namespace RacesOfValheim
|
|||
|
||||
// Handle Attack - each trigger is a rebindable SkadiConfig keybind; the button id
|
||||
// passed into PerformAttackCoroutine (0/1/2) still selects which attack runs, exactly
|
||||
// as it did when these were raw mouse-button checks.
|
||||
// as it did when these were raw mouse-button checks. The same id also picks the
|
||||
// gamepad button (RaceInput.PadAttackDown), which stays fixed even if the key is rebound.
|
||||
if (CanAttackNow() && RaceInput.Allowed)
|
||||
{
|
||||
if (SkadiConfig.PrimaryAttackKey.Value.IsDownIgnoringHeldKeys())
|
||||
if (SkadiConfig.PrimaryAttackKey.Value.IsDownIgnoringHeldKeys() || RaceInput.PadAttackDown(0))
|
||||
{
|
||||
if (HasAttackForButton(0) && Time.time - lastAttackTime >= ATTACK_COOLDOWN)
|
||||
{
|
||||
StartCoroutine(PerformAttackCoroutine(0));
|
||||
}
|
||||
}
|
||||
else if (SkadiConfig.BreathAttackKey.Value.IsDownIgnoringHeldKeys())
|
||||
else if (SkadiConfig.BreathAttackKey.Value.IsDownIgnoringHeldKeys() || RaceInput.PadAttackDown(2))
|
||||
{
|
||||
if (Time.time - lastAttackTime >= ATTACK_COOLDOWN)
|
||||
{
|
||||
StartCoroutine(PerformAttackCoroutine(2));
|
||||
}
|
||||
}
|
||||
else if (SkadiConfig.SpinAttackKey.Value.IsDownIgnoringHeldKeys() && formRules.Form == SkadiProgression.FormType.SkeletonDragon) // Fader Spin
|
||||
else if ((SkadiConfig.SpinAttackKey.Value.IsDownIgnoringHeldKeys() || RaceInput.PadAttackDown(1)) && formRules.Form == SkadiProgression.FormType.SkeletonDragon) // Fader Spin
|
||||
{
|
||||
if (Time.time - lastAttackTime >= ATTACK_COOLDOWN)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue