Fix NPC skill hitbox detection and add debug tooling

Maple2.File.Ingest/Mapper/SkillMapper.cs

@@ -158,7 +158,7 @@ private static SkillMetadataRange Convert(RegionSkill region) {
             },
             Distance: region.distance,
             Height: region.height,
-            Width: region.height,
+            Width: region.width,
             EndWidth: region.endWidth,
             RotateZDegree: region.rangeZRotateDegree,
             RangeAdd: region.rangeAdd,

Maple2.Server.DebugGame/Graphics/DebugFieldRenderer.cs

@@ -3,10 +3,15 @@
 using Maple2.Server.Game.Manager.Field;
 using ImGuiNET;
 using Maple2.Model.Enum;
+using Maple2.Model.Metadata;
 using Maple2.Model.Metadata.FieldEntity;
 using Maple2.Server.DebugGame.Graphics.Data;
 using Maple2.Server.Game.Model;
+using Maple2.Server.Game.Model.ActorStateComponent;
+using Maple2.Server.Game.Model.Enum;
+using Maple2.Server.Game.Model.Skill;
 using Maple2.Server.Game.Packets;
+using Maple2.Server.Game.Util;
 using Maple2.Tools.VectorMath;
 using Maple2.Tools.Collision;
 using Silk.NET.Maths;
@@ -54,6 +59,7 @@ public bool IsActive {
     public bool ShowPlotLabels = true; // toggle for showing floating plot labels (status/owner/etc.)
     public bool ShowTriggers = true;
     public bool ShowTriggerInformation = true;
+    public bool ShowSkillHitboxes = false; // toggle for rendering active skill hitboxes
     public bool PlayerMoveMode;
     public bool ForceMove;
 
@@ -284,6 +290,11 @@ private void RenderFieldEntities3D(DebugFieldWindow window) {
             // Render text labels above actors using ImGui
             RenderActorTextLabels();
         }
+
+        // Render skill hitboxes
+        if (ShowSkillHitboxes) {
+            RenderSkillHitboxes(window);
+        }
     }
 
     private void RenderBoxColliders(DebugFieldWindow window) {
@@ -1212,4 +1223,121 @@ private void RenderTriggerTextLabels() {
             drawList.AddText(topLeft, ImGui.ColorConvertFloat4ToU32(textColor), idText);
         }
     }
