Skip to content

Commit

Permalink
Samurai Combo lvl92 up need its New 1st Attack "Gyofu" #111
Browse files Browse the repository at this point in the history
Fixed Hakaze combos. Replaced all instances of returning Hakaze with OriginalHook versions, so the auto upgrade works
  • Loading branch information
FrigidWalrus committed Jul 16, 2024
1 parent 9a3f818 commit e0f730c
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions XIVComboVX/Combos/SAM.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ public const uint
Ikishoten = 16482,
Shoha2 = 25779,
OgiNamikiri = 25781,
KaeshiNamikiri = 25782;
KaeshiNamikiri = 25782,
Gyofu = 36963,
Zanshin = 36964;

public static class Buffs {
public const ushort
Expand Down Expand Up @@ -64,7 +66,9 @@ public const byte
Fuko = 86,
KaeshiNamikiri = 90,
OgiNamikiri = 90,
Bloodbath = 12;
Bloodbath = 12,
Gyofu = 92,
Zanshin = 96;
}
}

Expand Down Expand Up @@ -94,7 +98,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
return SAM.Yukikaze;
}

return SAM.Hakaze;
return OriginalHook(SAM.Hakaze);
}
}

Expand All @@ -119,7 +123,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim

return IsEnabled(CustomComboPreset.SamuraiGekkoOption)
? SAM.Jinpu
: SAM.Hakaze;
: OriginalHook(SAM.Hakaze);
}
}

Expand All @@ -142,7 +146,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim

return IsEnabled(CustomComboPreset.SamuraiKashaOption)
? SAM.Shifu
: SAM.Hakaze;
: OriginalHook(SAM.Hakaze);
}
}

Expand Down

0 comments on commit e0f730c

Please sign in to comment.