Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions Patches/HeroControl/MovesetFSMEdits.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
namespace Needleforge.Patches.HeroControl;

[HarmonyPatch(typeof(HeroController), nameof(HeroController.Start))]
internal class MovesetFSMEdits
internal static class MovesetFSMEdits
{
private static void Postfix(HeroController __instance)
private static void Prefix(HeroController __instance)
{
ModHelper.Log("Editing Moveset FSMs...");
DownSlashFSMEdits(__instance);
Expand All @@ -36,7 +36,8 @@ private static void DownSlashFSMEdits(HeroController hc)
return;

PlayMakerFSM fsm = hc.crestAttacksFSM;
fsm.Preprocess();
if (!fsm.Fsm.preprocessed)
fsm.Preprocess();

FsmState
Idle = fsm.GetState("Idle")!,
Expand Down Expand Up @@ -88,7 +89,8 @@ private static void DownSlashFSMEdits(HeroController hc)
private static void DashSlashFSMEdits(HeroController hc)
{
PlayMakerFSM fsm = hc.sprintFSM;
fsm.Preprocess();
if (!fsm.Fsm.preprocessed)
fsm.Preprocess();

FsmState
StartAttack = fsm.GetState("Start Attack")!,
Expand Down
7 changes: 4 additions & 3 deletions Patches/HeroControl/Tool_CrestFSMEdits.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@ internal class Tool_CrestFSMEdits
{ UniqueBindDirection.RIGHT, () => HeroController.instance.inputHandler.inputActions.Right.IsPressed }
};

[HarmonyPostfix]
[HarmonyPrefix]
private static void AddCrests(HeroController __instance)
{
PlayMakerFSM bind = __instance.gameObject.GetFsmPreprocessed("Bind");
PlayMakerFSM bind = __instance.gameObject.GetFsmPreprocessed("Bind")!;

FsmState CanBind = bind.GetState("Can Bind?");

FsmState BindType = bind.GetState("Bind Type");
Expand Down Expand Up @@ -153,7 +154,7 @@ private static void AddCrests(HeroController __instance)
CanBind.ReplaceAction(9, replaceSilkCost);
}

[HarmonyPostfix]
[HarmonyPrefix]
private static void AddTools(HeroController __instance)
{

Expand Down