From 6df124413179825b09c8827cd7251d6d52e66183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Boh=C3=A1=C4=8Dek?= Date: Mon, 3 Jan 2022 21:02:32 +0100 Subject: [PATCH] fix: use new packets in game responders --- .../Data/Characters/Character.cs | 4 ++-- Core/NosSmooth.Game/Data/Entities/Player.cs | 4 ++-- Core/NosSmooth.Game/Data/Social/Family.cs | 2 +- .../Extensions/ServiceCollectionExtensions.cs | 4 +--- .../Characters/CharacterInitResponder.cs | 12 +++++------ .../Entities/SkillUsedResponder.cs | 20 ++++++++----------- 6 files changed, 20 insertions(+), 26 deletions(-) diff --git a/Core/NosSmooth.Game/Data/Characters/Character.cs b/Core/NosSmooth.Game/Data/Characters/Character.cs index 02fd2c2..fbd01aa 100644 --- a/Core/NosSmooth.Game/Data/Characters/Character.cs +++ b/Core/NosSmooth.Game/Data/Characters/Character.cs @@ -66,7 +66,7 @@ public record Character FactionType? Faction = default, short Size = default, AuthorityType AuthorityType = default, - SexType Gender = default, + SexType Sex = default, HairStyle HairStyle = default, HairColor HairColor = default, PlayerClass Class = default, @@ -89,7 +89,7 @@ public record Character Faction, Size, AuthorityType, - Gender, + Sex, HairStyle, HairColor, Class, diff --git a/Core/NosSmooth.Game/Data/Entities/Player.cs b/Core/NosSmooth.Game/Data/Entities/Player.cs index f7b27d4..274dded 100644 --- a/Core/NosSmooth.Game/Data/Entities/Player.cs +++ b/Core/NosSmooth.Game/Data/Entities/Player.cs @@ -24,7 +24,7 @@ namespace NosSmooth.Game.Data.Entities; /// /// /// -/// +/// /// /// /// @@ -47,7 +47,7 @@ public record Player FactionType? Faction = default, short Size = default, AuthorityType AuthorityType = default, - SexType Gender = default, + SexType Sex = default, HairStyle HairStyle = default, HairColor HairColor = default, PlayerClass Class = default, diff --git a/Core/NosSmooth.Game/Data/Social/Family.cs b/Core/NosSmooth.Game/Data/Social/Family.cs index 82e7515..32d1a40 100644 --- a/Core/NosSmooth.Game/Data/Social/Family.cs +++ b/Core/NosSmooth.Game/Data/Social/Family.cs @@ -12,4 +12,4 @@ namespace NosSmooth.Game.Data.Social; /// The id of the family. /// The name of the family. /// The level of the entity. -public record Family(string? Id, string? Name, byte Level); \ No newline at end of file +public record Family(string? Id, string? Name, byte? Level); \ No newline at end of file diff --git a/Core/NosSmooth.Game/Extensions/ServiceCollectionExtensions.cs b/Core/NosSmooth.Game/Extensions/ServiceCollectionExtensions.cs index 5a2903a..ac19b42 100644 --- a/Core/NosSmooth.Game/Extensions/ServiceCollectionExtensions.cs +++ b/Core/NosSmooth.Game/Extensions/ServiceCollectionExtensions.cs @@ -11,7 +11,6 @@ using NosSmooth.Game.Apis; using NosSmooth.Game.Events.Core; using NosSmooth.Game.PacketHandlers.Characters; using NosSmooth.Game.PacketHandlers.Entities; -using NosSmooth.Game.PacketHandlers.Login; namespace NosSmooth.Game.Extensions; @@ -37,8 +36,7 @@ public static class ServiceCollectionExtensions .AddPacketResponder() .AddPacketResponder() .AddPacketResponder() - .AddPacketResponder() - .AddPacketResponder(); + .AddPacketResponder(); serviceCollection .AddTransient() diff --git a/Core/NosSmooth.Game/PacketHandlers/Characters/CharacterInitResponder.cs b/Core/NosSmooth.Game/PacketHandlers/Characters/CharacterInitResponder.cs index 05fa252..5ad9402 100644 --- a/Core/NosSmooth.Game/PacketHandlers/Characters/CharacterInitResponder.cs +++ b/Core/NosSmooth.Game/PacketHandlers/Characters/CharacterInitResponder.cs @@ -44,21 +44,21 @@ public class CharacterInitResponder : IPacketResponder, IPacketResp { _game.Character = character = character with { - /*Id = packet.CharacterId, + Id = packet.CharacterId, AuthorityType = packet.Authority, - Gender = packet.Gender, + Sex = packet.Sex, HairStyle = packet.HairStyle, HairColor = packet.HairColor, Class = packet.Class, Icon = packet.Icon, Compliment = packet.Compliment, - Morph = (character.Morph ?? new Morph(packet.Morph, packet.MorphUpgrade)) with + Morph = (character.Morph ?? new Morph(packet.MorphVNum, packet.MorphUpgrade)) with { - VNum = packet.Morph, Upgrade = packet.MorphUpgrade + VNum = packet.MorphVNum, Upgrade = packet.MorphUpgrade }, ArenaWinner = packet.ArenaWinner, - Invisible = packet.Invisible, - Family = new Family(packet.FamilyId, packet.FamilyName, packet.FamilyLevel)*/ + Invisible = packet.IsInvisible, + Family = new Family(packet.FamilyId, packet.FamilyName, packet.FamilyLevel) }; } diff --git a/Core/NosSmooth.Game/PacketHandlers/Entities/SkillUsedResponder.cs b/Core/NosSmooth.Game/PacketHandlers/Entities/SkillUsedResponder.cs index 5b78561..1da0790 100644 --- a/Core/NosSmooth.Game/PacketHandlers/Entities/SkillUsedResponder.cs +++ b/Core/NosSmooth.Game/PacketHandlers/Entities/SkillUsedResponder.cs @@ -11,6 +11,7 @@ using NosSmooth.Game.Events.Core; using NosSmooth.Game.Events.Players; using NosSmooth.Game.Extensions; using NosSmooth.Packets.Enums; +using NosSmooth.Packets.Packets.Server.Battle; using NosSmooth.Packets.Packets.Server.Skills; using Remora.Results; @@ -41,14 +42,9 @@ public class SkillUsedResponder : IPacketResponder, IPacketResponder, IPacketResponder, IPacketResponder