2 files changed, 48 insertions(+), 0 deletions(-)

M Core/NosSmooth.Game/Data/Entities/Npc.cs
M Core/NosSmooth.Game/PacketHandlers/Map/InResponder.cs

@@ 4,6 4,7 @@
 //  Copyright (c) František Boháček. All rights reserved.
 //  Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using NosSmooth.Data.Abstractions.Infos;
 using NosSmooth.Game.Data.Info;
 using NosSmooth.Packets.Enums;
 


@@ 15,6 16,11 @@ namespace NosSmooth.Game.Data.Entities;
 public class Npc : ILivingEntity
 {
     /// <summary>
+    /// Gets or sets the monster info.
+    /// </summary>
+    public IMonsterInfo? NpcInfo { get; set; }
+
+    /// <summary>
     /// Gets the VNum of the npc.
     /// </summary>
     public int VNum { get; internal set; }

@@ 15,6 15,7 @@ using NosSmooth.Game.Data.Social;
 using NosSmooth.Game.Events.Core;
 using NosSmooth.Game.Events.Entities;
 using NosSmooth.Game.Helpers;
+using NosSmooth.Packets.Enums;
 using NosSmooth.Packets.Server.Entities;
 using NosSmooth.Packets.Server.Maps;
 using Remora.Results;


@@ 83,6 84,11 @@ public class InResponder : IPacketResponder<InPacket>
         }
         if (packet.NonPlayerSubPacket is not null)
         {
+            if (packet.EntityType == EntityType.Npc)
+            {
+                return await CreateNpc(packet, packet.NonPlayerSubPacket, ct);
+            }
+
             return await CreateMonster(packet, packet.NonPlayerSubPacket, ct);
         }
 


@@ 163,6 169,42 @@ public class InResponder : IPacketResponder<InPacket>
         };
     }
 
+    private async Task<Npc> CreateNpc
+        (InPacket packet, InNonPlayerSubPacket nonPlayerSubPacket, CancellationToken ct)
+    {
+        if (packet.VNum is null)
+        {
+            throw new Exception("The vnum from the in packet cannot be null for monsters.");
+        }
+
+        var monsterInfoResult = await _infoService.GetMonsterInfoAsync(packet.VNum.Value, ct);
+        if (!monsterInfoResult.IsDefined(out var monsterInfo))
+        {
+            _logger.LogWarning
+            (
+                "Could not obtain a monster info for vnum {vnum}: {error}",
+                packet.VNum.Value,
+                monsterInfoResult.ToFullString()
+            );
+        }
+
+        return new Npc
+        {
+            VNum = packet.VNum.Value,
+            NpcInfo = monsterInfo,
+            Id = packet.EntityId,
+            Direction = packet.Direction,
+            Faction = nonPlayerSubPacket.Faction,
+            Hp = new Health { Percentage = nonPlayerSubPacket.HpPercentage },
+            Mp = new Health { Percentage = nonPlayerSubPacket.MpPercentage },
+            Name = nonPlayerSubPacket.Name?.Name,
+            Position = new Position(packet.PositionX, packet.PositionY),
+            IsInvisible = nonPlayerSubPacket.IsInvisible,
+            Level = monsterInfo?.Level ?? null,
+            IsSitting = nonPlayerSubPacket.IsSitting
+        };
+    }
+
     private async Task<Monster> CreateMonster
         (InPacket packet, InNonPlayerSubPacket nonPlayerSubPacket, CancellationToken ct)
     {