From 19cdf19a9b1ae5ce2a2301f266918b9c7ed4efed Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Tue, 27 Jan 2026 19:36:06 +0200 Subject: [PATCH] wtf --- .../controllers/data/ability/Ability.java | 13 ++++++++++++ .../java/noppes/npcs/NoppesUtilPlayer.java | 2 +- .../scripted/event/player/DialogEvent.java | 20 +++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java b/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java index 65a4e8ac5..c3f6d86ed 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java @@ -47,6 +47,7 @@ public abstract class Ability implements IAbility { // Timing (ticks) protected int cooldownTicks = 100; protected int windUpTicks = 20; + protected int dazedTicks = 0; protected int activeTicks = 10; protected int recoveryTicks = 20; @@ -588,6 +589,7 @@ public abstract class Ability implements IAbility { nbt.setFloat("maxRange", maxRange); nbt.setInteger("cooldown", cooldownTicks); nbt.setInteger("windUp", windUpTicks); + nbt.setInteger("dazed", dazedTicks); nbt.setInteger("active", activeTicks); nbt.setInteger("recovery", recoveryTicks); nbt.setBoolean("interruptible", interruptible); @@ -627,6 +629,7 @@ public abstract class Ability implements IAbility { maxRange = nbt.getFloat("maxRange"); cooldownTicks = nbt.getInteger("cooldown"); windUpTicks = nbt.getInteger("windUp"); + dazedTicks = nbt.hasKey("dazed") ? nbt.getInteger("dazed") : 0; activeTicks = nbt.getInteger("active"); recoveryTicks = nbt.getInteger("recovery"); interruptible = nbt.getBoolean("interruptible"); @@ -763,6 +766,16 @@ public abstract class Ability implements IAbility { this.windUpTicks = windUpTicks; } + @Override + public int getDazedTicks() { + return dazedTicks; + } + + @Override + public void setDazedTicks(int ticks) { + this.dazedTicks = ticks; + } + public int getActiveTicks() { return activeTicks; } diff --git a/src/main/java/noppes/npcs/NoppesUtilPlayer.java b/src/main/java/noppes/npcs/NoppesUtilPlayer.java index c78ffdf46..90e3c91ec 100644 --- a/src/main/java/noppes/npcs/NoppesUtilPlayer.java +++ b/src/main/java/noppes/npcs/NoppesUtilPlayer.java @@ -306,7 +306,7 @@ public class NoppesUtilPlayer { if (dialog == null) return; DialogOption option = dialog.options.get(optionId); - if (EventHooks.onDialogOption(player, new DialogEvent.DialogOption((IPlayer) NpcAPI.Instance().getIEntity(player), dialog))) + if (EventHooks.onDialogOption(player, new DialogEvent.DialogOption((IPlayer) NpcAPI.Instance().getIEntity(player), dialog, optionId))) return; if (!npc.isRemote()) { diff --git a/src/main/java/noppes/npcs/scripted/event/player/DialogEvent.java b/src/main/java/noppes/npcs/scripted/event/player/DialogEvent.java index a5ebfc1ff..efc8caeab 100644 --- a/src/main/java/noppes/npcs/scripted/event/player/DialogEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/player/DialogEvent.java @@ -8,16 +8,32 @@ import noppes.npcs.constants.EnumScriptType; public class DialogEvent extends PlayerEvent implements IDialogEvent { public final IDialog dialog; + private final int optionId; public DialogEvent(IPlayer player, IDialog dialog) { + this(player, dialog, -1); + } + + public DialogEvent(IPlayer player, IDialog dialog, int optionId) { super(player); this.dialog = dialog; + this.optionId = optionId; } public IDialog getDialog() { return dialog; } + @Override + public int getDialogId() { + return dialog != null ? dialog.getId() : -1; + } + + @Override + public int getOptionId() { + return optionId; + } + public String getHookName() { return EnumScriptType.DIALOG_EVENT.function; } @@ -39,6 +55,10 @@ public class DialogEvent extends PlayerEvent implements IDialogEvent { super(player, dialog); } + public DialogOption(IPlayer player, IDialog dialog, int optionId) { + super(player, dialog, optionId); + } + public String getHookName() { return EnumScriptType.DIALOG_OPTION.function; }