+
+    private void RenderSkillHitboxes(DebugFieldWindow window) {
+        // Set orange color for skill hitboxes
+        instanceBuffer.Color = new Vector4(1.0f, 0.5f, 0.0f, 0.7f);
+
+        // Render hitboxes for all actors with active skills
+        foreach ((int _, FieldPlayer player) in Field.Players) {
+            RenderActorSkillHitbox(window, player);
+        }
+        foreach ((int _, FieldNpc npc) in Field.Npcs) {
+            RenderActorSkillHitbox(window, npc);
+        }
+        foreach ((int _, FieldNpc mob) in Field.Mobs) {
+            RenderActorSkillHitbox(window, mob);
+        }
+    }
+
+    private void RenderActorSkillHitbox(DebugFieldWindow window, IActor actor) {
+        // Get the active SkillRecord from the appropriate source
+        SkillRecord? skillRecord = null;
+
+        if (actor is FieldNpc npc) {
+            // For NPCs/mobs: get from MovementState's active cast task
+            if (npc.MovementState.CastTask is MovementState.NpcSkillCastTask skillTask) {
+                skillRecord = skillTask.Cast;
+            }
+        } else {
+            // For players: use ActiveSkills but only if currently in a skill animation
+            if (actor.Animation.Current is { Type: AnimationType.Skill }) {
+                skillRecord = actor.ActiveSkills.GetMostRecent();
+            }
+        }
+
+        if (skillRecord == null) {
+            return;
+        }
+
+        // Only render the CURRENT attack point (not all attacks in the motion)
+        // Bounds check to avoid race condition with game thread updating MotionPoint/AttackPoint
+        if (skillRecord.MotionPoint >= skillRecord.Metadata.Data.Motions.Length ||
+            skillRecord.AttackPoint >= skillRecord.Motion.Attacks.Length) {
+            return;
+        }
+        SkillMetadataAttack attack = skillRecord.Attack;
+        Prism prism = SkillUtils.GetPrism(attack.Range, actor.Position, actor.Rotation.Z);
+
+        RenderPrism(window, prism, attack.Range);
+    }
+
+    private void RenderPrism(DebugFieldWindow window, Prism prism, SkillMetadataRange range) {
+        IPolygon polygon = prism.Polygon;
+
+        if (polygon is Circle circle) {
+            // Render cylinder for circular hitbox
+            Vector3 center = new(circle.Origin.X, circle.Origin.Y, prism.Height.Min + (prism.Height.Max - prism.Height.Min) * 0.5f);
+            float radius = circle.Radius;
+            float height = prism.Height.Max - prism.Height.Min;
+
+            var rotation = Matrix4x4.CreateRotationX((float) (Math.PI / 2));
+            instanceBuffer.Transformation = Matrix4x4.Transpose(
+                Matrix4x4.CreateScale(new Vector3(radius, height * 0.5f, radius)) *
+                rotation *
+                Matrix4x4.CreateTranslation(center));
+
+            UpdateWireframeInstance(window);
+            Context.CoreModels!.Cylinder.Draw();
+        } else if (polygon is Trapezoid trapezoid) {
+            // For trapezoid, calculate center and size from the points array
+            Vector2 p0 = trapezoid.Points[0];
+            Vector2 p1 = trapezoid.Points[1];
+            Vector2 p2 = trapezoid.Points[2];
+            Vector2 p3 = trapezoid.Points[3];
+
+            // Calculate center of the trapezoid
+            Vector2 center2D = (p0 + p1 + p2 + p3) * 0.25f;
+            Vector3 center = new(center2D.X, center2D.Y, prism.Height.Min + (prism.Height.Max - prism.Height.Min) * 0.5f);
+
+            // Use range metadata for dimensions
+            float avgWidth = (range.Width + range.EndWidth) * 0.5f;
+            float distance = range.Distance;
+            float height = prism.Height.Max - prism.Height.Min;
+
+            // Calculate rotation from trapezoid points
+            Vector2 forward2D = Vector2.Normalize(p2 - p1);
+            float angleRad = MathF.Atan2(forward2D.Y, forward2D.X) - MathF.PI / 2; // Adjust for coordinate system
+
+            var rotation = Matrix4x4.CreateRotationZ(angleRad);
+            // Intentional visual approximation: uniform-width box using avgWidth instead of true start/end widths.
+            // This is a debug aid and does not reflect the actual trapezoidal collision shape.
+            instanceBuffer.Transformation = Matrix4x4.Transpose(
+                Matrix4x4.CreateScale(new Vector3(avgWidth, distance, height)) *
+                rotation *
+                Matrix4x4.CreateTranslation(center));
+
+            UpdateWireframeInstance(window);
+            Context.CoreModels!.WireCube.Draw();
+        } else {
+            // Fallback for other polygon types (e.g. Rectangle, HoleCircle).
+            // Derive the 2D center from the vertex average when the polygon is a Polygon subclass.
+            Vector2 center2D = Vector2.Zero;
+            if (polygon is Polygon genericPolygon && genericPolygon.Points.Length > 0) {
+                foreach (Vector2 p in genericPolygon.Points) {
+                    center2D += p;
+                }
+                center2D /= genericPolygon.Points.Length;
+            }
+            float height = prism.Height.Max - prism.Height.Min;
+            Vector3 center = new(center2D.X, center2D.Y, prism.Height.Min + (prism.Height.Max - prism.Height.Min) * 0.5f);
+
+            instanceBuffer.Transformation = Matrix4x4.Transpose(
+                Matrix4x4.CreateScale(new Vector3(100, 100, height)) *
+                Matrix4x4.CreateTranslation(center));
+
+            UpdateWireframeInstance(window);
+            Context.CoreModels!.WireCube.Draw();
+        }
+    }
 }

Maple2.Server.DebugGame/Graphics/Ui/Windows/VisualizationControlsWindow.cs

@@ -55,6 +55,7 @@ public void Render() {
             ImGui.Checkbox("Show Mobs", ref renderer.ShowMobs);
             ImGui.Unindent();
         }
+        ImGui.Checkbox("Show Skill Hitboxes", ref renderer.ShowSkillHitboxes);
         ImGui.Separator();
         ImGui.Text("Camera Controls:");
         if (ImGui.Button("Reset Camera")) {

Maple2.Server.Game/Commands/MobAttackCommand.cs

@@ -0,0 +1,72 @@
+using System.CommandLine;
+using System.CommandLine.Invocation;
+using System.CommandLine.IO;
+using Maple2.Model.Enum;
+using Maple2.Model.Metadata;
+using Maple2.Server.Game.Model;
+using Maple2.Server.Game.Session;
+
+namespace Maple2.Server.Game.Commands;
+
+public class MobAttackCommand : GameCommand {
+    private readonly GameSession session;
+
+    public MobAttackCommand(GameSession session) : base(AdminPermissions.Debug, "mob-attack", "Make first mob on map use a skill.") {
+        this.session = session;
+
+        var skillId = new Argument<int?>("skillId", () => null, "Skill id for the mob to use.");
+        var skillLevel = new Option<short>(["--level", "-l"], () => 1, "Skill level.");
+
+        AddArgument(skillId);
+        AddOption(skillLevel);
+        this.SetHandler<InvocationContext, int?, short>(Handle, skillId, skillLevel);
+    }
+
+    private void Handle(InvocationContext ctx, int? skillId, short skillLevel) {
+        if (session.Field is null) {
+            ctx.Console.Error.WriteLine("No field loaded.");
+            return;
+        }
+
+        // Find first mob on the map
+        FieldNpc? mob = session.Field.Mobs.Values.FirstOrDefault();
+        if (mob is null) {
+            ctx.Console.Error.WriteLine("No mobs found on the current map.");
+            return;
+        }
+
+        ctx.Console.Out.WriteLine($"Using mob: {mob.Value.Metadata.Name} (Id: {mob.Value.Metadata.Id}, ObjectId: {mob.ObjectId})");
+
+        // Check if mob has skills
+        NpcMetadataSkill.Entry[] entries = mob.Value.Metadata.Skill.Entries;
+        if (entries.Length == 0) {
+            ctx.Console.Error.WriteLine("This mob has no skills.");
+            return;
+        }
+
+        // If no skill id passed, list available skills grouped by id
+        if (skillId is null) {
+            ctx.Console.Out.WriteLine("Available skills:");
+            foreach (var group in entries.GroupBy(e => e.Id)) {
+                string levels = string.Join(", ", group.Select(e => e.Level));
+                ctx.Console.Out.WriteLine($"  SkillId: {group.Key} (Levels: {levels})");
+            }
+            return;
+        }
+
+        // Validate skill exists in metadata
+        if (!session.Field.SkillMetadata.TryGet(skillId.Value, skillLevel, out SkillMetadata? _)) {
+            ctx.Console.Error.WriteLine($"Skill {skillId.Value} level {skillLevel} not found in metadata.");
+            return;
+        }
+
+        // Warn if the mob does not own the skill in its own skill list
+        if (!entries.Any(e => e.Id == skillId.Value && e.Level == skillLevel)) {
+            ctx.Console.Out.WriteLine($"Warning: {mob.Value.Metadata.Name} does not have skill {skillId.Value} (level {skillLevel}) in its skill list. Casting anyway...");
+        }
+
+        // Cast the skill facing the player
+        mob.CastAiSkill(skillId.Value, skillLevel, faceTarget: 1, facePos: session.Player.Position);
+        ctx.Console.Out.WriteLine($"Mob {mob.Value.Metadata.Name} casting skill {skillId.Value} (level {skillLevel}).");
+    }
+}

Maple2.Server.Game/Commands/NpcCommand.cs

@@ -21,13 +21,15 @@ public NpcCommand(GameSession session, NpcMetadataStorage npcStorage) : base(Adm
 
         var id = new Argument<int>("id", "Id of npc to spawn.");
         var amount = new Option<int>(["--amount", "-a"], () => 1, "Amount of the npc.");
+        var noAi = new Option<bool>(["--no-ai"], () => false, "Spawn NPC without AI.");
 
         AddArgument(id);
         AddOption(amount);
-        this.SetHandler<InvocationContext, int, int>(Handle, id, amount);
+        AddOption(noAi);
+        this.SetHandler<InvocationContext, int, int, bool>(Handle, id, amount, noAi);
     }
 
-    private void Handle(InvocationContext ctx, int npcId, int amount) {
+    private void Handle(InvocationContext ctx, int npcId, int amount, bool noAi) {
         try {
             if (session.Field == null || !npcStorage.TryGet(npcId, out NpcMetadata? metadata)) {
                 ctx.Console.Error.WriteLine($"Invalid Npc: {npcId}");
@@ -46,7 +48,7 @@ private void Handle(InvocationContext ctx, int npcId, int amount) {
                     0 // Keep Z position the same
                 );
 
-                FieldNpc? fieldNpc = session.Field.SpawnNpc(metadata, spawnPosition, rotation);
+                FieldNpc? fieldNpc = session.Field.SpawnNpc(metadata, spawnPosition, rotation, disableAi: noAi);
                 if (fieldNpc == null) {
                     ctx.Console.Error.WriteLine($"Failed to spawn npc {i + 1}/{amount}: {npcId}");
                     continue;

Maple2.Server.Game/Manager/Field/FieldManager/FieldManager.State.cs

@@ -104,7 +104,7 @@ public FieldPlayer SpawnPlayer(GameSession session, Player player, int portalId
         return fieldPlayer;
     }
 
-    public FieldNpc? SpawnNpc(NpcMetadata npc, Vector3 position, Vector3 rotation, FieldMobSpawn? owner = null, SpawnPointNPC? spawnPointNpc = null, string spawnAnimation = "") {
+    public FieldNpc? SpawnNpc(NpcMetadata npc, Vector3 position, Vector3 rotation, bool disableAi = false, FieldMobSpawn? owner = null, SpawnPointNPC? spawnPointNpc = null, string spawnAnimation = "") {
         // Apply random offset if SpawnRadius is set
         Vector3 spawnPosition = position;
         if (spawnPointNpc?.SpawnRadius > 0) {
@@ -132,7 +132,8 @@ public FieldPlayer SpawnPlayer(GameSession session, Player player, int portalId
         DtCrowdAgent agent = Navigation.AddAgent(npc, spawnPosition);
 
         AnimationMetadata? animation = NpcMetadata.GetAnimation(npc.Model.Name);
-        var fieldNpc = new FieldNpc(this, NextLocalId(), agent, new Npc(npc, animation), npc.AiPath, patrolDataUUID: spawnPointNpc?.PatrolData, spawnAnimation: spawnAnimation) {
+        string aiPath = disableAi ? string.Empty : npc.AiPath;
+        var fieldNpc = new FieldNpc(this, NextLocalId(), agent, new Npc(npc, animation), aiPath, patrolDataUUID: spawnPointNpc?.PatrolData, spawnAnimation: spawnAnimation) {
             Owner = owner,
             Position = spawnPosition,
             Rotation = rotation,
@@ -150,7 +151,7 @@ public FieldPlayer SpawnPlayer(GameSession session, Player player, int portalId
     }
 
     public FieldNpc? SpawnNpc(NpcMetadata npc, SpawnPointNPC spawnPointNpc) {
-        return SpawnNpc(npc, spawnPointNpc.Position, spawnPointNpc.Rotation, null, spawnPointNpc);
+        return SpawnNpc(npc, spawnPointNpc.Position, spawnPointNpc.Rotation, disableAi: false, owner: null, spawnPointNpc: spawnPointNpc);
     }
 
     public FieldPet? SpawnPet(Item pet, Vector3 position, Vector3 rotation, FieldMobSpawn? owner = null, FieldPlayer? player = null) {

Maple2.Server.Game/Model/Field/Actor/Actor.cs

@@ -198,6 +198,8 @@ public virtual void TargetAttack(SkillRecord record) {
             return;
         }
 
+        // For NPC casts, ImpactPosition is never set (only comes from client packets), so fall back to caster position
+        Vector3 impactPosition = record.ImpactPosition.LengthSquared() > 0.001f ? record.ImpactPosition : Position;
         var damage = new DamageRecord(record.Metadata, record.Attack) {
             CasterId = record.Caster.ObjectId,
             TargetUid = record.TargetUid,
@@ -206,7 +208,7 @@ public virtual void TargetAttack(SkillRecord record) {
             Level = record.Level,
             AttackPoint = record.AttackPoint,
             MotionPoint = record.MotionPoint,
-            Position = record.ImpactPosition,
+            Position = impactPosition,
             Direction = record.Direction,
         };
 

Maple2.Server.Game/Model/Field/Actor/ActorStateComponent/MovementStateTasks/MovementState.SkillCastTask.cs

@@ -97,7 +97,7 @@ private void SkillCast(NpcSkillCastTask task, int id, short level, long uid, byt
             return;
         }
 
-        if (!actor.Animation.TryPlaySequence(cast.Motion.MotionProperty.SequenceName, cast.Motion.MotionProperty.SequenceSpeed, AnimationType.Skill, out AnimationSequenceMetadata? sequence)) {
+        if (!actor.Animation.TryPlaySequence(cast.Motion.MotionProperty.SequenceName, cast.Motion.MotionProperty.SequenceSpeed, AnimationType.Skill, out AnimationSequenceMetadata? sequence, skill: cast.Metadata)) {
             task.Cancel();
 
             return;

Maple2.Server.Game/Model/Field/Actor/ActorStateComponent/SkillState.cs

@@ -67,13 +67,12 @@ public void SkillCastAttack(SkillRecord cast, byte attackPoint, List<IActor> att
         }
 
         // Apply damage to targets server-side for NPC attacks
-        var resolvedTargets = new List<IActor>(attackTargets);
-        if (resolvedTargets.Count == 0) {
-            // Fallback: query targets from attack range
-            Maple2.Tools.Collision.Prism prism = attack.Range.GetPrism(actor.Position, actor.Rotation.Z);
-            foreach (IActor target in actor.Field.GetTargets(actor, new[] { prism }, attack.Range.ApplyTarget, attack.TargetCount)) {
-                resolvedTargets.Add(target);
-            }
+        // Always use the attack range prism to resolve targets so spatial checks are respected
+        Tools.Collision.Prism attackPrism = attack.Range.GetPrism(actor.Position, actor.Rotation.Z);
+        var resolvedTargets = new List<IActor>();
+        int queryLimit = attack.TargetCount > 0 ? attack.TargetCount : 1;
+        foreach (IActor target in actor.Field.GetTargets(actor, [attackPrism], attack.Range.ApplyTarget, queryLimit)) {
+            resolvedTargets.Add(target);
         }
 
         if (resolvedTargets.Count > 0) {

Maple2.Server.Game/Model/Skill/SkillQueue.cs

@@ -52,4 +52,18 @@ public void Clear() {
             casts[i] = null;
         }
     }
+
+    /// <summary>
+    /// Returns the most recently added non-null SkillRecord, or null if none exist.
+    /// </summary>
+    public SkillRecord? GetMostRecent() {
+        // Walk backwards from the last written index
+        for (int i = 0; i < MAX_PENDING; i++) {
+            int idx = (index - 1 - i + MAX_PENDING) % MAX_PENDING;
+            if (casts[idx] != null) {
+                return casts[idx];
+            }
+        }
+        return null;
+    }
 }

Maple2.Server.Game/PacketHandlers/RevivalHandler.cs

@@ -34,7 +34,7 @@ public override void Handle(GameSession session, IByteReader packet) {
     /// </summary>
     private void HandleSafeRevive(GameSession session) {
         if (session.Field is null) return;
-        if (session.Field.Metadata.Property.NoRevivalHere || session.Field.Metadata.Property.RevivalReturnId == 0) {
+        if (session.Field.Metadata.Property.NoRevivalHere) {
             return;
         }
         // Revive player - this will handle moving to spawn point