diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 00000000..eb542529 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,38 @@ +version: 2 +jobs: + build: + docker: + - image: microsoft/dotnet:2.2-sdk-alpine + steps: + - checkout + - run: + name: Build solution + command : | + dotnet restore + dotnet build + test_unit_testing: + docker: + - image: microsoft/dotnet:2.2-sdk-alpine + steps: + - checkout + - run: + name: Run tests on ChickenAPI.Packets + command : echo "todo" + test_code_quality: + docker: + - image: microsoft/dotnet:2.2-sdk-alpine + steps: + - run: + name: Test Code Quality + command : echo "todo" +workflows: + version: 2 + build_and_test: + jobs: + - build + - test_unit_testing: + requires: + - build + - test_code_quality: + requires: + - build diff --git a/SaltyEmu.sln b/SaltyEmu.sln index c252cdf3..508fdaa8 100644 --- a/SaltyEmu.sln +++ b/SaltyEmu.sln @@ -21,12 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SaltyEmu.BasicAlgorithmPlug EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChickenAPI.Game", "src\ChickenAPI.Game\ChickenAPI.Game.csproj", "{34BBD274-3133-4894-8776-783731D126BC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChickenAPI.Core", "src\ChickenAPI.Core\ChickenAPI.Core.csproj", "{3DC7543A-221A-4491-962C-C1E04A24F69F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChickenAPI.Packets", "src\ChickenAPI.Packets\ChickenAPI.Packets.csproj", "{C376CC67-DA69-4509-B2CF-D84077157055}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChickenAPI.Enums", "src\ChickenAPI.Enums\ChickenAPI.Enums.csproj", "{2C706520-AA6F-45FA-910F-DCDD42C52192}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Toolkit", "src\Toolkit\Toolkit.csproj", "{5F14B226-7842-4F6E-BE2E-1CC01C530F3B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SaltyEmu.PathfinderPlugin", "src\Plugins\NosSharp.Pathfinder\SaltyEmu.PathfinderPlugin.csproj", "{48D59236-CC25-497E-A98D-DAB290E4A8B7}" @@ -37,8 +31,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SaltyEmu.Communication", "s EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChickenAPI.Data", "src\ChickenAPI.Data\ChickenAPI.Data.csproj", "{548F9115-2EF6-4B73-B224-5CEB8D7F4276}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChickenAPI.Game.Test", "test\ChickenAPI.Game.Test\ChickenAPI.Game.Test.csproj", "{0C47ED85-6577-4338-9976-8A2B00016609}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{7A642CDF-7BF0-4D43-B5CB-430FC64A32D1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SaltyEmu.FamilyService", "src\services\SaltyEmu.FamilyService\SaltyEmu.FamilyService.csproj", "{61CDB363-EC3A-47AA-A5CA-ABB4BCE2CC85}" @@ -73,9 +65,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SaltyEmu", "SaltyEmu", "{9F EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SaltyEmu.InventoryService", "src\services\SaltyEmu.InventoryService\SaltyEmu.InventoryService.csproj", "{45C3099C-13FB-47C1-94A8-074445608329}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SaltyEmu.CharacterSkillService", "src\services\SaltyEmu.CharacterSkillService\SaltyEmu.CharacterSkillService.csproj", "{7D0D4B40-86E2-436F-BC57-5CA8A7E16D2F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SaltyEmu.CharacterSkillService", "src\services\SaltyEmu.CharacterSkillService\SaltyEmu.CharacterSkillService.csproj", "{7D0D4B40-86E2-436F-BC57-5CA8A7E16D2F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SaltyEmu.Database.MongoDB", "src\libs\SaltyEmu.Database.MongoDB\SaltyEmu.Database.MongoDB.csproj", "{48886586-562B-4CE6-B105-3F231FE6C97E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SaltyEmu.Database.MongoDB", "src\libs\SaltyEmu.Database.MongoDB\SaltyEmu.Database.MongoDB.csproj", "{48886586-562B-4CE6-B105-3F231FE6C97E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChickenAPI.Game.Impl", "src\ChickenAPI.Game.Impl\ChickenAPI.Game.Impl.csproj", "{E5F9DC97-664E-42B5-B68F-F93AC4019051}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -115,18 +109,6 @@ Global {34BBD274-3133-4894-8776-783731D126BC}.Debug|Any CPU.Build.0 = Debug|Any CPU {34BBD274-3133-4894-8776-783731D126BC}.Release|Any CPU.ActiveCfg = Release|Any CPU {34BBD274-3133-4894-8776-783731D126BC}.Release|Any CPU.Build.0 = Release|Any CPU - {3DC7543A-221A-4491-962C-C1E04A24F69F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3DC7543A-221A-4491-962C-C1E04A24F69F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3DC7543A-221A-4491-962C-C1E04A24F69F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3DC7543A-221A-4491-962C-C1E04A24F69F}.Release|Any CPU.Build.0 = Release|Any CPU - {C376CC67-DA69-4509-B2CF-D84077157055}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C376CC67-DA69-4509-B2CF-D84077157055}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C376CC67-DA69-4509-B2CF-D84077157055}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C376CC67-DA69-4509-B2CF-D84077157055}.Release|Any CPU.Build.0 = Release|Any CPU - {2C706520-AA6F-45FA-910F-DCDD42C52192}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C706520-AA6F-45FA-910F-DCDD42C52192}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C706520-AA6F-45FA-910F-DCDD42C52192}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C706520-AA6F-45FA-910F-DCDD42C52192}.Release|Any CPU.Build.0 = Release|Any CPU {5F14B226-7842-4F6E-BE2E-1CC01C530F3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5F14B226-7842-4F6E-BE2E-1CC01C530F3B}.Debug|Any CPU.Build.0 = Debug|Any CPU {5F14B226-7842-4F6E-BE2E-1CC01C530F3B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -143,10 +125,6 @@ Global {548F9115-2EF6-4B73-B224-5CEB8D7F4276}.Debug|Any CPU.Build.0 = Debug|Any CPU {548F9115-2EF6-4B73-B224-5CEB8D7F4276}.Release|Any CPU.ActiveCfg = Release|Any CPU {548F9115-2EF6-4B73-B224-5CEB8D7F4276}.Release|Any CPU.Build.0 = Release|Any CPU - {0C47ED85-6577-4338-9976-8A2B00016609}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C47ED85-6577-4338-9976-8A2B00016609}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C47ED85-6577-4338-9976-8A2B00016609}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C47ED85-6577-4338-9976-8A2B00016609}.Release|Any CPU.Build.0 = Release|Any CPU {61CDB363-EC3A-47AA-A5CA-ABB4BCE2CC85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {61CDB363-EC3A-47AA-A5CA-ABB4BCE2CC85}.Debug|Any CPU.Build.0 = Debug|Any CPU {61CDB363-EC3A-47AA-A5CA-ABB4BCE2CC85}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -207,6 +185,10 @@ Global {48886586-562B-4CE6-B105-3F231FE6C97E}.Debug|Any CPU.Build.0 = Debug|Any CPU {48886586-562B-4CE6-B105-3F231FE6C97E}.Release|Any CPU.ActiveCfg = Release|Any CPU {48886586-562B-4CE6-B105-3F231FE6C97E}.Release|Any CPU.Build.0 = Release|Any CPU + {E5F9DC97-664E-42B5-B68F-F93AC4019051}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E5F9DC97-664E-42B5-B68F-F93AC4019051}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E5F9DC97-664E-42B5-B68F-F93AC4019051}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E5F9DC97-664E-42B5-B68F-F93AC4019051}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -218,13 +200,9 @@ Global {45E04475-DFC4-400A-9D35-44BAF5180ACD} = {7A7E9A02-CEFC-4E77-A495-70804348CA47} {28B389E6-9863-4306-B32E-756A2C6D9E99} = {7A7E9A02-CEFC-4E77-A495-70804348CA47} {34BBD274-3133-4894-8776-783731D126BC} = {88C85787-06D8-4E6D-9E87-38FCFD2F6CB0} - {3DC7543A-221A-4491-962C-C1E04A24F69F} = {88C85787-06D8-4E6D-9E87-38FCFD2F6CB0} - {C376CC67-DA69-4509-B2CF-D84077157055} = {88C85787-06D8-4E6D-9E87-38FCFD2F6CB0} - {2C706520-AA6F-45FA-910F-DCDD42C52192} = {88C85787-06D8-4E6D-9E87-38FCFD2F6CB0} {48D59236-CC25-497E-A98D-DAB290E4A8B7} = {7A7E9A02-CEFC-4E77-A495-70804348CA47} {AA0972AB-A59A-4EB7-AF5A-B31F61D25644} = {9FEA092D-17C0-4EAA-8D15-40A0CF3B0699} {548F9115-2EF6-4B73-B224-5CEB8D7F4276} = {88C85787-06D8-4E6D-9E87-38FCFD2F6CB0} - {0C47ED85-6577-4338-9976-8A2B00016609} = {4E7156D8-18DC-4638-9C9B-5BE5CFF76F13} {61CDB363-EC3A-47AA-A5CA-ABB4BCE2CC85} = {7A642CDF-7BF0-4D43-B5CB-430FC64A32D1} {A0DBCE58-3322-4539-BEAF-D9B577CBF3CF} = {7A7E9A02-CEFC-4E77-A495-70804348CA47} {9746EFA1-B25D-4945-A25C-3A960ACF2262} = {7A642CDF-7BF0-4D43-B5CB-430FC64A32D1} @@ -242,6 +220,7 @@ Global {45C3099C-13FB-47C1-94A8-074445608329} = {7A642CDF-7BF0-4D43-B5CB-430FC64A32D1} {7D0D4B40-86E2-436F-BC57-5CA8A7E16D2F} = {7A642CDF-7BF0-4D43-B5CB-430FC64A32D1} {48886586-562B-4CE6-B105-3F231FE6C97E} = {9FEA092D-17C0-4EAA-8D15-40A0CF3B0699} + {E5F9DC97-664E-42B5-B68F-F93AC4019051} = {88C85787-06D8-4E6D-9E87-38FCFD2F6CB0} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {33B1EC1B-965D-4770-B047-390647E82322} diff --git a/docs/started.md b/docs/started.md index 48af21a2..840fa4b9 100644 --- a/docs/started.md +++ b/docs/started.md @@ -53,7 +53,7 @@ Use [SSMS](https://docs.microsoft.com/en-us/sql/ssms/download-sql-server-managem ## Fill your database data with the toolkit -Pull the following [repository](https://gitlab.com/SaltyNos/Server/parsing) +Pull the following [Parsing repository](https://github.com/BlowaXD/nostale-parsing) ### /!\ ACHTUNG ! /!\ #### RUN THAT COMMAND IN YOUR TERMINAL (CMD / POWERSHELL / SHELL / BASH) diff --git a/src/ChickenAPI.Core/ChickenAPI.Core.csproj b/src/ChickenAPI.Core/ChickenAPI.Core.csproj deleted file mode 100644 index 5131dc0d..00000000 --- a/src/ChickenAPI.Core/ChickenAPI.Core.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - netstandard2.0 - latest - - - - - - - - - - - C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.netcore.app\2.0.0\ref\netcoreapp2.0\System.Reflection.Emit.ILGeneration.dll - - - C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.netcore.app\2.0.0\ref\netcoreapp2.0\System.Reflection.Emit.Lightweight.dll - - - - diff --git a/src/ChickenAPI.Core/Events/BasicEventPipelineAsync.cs b/src/ChickenAPI.Core/Events/BasicEventPipelineAsync.cs deleted file mode 100644 index 090c4ebe..00000000 --- a/src/ChickenAPI.Core/Events/BasicEventPipelineAsync.cs +++ /dev/null @@ -1,96 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; -using ChickenAPI.Core.Logging; - -namespace ChickenAPI.Core.Events -{ - public class BasicEventPipelineAsync : IEventPipeline - { - private static readonly Logger Log = Logger.GetLogger(); - private readonly Dictionary> _postprocessorsDictionary = new Dictionary>(); - private readonly Dictionary> _preprocessorsDictionary = new Dictionary>(); - - public async Task Notify(TNotification notification, CancellationToken cancellationToken = default) where TNotification : IEventNotification - { - if (!_postprocessorsDictionary.TryGetValue(typeof(TNotification), out List processors)) - { - return; - } - - if (!await CanSendEvent(notification, typeof(TNotification), cancellationToken)) - { - return; - } - - foreach (IEventPostProcessor postProcessor in processors) - { - try - { - await postProcessor.Handle(notification, cancellationToken); - } - catch (Exception e) - { - Log.Error("Notify()", e); - } - } - } - - public Task RegisterPreprocessorAsync(IEventPreprocessor preprocessor) where T : IEventNotification => RegisterPreprocessorAsync(preprocessor, typeof(T)); - - public Task RegisterPreprocessorAsync(IEventPreprocessor preprocessor, Type type) - { - if (!_preprocessorsDictionary.TryGetValue(type, out List handlers)) - { - handlers = new List(); - _preprocessorsDictionary[type] = handlers; - } - - handlers.Add(preprocessor); - return Task.CompletedTask; - } - - public Task UnregisterPreprocessorAsync(IEventPreprocessor preprocessor) where T : IEventNotification => UnregisterPreprocessorAsync(preprocessor, typeof(T)); - - public Task UnregisterPreprocessorAsync(IEventPreprocessor preprocessor, Type type) => Task.CompletedTask; - - public Task RegisterPostProcessorAsync(IEventPostProcessor postProcessor, Type type) - { - if (!_postprocessorsDictionary.TryGetValue(type, out List handlers)) - { - handlers = new List(); - _postprocessorsDictionary[type] = handlers; - } - - handlers.Add(postProcessor); - return Task.CompletedTask; - } - - public Task RegisterPostProcessorAsync(IEventPostProcessor postProcessor) where T : IEventNotification => RegisterPostProcessorAsync(postProcessor, typeof(T)); - - public Task UnregisterPostprocessorAsync(IEventPostProcessor preprocessor) where T : IEventNotification => UnregisterPostprocessorAsync(preprocessor, typeof(T)); - - public Task UnregisterPostprocessorAsync(IEventPostProcessor postProcessor, Type type) => Task.CompletedTask; - - - private async Task CanSendEvent(IEventNotification e, Type type, CancellationToken cancellationToken) - { - if (!_preprocessorsDictionary.TryGetValue(type, out List filters)) - { - return true; - } - - foreach (IEventPreprocessor filter in filters) - { - // filter is not passed correctly - if (await filter.Handle(e, cancellationToken) == false) - { - return false; - } - } - - return true; - } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/Events/ChickenEvent.cs b/src/ChickenAPI.Core/Events/ChickenEvent.cs deleted file mode 100644 index b41dca1f..00000000 --- a/src/ChickenAPI.Core/Events/ChickenEvent.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace ChickenAPI.Core.Events -{ - public class ChickenEvent : EventArgs, IEventNotification - { - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/Events/GenericEventPostProcessorBase.cs b/src/ChickenAPI.Core/Events/GenericEventPostProcessorBase.cs deleted file mode 100644 index 10b6f6c3..00000000 --- a/src/ChickenAPI.Core/Events/GenericEventPostProcessorBase.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Threading; -using System.Threading.Tasks; -using ChickenAPI.Core.Logging; - -namespace ChickenAPI.Core.Events -{ - public abstract class GenericEventPostProcessorBase : IEventPostProcessor where TNotification : IEventNotification - { - protected readonly Logger Log = Logger.GetLogger($"[HANDLER:({typeof(TNotification)})]"); - public Type Type => typeof(TNotification); - - public Task Handle(IEventNotification notification, CancellationToken cancellation) - { - if (notification is TNotification typedNotification) - { - return Handle(typedNotification, cancellation); - } - - return Task.CompletedTask; - } - - protected abstract Task Handle(TNotification e, CancellationToken cancellation); - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/Events/IEventNotification.cs b/src/ChickenAPI.Core/Events/IEventNotification.cs deleted file mode 100644 index c4479826..00000000 --- a/src/ChickenAPI.Core/Events/IEventNotification.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace ChickenAPI.Core.Events -{ - /// - /// Interface for every type of event notification - /// - public interface IEventNotification - { - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/Events/IEventPipeline.cs b/src/ChickenAPI.Core/Events/IEventPipeline.cs deleted file mode 100644 index d2ad0115..00000000 --- a/src/ChickenAPI.Core/Events/IEventPipeline.cs +++ /dev/null @@ -1,80 +0,0 @@ -using System; -using System.Threading; -using System.Threading.Tasks; - -namespace ChickenAPI.Core.Events -{ - public interface IEventPipeline - { - /// - /// Asynchronously send a notification to handlers of type T - /// - /// Notification object - /// Optional cancellation token - /// A task that represents the publish operation. - Task Notify(TNotification notification, CancellationToken cancellationToken = default) where TNotification : IEventNotification; - - - /// - /// Asynchronously registers a preprocessor in the pipeline for events of type - /// - /// - /// - /// - Task RegisterPreprocessorAsync(IEventPreprocessor preprocessor) where T : IEventNotification; - - /// - /// Asynchronously registers a filter in filters in piepline for event of the given type - /// - /// - /// - Task RegisterPreprocessorAsync(IEventPreprocessor preprocessor, Type type); - - /// - /// Asynchronously unregisters the preprocessor for handled type from the pipeline - /// - /// - /// - Task UnregisterPreprocessorAsync(IEventPreprocessor preprocessor) where T : IEventNotification; - - /// - /// Asynchronously unregisters the preprocessor from the pipeline - /// - /// - /// - /// - Task UnregisterPreprocessorAsync(IEventPreprocessor preprocessor, Type type); - - - /// - /// Asynchronously registers a PostProcessor (aka Handler) in the pipeline for events of type - /// - /// - /// - /// Type of event handled by the post processor - /// - Task RegisterPostProcessorAsync(IEventPostProcessor postProcessor, Type type); - - /// - /// Asynchronously registers a PostProcessor (aka Handler) in the pipeline for events of type - /// - /// - /// - /// - Task RegisterPostProcessorAsync(IEventPostProcessor postProcessor) where T : IEventNotification; - - /// - /// Asynchronously unregisters the postprocessor for handled type from the pipeline - /// - /// - /// - Task UnregisterPostprocessorAsync(IEventPostProcessor preprocessor) where T : IEventNotification; - - /// - /// Asynchronously unregisters the postprocessor from the pipeline - /// - /// - /// - Task UnregisterPostprocessorAsync(IEventPostProcessor postProcessor, Type type); - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/Events/IEventPostProcessor.cs b/src/ChickenAPI.Core/Events/IEventPostProcessor.cs deleted file mode 100644 index 5cf82422..00000000 --- a/src/ChickenAPI.Core/Events/IEventPostProcessor.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Threading; -using System.Threading.Tasks; - -namespace ChickenAPI.Core.Events -{ - /// - /// Defines a handler for any type of notification - /// - public interface IEventPostProcessor - { - Task Handle(IEventNotification notification, CancellationToken cancellation); - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/Events/IEventPreprocessor.cs b/src/ChickenAPI.Core/Events/IEventPreprocessor.cs deleted file mode 100644 index 30a9f00f..00000000 --- a/src/ChickenAPI.Core/Events/IEventPreprocessor.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Threading; -using System.Threading.Tasks; - -namespace ChickenAPI.Core.Events -{ - public interface IEventPreprocessor - { - /// - /// Handles the preprocessor - /// - /// - /// - /// - Task Handle(IEventNotification notification, CancellationToken token); - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/IPC/IIpcClient.cs b/src/ChickenAPI.Core/IPC/IIpcClient.cs deleted file mode 100644 index 50cc5847..00000000 --- a/src/ChickenAPI.Core/IPC/IIpcClient.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Threading.Tasks; -using ChickenAPI.Core.IPC.Protocol; - -namespace ChickenAPI.Core.IPC -{ - public interface IIpcClient - { - Task RequestAsync(IIpcRequest request) where T : class, IIpcResponse; - Task BroadcastAsync(T packet) where T : IIpcPacket; - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/IPC/IIpcPacketHandler.cs b/src/ChickenAPI.Core/IPC/IIpcPacketHandler.cs deleted file mode 100644 index bfb9f7fb..00000000 --- a/src/ChickenAPI.Core/IPC/IIpcPacketHandler.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Threading.Tasks; -using ChickenAPI.Core.IPC.Protocol; - -namespace ChickenAPI.Core.IPC -{ - public interface IIpcPacketHandler - { - Task Handle(IIpcPacket packet); - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/IPC/IIpcPacketHandlersContainer.cs b/src/ChickenAPI.Core/IPC/IIpcPacketHandlersContainer.cs deleted file mode 100644 index 8810b8db..00000000 --- a/src/ChickenAPI.Core/IPC/IIpcPacketHandlersContainer.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Threading.Tasks; -using ChickenAPI.Core.IPC.Protocol; - -namespace ChickenAPI.Core.IPC -{ - public interface IIpcPacketHandlersContainer - { - event EventHandler Registered; - event EventHandler Unregistered; - Task RegisterAsync(IIpcPacketHandler handler, Type type); - - Task UnregisterAsync(Type type); - Task HandleAsync(IIpcPacket request, Type type); - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/IPC/IIpcPacketRouter.cs b/src/ChickenAPI.Core/IPC/IIpcPacketRouter.cs deleted file mode 100644 index f28a016e..00000000 --- a/src/ChickenAPI.Core/IPC/IIpcPacketRouter.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Threading.Tasks; - -namespace ChickenAPI.Core.IPC -{ - public interface IIpcPacketRouter - { - /// - /// Will register and generate the default routing informations related to Router's configuration - /// - /// - /// - Task RegisterAsync(Type type); - - /// - /// Will register the packet routing information for a given type - /// - /// - /// - /// - Task RegisterAsync(Type type, IRoutingInformation routingInformation); - - /// - /// Get the routing informations from the router - /// re - /// - /// - /// - Task GetRoutingInformationsAsync(Type type); - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/IPC/IIpcServer.cs b/src/ChickenAPI.Core/IPC/IIpcServer.cs deleted file mode 100644 index dcbbfc4f..00000000 --- a/src/ChickenAPI.Core/IPC/IIpcServer.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using System.Threading.Tasks; -using ChickenAPI.Core.IPC.Protocol; - -namespace ChickenAPI.Core.IPC -{ - public interface IIpcServer - { - Task ResponseAsync(T response, Type requestType) where T : IIpcResponse; - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/IPC/IRoutingInformation.cs b/src/ChickenAPI.Core/IPC/IRoutingInformation.cs deleted file mode 100644 index 15a893f4..00000000 --- a/src/ChickenAPI.Core/IPC/IRoutingInformation.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace ChickenAPI.Core.IPC -{ - public interface IRoutingInformation - { - string IncomingTopic { get; } - string OutgoingTopic { get; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/IPC/IRoutingInformationFactory.cs b/src/ChickenAPI.Core/IPC/IRoutingInformationFactory.cs deleted file mode 100644 index cb6f34bf..00000000 --- a/src/ChickenAPI.Core/IPC/IRoutingInformationFactory.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Threading.Tasks; - -namespace ChickenAPI.Core.IPC -{ - public interface IRoutingInformationFactory - { - Task Create(string topic, string responseTopic); - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/IPC/Protocol/IIpcPacket.cs b/src/ChickenAPI.Core/IPC/Protocol/IIpcPacket.cs deleted file mode 100644 index 7cb9d33a..00000000 --- a/src/ChickenAPI.Core/IPC/Protocol/IIpcPacket.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; - -namespace ChickenAPI.Core.IPC.Protocol -{ - public interface IIpcPacket - { - Guid Id { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/IPC/Protocol/IIpcRequest.cs b/src/ChickenAPI.Core/IPC/Protocol/IIpcRequest.cs deleted file mode 100644 index b0a757d7..00000000 --- a/src/ChickenAPI.Core/IPC/Protocol/IIpcRequest.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Threading.Tasks; - -namespace ChickenAPI.Core.IPC.Protocol -{ - public interface IIpcRequest : IIpcPacket - { - Task ReplyAsync(T response) where T : IIpcResponse; - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/IPC/Protocol/IIpcResponse.cs b/src/ChickenAPI.Core/IPC/Protocol/IIpcResponse.cs deleted file mode 100644 index 0ddd852c..00000000 --- a/src/ChickenAPI.Core/IPC/Protocol/IIpcResponse.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; - -namespace ChickenAPI.Core.IPC.Protocol -{ - public interface IIpcResponse : IIpcPacket - { - Guid RequestId { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/IoC/ChickenContainer.cs b/src/ChickenAPI.Core/IoC/ChickenContainer.cs deleted file mode 100644 index 325a02ab..00000000 --- a/src/ChickenAPI.Core/IoC/ChickenContainer.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Autofac; - -namespace ChickenAPI.Core.IoC -{ - public static class ChickenContainer - { - public static ContainerBuilder Builder = new ContainerBuilder(); - - public static IContainer Instance { get; private set; } - - public static void Initialize() - { - Instance = Builder.Build(); - } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/IoC/ServiceFactory.cs b/src/ChickenAPI.Core/IoC/ServiceFactory.cs deleted file mode 100644 index 93cc2455..00000000 --- a/src/ChickenAPI.Core/IoC/ServiceFactory.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace ChickenAPI.Core.IoC -{ - /// - /// Factory method used to resolve all services. For multiple instances, it will resolve against - /// - /// - /// Type of service to resolve - /// An instance of type - public delegate object ServiceFactory(Type serviceType); -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/IoC/ServiceFactoryExtensions.cs b/src/ChickenAPI.Core/IoC/ServiceFactoryExtensions.cs deleted file mode 100644 index 1094be99..00000000 --- a/src/ChickenAPI.Core/IoC/ServiceFactoryExtensions.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Collections.Generic; - -namespace ChickenAPI.Core.IoC -{ - public static class ServiceFactoryExtensions - { - public static T GetInstance(this ServiceFactory factory) - => (T)factory(typeof(T)); - - public static IEnumerable GetInstances(this ServiceFactory factory) - => (IEnumerable)factory(typeof(IEnumerable)); - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/Maths/IRandomGenerator.cs b/src/ChickenAPI.Core/Maths/IRandomGenerator.cs deleted file mode 100644 index c8099d38..00000000 --- a/src/ChickenAPI.Core/Maths/IRandomGenerator.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace ChickenAPI.Core.Maths -{ - public interface IRandomGenerator - { - int Next(int min, int max); - - int Next(int max); - - double Next(); - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/Maths/RandomGenerator.cs b/src/ChickenAPI.Core/Maths/RandomGenerator.cs deleted file mode 100644 index c50cbe47..00000000 --- a/src/ChickenAPI.Core/Maths/RandomGenerator.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Security.Cryptography; - -namespace ChickenAPI.Core.Maths -{ - public class RandomGenerator : IRandomGenerator - { - public RandomGenerator() => RngProvider = new RNGCryptoServiceProvider(); - - private RNGCryptoServiceProvider RngProvider { get; } - - public int Next(int min, int max) => (int)Math.Floor(min + ((double)max - min) * Next()); - - public int Next(int max) => Next(0, max); - - public double Next() - { - byte[] bytes = new byte[sizeof(uint)]; - GetBytes(bytes); - - uint rnd = BitConverter.ToUInt32(bytes, 0); - - return rnd / (uint.MaxValue + 1.0); - } - - private void GetBytes(byte[] data) - { - RngProvider.GetBytes(data); - } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/Plugins/Exceptions/CriticalPluginException.cs b/src/ChickenAPI.Core/Plugins/Exceptions/CriticalPluginException.cs deleted file mode 100644 index 75826990..00000000 --- a/src/ChickenAPI.Core/Plugins/Exceptions/CriticalPluginException.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace ChickenAPI.Core.Plugins.Exceptions -{ - /// - /// This exception should be thrown only if you need to stop the software - /// - public class CriticalPluginException : PluginException - { - public CriticalPluginException(IPlugin plugin, string message = "Critical Plugin Exception") : base($"[{plugin.Name}] {message}") => Plugin = plugin; - - public IPlugin Plugin { get; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/Plugins/Exceptions/PluginException.cs b/src/ChickenAPI.Core/Plugins/Exceptions/PluginException.cs deleted file mode 100644 index ee4bf6b4..00000000 --- a/src/ChickenAPI.Core/Plugins/Exceptions/PluginException.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace ChickenAPI.Core.Plugins.Exceptions -{ - public class PluginException : Exception - { - public PluginException(string message) : base(message) - { - } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/Plugins/IPlugin.cs b/src/ChickenAPI.Core/Plugins/IPlugin.cs deleted file mode 100644 index ee044d30..00000000 --- a/src/ChickenAPI.Core/Plugins/IPlugin.cs +++ /dev/null @@ -1,31 +0,0 @@ -namespace ChickenAPI.Core.Plugins -{ - public interface IPlugin - { - PluginEnableTime EnableTime { get; } - - /// - /// Name of the plugin - /// - string Name { get; } - - /// - /// Called when this plugin is disabled - /// - void OnDisable(); - - /// - /// Called when this plugin is enabled - /// - void OnEnable(); - - /// - /// Called when this plugin is loaded but before it has been enabled - /// - void OnLoad(); - - void ReloadConfig(); - void SaveConfig(); - void SaveDefaultConfig(); - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/Plugins/IPluginConfiguration.cs b/src/ChickenAPI.Core/Plugins/IPluginConfiguration.cs deleted file mode 100644 index b6ff0bce..00000000 --- a/src/ChickenAPI.Core/Plugins/IPluginConfiguration.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.IO; - -namespace ChickenAPI.Core.Plugins -{ - public interface IPluginConfiguration - { - void Load(FileInfo file); - void Load(string filePath); - - void Save(FileInfo file); - void Save(string filePath); - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/Plugins/IPluginManager.cs b/src/ChickenAPI.Core/Plugins/IPluginManager.cs deleted file mode 100644 index a305d404..00000000 --- a/src/ChickenAPI.Core/Plugins/IPluginManager.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.IO; - -namespace ChickenAPI.Core.Plugins -{ - public interface IPluginManager - { - IPlugin[] LoadPlugin(FileInfo file); - IPlugin[] LoadPlugins(DirectoryInfo directory); - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/Plugins/PluginEnableTime.cs b/src/ChickenAPI.Core/Plugins/PluginEnableTime.cs deleted file mode 100644 index 8cdc2b5f..00000000 --- a/src/ChickenAPI.Core/Plugins/PluginEnableTime.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace ChickenAPI.Core.Plugins -{ - public enum PluginEnableTime - { - PreContainerBuild, - PostContainerBuild - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/Utils/AssemblyExtensions.cs b/src/ChickenAPI.Core/Utils/AssemblyExtensions.cs deleted file mode 100644 index 67d7e079..00000000 --- a/src/ChickenAPI.Core/Utils/AssemblyExtensions.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; - -namespace ChickenAPI.Core.Utils -{ - public static class AssemblyExtensions - { - public static bool IsSubclassOfRawGeneric(Type generic, Type toCheck) - { - if (generic == toCheck) return false; - while (toCheck != null && toCheck != typeof(object)) - { - Type cur = toCheck.IsGenericType ? toCheck.GetGenericTypeDefinition() : toCheck; - if (generic == cur) - { - return true; - } - - toCheck = toCheck.BaseType; - } - - return false; - } - - public static List GetTypesImplementingInterface(this Assembly assembly, params Type[] types) - { - List list = new List(); - foreach (Type type in types) - { - list.AddRange(assembly.GetTypesImplementingInterface(type)); - } - - return list; - } - - public static List GetTypesImplementingInterface(this Assembly assembly) - { - return assembly.GetTypesImplementingInterface(typeof(T)); - } - - public static List GetTypesImplementingInterface(this Assembly assembly, Type type) - { - List list = new List(); - list.AddRange(assembly.GetTypes().Where(s => s.ImplementsInterface(type))); - - return list; - } - - public static bool ImplementsInterface(this Type type) - { - return type.GetInterfaces().Any(s => s == typeof(T)); - } - - public static bool ImplementsInterface(this Type type, Type interfaceType) - { - return type.GetInterfaces().Any(s => s == interfaceType); - } - - public static List GetTypesImplementingGenericClass(this Assembly assembly, params Type[] types) - { - List list = new List(); - foreach (Type type in types) - { - list.AddRange(assembly.GetTypesImplementingGenericClass(type)); - } - - return list; - } - - public static List GetTypesImplementingGenericClass(this Assembly assembly, Type type) - { - return assembly.GetTypes().Where(s => IsSubclassOfRawGeneric(type, s)).ToList(); - } - - public static List GetTypesDerivedFrom(this Assembly assembly) - { - return assembly.GetTypes().Where(s => s.IsSubclassOf(typeof(T))).ToList(); - } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/Utils/ConfigurationHelper.cs b/src/ChickenAPI.Core/Utils/ConfigurationHelper.cs deleted file mode 100644 index d08e256a..00000000 --- a/src/ChickenAPI.Core/Utils/ConfigurationHelper.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System.IO; -using Newtonsoft.Json; - -namespace ChickenAPI.Core.Utils -{ - public class ConfigurationHelper - { - public static T Load(string path) where T : class, new() => Load(path, false); - - public static T Load(string path, bool createIfNotExists) where T : class, new() - { - if (!File.Exists(path)) - { - if (createIfNotExists) - { - Save(path, new T()); - } - else - { - throw new IOException(path); - } - } - - string fileContent = File.ReadAllText(path); - - return JsonConvert.DeserializeObject(fileContent); - } - - public static void Save(string path, T value) - { - if (!Directory.Exists(path)) - { - Directory.CreateDirectory(Path.GetDirectoryName(path)); - } - - string valueSerialized = JsonConvert.SerializeObject(value, Formatting.Indented); - - File.WriteAllText(path, valueSerialized); - } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/Utils/EventHandlerWithoutArgs.cs b/src/ChickenAPI.Core/Utils/EventHandlerWithoutArgs.cs deleted file mode 100644 index b9734dca..00000000 --- a/src/ChickenAPI.Core/Utils/EventHandlerWithoutArgs.cs +++ /dev/null @@ -1,4 +0,0 @@ -namespace ChickenAPI.Core.Utils -{ - public delegate void EventHandlerWithoutArgs(TSender sender) where TSender : class; -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/Utils/Position.cs b/src/ChickenAPI.Core/Utils/Position.cs deleted file mode 100644 index 9dac547b..00000000 --- a/src/ChickenAPI.Core/Utils/Position.cs +++ /dev/null @@ -1,83 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace ChickenAPI.Core.Utils -{ - public class Position : IEquatable> - { - public Position(T x, T y) - { - X = x; - Y = y; - } - - public Position() - { - } - - public T X { get; set; } - public T Y { get; set; } - - public bool Equals(Position other) - { - if (other is null) - { - return false; - } - - if (ReferenceEquals(this, other)) - { - return true; - } - - return EqualityComparer.Default.Equals(X, other.X) && EqualityComparer.Default.Equals(Y, other.Y); - } - - public static bool operator ==(Position obj1, Position obj2) - { - if (ReferenceEquals(obj1, obj2)) - { - return true; - } - - if (obj1 is null) - { - return false; - } - - if (obj2 is null) - { - return false; - } - - return EqualityComparer.Default.Equals(obj1.X, obj2.X) && EqualityComparer.Default.Equals(obj1.Y, obj2.Y); - } - - public static bool operator !=(Position obj1, Position obj2) => !(obj1 == obj2); - - public override bool Equals(object obj) - { - if (obj is null) - { - return false; - } - - if (ReferenceEquals(this, obj)) - { - return true; - } - - return obj.GetType() == GetType() && Equals((Position)obj); - } - - public override int GetHashCode() - { - unchecked - { - return EqualityComparer.Default.GetHashCode(X) * 397 ^ EqualityComparer.Default.GetHashCode(Y); - } - } - - public override string ToString() => "(" + X + "," + Y + ")"; - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/Utils/StringExtensions.cs b/src/ChickenAPI.Core/Utils/StringExtensions.cs deleted file mode 100644 index ef6e5be5..00000000 --- a/src/ChickenAPI.Core/Utils/StringExtensions.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Linq; -using System.Security.Cryptography; -using System.Text; - -namespace ChickenAPI.Core.Utils -{ - public static class StringExtensions - { - public static string ToSha512(this string str) - { - using (SHA512 hash = SHA512.Create()) - { - return string.Concat(hash.ComputeHash(Encoding.UTF8.GetBytes(str)).Select(item => item.ToString("x2"))); - } - } - - public static string Truncate(this string str, int length) => str.Length > length ? str.Substring(0, length) : str; - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/Utils/TypedSenderEventHandler.cs b/src/ChickenAPI.Core/Utils/TypedSenderEventHandler.cs deleted file mode 100644 index e6a18e20..00000000 --- a/src/ChickenAPI.Core/Utils/TypedSenderEventHandler.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace ChickenAPI.Core.Utils -{ - public delegate void TypedSenderEventHandler(TSender sender, TEventArgs e) - where TSender : class - where TEventArgs : EventArgs; -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/i18n/ILogLanguageService.cs b/src/ChickenAPI.Core/i18n/ILogLanguageService.cs deleted file mode 100644 index df243cd9..00000000 --- a/src/ChickenAPI.Core/i18n/ILogLanguageService.cs +++ /dev/null @@ -1,23 +0,0 @@ -namespace ChickenAPI.Core.i18n -{ - public interface ILogLanguageService - { - /// - /// Will return the string by its key & region - /// Used for ChickenAPI mainly - /// - /// - /// - /// - string GetLanguage(LogI18NKeys key, LanguageKey type); - - /// - /// Will register the key and value by its region type - /// Used for ChickenAPI mainly - /// - /// - /// - /// - void SetLanguage(LogI18NKeys key, string value, LanguageKey type); - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/i18n/LanguageKey.cs b/src/ChickenAPI.Core/i18n/LanguageKey.cs deleted file mode 100644 index f6befc93..00000000 --- a/src/ChickenAPI.Core/i18n/LanguageKey.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace ChickenAPI.Core.i18n -{ - public enum LanguageKey - { - FR, - EN, - DE, - PL, - IT, - ES, - CZ, - TR - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Core/i18n/LogI18NKeys.cs b/src/ChickenAPI.Core/i18n/LogI18NKeys.cs deleted file mode 100644 index 82f018dc..00000000 --- a/src/ChickenAPI.Core/i18n/LogI18NKeys.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace ChickenAPI.Core.i18n -{ - public enum LogI18NKeys - { - - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Data/Account/AccountDto.cs b/src/ChickenAPI.Data/Account/AccountDto.cs index f263eea1..cb2f73ce 100644 --- a/src/ChickenAPI.Data/Account/AccountDto.cs +++ b/src/ChickenAPI.Data/Account/AccountDto.cs @@ -1,5 +1,5 @@ using ChickenAPI.Core.i18n; -using ChickenAPI.Enums; +using ChickenAPI.Data.Enums; namespace ChickenAPI.Data.Account { diff --git a/src/ChickenAPI.Data/BCard/BCardDto.cs b/src/ChickenAPI.Data/BCard/BCardDto.cs index f1a25f07..8a549485 100644 --- a/src/ChickenAPI.Data/BCard/BCardDto.cs +++ b/src/ChickenAPI.Data/BCard/BCardDto.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.BCard; +using ChickenAPI.Data.Enums.Game.BCard; namespace ChickenAPI.Data.BCard { diff --git a/src/ChickenAPI.Data/BCard/IBCardService.cs b/src/ChickenAPI.Data/BCard/IBCardService.cs index 46fc9c81..940374b0 100644 --- a/src/ChickenAPI.Data/BCard/IBCardService.cs +++ b/src/ChickenAPI.Data/BCard/IBCardService.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Threading.Tasks; -using ChickenAPI.Enums.Game.BCard; +using ChickenAPI.Data.Enums.Game.BCard; namespace ChickenAPI.Data.BCard { diff --git a/src/ChickenAPI.Data/Character/CharacterDto.cs b/src/ChickenAPI.Data/Character/CharacterDto.cs index 39425d81..07b5b8cc 100644 --- a/src/ChickenAPI.Data/Character/CharacterDto.cs +++ b/src/ChickenAPI.Data/Character/CharacterDto.cs @@ -1,4 +1,5 @@ -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Data.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Data.Character { diff --git a/src/ChickenAPI.Data/Character/CharacterFamilyDto.cs b/src/ChickenAPI.Data/Character/CharacterFamilyDto.cs index 4bc28989..7c327901 100644 --- a/src/ChickenAPI.Data/Character/CharacterFamilyDto.cs +++ b/src/ChickenAPI.Data/Character/CharacterFamilyDto.cs @@ -1,5 +1,6 @@ using System; -using ChickenAPI.Enums.Game.Families; +using ChickenAPI.Data.Enums.Game.Families; +using FamilyAuthority = ChickenAPI.Packets.Enumerations.FamilyAuthority; namespace ChickenAPI.Data.Character { diff --git a/src/ChickenAPI.Data/Character/CharacterMateDto.cs b/src/ChickenAPI.Data/Character/CharacterMateDto.cs index be36f20a..818f2dc2 100644 --- a/src/ChickenAPI.Data/Character/CharacterMateDto.cs +++ b/src/ChickenAPI.Data/Character/CharacterMateDto.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Entity; namespace ChickenAPI.Data.Character { diff --git a/src/ChickenAPI.Data/Character/IAlgorithmService.cs b/src/ChickenAPI.Data/Character/IAlgorithmService.cs index 010f5908..ac12741a 100644 --- a/src/ChickenAPI.Data/Character/IAlgorithmService.cs +++ b/src/ChickenAPI.Data/Character/IAlgorithmService.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Data.Character { diff --git a/src/ChickenAPI.Data/Character/ICharacterService.cs b/src/ChickenAPI.Data/Character/ICharacterService.cs index fad1522d..50d86184 100644 --- a/src/ChickenAPI.Data/Character/ICharacterService.cs +++ b/src/ChickenAPI.Data/Character/ICharacterService.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Threading.Tasks; -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Data.Enums.Game.Character; namespace ChickenAPI.Data.Character { diff --git a/src/ChickenAPI.Data/ChickenAPI.Data.csproj b/src/ChickenAPI.Data/ChickenAPI.Data.csproj index effee951..e99a5613 100644 --- a/src/ChickenAPI.Data/ChickenAPI.Data.csproj +++ b/src/ChickenAPI.Data/ChickenAPI.Data.csproj @@ -1,12 +1,16 @@ - + netstandard2.0 - - + + + + + + diff --git a/src/ChickenAPI.Data/Drop/DropDto.cs b/src/ChickenAPI.Data/Drop/DropDto.cs index 8b9bafb3..daf54856 100644 --- a/src/ChickenAPI.Data/Drop/DropDto.cs +++ b/src/ChickenAPI.Data/Drop/DropDto.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Drop; +using ChickenAPI.Data.Enums.Game.Drop; namespace ChickenAPI.Data.Drop { diff --git a/src/ChickenAPI.Enums/AuthResponse.cs b/src/ChickenAPI.Data/Enums/AuthResponse.cs similarity index 89% rename from src/ChickenAPI.Enums/AuthResponse.cs rename to src/ChickenAPI.Data/Enums/AuthResponse.cs index b2071193..66740319 100644 --- a/src/ChickenAPI.Enums/AuthResponse.cs +++ b/src/ChickenAPI.Data/Enums/AuthResponse.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums +namespace ChickenAPI.Data.Enums { public enum AuthResponse { diff --git a/src/ChickenAPI.Enums/AuthenticationState.cs b/src/ChickenAPI.Data/Enums/AuthenticationState.cs similarity index 89% rename from src/ChickenAPI.Enums/AuthenticationState.cs rename to src/ChickenAPI.Data/Enums/AuthenticationState.cs index a6c8a9f4..5526731e 100644 --- a/src/ChickenAPI.Enums/AuthenticationState.cs +++ b/src/ChickenAPI.Data/Enums/AuthenticationState.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums +namespace ChickenAPI.Data.Enums { public enum AuthenticationState { diff --git a/src/ChickenAPI.Enums/AuthorityType.cs b/src/ChickenAPI.Data/Enums/AuthorityType.cs similarity index 89% rename from src/ChickenAPI.Enums/AuthorityType.cs rename to src/ChickenAPI.Data/Enums/AuthorityType.cs index 97a5a96f..98a2db0c 100644 --- a/src/ChickenAPI.Enums/AuthorityType.cs +++ b/src/ChickenAPI.Data/Enums/AuthorityType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums +namespace ChickenAPI.Data.Enums { /// /// Account basic groups diff --git a/src/ChickenAPI.Enums/Game/BCard/BCardRelationType.cs b/src/ChickenAPI.Data/Enums/Game/BCard/BCardRelationType.cs similarity index 73% rename from src/ChickenAPI.Enums/Game/BCard/BCardRelationType.cs rename to src/ChickenAPI.Data/Enums/Game/BCard/BCardRelationType.cs index 1fa01736..4089f932 100644 --- a/src/ChickenAPI.Enums/Game/BCard/BCardRelationType.cs +++ b/src/ChickenAPI.Data/Enums/Game/BCard/BCardRelationType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.BCard +namespace ChickenAPI.Data.Enums.Game.BCard { public enum BCardRelationType { diff --git a/src/ChickenAPI.Enums/Game/BCard/BCardType.cs b/src/ChickenAPI.Data/Enums/Game/BCard/BCardType.cs similarity index 98% rename from src/ChickenAPI.Enums/Game/BCard/BCardType.cs rename to src/ChickenAPI.Data/Enums/Game/BCard/BCardType.cs index e99fbc3c..0b552195 100644 --- a/src/ChickenAPI.Enums/Game/BCard/BCardType.cs +++ b/src/ChickenAPI.Data/Enums/Game/BCard/BCardType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.BCard +namespace ChickenAPI.Data.Enums.Game.BCard { public enum BCardType { diff --git a/src/ChickenAPI.Enums/Game/BCard/BCard_Additional.cs b/src/ChickenAPI.Data/Enums/Game/BCard/BCard_Additional.cs similarity index 99% rename from src/ChickenAPI.Enums/Game/BCard/BCard_Additional.cs rename to src/ChickenAPI.Data/Enums/Game/BCard/BCard_Additional.cs index 9adb9d06..ac5c60f9 100644 --- a/src/ChickenAPI.Enums/Game/BCard/BCard_Additional.cs +++ b/src/ChickenAPI.Data/Enums/Game/BCard/BCard_Additional.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.BCard +namespace ChickenAPI.Data.Enums.Game.BCard { public static class BCardSubTypes { diff --git a/src/ChickenAPI.Enums/Game/Buffs/BuffType.cs b/src/ChickenAPI.Data/Enums/Game/Buffs/BuffType.cs similarity index 67% rename from src/ChickenAPI.Enums/Game/Buffs/BuffType.cs rename to src/ChickenAPI.Data/Enums/Game/Buffs/BuffType.cs index c2a34710..a1189451 100644 --- a/src/ChickenAPI.Enums/Game/Buffs/BuffType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Buffs/BuffType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Buffs +namespace ChickenAPI.Data.Enums.Game.Buffs { public enum BuffType { diff --git a/src/ChickenAPI.Enums/Game/Character/ChannelColor.cs b/src/ChickenAPI.Data/Enums/Game/Character/ChannelColor.cs similarity index 72% rename from src/ChickenAPI.Enums/Game/Character/ChannelColor.cs rename to src/ChickenAPI.Data/Enums/Game/Character/ChannelColor.cs index 0c8e0126..25cb75ad 100644 --- a/src/ChickenAPI.Enums/Game/Character/ChannelColor.cs +++ b/src/ChickenAPI.Data/Enums/Game/Character/ChannelColor.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Character +namespace ChickenAPI.Data.Enums.Game.Character { public enum ChannelColor : byte { diff --git a/src/ChickenAPI.Enums/Game/Character/CharacterNameAppearance.cs b/src/ChickenAPI.Data/Enums/Game/Character/CharacterNameAppearance.cs similarity index 78% rename from src/ChickenAPI.Enums/Game/Character/CharacterNameAppearance.cs rename to src/ChickenAPI.Data/Enums/Game/Character/CharacterNameAppearance.cs index 38bd9750..7a661ff3 100644 --- a/src/ChickenAPI.Enums/Game/Character/CharacterNameAppearance.cs +++ b/src/ChickenAPI.Data/Enums/Game/Character/CharacterNameAppearance.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Character +namespace ChickenAPI.Data.Enums.Game.Character { public enum CharacterNameAppearance { diff --git a/src/ChickenAPI.Enums/Game/Character/CharacterOption.cs b/src/ChickenAPI.Data/Enums/Game/Character/CharacterOption.cs similarity index 89% rename from src/ChickenAPI.Enums/Game/Character/CharacterOption.cs rename to src/ChickenAPI.Data/Enums/Game/Character/CharacterOption.cs index 91ba0588..fe2212da 100644 --- a/src/ChickenAPI.Enums/Game/Character/CharacterOption.cs +++ b/src/ChickenAPI.Data/Enums/Game/Character/CharacterOption.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Character +namespace ChickenAPI.Data.Enums.Game.Character { public enum CharacterOption { diff --git a/src/ChickenAPI.Enums/Game/Character/CharacterState.cs b/src/ChickenAPI.Data/Enums/Game/Character/CharacterState.cs similarity index 69% rename from src/ChickenAPI.Enums/Game/Character/CharacterState.cs rename to src/ChickenAPI.Data/Enums/Game/Character/CharacterState.cs index fe9898bf..2f67de50 100644 --- a/src/ChickenAPI.Enums/Game/Character/CharacterState.cs +++ b/src/ChickenAPI.Data/Enums/Game/Character/CharacterState.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Character +namespace ChickenAPI.Data.Enums.Game.Character { public enum CharacterState : byte { diff --git a/src/ChickenAPI.Enums/Game/Character/MinilandState.cs b/src/ChickenAPI.Data/Enums/Game/Character/MinilandState.cs similarity index 68% rename from src/ChickenAPI.Enums/Game/Character/MinilandState.cs rename to src/ChickenAPI.Data/Enums/Game/Character/MinilandState.cs index a9840fac..7d785f5d 100644 --- a/src/ChickenAPI.Enums/Game/Character/MinilandState.cs +++ b/src/ChickenAPI.Data/Enums/Game/Character/MinilandState.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Character +namespace ChickenAPI.Data.Enums.Game.Character { public enum MinilandState : byte { diff --git a/src/ChickenAPI.Enums/Game/Character/ReputationIconType.cs b/src/ChickenAPI.Data/Enums/Game/Character/ReputationIconType.cs similarity index 66% rename from src/ChickenAPI.Enums/Game/Character/ReputationIconType.cs rename to src/ChickenAPI.Data/Enums/Game/Character/ReputationIconType.cs index 7bdaed02..d9dfd045 100644 --- a/src/ChickenAPI.Enums/Game/Character/ReputationIconType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Character/ReputationIconType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Character +namespace ChickenAPI.Data.Enums.Game.Character { public enum ReputationIconType : byte { diff --git a/src/ChickenAPI.Enums/Game/Drop/DropType.cs b/src/ChickenAPI.Data/Enums/Game/Drop/DropType.cs similarity index 67% rename from src/ChickenAPI.Enums/Game/Drop/DropType.cs rename to src/ChickenAPI.Data/Enums/Game/Drop/DropType.cs index 7267e246..d7b0ead7 100644 --- a/src/ChickenAPI.Enums/Game/Drop/DropType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Drop/DropType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Drop +namespace ChickenAPI.Data.Enums.Game.Drop { public enum DropType { diff --git a/src/ChickenAPI.Enums/Game/Effects/EmojiType.cs b/src/ChickenAPI.Data/Enums/Game/Effects/EmojiType.cs similarity index 90% rename from src/ChickenAPI.Enums/Game/Effects/EmojiType.cs rename to src/ChickenAPI.Data/Enums/Game/Effects/EmojiType.cs index d5f77b5c..af833515 100644 --- a/src/ChickenAPI.Enums/Game/Effects/EmojiType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Effects/EmojiType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Effects +namespace ChickenAPI.Data.Enums.Game.Effects { public enum EmojiType { diff --git a/src/ChickenAPI.Enums/Game/Entity/DirectionType.cs b/src/ChickenAPI.Data/Enums/Game/Entity/DirectionType.cs similarity index 79% rename from src/ChickenAPI.Enums/Game/Entity/DirectionType.cs rename to src/ChickenAPI.Data/Enums/Game/Entity/DirectionType.cs index 540dc836..f9b0eed8 100644 --- a/src/ChickenAPI.Enums/Game/Entity/DirectionType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Entity/DirectionType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Entity +namespace ChickenAPI.Data.Enums.Game.Entity { public enum DirectionType { diff --git a/src/ChickenAPI.Enums/Game/Entity/MateType.cs b/src/ChickenAPI.Data/Enums/Game/Entity/MateType.cs similarity index 64% rename from src/ChickenAPI.Enums/Game/Entity/MateType.cs rename to src/ChickenAPI.Data/Enums/Game/Entity/MateType.cs index 3e78b0ea..5e797928 100644 --- a/src/ChickenAPI.Enums/Game/Entity/MateType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Entity/MateType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Entity +namespace ChickenAPI.Data.Enums.Game.Entity { public enum MateType : byte { diff --git a/src/ChickenAPI.Enums/Game/Entity/MonsterType.cs b/src/ChickenAPI.Data/Enums/Game/Entity/MonsterType.cs similarity index 83% rename from src/ChickenAPI.Enums/Game/Entity/MonsterType.cs rename to src/ChickenAPI.Data/Enums/Game/Entity/MonsterType.cs index d3cdcc48..b8b4aa3e 100644 --- a/src/ChickenAPI.Enums/Game/Entity/MonsterType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Entity/MonsterType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Entity +namespace ChickenAPI.Data.Enums.Game.Entity { public enum MonsterType { diff --git a/src/ChickenAPI.Enums/Game/Entity/NpcMonsterRaceType.cs b/src/ChickenAPI.Data/Enums/Game/Entity/NpcMonsterRaceType.cs similarity index 65% rename from src/ChickenAPI.Enums/Game/Entity/NpcMonsterRaceType.cs rename to src/ChickenAPI.Data/Enums/Game/Entity/NpcMonsterRaceType.cs index b1b84f2f..f74b9d4d 100644 --- a/src/ChickenAPI.Enums/Game/Entity/NpcMonsterRaceType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Entity/NpcMonsterRaceType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Entity +namespace ChickenAPI.Data.Enums.Game.Entity { public enum NpcMonsterRaceType { diff --git a/src/ChickenAPI.Data/Enums/Game/Entity/ReqInfoType.cs b/src/ChickenAPI.Data/Enums/Game/Entity/ReqInfoType.cs new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/src/ChickenAPI.Data/Enums/Game/Entity/ReqInfoType.cs @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Game/Families/FamilyLogType.cs b/src/ChickenAPI.Data/Enums/Game/Families/FamilyLogType.cs similarity index 89% rename from src/ChickenAPI.Enums/Game/Families/FamilyLogType.cs rename to src/ChickenAPI.Data/Enums/Game/Families/FamilyLogType.cs index 4c5c01bd..62ce570e 100644 --- a/src/ChickenAPI.Enums/Game/Families/FamilyLogType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Families/FamilyLogType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Families +namespace ChickenAPI.Data.Enums.Game.Families { public enum FamilyLogType { diff --git a/src/ChickenAPI.Enums/Game/Families/FamilyMemberRank.cs b/src/ChickenAPI.Data/Enums/Game/Families/FamilyMemberRank.cs similarity index 92% rename from src/ChickenAPI.Enums/Game/Families/FamilyMemberRank.cs rename to src/ChickenAPI.Data/Enums/Game/Families/FamilyMemberRank.cs index 967373e6..2f3bc549 100644 --- a/src/ChickenAPI.Enums/Game/Families/FamilyMemberRank.cs +++ b/src/ChickenAPI.Data/Enums/Game/Families/FamilyMemberRank.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Families +namespace ChickenAPI.Data.Enums.Game.Families { public enum FamilyMemberRank { diff --git a/src/ChickenAPI.Enums/Game/Groups/GroupDropType.cs b/src/ChickenAPI.Data/Enums/Game/Groups/GroupDropType.cs similarity index 75% rename from src/ChickenAPI.Enums/Game/Groups/GroupDropType.cs rename to src/ChickenAPI.Data/Enums/Game/Groups/GroupDropType.cs index 135d75d4..fcf2b3ea 100644 --- a/src/ChickenAPI.Enums/Game/Groups/GroupDropType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Groups/GroupDropType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Groups +namespace ChickenAPI.Data.Enums.Game.Groups { public enum GroupDropType { diff --git a/src/ChickenAPI.Enums/Game/Items/ArmorOptionType.cs b/src/ChickenAPI.Data/Enums/Game/Items/ArmorOptionType.cs similarity index 97% rename from src/ChickenAPI.Enums/Game/Items/ArmorOptionType.cs rename to src/ChickenAPI.Data/Enums/Game/Items/ArmorOptionType.cs index b401e796..50336b08 100644 --- a/src/ChickenAPI.Enums/Game/Items/ArmorOptionType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Items/ArmorOptionType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Items +namespace ChickenAPI.Data.Enums.Game.Items { public enum ArmorOptionType { diff --git a/src/ChickenAPI.Enums/Game/Items/EquipmentOptionType.cs b/src/ChickenAPI.Data/Enums/Game/Items/EquipmentOptionType.cs similarity index 66% rename from src/ChickenAPI.Enums/Game/Items/EquipmentOptionType.cs rename to src/ChickenAPI.Data/Enums/Game/Items/EquipmentOptionType.cs index 7d619aab..5fe20293 100644 --- a/src/ChickenAPI.Enums/Game/Items/EquipmentOptionType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Items/EquipmentOptionType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Items +namespace ChickenAPI.Data.Enums.Game.Items { public enum EquipmentOptionType { diff --git a/src/ChickenAPI.Enums/Game/Items/EquipmentType.cs b/src/ChickenAPI.Data/Enums/Game/Items/EquipmentType.cs similarity index 89% rename from src/ChickenAPI.Enums/Game/Items/EquipmentType.cs rename to src/ChickenAPI.Data/Enums/Game/Items/EquipmentType.cs index f85b0e09..eba8df3f 100644 --- a/src/ChickenAPI.Enums/Game/Items/EquipmentType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Items/EquipmentType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Items +namespace ChickenAPI.Data.Enums.Game.Items { public enum EquipmentType : byte { diff --git a/src/ChickenAPI.Enums/Game/Items/ItemClassType.cs b/src/ChickenAPI.Data/Enums/Game/Items/ItemClassType.cs similarity index 74% rename from src/ChickenAPI.Enums/Game/Items/ItemClassType.cs rename to src/ChickenAPI.Data/Enums/Game/Items/ItemClassType.cs index b5f7a101..70c5d6ce 100644 --- a/src/ChickenAPI.Enums/Game/Items/ItemClassType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Items/ItemClassType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Items +namespace ChickenAPI.Data.Enums.Game.Items { public enum ItemClassType { diff --git a/src/ChickenAPI.Enums/Game/Items/ItemType.cs b/src/ChickenAPI.Data/Enums/Game/Items/ItemType.cs similarity index 93% rename from src/ChickenAPI.Enums/Game/Items/ItemType.cs rename to src/ChickenAPI.Data/Enums/Game/Items/ItemType.cs index 7736098c..0b91e3c1 100644 --- a/src/ChickenAPI.Enums/Game/Items/ItemType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Items/ItemType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Items +namespace ChickenAPI.Data.Enums.Game.Items { public enum ItemType : byte { diff --git a/src/ChickenAPI.Enums/Game/Items/ItemWearType.cs b/src/ChickenAPI.Data/Enums/Game/Items/ItemWearType.cs similarity index 64% rename from src/ChickenAPI.Enums/Game/Items/ItemWearType.cs rename to src/ChickenAPI.Data/Enums/Game/Items/ItemWearType.cs index 779f9417..ac431fd4 100644 --- a/src/ChickenAPI.Enums/Game/Items/ItemWearType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Items/ItemWearType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Items +namespace ChickenAPI.Data.Enums.Game.Items { public enum ItemWearType { diff --git a/src/ChickenAPI.Enums/Game/Items/JewelOptionType.cs b/src/ChickenAPI.Data/Enums/Game/Items/JewelOptionType.cs similarity index 78% rename from src/ChickenAPI.Enums/Game/Items/JewelOptionType.cs rename to src/ChickenAPI.Data/Enums/Game/Items/JewelOptionType.cs index f0f81114..43230ebd 100644 --- a/src/ChickenAPI.Enums/Game/Items/JewelOptionType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Items/JewelOptionType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Items +namespace ChickenAPI.Data.Enums.Game.Items { public enum JewelOptionType { diff --git a/src/ChickenAPI.Enums/Game/Items/Upgrade/FixedUpModeType.cs b/src/ChickenAPI.Data/Enums/Game/Items/Upgrade/FixedUpModeType.cs similarity index 60% rename from src/ChickenAPI.Enums/Game/Items/Upgrade/FixedUpModeType.cs rename to src/ChickenAPI.Data/Enums/Game/Items/Upgrade/FixedUpModeType.cs index 7f409286..6d9a02f3 100644 --- a/src/ChickenAPI.Enums/Game/Items/Upgrade/FixedUpModeType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Items/Upgrade/FixedUpModeType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Items +namespace ChickenAPI.Data.Enums.Game.Items.Upgrade { public enum FixedUpMode { diff --git a/src/ChickenAPI.Enums/Game/Items/Upgrade/RarifyModeType.cs b/src/ChickenAPI.Data/Enums/Game/Items/Upgrade/RarifyModeType.cs similarity index 68% rename from src/ChickenAPI.Enums/Game/Items/Upgrade/RarifyModeType.cs rename to src/ChickenAPI.Data/Enums/Game/Items/Upgrade/RarifyModeType.cs index 38fcaad7..f760fb0b 100644 --- a/src/ChickenAPI.Enums/Game/Items/Upgrade/RarifyModeType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Items/Upgrade/RarifyModeType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Items +namespace ChickenAPI.Data.Enums.Game.Items.Upgrade { public enum RarifyMode { diff --git a/src/ChickenAPI.Enums/Game/Items/Upgrade/RarifyProtectionType.cs b/src/ChickenAPI.Data/Enums/Game/Items/Upgrade/RarifyProtectionType.cs similarity index 78% rename from src/ChickenAPI.Enums/Game/Items/Upgrade/RarifyProtectionType.cs rename to src/ChickenAPI.Data/Enums/Game/Items/Upgrade/RarifyProtectionType.cs index f25eb2c0..8cebbc2a 100644 --- a/src/ChickenAPI.Enums/Game/Items/Upgrade/RarifyProtectionType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Items/Upgrade/RarifyProtectionType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Items +namespace ChickenAPI.Data.Enums.Game.Items.Upgrade { public enum RarifyProtection { diff --git a/src/ChickenAPI.Enums/Game/Items/Upgrade/UpgradeModeType.cs b/src/ChickenAPI.Data/Enums/Game/Items/Upgrade/UpgradeModeType.cs similarity index 62% rename from src/ChickenAPI.Enums/Game/Items/Upgrade/UpgradeModeType.cs rename to src/ChickenAPI.Data/Enums/Game/Items/Upgrade/UpgradeModeType.cs index 70ade927..482963ac 100644 --- a/src/ChickenAPI.Enums/Game/Items/Upgrade/UpgradeModeType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Items/Upgrade/UpgradeModeType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Items +namespace ChickenAPI.Data.Enums.Game.Items.Upgrade { public enum UpgradeMode { diff --git a/src/ChickenAPI.Enums/Game/Items/Upgrade/UpgradeProtectionType.cs b/src/ChickenAPI.Data/Enums/Game/Items/Upgrade/UpgradeProtectionType.cs similarity index 60% rename from src/ChickenAPI.Enums/Game/Items/Upgrade/UpgradeProtectionType.cs rename to src/ChickenAPI.Data/Enums/Game/Items/Upgrade/UpgradeProtectionType.cs index 9ddb439f..01134f29 100644 --- a/src/ChickenAPI.Enums/Game/Items/Upgrade/UpgradeProtectionType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Items/Upgrade/UpgradeProtectionType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Items +namespace ChickenAPI.Data.Enums.Game.Items.Upgrade { public enum UpgradeProtection { diff --git a/src/ChickenAPI.Enums/Game/Items/Upgrade/UpgradeTypeEvent.cs b/src/ChickenAPI.Data/Enums/Game/Items/Upgrade/UpgradeTypeEvent.cs similarity index 60% rename from src/ChickenAPI.Enums/Game/Items/Upgrade/UpgradeTypeEvent.cs rename to src/ChickenAPI.Data/Enums/Game/Items/Upgrade/UpgradeTypeEvent.cs index 7c342972..489921f6 100644 --- a/src/ChickenAPI.Enums/Game/Items/Upgrade/UpgradeTypeEvent.cs +++ b/src/ChickenAPI.Data/Enums/Game/Items/Upgrade/UpgradeTypeEvent.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Items +namespace ChickenAPI.Data.Enums.Game.Items.Upgrade { public enum UpgradeTypeEvent { diff --git a/src/ChickenAPI.Enums/Game/Items/WeaponOptionLevelType.cs b/src/ChickenAPI.Data/Enums/Game/Items/WeaponOptionLevelType.cs similarity index 69% rename from src/ChickenAPI.Enums/Game/Items/WeaponOptionLevelType.cs rename to src/ChickenAPI.Data/Enums/Game/Items/WeaponOptionLevelType.cs index 8c23f681..526f689d 100644 --- a/src/ChickenAPI.Enums/Game/Items/WeaponOptionLevelType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Items/WeaponOptionLevelType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Items +namespace ChickenAPI.Data.Enums.Game.Items { public enum WeaponOptionLevelType : byte { diff --git a/src/ChickenAPI.Enums/Game/Items/WeaponOptionType.cs b/src/ChickenAPI.Data/Enums/Game/Items/WeaponOptionType.cs similarity index 97% rename from src/ChickenAPI.Enums/Game/Items/WeaponOptionType.cs rename to src/ChickenAPI.Data/Enums/Game/Items/WeaponOptionType.cs index 0cbcbe68..88745b1c 100644 --- a/src/ChickenAPI.Enums/Game/Items/WeaponOptionType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Items/WeaponOptionType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Items +namespace ChickenAPI.Data.Enums.Game.Items { public enum WeaponOptionType : byte { diff --git a/src/ChickenAPI.Enums/Game/Maps/MapLayerType.cs b/src/ChickenAPI.Data/Enums/Game/Maps/MapLayerType.cs similarity index 59% rename from src/ChickenAPI.Enums/Game/Maps/MapLayerType.cs rename to src/ChickenAPI.Data/Enums/Game/Maps/MapLayerType.cs index 55a77afe..aadd710a 100644 --- a/src/ChickenAPI.Enums/Game/Maps/MapLayerType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Maps/MapLayerType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Maps +namespace ChickenAPI.Data.Enums.Game.Maps { public enum MapLayerType { diff --git a/src/ChickenAPI.Enums/Game/Mates/SpPartnerRank.cs b/src/ChickenAPI.Data/Enums/Game/Mates/SpPartnerRank.cs similarity index 79% rename from src/ChickenAPI.Enums/Game/Mates/SpPartnerRank.cs rename to src/ChickenAPI.Data/Enums/Game/Mates/SpPartnerRank.cs index eb1f535c..29e6f166 100644 --- a/src/ChickenAPI.Enums/Game/Mates/SpPartnerRank.cs +++ b/src/ChickenAPI.Data/Enums/Game/Mates/SpPartnerRank.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Mates +namespace ChickenAPI.Data.Enums.Game.Mates { public enum SpPartnerRank { diff --git a/src/ChickenAPI.Enums/Game/NosBazaar/NosBazaarCategoryType.cs b/src/ChickenAPI.Data/Enums/Game/NosBazaar/NosBazaarCategoryType.cs similarity index 85% rename from src/ChickenAPI.Enums/Game/NosBazaar/NosBazaarCategoryType.cs rename to src/ChickenAPI.Data/Enums/Game/NosBazaar/NosBazaarCategoryType.cs index 22ea6464..34c7ef63 100644 --- a/src/ChickenAPI.Enums/Game/NosBazaar/NosBazaarCategoryType.cs +++ b/src/ChickenAPI.Data/Enums/Game/NosBazaar/NosBazaarCategoryType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.NosBazaar +namespace ChickenAPI.Data.Enums.Game.NosBazaar { public enum NosBazaarCategoryType { diff --git a/src/ChickenAPI.Enums/Game/NosBazaar/NosBazaarOrderType.cs b/src/ChickenAPI.Data/Enums/Game/NosBazaar/NosBazaarOrderType.cs similarity index 75% rename from src/ChickenAPI.Enums/Game/NosBazaar/NosBazaarOrderType.cs rename to src/ChickenAPI.Data/Enums/Game/NosBazaar/NosBazaarOrderType.cs index c8ab1003..7b483c33 100644 --- a/src/ChickenAPI.Enums/Game/NosBazaar/NosBazaarOrderType.cs +++ b/src/ChickenAPI.Data/Enums/Game/NosBazaar/NosBazaarOrderType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.NosBazaar +namespace ChickenAPI.Data.Enums.Game.NosBazaar { public enum NosBazaarOrderType { diff --git a/src/ChickenAPI.Enums/Game/PlayerSessionState.cs b/src/ChickenAPI.Data/Enums/Game/PlayerSessionState.cs similarity index 73% rename from src/ChickenAPI.Enums/Game/PlayerSessionState.cs rename to src/ChickenAPI.Data/Enums/Game/PlayerSessionState.cs index 0a05fe6a..ddb48ee6 100644 --- a/src/ChickenAPI.Enums/Game/PlayerSessionState.cs +++ b/src/ChickenAPI.Data/Enums/Game/PlayerSessionState.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game +namespace ChickenAPI.Data.Enums.Game { public enum PlayerSessionState { diff --git a/src/ChickenAPI.Enums/Game/Quicklist/QuicklistItemSlotType.cs b/src/ChickenAPI.Data/Enums/Game/Quicklist/QuicklistItemSlotType.cs similarity index 68% rename from src/ChickenAPI.Enums/Game/Quicklist/QuicklistItemSlotType.cs rename to src/ChickenAPI.Data/Enums/Game/Quicklist/QuicklistItemSlotType.cs index 08de7f26..60ecaf24 100644 --- a/src/ChickenAPI.Enums/Game/Quicklist/QuicklistItemSlotType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Quicklist/QuicklistItemSlotType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Quicklist +namespace ChickenAPI.Data.Enums.Game.Quicklist { public enum QuicklistItemSlotType { diff --git a/src/ChickenAPI.Enums/Game/Quicklist/QuicklistSkillSlotType.cs b/src/ChickenAPI.Data/Enums/Game/Quicklist/QuicklistSkillSlotType.cs similarity index 69% rename from src/ChickenAPI.Enums/Game/Quicklist/QuicklistSkillSlotType.cs rename to src/ChickenAPI.Data/Enums/Game/Quicklist/QuicklistSkillSlotType.cs index 6dbc3f30..4eb6a7b9 100644 --- a/src/ChickenAPI.Enums/Game/Quicklist/QuicklistSkillSlotType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Quicklist/QuicklistSkillSlotType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Quicklist +namespace ChickenAPI.Data.Enums.Game.Quicklist { public enum QuicklistSkillSlotType { diff --git a/src/ChickenAPI.Enums/Game/Relations/RelationInvitationProcess.cs b/src/ChickenAPI.Data/Enums/Game/Relations/RelationInvitationProcess.cs similarity index 64% rename from src/ChickenAPI.Enums/Game/Relations/RelationInvitationProcess.cs rename to src/ChickenAPI.Data/Enums/Game/Relations/RelationInvitationProcess.cs index 8ed73e36..4d8b96de 100644 --- a/src/ChickenAPI.Enums/Game/Relations/RelationInvitationProcess.cs +++ b/src/ChickenAPI.Data/Enums/Game/Relations/RelationInvitationProcess.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Relations +namespace ChickenAPI.Data.Enums.Game.Relations { public enum RelationInvitationProcessType { diff --git a/src/ChickenAPI.Enums/Game/Skill/SkillTargetType.cs b/src/ChickenAPI.Data/Enums/Game/Skill/SkillTargetType.cs similarity index 70% rename from src/ChickenAPI.Enums/Game/Skill/SkillTargetType.cs rename to src/ChickenAPI.Data/Enums/Game/Skill/SkillTargetType.cs index 378590a7..c9dc85ce 100644 --- a/src/ChickenAPI.Enums/Game/Skill/SkillTargetType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Skill/SkillTargetType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Skill +namespace ChickenAPI.Data.Enums.Game.Skill { public enum SkillTargetType { diff --git a/src/ChickenAPI.Enums/Game/Visibility/VisibilityType.cs b/src/ChickenAPI.Data/Enums/Game/Visibility/VisibilityType.cs similarity index 61% rename from src/ChickenAPI.Enums/Game/Visibility/VisibilityType.cs rename to src/ChickenAPI.Data/Enums/Game/Visibility/VisibilityType.cs index d95bbfc2..7353bb50 100644 --- a/src/ChickenAPI.Enums/Game/Visibility/VisibilityType.cs +++ b/src/ChickenAPI.Data/Enums/Game/Visibility/VisibilityType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums.Game.Visibility +namespace ChickenAPI.Data.Enums.Game.Visibility { public enum VisibilityType { diff --git a/src/ChickenAPI.Enums/RegionType.cs b/src/ChickenAPI.Data/Enums/RegionType.cs similarity index 80% rename from src/ChickenAPI.Enums/RegionType.cs rename to src/ChickenAPI.Data/Enums/RegionType.cs index 52f49e1a..1f1a7f15 100644 --- a/src/ChickenAPI.Enums/RegionType.cs +++ b/src/ChickenAPI.Data/Enums/RegionType.cs @@ -1,4 +1,4 @@ -namespace ChickenAPI.Enums +namespace ChickenAPI.Data.Enums { public enum RegionType { diff --git a/src/ChickenAPI.Data/Families/FamilyDto.cs b/src/ChickenAPI.Data/Families/FamilyDto.cs index c1e0ee12..fed8d917 100644 --- a/src/ChickenAPI.Data/Families/FamilyDto.cs +++ b/src/ChickenAPI.Data/Families/FamilyDto.cs @@ -1,5 +1,4 @@ -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Enums.Game.Families; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Data.Families { diff --git a/src/ChickenAPI.Data/Item/IItemInstanceService.cs b/src/ChickenAPI.Data/Item/IItemInstanceService.cs index 76fe1bf4..65837d16 100644 --- a/src/ChickenAPI.Data/Item/IItemInstanceService.cs +++ b/src/ChickenAPI.Data/Item/IItemInstanceService.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using ChickenAPI.Data.Character; -using ChickenAPI.Enums; +using ChickenAPI.Data.Enums; namespace ChickenAPI.Data.Item { diff --git a/src/ChickenAPI.Data/Item/ItemDto.cs b/src/ChickenAPI.Data/Item/ItemDto.cs index 9d38e681..0f212e30 100644 --- a/src/ChickenAPI.Data/Item/ItemDto.cs +++ b/src/ChickenAPI.Data/Item/ItemDto.cs @@ -1,4 +1,6 @@ -using ChickenAPI.Enums.Game.Items; +using ChickenAPI.Data.Enums.Game.Items; +using ChickenAPI.Packets.Enumerations; +using EquipmentType = ChickenAPI.Data.Enums.Game.Items.EquipmentType; namespace ChickenAPI.Data.Item { @@ -161,7 +163,7 @@ public class ItemDto : IMappedDto public byte SpType { get; set; } - public InventoryType Type { get; set; } + public PocketType Type { get; set; } public short WaitDelay { get; set; } diff --git a/src/ChickenAPI.Data/Item/ItemInstanceDto.cs b/src/ChickenAPI.Data/Item/ItemInstanceDto.cs index bc08cf62..30afdac5 100644 --- a/src/ChickenAPI.Data/Item/ItemInstanceDto.cs +++ b/src/ChickenAPI.Data/Item/ItemInstanceDto.cs @@ -1,6 +1,5 @@ using System; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Enums.Game.Items; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Data.Item { @@ -42,7 +41,7 @@ public class ItemInstanceDto : ISynchronizedDto public sbyte Rarity { get; set; } - public InventoryType Type { get; set; } + public PocketType Type { get; set; } public byte Upgrade { get; set; } diff --git a/src/ChickenAPI.Data/Map/MapMonsterDto.cs b/src/ChickenAPI.Data/Map/MapMonsterDto.cs index f539d83d..79fd6754 100644 --- a/src/ChickenAPI.Data/Map/MapMonsterDto.cs +++ b/src/ChickenAPI.Data/Map/MapMonsterDto.cs @@ -1,5 +1,5 @@ -using ChickenAPI.Data.NpcMonster; -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Entity; +using ChickenAPI.Data.NpcMonster; namespace ChickenAPI.Data.Map { diff --git a/src/ChickenAPI.Data/Map/MapNpcDto.cs b/src/ChickenAPI.Data/Map/MapNpcDto.cs index bc8abc07..444db583 100644 --- a/src/ChickenAPI.Data/Map/MapNpcDto.cs +++ b/src/ChickenAPI.Data/Map/MapNpcDto.cs @@ -1,5 +1,5 @@ -using ChickenAPI.Data.NpcMonster; -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Entity; +using ChickenAPI.Data.NpcMonster; namespace ChickenAPI.Data.Map { diff --git a/src/ChickenAPI.Data/Map/PortalDto.cs b/src/ChickenAPI.Data/Map/PortalDto.cs index ae14b915..40178455 100644 --- a/src/ChickenAPI.Data/Map/PortalDto.cs +++ b/src/ChickenAPI.Data/Map/PortalDto.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Portals; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Data.Map { diff --git a/src/ChickenAPI.Data/NpcMonster/INpcMonsterAlgorithmService.cs b/src/ChickenAPI.Data/NpcMonster/INpcMonsterAlgorithmService.cs index 94d2ae2d..668b5bcf 100644 --- a/src/ChickenAPI.Data/NpcMonster/INpcMonsterAlgorithmService.cs +++ b/src/ChickenAPI.Data/NpcMonster/INpcMonsterAlgorithmService.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Entity; namespace ChickenAPI.Data.NpcMonster { diff --git a/src/ChickenAPI.Data/NpcMonster/NpcMonsterDto.cs b/src/ChickenAPI.Data/NpcMonster/NpcMonsterDto.cs index 0506c15f..b680db91 100644 --- a/src/ChickenAPI.Data/NpcMonster/NpcMonsterDto.cs +++ b/src/ChickenAPI.Data/NpcMonster/NpcMonsterDto.cs @@ -1,4 +1,5 @@ -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Entity; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Data.NpcMonster { diff --git a/src/ChickenAPI.Data/Relations/IRelationService.cs b/src/ChickenAPI.Data/Relations/IRelationService.cs index 5d390e1e..963dca1e 100644 --- a/src/ChickenAPI.Data/Relations/IRelationService.cs +++ b/src/ChickenAPI.Data/Relations/IRelationService.cs @@ -1,7 +1,8 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using ChickenAPI.Enums.Game.Relations; +using ChickenAPI.Data.Enums.Game.Relations; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Data.Relations { diff --git a/src/ChickenAPI.Data/Relations/RelationDto.cs b/src/ChickenAPI.Data/Relations/RelationDto.cs index af0127d2..1b21acd6 100644 --- a/src/ChickenAPI.Data/Relations/RelationDto.cs +++ b/src/ChickenAPI.Data/Relations/RelationDto.cs @@ -1,5 +1,5 @@ using System; -using ChickenAPI.Enums.Game.Relations; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Data.Relations { diff --git a/src/ChickenAPI.Data/Relations/RelationInvitationDto.cs b/src/ChickenAPI.Data/Relations/RelationInvitationDto.cs index 064305df..2e977c93 100644 --- a/src/ChickenAPI.Data/Relations/RelationInvitationDto.cs +++ b/src/ChickenAPI.Data/Relations/RelationInvitationDto.cs @@ -1,5 +1,5 @@ using System; -using ChickenAPI.Enums.Game.Relations; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Data.Relations { diff --git a/src/ChickenAPI.Data/Server/PlayerSessionDto.cs b/src/ChickenAPI.Data/Server/PlayerSessionDto.cs index 9101b733..67e4f2b3 100644 --- a/src/ChickenAPI.Data/Server/PlayerSessionDto.cs +++ b/src/ChickenAPI.Data/Server/PlayerSessionDto.cs @@ -1,5 +1,5 @@ using System; -using ChickenAPI.Enums.Game; +using ChickenAPI.Data.Enums.Game; namespace ChickenAPI.Data.Server { diff --git a/src/ChickenAPI.Data/Server/WorldServerDto.cs b/src/ChickenAPI.Data/Server/WorldServerDto.cs index e67182f8..51de2409 100644 --- a/src/ChickenAPI.Data/Server/WorldServerDto.cs +++ b/src/ChickenAPI.Data/Server/WorldServerDto.cs @@ -1,5 +1,5 @@ using System; -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Data.Enums.Game.Character; namespace ChickenAPI.Data.Server { diff --git a/src/ChickenAPI.Data/Skills/CardDto.cs b/src/ChickenAPI.Data/Skills/CardDto.cs index a5858040..f8dd3a9d 100644 --- a/src/ChickenAPI.Data/Skills/CardDto.cs +++ b/src/ChickenAPI.Data/Skills/CardDto.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Buffs; +using ChickenAPI.Data.Enums.Game.Buffs; namespace ChickenAPI.Data.Skills { diff --git a/src/ChickenAPI.Enums/ChickenAPI.Enums.csproj b/src/ChickenAPI.Enums/ChickenAPI.Enums.csproj deleted file mode 100644 index 9f5c4f4a..00000000 --- a/src/ChickenAPI.Enums/ChickenAPI.Enums.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - netstandard2.0 - - - diff --git a/src/ChickenAPI.Enums/Game/Character/CharacterClassType.cs b/src/ChickenAPI.Enums/Game/Character/CharacterClassType.cs deleted file mode 100644 index c877afb3..00000000 --- a/src/ChickenAPI.Enums/Game/Character/CharacterClassType.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace ChickenAPI.Enums.Game.Character -{ - public enum CharacterClassType : byte - { - Adventurer = 0, - Swordman = 1, - Archer = 2, - Magician = 3, - Wrestler = 4, - Unknown = 5 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Game/Character/CharacterDignity.cs b/src/ChickenAPI.Enums/Game/Character/CharacterDignity.cs deleted file mode 100644 index 2363d8a0..00000000 --- a/src/ChickenAPI.Enums/Game/Character/CharacterDignity.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace ChickenAPI.Enums.Game.Character -{ - public enum CharacterDignity : byte - { - Basic = 1, // Basic Dignity ( Dignity are not changed ) - Suspected = 2, // Suspected RANK (Dignity: -100 ~ -200) - BluffedNameOnly = 3, // Bluffed name only RANK (Dignity: -201 ~ -400) - NotQualifiedFor = 4, // Not qualified for RANK (Dignity: -401 ~ -600) - Useless = 5, // Useless RANK (Dignity: -601 ~ -800) - StupidMinded = 6 // Stupid minded RANK (Dignity: -801 ~ -1.000) - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Game/Character/CharacterRep.cs b/src/ChickenAPI.Enums/Game/Character/CharacterRep.cs deleted file mode 100644 index ddaf6099..00000000 --- a/src/ChickenAPI.Enums/Game/Character/CharacterRep.cs +++ /dev/null @@ -1,55 +0,0 @@ -namespace ChickenAPI.Enums.Game.Character -{ - public enum CharacterRep : sbyte - { - StupidMinded = -6, // Stupid minded RANK (Dignity: -801 ~ -1.000) - Useless = -5, // Useless RANK (Dignity: -601 ~ -800) - NotQualifiedFor = -4, // Not qualified for RANK (Dignity: -401 ~ -600) - BluffedNameOnly = -3, // Bluffed name only RANK (Dignity: -201 ~ -400) - Suspected = -2, // Suspected RANK (Dignity: -100 ~ -200) - Basic = -1, // Basic Dignity ( Dignity are not changed ) - Beginner = 1, // (0 ~ 250 Reputation) - - IDk = 2, // IDK ? - IDk2 = 3, // IDK ? - - TraineeG = 4, // (Reputation: 251 ~ 500) - TraineeB = 5, //(Reputation:501 ~ 750) - TraineeR = 6, //(Reputation: 750 ~ 1.000) - - TheExperiencedG = 7, // (Reputation: 1.001 ~ 2.250) - TheExperiencedB = 8, // (Reputation: 2.251 ~ 3.500) - TheExperiencedR = 9, // (Reputation: 3.501 ~ 5.000) - - BattleSoldierG = 10, // (Reputation: 5 001 ~ 9.500) - BattleSoldierB = 11, // (Reputation: 9.501 ~ 19.000) - BattleSoldierR = 12, // (Reputation: 19.001 ~ 25.000) - - ExpertG = 13, // (Reputation: 25.001 ~ 40.000) - ExpertB = 14, // (Reputation: 40.001 ~ 60.000) - ExpertR = 15, // (Reputation: 60.001 ~ 85.000) - - LeaderG = 16, // (Reputation: 85.001 ~ 115.000) - LeaderB = 17, // (Reputation: 115.001 ~ 150.000) - LeaderR = 18, // (Reputation: 150.001 ~ 190.000) - - MasterG = 19, // (Reputation: 190.001 ~ 235.000) - MasterB = 20, // (Reputation: 235.001 ~ 185.000) - MasterR = 21, // (Reputation: 285.001 ~ 350.000) - - NosG = 22, // (Reputation: 350.001 ~ 500.000) - NosB = 23, // (Reputation: 500.001 ~ 1.500.000) - NosR = 24, // (Reputation: 1.500.001 ~ 2.500.000) - - EliteG = 25, // (Reputation: 2.500.001 ~ 3.750.000) - EliteB = 26, // (Reputation: 3.750.001 ~ 5.000.000) - EliteR = 27, // (Reputation: 5.000.001 and more ) - - LegendG = 28, // (43 th to 14 th place at the reputation ranking : 5.000.000 and more) - LegendB = 29, // (14 th to 4 th place at the reputation ranking : 5.000.000 and more) - - AncienHeros = 30, // (3 rd place at the reputation ranking : 5.000.000 and more) - MysteriousHeros = 31, // (2 nd place in the reputation ranking : 5.000.000 and more) - LegendaryHeros = 32 // (1 st place in the reputation ranking : 5.000.000 and more) - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Game/Character/FactionType.cs b/src/ChickenAPI.Enums/Game/Character/FactionType.cs deleted file mode 100644 index b8e060b8..00000000 --- a/src/ChickenAPI.Enums/Game/Character/FactionType.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace ChickenAPI.Enums.Game.Character -{ - public enum FactionType : byte - { - Neutral = 0, - Angel = 1, - Demon = 2 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Game/Character/GenderType.cs b/src/ChickenAPI.Enums/Game/Character/GenderType.cs deleted file mode 100644 index a47e5fb9..00000000 --- a/src/ChickenAPI.Enums/Game/Character/GenderType.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace ChickenAPI.Enums.Game.Character -{ - public enum GenderType : byte - { - Male = 0, - Female = 1 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Game/Character/HairColorType.cs b/src/ChickenAPI.Enums/Game/Character/HairColorType.cs deleted file mode 100644 index 6972b6d1..00000000 --- a/src/ChickenAPI.Enums/Game/Character/HairColorType.cs +++ /dev/null @@ -1,134 +0,0 @@ -namespace ChickenAPI.Enums.Game.Character -{ - public enum HairColorType : byte - { - DarkPurple = 0, - Yellow = 1, - Blue = 2, - Purple = 3, - Orange = 4, - Brown = 5, - Green = 6, - DarkGrey = 7, - LightBlue = 8, - PinkRed = 9, - LightYellow = 10, - LightPink = 11, - LightGreen = 12, - LightGrey = 13, - SkyBlue = 14, - Black = 15, - DarkOrange = 16, - DarkOrangeVariant2 = 17, - DarkOrangeVariant3 = 18, - DarkOrangeVariant4 = 19, - DarkOrangeVariant5 = 20, - DarkOrangeVariant6 = 21, - LightOrange = 22, - LightLightOrange = 23, - LightLightLightOrange = 24, - LightLightLightLightOrange = 25, - SuperLightOrange = 26, - DarkYellow = 27, - LightLightYellow = 28, - KakiYellow = 29, - SuperLightYellow = 30, - SuperLightYellow2 = 31, - SuperLightYellow3 = 32, - LittleDarkYellow = 33, - YellowVariant = 34, - YellowVariant1 = 35, - YellowVariant2 = 36, - YellowVariant3 = 37, - YellowVariant4 = 38, - YellowVariant5 = 39, - YellowVariant6 = 40, - YellowVariant7 = 41, - YellowVariant8 = 42, - YellowVariant9 = 43, - GreenVariant = 44, - GreenVariant1 = 45, - DarkGreenVariant = 46, - GreenMoreDarkVariant = 47, - GreenVariant2 = 48, - GreenVariant3 = 49, - GreenVariant4 = 50, - GreenVariant5 = 51, - GreenVariant6 = 52, - GreenVariant7 = 53, - GreenVariant8 = 54, - GreenVariant9 = 55, - GreenVariant10 = 56, - GreenVariant11 = 57, - GreenVariant12 = 58, - GreenVariant13 = 59, - GreenVariant14 = 60, - GreenVariant15 = 61, - GreenVariant16 = 62, - GreenVariant17 = 63, - GreenVariant18 = 64, - GreenVariant19 = 65, - GreenVariant20 = 66, - LightBlueVariant1 = 67, - LightBlueVariant2 = 68, - LightBlueVariant3 = 69, - LightBlueVariant4 = 70, - LightBlueVariant5 = 71, - LightBlueVariant6 = 72, - LightBlueVariant7 = 73, - LightBlueVariant8 = 74, - LightBlueVariant9 = 75, - LightBlueVariant10 = 76, - LightBlueVariant11 = 77, - LightBlueVariant12 = 78, - LightBlueVariant13 = 79, - DarkBlack = 80, - LightBlueVariant14 = 81, - LightBlueVariant15 = 82, - LightBlueVariant16 = 83, - LightBlueVariant17 = 84, - BlueVariant = 85, - BlueVariantDark = 86, - BlueVariantDarkDark = 87, - BlueVariantDarkDark2 = 88, - FlashBlue = 89, - FlashBlueDark = 90, - FlashBlueDark2 = 91, - FlashBlueDark3 = 92, - FlashBlueDark4 = 93, - FlashBlueDark5 = 94, - FlashBlueDark6 = 95, - FlashBlueDark7 = 96, - FlashBlueDark8 = 97, - FlashBlueDark9 = 98, - White = 99, - FlashBlueDark10 = 100, - FlashBlue1 = 101, - FlashBlue2 = 102, - FlashBlue3 = 103, - FlashBlue4 = 104, - FlashBlue5 = 105, - FlashPurple = 106, - FlashLightPurple = 107, - FlashLightPurple2 = 108, - FlashLightPurple3 = 109, - FlashLightPurple4 = 110, - FlashLightPurple5 = 111, - LightPurple = 112, - PurpleVariant1 = 113, - PurpleVariant2 = 114, - PurpleVariant3 = 115, - PurpleVariant4 = 116, - PurpleVariant5 = 117, - PurpleVariant6 = 118, - PurpleVariant7 = 119, - PurpleVariant8 = 120, - PurpleVariant9 = 121, - PurpleVariant10 = 122, - PurpleVariant11 = 123, - PurpleVariant12 = 124, - PurpleVariant13 = 125, - PurpleVariant14 = 126, - PurpleVariant15 = 127 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Game/Character/HairStyleType.cs b/src/ChickenAPI.Enums/Game/Character/HairStyleType.cs deleted file mode 100644 index 009c76fb..00000000 --- a/src/ChickenAPI.Enums/Game/Character/HairStyleType.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace ChickenAPI.Enums.Game.Character -{ - public enum HairStyleType : byte - { - HairStyleA = 0, - HairStyleB = 1, - HairStyleC = 2, - HairStyleD = 3, - NoHair = 4 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Game/Entity/ElementType.cs b/src/ChickenAPI.Enums/Game/Entity/ElementType.cs deleted file mode 100644 index 8af2bb11..00000000 --- a/src/ChickenAPI.Enums/Game/Entity/ElementType.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace ChickenAPI.Enums.Game.Entity -{ - public enum ElementType - { - Neutral, - Fire, - Water, - Light, - Dark - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Game/Entity/EntityType.cs b/src/ChickenAPI.Enums/Game/Entity/EntityType.cs deleted file mode 100644 index 72cbfc06..00000000 --- a/src/ChickenAPI.Enums/Game/Entity/EntityType.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace ChickenAPI.Enums.Game.Entity -{ -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Game/Entity/ReqInfoType.cs b/src/ChickenAPI.Enums/Game/Entity/ReqInfoType.cs deleted file mode 100644 index e81bc0b0..00000000 --- a/src/ChickenAPI.Enums/Game/Entity/ReqInfoType.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace ChickenAPI.Enums.Game.Entity -{ - public enum ReqInfoType - { - ItemInfo = 12, - MateInfo = 6, - - NpcInfo = 5 - // Default => Player - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Game/Entity/VisualType.cs b/src/ChickenAPI.Enums/Game/Entity/VisualType.cs deleted file mode 100644 index 1616d90e..00000000 --- a/src/ChickenAPI.Enums/Game/Entity/VisualType.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace ChickenAPI.Enums.Game.Entity -{ - public enum VisualType - { - Character = 1, - Npc = 2, - Monster = 3, - MapObject = 9, - - - Portal = 1000 // unknown yet - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Game/Families/FamilyAuthority.cs b/src/ChickenAPI.Enums/Game/Families/FamilyAuthority.cs deleted file mode 100644 index 1c4ce7ca..00000000 --- a/src/ChickenAPI.Enums/Game/Families/FamilyAuthority.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace ChickenAPI.Enums.Game.Families -{ - public enum FamilyAuthority - { - Head = 0, - Assistant = 1, - Manager = 2, - Member = 3 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Game/Families/FamilyAuthorityType.cs b/src/ChickenAPI.Enums/Game/Families/FamilyAuthorityType.cs deleted file mode 100644 index 2b255358..00000000 --- a/src/ChickenAPI.Enums/Game/Families/FamilyAuthorityType.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace ChickenAPI.Enums.Game.Families -{ - public enum FamilyAuthorityType - { - NONE = 0, - PUT = 1, - ALL = 2 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Game/Items/EInfoPacketType.cs b/src/ChickenAPI.Enums/Game/Items/EInfoPacketType.cs deleted file mode 100644 index 86c8c6ac..00000000 --- a/src/ChickenAPI.Enums/Game/Items/EInfoPacketType.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace ChickenAPI.Enums.Game.Items -{ - public enum EInfoPacketType - { - WeaponDefault = 0, - MainWeaponArcher = 1, - Armor = 2, - Hat = 3, - Jewelery = 4, - MainWeaponMagician = 5, - - Specialist = 8 - // Box 7 - 11 - 12 - 13 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Game/Items/InventoryType.cs b/src/ChickenAPI.Enums/Game/Items/InventoryType.cs deleted file mode 100644 index 5a5ddf09..00000000 --- a/src/ChickenAPI.Enums/Game/Items/InventoryType.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace ChickenAPI.Enums.Game.Items -{ - public enum InventoryType : byte - { - Equipment = 0, - Main = 1, - Etc = 2, - Miniland = 3, - Specialist = 6, - Costume = 7, - Wear = 8, - Bazaar = 9, - Warehouse = 10, - FamilyWareHouse = 11, - PetWarehouse = 12, - PartnerInventory = 13 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Game/Portals/PortalType.cs b/src/ChickenAPI.Enums/Game/Portals/PortalType.cs deleted file mode 100644 index 5c0448bc..00000000 --- a/src/ChickenAPI.Enums/Game/Portals/PortalType.cs +++ /dev/null @@ -1,21 +0,0 @@ -namespace ChickenAPI.Enums.Game.Portals -{ - public enum PortalType : sbyte - { - MapPortal = -1, - TsNormal = 0, // same over >127 - sbyte - Closed = 1, - Open = 2, - Miniland = 3, - TsEnd = 4, - TsEndClosed = 5, - Exit = 6, - ExitClosed = 7, - Raid = 8, - Effect = 9, // same as 13 - 19 and 20 - 126 - BlueRaid = 10, - DarkRaid = 11, - TimeSpace = 12, - ShopTeleport = 20 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Game/Relations/CharacterRelationType.cs b/src/ChickenAPI.Enums/Game/Relations/CharacterRelationType.cs deleted file mode 100644 index 66fa7837..00000000 --- a/src/ChickenAPI.Enums/Game/Relations/CharacterRelationType.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace ChickenAPI.Enums.Game.Relations -{ - public enum CharacterRelationType : short - { - Blocked = -1, - Friend = 0, - HiddenSpouse = 2, - Spouse = 5 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Packets/CancelPacketType.cs b/src/ChickenAPI.Enums/Packets/CancelPacketType.cs deleted file mode 100644 index ba6d9000..00000000 --- a/src/ChickenAPI.Enums/Packets/CancelPacketType.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace ChickenAPI.Enums.Packets -{ - public enum CancelPacketType - { - NotInCombatMode = 0, - InCombatMode = 2 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Packets/DelayPacketType.cs b/src/ChickenAPI.Enums/Packets/DelayPacketType.cs deleted file mode 100644 index a6ce5228..00000000 --- a/src/ChickenAPI.Enums/Packets/DelayPacketType.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace ChickenAPI.Enums.Packets -{ - public enum DelayPacketType - { - Button = 1, - Exploration = 2, - Locomotion = 3, - InUse = 4, - UnFreeze = 5, - Cooking = 6, - ItemInUse = 7, - Identify = 8, - OpenChest = 9, - BackToMiniland = 10, - Invocation = 11 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Packets/EffectType.cs b/src/ChickenAPI.Enums/Packets/EffectType.cs deleted file mode 100644 index c5cb63ea..00000000 --- a/src/ChickenAPI.Enums/Packets/EffectType.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace ChickenAPI.Enums.Packets -{ - public enum EffectType - { - Character = 1, - MateOrNpc = 2, - Monster = 3 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Packets/FInsPacketType.cs b/src/ChickenAPI.Enums/Packets/FInsPacketType.cs deleted file mode 100644 index b9ecd67b..00000000 --- a/src/ChickenAPI.Enums/Packets/FInsPacketType.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace ChickenAPI.Enums.Packets -{ - public enum FInsPacketType - { - Accept, - Refuse - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Packets/GuriPacketType.cs b/src/ChickenAPI.Enums/Packets/GuriPacketType.cs deleted file mode 100644 index 871ad8cc..00000000 --- a/src/ChickenAPI.Enums/Packets/GuriPacketType.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace ChickenAPI.Enums.Packets -{ - public enum GuriPacketType - { - Unknow = 2, - Unknow2 = 6, - Unknow3 = 10, - Unknow4 = 15, - AfterSumming = 19 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Packets/MShopPacketType.cs b/src/ChickenAPI.Enums/Packets/MShopPacketType.cs deleted file mode 100644 index d143ee8b..00000000 --- a/src/ChickenAPI.Enums/Packets/MShopPacketType.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace ChickenAPI.Enums.Packets -{ - public enum MShopPacketType - { - OpenShop = 0, - CloseShop = 1, - OpenDialog = 2 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Packets/MsgPacketType.cs b/src/ChickenAPI.Enums/Packets/MsgPacketType.cs deleted file mode 100644 index 28fbb042..00000000 --- a/src/ChickenAPI.Enums/Packets/MsgPacketType.cs +++ /dev/null @@ -1,16 +0,0 @@ -namespace ChickenAPI.Enums.Packets -{ - public enum ModalPacketType - { - Default = 1, - } - - public enum MsgPacketType - { - Whisper = 0, - PrivateChat = 1, - Shout = 2, - White = 3, - FamilyChat = 4 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Packets/OutPacketType.cs b/src/ChickenAPI.Enums/Packets/OutPacketType.cs deleted file mode 100644 index c2b05648..00000000 --- a/src/ChickenAPI.Enums/Packets/OutPacketType.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace ChickenAPI.Enums.Packets -{ - public enum OutPacketType - { - Character = 1, - MateOrNpc = 2, - Monster = 3 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Packets/PJoinPacketType.cs b/src/ChickenAPI.Enums/Packets/PJoinPacketType.cs deleted file mode 100644 index f59b77e7..00000000 --- a/src/ChickenAPI.Enums/Packets/PJoinPacketType.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace ChickenAPI.Enums.Packets -{ - public enum PJoinPacketType - { - Requested = 0, - Invited = 1, - Accepted = 3, - Declined = 4, - Sharing = 5, - AcceptedShare = 6, - DeclinedShare = 7 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Packets/PslPacketType.cs b/src/ChickenAPI.Enums/Packets/PslPacketType.cs deleted file mode 100644 index 14a10dc2..00000000 --- a/src/ChickenAPI.Enums/Packets/PslPacketType.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace ChickenAPI.Enums.Packets -{ - public enum PslPacketType - { - Unwear, - Wear - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Packets/RlPacketType.cs b/src/ChickenAPI.Enums/Packets/RlPacketType.cs deleted file mode 100644 index e2d64f0b..00000000 --- a/src/ChickenAPI.Enums/Packets/RlPacketType.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace ChickenAPI.Enums.Packets -{ - public enum RlPacketType - { - Normal, - WantToRegister = 1, - WantToUnregister = 2, - MemberAndAlreadyInList = 3 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Packets/SMemoPacketType.cs b/src/ChickenAPI.Enums/Packets/SMemoPacketType.cs deleted file mode 100644 index fe6496be..00000000 --- a/src/ChickenAPI.Enums/Packets/SMemoPacketType.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace ChickenAPI.Enums.Packets -{ - public enum SMemoPacketType - { - SuccessPlayer = 0, - SuccessNpc = 1, - FailNpc = 2, - FailPlayer = 3 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Packets/SayColorType.cs b/src/ChickenAPI.Enums/Packets/SayColorType.cs deleted file mode 100644 index b72239c7..00000000 --- a/src/ChickenAPI.Enums/Packets/SayColorType.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace ChickenAPI.Enums.Packets -{ - public enum SayColorType - { - White = 0, - PlayerSay = 1, - LightGreen = 3, - DarkGrey = 4, - RedWhisper = 5, - Blue = 6, - LightYellow = 7, - RedW = 8, - Yellow = 10, - Purple = 11, - Green = 12 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Packets/ShopEndPacketType.cs b/src/ChickenAPI.Enums/Packets/ShopEndPacketType.cs deleted file mode 100644 index 3eafd89f..00000000 --- a/src/ChickenAPI.Enums/Packets/ShopEndPacketType.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace ChickenAPI.Enums.Packets -{ - public enum ShopEndPacketType - { - PersonalShop = 0, - CloseSubWindow = 1, // todo confirm that enum - CloseWindow = 2 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Packets/SlPacketType.cs b/src/ChickenAPI.Enums/Packets/SlPacketType.cs deleted file mode 100644 index 7e3a03b2..00000000 --- a/src/ChickenAPI.Enums/Packets/SlPacketType.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace ChickenAPI.Enums.Packets -{ - public enum SlPacketType - { - WearSp = 0, - ChangePoints = 10 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Packets/SuPacketHitMode.cs b/src/ChickenAPI.Enums/Packets/SuPacketHitMode.cs deleted file mode 100644 index 602eab03..00000000 --- a/src/ChickenAPI.Enums/Packets/SuPacketHitMode.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace ChickenAPI.Enums.Packets -{ - public enum SuPacketHitMode : byte - { - SuccessAttack = 0, - Miss = 1, - CriticalAttack = 3 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Enums/Packets/UpgradePacketType.cs b/src/ChickenAPI.Enums/Packets/UpgradePacketType.cs deleted file mode 100644 index 579c71a7..00000000 --- a/src/ChickenAPI.Enums/Packets/UpgradePacketType.cs +++ /dev/null @@ -1,36 +0,0 @@ -namespace ChickenAPI.Enums.Packets -{ - public enum UpgradePacketType - { - #region Item - - ItemToPart = 0, - UpgradeItem = 1, // UpgradeMode.Normal, UpgradeProtection.None, hasAmulet: HasAmulet - CellonItem = 3, - RarifyItem = 7, // mode, protection - UpgradeItemProtected = 20, // UpgradeMode.Normal, UpgradeProtection.Protected, hasAmulet: HasAmulet - RarifyItemProtected = 21, // RarifyMode.Normal, RarifyProtection.Scroll - UpgradeItemGoldScroll = 43, // UpgradeMode.Reduced, UpgradeProtection.Protected, hasAmulet: hasAmulet ( Gold scroll) - FusionItem = 53, - - #endregion Item - - SumResistance = 8, - - #region Specialist - - UpgradeSpNoProtection = 9, // UpgradeProtection.None - UpgradeSpProtected = 25, // Scroll Blue or red - Need to verify - UpgradeSpProtected2 = 26, // Scroll Blue or red - Need to verify - PerfectSp = 41, - UpgradeSpChiken = 35, // Scroll Chiken - event - UpgradeSpPyjama = 38, // Scroll Pyjama - Event - UpgradeSpPirate = 42, // Scroll Pirate - Event - - #endregion Specialist - - CreateFairyFernon = 52, - CreateFairyErenia = 51, - CreateFairyZenas = 50 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Game.Extensions/ChickenAPI.Game.Extensions.csproj b/src/ChickenAPI.Game.Extensions/ChickenAPI.Game.Extensions.csproj index e4c1e83a..1cd295be 100644 --- a/src/ChickenAPI.Game.Extensions/ChickenAPI.Game.Extensions.csproj +++ b/src/ChickenAPI.Game.Extensions/ChickenAPI.Game.Extensions.csproj @@ -1,12 +1,16 @@ - + netstandard2.0 + + + + + - diff --git a/src/ChickenAPI.Game/Helpers/CellonGeneratorHelper.cs b/src/ChickenAPI.Game.Extensions/Helpers/CellonGeneratorHelper.cs similarity index 99% rename from src/ChickenAPI.Game/Helpers/CellonGeneratorHelper.cs rename to src/ChickenAPI.Game.Extensions/Helpers/CellonGeneratorHelper.cs index d02bf65d..aec713e3 100644 --- a/src/ChickenAPI.Game/Helpers/CellonGeneratorHelper.cs +++ b/src/ChickenAPI.Game.Extensions/Helpers/CellonGeneratorHelper.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; +using ChickenAPI.Data.Enums.Game.Items; using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; namespace ChickenAPI.Game.Helpers { diff --git a/src/ChickenAPI.Game/Helpers/EmojiHelper.cs b/src/ChickenAPI.Game.Extensions/Helpers/EmojiHelper.cs similarity index 79% rename from src/ChickenAPI.Game/Helpers/EmojiHelper.cs rename to src/ChickenAPI.Game.Extensions/Helpers/EmojiHelper.cs index 6dc78514..13c03a89 100644 --- a/src/ChickenAPI.Game/Helpers/EmojiHelper.cs +++ b/src/ChickenAPI.Game.Extensions/Helpers/EmojiHelper.cs @@ -1,7 +1,7 @@ -using ChickenAPI.Enums.Game.Effects; +using ChickenAPI.Data.Enums.Game.Effects; using ChickenAPI.Game.Effects; using ChickenAPI.Game._ECS.Entities; -using ChickenAPI.Packets.Game.Client.Player; +using ChickenAPI.Packets.ServerPackets.Player; namespace ChickenAPI.Game.Helpers { diff --git a/src/ChickenAPI.Core/Utils/PositionHelper.cs b/src/ChickenAPI.Game.Extensions/Helpers/PositionHelper.cs similarity index 100% rename from src/ChickenAPI.Core/Utils/PositionHelper.cs rename to src/ChickenAPI.Game.Extensions/Helpers/PositionHelper.cs diff --git a/src/ChickenAPI.Game/Helpers/ShellGeneratorHelper.cs b/src/ChickenAPI.Game.Extensions/Helpers/ShellGeneratorHelper.cs similarity index 100% rename from src/ChickenAPI.Game/Helpers/ShellGeneratorHelper.cs rename to src/ChickenAPI.Game.Extensions/Helpers/ShellGeneratorHelper.cs diff --git a/src/ChickenAPI.Game/Helpers/TeleportationHelper.cs b/src/ChickenAPI.Game.Extensions/Helpers/TeleportationHelper.cs similarity index 100% rename from src/ChickenAPI.Game/Helpers/TeleportationHelper.cs rename to src/ChickenAPI.Game.Extensions/Helpers/TeleportationHelper.cs index 2573b6b1..b9b81d07 100644 --- a/src/ChickenAPI.Game/Helpers/TeleportationHelper.cs +++ b/src/ChickenAPI.Game.Extensions/Helpers/TeleportationHelper.cs @@ -2,10 +2,10 @@ using System.Threading.Tasks; using Autofac; using ChickenAPI.Core.IoC; -using ChickenAPI.Game.Entities.Extensions; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Managers; using ChickenAPI.Game._ECS.Entities; +using ChickenAPI.Game.Entities.Extensions; namespace ChickenAPI.Game.Helpers { diff --git a/src/ChickenAPI.Game/Helpers/UIHelper.cs b/src/ChickenAPI.Game.Extensions/Helpers/UIHelper.cs similarity index 60% rename from src/ChickenAPI.Game/Helpers/UIHelper.cs rename to src/ChickenAPI.Game.Extensions/Helpers/UIHelper.cs index 6ca70ba0..37d563f3 100644 --- a/src/ChickenAPI.Game/Helpers/UIHelper.cs +++ b/src/ChickenAPI.Game.Extensions/Helpers/UIHelper.cs @@ -1,12 +1,10 @@ using System.Threading.Tasks; -using ChickenAPI.Core.i18n; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; using ChickenAPI.Game._i18n; -using ChickenAPI.Packets; -using ChickenAPI.Packets.Game.Client.Player; -using ChickenAPI.Packets.Game.Server.UserInterface; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.Interfaces; +using ChickenAPI.Packets.ServerPackets.UI; namespace ChickenAPI.Game.Helpers { @@ -14,55 +12,59 @@ public static class UIHelper { public static Task SendGuri(this IPlayerEntity player, GuriPacketType type, byte argument, int value = 0) => player.SendPacketAsync(player.GenerateGuriPacket(type, argument, value)); - public static ClientGuriPacket GenerateGuriPacket(this IPlayerEntity player, GuriPacketType type, byte argument, int value = 0) + public static GuriPacket GenerateGuriPacket(this IPlayerEntity player, GuriPacketType type, byte argument, int value = 0) { + return null; + /* switch (type) { case GuriPacketType.Unknow: - return new ClientGuriPacket + return new GuriPacket { - Type = 2, - Argument = argument, - VisualId = player.Id + Type = (GuriPacketType)2, + EntityId = player.Id, + Unknown = argument, + Value = (uint)value, }; case GuriPacketType.Unknow2: - return new ClientGuriPacket + return new GuriPacket { Type = 6, Argument = 1, - VisualId = player.Id, - Value = 0, + VisualEntityId = player.Id, + Value = "0", Data = 0 }; case GuriPacketType.Unknow3: - return new ClientGuriPacket + return new GuriPacket { Type = 10, Argument = argument, - VisualId = value, - Value = player.Id + VisualEntityId = value, + Value = player.Id.ToString() }; case GuriPacketType.Unknow4: - return new ClientGuriPacket + return new GuriPacket { Type = 15, Argument = argument, - VisualId = 0, + VisualEntityId = 0, Data = 0 }; default: - return new ClientGuriPacket + return new GuriPacket { Type = (int)type, Argument = argument, - VisualId = player.Id, - Value = value + VisualEntityId = player.Id, + Value = value.ToString() }; } + */ } public static Task SendChatMessageFormat(this IPlayerEntity player, PlayerMessages key, SayColorType color, params object[] objs) @@ -79,24 +81,24 @@ public static Task SendChatMessageAsync(this IPlayerEntity player, PlayerMessage public static Task SendChatMessageAsync(this IPlayerEntity player, string msg, SayColorType color) => player.SendPacketAsync(player.GenerateSayPacket(msg, color)); - public static Task SendTopscreenMessage(this IPlayerEntity player, string msg, MsgPacketType type) => player.SendPacketAsync(player.GenerateMsgPacket(msg, type)); + public static Task SendTopscreenMessage(this IPlayerEntity player, string msg, MessageType type) => player.SendPacketAsync(player.GenerateMsgPacket(msg, type)); public static Task GenerateBSInfo(this IPlayerEntity player, byte mode, short title, short time, short text) => player.SendPacketAsync(player.GenerateBSInfoPacket(mode, title, time, text)); public static Task GenerateCHDM(this IPlayerEntity player, int maxhp, int angeldmg, int demondmg, int time) => player.SendPacketAsync(player.GenerateCHDMPacket(maxhp, angeldmg, demondmg, time)); - public static Task SendDialog(this IPlayerEntity player, PacketBase acceptpacket, PacketBase refusepacket, string question) => - player.SendPacketAsync(player.GenerateDialogPacket(acceptpacket, refusepacket, question)); + public static Task SendDialog(this IPlayerEntity player, IPacket yesPacket, IPacket noPacket, string question) => + player.SendPacketAsync(player.GenerateDialogPacket(yesPacket, noPacket, question)); - public static Task SendQuestionAsync(this IPlayerEntity player, PacketBase acceptpacket, string question) => player.SendPacketAsync(player.GenerateQnaPacket(acceptpacket, question)); + public static Task SendQuestionAsync(this IPlayerEntity player, IPacket yesPacket, string question) => player.SendPacketAsync(player.GenerateQnaPacket(yesPacket, question)); - public static Task GenerateDelay(this IPlayerEntity player, int delay, DelayPacketType type, string argument) => player.SendPacketAsync(player.GenerateDelayPacket(delay, type, argument)); + public static Task SendDelayAsync(this IPlayerEntity player, short delay, DelayPacketType type, IPacket argument) => player.SendPacketAsync(player.GenerateDelayPacket(delay, type, argument)); - public static QnaPacket GenerateQnaPacket(this IPlayerEntity player, PacketBase acceptpacket, string question) => + public static QnaPacket GenerateQnaPacket(this IPlayerEntity player, IPacket yesPacket, string question) => new QnaPacket { - AcceptPacket = acceptpacket, + YesPacket = yesPacket, Question = question }; @@ -109,29 +111,29 @@ public static BSInfoPacket GenerateBSInfoPacket(this IPlayerEntity player, byte Text = text }; - public static ChDMPacket GenerateCHDMPacket(this IPlayerEntity player, int maxhp, int angeldmg, int demondmg, int time) => + public static ChDMPacket GenerateCHDMPacket(this IPlayerEntity player, int maxHp, int angelDamage, int demonDamage, int time) => new ChDMPacket { - Maxhp = maxhp, - AngelDMG = angeldmg, - DemonDMG = demondmg, + Maxhp = maxHp, + AngelDMG = angelDamage, + DemonDMG = demonDamage, Time = time }; - public static DialogPacket GenerateDialogPacket(this IPlayerEntity player, PacketBase acceptpacket, PacketBase refusepacket, string question) => - new DialogPacket + public static DlgPacket GenerateDialogPacket(this IPlayerEntity player, IPacket yesPacket, IPacket noPacket, string question) => + new DlgPacket { - AcceptPacket = acceptpacket, - RefusePacket = refusepacket, + YesPacket = yesPacket, + NoPacket = noPacket, Question = question }; - public static DelayPacket GenerateDelayPacket(this IPlayerEntity player, int delay, DelayPacketType type, string argument) => + public static DelayPacket GenerateDelayPacket(this IPlayerEntity player, short delay, DelayPacketType type, IPacket packet) => new DelayPacket { Delay = delay, - Type = type, - Argument = argument + Type = (byte)type, + Packet = packet, }; } } \ No newline at end of file diff --git a/src/ChickenAPI.Game.Extensions/PacketGeneration/ChatPacketExtensions.cs b/src/ChickenAPI.Game.Extensions/PacketGeneration/ChatPacketExtensions.cs index fa8e9c52..83c8d157 100644 --- a/src/ChickenAPI.Game.Extensions/PacketGeneration/ChatPacketExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/PacketGeneration/ChatPacketExtensions.cs @@ -1,8 +1,8 @@ using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory.Extensions; -using ChickenAPI.Packets.Game.Server.Chat; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Chats; namespace ChickenAPI.Game.Extensions.PacketGeneration { @@ -19,11 +19,13 @@ public static SayItemPacket GenerateSayItemPacket(this IPlayerEntity player, str VisualId = player.Id, VisualType = player.Type, Message = message.Replace(' ', '^'), - ItemData = new SayItemPacket.SayItemSubPacket - { - IconId = item.Item.Type == InventoryType.Equipment ? (long?)null : item.ItemId, - EquipmentInfo = item.Item.Type == InventoryType.Equipment ? item.GenerateEInfoPacket() : null - }, + ItemData = item.Item.Type == PocketType.Equipment + ? null + : new SayItemPacket.SayItemSubPacket + { + IconId = item.Item.Type == PocketType.Equipment ? (long?)null : item.ItemId, + }, + EquipmentInfo = item.Item.Type == PocketType.Equipment ? item.GenerateEInfoPacket() : null }; } } diff --git a/src/ChickenAPI.Game.Extensions/PacketGeneration/TcInfoPacketExtension.cs b/src/ChickenAPI.Game.Extensions/PacketGeneration/TcInfoPacketExtension.cs new file mode 100644 index 00000000..06e7013c --- /dev/null +++ b/src/ChickenAPI.Game.Extensions/PacketGeneration/TcInfoPacketExtension.cs @@ -0,0 +1,96 @@ +using ChickenAPI.Data.Item; +using ChickenAPI.Game.Entities.Player; +using ChickenAPI.Game.Entities.Player.Extensions; +using ChickenAPI.Game.Inventory.Extensions; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Player; +using EquipmentType = ChickenAPI.Data.Enums.Game.Items.EquipmentType; + +namespace ChickenAPI.Game.Extensions.PacketGeneration +{ + public static class TcInfoPacketExtension + { + public static TitPacket GenerateTitPacket(this IPlayerEntity player) + { + return new TitPacket + { + ClassType = player.Character.Class == CharacterClassType.Adventurer ? "Adventurer" : + player.Character.Class == CharacterClassType.Archer ? "Archer" : + player.Character.Class == CharacterClassType.Magician ? "Mage" : + player.Character.Class == CharacterClassType.Swordman ? "Swordman" : "Martial", + Name = player.Character.Name + }; + } + + public static TcInfoPacket GenerateTcInfo(this IPlayerEntity charac) + { + ItemInstanceDto fairy = null; + ItemInstanceDto armor = null; + ItemInstanceDto weapon2 = null; + ItemInstanceDto weapon = null; + if (charac.Inventory != null) + { + fairy = charac.Inventory.GetWeared(EquipmentType.Fairy); + armor = charac.Inventory.GetWeared(EquipmentType.Armor); + weapon2 = charac.Inventory.GetWeared(EquipmentType.SecondaryWeapon); + weapon = charac.Inventory.GetWeared(EquipmentType.MainWeapon); + } + + bool isPvpPrimary = false; + bool isPvpSecondary = false; + bool isPvpArmor = false; + + if (weapon?.Item.Name.Contains(": ") == true) + { + isPvpPrimary = true; + } + + isPvpSecondary |= weapon2?.Item.Name.Contains(": ") == true; + isPvpArmor |= armor?.Item.Name.Contains(": ") == true; + + // tc_info 0 name 0 0 0 0 -1 - 0 0 0 0 0 0 0 0 0 0 0 wins deaths reput 0 0 0 morph + // talentwin talentlose capitul rankingpoints arenapoints 0 0 ispvpprimary ispvpsecondary + // ispvparmor herolvl desc + return new TcInfoPacket + { + Level = charac.Level, + Name = charac.Character.Name, + Element = fairy?.ElementType ?? ElementType.Neutral, + ElementRate = fairy?.ElementRate ?? 0, + Class = charac.Character.Class, + Gender = charac.Character.Gender, + Family = charac.HasFamily ? charac.Family.Name : "-1 -", + ReputationIco = charac.GetReputIcon(), + DignityIco = charac.GetDignityIcon(), + HaveWeapon = weapon != null ? 1 : 0, + WeaponRare = weapon?.Rarity ?? 0, + WeaponUpgrade = weapon?.Upgrade ?? 0, + HaveSecondary = weapon2 != null ? 1 : 0, + SecondaryRare = weapon2?.Rarity ?? 0, + SecondaryUpgrade = weapon?.Upgrade ?? 0, + HaveArmor = armor != null ? 1 : 0, + ArmorRare = armor?.Rarity ?? 0, + ArmorUpgrade = armor?.Upgrade ?? 0, + Act4Kill = charac.Character.Act4Kill, + Act4Dead = charac.Character.Act4Dead, + Reputation = charac.Character.Reput, + Unknow = 0, + Unknow2 = 0, + Unknow3 = 0, + Unknow4 = 0, + Morph = charac.MorphId, + TalentLose = charac.Character.TalentLose, + TalentSurrender = charac.Character.TalentSurrender, + TalentWin = charac.Character.TalentWin, + MasterPoints = charac.Character.MasterPoints, + Compliments = charac.Character.Compliment, + Act4Points = charac.Character.Act4Points, + isPvpArmor = isPvpArmor, + isPvpPrimary = isPvpPrimary, + isPvpSecondary = isPvpSecondary, + HeroLevel = charac.HeroLevel, + Biography = string.IsNullOrEmpty(charac.Character.Biography) ? " REKT BOY" : charac.Character.Biography + }; + } + } +} \ No newline at end of file diff --git a/src/ChickenAPI.Game/Battle/Extensions/BattleBuffExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/BattleBuffExtensions.cs similarity index 100% rename from src/ChickenAPI.Game/Battle/Extensions/BattleBuffExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/BattleBuffExtensions.cs diff --git a/src/ChickenAPI.Game/Battle/Extensions/BattleCheckExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/BattleCheckExtensions.cs similarity index 100% rename from src/ChickenAPI.Game/Battle/Extensions/BattleCheckExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/BattleCheckExtensions.cs diff --git a/src/ChickenAPI.Game/Battle/Extensions/BattleEntityStatsManagement.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/BattleEntityStatsManagement.cs similarity index 100% rename from src/ChickenAPI.Game/Battle/Extensions/BattleEntityStatsManagement.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/BattleEntityStatsManagement.cs diff --git a/src/ChickenAPI.Game/Entities/Player/Extensions/CInfoPacketExtension.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/CInfoPacketExtension.cs similarity index 81% rename from src/ChickenAPI.Game/Entities/Player/Extensions/CInfoPacketExtension.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/CInfoPacketExtension.cs index ff11550a..5eb4c988 100644 --- a/src/ChickenAPI.Game/Entities/Player/Extensions/CInfoPacketExtension.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/CInfoPacketExtension.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Packets.Game.Server.Player; +using ChickenAPI.Packets.ServerPackets.Player; namespace ChickenAPI.Game.Entities.Player.Extensions { @@ -10,10 +10,10 @@ public static CInfoPacket GenerateCInfoPacket(this IPlayerEntity player) => Name = player.Character.Name, Unknown1 = "-", //TODO: Find signification GroupId = -1, - FamilyId = player.Family?.Id ?? -1, // todo : family system + FamilyId = (int)(player.Family?.Id ?? -1), FamilyName = player.Family?.Name ?? "-", CharacterId = player.Character.Id, - NameAppearance = player.NameAppearance, + Authority = (byte)player.NameAppearance, Gender = player.Character.Gender, HairStyle = player.Character.HairStyle, HairColor = player.Character.HairColor, @@ -23,7 +23,7 @@ public static CInfoPacket GenerateCInfoPacket(this IPlayerEntity player) => Morph = player.MorphId, Invisible = player.IsInvisible, FamilyLevel = 0, - SpUpgrade = player.Sp?.Upgrade ?? 0, + MorphUpgrade = player.Sp?.Upgrade ?? 0, ArenaWinner = player.Character.ArenaWinner }; } diff --git a/src/ChickenAPI.Game.Extensions/_TOCLEAN/CModePacketExtension.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/CModePacketExtension.cs new file mode 100644 index 00000000..a9f471c6 --- /dev/null +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/CModePacketExtension.cs @@ -0,0 +1,18 @@ +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Player; + +namespace ChickenAPI.Game.Entities.Player.Extensions +{ + public static class CModePacketExtension + { + public static CModePacket GenerateCModePacket(this IPlayerEntity player) => new CModePacket + { + VisualType = VisualType.Player, + VisualId = player.Id, + Morph = player.MorphId, + MorphUpgrade = player.Sp?.Upgrade ?? 0, + MorphDesign = player.Sp?.Design ?? 0, + MorphBonus = (byte)(player.Character.ArenaWinner ? 1 : 0) + }; + } +} \ No newline at end of file diff --git a/src/ChickenAPI.Game/Battle/Extensions/CancelPacketExtension.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/CancelPacketExtension.cs similarity index 79% rename from src/ChickenAPI.Game/Battle/Extensions/CancelPacketExtension.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/CancelPacketExtension.cs index 3085399e..0b1b87cc 100644 --- a/src/ChickenAPI.Game/Battle/Extensions/CancelPacketExtension.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/CancelPacketExtension.cs @@ -1,6 +1,6 @@ -using ChickenAPI.Enums.Packets; -using ChickenAPI.Game.Battle.Interfaces; -using ChickenAPI.Packets.Game.Server.Battle; +using ChickenAPI.Game.Battle.Interfaces; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Battle; namespace ChickenAPI.Game.Battle.Extensions { diff --git a/src/ChickenAPI.Game/Battle/Extensions/CtPacketExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/CtPacketExtensions.cs similarity index 93% rename from src/ChickenAPI.Game/Battle/Extensions/CtPacketExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/CtPacketExtensions.cs index 44a0ece6..f669d91b 100644 --- a/src/ChickenAPI.Game/Battle/Extensions/CtPacketExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/CtPacketExtensions.cs @@ -1,7 +1,7 @@ using ChickenAPI.Data.Skills; using ChickenAPI.Game.Battle.Interfaces; using ChickenAPI.Game._ECS.Entities; -using ChickenAPI.Packets.Game.Server.Battle; +using ChickenAPI.Packets.ServerPackets.Battle; namespace ChickenAPI.Game.Battle.Extensions { diff --git a/src/ChickenAPI.Game/Entities/Drop/Extensions/DropExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/DropExtensions.cs similarity index 54% rename from src/ChickenAPI.Game/Entities/Drop/Extensions/DropExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/DropExtensions.cs index 18678fef..72fc7606 100644 --- a/src/ChickenAPI.Game/Entities/Drop/Extensions/DropExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/DropExtensions.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Packets.Game.Server.Entities; +using ChickenAPI.Packets.ServerPackets.Entities; namespace ChickenAPI.Game.Entities.Drop.Extensions { @@ -7,14 +7,13 @@ public static class DropExtensions public static DropPacket GenerateDropPacket(this IDropEntity drop) => new DropPacket { - ItemVnum = drop.ItemVnum, - Quantity = drop.Quantity, + VisualId = drop.Id, + Amount = (short)drop.Quantity, + VNum = (short)drop.ItemVnum, PositionX = drop.Position.X, PositionY = drop.Position.Y, - TransportId = drop.Id, - IsQuestDrop = drop.IsQuestDrop, - Unknown = 0, - Unknown2 = -1 + Unknown = (byte)(drop.IsQuestDrop ? 1 : 0), + OwnerId = drop.Id, }; } } \ No newline at end of file diff --git a/src/ChickenAPI.Game/Inventory/Extensions/EInfoPacketExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/EInfoPacketExtensions.cs similarity index 97% rename from src/ChickenAPI.Game/Inventory/Extensions/EInfoPacketExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/EInfoPacketExtensions.cs index dcdd87ed..fdb8451e 100644 --- a/src/ChickenAPI.Game/Inventory/Extensions/EInfoPacketExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/EInfoPacketExtensions.cs @@ -1,6 +1,8 @@ -using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Packets.Game.Server.Inventory; +using ChickenAPI.Data.Enums.Game.Items; +using ChickenAPI.Data.Item; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Inventory; +using EquipmentType = ChickenAPI.Data.Enums.Game.Items.EquipmentType; namespace ChickenAPI.Game.Inventory.Extensions { diff --git a/src/ChickenAPI.Game.Extensions/_TOCLEAN/EqPacketExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/EqPacketExtensions.cs new file mode 100644 index 00000000..9c7a3055 --- /dev/null +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/EqPacketExtensions.cs @@ -0,0 +1,124 @@ +using System.Collections.Generic; +using ChickenAPI.Data.Item; +using ChickenAPI.Game.Entities.Player; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Inventory; +using ChickenAPI.Packets.ServerPackets.Visibility; + +namespace ChickenAPI.Game.Inventory.Extensions +{ + public static class EqPacketExtensions + { + public static InEquipmentSubPacket GenerateEqListInfoPacket(this InventoryComponent inventory) => new InEquipmentSubPacket + { + Hat = (short?)inventory.Wear[(int)EquipmentType.Hat]?.ItemId ?? -1, + Armor = (short?)inventory.Wear[(int)EquipmentType.Armor]?.ItemId ?? -1, + MainWeapon = (short?)inventory.Wear[(int)EquipmentType.MainWeapon]?.ItemId ?? -1, + SecondaryWeapon = (short?)inventory.Wear[(int)EquipmentType.SecondaryWeapon]?.ItemId ?? -1, + Mask = (short?)inventory.Wear[(int)EquipmentType.Mask]?.ItemId ?? -1, + Fairy = (short?)inventory.Wear[(int)EquipmentType.Fairy]?.ItemId ?? -1, + CostumeSuit = (short?)inventory.Wear[(int)EquipmentType.CostumeSuit]?.ItemId ?? -1, + CostumeHat = (short?)inventory.Wear[(int)EquipmentType.CostumeHat]?.ItemId ?? -1, + WeaponSkin = (short?)inventory.Wear[(int)EquipmentType.WeaponSkin]?.ItemId ?? -1 + }; + + public static UpgradeRareSubPacket GenerateEqRareInfoPacket(this InventoryComponent inventory, EquipmentType type) => new UpgradeRareSubPacket + { + Upgrade = inventory.Wear[(int)type]?.Upgrade ?? 0, + Rare = inventory.Wear[(int)type]?.Rarity ?? 0 + }; + + public static EqPacket GenerateEqPacket(this IPlayerEntity player) => new EqPacket + { + VisualId = player.Id, + Visibility = (byte)player.NameAppearance, + Gender = player.Character.Gender, + HairStyle = player.Character.HairStyle, + Haircolor = player.Character.HairColor, + ClassType = player.Character.Class, + ArmorUpgradeRarePacket = player.Inventory.GenerateEqRareInfoPacket(EquipmentType.Armor), + WeaponUpgradeRarePacket = player.Inventory.GenerateEqRareInfoPacket(EquipmentType.MainWeapon), + EqSubPacket = player.Inventory.GenerateEqListInfoPacket(), + }; + + /// + /// This packet is used for character items equiped in "P" panel (wear items) + /// + /// + /// + public static EquipPacket GenerateEquipPacket(this IPlayerEntity player) + { + EquipmentSubPacket generateEquipmentSubPacket(EquipmentType eqType) + { + ItemInstanceDto eq = player.Inventory.Equipment[((short)eqType)]; + if (eq == null) + { + return null; + } + + return new EquipmentSubPacket + { + EquipmentType = eqType, + VNum = (short)eq.ItemId, + Rare = eq.Rarity, + Upgrade = (eq?.Item.IsColored == true ? eq?.Design : eq?.Upgrade) ?? 0, + Unknown = 0, + }; + } + + List tmp = new List(); + ItemInstanceDto[] subInventory = player.Inventory.Wear; + + for (int i = 0; i < subInventory.Length; i++) + { + ItemInstanceDto item = subInventory[i]; + if (item == null) + { + continue; + } + + tmp.Add(new EquipmentSubPacket() + { + EquipmentType = (EquipmentType)i, + VNum = (short)item.ItemId, + Rare = (byte)item.Rarity, + Upgrade = item.Item.IsColored ? item.Design : item.Upgrade, + Unknown = 0 + }); + } + + var weapon = new UpgradeRareSubPacket + { + Upgrade = player.Weapon?.Upgrade ?? 0, + Rare = (player.Weapon?.Rarity ?? 0) + }; + var armor = new UpgradeRareSubPacket + { + Upgrade = player.Armor?.Upgrade ?? 0, + Rare = (player.Armor?.Rarity ?? 0) + }; + + return new EquipPacket + { + WeaponUpgradeRareSubPacket = weapon, + ArmorUpgradeRareSubPacket = armor, + Armor = generateEquipmentSubPacket(EquipmentType.Armor), + WeaponSkin = generateEquipmentSubPacket(EquipmentType.WeaponSkin), + SecondaryWeapon = generateEquipmentSubPacket(EquipmentType.SecondaryWeapon), + Sp = generateEquipmentSubPacket(EquipmentType.Sp), + Amulet = generateEquipmentSubPacket(EquipmentType.Amulet), + Boots = generateEquipmentSubPacket(EquipmentType.Boots), + CostumeHat = generateEquipmentSubPacket(EquipmentType.CostumeHat), + CostumeSuit = generateEquipmentSubPacket(EquipmentType.CostumeSuit), + Fairy = generateEquipmentSubPacket(EquipmentType.Fairy), + Gloves = generateEquipmentSubPacket(EquipmentType.Gloves), + Hat = generateEquipmentSubPacket(EquipmentType.Hat), + MainWeapon = generateEquipmentSubPacket(EquipmentType.MainWeapon), + Mask = generateEquipmentSubPacket(EquipmentType.Mask), + Necklace = generateEquipmentSubPacket(EquipmentType.Necklace), + Ring = generateEquipmentSubPacket(EquipmentType.Ring), + Bracelet = generateEquipmentSubPacket(EquipmentType.Bracelet), + }; + } + } +} \ No newline at end of file diff --git a/src/ChickenAPI.Game/Entities/Player/Extensions/ExperienceManagerExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/ExperienceManagerExtensions.cs similarity index 100% rename from src/ChickenAPI.Game/Entities/Player/Extensions/ExperienceManagerExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/ExperienceManagerExtensions.cs diff --git a/src/ChickenAPI.Game/Families/Extensions/FamilyCheckExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/FamilyCheckExtensions.cs similarity index 100% rename from src/ChickenAPI.Game/Families/Extensions/FamilyCheckExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/FamilyCheckExtensions.cs diff --git a/src/ChickenAPI.Game/Entities/Player/Extensions/FdPacketExtension.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/FdPacketExtension.cs similarity index 98% rename from src/ChickenAPI.Game/Entities/Player/Extensions/FdPacketExtension.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/FdPacketExtension.cs index 13a13c6d..12a841f0 100644 --- a/src/ChickenAPI.Game/Entities/Player/Extensions/FdPacketExtension.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/FdPacketExtension.cs @@ -1,6 +1,6 @@ using System; -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Packets.Game.Server.Player; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Player; namespace ChickenAPI.Game.Entities.Player.Extensions { diff --git a/src/ChickenAPI.Game/Entities/Player/Extensions/FsPacketExtension.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/FsPacketExtension.cs similarity index 88% rename from src/ChickenAPI.Game/Entities/Player/Extensions/FsPacketExtension.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/FsPacketExtension.cs index 9d138df9..d7b995a6 100644 --- a/src/ChickenAPI.Game/Entities/Player/Extensions/FsPacketExtension.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/FsPacketExtension.cs @@ -1,6 +1,5 @@ using System.Threading.Tasks; -using ChickenAPI.Packets.Game.Client.Player; -using ChickenAPI.Packets.Game.Server.Player; +using ChickenAPI.Packets.ServerPackets.Player; namespace ChickenAPI.Game.Entities.Player.Extensions { diff --git a/src/ChickenAPI.Game/Families/Extensions/GInfoPacketExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/GInfoPacketExtensions.cs similarity index 96% rename from src/ChickenAPI.Game/Families/Extensions/GInfoPacketExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/GInfoPacketExtensions.cs index 548544d3..8323afd7 100644 --- a/src/ChickenAPI.Game/Families/Extensions/GInfoPacketExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/GInfoPacketExtensions.cs @@ -1,5 +1,5 @@ using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Packets.Game.Client.Families; +using ChickenAPI.Packets.ServerPackets.Families; namespace ChickenAPI.Game.Families.Extensions { diff --git a/src/ChickenAPI.Game/Inventory/Extensions/GenerateHeroicShellExtensioncs.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/GenerateHeroicShellExtensioncs.cs similarity index 95% rename from src/ChickenAPI.Game/Inventory/Extensions/GenerateHeroicShellExtensioncs.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/GenerateHeroicShellExtensioncs.cs index 4d4cb9e3..dc531e49 100644 --- a/src/ChickenAPI.Game/Inventory/Extensions/GenerateHeroicShellExtensioncs.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/GenerateHeroicShellExtensioncs.cs @@ -3,8 +3,9 @@ using Autofac; using ChickenAPI.Core.IoC; using ChickenAPI.Core.Maths; +using ChickenAPI.Data.Enums.Game.Items; +using ChickenAPI.Data.Enums.Game.Items.Upgrade; using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; namespace ChickenAPI.Game.Inventory.Extensions { diff --git a/src/ChickenAPI.Game/Entities/Player/Extensions/GetPacketExtension.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/GetPacketExtension.cs similarity index 61% rename from src/ChickenAPI.Game/Entities/Player/Extensions/GetPacketExtension.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/GetPacketExtension.cs index 9047d47e..277afd3e 100644 --- a/src/ChickenAPI.Game/Entities/Player/Extensions/GetPacketExtension.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/GetPacketExtension.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Packets.Game.Server.Inventory; +using ChickenAPI.Packets.ClientPackets.Drops; namespace ChickenAPI.Game.Entities.Player.Extensions { @@ -6,8 +6,9 @@ public static class GetPacketExtension { public static GetPacket GenerateGetPacket(this IPlayerEntity player, long itemId) => new GetPacket { - CharacterId = player.Id, - ItemId = itemId + PickerId = player.Id, + PickerType = player.Type, + VisualId = itemId }; } } \ No newline at end of file diff --git a/src/ChickenAPI.Game/Families/Extensions/GidxPacketExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/GidxPacketExtensions.cs similarity index 93% rename from src/ChickenAPI.Game/Families/Extensions/GidxPacketExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/GidxPacketExtensions.cs index 09443db4..6d18f646 100644 --- a/src/ChickenAPI.Game/Families/Extensions/GidxPacketExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/GidxPacketExtensions.cs @@ -1,5 +1,5 @@ using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Packets.Game.Client.Families; +using ChickenAPI.Packets.ClientPackets.Families; namespace ChickenAPI.Game.Families.Extensions { diff --git a/src/ChickenAPI.Game/Inventory/Extensions/GoldPacketExtension.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/GoldPacketExtension.cs similarity index 86% rename from src/ChickenAPI.Game/Inventory/Extensions/GoldPacketExtension.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/GoldPacketExtension.cs index e60a9557..465892d7 100644 --- a/src/ChickenAPI.Game/Inventory/Extensions/GoldPacketExtension.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/GoldPacketExtension.cs @@ -1,5 +1,5 @@ using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Packets.Game.Server.Inventory; +using ChickenAPI.Packets.ServerPackets.Inventory; namespace ChickenAPI.Game.Inventory.Extensions { diff --git a/src/ChickenAPI.Game/Groups/Extensions/GroupPlayerExtension.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/GroupPlayerExtension.cs similarity index 54% rename from src/ChickenAPI.Game/Groups/Extensions/GroupPlayerExtension.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/GroupPlayerExtension.cs index a3c93010..16462fe0 100644 --- a/src/ChickenAPI.Game/Groups/Extensions/GroupPlayerExtension.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/GroupPlayerExtension.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using System.Linq; -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Enums.Game.Entity; using ChickenAPI.Game.Entities.Mates; using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Packets.Game.Server.Group; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Groups; +using ChickenAPI.Packets.ServerPackets.Shop; namespace ChickenAPI.Game.Groups.Extensions { @@ -19,17 +19,17 @@ public static PstPacket GeneratePstPacket(this IPlayerEntity entity, ref int ico return new PstPacket { - VisualType = VisualType.Character, - GroupIndex = ++iconIndex, + Type = VisualType.Player, + GroupOrder = ++iconIndex, VisualId = entity.Id, - HpPercentage = entity.HpPercentage, - HpMax = entity.HpMax, - MpPercentage = entity.MpPercentage, - MpMax = entity.MpMax, - Gender = entity.Character.Gender, - Class = entity.Character.Class, + HpLeft = entity.HpPercentage, + HpLoad = entity.HpMax, + MpLeft = entity.MpPercentage, + MpLoad = entity.MpMax, + Gender = entity.Character.Gender, // 0 + Race = (short)entity.Character.Class, // 0 Morph = entity.MorphId, - Buffs = new List(entity.Buffs.Select(s => s.Id)) + BuffIds = new List(entity.Buffs.Select(s => (int)s.Id)) }; } @@ -42,65 +42,67 @@ public static PstPacket GeneratePstPacket(this IMateEntity entity, ref int iconI return new PstPacket { - VisualType = VisualType.Character, - GroupIndex = iconIndex++, + Type = VisualType.Player, + GroupOrder = iconIndex++, VisualId = entity.Id, - HpPercentage = entity.HpPercentage, - HpMax = entity.HpMax, - MpPercentage = entity.MpPercentage, - MpMax = entity.MpMax, + HpLeft = entity.HpPercentage, + HpLoad = entity.HpMax, + MpLeft = entity.MpPercentage, + MpLoad = entity.MpMax, Gender = GenderType.Male, // 0 - Class = CharacterClassType.Adventurer, // 0 + Race = (short)CharacterClassType.Adventurer, // 0 Morph = entity.MorphId, - Buffs = new List(entity.Buffs.Select(s => s.Id)) + BuffIds = new List(entity.Buffs.Select(s => (int)s.Id)) }; } - public static PInitPacket.PInitMateSubPacket GeneratePInitSubPacket(this IMateEntity mate, ref byte groupIndex) + public static PinitSubPacket GeneratePInitSubPacket(this IMateEntity mate, ref byte groupIndex) { if (mate == null) { return null; } - return new PInitPacket.PInitMateSubPacket + return new PinitSubPacket { VisualType = mate.Type, VisualId = mate.Id, - GroupIndex = ++groupIndex, + GroupPosition = ++groupIndex, Name = mate.Mate.Name.Replace(' ', '^'), Level = mate.Level, - MorphOrNpcMonsterId = mate.MorphId == 0 ? mate.NpcMonster.Id : mate.MorphId, + Morph = (short)(mate.MorphId == 0 ? mate.NpcMonster.Id : mate.MorphId), Unknown = -1, - Unknown2 = 0 + Gender = 0, + Race = 0, + HeroLevel = 0 }; } - public static PInitPacket.PInitPlayerSubPacket GeneratePinitSubPacket(this IPlayerEntity player, ref byte groupIndex) + public static PinitSubPacket GeneratePinitSubPacket(this IPlayerEntity player, ref byte groupIndex) { if (player == null) { return null; } - return new PInitPacket.PInitPlayerSubPacket + return new PinitSubPacket() { VisualType = player.Type, VisualId = player.Id, - MorphId = player.MorphId, - GroupIndex = ++groupIndex, + Morph = player.MorphId, + GroupPosition = ++groupIndex, Name = player.Character.Name, Unknown = 0, Gender = player.Character.Gender, Level = player.Level, - Class = player.Character.Class, + Race = (short)player.Character.Class, HeroLevel = player.HeroLevel }; } public static PidxPacket GeneratePidxPacket(this IPlayerEntity player) { - List packets = new List { new PidxPacket.PidxSubPacket { CharacterId = player.Id, IsMemberOfGroup = player.HasGroup } }; + List packets = new List { new PidxSubPacket { VisualId = player.Id, IsGrouped = player.HasGroup } }; if (!player.HasGroup) { @@ -118,10 +120,10 @@ public static PidxPacket GeneratePidxPacket(this IPlayerEntity player) continue; } - packets.Add(new PidxPacket.PidxSubPacket + packets.Add(new PidxSubPacket { - CharacterId = member.Id, - IsMemberOfGroup = member.Group == player.Group // stupid as fuck ?? + VisualId = member.Id, + IsGrouped = member.Group == player.Group // stupid as fuck ?? }); } @@ -132,24 +134,22 @@ public static PidxPacket GeneratePidxPacket(this IPlayerEntity player) }; } - public static PInitPacket GeneratePInitPacket(this IPlayerEntity player) + public static PinitPacket GeneratePInitPacket(this IPlayerEntity player) { byte tmp = 0; - List mates = new List(); - List players = new List(); - mates.AddRange(player.ActualMates.Where(s => s != null)?.Select(s => s.GeneratePInitSubPacket(ref tmp)).Where(s => s != null)); + List subPackets = new List(); + subPackets.AddRange(player.ActualMates.Where(s => s != null)?.Select(s => s.GeneratePInitSubPacket(ref tmp)).Where(s => s != null)); if (player.HasGroup) { - players.AddRange(player.Group.Players.Where(s => s != null).Select(s => s.GeneratePinitSubPacket(ref tmp)).Where(s => s != null)); + subPackets.AddRange(player.Group.Players.Where(s => s != null).Select(s => s.GeneratePinitSubPacket(ref tmp)).Where(s => s != null)); } - return new PInitPacket + return new PinitPacket { - PartySize = player.Mates.Count(s => s.Mate.IsTeamMember) + player.GroupMembersCount, - MateSubPackets = mates, - PlayerSubPackets = players + GroupSize = player.Mates.Count(s => s.Mate.IsTeamMember) + player.GroupMembersCount, + PinitSubPackets = subPackets }; } diff --git a/src/ChickenAPI.Game/GuriHandling/Extensions/GuriPacketExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/GuriPacketExtensions.cs similarity index 100% rename from src/ChickenAPI.Game/GuriHandling/Extensions/GuriPacketExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/GuriPacketExtensions.cs diff --git a/src/ChickenAPI.Game/Inventory/Extensions/InventoryChecksExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/InventoryChecksExtensions.cs similarity index 100% rename from src/ChickenAPI.Game/Inventory/Extensions/InventoryChecksExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/InventoryChecksExtensions.cs diff --git a/src/ChickenAPI.Game/Inventory/Extensions/InventoryGetExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/InventoryGetExtensions.cs similarity index 71% rename from src/ChickenAPI.Game/Inventory/Extensions/InventoryGetExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/InventoryGetExtensions.cs index fd49978b..68f25202 100644 --- a/src/ChickenAPI.Game/Inventory/Extensions/InventoryGetExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/InventoryGetExtensions.cs @@ -4,10 +4,11 @@ using Autofac; using ChickenAPI.Core.IoC; using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; using ChickenAPI.Game.Configuration; using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Packets.Game.Server.Inventory; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Inventory; +using EquipmentType = ChickenAPI.Data.Enums.Game.Items.EquipmentType; namespace ChickenAPI.Game.Inventory.Extensions { @@ -16,15 +17,24 @@ public static class InventoryGetExtensions private static readonly IGameConfiguration GameConf = new Lazy(ChickenContainer.Instance.Resolve).Value; public static ItemInstanceDto GetWeared(this InventoryComponent inv, EquipmentType equipmentType) => inv.Wear[(int)equipmentType]; + public static IvnSubPacket GenerateIvnSubPacket(this ItemInstanceDto item) + { + return new IvnSubPacket + { + VNum = (short)item.ItemId, + RareAmount = item.Rarity, + UpgradeDesign = item.Item.IsColored && item.Item.EquipmentSlot == EquipmentType.Sp ? item.Design : item.Upgrade, + SecondUpgrade = item.SpStoneUpgrade, + }; + } - public static InvPacket GenerateInventoryPacket(this IPlayerEntity player, InventoryType type) + public static InvPacket GenerateInventoryPacket(this IPlayerEntity player, PocketType type) { ItemInstanceDto[] items = player.Inventory.GetSubInvFromInventoryType(type); var packet = new InvPacket { - InventoryType = type, - Items = new List() + IvnSubPackets = new List() }; if (items.All(s => s == null)) @@ -34,22 +44,22 @@ public static InvPacket GenerateInventoryPacket(this IPlayerEntity player, Inven switch (type) { - case InventoryType.Equipment: - packet.Items.AddRange(items.Where(s => s != null).Select(s => - $"{s.Slot}.{s.ItemId}.{s.Rarity}.{(s.Item.IsColored && s.Item.EquipmentSlot == EquipmentType.Sp ? s.Design : s.Upgrade)}.{s.SpStoneUpgrade}")); + case PocketType.Equipment: + packet.IvnSubPackets.AddRange(items.Where(s => s != null).Select(s => s.GenerateIvnSubPacket())); break; - case InventoryType.Etc: - case InventoryType.Main: - packet.Items.AddRange(items.Where(s => s != null).Select(s => - $"{s.Slot}.{s.ItemId}.{s.Amount}.0")); + case PocketType.Etc: + case PocketType.Main: + + packet.IvnSubPackets.AddRange(items.Where(s => s != null).Select(s => s.GenerateIvnSubPacket())); + // $"{s.Slot}.{s.ItemId}.{s.Amount}.0")); break; - case InventoryType.Miniland: - packet.Items.AddRange(items.Where(s => s != null).Select(s => - $"{s.Slot}.{s.ItemId}.{s.Amount}")); + case PocketType.Miniland: + packet.IvnSubPackets.AddRange(items.Where(s => s != null).Select(s => s.GenerateIvnSubPacket())); + // $"{s.Slot}.{s.ItemId}.{s.Amount}")); break; - case InventoryType.Wear: + case PocketType.Wear: break; } @@ -59,7 +69,7 @@ public static InvPacket GenerateInventoryPacket(this IPlayerEntity player, Inven public static short GetFirstFreeSlot(this InventoryComponent inv, IReadOnlyCollection subInventory, ItemDto source, short amount) { ItemInstanceDto item = subInventory.FirstOrDefault(x => x != null && - x.Amount + amount < GameConf.Inventory.MaxItemPerSlot && x.ItemId == source.Id && x.Item.Type != InventoryType.Equipment); + x.Amount + amount < GameConf.Inventory.MaxItemPerSlot && x.ItemId == source.Id && x.Item.Type != PocketType.Equipment); return item?.Slot ?? GetFirstFreeSlot(inv, subInventory); } @@ -115,21 +125,21 @@ public static IEnumerable GetItems(this InventoryComponent inve /// Gets the first available slot by it's inventory type /// /// - /// + /// /// Returns -1 in case it could not find any available slot - public static short GetFirstFreeSlot(this InventoryComponent inv, InventoryType inventoryType) => GetFirstFreeSlot(inv, GetSubInvFromInventoryType(inv, inventoryType)); + public static short GetFirstFreeSlot(this InventoryComponent inv, PocketType pocketType) => GetFirstFreeSlot(inv, GetSubInvFromInventoryType(inv, pocketType)); - public static ItemInstanceDto[] GetSubInvFromInventoryType(this InventoryComponent inv, InventoryType type) + public static ItemInstanceDto[] GetSubInvFromInventoryType(this InventoryComponent inv, PocketType type) { switch (type) { - case InventoryType.Wear: + case PocketType.Wear: return inv.Wear; - case InventoryType.Equipment: + case PocketType.Equipment: return inv.Equipment; - case InventoryType.Main: + case PocketType.Main: return inv.Main; - case InventoryType.Etc: + case PocketType.Etc: return inv.Etc; default: return null; @@ -141,7 +151,7 @@ public static ItemInstanceDto[] GetSubInvFromInventoryType(this InventoryCompone public static ItemInstanceDto[] GetSubInvFromItemInstance(this InventoryComponent inv, ItemInstanceDto item) => GetSubInvFromInventoryType(inv, item.Type); - public static ItemInstanceDto GetItemFromSlotAndType(this InventoryComponent inventory, short itemSlot, InventoryType equipment) + public static ItemInstanceDto GetItemFromSlotAndType(this InventoryComponent inventory, short itemSlot, PocketType equipment) { ItemInstanceDto[] subInv = inventory.GetSubInvFromInventoryType(equipment); return itemSlot >= subInv.Length ? null : subInv[itemSlot]; diff --git a/src/ChickenAPI.Game/Inventory/Extensions/InventoryUseExtension.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/InventoryUseExtension.cs similarity index 92% rename from src/ChickenAPI.Game/Inventory/Extensions/InventoryUseExtension.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/InventoryUseExtension.cs index ded5b843..94ad878a 100644 --- a/src/ChickenAPI.Game/Inventory/Extensions/InventoryUseExtension.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/InventoryUseExtension.cs @@ -1,6 +1,7 @@ using System; using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; +using ChickenAPI.Packets.Enumerations; +using EquipmentType = ChickenAPI.Data.Enums.Game.Items.EquipmentType; namespace ChickenAPI.Game.Inventory.Extensions { @@ -10,7 +11,7 @@ public static void UseItem(this InventoryComponent inventory, ItemInstanceDto it { switch (itemInstance.Item.Type) { - case InventoryType.Wear: + case PocketType.Wear: inventory.UseWear(itemInstance); break; } diff --git a/src/ChickenAPI.Game.Extensions/_TOCLEAN/IvnPacketExtension.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/IvnPacketExtension.cs new file mode 100644 index 00000000..540ea15b --- /dev/null +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/IvnPacketExtension.cs @@ -0,0 +1,92 @@ +using System.Collections.Generic; +using ChickenAPI.Data.Item; +using ChickenAPI.Game.Entities.Player; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Inventory; + +namespace ChickenAPI.Game.Inventory.Extensions +{ + public static class IvnPacketExtension + { + public static IvnPacket GenerateEmptyIvnPacket(this IPlayerEntity player, PocketType type, short slot) => + new IvnPacket + { + Type = type, + IvnSubPackets = new List + { + new IvnSubPacket() + { + VNum = -1, + Slot = slot, + UpgradeDesign = 0, + RareAmount = 0, + SecondUpgrade = 0, + } + } + }; + + public static IvnPacket GenerateIvnPacket(this ItemInstanceDto itemInstance) + { + switch (itemInstance.Type) + { + case PocketType.Specialist: + return new IvnPacket + { + Type = itemInstance.Type, + IvnSubPackets = new List + { + new IvnSubPacket + { + VNum = (short)itemInstance.ItemId, + UpgradeDesign = itemInstance.Upgrade, + Slot = itemInstance.Slot, + RareAmount = itemInstance.Rarity, + SecondUpgrade = itemInstance.SpecialistUpgrade, + } + } + }; + + case PocketType.Equipment: + return new IvnPacket + { + Type = itemInstance.Type, + IvnSubPackets = new List + { + new IvnSubPacket + { + VNum = (short)itemInstance.ItemId, + UpgradeDesign = itemInstance.Upgrade, + Slot = itemInstance.Slot, + RareAmount = itemInstance.Rarity, + } + } + }; + case PocketType.Main: + case PocketType.Etc: + return itemInstance.GenerateMainIvnPacket(); + + default: + //Log.Info($"{itemInstance.Type} not implemented"); + return null; + } + } + + private static IvnPacket GenerateMainIvnPacket(this ItemInstanceDto itemInstance) + { + return new IvnPacket + { + Type = itemInstance.Type, + IvnSubPackets = new List + { + new IvnSubPacket + { + VNum = (short)itemInstance.ItemId, + UpgradeDesign = 0, + Slot = itemInstance.Slot, + RareAmount = itemInstance.Amount, + } + } + }; + } + } +} \ No newline at end of file diff --git a/src/ChickenAPI.Game/Entities/Player/Extensions/LanguageServiceExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/LanguageServiceExtensions.cs similarity index 100% rename from src/ChickenAPI.Game/Entities/Player/Extensions/LanguageServiceExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/LanguageServiceExtensions.cs diff --git a/src/ChickenAPI.Game/Entities/Player/Extensions/LevPacketExtension.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/LevPacketExtension.cs similarity index 74% rename from src/ChickenAPI.Game/Entities/Player/Extensions/LevPacketExtension.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/LevPacketExtension.cs index 4fc5946d..685aa863 100644 --- a/src/ChickenAPI.Game/Entities/Player/Extensions/LevPacketExtension.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/LevPacketExtension.cs @@ -2,8 +2,8 @@ using ChickenAPI.Core.IoC; using ChickenAPI.Data.Character; using ChickenAPI.Game.Skills.Extensions; -using ChickenAPI.Packets.Game.Server.Entities; -using ChickenAPI.Packets.Game.Server.Player; +using ChickenAPI.Packets.ServerPackets.Entities; +using ChickenAPI.Packets.ServerPackets.Player; namespace ChickenAPI.Game.Entities.Player.Extensions { @@ -19,13 +19,13 @@ public static LevPacket GenerateLevPacket(this IPlayerEntity player) => LevelXp = (int)player.LevelXp, JobLevel = player.JobLevel, JobLevelXp = (int)player.JobLevelXp, - LevelXpMax = Algorithm.GetLevelXp(player.Character.Class, player.Level), - JobLevelXpMax = Algorithm.GetLevelXp(player.Character.Class, player.JobLevel), + XpLoad = Algorithm.GetLevelXp(player.Character.Class, player.Level), + JobXpLoad = Algorithm.GetLevelXp(player.Character.Class, player.JobLevel), HeroLevel = player.HeroLevel, Reputation = player.Character.Reput, - Cp = player.GetCp(), - HeroLevelXp = (int)player.HeroLevelXp, - HeroLevelXpMax = Algorithm.GetHeroLevelXp(player.Character.Class, player.HeroLevel) + SkillCp = player.GetCp(), + HeroXp = (int)player.HeroLevelXp, + HeroXpLoad = Algorithm.GetHeroLevelXp(player.Character.Class, player.HeroLevel) }; public static LevelUpPacket GenerateLevelUpPacket(this IPlayerEntity player) => diff --git a/src/ChickenAPI.Game/Maps/Extensions/MapLayerInformationsExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/MapLayerInformationsExtensions.cs similarity index 74% rename from src/ChickenAPI.Game/Maps/Extensions/MapLayerInformationsExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/MapLayerInformationsExtensions.cs index 117e34a3..f3e0bf4f 100644 --- a/src/ChickenAPI.Game/Maps/Extensions/MapLayerInformationsExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/MapLayerInformationsExtensions.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Linq; -using ChickenAPI.Enums.Game.Entity; using ChickenAPI.Game.Entities.Npc; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; @@ -9,10 +8,11 @@ using ChickenAPI.Game.Shops.Extensions; using ChickenAPI.Game.Visibility; using ChickenAPI.Game._ECS.Entities; -using ChickenAPI.Packets.Game.Client.Shops; -using ChickenAPI.Packets.Game.Server.Inventory; -using ChickenAPI.Packets.Game.Server.Portals; -using ChickenAPI.Packets.Game.Server.Visibility; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Inventory; +using ChickenAPI.Packets.ServerPackets.Portals; +using ChickenAPI.Packets.ServerPackets.Shop; +using ChickenAPI.Packets.ServerPackets.Visibility; namespace ChickenAPI.Game.Maps.Extensions { @@ -21,13 +21,13 @@ public static class MapLayerInformationsExtensions public static IEnumerable GetShopsPackets(this IMapLayer layer) { IEnumerable tmp = layer.GetEntitiesByType(VisualType.Npc).Where(s => s.HasShop).Select(s => s.GenerateShopPacket()); - IEnumerable players = layer.GetEntitiesByType(VisualType.Character).Where(s => s.HasShop).Select(s => s.GenerateShopPacket()); + IEnumerable players = layer.GetEntitiesByType(VisualType.Player).Where(s => s.HasShop).Select(s => s.GenerateShopPacket()); return tmp.Union(players); } public static IEnumerable GetPairyPackets(this IMapLayer layer, IPlayerEntity player) { - return layer.GetEntitiesByType(VisualType.Character).Select(s => s == player ? null : s.GeneratePairyPacket()); + return layer.GetEntitiesByType(VisualType.Player).Select(s => s == player ? null : s.GeneratePairyPacket()); } public static IEnumerable GetEntitiesPackets(this IMapLayer layer) @@ -37,7 +37,7 @@ public static IEnumerable GetEntitiesPackets(this IMapLayer layer) public static IEnumerable GetPortalsPackets(this IMapLayer map) { - return map.GetEntitiesByType(VisualType.Portal)?.Select(s => s.Portal.GenerateGpPacket()); + return map.GetEntitiesByType(VisualType.Object)?.Where(s => s != null).Select(s => s.Portal.GenerateGpPacket()); } } } \ No newline at end of file diff --git a/src/ChickenAPI.Game/Inventory/Extensions/MapPacketsExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/MapPacketsExtensions.cs similarity index 86% rename from src/ChickenAPI.Game/Inventory/Extensions/MapPacketsExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/MapPacketsExtensions.cs index b68e04da..7b2ec389 100644 --- a/src/ChickenAPI.Game/Inventory/Extensions/MapPacketsExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/MapPacketsExtensions.cs @@ -1,7 +1,7 @@ using System; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game._ECS.Entities; -using ChickenAPI.Packets.Game.Server.MiniMap; +using ChickenAPI.Packets.ServerPackets.MiniMap; namespace ChickenAPI.Game.Inventory.Extensions { @@ -13,7 +13,7 @@ public static class MapPacketsExtensions { Type = 0, Id = Convert.ToInt16(map.Id), - MapType = 1 + MapType = true }; } } \ No newline at end of file diff --git a/src/ChickenAPI.Game/Entities/Player/Extensions/MateExtension.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/MateExtension.cs similarity index 96% rename from src/ChickenAPI.Game/Entities/Player/Extensions/MateExtension.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/MateExtension.cs index df54f20f..075a5500 100644 --- a/src/ChickenAPI.Game/Entities/Player/Extensions/MateExtension.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/MateExtension.cs @@ -3,17 +3,16 @@ using System.Linq; using System.Threading.Tasks; using Autofac; -using ChickenAPI.Core.i18n; using ChickenAPI.Core.IoC; using ChickenAPI.Data.Character; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Enums.Packets; +using ChickenAPI.Data.Enums.Game.Entity; using ChickenAPI.Game.Entities.Mates; using ChickenAPI.Game.Helpers; using ChickenAPI.Game.Inventory.Extensions; using ChickenAPI.Game._i18n; -using ChickenAPI.Packets.Game.Server.Mates; -using ChickenAPI.Packets.Game.Server.UserInterface; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Mates; +using ChickenAPI.Packets.ServerPackets.UI; namespace ChickenAPI.Game.Entities.Player.Extensions { @@ -32,7 +31,7 @@ public static async Task AddPet(this IPlayerEntity player, IMateEntity mat CharacterMateService.Save(mate.Mate); await player.BroadcastAsync(mate.GenerateInPacket()); - await player.SendPacketAsync(new PClearPacket()); + await player.SendPacketAsync(new PclearPacket()); player.Mates.Add(mate); await player.SendPacketsAsync(player.GenerateScP()); await player.SendPacketsAsync(player.GenerateScN()); diff --git a/src/ChickenAPI.Game.Extensions/_TOCLEAN/MovableEntityExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/MovableEntityExtensions.cs new file mode 100644 index 00000000..c1345c42 --- /dev/null +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/MovableEntityExtensions.cs @@ -0,0 +1,20 @@ +using ChickenAPI.Game.Movements; +using ChickenAPI.Packets.ServerPackets.Entities; + +namespace ChickenAPI.Game.Inventory.Extensions +{ + public static class MovableEntityExtensions + { + public static MovePacket GenerateMvPacket(this IMovableEntity entity) + { + return new MovePacket + { + VisualType = entity.Type, + VisualEntityId = entity.Id, + Speed = entity.Speed, + MapX = entity.Position.X, + MapY = entity.Position.Y + }; + } + } +} \ No newline at end of file diff --git a/src/ChickenAPI.Game/Movements/Extensions/MovablePlayerExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/MovablePlayerExtensions.cs similarity index 70% rename from src/ChickenAPI.Game/Movements/Extensions/MovablePlayerExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/MovablePlayerExtensions.cs index 7e99c37a..5bfba45b 100644 --- a/src/ChickenAPI.Game/Movements/Extensions/MovablePlayerExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/MovablePlayerExtensions.cs @@ -1,11 +1,11 @@ using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Packets.Game.Server.Player; +using ChickenAPI.Packets.ServerPackets.Player; namespace ChickenAPI.Game.Movements.Extensions { public static class MovablePlayerExtensions { - public static CondPacketBase GenerateCondPacket(this IPlayerEntity entity) => new CondPacketBase + public static CondPacket GenerateCondPacket(this IPlayerEntity entity) => new CondPacket { NoAttack = !entity.CanAttack, NoMove = !entity.CanMove, diff --git a/src/ChickenAPI.Game/Movements/Extensions/MoveChecksExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/MoveChecksExtensions.cs similarity index 100% rename from src/ChickenAPI.Game/Movements/Extensions/MoveChecksExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/MoveChecksExtensions.cs diff --git a/src/ChickenAPI.Game/Inventory/Extensions/MoveItemExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/MoveItemExtensions.cs similarity index 97% rename from src/ChickenAPI.Game/Inventory/Extensions/MoveItemExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/MoveItemExtensions.cs index 076b55a4..385dec22 100644 --- a/src/ChickenAPI.Game/Inventory/Extensions/MoveItemExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/MoveItemExtensions.cs @@ -19,7 +19,7 @@ public static async Task MoveItem(this InventoryComponent inv, ItemInstanceDto s return; } - await player.SendPacketAsync(player.GenerateEmptyIvnPacket(args.InventoryType, args.SourceSlot)); + await player.SendPacketAsync(player.GenerateEmptyIvnPacket(args.PocketType, args.SourceSlot)); await player.SendPacketAsync(source.GenerateIvnPacket()); } diff --git a/src/ChickenAPI.Game/Shops/Extensions/NInvPacketExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/NInvPacketExtensions.cs similarity index 59% rename from src/ChickenAPI.Game/Shops/Extensions/NInvPacketExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/NInvPacketExtensions.cs index a9bc661f..347a1d96 100644 --- a/src/ChickenAPI.Game/Shops/Extensions/NInvPacketExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/NInvPacketExtensions.cs @@ -2,55 +2,54 @@ using System.Linq; using System.Text; using ChickenAPI.Data.Shop; -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Enums.Game.Items; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; -using ChickenAPI.Packets.Game.Client.Shops; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Shop; namespace ChickenAPI.Game.Shops.Extensions { public static class NInvPacketExtensions { - private static string GetShopList(IEnumerable items) + private static List GetShopList(IEnumerable items) { - var tmp = new StringBuilder(); + var tmp = new List(); foreach (PersonalShopItem itemInfo in items) { - tmp.Append(' '); - long upgradeOrPrice = itemInfo.ItemInstance.Item.Type == InventoryType.Equipment ? itemInfo.ItemInstance.Upgrade : itemInfo.Price; - int rareOrQuantity = itemInfo.ItemInstance.Item.Type == InventoryType.Equipment ? itemInfo.ItemInstance.Rarity : itemInfo.Quantity; - double priceOrMinus = itemInfo.ItemInstance.Item.Type == InventoryType.Equipment ? itemInfo.Price : -1; + // tmp.Append(' '); + long upgradeOrPrice = itemInfo.ItemInstance.Item.Type == PocketType.Equipment ? itemInfo.ItemInstance.Upgrade : itemInfo.Price; + int rareOrQuantity = itemInfo.ItemInstance.Item.Type == PocketType.Equipment ? itemInfo.ItemInstance.Rarity : itemInfo.Quantity; + double priceOrMinus = itemInfo.ItemInstance.Item.Type == PocketType.Equipment ? itemInfo.Price : -1; - tmp.Append($"{(byte)itemInfo.ItemInstance.Item.Type}.{itemInfo.Slot}.{itemInfo.ItemInstance.ItemId}.{rareOrQuantity}.{upgradeOrPrice}.{priceOrMinus}"); + tmp.Add(new NInvItemSubPacket + { + Price = (int)upgradeOrPrice, + UpgradeDesign = (short)rareOrQuantity, + Slot = (byte)itemInfo.Slot, + VNum = (short)itemInfo.ItemInstance.ItemId, + }); + + // tmp.Append($"{(byte)itemInfo.ItemInstance.Item.Type}.{itemInfo.Slot}.{itemInfo.ItemInstance.ItemId}.{rareOrQuantity}.{upgradeOrPrice}.{priceOrMinus}"); } - return tmp.ToString(); + return tmp; } - private static string GetShopList(IEnumerable items, double percent) + private static List GetShopList(IEnumerable items, double percent) { - var tmp = new StringBuilder(); + var tmp = new List(); foreach (ShopItemDto itemInfo in items) { - tmp.Append(' '); double price = itemInfo.Item.ReputPrice > 0 ? itemInfo.Item.ReputPrice : itemInfo.Item.Price * percent; byte color = itemInfo.Color != 0 ? itemInfo.Item.Color : itemInfo.Item.BasicUpgrade; - int rareOrQuantity = itemInfo.Item.Type != InventoryType.Equipment ? -1 : itemInfo.Rare; + int rareOrQuantity = itemInfo.Item.Type != PocketType.Equipment ? -1 : itemInfo.Rare; - tmp.Append($"{(byte)itemInfo.Item.Type}.{itemInfo.Slot}.{itemInfo.ItemId}.{rareOrQuantity}."); - if (itemInfo.Item.Type == InventoryType.Equipment) - { - tmp.Append(color); - tmp.Append('.'); - } - tmp.Append(price); } - return tmp.ToString(); + return tmp; } @@ -59,15 +58,15 @@ public static NInvPacket GenerateNInvPacket(this IPlayerEntity player, PersonalS { VisualType = shop.Owner.Type, VisualId = shop.Owner.Id, - ShopType = 0, + ShopKind = 0, Unknown = 0, - ShopList = GetShopList(shop.ShopItems), - ShopSkills = new List() + Items = GetShopList(shop.ShopItems), + Skills = null, }; public static NInvPacket GenerateNInvPacket(this IPlayerEntity player, Shop shop, byte type) { - int typeshop = 0; + byte typeshop = 0; double percent = 1.0; switch (player.GetDignityIcon()) @@ -93,7 +92,7 @@ public static NInvPacket GenerateNInvPacket(this IPlayerEntity player, Shop shop typeshop = 100; } - List skillIds = new List(); + List skillIds = new List(); foreach (ShopSkillDto skill in shop.Skills.Where(s => s.Type == type)) { @@ -102,12 +101,12 @@ public static NInvPacket GenerateNInvPacket(this IPlayerEntity player, Shop shop typeshop = 1; if (skill.Skill.Class == (byte)player.Character.Class) { - skillIds.Add(skill.SkillId); + skillIds.Add((short)skill.SkillId); } } else { - skillIds.Add(skill.SkillId); + skillIds.Add((short)skill.SkillId); } } @@ -116,10 +115,10 @@ public static NInvPacket GenerateNInvPacket(this IPlayerEntity player, Shop shop { VisualType = shop.Owner.Type, VisualId = shop.Owner.Id, - ShopType = typeshop, + ShopKind = typeshop, Unknown = 0, - ShopList = GetShopList(shop.Items.Where(s => s.Type == type), percent), - ShopSkills = skillIds + Items = GetShopList(shop.Items.Where(s => s.Type == type), percent), + Skills = skillIds }; } } diff --git a/src/ChickenAPI.Game/Inventory/ItemUpgrade/Extension/NotifyResultAndSetRarityPointExtension.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/NotifyResultAndSetRarityPointExtension.cs similarity index 89% rename from src/ChickenAPI.Game/Inventory/ItemUpgrade/Extension/NotifyResultAndSetRarityPointExtension.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/NotifyResultAndSetRarityPointExtension.cs index 22a4d5fc..fde17971 100644 --- a/src/ChickenAPI.Game/Inventory/ItemUpgrade/Extension/NotifyResultAndSetRarityPointExtension.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/NotifyResultAndSetRarityPointExtension.cs @@ -1,13 +1,14 @@ using System.Threading.Tasks; +using ChickenAPI.Data.Enums.Game.Items.Upgrade; using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game.Effects; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; using ChickenAPI.Game.Helpers; using ChickenAPI.Game.Inventory.Extensions; using ChickenAPI.Game.Inventory.ItemUpgrade.Events; +using ChickenAPI.Packets.Enumerations; +using EquipmentType = ChickenAPI.Data.Enums.Game.Items.EquipmentType; namespace ChickenAPI.Game.Inventory.ItemUpgrade.Extension { @@ -35,7 +36,7 @@ public static async Task FailAsync(this RarifyEvent e, IPlayerEntity player) case RarifyProtection.RedAmulet: case RarifyProtection.HeroicAmulet: case RarifyProtection.RandomHeroicAmulet: - ItemInstanceDto amulets = player.Inventory.GetItemFromSlotAndType((short)EquipmentType.Amulet, InventoryType.Wear); + ItemInstanceDto amulets = player.Inventory.GetItemFromSlotAndType((short)EquipmentType.Amulet, PocketType.Wear); if (amulets == null) { return; @@ -48,20 +49,20 @@ public static async Task FailAsync(this RarifyEvent e, IPlayerEntity player) await session.SendPacketAsync($"info {Language.Instance.GetMessageFromKey("AMULET_DESTROYED")}"); await session.SendPacketAsync(session.Character.GenerateEquipment()); }*/ - await player.SendTopscreenMessage("AMULET_FAIL_SAVED", MsgPacketType.Whisper); + await player.SendTopscreenMessage("AMULET_FAIL_SAVED", MessageType.Whisper); await player.SendChatMessageAsync("AMULET_FAIL_SAVED", SayColorType.Purple); return; case RarifyProtection.None: /* session.Character.DeleteItemByItemInstanceId(Id);*/ //player.EmitEvent(new InventoryDestroyItemEvent { ItemInstance = e.Item }); - await player.SendTopscreenMessage("RARIFY_FAILED", MsgPacketType.Whisper); + await player.SendTopscreenMessage("RARIFY_FAILED", MessageType.Whisper); await player.SendChatMessageAsync("RARIFY_FAILED", SayColorType.Purple); return; } - await player.SendTopscreenMessage("RARIFY_FAILED_ITEM_SAVED", MsgPacketType.Whisper); + await player.SendTopscreenMessage("RARIFY_FAILED_ITEM_SAVED", MessageType.Whisper); await player.SendChatMessageAsync("RARIFY_FAILED_ITEM_SAVED", SayColorType.Purple); await player.BroadcastAsync(player.GenerateEffectPacket(3004)); } diff --git a/src/ChickenAPI.Game/Entities/Npc/Extensions/NpcExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/NpcExtensions.cs similarity index 68% rename from src/ChickenAPI.Game/Entities/Npc/Extensions/NpcExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/NpcExtensions.cs index dde39beb..760f6049 100644 --- a/src/ChickenAPI.Game/Entities/Npc/Extensions/NpcExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/NpcExtensions.cs @@ -1,5 +1,5 @@ using ChickenAPI.Data.NpcMonster; -using ChickenAPI.Packets.Game.Client.UI; +using ChickenAPI.Packets.ServerPackets.Inventory; namespace ChickenAPI.Game.Entities.Npc.Extensions { @@ -8,33 +8,36 @@ public static class NpcExtensions public static EInfoPacket GenerateEInfoPacket(this NpcMonsterDto monster) { return new EInfoPacket - { + {/* Unknown1 = 10, - MonsterVnum = monster.Id, - Level = monster.Level, - Element = monster.Element, + ItemVNum = monster.Id, + LevelMinimum = monster.Level, + Element = (byte?)monster.Element, AttackClass = monster.AttackClass, ElementRate = monster.ElementRate, - AttackUpgrade = monster.AttackUpgrade, + Upgrade = monster.AttackUpgrade, + DamageMinimum = monster.DamageMinimum, DamageMaximum = monster.DamageMaximum, Concentrate = monster.Concentrate, CriticalChance = monster.CriticalChance, CriticalRate = monster.CriticalRate, DefenceUpgrade = monster.DefenceUpgrade, - CloseDefence = monster.CloseDefence, - DefenceDodge = monster.DefenceDodge, - DistanceDefence = monster.DistanceDefence, + CloseDefense = monster.CloseDefence, + DefenseDodge = monster.DefenceDodge, + RangeDefense = monster.DistanceDefence, DistanceDefenceDodge = monster.DistanceDefenceDodge, - MagicDefence = monster.MagicDefence, + MagicDefense = monster.MagicDefence, + FireResistance = monster.FireResistance, WaterResistance = monster.WaterResistance, LightResistance = monster.LightResistance, DarkResistance = monster.DarkResistance, MaxHp = monster.MaxHp, MaxMp = monster.MaxMp, - Unknown2 = -1, + GroupId = -1, Name = monster.Name.Replace(" ", "^") + */ }; } } diff --git a/src/ChickenAPI.Game/Relations/Extensions/PacketExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/PacketExtensions.cs similarity index 57% rename from src/ChickenAPI.Game/Relations/Extensions/PacketExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/PacketExtensions.cs index 72db5baf..fc9dd96a 100644 --- a/src/ChickenAPI.Game/Relations/Extensions/PacketExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/PacketExtensions.cs @@ -1,43 +1,43 @@ using System.Collections.Generic; using System.Linq; -using ChickenAPI.Enums.Game.Relations; using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Packets.Game.Server.Relations; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Relations; namespace ChickenAPI.Game.Relations.Extensions { public static class PacketExtensions { - public static FInitPacket GenerateFInitPacket(this IPlayerEntity player) + public static FinitPacket GenerateFInitPacket(this IPlayerEntity player) { - List subpackets = new List(); + List subpackets = new List(); subpackets.AddRange( player.Relations.Relation.Where(s => s != null && (s.Type == CharacterRelationType.Friend || s.Type == CharacterRelationType.Spouse))?.Select(relation => - new FInitPacket.FInitSubPacket + new FinitSubPacket { - RelationId = relation.TargetId, - RelationType = relation.Type, + CharacterId = relation.TargetId, CharacterName = relation.Name, + RelationType = relation.Type, IsOnline = true })); - return new FInitPacket + return new FinitPacket() { - Packets = subpackets + SubPackets = subpackets }; } - public static BlInitPacket GenerateBlIinitPacket(this IPlayerEntity player) + public static BlinitPacket GenerateBlIinitPacket(this IPlayerEntity player) { - List subPackets = new List(); + List subPackets = new List(); - subPackets.AddRange(player.Relations.Relation.Where(s => s?.Type == CharacterRelationType.Blocked).Select(relation => new BlInitPacket.BlInitSubPacket + subPackets.AddRange(player.Relations.Relation.Where(s => s?.Type == CharacterRelationType.Blocked).Select(relation => new BlinitSubPacket { - CharacterId = relation.TargetId, + RelatedCharacterId = relation.TargetId, CharacterName = relation.Name })); - return new BlInitPacket + return new BlinitPacket() { SubPackets = subPackets }; diff --git a/src/ChickenAPI.Game/Entities/Player/Extensions/PairyPacketExtension.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/PairyPacketExtension.cs similarity index 52% rename from src/ChickenAPI.Game/Entities/Player/Extensions/PairyPacketExtension.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/PairyPacketExtension.cs index e763d10c..fe666348 100644 --- a/src/ChickenAPI.Game/Entities/Player/Extensions/PairyPacketExtension.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/PairyPacketExtension.cs @@ -1,8 +1,8 @@ using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Enums.Game.Items; using ChickenAPI.Game.Inventory.Extensions; -using ChickenAPI.Packets.Game.Server.Inventory; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Inventory; +using EquipmentType = ChickenAPI.Data.Enums.Game.Items.EquipmentType; namespace ChickenAPI.Game.Entities.Player.Extensions { @@ -15,11 +15,12 @@ public static PairyPacket GeneratePairyPacket(this IPlayerEntity player) { return new PairyPacket { - VisualType = VisualType.Character, - CharacterId = player.Character.Id, + VisualType = VisualType.Player, + VisualId = player.Character.Id, FairyMoveType = 0, - ElementType = 0, - FairyLevel = 0 + Element = ElementType.Neutral, + ElementRate = 0, + Morph = -1, }; } @@ -27,10 +28,11 @@ public static PairyPacket GeneratePairyPacket(this IPlayerEntity player) return new PairyPacket { - VisualType = VisualType.Character, - CharacterId = player.Character.Id, - ElementType = fairy.ElementType, - FairyLevel = fairy.Upgrade, + VisualType = VisualType.Player, + VisualId = player.Character.Id, + Morph = (int)fairy.ItemId, + Element = fairy.ElementType, + ElementRate = fairy.Upgrade, FairyMoveType = 4 // todo enum }; } diff --git a/src/ChickenAPI.Game/Entities/Player/Extensions/PlayerExtension.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/PlayerExtension.cs similarity index 56% rename from src/ChickenAPI.Game/Entities/Player/Extensions/PlayerExtension.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/PlayerExtension.cs index 6a849a23..e5bc7837 100644 --- a/src/ChickenAPI.Game/Entities/Player/Extensions/PlayerExtension.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/PlayerExtension.cs @@ -6,10 +6,6 @@ using ChickenAPI.Data.Character; using ChickenAPI.Data.Item; using ChickenAPI.Data.Skills; -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game.Effects; using ChickenAPI.Game.Families.Extensions; using ChickenAPI.Game.Helpers; @@ -17,9 +13,10 @@ using ChickenAPI.Game.Shops.Extensions; using ChickenAPI.Game.Skills; using ChickenAPI.Game._i18n; -using ChickenAPI.Packets.Game.Client.Player; -using ChickenAPI.Packets.Game.Server.Player; -using ChickenAPI.Packets.Game.Server.UserInterface; +using ChickenAPI.Game.Extensions.PacketGeneration; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Player; +using ChickenAPI.Packets.ServerPackets.UI; namespace ChickenAPI.Game.Entities.Player.Extensions { @@ -28,95 +25,13 @@ public static class PlayerExtension private static readonly IRandomGenerator _randomGenerator = new Lazy(() => ChickenContainer.Instance.Resolve()).Value; private static readonly IAlgorithmService Algorithm = new Lazy(() => ChickenContainer.Instance.Resolve()).Value; - public static TcInfoPacket GenerateTcInfo(this IPlayerEntity charac) - { - ItemInstanceDto fairy = null; - ItemInstanceDto armor = null; - ItemInstanceDto weapon2 = null; - ItemInstanceDto weapon = null; - if (charac.Inventory != null) - { - fairy = charac.Inventory.GetWeared(EquipmentType.Fairy); - armor = charac.Inventory.GetWeared(EquipmentType.Armor); - weapon2 = charac.Inventory.GetWeared(EquipmentType.SecondaryWeapon); - weapon = charac.Inventory.GetWeared(EquipmentType.MainWeapon); - } - - bool isPvpPrimary = false; - bool isPvpSecondary = false; - bool isPvpArmor = false; - - if (weapon?.Item.Name.Contains(": ") == true) - { - isPvpPrimary = true; - } - - isPvpSecondary |= weapon2?.Item.Name.Contains(": ") == true; - isPvpArmor |= armor?.Item.Name.Contains(": ") == true; - - // tc_info 0 name 0 0 0 0 -1 - 0 0 0 0 0 0 0 0 0 0 0 wins deaths reput 0 0 0 morph - // talentwin talentlose capitul rankingpoints arenapoints 0 0 ispvpprimary ispvpsecondary - // ispvparmor herolvl desc - return new TcInfoPacket - { - Level = charac.Level, - Name = charac.Character.Name, - Element = fairy?.ElementType ?? ElementType.Neutral, - ElementRate = fairy?.ElementRate ?? 0, - Class = charac.Character.Class, - Gender = charac.Character.Gender, - Family = charac.HasFamily ? charac.Family.Name : "-1 -", - ReputationIco = charac.GetReputIcon(), - DignityIco = charac.GetDignityIcon(), - HaveWeapon = weapon != null ? 1 : 0, - WeaponRare = weapon?.Rarity ?? 0, - WeaponUpgrade = weapon?.Upgrade ?? 0, - HaveSecondary = weapon2 != null ? 1 : 0, - SecondaryRare = weapon2?.Rarity ?? 0, - SecondaryUpgrade = weapon?.Upgrade ?? 0, - HaveArmor = armor != null ? 1 : 0, - ArmorRare = armor?.Rarity ?? 0, - ArmorUpgrade = armor?.Upgrade ?? 0, - Act4Kill = charac.Character.Act4Kill, - Act4Dead = charac.Character.Act4Dead, - Reputation = charac.Character.Reput, - Unknow = 0, - Unknow2 = 0, - Unknow3 = 0, - Unknow4 = 0, - Morph = charac.MorphId, - TalentLose = charac.Character.TalentLose, - TalentSurrender = charac.Character.TalentSurrender, - TalentWin = charac.Character.TalentWin, - MasterPoints = charac.Character.MasterPoints, - Compliments = charac.Character.Compliment, - Act4Points = charac.Character.Act4Points, - isPvpArmor = isPvpArmor, - isPvpPrimary = isPvpPrimary, - isPvpSecondary = isPvpSecondary, - HeroLevel = charac.HeroLevel, - Biography = string.IsNullOrEmpty(charac.Character.Biography) ? " REKT BOY" : charac.Character.Biography - }; - } - - public static TitPacket GenerateTitPacket(this IPlayerEntity player) - { - return new TitPacket - { - ClassType = player.Character.Class == CharacterClassType.Adventurer ? "Adventurer" : - player.Character.Class == CharacterClassType.Archer ? "Archer" : - player.Character.Class == CharacterClassType.Magician ? "Mage" : - player.Character.Class == CharacterClassType.Swordman ? "Swordman" : "Martial", - Name = player.Character.Name - }; - } public static async Task ChangeClass(this IPlayerEntity player, CharacterClassType type) { player.JobLevel = 1; player.JobLevelXp = 0; - await player.SendPacketAsync(new NpInfoPacket { UnKnow = 0 }); - await player.SendPacketAsync(new PClearPacket()); + await player.SendPacketAsync(new NpInfoPacket { Page = 0 }); + await player.SendPacketAsync(new PclearPacket()); if (type == CharacterClassType.Adventurer) { @@ -151,12 +66,11 @@ public static async Task ChangeClass(this IPlayerEntity player, CharacterClassTy await player.BroadcastAsync(player.GenerateEffectPacket(6)); await player.BroadcastAsync(player.GenerateEffectPacket(196)); - SkillComponent component = player.SkillComponent; - foreach (SkillDto skill in component.Skills.Values) + foreach (SkillDto skill in player.Skills.Values) { if (skill.Id >= 200) { - component.Skills.Remove(skill.Id); + player.Skills.Remove(skill.Id); } } @@ -202,7 +116,7 @@ public static async Task ChangeGender(this IPlayerEntity player, GenderType type public static async Task NotifyRarifyResult(this IPlayerEntity player, sbyte rare) { - await player.SendMessageAsync(PlayerMessages.UPGRADE_RARIFY_SUCCESS, MsgPacketType.Whisper); + await player.SendMessageAsync(PlayerMessages.UPGRADE_RARIFY_SUCCESS, MessageType.White); await player.SendPacketAsync(player.GenerateSayPacket("RARIFY_SUCCESS " + rare, SayColorType.Green)); await player.BroadcastAsync(player.GenerateEffectPacket(3005)); await player.SendPacketAsync(player.GenerateShopEndPacket(ShopEndPacketType.CloseSubWindow)); diff --git a/src/ChickenAPI.Game/Entities/Player/Extensions/PlayerGroupExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/PlayerGroupExtensions.cs similarity index 100% rename from src/ChickenAPI.Game/Entities/Player/Extensions/PlayerGroupExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/PlayerGroupExtensions.cs diff --git a/src/ChickenAPI.Game/Entities/Player/Extensions/PlayerInteractionExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/PlayerInteractionExtensions.cs similarity index 87% rename from src/ChickenAPI.Game/Entities/Player/Extensions/PlayerInteractionExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/PlayerInteractionExtensions.cs index a26522eb..ffdf1dcb 100644 --- a/src/ChickenAPI.Game/Entities/Player/Extensions/PlayerInteractionExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/PlayerInteractionExtensions.cs @@ -1,15 +1,15 @@ using System.Threading.Tasks; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game._ECS.Entities; using ChickenAPI.Game._i18n; -using ChickenAPI.Packets.Game.Server.Player; -using ChickenAPI.Packets.Game.Server.UserInterface; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Chats; +using ChickenAPI.Packets.ServerPackets.UI; namespace ChickenAPI.Game.Entities.Player.Extensions { public static class PlayerInteractionExtensions { - public static Task SendMessageAsync(this IPlayerEntity player, PlayerMessages message, MsgPacketType type) + public static Task SendMessageAsync(this IPlayerEntity player, PlayerMessages message, MessageType type) { return player.SendPacketAsync(player.GenerateMsgPacket(message, type)); } @@ -28,12 +28,12 @@ public static ModalPacket GenerateModalPacket(this IPlayerEntity player, string { return new ModalPacket { - Type = type, + Type = (byte)type, Message = message, }; } - public static MsgPacket GenerateMsgPacket(this IPlayerEntity player, PlayerMessages message, MsgPacketType type) + public static MsgPacket GenerateMsgPacket(this IPlayerEntity player, PlayerMessages message, MessageType type) { return new MsgPacket { @@ -42,7 +42,7 @@ public static MsgPacket GenerateMsgPacket(this IPlayerEntity player, PlayerMessa }; } - public static MsgPacket GenerateMsgPacket(this IPlayerEntity player, string msg, MsgPacketType type) => + public static MsgPacket GenerateMsgPacket(this IPlayerEntity player, string msg, MessageType type) => new MsgPacket { Message = msg, diff --git a/src/ChickenAPI.Game/Entities/Player/Extensions/PlayerMatesExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/PlayerMatesExtensions.cs similarity index 93% rename from src/ChickenAPI.Game/Entities/Player/Extensions/PlayerMatesExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/PlayerMatesExtensions.cs index 6428a473..a47bd398 100644 --- a/src/ChickenAPI.Game/Entities/Player/Extensions/PlayerMatesExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/PlayerMatesExtensions.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Entity; using ChickenAPI.Game.Entities.Mates; namespace ChickenAPI.Game.Entities.Player.Extensions diff --git a/src/ChickenAPI.Game/Entities/Player/Extensions/PlayerUiExtension.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/PlayerUiExtension.cs similarity index 98% rename from src/ChickenAPI.Game/Entities/Player/Extensions/PlayerUiExtension.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/PlayerUiExtension.cs index 2cb7ab15..41d063cf 100644 --- a/src/ChickenAPI.Game/Entities/Player/Extensions/PlayerUiExtension.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/PlayerUiExtension.cs @@ -1,6 +1,5 @@ using System.Threading.Tasks; using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; using ChickenAPI.Game.Entities.Extensions; using ChickenAPI.Game.Families.Extensions; using ChickenAPI.Game.Groups.Extensions; @@ -8,6 +7,7 @@ using ChickenAPI.Game.Movements.Extensions; using ChickenAPI.Game.Relations.Extensions; using ChickenAPI.Game.Skills.Extensions; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Entities.Player.Extensions { @@ -49,7 +49,7 @@ public static Task ActualizeUiReputation(this IPlayerEntity player) => /// /// /// - public static Task ActualizeUiInventorySlot(this IPlayerEntity player, InventoryType type, short slot) + public static Task ActualizeUiInventorySlot(this IPlayerEntity player, PocketType type, short slot) { ItemInstanceDto tmp = player.Inventory.GetItemFromSlotAndType(slot, type); diff --git a/src/ChickenAPI.Game/Inventory/Extensions/PortalPacketExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/PortalPacketExtensions.cs similarity index 52% rename from src/ChickenAPI.Game/Inventory/Extensions/PortalPacketExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/PortalPacketExtensions.cs index 666c0b0b..cee55ef3 100644 --- a/src/ChickenAPI.Game/Inventory/Extensions/PortalPacketExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/PortalPacketExtensions.cs @@ -1,5 +1,5 @@ using ChickenAPI.Game.Portals; -using ChickenAPI.Packets.Game.Server.Portals; +using ChickenAPI.Packets.ServerPackets.Portals; namespace ChickenAPI.Game.Inventory.Extensions { @@ -7,12 +7,12 @@ public static class PortalPacketExtensions { public static GpPacket GenerateGpPacket(this PortalComponent portal) => new GpPacket { - PositionX = portal.SourceX, - PositionY = portal.SourceY, - DestinationMapId = portal.DestinationMapId, + PortalId = (int)portal.PortalId, + IsDisabled = portal.IsDisabled, + SourceX = portal.SourceX, + SourceY = portal.SourceY, + MapId = portal.DestinationMapId, PortalType = portal.Type, - PortalId = portal.PortalId, - IsDisabled = portal.IsDisabled }; } } \ No newline at end of file diff --git a/src/ChickenAPI.Game/Quicklist/Extensions/QsetGenerationExtension.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/QsetGenerationExtension.cs similarity index 94% rename from src/ChickenAPI.Game/Quicklist/Extensions/QsetGenerationExtension.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/QsetGenerationExtension.cs index ea4d7207..77f1339c 100644 --- a/src/ChickenAPI.Game/Quicklist/Extensions/QsetGenerationExtension.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/QsetGenerationExtension.cs @@ -1,5 +1,5 @@ using ChickenAPI.Data.Character; -using ChickenAPI.Packets.Game.Server.Player; +using ChickenAPI.Packets.ServerPackets.Player; namespace ChickenAPI.Game.Quicklist.Extensions { diff --git a/src/ChickenAPI.Game/Skills/Extensions/QuicklistPacketExtension.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/QuicklistPacketExtension.cs similarity index 97% rename from src/ChickenAPI.Game/Skills/Extensions/QuicklistPacketExtension.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/QuicklistPacketExtension.cs index ec22cc78..4f565dba 100644 --- a/src/ChickenAPI.Game/Skills/Extensions/QuicklistPacketExtension.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/QuicklistPacketExtension.cs @@ -3,7 +3,7 @@ using System.Text; using ChickenAPI.Data.Character; using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Packets.Game.Server.Player; +using ChickenAPI.Packets.ServerPackets.Player; namespace ChickenAPI.Game.Skills.Extensions { diff --git a/src/ChickenAPI.Game/IAs/RespawnExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/RespawnExtensions.cs similarity index 100% rename from src/ChickenAPI.Game/IAs/RespawnExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/RespawnExtensions.cs diff --git a/src/ChickenAPI.Game/Movements/Extensions/RestEntityExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/RestEntityExtensions.cs similarity index 83% rename from src/ChickenAPI.Game/Movements/Extensions/RestEntityExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/RestEntityExtensions.cs index 67cf715e..8b606a5c 100644 --- a/src/ChickenAPI.Game/Movements/Extensions/RestEntityExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/RestEntityExtensions.cs @@ -1,9 +1,9 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Game.Entities.Monster; +using ChickenAPI.Game.Entities.Monster; using ChickenAPI.Game.Entities.Npc; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game._ECS.Entities; -using ChickenAPI.Packets.Game.Server.Entities; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Entities; namespace ChickenAPI.Game.Movements.Extensions { @@ -31,8 +31,8 @@ public static RestPacket GenerateRestPacket(this IEntity entity) case IPlayerEntity player: return new RestPacket { - VisualType = VisualType.Character, - VisualId = player.Character.Id, + VisualType = VisualType.Player, + VisualId = player.Id, IsSitting = player.IsSitting }; default: diff --git a/src/ChickenAPI.Game/Inventory/Extensions/SetRarityPointExtension.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/SetRarityPointExtension.cs similarity index 99% rename from src/ChickenAPI.Game/Inventory/Extensions/SetRarityPointExtension.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/SetRarityPointExtension.cs index b11e4512..bda4fc8f 100644 --- a/src/ChickenAPI.Game/Inventory/Extensions/SetRarityPointExtension.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/SetRarityPointExtension.cs @@ -2,8 +2,8 @@ using Autofac; using ChickenAPI.Core.IoC; using ChickenAPI.Core.Maths; +using ChickenAPI.Data.Enums.Game.Items; using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; namespace ChickenAPI.Game.Inventory.Extensions { diff --git a/src/ChickenAPI.Game/Shops/Extensions/ShopPacketExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/ShopPacketExtensions.cs similarity index 86% rename from src/ChickenAPI.Game/Shops/Extensions/ShopPacketExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/ShopPacketExtensions.cs index 2678225c..7a7d52c3 100644 --- a/src/ChickenAPI.Game/Shops/Extensions/ShopPacketExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/ShopPacketExtensions.cs @@ -1,9 +1,9 @@ -using ChickenAPI.Enums.Packets; -using ChickenAPI.Game.Entities.Npc; +using ChickenAPI.Game.Entities.Npc; using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Packets.Game.Client.Shops; -using ChickenAPI.Packets.Game.Server.Shop; using System.Threading.Tasks; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Player; +using ChickenAPI.Packets.ServerPackets.Shop; namespace ChickenAPI.Game.Shops.Extensions { @@ -15,10 +15,10 @@ public static ShopEndPacket GenerateShopEndPacket(this IPlayerEntity player, Sho Type = type }; - public static SMemoPacket GenerateShopMemoPacket(this IPlayerEntity player, SMemoPacketType type, string message) => + public static SMemoPacket GenerateShopMemoPacket(this IPlayerEntity player, SMemoType type, string message) => new SMemoPacket { - SMemoPacketType = type, + Type = type, Message = message }; @@ -40,7 +40,7 @@ public static ShopPacket GenerateShopPacket(this IPlayerEntity player) return new ShopPacket { VisualType = player.Type, - EntityId = player.Id, + VisualId = player.Id, ShopId = 1, MenuType = 3, ShopType = 0, @@ -58,7 +58,7 @@ public static ShopPacket GenerateShopPacket(this INpcEntity npc) return new ShopPacket { VisualType = npc.Type, - EntityId = npc.Id, + VisualId = npc.Id, ShopId = npc.Shop.Id, MenuType = npc.Shop.MenuType, ShopType = npc.Shop.ShopType, @@ -70,7 +70,7 @@ public static ShopPacket GenerateEmptyShopPacket(this IPlayerEntity player) return new ShopPacket { VisualType = player.Type, - EntityId = player.Id, + VisualId = player.Id, ShopId = 0, MenuType = 0, ShopType = 0, diff --git a/src/ChickenAPI.Game/Skills/Extensions/SkiPacketExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/SkiPacketExtensions.cs similarity index 88% rename from src/ChickenAPI.Game/Skills/Extensions/SkiPacketExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/SkiPacketExtensions.cs index c541e9f1..06aeea78 100644 --- a/src/ChickenAPI.Game/Skills/Extensions/SkiPacketExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/SkiPacketExtensions.cs @@ -11,7 +11,7 @@ public static class SkiPacketExtensions { public static IOrderedEnumerable GetSpSkillsByCastIdAscending(this IPlayerEntity player) { - return player.SkillComponent.Skills.Values.Where(s => s.Class == player.GetSpClassId()).OrderBy(s => s.CastId); + return player.Skills.Values.Where(s => s.Class == player.GetSpClassId()).OrderBy(s => s.CastId); } public static byte GetSpClassId(this IPlayerEntity player) => player.Sp.GetClassId(); @@ -20,7 +20,7 @@ public static IOrderedEnumerable GetSpSkillsByCastIdAscending(this IPl public static IOrderedEnumerable GetSkillsByCastIdAscending(this IPlayerEntity player) { - return player.SkillComponent.Skills.Values.OrderBy(s => s.CastId); + return player.Skills.Values.OrderBy(s => s.CastId); } public static SkiPacket GenerateSkiPacket(this IPlayerEntity player) diff --git a/src/ChickenAPI.Game/Skills/Extensions/SkillExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/SkillExtensions.cs similarity index 77% rename from src/ChickenAPI.Game/Skills/Extensions/SkillExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/SkillExtensions.cs index 8455aa8c..c3520584 100644 --- a/src/ChickenAPI.Game/Skills/Extensions/SkillExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/SkillExtensions.cs @@ -6,9 +6,9 @@ using ChickenAPI.Core.IoC; using ChickenAPI.Data.Character; using ChickenAPI.Data.Skills; -using ChickenAPI.Enums.Game.Character; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Skills.Extensions { @@ -19,12 +19,12 @@ public static class SkillExtensions public static int GetCp(this IPlayerEntity player) { int cpMax = (player.Character.Class > CharacterClassType.Adventurer ? 40 : 0) + player.JobLevel * 2; - if (player.SkillComponent?.Skills?.Count == null) + if (player.Skills?.Count == null) { return cpMax; } - int cpUsed = 0 + (int)player.SkillComponent?.Skills?.Values.Where(s => s != null).Sum(dto => dto.CpCost); + int cpUsed = 0 + (int)player.Skills?.Values.Where(s => s != null).Sum(dto => dto.CpCost); return cpMax - cpUsed; } @@ -44,7 +44,7 @@ public static async Task LearnAdventurerSkillsAsync(this IPlayerEntity player) await player.ActualizeUiSkillList(); } - public static void AddSkill(this SkillComponent component, SkillDto skill) + public static void AddSkill(this ISkillEntity component, SkillDto skill) { if (skill == null) { @@ -64,14 +64,14 @@ public static void AddSkill(this SkillComponent component, SkillDto skill) public static async Task AddCharacterSkillAsync(this IPlayerEntity player, CharacterSkillDto skill) { - if (player.SkillComponent.CharacterSkills.ContainsKey(skill.Id)) + if (player.CharacterSkills.ContainsKey(skill.Id)) { return; } - player.SkillComponent.CharacterSkills.Add(skill.Id, skill); + player.CharacterSkills.Add(skill.Id, skill); SkillDto skillDto = await SkillService.GetByIdAsync(skill.SkillId); - player.SkillComponent.AddSkill(skillDto); + player.AddSkill(skillDto); } public static void AddSkills(this IPlayerEntity player, IEnumerable skills) @@ -84,17 +84,17 @@ public static void AddSkills(this IPlayerEntity player, IEnumerable sk public static void AddSkill(this IPlayerEntity player, SkillDto skill) { - player.SkillComponent.AddSkill(skill); + player.AddSkill(skill); } public static void RemoveSkillsByClassId(this IPlayerEntity player, byte classId) { - IEnumerable> skills = player.SkillComponent.Skills.Where(s => s.Value.Class == classId); + IEnumerable> skills = player.Skills.Where(s => s.Value.Class == classId); foreach (KeyValuePair pair in skills) { - player.SkillComponent.Skills.Remove(pair.Value.Id); - player.SkillComponent.SkillsByCastId.Remove(pair.Value.CastId); + player.Skills.Remove(pair.Value.Id); + player.SkillsByCastId.Remove(pair.Value.CastId); } } } diff --git a/src/ChickenAPI.Game/Inventory/Extensions/SlInfoPacketExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/SlInfoPacketExtensions.cs similarity index 98% rename from src/ChickenAPI.Game/Inventory/Extensions/SlInfoPacketExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/SlInfoPacketExtensions.cs index 89dd89ee..61bee4e6 100644 --- a/src/ChickenAPI.Game/Inventory/Extensions/SlInfoPacketExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/SlInfoPacketExtensions.cs @@ -4,7 +4,7 @@ using ChickenAPI.Data.Item; using ChickenAPI.Data.Skills; using ChickenAPI.Game.Skills.Extensions; -using ChickenAPI.Packets.Game.Server.Inventory; +using ChickenAPI.Packets.ServerPackets.Specialists; namespace ChickenAPI.Game.Inventory.Extensions { diff --git a/src/ChickenAPI.Game/Entities/Player/Extensions/SpPacketExtension.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/SpPacketExtension.cs similarity index 66% rename from src/ChickenAPI.Game/Entities/Player/Extensions/SpPacketExtension.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/SpPacketExtension.cs index f85864a8..74ed1539 100644 --- a/src/ChickenAPI.Game/Entities/Player/Extensions/SpPacketExtension.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/SpPacketExtension.cs @@ -2,7 +2,7 @@ using Autofac; using ChickenAPI.Core.IoC; using ChickenAPI.Game.Configuration; -using ChickenAPI.Packets.Game.Client.Specialists; +using ChickenAPI.Packets.ServerPackets.Specialists; namespace ChickenAPI.Game.Entities.Player.Extensions { @@ -16,12 +16,13 @@ public static SpPacket GenerateSpPacket(this IPlayerEntity player) { return null; } + return new SpPacket { - AdditionalPoints = player.Character.SpAdditionPoint, - MaxAdditionalPoints = Configuration.SpMaxAdditionalPoints, - Points = player.Character.SpPoint, - MaxDailyPoints = Configuration.SpMaxDailyPoints + AdditionalPoint = player.Character.SpAdditionPoint, + MaxAdditionalPoint = (int)Configuration.SpMaxAdditionalPoints, + SpPoint = player.Character.SpPoint, + MaxSpPoint = (int)Configuration.SpMaxDailyPoints }; } } diff --git a/src/ChickenAPI.Game/Specialists/Extensions/SpecialistExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/SpecialistExtensions.cs similarity index 84% rename from src/ChickenAPI.Game/Specialists/Extensions/SpecialistExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/SpecialistExtensions.cs index e56d9d4f..cededb79 100644 --- a/src/ChickenAPI.Game/Specialists/Extensions/SpecialistExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/SpecialistExtensions.cs @@ -1,7 +1,7 @@ using ChickenAPI.Game._ECS.Entities; using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Packets.Game.Server.Specialist; using System.Threading.Tasks; +using ChickenAPI.Packets.ServerPackets.Specialists; namespace ChickenAPI.Game.Specialists.Extensions { @@ -16,16 +16,16 @@ public static void SetMorph(this IMorphableEntity entity, short id) entity.MorphId = id; } - public static Task SendSdAsync(this IPlayerEntity player, int cooldown) + public static Task SendSdAsync(this IPlayerEntity player, short cooldown) { return player.SendPacketAsync(player.GenerateSdPacket(cooldown)); } - public static SdPacket GenerateSdPacket(this IPlayerEntity player, int cooldown) + public static SdPacket GenerateSdPacket(this IPlayerEntity player, short cooldown) { return new SdPacket { - CoolDown = cooldown + Cooldown = cooldown }; } } diff --git a/src/ChickenAPI.Game/Specialists/Extensions/SpecialistPacketExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/SpecialistPacketExtensions.cs similarity index 100% rename from src/ChickenAPI.Game/Specialists/Extensions/SpecialistPacketExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/SpecialistPacketExtensions.cs diff --git a/src/ChickenAPI.Game/Entities/Extensions/StPacketExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/StPacketExtensions.cs similarity index 64% rename from src/ChickenAPI.Game/Entities/Extensions/StPacketExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/StPacketExtensions.cs index 84f7ab1a..3c4efad3 100644 --- a/src/ChickenAPI.Game/Entities/Extensions/StPacketExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/StPacketExtensions.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using ChickenAPI.Game.Battle.Interfaces; -using ChickenAPI.Packets.Game.Server.Entities; +using ChickenAPI.Packets.ServerPackets.Entities; namespace ChickenAPI.Game.Entities.Extensions { @@ -10,15 +10,15 @@ public static class StPacketExtensions public static StPacket GenerateStPacket(this IBattleEntity battle) => new StPacket { - VisualType = battle.Type, + Type = battle.Type, VisualId = battle.Id, Level = battle.Level, - HeroLevel = battle.HeroLevel, + HeroLvl = battle.HeroLevel, HpPercentage = battle.HpPercentage, MpPercentage = battle.MpPercentage, - Hp = battle.Hp, - Mp = battle.Mp, - CardIds = new List(battle.Buffs.Select(s => s.Id)) + CurrentHp = battle.Hp, + CurrentMp = battle.Mp, + BuffIds = new List(battle.Buffs.Select(s => (short)s.Id)) }; } } \ No newline at end of file diff --git a/src/ChickenAPI.Game/Entities/Player/Extensions/StatCharExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/StatCharExtensions.cs similarity index 96% rename from src/ChickenAPI.Game/Entities/Player/Extensions/StatCharExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/StatCharExtensions.cs index a6dd61c4..d1283f73 100644 --- a/src/ChickenAPI.Game/Entities/Player/Extensions/StatCharExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/StatCharExtensions.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Packets.Game.Server.Player; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Player; namespace ChickenAPI.Game.Entities.Player.Extensions { diff --git a/src/ChickenAPI.Game/Entities/Extensions/StatPacketExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/StatPacketExtensions.cs similarity index 70% rename from src/ChickenAPI.Game/Entities/Extensions/StatPacketExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/StatPacketExtensions.cs index ebc77e42..e5e69034 100644 --- a/src/ChickenAPI.Game/Entities/Extensions/StatPacketExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/StatPacketExtensions.cs @@ -1,5 +1,5 @@ using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Packets.Game.Server.Player; +using ChickenAPI.Packets.ServerPackets.Player; namespace ChickenAPI.Game.Entities.Extensions { @@ -9,11 +9,11 @@ public static StatPacket GenerateStatPacket(this IPlayerEntity player) => new StatPacket { Hp = player.Hp, - HpMax = player.HpMax, + HpMaximum = player.HpMax, Mp = player.Mp, - MpMax = player.MpMax, + MpMaximum = player.MpMax, Unknown = 0, - CharacterOption = 0 + Option = 0, }; } } \ No newline at end of file diff --git a/src/ChickenAPI.Game/Battle/Extensions/SuPacketExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/SuPacketExtensions.cs similarity index 97% rename from src/ChickenAPI.Game/Battle/Extensions/SuPacketExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/SuPacketExtensions.cs index 365e4266..3d29798c 100644 --- a/src/ChickenAPI.Game/Battle/Extensions/SuPacketExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/SuPacketExtensions.cs @@ -1,6 +1,6 @@ using ChickenAPI.Game.Battle.Hitting; using ChickenAPI.Game.Battle.Interfaces; -using ChickenAPI.Packets.Game.Server.Battle; +using ChickenAPI.Packets.ServerPackets.Battle; namespace ChickenAPI.Game.Battle.Extensions { diff --git a/src/ChickenAPI.Game/Battle/Extensions/TargetExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/TargetExtensions.cs similarity index 100% rename from src/ChickenAPI.Game/Battle/Extensions/TargetExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/TargetExtensions.cs diff --git a/src/ChickenAPI.Game/Entities/Extensions/TpPacketExtension.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/TpPacketExtension.cs similarity index 87% rename from src/ChickenAPI.Game/Entities/Extensions/TpPacketExtension.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/TpPacketExtension.cs index faec7457..46ff63b1 100644 --- a/src/ChickenAPI.Game/Entities/Extensions/TpPacketExtension.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/TpPacketExtension.cs @@ -1,10 +1,10 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Game.Entities.Monster; +using ChickenAPI.Game.Entities.Monster; using ChickenAPI.Game.Entities.Npc; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Movements; using ChickenAPI.Game._ECS.Entities; -using ChickenAPI.Packets.Game.Server.Entities; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Entities; namespace ChickenAPI.Game.Entities.Extensions { @@ -27,7 +27,7 @@ public static TpPacket GenerateTpPacket(this IEntity entity, short x, short y) { case IPlayerEntity player: packet.VisualId = player.Character.Id; - packet.VisualType = VisualType.Character; + packet.VisualType = VisualType.Player; return packet; case IMonsterEntity monster: packet.VisualType = VisualType.Monster; diff --git a/src/ChickenAPI.Game/Inventory/Extensions/VisibleEntityExtensions.cs b/src/ChickenAPI.Game.Extensions/_TOCLEAN/VisibleEntityExtensions.cs similarity index 59% rename from src/ChickenAPI.Game/Inventory/Extensions/VisibleEntityExtensions.cs rename to src/ChickenAPI.Game.Extensions/_TOCLEAN/VisibleEntityExtensions.cs index 8880377f..ea84f8cd 100644 --- a/src/ChickenAPI.Game/Inventory/Extensions/VisibleEntityExtensions.cs +++ b/src/ChickenAPI.Game.Extensions/_TOCLEAN/VisibleEntityExtensions.cs @@ -1,7 +1,6 @@ using System; +using System.Collections.Generic; using ChickenAPI.Data.NpcMonster; -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Enums.Game.Entity; using ChickenAPI.Game.Entities.Drop; using ChickenAPI.Game.Entities.Mates; using ChickenAPI.Game.Entities.Monster; @@ -9,9 +8,10 @@ using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; using ChickenAPI.Game._ECS.Entities; -using ChickenAPI.Packets.Game.Server.Entities; -using ChickenAPI.Packets.Game.Server.MiniMap; -using ChickenAPI.Packets.Game.Server.Visibility; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Entities; +using ChickenAPI.Packets.ServerPackets.MiniMap; +using ChickenAPI.Packets.ServerPackets.Visibility; namespace ChickenAPI.Game.Inventory.Extensions { @@ -24,32 +24,33 @@ private static InPacket GenerateInMonster(IMonsterEntity monster) { VisualType = VisualType.Monster, Name = npcMonster.Id.ToString(), - TransportId = monster.MapMonster.Id.ToString(), + VisualId = monster.MapMonster.Id, PositionX = monster.Position.X, PositionY = monster.Position.Y, - DirectionType = monster.DirectionType, - InMonsterSubPacket = new InMonsterSubPacket + Direction = (byte?)monster.DirectionType, + InNonPlayerSubPacket = new InNonPlayerSubPacket { - HpPercentage = monster.HpPercentage, - MpPercentage = monster.MpPercentage, - Unknown1 = 0, - Unknown2 = 0, - Unknown3 = 0, - Unknown4 = -1, - NoAggressiveIcon = npcMonster.NoAggresiveIcon, - Unknown5 = 0, - Unknown6 = -1, - Unknown7 = "-", - Unknown8 = 0, - Unknown9 = -1, - Unknown10 = 0, - Unknown11 = 0, - Unknown12 = 0, - Unknown13 = 0, - Unknown14 = 0, - Unknown15 = 0, - Unknown16 = 0, - Unknown17 = 0 + Dialog = 0, + Faction = 0, + GroupEffect = 0, + InAliveSubPacket = new InAliveSubPacket + { + Hp = monster.HpPercentage, + Mp = monster.MpPercentage, + }, + Morph = 0, + Skill1 = 0, + Skill2 = 0, + Skill3 = 0, + SkillRank1 = 0, + SkillRank2 = 0, + SkillRank3 = 0, + Unknow1 = 0, + Unknow3 = 0, + Unknow4 = 0, + Name = npcMonster.Id.ToString(), + IsSitting = false, + SpawnEffect = SpawnEffectType.Summon, } }; } @@ -70,7 +71,7 @@ public static InPacket GenerateInPacket(this IEntity entity) case IMateEntity mate: return GenerateInMate(mate); - case ItemDropEntity drop: + case IDropEntity drop: return GenerateInDrop(drop); default: @@ -80,8 +81,8 @@ public static InPacket GenerateInPacket(this IEntity entity) public static OutPacket GenerateOutPacket(this IEntity entity) => new OutPacket { - Type = entity.Type, - EntityId = entity.Id + VisualType = entity.Type, + VisualId = entity.Id }; private static InPacket GenerateInMate(IMateEntity mate) => @@ -89,10 +90,11 @@ private static InPacket GenerateInMate(IMateEntity mate) => { VisualType = VisualType.Npc, Name = mate.Mate.NpcMonsterId.ToString(), - TransportId = mate.Id.ToString(), + VisualId = mate.Id, PositionX = mate.Position.X, PositionY = mate.Position.Y, - DirectionType = mate.DirectionType, + Direction = (byte?)mate.DirectionType, + /* InMateSubPacket = new InMateSubPacket { HpPercentage = mate.HpPercentage, @@ -115,6 +117,7 @@ private static InPacket GenerateInMate(IMateEntity mate) => SPRank2 = 0, // if rank = 7 (SpInstance.SkillRank1 == 7 ? "4238" : "0") SPRank3 = 0 // xxx (SpInstance.SkillRank1 == 7 ? "4239" : "0") } + */ }; private static InPacket GenerateInNpc(INpcEntity npcEntity) => @@ -122,33 +125,11 @@ private static InPacket GenerateInNpc(INpcEntity npcEntity) => { VisualType = VisualType.Npc, Name = npcEntity.NpcMonster.Id.ToString(), - TransportId = npcEntity.Id.ToString(), + VisualId = npcEntity.Id, PositionX = npcEntity.Position.X, PositionY = npcEntity.Position.Y, - DirectionType = npcEntity.DirectionType, - InNpcSubPacket = new InNpcSubPacket - { - HpPercentage = npcEntity.HpPercentage, - MpPercentage = npcEntity.MpPercentage, - Dialog = npcEntity.MapNpc.Dialog, - Unknown1 = 0, - Unknown2 = 0, - Unknown3 = -1, - Unknown4 = 1, - IsSitting = false, - Unknown5 = -1, - Unknown6 = "-", - Unknown7 = 0, - Unknown8 = -1, - Unknown9 = 0, - Unknown10 = 0, - Unknown11 = 0, - Unknown12 = 0, - Unknown13 = 0, - Unknown14 = 0, - Unknown15 = 0, - Unknown16 = 0 - } + VNum = npcEntity.NpcMonster.Id.ToString(), + Direction = (byte?)npcEntity.DirectionType, }; private static InPacket GenerateInDrop(IDropEntity drop) => @@ -156,66 +137,59 @@ private static InPacket GenerateInDrop(IDropEntity drop) => { VisualType = drop.Type, Name = drop.ItemVnum.ToString(), - TransportId = drop.Id.ToString(), + VisualId = drop.Id, PositionX = drop.Position.X, PositionY = drop.Position.Y, - Amount = drop.Quantity, - InDropSubPacket = new InItemSubPacketBase - { - Unknown = 0, - Unknown1 = 0, - Unknown2 = 0 - } }; private static InPacket GenerateInPlayer(IPlayerEntity player) => new InPacket { - VisualType = VisualType.Character, + VisualType = VisualType.Player, Name = player.Character.Name, - TransportId = "-", - VNum = player.Character.Id, + VNum = "-", + VisualId = player.Id, PositionX = player.Position.X, PositionY = player.Position.Y, - DirectionType = player.DirectionType, - InCharacterSubPacket = new InCharacterSubPacketBase + Direction = (byte?)player.DirectionType, + InCharacterSubPacket = new InCharacterSubPacket() { - NameAppearance = player.NameAppearance, + Authority = (byte)player.NameAppearance, Gender = player.Character.Gender, HairStyle = player.Character.HairStyle, HairColor = player.Character.HairColor, Class = player.Character.Class, - Equipment = player.GenerateInventoryWearPacket(), - HpPercentage = player.HpPercentage, - MpPercentage = player.MpPercentage, + Equipment = player.Inventory.GenerateEqListInfoPacket(), + InAliveSubPacket = new InAliveSubPacket { Hp = player.HpPercentage, Mp = player.MpPercentage }, IsSitting = false, GroupId = -1, - FairyId = (byte)(player.Fairy != null ? 4 : 0), + Fairy = (byte)(player.Fairy != null ? 4 : 0), FairyElement = (byte)(player.Fairy?.ElementType ?? 0), - IsBoostedFairy = 0, - FairyMorph = player.Fairy?.Item.Morph ?? 0, - EntryType = 0, - Morph = player.MorphId, - WeaponRareAndUpgradeInfo = $"{player.Weapon?.Rarity ?? 0}{player.Weapon?.Upgrade ?? 0}", - ArmorRareAndUpgradeInfo = $"{player.Armor?.Rarity ?? 0}{player.Armor?.Upgrade ?? 0}", + Unknown = 0, + Morph = (byte)player.MorphId, + Unknown2 = 0, + WeaponUpgradeRareSubPacket = player.Inventory.GenerateEqRareInfoPacket(EquipmentType.MainWeapon), + ArmorUpgradeRareSubPacket = player.Inventory.GenerateEqRareInfoPacket(EquipmentType.Armor), FamilyId = player.HasFamily ? player.Family.Id : -1, FamilyName = player.HasFamily ? player.Family.Name : "-", // if not put -1 - ReputationIcon = player.GetReputIcon(), - Invisible = player.IsInvisible, - SpUpgrade = player.Sp?.Upgrade ?? 0, Faction = FactionType.Neutral, // todo faction system - SpDesign = player.Sp?.Design ?? 0, + ReputIco = (short)player.GetReputIcon(), + Invisible = player.IsInvisible, Level = player.Level, FamilyLevel = player.Family?.FamilyLevel ?? 0, ArenaWinner = player.Character.ArenaWinner, Compliment = player.Character.Compliment, Size = 10, - HeroLevel = player.HeroLevel + HeroLevel = player.HeroLevel, + FamilyIcons = new List { false, false, false }, + MorphUpgrade = player.Sp?.Upgrade ?? 0, + MorphUpgrade2 = player.Sp?.Design ?? 0, + Unknown3 = 0 } }; - public static AtPacketBase GenerateAtPacket(this IPlayerEntity player) => - new AtPacketBase + public static AtPacket GenerateAtPacket(this IPlayerEntity player) => + new AtPacket { CharacterId = player.Character.Id, MapId = Convert.ToInt16(player.CurrentMap.Map.Id), diff --git a/src/ChickenAPI.Game.Impl/ChickenAPI.Game.Impl.csproj b/src/ChickenAPI.Game.Impl/ChickenAPI.Game.Impl.csproj new file mode 100644 index 00000000..f4c77679 --- /dev/null +++ b/src/ChickenAPI.Game.Impl/ChickenAPI.Game.Impl.csproj @@ -0,0 +1,16 @@ + + + + netstandard2.0 + + + + + + + + + + + + diff --git a/src/ChickenAPI.Game/Effects/EffectSystem.cs b/src/ChickenAPI.Game.Impl/EffectSystem.cs similarity index 96% rename from src/ChickenAPI.Game/Effects/EffectSystem.cs rename to src/ChickenAPI.Game.Impl/EffectSystem.cs index 16c22a89..7e985fb9 100644 --- a/src/ChickenAPI.Game/Effects/EffectSystem.cs +++ b/src/ChickenAPI.Game.Impl/EffectSystem.cs @@ -3,7 +3,7 @@ using System.Linq.Expressions; using ChickenAPI.Game._ECS.Entities; using ChickenAPI.Game._ECS.Systems; -using ChickenAPI.Packets.Game.Client.Player; +using ChickenAPI.Packets.ServerPackets.Player; namespace ChickenAPI.Game.Effects { diff --git a/src/ChickenAPI.Game/Groups/GroupSystem.cs b/src/ChickenAPI.Game.Impl/GroupSystem.cs similarity index 100% rename from src/ChickenAPI.Game/Groups/GroupSystem.cs rename to src/ChickenAPI.Game.Impl/GroupSystem.cs index 7e575588..e5e164b8 100644 --- a/src/ChickenAPI.Game/Groups/GroupSystem.cs +++ b/src/ChickenAPI.Game.Impl/GroupSystem.cs @@ -2,9 +2,9 @@ using System.Linq; using System.Linq.Expressions; using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Game.Entities.Player.Extensions; using ChickenAPI.Game._ECS.Entities; using ChickenAPI.Game._ECS.Systems; +using ChickenAPI.Game.Entities.Player.Extensions; namespace ChickenAPI.Game.Groups { diff --git a/src/ChickenAPI.Game/IAs/IASystem.cs b/src/ChickenAPI.Game.Impl/IASystem.cs similarity index 93% rename from src/ChickenAPI.Game/IAs/IASystem.cs rename to src/ChickenAPI.Game.Impl/IASystem.cs index 5debacf0..886b731a 100644 --- a/src/ChickenAPI.Game/IAs/IASystem.cs +++ b/src/ChickenAPI.Game.Impl/IASystem.cs @@ -6,19 +6,15 @@ using ChickenAPI.Core.IoC; using ChickenAPI.Core.Maths; using ChickenAPI.Core.Utils; +using ChickenAPI.Data.Enums.Game.Skill; using ChickenAPI.Data.Skills; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Enums.Game.Skill; using ChickenAPI.Game.Battle.Interfaces; -using ChickenAPI.Game.Entities; -using ChickenAPI.Game.Entities.Monster; -using ChickenAPI.Game.Entities.Npc; using ChickenAPI.Game.Maps; -using ChickenAPI.Game.Movements; -using ChickenAPI.Game.Movements.Extensions; using ChickenAPI.Game.Skills.Args; using ChickenAPI.Game._ECS.Entities; using ChickenAPI.Game._ECS.Systems; +using ChickenAPI.Game.Movements.Extensions; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.IAs { @@ -41,7 +37,7 @@ public IASystem(IEntityManager entityManager, IMap map) : base(entityManager) private static bool MovableFilter(IEntity entity) { - if (entity.Type == VisualType.Character) + if (entity.Type == VisualType.Player) { return false; } @@ -122,7 +118,7 @@ private void ProcessAiWithoutTarget(IAiEntity mov) return; } // supposedly should never enter here - if (mov.Type == VisualType.Character || mov.Speed == 0) + if (mov.Type == VisualType.Player || mov.Speed == 0) { return; } diff --git a/src/ChickenAPI.Game/Entities/Drop/ItemDropEntity.cs b/src/ChickenAPI.Game.Impl/ItemDropEntity.cs similarity index 82% rename from src/ChickenAPI.Game/Entities/Drop/ItemDropEntity.cs rename to src/ChickenAPI.Game.Impl/ItemDropEntity.cs index a14e56af..e070b8ab 100644 --- a/src/ChickenAPI.Game/Entities/Drop/ItemDropEntity.cs +++ b/src/ChickenAPI.Game.Impl/ItemDropEntity.cs @@ -2,15 +2,15 @@ using System.Collections.Generic; using ChickenAPI.Core.Utils; using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Entity; using ChickenAPI.Game._ECS.Components; using ChickenAPI.Game._ECS.Entities; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Entities.Drop { public class ItemDropEntity : EntityBase, IDropEntity { - public ItemDropEntity(long id) : base(VisualType.MapObject, id) => Components = new Dictionary(); + public ItemDropEntity(long id) : base(VisualType.Object, id) => Components = new Dictionary(); public ItemDto Item { get; set; } public ItemInstanceDto ItemInstance { get; set; } diff --git a/src/ChickenAPI.Game.Impl/JsonConfigurationSerializer.cs b/src/ChickenAPI.Game.Impl/JsonConfigurationSerializer.cs new file mode 100644 index 00000000..1fee633c --- /dev/null +++ b/src/ChickenAPI.Game.Impl/JsonConfigurationSerializer.cs @@ -0,0 +1,13 @@ +using System; +using ChickenAPI.Core.Configurations; +using Newtonsoft.Json; + +namespace ChickenAPI.Game.Impl +{ + public class JsonConfigurationSerializer : IConfigurationSerializer + { + public string Serialize(T conf) where T : IConfiguration => JsonConvert.SerializeObject(conf); + + public T Deserialize(string buffer) where T : IConfiguration => JsonConvert.DeserializeObject(buffer); + } +} \ No newline at end of file diff --git a/src/ChickenAPI.Game/Entities/Mates/MateEntity.cs b/src/ChickenAPI.Game.Impl/MateEntity.cs similarity index 95% rename from src/ChickenAPI.Game/Entities/Mates/MateEntity.cs rename to src/ChickenAPI.Game.Impl/MateEntity.cs index 58a440eb..60236141 100644 --- a/src/ChickenAPI.Game/Entities/Mates/MateEntity.cs +++ b/src/ChickenAPI.Game.Impl/MateEntity.cs @@ -3,10 +3,10 @@ using System.Linq; using ChickenAPI.Core.Utils; using ChickenAPI.Data.Character; +using ChickenAPI.Data.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Visibility; using ChickenAPI.Data.NpcMonster; using ChickenAPI.Data.Skills; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Enums.Game.Visibility; using ChickenAPI.Game.Battle.Interfaces; using ChickenAPI.Game.Buffs; using ChickenAPI.Game.Entities.Player; @@ -15,6 +15,7 @@ using ChickenAPI.Game.Visibility; using ChickenAPI.Game._ECS.Components; using ChickenAPI.Game._ECS.Entities; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Entities.Mates { @@ -206,11 +207,13 @@ public IBattleEntity Target #region Skills + public List<(DateTime, long)> CooldownsBySkillId => SkillComponent.CooldownsBySkillId; public bool HasSkill(long skillId) => SkillComponent.Skills.ContainsKey(skillId); public bool CanCastSkill(long skillId) => SkillComponent.CooldownsBySkillId.Any(s => s.Item2 == skillId); public IDictionary Skills => SkillComponent.Skills; + public IDictionary SkillsByCastId => SkillComponent.SkillsByCastId; public SkillComponent SkillComponent { get; } diff --git a/src/ChickenAPI.Game/Entities/Monster/MonsterEntity.cs b/src/ChickenAPI.Game.Impl/MonsterEntity.cs similarity index 95% rename from src/ChickenAPI.Game/Entities/Monster/MonsterEntity.cs rename to src/ChickenAPI.Game.Impl/MonsterEntity.cs index 4afe7567..6e17dc7b 100644 --- a/src/ChickenAPI.Game/Entities/Monster/MonsterEntity.cs +++ b/src/ChickenAPI.Game.Impl/MonsterEntity.cs @@ -2,11 +2,11 @@ using System.Collections.Generic; using System.Linq; using ChickenAPI.Core.Utils; +using ChickenAPI.Data.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Visibility; using ChickenAPI.Data.Map; using ChickenAPI.Data.NpcMonster; using ChickenAPI.Data.Skills; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Enums.Game.Visibility; using ChickenAPI.Game.Battle.Interfaces; using ChickenAPI.Game.Buffs; using ChickenAPI.Game.Movements.DataObjects; @@ -14,6 +14,7 @@ using ChickenAPI.Game.Visibility; using ChickenAPI.Game._ECS.Components; using ChickenAPI.Game._ECS.Entities; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Entities.Monster { @@ -129,11 +130,14 @@ public VisibilityType Visibility #region Skills + public List<(DateTime, long)> CooldownsBySkillId => SkillComponent.CooldownsBySkillId; + public bool HasSkill(long skillId) => SkillComponent.Skills.ContainsKey(skillId); public bool CanCastSkill(long skillId) => SkillComponent.CooldownsBySkillId.Any(s => s.Item2 == skillId); public IDictionary Skills => SkillComponent.Skills; + public IDictionary SkillsByCastId => SkillComponent.SkillsByCastId; public SkillComponent SkillComponent { get; } diff --git a/src/ChickenAPI.Game/Movements/DataObjects/MovableComponent.cs b/src/ChickenAPI.Game.Impl/MovableComponent.cs similarity index 89% rename from src/ChickenAPI.Game/Movements/DataObjects/MovableComponent.cs rename to src/ChickenAPI.Game.Impl/MovableComponent.cs index 3ee89cf3..45f9c212 100644 --- a/src/ChickenAPI.Game/Movements/DataObjects/MovableComponent.cs +++ b/src/ChickenAPI.Game.Impl/MovableComponent.cs @@ -1,9 +1,10 @@ using System; using Autofac; +using ChickenAPI.Core.Events; using ChickenAPI.Core.IoC; using ChickenAPI.Core.Utils; using ChickenAPI.Data.Character; -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Entity; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Movements.Extensions; using ChickenAPI.Game._ECS.Components; @@ -16,6 +17,7 @@ namespace ChickenAPI.Game.Movements.DataObjects /// public class MovableComponent : IComponent { + private static IAlgorithmService Algorithm => new Lazy(() => ChickenContainer.Instance.Resolve()).Value; private Position _actual; private bool _isSitting; @@ -37,7 +39,6 @@ public MovableComponent(IPlayerEntity entity) Speed = (byte)Algorithm.GetSpeed(entity.Character.Class, entity.Level); } - private static IAlgorithmService Algorithm => new Lazy(() => ChickenContainer.Instance.Resolve()).Value; /// /// Entity Walking Speed @@ -66,7 +67,7 @@ public Position Actual set { LastMove = DateTime.UtcNow; - OnMove(Entity, new MoveEventArgs { Component = this, New = value, Old = _actual }); + OnMove(Entity, new MoveEventArgs { Component = Entity as IMovableEntity, New = value, Old = _actual }); _actual = value; } } @@ -75,12 +76,9 @@ public Position Actual public IEntity Entity { get; set; } - public static event TypedSenderEventHandler Move; - private static void OnMove(IEntity sender, MoveEventArgs e) { e.Component.LastMove = DateTime.UtcNow; - Move?.Invoke(sender, e); } } } \ No newline at end of file diff --git a/src/ChickenAPI.Game/Movements/MovableSystem.cs b/src/ChickenAPI.Game.Impl/MovableSystem.cs similarity index 82% rename from src/ChickenAPI.Game/Movements/MovableSystem.cs rename to src/ChickenAPI.Game.Impl/MovableSystem.cs index fb33243a..022e83ab 100644 --- a/src/ChickenAPI.Game/Movements/MovableSystem.cs +++ b/src/ChickenAPI.Game.Impl/MovableSystem.cs @@ -1,22 +1,26 @@ using System; using System.Linq; using System.Linq.Expressions; +using ChickenAPI.Core.Logging; using ChickenAPI.Core.Utils; -using ChickenAPI.Enums.Game.Entity; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.IAs; -using ChickenAPI.Game.Inventory.Extensions; -using ChickenAPI.Game.Movements.Extensions; using ChickenAPI.Game._ECS.Entities; using ChickenAPI.Game._ECS.Systems; -using ChickenAPI.Packets.Game.Server.Entities; +using ChickenAPI.Game.Inventory.Extensions; +using ChickenAPI.Game.Movements.Extensions; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Entities; namespace ChickenAPI.Game.Movements { public class MovableSystem : SystemBase { - public MovableSystem(IEntityManager entityManager) : base(entityManager) + private readonly ILogger _log; + + public MovableSystem(IEntityManager entityManager, ILogger log) : base(entityManager) { + _log = log; } protected override double RefreshRate => 3; @@ -25,7 +29,7 @@ public MovableSystem(IEntityManager entityManager) : base(entityManager) private static bool MovableFilter(IEntity entity) { - if (entity.Type == VisualType.Character) + if (entity.Type == VisualType.Player) { return false; } @@ -43,11 +47,11 @@ protected override void Execute(IEntity entity) ProcessMovement((IMovableEntity)entity); } - private void Move(IEntity entity) + private void Move(IMovableEntity entity) { try { - MvPacket packet = entity.GenerateMvPacket(); + MovePacket packet = entity.GenerateMvPacket(); entity.CurrentMap.BroadcastAsync(packet).ConfigureAwait(false).GetAwaiter().GetResult(); if (entity is IPlayerEntity playerEntity) @@ -57,7 +61,7 @@ private void Move(IEntity entity) } catch (Exception e) { - Log.Error("Move()", e); + _log.Error("Move()", e); } } diff --git a/src/ChickenAPI.Game/Entities/Npc/NpcEntity.cs b/src/ChickenAPI.Game.Impl/NpcEntity.cs similarity index 95% rename from src/ChickenAPI.Game/Entities/Npc/NpcEntity.cs rename to src/ChickenAPI.Game.Impl/NpcEntity.cs index 585a8262..e54f5c25 100644 --- a/src/ChickenAPI.Game/Entities/Npc/NpcEntity.cs +++ b/src/ChickenAPI.Game.Impl/NpcEntity.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Linq; using ChickenAPI.Core.Utils; +using ChickenAPI.Data.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Visibility; using ChickenAPI.Data.Map; using ChickenAPI.Data.NpcMonster; using ChickenAPI.Data.Shop; using ChickenAPI.Data.Skills; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Enums.Game.Visibility; using ChickenAPI.Game.Battle.Interfaces; using ChickenAPI.Game.Buffs; using ChickenAPI.Game.Entities.Monster; @@ -17,6 +17,7 @@ using ChickenAPI.Game.Visibility; using ChickenAPI.Game._ECS.Components; using ChickenAPI.Game._ECS.Entities; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Entities.Npc { @@ -133,11 +134,14 @@ public VisibilityType Visibility #region Skills + public List<(DateTime, long)> CooldownsBySkillId => SkillComponent.CooldownsBySkillId; + public bool HasSkill(long skillId) => SkillComponent.Skills.ContainsKey(skillId); public bool CanCastSkill(long skillId) => SkillComponent.CooldownsBySkillId.Any(s => s.Item2 == skillId); public IDictionary Skills => SkillComponent.Skills; + public IDictionary SkillsByCastId => SkillComponent.SkillsByCastId; public SkillComponent SkillComponent { get; } diff --git a/src/ChickenAPI.Game/Entities/Player/PlayerEntity.cs b/src/ChickenAPI.Game.Impl/PlayerEntity.cs similarity index 94% rename from src/ChickenAPI.Game/Entities/Player/PlayerEntity.cs rename to src/ChickenAPI.Game.Impl/PlayerEntity.cs index 7383a889..f74526e8 100644 --- a/src/ChickenAPI.Game/Entities/Player/PlayerEntity.cs +++ b/src/ChickenAPI.Game.Impl/PlayerEntity.cs @@ -6,15 +6,13 @@ using ChickenAPI.Core.IoC; using ChickenAPI.Core.Utils; using ChickenAPI.Data.Character; +using ChickenAPI.Data.Enums; +using ChickenAPI.Data.Enums.Game.Character; +using ChickenAPI.Data.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Visibility; using ChickenAPI.Data.Families; using ChickenAPI.Data.Item; using ChickenAPI.Data.Skills; -using ChickenAPI.Enums; -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Enums.Game.Families; -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Enums.Game.Visibility; using ChickenAPI.Game.Battle.Interfaces; using ChickenAPI.Game.Buffs; using ChickenAPI.Game.Entities.Mates; @@ -35,7 +33,9 @@ using ChickenAPI.Game._ECS.Components; using ChickenAPI.Game._ECS.Entities; using ChickenAPI.Game._Network; -using ChickenAPI.Packets; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.Interfaces; +using EquipmentType = ChickenAPI.Data.Enums.Game.Items.EquipmentType; namespace ChickenAPI.Game.Entities.Player { @@ -52,7 +52,7 @@ private static readonly ICharacterQuickListService private static readonly IPlayerManager PlayerManager = new Lazy(() => ChickenContainer.Instance.Resolve()).Value; - public PlayerEntity(ISession session, CharacterDto dto, IEnumerable skills, IEnumerable quicklist) : base(VisualType.Character, dto.Id) + public PlayerEntity(ISession session, CharacterDto dto, IEnumerable skills, IEnumerable quicklist) : base(VisualType.Player, dto.Id) { Session = session; Character = dto; @@ -120,6 +120,7 @@ public long Gold public LocomotionComponent Locomotion { get; } public IRelationList Relations { get; } public CharacterDto Character { get; } + public Dictionary CharacterSkills { get; } public List Mates { get; set; } public IEnumerable ActualMates => Mates.Where(s => s.Mate.IsTeamMember).OrderByDescending(s => s.Mate.MateType); @@ -193,7 +194,7 @@ public void Save() CharacterSkillService.Save(SkillComponent.CharacterSkills.Values); CharacterQuicklistService.Save(Quicklist.Quicklist); ItemInstance.Save(Inventory.GetItems()); - Log.Info($"[SAVE] {Character.Name} saved in {(DateTime.UtcNow - before).TotalMilliseconds} ms"); + // Log.Info($"[SAVE] {Character.Name} saved in {(DateTime.UtcNow - before).TotalMilliseconds} ms"); } public double LastPortal { get; set; } @@ -261,11 +262,13 @@ public void Save() #region Skills + public List<(DateTime, long)> CooldownsBySkillId => SkillComponent.CooldownsBySkillId; public bool HasSkill(long skillId) => SkillComponent.Skills.ContainsKey(skillId); public bool CanCastSkill(long skillId) => SkillComponent.CooldownsBySkillId.Any(s => s.Item2 == skillId); - public IDictionary Skills { get; } + public IDictionary Skills => SkillComponent.Skills; + public IDictionary SkillsByCastId => SkillComponent.SkillsByCastId; public SkillComponent SkillComponent { get; } diff --git a/src/ChickenAPI.Game/IAs/RespawnSystem.cs b/src/ChickenAPI.Game.Impl/RespawnSystem.cs similarity index 97% rename from src/ChickenAPI.Game/IAs/RespawnSystem.cs rename to src/ChickenAPI.Game.Impl/RespawnSystem.cs index 65fcd178..290b87da 100644 --- a/src/ChickenAPI.Game/IAs/RespawnSystem.cs +++ b/src/ChickenAPI.Game.Impl/RespawnSystem.cs @@ -1,11 +1,11 @@ using System; using System.Linq.Expressions; -using ChickenAPI.Enums.Game.Entity; using ChickenAPI.Game.Battle.Interfaces; using ChickenAPI.Game.Entities.Monster; using ChickenAPI.Game.Entities.Npc; using ChickenAPI.Game._ECS.Entities; using ChickenAPI.Game._ECS.Systems; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.IAs { diff --git a/src/ChickenAPI.Game/Maps/SimpleMap.cs b/src/ChickenAPI.Game.Impl/SimpleMap.cs similarity index 95% rename from src/ChickenAPI.Game/Maps/SimpleMap.cs rename to src/ChickenAPI.Game.Impl/SimpleMap.cs index 241efa02..244b2caa 100644 --- a/src/ChickenAPI.Game/Maps/SimpleMap.cs +++ b/src/ChickenAPI.Game.Impl/SimpleMap.cs @@ -4,6 +4,7 @@ using System.Threading; using Autofac; using ChickenAPI.Core.IoC; +using ChickenAPI.Core.Logging; using ChickenAPI.Core.Maths; using ChickenAPI.Core.Utils; using ChickenAPI.Data.Map; @@ -16,6 +17,7 @@ namespace ChickenAPI.Game.Maps public class SimpleMap : EntityManagerBase, IMap { private readonly bool _initSystems; + private readonly ILogger _log; private readonly MapDto _map; private readonly IEnumerable _monsters; private readonly IEnumerable _shops; @@ -41,6 +43,7 @@ public SimpleMap(MapDto map, IEnumerable monsters, IEnumerable(); _random = ChickenContainer.Instance.Resolve(); + _log = ChickenContainer.Instance.Resolve(); _walkableGrid = new Lazy[]>(() => @@ -76,7 +79,7 @@ public bool IsWalkable(short x, short y) } catch (Exception) { - Log.Warn($"[IS_WALKABLE] {Id}: ({x},{y})"); + _log.Warn($"[IS_WALKABLE] {Id}: ({x},{y})"); return false; } } diff --git a/src/ChickenAPI.Game/Maps/SimpleMapLayer.cs b/src/ChickenAPI.Game.Impl/SimpleMapLayer.cs similarity index 96% rename from src/ChickenAPI.Game/Maps/SimpleMapLayer.cs rename to src/ChickenAPI.Game.Impl/SimpleMapLayer.cs index 1b12494d..b231aa27 100644 --- a/src/ChickenAPI.Game/Maps/SimpleMapLayer.cs +++ b/src/ChickenAPI.Game.Impl/SimpleMapLayer.cs @@ -8,7 +8,6 @@ using ChickenAPI.Data.Map; using ChickenAPI.Data.NpcMonster; using ChickenAPI.Data.Shop; -using ChickenAPI.Enums.Game.Entity; using ChickenAPI.Game.Effects; using ChickenAPI.Game.Entities; using ChickenAPI.Game.Entities.Monster; @@ -22,6 +21,9 @@ using ChickenAPI.Game._ECS.Entities; using ChickenAPI.Game._Network; using ChickenAPI.Packets; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.Interfaces; +using ChickenAPI.Core.Logging; namespace ChickenAPI.Game.Maps { @@ -57,7 +59,7 @@ public SimpleMapLayer(IMap map, IEnumerable monsters, public bool IsPvpEnabled => false; public IEnumerable Players => _players; - public IPlayerEntity GetPlayerById(long id) => GetEntity(id, VisualType.Character); + public IPlayerEntity GetPlayerById(long id) => GetEntity(id, VisualType.Player); public IEnumerable GetPlayersInRange(Position pos, int range) => _players.Where(e => PositionHelper.GetDistance(pos, e.Position) < range); @@ -115,7 +117,7 @@ private void InitializePortals(IEnumerable portals) private void InitializeSystems() { - AddSystem(new MovableSystem(this)); + AddSystem(new MovableSystem(this, ChickenContainer.Instance.Resolve())); AddSystem(new IASystem(this, Map)); AddSystem(new EffectSystem(this)); AddSystem(new GroupSystem(this)); @@ -138,6 +140,7 @@ private void InitializeNpcs(IEnumerable npcs, IEnumerable sh { npcSkills = new List(); } + new NpcEntity(npc, shop).TransferEntity(this); } } diff --git a/src/ChickenAPI.Game/Skills/SkillComponent.cs b/src/ChickenAPI.Game.Impl/SkillComponent.cs similarity index 65% rename from src/ChickenAPI.Game/Skills/SkillComponent.cs rename to src/ChickenAPI.Game.Impl/SkillComponent.cs index 351bfa04..ef18a319 100644 --- a/src/ChickenAPI.Game/Skills/SkillComponent.cs +++ b/src/ChickenAPI.Game.Impl/SkillComponent.cs @@ -6,19 +6,19 @@ using ChickenAPI.Data.Character; using ChickenAPI.Data.NpcMonster; using ChickenAPI.Data.Skills; -using ChickenAPI.Enums.Game.Character; using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Game.Skills.Extensions; using ChickenAPI.Game._ECS.Components; using ChickenAPI.Game._ECS.Entities; +using ChickenAPI.Game.Skills.Extensions; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Skills { - public class SkillComponent : IComponent + public class SkillComponent : IComponent, ISkillCapacity { private static readonly ISkillService SkillService = new Lazy(() => ChickenContainer.Instance.Resolve()).Value; - public SkillComponent(IEntity entity) + public SkillComponent(ISkillEntity entity) { Entity = entity; @@ -28,24 +28,24 @@ public SkillComponent(IEntity entity) } int tmp = 200 + 20 * (byte)player.Character.Class; - this.AddSkill(SkillService.GetById(tmp)); - this.AddSkill(SkillService.GetById(tmp + 1)); + entity.AddSkill(SkillService.GetById(tmp)); + entity.AddSkill(SkillService.GetById(tmp + 1)); if (player.Character.Class != CharacterClassType.Adventurer) { return; } - this.AddSkill(SkillService.GetById(tmp + 9)); + entity.AddSkill(SkillService.GetById(tmp + 9)); IEnumerable skills = SkillService.GetByClassIdAsync((byte)player.Character.Class).ConfigureAwait(false).GetAwaiter().GetResult(); foreach (SkillDto skillDto in skills.Where(s => s.LevelMinimum < player.JobLevel && s.Id >= 200 && s.Id != 209 && s.Id <= 210)) { - this.AddSkill(skillDto); + entity.AddSkill(skillDto); } } - public SkillComponent(IEntity entity, IEnumerable skills) : this(entity) + public SkillComponent(ISkillEntity entity, IEnumerable skills) : this(entity) { if (skills == null) { @@ -55,11 +55,11 @@ public SkillComponent(IEntity entity, IEnumerable skills) : // add skills to component foreach (NpcMonsterSkillDto skill in skills) { - this.AddSkill(skill.Skill); + entity.AddSkill(skill.Skill); } } - public SkillComponent(IEntity entity, IEnumerable skills) : this(entity) + public SkillComponent(ISkillEntity entity, IEnumerable skills) : this(entity) { if (skills == null) { @@ -69,17 +69,20 @@ public SkillComponent(IEntity entity, IEnumerable skills) : t foreach (CharacterSkillDto characterSkill in skills) { CharacterSkills.Add(characterSkill.Id, characterSkill); - this.AddSkill(characterSkill.Skill); + entity.AddSkill(characterSkill.Skill); } } public Dictionary CharacterSkills { get; } = new Dictionary(); - public Dictionary Skills { get; } = new Dictionary(); + public IDictionary Skills { get; } = new Dictionary(); - public Dictionary SkillsByCastId { get; } = new Dictionary(); + public IDictionary SkillsByCastId { get; } = new Dictionary(); public List<(DateTime, long)> CooldownsBySkillId { get; } = new List<(DateTime, long)>(); + public bool HasSkill(long skillId) => Skills.ContainsKey(skillId); + + public bool CanCastSkill(long skillId) => CooldownsBySkillId.Any(s => s.Item2 == skillId); public IEntity Entity { get; } } diff --git a/src/ChickenAPI.Game/Specialists/SpecialistSystem.cs b/src/ChickenAPI.Game.Impl/SpecialistSystem.cs similarity index 91% rename from src/ChickenAPI.Game/Specialists/SpecialistSystem.cs rename to src/ChickenAPI.Game.Impl/SpecialistSystem.cs index 276543e2..631efc93 100644 --- a/src/ChickenAPI.Game/Specialists/SpecialistSystem.cs +++ b/src/ChickenAPI.Game.Impl/SpecialistSystem.cs @@ -1,10 +1,10 @@ using System; using System.Linq.Expressions; -using ChickenAPI.Enums.Game.Entity; using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Game.Entities.Player.Extensions; using ChickenAPI.Game._ECS.Entities; using ChickenAPI.Game._ECS.Systems; +using ChickenAPI.Game.Entities.Player.Extensions; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Specialists { @@ -16,7 +16,7 @@ public SpecialistSystem(IEntityManager entityManager) : base(entityManager) // all 10 seconds protected override double RefreshRate => 0.1; - protected override Expression> Filter => entity => entity.Type == VisualType.Character; + protected override Expression> Filter => entity => entity.Type == VisualType.Player; protected override void Execute(IEntity entity) { diff --git a/src/ChickenAPI.Game/BCards/BCardEffectHandlerAttribute.cs b/src/ChickenAPI.Game/BCards/BCardEffectHandlerAttribute.cs index 451f178d..05c2e01a 100644 --- a/src/ChickenAPI.Game/BCards/BCardEffectHandlerAttribute.cs +++ b/src/ChickenAPI.Game/BCards/BCardEffectHandlerAttribute.cs @@ -1,5 +1,5 @@ using System; -using ChickenAPI.Enums.Game.BCard; +using ChickenAPI.Data.Enums.Game.BCard; namespace ChickenAPI.Game.BCards { diff --git a/src/ChickenAPI.Game/BCards/BasicBCardHandler.cs b/src/ChickenAPI.Game/BCards/BasicBCardHandler.cs index 62935648..a1919a7e 100644 --- a/src/ChickenAPI.Game/BCards/BasicBCardHandler.cs +++ b/src/ChickenAPI.Game/BCards/BasicBCardHandler.cs @@ -1,16 +1,14 @@ using System; using System.Reflection; using System.Threading.Tasks; -using ChickenAPI.Core.Logging; using ChickenAPI.Data.BCard; -using ChickenAPI.Enums.Game.BCard; +using ChickenAPI.Data.Enums.Game.BCard; using ChickenAPI.Game.Battle.Interfaces; namespace ChickenAPI.Game.BCards { public class BasicBCardHandler : IBCardEffectHandler { - private readonly Logger Log = Logger.GetLogger(); private readonly Action _func; public BasicBCardHandler(MethodInfo method) : this(method.GetCustomAttribute(), method) @@ -33,7 +31,6 @@ public BasicBCardHandler(BCardEffectHandlerAttribute attribute, MethodInfo metho public Task Handle(IBattleEntity target, IBattleEntity sender, BCardDto bcard) { - Log.Info($"Handling : {HandledType}"); _func(target, sender, bcard); return Task.CompletedTask; } diff --git a/src/ChickenAPI.Game/BCards/IBCardEffectHandler.cs b/src/ChickenAPI.Game/BCards/IBCardEffectHandler.cs index 39539708..c5b9f8d5 100644 --- a/src/ChickenAPI.Game/BCards/IBCardEffectHandler.cs +++ b/src/ChickenAPI.Game/BCards/IBCardEffectHandler.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; using ChickenAPI.Data.BCard; -using ChickenAPI.Enums.Game.BCard; +using ChickenAPI.Data.Enums.Game.BCard; using ChickenAPI.Game.Battle.Interfaces; namespace ChickenAPI.Game.BCards diff --git a/src/ChickenAPI.Game/Battle/Hitting/HitRequest.cs b/src/ChickenAPI.Game/Battle/Hitting/HitRequest.cs index e8181b04..7793055c 100644 --- a/src/ChickenAPI.Game/Battle/Hitting/HitRequest.cs +++ b/src/ChickenAPI.Game/Battle/Hitting/HitRequest.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using ChickenAPI.Data.BCard; using ChickenAPI.Data.Skills; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game.Battle.Interfaces; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Battle.Hitting { diff --git a/src/ChickenAPI.Game/Buffs/BuffContainer.cs b/src/ChickenAPI.Game/Buffs/BuffContainer.cs index c32bcf62..0e08ac60 100644 --- a/src/ChickenAPI.Game/Buffs/BuffContainer.cs +++ b/src/ChickenAPI.Game/Buffs/BuffContainer.cs @@ -1,6 +1,6 @@ using System; +using ChickenAPI.Data.Enums.Game.Buffs; using ChickenAPI.Data.Skills; -using ChickenAPI.Enums.Game.Buffs; namespace ChickenAPI.Game.Buffs { diff --git a/src/ChickenAPI.Game/Builders/CharacterBuilder.cs b/src/ChickenAPI.Game/Builders/CharacterBuilder.cs index af5c84e0..176c2fc7 100644 --- a/src/ChickenAPI.Game/Builders/CharacterBuilder.cs +++ b/src/ChickenAPI.Game/Builders/CharacterBuilder.cs @@ -1,6 +1,6 @@ using ChickenAPI.Data.Account; using ChickenAPI.Data.Character; -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Builders { diff --git a/src/ChickenAPI.Game/Builders/WeaponOptionBuilder.cs b/src/ChickenAPI.Game/Builders/WeaponOptionBuilder.cs index 1cfb12a5..d477c942 100644 --- a/src/ChickenAPI.Game/Builders/WeaponOptionBuilder.cs +++ b/src/ChickenAPI.Game/Builders/WeaponOptionBuilder.cs @@ -1,6 +1,6 @@ using System; +using ChickenAPI.Data.Enums.Game.Items; using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; namespace ChickenAPI.Game.Builders { diff --git a/src/ChickenAPI.Game/ChickenAPI.Game.csproj b/src/ChickenAPI.Game/ChickenAPI.Game.csproj index c89b5356..5dcb0fcd 100644 --- a/src/ChickenAPI.Game/ChickenAPI.Game.csproj +++ b/src/ChickenAPI.Game/ChickenAPI.Game.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 @@ -19,21 +19,11 @@ - - - + + - - - - - - - - - diff --git a/src/ChickenAPI.Game/Effects/EffectComponent.cs b/src/ChickenAPI.Game/Effects/EffectComponent.cs index c9a3fef7..8b0abd9a 100644 --- a/src/ChickenAPI.Game/Effects/EffectComponent.cs +++ b/src/ChickenAPI.Game/Effects/EffectComponent.cs @@ -19,14 +19,14 @@ public EffectComponent(IEntity entity) public class Effect { - public Effect(long id, long cooldown) + public Effect(int id, long cooldown) { Id = id; Cooldown = cooldown; LastCast = DateTime.MinValue; } - public long Id { get; } + public int Id { get; } /// /// In milliseconds diff --git a/src/ChickenAPI.Game/Effects/EntityExtensionEffect.cs b/src/ChickenAPI.Game/Effects/EntityExtensionEffect.cs index bc4801cd..e5e2b466 100644 --- a/src/ChickenAPI.Game/Effects/EntityExtensionEffect.cs +++ b/src/ChickenAPI.Game/Effects/EntityExtensionEffect.cs @@ -1,40 +1,17 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Game.Entities.Monster; -using ChickenAPI.Game.Entities.Npc; -using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Game._ECS.Entities; -using ChickenAPI.Packets.Game.Client.Player; +using ChickenAPI.Game._ECS.Entities; +using ChickenAPI.Packets.ServerPackets.Player; namespace ChickenAPI.Game.Effects { public static class EntityExtensionEffect { - public static EffectPacket GenerateEffectPacket(this IEntity entity, long id) + public static EffectPacket GenerateEffectPacket(this IEntity entity, int id) { - long visualId = 0; - var visualType = VisualType.Character; - switch (entity) - - { - case IPlayerEntity player: - visualId = player.Character.Id; - visualType = VisualType.Character; - break; - case IMonsterEntity monster: - visualId = monster.MapMonster.Id; - visualType = VisualType.Monster; - break; - case INpcEntity npc: - visualId = npc.MapNpc.Id; - visualType = VisualType.Monster; - break; - } - return new EffectPacket { - CharacterId = visualId, - EffectId = id, - EffectType = visualType + VisualEntityId = entity.Id, + EffectType = entity.Type, + Id = id, }; } } diff --git a/src/ChickenAPI.Game/Entities/Events/ReqInfoEvent.cs b/src/ChickenAPI.Game/Entities/Events/ReqInfoEvent.cs index 3211fc14..16c7242f 100644 --- a/src/ChickenAPI.Game/Entities/Events/ReqInfoEvent.cs +++ b/src/ChickenAPI.Game/Entities/Events/ReqInfoEvent.cs @@ -1,5 +1,5 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Game._Events; +using ChickenAPI.Game._Events; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Entities.Events { diff --git a/src/ChickenAPI.Game/Entities/Player/Extensions/CModePacketExtension.cs b/src/ChickenAPI.Game/Entities/Player/Extensions/CModePacketExtension.cs deleted file mode 100644 index 02cac01a..00000000 --- a/src/ChickenAPI.Game/Entities/Player/Extensions/CModePacketExtension.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Game.Server.Player; - -namespace ChickenAPI.Game.Entities.Player.Extensions -{ - public static class CModePacketExtension - { - public static CModePacketBase GenerateCModePacket(this IPlayerEntity player) => new CModePacketBase - { - VisualType = VisualType.Character, - CharacterId = player.Id, - Morph = player.MorphId, - SpUpgrade = player.Sp?.Upgrade ?? 0, - SpDesign = player.Sp?.Design ?? 0, - ArenaWinner = player.Character.ArenaWinner - }; - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Game/Entities/Player/IPlayerEntity.cs b/src/ChickenAPI.Game/Entities/Player/IPlayerEntity.cs index 7f64cf82..1a31ade7 100644 --- a/src/ChickenAPI.Game/Entities/Player/IPlayerEntity.cs +++ b/src/ChickenAPI.Game/Entities/Player/IPlayerEntity.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Threading.Tasks; using ChickenAPI.Data.Character; +using ChickenAPI.Data.Enums.Game.Character; using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Character; using ChickenAPI.Game.Battle.Interfaces; using ChickenAPI.Game.Entities.Mates; using ChickenAPI.Game.Families; @@ -15,6 +15,7 @@ using ChickenAPI.Game.Specialists; using ChickenAPI.Game._Network; using ChickenAPI.Packets; +using ChickenAPI.Packets.Interfaces; namespace ChickenAPI.Game.Entities.Player { @@ -24,6 +25,7 @@ public interface IPlayerEntity : ILocomotionEntity, IBattleEntity, IInventoriedE CharacterDto Character { get; } + Dictionary CharacterSkills { get; } CharacterNameAppearance NameAppearance { get; } diff --git a/src/ChickenAPI.Game/Entities/Portal/PortalEntity.cs b/src/ChickenAPI.Game/Entities/Portal/PortalEntity.cs index 450e9f05..0dae7225 100644 --- a/src/ChickenAPI.Game/Entities/Portal/PortalEntity.cs +++ b/src/ChickenAPI.Game/Entities/Portal/PortalEntity.cs @@ -1,17 +1,17 @@ using System; using System.Collections.Generic; using ChickenAPI.Data.Map; -using ChickenAPI.Enums.Game.Entity; using ChickenAPI.Game.Portals; using ChickenAPI.Game.Visibility; using ChickenAPI.Game._ECS.Components; using ChickenAPI.Game._ECS.Entities; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Entities.Portal { public class PortalEntity : EntityBase, IPortalEntity { - public PortalEntity(PortalDto portal) : base(VisualType.Portal, portal.Id) + public PortalEntity(PortalDto portal) : base(VisualType.Object, portal.Id) { Portal = new PortalComponent(this, portal); Components = new Dictionary diff --git a/src/ChickenAPI.Game/Families/Events/FamilyJoinEvent.cs b/src/ChickenAPI.Game/Families/Events/FamilyJoinEvent.cs index 1870db87..7008007e 100644 --- a/src/ChickenAPI.Game/Families/Events/FamilyJoinEvent.cs +++ b/src/ChickenAPI.Game/Families/Events/FamilyJoinEvent.cs @@ -1,7 +1,7 @@ using ChickenAPI.Data.Families; -using ChickenAPI.Enums.Game.Families; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game._Events; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Families.Events { diff --git a/src/ChickenAPI.Game/Groups/Group.cs b/src/ChickenAPI.Game/Groups/Group.cs index b1f2ea0b..d9d84dcc 100644 --- a/src/ChickenAPI.Game/Groups/Group.cs +++ b/src/ChickenAPI.Game/Groups/Group.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using ChickenAPI.Enums.Game.Groups; +using ChickenAPI.Data.Enums.Game.Groups; using ChickenAPI.Game.Entities.Player; namespace ChickenAPI.Game.Groups diff --git a/src/ChickenAPI.Game/Inventory/Events/InventoryMoveEvent.cs b/src/ChickenAPI.Game/Inventory/Events/InventoryMoveEvent.cs index 03e773d0..8503985b 100644 --- a/src/ChickenAPI.Game/Inventory/Events/InventoryMoveEvent.cs +++ b/src/ChickenAPI.Game/Inventory/Events/InventoryMoveEvent.cs @@ -1,11 +1,11 @@ -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Game._Events; +using ChickenAPI.Game._Events; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Inventory.Events { public class InventoryMoveEvent : GameEntityEvent { - public InventoryType InventoryType { get; set; } + public PocketType PocketType { get; set; } public short SourceSlot { get; set; } diff --git a/src/ChickenAPI.Game/Inventory/Events/InventoryWearEvent.cs b/src/ChickenAPI.Game/Inventory/Events/InventoryWearEvent.cs index 0982ec1a..965216d9 100644 --- a/src/ChickenAPI.Game/Inventory/Events/InventoryWearEvent.cs +++ b/src/ChickenAPI.Game/Inventory/Events/InventoryWearEvent.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Items; +using ChickenAPI.Data.Enums.Game.Items; using ChickenAPI.Game._Events; namespace ChickenAPI.Game.Inventory.Events diff --git a/src/ChickenAPI.Game/Inventory/Extensions/EqPacketExtensions.cs b/src/ChickenAPI.Game/Inventory/Extensions/EqPacketExtensions.cs deleted file mode 100644 index 7ce94266..00000000 --- a/src/ChickenAPI.Game/Inventory/Extensions/EqPacketExtensions.cs +++ /dev/null @@ -1,80 +0,0 @@ -using System.Collections.Generic; -using System.Text; -using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Packets.Game.Server.Inventory; - -namespace ChickenAPI.Game.Inventory.Extensions -{ - public static class EqPacketExtensions - { - public static EqListInfo GenerateEqListInfoPacket(this InventoryComponent inventory) => new EqListInfo - { - Hat = inventory.Wear[(int)EquipmentType.Hat]?.ItemId ?? -1, - Armor = inventory.Wear[(int)EquipmentType.Armor]?.ItemId ?? -1, - MainWeapon = inventory.Wear[(int)EquipmentType.MainWeapon]?.ItemId ?? -1, - SecondaryWeapon = inventory.Wear[(int)EquipmentType.SecondaryWeapon]?.ItemId ?? -1, - Mask = inventory.Wear[(int)EquipmentType.Mask]?.ItemId ?? -1, - Fairy = inventory.Wear[(int)EquipmentType.Fairy]?.ItemId ?? -1, - CostumeSuit = inventory.Wear[(int)EquipmentType.CostumeSuit]?.ItemId ?? -1, - CostumeHat = inventory.Wear[(int)EquipmentType.CostumeHat]?.ItemId ?? -1, - WeaponSkin = inventory.Wear[(int)EquipmentType.WeaponSkin]?.ItemId ?? -1 - }; - - public static EqRareInfo GenerateEqRareInfoPacket(this InventoryComponent inventory) => new EqRareInfo - { - WeaponUpgrade = inventory.Wear[(int)EquipmentType.MainWeapon]?.Upgrade ?? 0, - WeaponRarity = inventory.Wear[(int)EquipmentType.MainWeapon]?.Rarity ?? 0, - ArmorUpgrade = inventory.Wear[(int)EquipmentType.Armor]?.Upgrade ?? 0, - ArmorRarity = inventory.Wear[(int)EquipmentType.MainWeapon]?.Rarity ?? 0 - }; - - public static EqPacket GenerateEqPacket(this IPlayerEntity player) => new EqPacket - { - CharacterId = player.Id, - NameAppearance = player.NameAppearance, - GenderType = player.Character.Gender, - HairStyleType = player.Character.HairStyle, - HairColorType = player.Character.HairColor, - CharacterClassType = player.Character.Class, - EqList = player.Inventory.GenerateEqListInfoPacket(), - EqInfo = player.Inventory.GenerateEqRareInfoPacket() - }; - - /// - /// This packet is used for character items equiped in "P" panel (wear items) - /// - /// - /// - public static EquipPacket GenerateEquipPacket(this IPlayerEntity player) - { - List tmp = new List(); - ItemInstanceDto[] subInventory = player.Inventory.Wear; - - for (int i = 0; i < subInventory.Length; i++) - { - ItemInstanceDto item = subInventory[i]; - if (item == null) - { - continue; - } - - tmp.Add(new EquipPacket.EquipSubPacket - { - WearIndex = i, - ItemId = item.ItemId, - ItemRarity = (byte)item.Rarity, - UpgradeOrDesign = item.Item.IsColored ? item.Design : item.Upgrade, - Unknown = 0 - }); - } - - return new EquipPacket - { - EqRare = player.Inventory.GenerateEqRareInfoPacket(), - EqList = tmp - }; - } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Game/Inventory/Extensions/InventoryWearPacketExtensions.cs b/src/ChickenAPI.Game/Inventory/Extensions/InventoryWearPacketExtensions.cs deleted file mode 100644 index 98a1c3b1..00000000 --- a/src/ChickenAPI.Game/Inventory/Extensions/InventoryWearPacketExtensions.cs +++ /dev/null @@ -1,26 +0,0 @@ -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Packets.Game.Server.Inventory; - -namespace ChickenAPI.Game.Inventory.Extensions -{ - public static class InventoryWearPacketExtensions - { - public static InventoryWearSubPacket GenerateInventoryWearPacket(this IPlayerEntity player) - { - InventoryComponent inventory = player.Inventory; - return new InventoryWearSubPacket - { - Hat = inventory.Wear[(int)EquipmentType.Hat]?.ItemId ?? -1, - Armor = inventory.Wear[(int)EquipmentType.Armor]?.ItemId ?? -1, - MainWeapon = inventory.Wear[(int)EquipmentType.MainWeapon]?.ItemId ?? -1, - SecondaryWeapon = inventory.Wear[(int)EquipmentType.SecondaryWeapon]?.ItemId ?? -1, - Mask = inventory.Wear[(int)EquipmentType.Mask]?.ItemId ?? -1, - Fairy = inventory.Wear[(int)EquipmentType.Fairy]?.ItemId ?? -1, - CostumeSuit = inventory.Wear[(int)EquipmentType.CostumeSuit]?.ItemId ?? -1, - CostumeHat = inventory.Wear[(int)EquipmentType.CostumeHat]?.ItemId ?? -1, - WeaponSkin = inventory.Wear[(int)EquipmentType.WeaponSkin]?.ItemId ?? -1 - }; - } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Game/Inventory/Extensions/IvnPacketExtension.cs b/src/ChickenAPI.Game/Inventory/Extensions/IvnPacketExtension.cs deleted file mode 100644 index 8e5fa265..00000000 --- a/src/ChickenAPI.Game/Inventory/Extensions/IvnPacketExtension.cs +++ /dev/null @@ -1,65 +0,0 @@ -using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Packets.Game.Server.Inventory; - -namespace ChickenAPI.Game.Inventory.Extensions -{ - public static class IvnPacketExtension - { - public static IvnPacket GenerateEmptyIvnPacket(this IPlayerEntity player, InventoryType type, short slot) => - new IvnPacket - { - InventoryType = type, - Slot = slot, - ItemId = -1, - Upgrade = 0, - Rare = 0, - SpStoneUpgrade = 0 - }; - - public static IvnPacket GenerateIvnPacket(this ItemInstanceDto itemInstance) - { - switch (itemInstance.Type) - { - case InventoryType.Specialist: - return new IvnPacket - { - InventoryType = itemInstance.Type, - ItemId = itemInstance.Item.Id, - Slot = itemInstance.Slot, - Upgrade = itemInstance.Upgrade, - Rare = itemInstance.Rarity, - SpStoneUpgrade = itemInstance.SpecialistUpgrade - }; - - case InventoryType.Equipment: - return new IvnPacket - { - InventoryType = itemInstance.Type, - ItemId = itemInstance.ItemId, - Slot = itemInstance.Slot, - Rare = itemInstance.Rarity, - Upgrade = itemInstance.Upgrade - }; - - case InventoryType.Main: - case InventoryType.Etc: - return itemInstance.GenerateMainIvnPacket(); - - default: - //Log.Info($"{itemInstance.Type} not implemented"); - return null; - } - } - - private static IvnPacket GenerateMainIvnPacket(this ItemInstanceDto itemInstance) => new IvnPacket - { - InventoryType = itemInstance.Type, - Slot = itemInstance.Slot, - ItemId = itemInstance.ItemId, - Rare = itemInstance.Amount, - Upgrade = 0 - }; - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Game/Inventory/Extensions/MovableEntityExtensions.cs b/src/ChickenAPI.Game/Inventory/Extensions/MovableEntityExtensions.cs deleted file mode 100644 index 6833de83..00000000 --- a/src/ChickenAPI.Game/Inventory/Extensions/MovableEntityExtensions.cs +++ /dev/null @@ -1,49 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Game.Entities.Monster; -using ChickenAPI.Game.Entities.Npc; -using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Game._ECS.Entities; -using ChickenAPI.Packets.Game.Server.Entities; - -namespace ChickenAPI.Game.Inventory.Extensions -{ - public static class MovableEntityExtensions - { - public static MvPacket GenerateMvPacket(this IEntity entity) - { - switch (entity) - { - case IMonsterEntity monster: - return new MvPacket - { - VisualType = VisualType.Monster, - VisualId = monster.MapMonster.Id, - Speed = monster.Speed, - MapX = monster.Position.X, - MapY = monster.Position.Y - }; - - case INpcEntity npc: - return new MvPacket - { - VisualType = VisualType.Npc, - VisualId = npc.MapNpc.Id, - Speed = npc.Speed, - MapX = npc.Position.X, - MapY = npc.Position.Y - }; - case IPlayerEntity player: - return new MvPacket - { - VisualType = VisualType.Character, - VisualId = player.Character.Id, - Speed = player.Speed, - MapX = player.Position.X, - MapY = player.Position.Y - }; - default: - return null; - } - } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Game/Inventory/ItemUpgrade/Events/ItemUpgradeEvent.cs b/src/ChickenAPI.Game/Inventory/ItemUpgrade/Events/ItemUpgradeEvent.cs index 5ea94ba5..21a2985a 100644 --- a/src/ChickenAPI.Game/Inventory/ItemUpgrade/Events/ItemUpgradeEvent.cs +++ b/src/ChickenAPI.Game/Inventory/ItemUpgrade/Events/ItemUpgradeEvent.cs @@ -1,6 +1,6 @@ using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game._Events; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Inventory.ItemUpgrade.Events { diff --git a/src/ChickenAPI.Game/Inventory/ItemUpgrade/Events/RarifyEvent.cs b/src/ChickenAPI.Game/Inventory/ItemUpgrade/Events/RarifyEvent.cs index 94a4f6bd..bcfba5a3 100644 --- a/src/ChickenAPI.Game/Inventory/ItemUpgrade/Events/RarifyEvent.cs +++ b/src/ChickenAPI.Game/Inventory/ItemUpgrade/Events/RarifyEvent.cs @@ -1,5 +1,5 @@ -using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; +using ChickenAPI.Data.Enums.Game.Items.Upgrade; +using ChickenAPI.Data.Item; using ChickenAPI.Game._Events; namespace ChickenAPI.Game.Inventory.ItemUpgrade.Events diff --git a/src/ChickenAPI.Game/Inventory/ItemUpgrade/Events/UpgradeEquipment.cs b/src/ChickenAPI.Game/Inventory/ItemUpgrade/Events/UpgradeEquipment.cs index 99d06b26..265fa524 100644 --- a/src/ChickenAPI.Game/Inventory/ItemUpgrade/Events/UpgradeEquipment.cs +++ b/src/ChickenAPI.Game/Inventory/ItemUpgrade/Events/UpgradeEquipment.cs @@ -1,5 +1,5 @@ -using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; +using ChickenAPI.Data.Enums.Game.Items.Upgrade; +using ChickenAPI.Data.Item; using ChickenAPI.Game._Events; namespace ChickenAPI.Game.Inventory.ItemUpgrade.Events diff --git a/src/ChickenAPI.Game/Inventory/ItemUpgrade/Events/UpgradeSpecialistEvent.cs b/src/ChickenAPI.Game/Inventory/ItemUpgrade/Events/UpgradeSpecialistEvent.cs index 13a21c45..594399c1 100644 --- a/src/ChickenAPI.Game/Inventory/ItemUpgrade/Events/UpgradeSpecialistEvent.cs +++ b/src/ChickenAPI.Game/Inventory/ItemUpgrade/Events/UpgradeSpecialistEvent.cs @@ -1,5 +1,5 @@ -using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; +using ChickenAPI.Data.Enums.Game.Items.Upgrade; +using ChickenAPI.Data.Item; using ChickenAPI.Game._Events; namespace ChickenAPI.Game.Inventory.ItemUpgrade.Events diff --git a/src/ChickenAPI.Game/Inventory/ItemUpgrade/Handlers/Handling/IItemUpgradeHandler.cs b/src/ChickenAPI.Game/Inventory/ItemUpgrade/Handlers/Handling/IItemUpgradeHandler.cs index 03a9e0b8..ea659911 100644 --- a/src/ChickenAPI.Game/Inventory/ItemUpgrade/Handlers/Handling/IItemUpgradeHandler.cs +++ b/src/ChickenAPI.Game/Inventory/ItemUpgrade/Handlers/Handling/IItemUpgradeHandler.cs @@ -1,6 +1,6 @@ -using ChickenAPI.Enums.Packets; -using ChickenAPI.Game.Entities.Player; +using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory.ItemUpgrade.Events; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Inventory.ItemUpgrade.Handlers.Handling { diff --git a/src/ChickenAPI.Game/Inventory/ItemUpgrade/Handlers/Handling/ItemUpgradeHandler.cs b/src/ChickenAPI.Game/Inventory/ItemUpgrade/Handlers/Handling/ItemUpgradeHandler.cs index 361a42e7..f1059181 100644 --- a/src/ChickenAPI.Game/Inventory/ItemUpgrade/Handlers/Handling/ItemUpgradeHandler.cs +++ b/src/ChickenAPI.Game/Inventory/ItemUpgrade/Handlers/Handling/ItemUpgradeHandler.cs @@ -1,8 +1,8 @@ using System; using System.Reflection; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory.ItemUpgrade.Events; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Inventory.ItemUpgrade.Handlers.Handling { diff --git a/src/ChickenAPI.Game/Inventory/ItemUpgrade/Handlers/Handling/ItemUpgradeHandlerAttribute.cs b/src/ChickenAPI.Game/Inventory/ItemUpgrade/Handlers/Handling/ItemUpgradeHandlerAttribute.cs index fe700873..d7b896ba 100644 --- a/src/ChickenAPI.Game/Inventory/ItemUpgrade/Handlers/Handling/ItemUpgradeHandlerAttribute.cs +++ b/src/ChickenAPI.Game/Inventory/ItemUpgrade/Handlers/Handling/ItemUpgradeHandlerAttribute.cs @@ -1,5 +1,5 @@ using System; -using ChickenAPI.Enums.Packets; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Inventory.ItemUpgrade.Handlers.Handling { diff --git a/src/ChickenAPI.Game/Inventory/ItemUsage/IUseItemRequestHandlerAsync.cs b/src/ChickenAPI.Game/Inventory/ItemUsage/IUseItemRequestHandlerAsync.cs index 08811a3d..db41bfef 100644 --- a/src/ChickenAPI.Game/Inventory/ItemUsage/IUseItemRequestHandlerAsync.cs +++ b/src/ChickenAPI.Game/Inventory/ItemUsage/IUseItemRequestHandlerAsync.cs @@ -1,6 +1,6 @@ -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Game.Entities.Player; +using ChickenAPI.Game.Entities.Player; using System.Threading.Tasks; +using ChickenAPI.Data.Enums.Game.Items; using ChickenAPI.Game.Inventory.Events; namespace ChickenAPI.Game.Inventory.ItemUsage diff --git a/src/ChickenAPI.Game/Managers/SimplePlayerManager.cs b/src/ChickenAPI.Game/Managers/SimplePlayerManager.cs index 71f08417..a9fe4d45 100644 --- a/src/ChickenAPI.Game/Managers/SimplePlayerManager.cs +++ b/src/ChickenAPI.Game/Managers/SimplePlayerManager.cs @@ -4,6 +4,7 @@ using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game._Network; using ChickenAPI.Packets; +using ChickenAPI.Packets.Interfaces; namespace ChickenAPI.Game.Managers { diff --git a/src/ChickenAPI.Game/Mates/Events/AddPetEvent.cs b/src/ChickenAPI.Game/Mates/Events/AddPetEvent.cs index f53f2aef..6876ef14 100644 --- a/src/ChickenAPI.Game/Mates/Events/AddPetEvent.cs +++ b/src/ChickenAPI.Game/Mates/Events/AddPetEvent.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Entity; using ChickenAPI.Game._Events; namespace ChickenAPI.Game.Mates.Events diff --git a/src/ChickenAPI.Game/Movements/DataObjects/MoveEventArgs.cs b/src/ChickenAPI.Game/Movements/DataObjects/MoveEventArgs.cs index f08d9659..00d1af1d 100644 --- a/src/ChickenAPI.Game/Movements/DataObjects/MoveEventArgs.cs +++ b/src/ChickenAPI.Game/Movements/DataObjects/MoveEventArgs.cs @@ -5,7 +5,7 @@ namespace ChickenAPI.Game.Movements.DataObjects { public class MoveEventArgs : EventArgs { - public MovableComponent Component { get; set; } + public IMovableEntity Component { get; set; } public Position Old { get; set; } public Position New { get; set; } } diff --git a/src/ChickenAPI.Game/Movements/IMovableCapacity.cs b/src/ChickenAPI.Game/Movements/IMovableCapacity.cs index 0b04b2bc..de9f161d 100644 --- a/src/ChickenAPI.Game/Movements/IMovableCapacity.cs +++ b/src/ChickenAPI.Game/Movements/IMovableCapacity.cs @@ -1,6 +1,6 @@ using System; using ChickenAPI.Core.Utils; -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Entity; using ChickenAPI.Game.Visibility; namespace ChickenAPI.Game.Movements diff --git a/src/ChickenAPI.Game/Portals/PortalComponent.cs b/src/ChickenAPI.Game/Portals/PortalComponent.cs index 1a2163d6..3438470e 100644 --- a/src/ChickenAPI.Game/Portals/PortalComponent.cs +++ b/src/ChickenAPI.Game/Portals/PortalComponent.cs @@ -1,7 +1,7 @@ using ChickenAPI.Data.Map; -using ChickenAPI.Enums.Game.Portals; using ChickenAPI.Game._ECS.Components; using ChickenAPI.Game._ECS.Entities; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Portals { diff --git a/src/ChickenAPI.Game/Relations/Events/RelationInvitationProcessEvent.cs b/src/ChickenAPI.Game/Relations/Events/RelationInvitationProcessEvent.cs index 7a9dd9a7..b6d62b36 100644 --- a/src/ChickenAPI.Game/Relations/Events/RelationInvitationProcessEvent.cs +++ b/src/ChickenAPI.Game/Relations/Events/RelationInvitationProcessEvent.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Relations; +using ChickenAPI.Data.Enums.Game.Relations; using ChickenAPI.Game._Events; namespace ChickenAPI.Game.Relations.Events diff --git a/src/ChickenAPI.Game/Relations/Events/RelationInvitationSendEvent.cs b/src/ChickenAPI.Game/Relations/Events/RelationInvitationSendEvent.cs index f2c1d02d..b703339e 100644 --- a/src/ChickenAPI.Game/Relations/Events/RelationInvitationSendEvent.cs +++ b/src/ChickenAPI.Game/Relations/Events/RelationInvitationSendEvent.cs @@ -1,5 +1,5 @@ -using ChickenAPI.Enums.Game.Relations; -using ChickenAPI.Game._Events; +using ChickenAPI.Game._Events; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Relations.Events { diff --git a/src/ChickenAPI.Game/Shops/Events/ShopBuyEvent.cs b/src/ChickenAPI.Game/Shops/Events/ShopBuyEvent.cs index 05d721b3..a3b08352 100644 --- a/src/ChickenAPI.Game/Shops/Events/ShopBuyEvent.cs +++ b/src/ChickenAPI.Game/Shops/Events/ShopBuyEvent.cs @@ -1,5 +1,5 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Game._Events; +using ChickenAPI.Game._Events; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Shops.Events { diff --git a/src/ChickenAPI.Game/Shops/Events/ShowShopEvent.cs b/src/ChickenAPI.Game/Shops/Events/ShowShopEvent.cs index 6296d1c2..72f87489 100644 --- a/src/ChickenAPI.Game/Shops/Events/ShowShopEvent.cs +++ b/src/ChickenAPI.Game/Shops/Events/ShowShopEvent.cs @@ -1,5 +1,5 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Game._Events; +using ChickenAPI.Game._Events; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game.Shops.Events { diff --git a/src/ChickenAPI.Game/Skills/ISkillEntity.cs b/src/ChickenAPI.Game/Skills/ISkillEntity.cs index da335399..ef30356a 100644 --- a/src/ChickenAPI.Game/Skills/ISkillEntity.cs +++ b/src/ChickenAPI.Game/Skills/ISkillEntity.cs @@ -1,16 +1,22 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; +using ChickenAPI.Data.Character; using ChickenAPI.Data.Skills; +using ChickenAPI.Game._ECS.Entities; namespace ChickenAPI.Game.Skills { - public interface ISkillEntity + public interface ISkillCapacity { /// /// Skills /// IDictionary Skills { get; } - SkillComponent SkillComponent { get; } + + IDictionary SkillsByCastId { get; } + + List<(DateTime, long)> CooldownsBySkillId { get; } /// /// Checks if the entity has the given skill @@ -26,4 +32,8 @@ public interface ISkillEntity /// bool CanCastSkill(long skillId); } + + public interface ISkillEntity : IEntity, ISkillCapacity + { + } } \ No newline at end of file diff --git a/src/ChickenAPI.Game/Skills/SkiPacket.cs b/src/ChickenAPI.Game/Skills/SkiPacket.cs index db61684d..64dc8e47 100644 --- a/src/ChickenAPI.Game/Skills/SkiPacket.cs +++ b/src/ChickenAPI.Game/Skills/SkiPacket.cs @@ -7,7 +7,7 @@ namespace ChickenAPI.Game.Skills [PacketHeader("ski")] public class SkiPacket : PacketBase { - [PacketIndex(0, SeparatorNestedElements = " ")] + [PacketIndex(0, SpecialSeparator = " ")] public List SkillIds { get; set; } } } \ No newline at end of file diff --git a/src/ChickenAPI.Game/Visibility/IVisibleCapacity.cs b/src/ChickenAPI.Game/Visibility/IVisibleCapacity.cs index 8a0d659b..954aa3a9 100644 --- a/src/ChickenAPI.Game/Visibility/IVisibleCapacity.cs +++ b/src/ChickenAPI.Game/Visibility/IVisibleCapacity.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Visibility; +using ChickenAPI.Data.Enums.Game.Visibility; namespace ChickenAPI.Game.Visibility { diff --git a/src/ChickenAPI.Game/Visibility/VisibilityChangeEventArgs.cs b/src/ChickenAPI.Game/Visibility/VisibilityChangeEventArgs.cs index c1189de3..4892ce39 100644 --- a/src/ChickenAPI.Game/Visibility/VisibilityChangeEventArgs.cs +++ b/src/ChickenAPI.Game/Visibility/VisibilityChangeEventArgs.cs @@ -1,5 +1,5 @@ using System; -using ChickenAPI.Enums.Game.Visibility; +using ChickenAPI.Data.Enums.Game.Visibility; namespace ChickenAPI.Game.Visibility { diff --git a/src/ChickenAPI.Game/Visibility/VisibilityComponent.cs b/src/ChickenAPI.Game/Visibility/VisibilityComponent.cs index f7bdd39f..1bcf2b44 100644 --- a/src/ChickenAPI.Game/Visibility/VisibilityComponent.cs +++ b/src/ChickenAPI.Game/Visibility/VisibilityComponent.cs @@ -1,6 +1,6 @@ using System; using ChickenAPI.Core.Utils; -using ChickenAPI.Enums.Game.Visibility; +using ChickenAPI.Data.Enums.Game.Visibility; using ChickenAPI.Game._ECS.Components; using ChickenAPI.Game._ECS.Entities; diff --git a/src/ChickenAPI.Game/_ECS/Entities/EntityBase.cs b/src/ChickenAPI.Game/_ECS/Entities/EntityBase.cs index 1ac3bfe2..69ab8f77 100644 --- a/src/ChickenAPI.Game/_ECS/Entities/EntityBase.cs +++ b/src/ChickenAPI.Game/_ECS/Entities/EntityBase.cs @@ -5,15 +5,14 @@ using ChickenAPI.Core.Events; using ChickenAPI.Core.IoC; using ChickenAPI.Core.Logging; -using ChickenAPI.Enums.Game.Entity; using ChickenAPI.Game._ECS.Components; using ChickenAPI.Game._Events; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game._ECS.Entities { public abstract class EntityBase : IEntity { - protected static readonly Logger Log = Logger.GetLogger(); protected static readonly IEventPipeline EventPipelineAsync = new Lazy(() => ChickenContainer.Instance.Resolve()).Value; protected Dictionary Components = new Dictionary(); diff --git a/src/ChickenAPI.Game/_ECS/Entities/EntityManagerBase.cs b/src/ChickenAPI.Game/_ECS/Entities/EntityManagerBase.cs index c6a39684..5de92ee3 100644 --- a/src/ChickenAPI.Game/_ECS/Entities/EntityManagerBase.cs +++ b/src/ChickenAPI.Game/_ECS/Entities/EntityManagerBase.cs @@ -4,16 +4,15 @@ using Autofac; using ChickenAPI.Core.IoC; using ChickenAPI.Core.Logging; -using ChickenAPI.Enums.Game.Entity; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game._ECS.Systems; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game._ECS.Entities { public abstract class EntityManagerBase : IEntityManager { protected static IEntityManagerContainer EmContainer = new Lazy(() => ChickenContainer.Instance.Resolve()).Value; - protected static readonly Logger Log = Logger.GetLogger(); // entities protected readonly HashSet _players = new HashSet(); @@ -51,7 +50,7 @@ public void RegisterEntity(T entity) where T : IEntity { lock(LockObj) { - if (entity.Type == VisualType.Character) + if (entity.Type == VisualType.Player) { _players.Add(entity as IPlayerEntity); } @@ -66,7 +65,7 @@ public void RegisterEntity(T entity) where T : IEntity entities.Add(entity.Id, entity); UpdateCache(); // player cache - if (!ShouldUpdate && entity.Type == VisualType.Character) + if (!ShouldUpdate && entity.Type == VisualType.Player) { StartSystemUpdate(); } @@ -77,7 +76,7 @@ public void UnregisterEntity(T entity) where T : IEntity { lock(LockObj) { - if (entity.Type == VisualType.Character) + if (entity.Type == VisualType.Player) { _players.Remove(entity as IPlayerEntity); } diff --git a/src/ChickenAPI.Game/_ECS/Entities/IEntity.cs b/src/ChickenAPI.Game/_ECS/Entities/IEntity.cs index 28856d38..1c1ec20d 100644 --- a/src/ChickenAPI.Game/_ECS/Entities/IEntity.cs +++ b/src/ChickenAPI.Game/_ECS/Entities/IEntity.cs @@ -1,8 +1,8 @@ using System; using System.Threading.Tasks; -using ChickenAPI.Enums.Game.Entity; using ChickenAPI.Game._ECS.Components; using ChickenAPI.Game._Events; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game._ECS.Entities { diff --git a/src/ChickenAPI.Game/_ECS/Entities/IEntityManager.cs b/src/ChickenAPI.Game/_ECS/Entities/IEntityManager.cs index 7ebadde2..dcc53a37 100644 --- a/src/ChickenAPI.Game/_ECS/Entities/IEntityManager.cs +++ b/src/ChickenAPI.Game/_ECS/Entities/IEntityManager.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using ChickenAPI.Enums.Game.Entity; using ChickenAPI.Game._ECS.Systems; +using ChickenAPI.Packets.Enumerations; namespace ChickenAPI.Game._ECS.Entities { diff --git a/src/ChickenAPI.Game/_ECS/Systems/SystemBase.cs b/src/ChickenAPI.Game/_ECS/Systems/SystemBase.cs index 60d1fd80..0a1f959f 100644 --- a/src/ChickenAPI.Game/_ECS/Systems/SystemBase.cs +++ b/src/ChickenAPI.Game/_ECS/Systems/SystemBase.cs @@ -1,14 +1,12 @@ using System; using System.Linq; using System.Linq.Expressions; -using ChickenAPI.Core.Logging; using ChickenAPI.Game._ECS.Entities; namespace ChickenAPI.Game._ECS.Systems { public abstract class SystemBase : ISystem { - protected static readonly Logger Log = Logger.GetLogger(); private Func _filter; private DateTime _lastUpdate; diff --git a/src/ChickenAPI.Game/_Network/IBroadcastable.cs b/src/ChickenAPI.Game/_Network/IBroadcastable.cs index 87f187b7..e3f4d379 100644 --- a/src/ChickenAPI.Game/_Network/IBroadcastable.cs +++ b/src/ChickenAPI.Game/_Network/IBroadcastable.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using ChickenAPI.Packets; +using ChickenAPI.Packets.Interfaces; namespace ChickenAPI.Game._Network { diff --git a/src/ChickenAPI.Game/_Network/IPacketPipelineAsync.cs b/src/ChickenAPI.Game/_Network/IPacketPipelineAsync.cs index 7441483a..99d501f0 100644 --- a/src/ChickenAPI.Game/_Network/IPacketPipelineAsync.cs +++ b/src/ChickenAPI.Game/_Network/IPacketPipelineAsync.cs @@ -1,6 +1,7 @@ using System; using System.Threading.Tasks; using ChickenAPI.Packets; +using ChickenAPI.Packets.Interfaces; namespace ChickenAPI.Game._Network { diff --git a/src/ChickenAPI.Game/_Network/IPacketProcessor.cs b/src/ChickenAPI.Game/_Network/IPacketProcessor.cs index b42514d9..82a31a6b 100644 --- a/src/ChickenAPI.Game/_Network/IPacketProcessor.cs +++ b/src/ChickenAPI.Game/_Network/IPacketProcessor.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; using ChickenAPI.Packets; +using ChickenAPI.Packets.Interfaces; namespace ChickenAPI.Game._Network { diff --git a/src/ChickenAPI.Game/_Network/ISession.cs b/src/ChickenAPI.Game/_Network/ISession.cs index 44b4654b..89209efc 100644 --- a/src/ChickenAPI.Game/_Network/ISession.cs +++ b/src/ChickenAPI.Game/_Network/ISession.cs @@ -5,6 +5,7 @@ using ChickenAPI.Data.Account; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Packets; +using ChickenAPI.Packets.Interfaces; namespace ChickenAPI.Game._Network { diff --git a/src/ChickenAPI.Packets/Attributes/PacketClientAttribute.cs b/src/ChickenAPI.Packets/Attributes/PacketClientAttribute.cs deleted file mode 100644 index 67e0e168..00000000 --- a/src/ChickenAPI.Packets/Attributes/PacketClientAttribute.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; - -namespace ChickenAPI.Packets.Attributes -{ - [AttributeUsage(AttributeTargets.Class)] - public class PacketClientAttribute : Attribute - { - public PacketClientAttribute() - { - } - - /// - /// Packet's header - /// - public string Header { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Attributes/PacketDescriptionAttribute.cs b/src/ChickenAPI.Packets/Attributes/PacketDescriptionAttribute.cs deleted file mode 100644 index 54899f03..00000000 --- a/src/ChickenAPI.Packets/Attributes/PacketDescriptionAttribute.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; - -namespace ChickenAPI.Packets.Attributes -{ - [AttributeUsage(AttributeTargets.Class)] - public class PacketDescriptionAttribute : Attribute - { - public PacketDescriptionAttribute() - { - - } - - /// - /// Why this packet is sent and the different actions that are related to it - /// - public string Description { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Attributes/PacketHeaderAttribute.cs b/src/ChickenAPI.Packets/Attributes/PacketHeaderAttribute.cs deleted file mode 100644 index 4b0bf4fc..00000000 --- a/src/ChickenAPI.Packets/Attributes/PacketHeaderAttribute.cs +++ /dev/null @@ -1,59 +0,0 @@ -using System; -using ChickenAPI.Enums; - -namespace ChickenAPI.Packets.Attributes -{ - [AttributeUsage(AttributeTargets.Class)] - public class PacketHeaderAttribute : Attribute - { - #region Instantiation - - public PacketHeaderAttribute(string identification) - { - Identification = identification; - NeedCharacter = true; - } - - public PacketHeaderAttribute(string identification, bool needCharacter) - { - Identification = identification; - NeedCharacter = needCharacter; - } - - public PacketHeaderAttribute(string identification, byte amount) - { - Identification = identification; - Amount = amount; - } - - public PacketHeaderAttribute(string identification, byte amount, bool needCharacter) - { - Identification = identification; - Amount = amount; - NeedCharacter = needCharacter; - } - - #endregion - - #region Properties - - /// - /// Permission to handle the packetBase - /// - public AuthorityType Authority { get; set; } - - /// - /// Unique identification of the Packet - /// - public string Identification { get; set; } - - /// - /// Amount of tcp message to create the Packet - /// - public byte Amount { get; set; } - - public bool NeedCharacter { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Attributes/PacketIndexAttribute.cs b/src/ChickenAPI.Packets/Attributes/PacketIndexAttribute.cs deleted file mode 100644 index 8ece7a93..00000000 --- a/src/ChickenAPI.Packets/Attributes/PacketIndexAttribute.cs +++ /dev/null @@ -1,79 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace ChickenAPI.Packets.Attributes -{ - [AttributeUsage(AttributeTargets.Property)] - public class PacketIndexAttribute : Attribute - { - #region Instantiation - - /// - /// Specify the Index of the packetBase to parse this property to. - /// - /// The zero based index starting from header (exclusive). - /// - /// - /// Adds an # to the Header and replaces Spaces with ^ if set to - /// true. - /// - /// - /// Defines if everything from this index should - /// be serialized into the underlying property - /// - /// - /// Removes - /// the separator (.) for packets. - /// - /// - /// - public PacketIndexAttribute(int index, bool isReturnPacket = false, bool serializeToEnd = false, bool removeSeparator = false, string separatorBeforeProperty = " ", - string separatorNestedElements = ".") - { - Index = index; - IsReturnPacket = isReturnPacket; - SerializeToEnd = serializeToEnd; - RemoveSeparator = removeSeparator; - SeparatorBeforeProperty = separatorBeforeProperty; - } - - #endregion - - #region Properties - - /// - /// The zero based index starting from the header (exclusive). - /// - public int Index { get; set; } - - /// - /// Adds an # to the Header and replaces Spaces with ^ - /// - public bool IsReturnPacket { get; set; } - - /// Removes the separator (.) for packets. - public bool RemoveSeparator { get; set; } - - /// - /// Defines if everything from this index should be serialized into the underlying property. - /// - public bool SerializeToEnd { get; set; } - - /// - /// Defines if this property will be added to the packet or not depending if there is a value - /// - public bool IsOptional { get; set; } - - /// - /// Defines the separator that will be used before property (by default : " ") - /// - public string SeparatorBeforeProperty { get; set; } - - /// - /// Defines the separator between every elements of an - /// - public string SeparatorNestedElements { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Attributes/PacketPropertyDescriptionAttribute.cs b/src/ChickenAPI.Packets/Attributes/PacketPropertyDescriptionAttribute.cs deleted file mode 100644 index 6fe0f330..00000000 --- a/src/ChickenAPI.Packets/Attributes/PacketPropertyDescriptionAttribute.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; - -namespace ChickenAPI.Packets.Attributes -{ - [AttributeUsage(AttributeTargets.Property)] - public class PacketPropertyDescriptionAttribute : Attribute - { - public PacketPropertyDescriptionAttribute() - { - - } - - /// - /// Why is this property done for - /// - public string Description { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Attributes/PacketServerAttribute.cs b/src/ChickenAPI.Packets/Attributes/PacketServerAttribute.cs deleted file mode 100644 index ecff5203..00000000 --- a/src/ChickenAPI.Packets/Attributes/PacketServerAttribute.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; - -namespace ChickenAPI.Packets.Attributes -{ - [AttributeUsage(AttributeTargets.Class)] - public class PacketServerAttribute : Attribute - { - public PacketServerAttribute() - { - } - - /// - /// Packet's header - /// - public string Header { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/CharacterSelectionScreen/Client/CharNewPacketBase.cs b/src/ChickenAPI.Packets/CharacterSelectionScreen/Client/CharNewPacketBase.cs deleted file mode 100644 index bedd131e..00000000 --- a/src/ChickenAPI.Packets/CharacterSelectionScreen/Client/CharNewPacketBase.cs +++ /dev/null @@ -1,24 +0,0 @@ -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.CharacterSelectionScreen.Client -{ - [PacketHeader("Char_NEW", false)] - public class CharNewPacketBase : PacketBase - { - [PacketIndex(0)] - public string Name { get; set; } - - [PacketIndex(1)] - public byte Slot { get; set; } - - [PacketIndex(2)] - public GenderType Gender { get; set; } - - [PacketIndex(3)] - public HairStyleType HairStyle { get; set; } - - [PacketIndex(4)] - public HairColorType HairColor { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/CharacterSelectionScreen/Client/CharNewWrestlerPacketBase.cs b/src/ChickenAPI.Packets/CharacterSelectionScreen/Client/CharNewWrestlerPacketBase.cs deleted file mode 100644 index 3aadd153..00000000 --- a/src/ChickenAPI.Packets/CharacterSelectionScreen/Client/CharNewWrestlerPacketBase.cs +++ /dev/null @@ -1,24 +0,0 @@ -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.CharacterSelectionScreen.Client -{ - [PacketHeader("Char_NEW_Job", false)] - public class CharNewWrestlerPacketBase : PacketBase - { - [PacketIndex(0)] - public string Name { get; set; } - - [PacketIndex(1)] - public byte Slot { get; set; } - - [PacketIndex(2)] - public GenderType Gender { get; set; } - - [PacketIndex(3)] - public HairStyleType HairStyle { get; set; } - - [PacketIndex(4)] - public HairColorType HairColor { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/CharacterSelectionScreen/Client/CharacterDeletePacketBase.cs b/src/ChickenAPI.Packets/CharacterSelectionScreen/Client/CharacterDeletePacketBase.cs deleted file mode 100644 index 1ebf189c..00000000 --- a/src/ChickenAPI.Packets/CharacterSelectionScreen/Client/CharacterDeletePacketBase.cs +++ /dev/null @@ -1,14 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.CharacterSelectionScreen.Client -{ - [PacketHeader("Char_DEL", false)] - public class CharacterDeletePacketBase : PacketBase - { - [PacketIndex(0)] - public byte Slot { get; set; } - - [PacketIndex(1)] - public string Password { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/CharacterSelectionScreen/Client/EntryPointPacketBase.cs b/src/ChickenAPI.Packets/CharacterSelectionScreen/Client/EntryPointPacketBase.cs deleted file mode 100644 index 4a5a4eab..00000000 --- a/src/ChickenAPI.Packets/CharacterSelectionScreen/Client/EntryPointPacketBase.cs +++ /dev/null @@ -1,27 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.CharacterSelectionScreen.Client -{ - [PacketHeader("EntryPoint", 3, false)] - public class EntryPointPacketBase : PacketBase - { - #region Properties - - [PacketIndex(0)] - public string Title { get; set; } - - [PacketIndex(1)] - public string Packet1Id { get; set; } - - [PacketIndex(2)] - public string Name { get; set; } - - [PacketIndex(3)] - public string Packet2Id { get; set; } - - [PacketIndex(4)] - public string Password { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/CharacterSelectionScreen/Client/GameStartPacketBase.cs b/src/ChickenAPI.Packets/CharacterSelectionScreen/Client/GameStartPacketBase.cs deleted file mode 100644 index b69ab0eb..00000000 --- a/src/ChickenAPI.Packets/CharacterSelectionScreen/Client/GameStartPacketBase.cs +++ /dev/null @@ -1,9 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.CharacterSelectionScreen.Client -{ - [PacketHeader("game_start")] - public class GameStartPacketBase : PacketBase - { - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/CharacterSelectionScreen/Client/SelectPacketBase.cs b/src/ChickenAPI.Packets/CharacterSelectionScreen/Client/SelectPacketBase.cs deleted file mode 100644 index 114bbedf..00000000 --- a/src/ChickenAPI.Packets/CharacterSelectionScreen/Client/SelectPacketBase.cs +++ /dev/null @@ -1,11 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.CharacterSelectionScreen.Client -{ - [PacketHeader("select", NeedCharacter = false)] - public class SelectPacketBase : PacketBase - { - [PacketIndex(0)] - public byte Slot { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/CharacterSelectionScreen/Server/CListStartPacket.cs b/src/ChickenAPI.Packets/CharacterSelectionScreen/Server/CListStartPacket.cs deleted file mode 100644 index 33898496..00000000 --- a/src/ChickenAPI.Packets/CharacterSelectionScreen/Server/CListStartPacket.cs +++ /dev/null @@ -1,15 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.CharacterSelectionScreen.Server -{ - [PacketHeader("clist_start")] - public class CListStartPacket : PacketBase - { - #region Properties - - [PacketIndex(0)] - public byte Type { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/CharacterSelectionScreen/Server/ClistEndPacketBase.cs b/src/ChickenAPI.Packets/CharacterSelectionScreen/Server/ClistEndPacketBase.cs deleted file mode 100644 index 3f1347bf..00000000 --- a/src/ChickenAPI.Packets/CharacterSelectionScreen/Server/ClistEndPacketBase.cs +++ /dev/null @@ -1,10 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.CharacterSelectionScreen.Server -{ - [PacketHeader("clist_end")] - public class ClistEndPacketBase : PacketBase - { - // Useless packet - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/CharacterSelectionScreen/Server/ClistPacketBase.cs b/src/ChickenAPI.Packets/CharacterSelectionScreen/Server/ClistPacketBase.cs deleted file mode 100644 index 8371bfe5..00000000 --- a/src/ChickenAPI.Packets/CharacterSelectionScreen/Server/ClistPacketBase.cs +++ /dev/null @@ -1,65 +0,0 @@ -using System.Collections.Generic; -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.CharacterSelectionScreen.Server -{ - [PacketHeader("clist")] - public class ClistPacketBase : PacketBase - { - #region Properties - - [PacketIndex(0)] - public byte Slot { get; set; } - - [PacketIndex(1)] - public string Name { get; set; } - - [PacketIndex(2)] - public byte Unknown { get; set; } - - [PacketIndex(3)] - public GenderType Gender { get; set; } - - [PacketIndex(4)] - public HairStyleType HairStyle { get; set; } - - [PacketIndex(5)] - public HairColorType HairColor { get; set; } - - [PacketIndex(6)] - public byte Unknown1 { get; set; } - - [PacketIndex(7)] - public CharacterClassType Class { get; set; } - - [PacketIndex(8)] - public ushort Level { get; set; } - - [PacketIndex(9)] - public ushort HeroLevel { get; set; } - - [PacketIndex(10, SeparatorBeforeProperty = " ", SeparatorNestedElements = ".")] - public List Equipments { get; set; } - - [PacketIndex(11)] - public ushort JobLevel { get; set; } - - [PacketIndex(12)] - public byte QuestCompletion { get; set; } - - [PacketIndex(13)] - public byte QuestPart { get; set; } - - [PacketIndex(14, SeparatorBeforeProperty = " ", SeparatorNestedElements = ".")] - public List Pets { get; set; } - - [PacketIndex(15)] - public int Design { get; set; } - - [PacketIndex(16)] - public byte Unknown3 { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/CharacterSelectionScreen/Server/OkPacketBase.cs b/src/ChickenAPI.Packets/CharacterSelectionScreen/Server/OkPacketBase.cs deleted file mode 100644 index 2639c135..00000000 --- a/src/ChickenAPI.Packets/CharacterSelectionScreen/Server/OkPacketBase.cs +++ /dev/null @@ -1,9 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.CharacterSelectionScreen.Server -{ - [PacketHeader("OK")] - public class OkPacketBase : PacketBase - { - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/ChickenAPI.Packets.csproj b/src/ChickenAPI.Packets/ChickenAPI.Packets.csproj deleted file mode 100644 index 3ecb49db..00000000 --- a/src/ChickenAPI.Packets/ChickenAPI.Packets.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netstandard2.0 - - - - - - - - - - - - diff --git a/src/ChickenAPI.Packets/Game/Client/Battle/MultiTargetListPacket.cs b/src/ChickenAPI.Packets/Game/Client/Battle/MultiTargetListPacket.cs deleted file mode 100644 index 91f81f81..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Battle/MultiTargetListPacket.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections.Generic; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Battle -{ - [PacketHeader("mtlist")] - public class MultiTargetListPacket : PacketBase - { - #region Properties - - [PacketIndex(0)] - public byte TargetsAmount { get; set; } - - [PacketIndex(1, RemoveSeparator = true)] - public List Targets { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Battle/MultiTargetListSubPacket.cs b/src/ChickenAPI.Packets/Game/Client/Battle/MultiTargetListSubPacket.cs deleted file mode 100644 index eb1d6a55..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Battle/MultiTargetListSubPacket.cs +++ /dev/null @@ -1,14 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Battle -{ - [PacketHeader("multi_target_list_sub_packet")] - public class MultiTargetListSubPacket : PacketBase - { - [PacketIndex(0)] - public int SkillCastId { get; set; } - - [PacketIndex(1)] - public int TargetId { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Battle/NcifPacket.cs b/src/ChickenAPI.Packets/Game/Client/Battle/NcifPacket.cs deleted file mode 100644 index 8da912c4..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Battle/NcifPacket.cs +++ /dev/null @@ -1,19 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Battle -{ - [PacketHeader("ncif")] - public class NcifPacket : PacketBase - { - #region Properties - - [PacketIndex(0)] - public VisualType Type { get; set; } - - [PacketIndex(1)] - public long TargetId { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Battle/UseAoeSkillPacket.cs b/src/ChickenAPI.Packets/Game/Client/Battle/UseAoeSkillPacket.cs deleted file mode 100644 index 67c2896e..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Battle/UseAoeSkillPacket.cs +++ /dev/null @@ -1,17 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Battle -{ - [PacketHeader("u_as")] - public class UseAoeSkillPacket : PacketBase - { - [PacketIndex(0)] - public long CastId { get; set; } - - [PacketIndex(1)] - public short MapX { get; set; } - - [PacketIndex(2)] - public short MapY { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Battle/UseSkillPacket.cs b/src/ChickenAPI.Packets/Game/Client/Battle/UseSkillPacket.cs deleted file mode 100644 index a212e2cd..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Battle/UseSkillPacket.cs +++ /dev/null @@ -1,24 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Battle -{ - [PacketHeader("u_s")] - public class UseSkillPacket : PacketBase - { - [PacketIndex(0)] - public long CastId { get; set; } - - [PacketIndex(1)] - public VisualType TargetVisualType { get; set; } - - [PacketIndex(2)] - public long TargetId { get; set; } - - [PacketIndex(3, IsOptional = true)] - public short? MapX { get; set; } - - [PacketIndex(4, IsOptional = true)] - public short? MapY { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Chat/ClientSayPacket.cs b/src/ChickenAPI.Packets/Game/Client/Chat/ClientSayPacket.cs deleted file mode 100644 index a685f152..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Chat/ClientSayPacket.cs +++ /dev/null @@ -1,11 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Chat -{ - [PacketHeader("say")] - public class ClientSayPacket : PacketBase - { - [PacketIndex(0, SerializeToEnd = true)] - public string Message { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Drops/DropPacket.cs b/src/ChickenAPI.Packets/Game/Client/Drops/DropPacket.cs deleted file mode 100644 index d254e0b9..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Drops/DropPacket.cs +++ /dev/null @@ -1,32 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Drops -{ - [PacketHeader("drop")] - internal class DropPacket : PacketBase - { - [PacketIndex(0)] - public long ItemVNum { get; set; } - - [PacketIndex(1)] - public long DropId { get; set; } - - [PacketIndex(2)] - public short MapX { get; set; } - - [PacketIndex(3)] - public short MapY { get; set; } - - [PacketIndex(4)] - public short Amount { get; set; } - - [PacketIndex(5)] - public bool IsQuestItem { get; set; } - - [PacketIndex(6)] - public byte Unknown { get; set; } // looks like always 0 - - [PacketIndex(7)] - public byte Unknown2 { get; set; } // looks like always -1 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Drops/GetPacket.cs b/src/ChickenAPI.Packets/Game/Client/Drops/GetPacket.cs deleted file mode 100644 index da46e4d3..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Drops/GetPacket.cs +++ /dev/null @@ -1,21 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Drops -{ - [PacketHeader("get")] - public class GetPacket : PacketBase - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public short CharacterId { get; set; } - - [PacketIndex(2)] - public long DropId { get; set; } - - [PacketIndex(3)] - public byte Unknown2 { get; set; } // seems to be always 0 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Families/CreateFamilyPacket.cs b/src/ChickenAPI.Packets/Game/Client/Families/CreateFamilyPacket.cs deleted file mode 100644 index 00c8c9af..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Families/CreateFamilyPacket.cs +++ /dev/null @@ -1,15 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Families -{ - [PacketHeader("glmk")] - public class CreateFamilyPacket : PacketBase - { - #region Properties - - [PacketIndex(0)] - public string FamilyName { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Families/GInfoPacket.cs b/src/ChickenAPI.Packets/Game/Client/Families/GInfoPacket.cs deleted file mode 100644 index 7cdcf851..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Families/GInfoPacket.cs +++ /dev/null @@ -1,67 +0,0 @@ -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Enums.Game.Families; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Families -{ - [PacketHeader("ginfo")] - public class GInfoPacket : PacketBase - { - [PacketIndex(0)] - public string FamilyName { get; set; } - - [PacketIndex(1)] - public string CharacterName { get; set; } - - /// - /// Todo to confirm - /// - [PacketIndex(2)] - public GenderType FamilyHeadGenderType { get; set; } - - [PacketIndex(3)] - public short FamilyLevel { get; set; } - - [PacketIndex(4)] - public int FamilyXp { get; set; } - - [PacketIndex(5)] - public uint MaxFamilyXp { get; set; } - - [PacketIndex(6)] - public ushort MembersCount { get; set; } - - [PacketIndex(7)] - public ushort MembersCapacity { get; set; } - - [PacketIndex(8)] - public FamilyAuthority CharacterFamilyAuthority { get; set; } - - [PacketIndex(9)] - public bool FamilyManagerCanInvit { get; set; } - - [PacketIndex(10)] - public bool FamilyManagerCanNotice { get; set; } - - [PacketIndex(11)] - public bool FamilyManagerCanShout { get; set; } - - [PacketIndex(12)] - public bool FamilyManagerCanGetHistory { get; set; } - - [PacketIndex(13)] - public FamilyAuthorityType FamilyManagerAuthorityType { get; set; } - - [PacketIndex(14)] - public bool FamilyMemberCanGetHistory { get; set; } - - [PacketIndex(15)] - public FamilyAuthorityType FamilyMemberAuthorityType { get; set; } - - /// - /// Should replace ' ' by '^' - /// - [PacketIndex(16)] - public string FamilyMessage { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Families/GidxPacket.cs b/src/ChickenAPI.Packets/Game/Client/Families/GidxPacket.cs deleted file mode 100644 index 9bab0df0..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Families/GidxPacket.cs +++ /dev/null @@ -1,27 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Families -{ - [PacketHeader("gidx")] - public class GidxPacket : PacketBase - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long VisualId { get; set; } - - [PacketIndex(2)] - public long FamilyId { get; set; } - - [PacketIndex(3)] - public string FamilyName { get; set; } - - [PacketIndex(4, SeparatorBeforeProperty = "")] - public string FamilyCustomRank { get; set; } - - [PacketIndex(5)] - public byte FamilyLevel { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Inventory/BiPacket.cs b/src/ChickenAPI.Packets/Game/Client/Inventory/BiPacket.cs deleted file mode 100644 index a34350f2..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Inventory/BiPacket.cs +++ /dev/null @@ -1,15 +0,0 @@ -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Inventory -{ - [PacketHeader("b_i")] - public class BiPacket : PacketBase - { - [PacketIndex(0)] - public InventoryType InventoryType { get; set; } - - [PacketIndex(1)] - public short InventorySlot { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Inventory/MviPacket.cs b/src/ChickenAPI.Packets/Game/Client/Inventory/MviPacket.cs deleted file mode 100644 index ec82a369..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Inventory/MviPacket.cs +++ /dev/null @@ -1,21 +0,0 @@ -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Inventory -{ - [PacketHeader("mvi")] - public class MviPacket : PacketBase - { - [PacketIndex(0)] - public InventoryType InventoryType { get; set; } - - [PacketIndex(1)] - public short InventorySlot { get; set; } - - [PacketIndex(2)] - public short Amount { get; set; } - - [PacketIndex(3)] - public short DestinationSlot { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Inventory/PdtiPacket.cs b/src/ChickenAPI.Packets/Game/Client/Inventory/PdtiPacket.cs deleted file mode 100644 index 21d6882b..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Inventory/PdtiPacket.cs +++ /dev/null @@ -1,26 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Inventory -{ - [PacketHeader("pdti")] - public class PdtiPacket : PacketBase - { - [PacketIndex(0)] - public short Unknow { get; set; } - - [PacketIndex(1)] - public long ItemVnum { get; set; } - - [PacketIndex(2)] - public short Unknow2 { get; set; } - - [PacketIndex(3)] - public short Unknow3 { get; set; } - - [PacketIndex(4)] - public short ItemUpgrade { get; set; } - - [PacketIndex(5)] - public short Unknow4 { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Inventory/PutPacket.cs b/src/ChickenAPI.Packets/Game/Client/Inventory/PutPacket.cs deleted file mode 100644 index 83ddb630..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Inventory/PutPacket.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Inventory -{ - [PacketHeader("put")] - public class PutPacket : PacketBase - { - [PacketIndex(0)] - public InventoryType InventoryType { get; set; } - - [PacketIndex(1)] - public short InventorySlot { get; set; } - - [PacketIndex(2)] - public short Amount { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Inventory/RemovePacket.cs b/src/ChickenAPI.Packets/Game/Client/Inventory/RemovePacket.cs deleted file mode 100644 index 99d00d83..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Inventory/RemovePacket.cs +++ /dev/null @@ -1,14 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Inventory -{ - [PacketHeader("remove")] - public class RemovePacket : PacketBase - { - [PacketIndex(0)] - public byte InventorySlot { get; set; } - - [PacketIndex(1)] - public long MateId { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Inventory/UiPacket.cs b/src/ChickenAPI.Packets/Game/Client/Inventory/UiPacket.cs deleted file mode 100644 index e99112fa..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Inventory/UiPacket.cs +++ /dev/null @@ -1,28 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Inventory -{ - [PacketHeader("u_i")] - public class UiPacket : PacketBase - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long CharacterId { get; set; } - - [PacketIndex(2)] - public InventoryType InventoryType { get; set; } - - [PacketIndex(3)] - public byte InventorySlot { get; set; } - - [PacketIndex(4)] - public byte Unknown2 { get; set; } //Seems to be always 0 - using accountbound costumes and accepting the dialog sends: "#u_i^1^1^7^0^1" - - [PacketIndex(5)] - public byte Unknown3 { get; set; } //Seems to be always 0 - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Inventory/WearPacket.cs b/src/ChickenAPI.Packets/Game/Client/Inventory/WearPacket.cs deleted file mode 100644 index b5dd3783..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Inventory/WearPacket.cs +++ /dev/null @@ -1,14 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Inventory -{ - [PacketHeader("wear")] - public class WearPacket : PacketBase - { - [PacketIndex(0)] - public short ItemSlot { get; set; } - - [PacketIndex(1)] - public byte WearPacketType { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Mates/PsOpPacket.cs b/src/ChickenAPI.Packets/Game/Client/Mates/PsOpPacket.cs deleted file mode 100644 index 4bb05537..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Mates/PsOpPacket.cs +++ /dev/null @@ -1,21 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Mates -{ - [PacketHeader("ps_op")] - public class PsopPacket : PacketBase - { - #region Properties - - [PacketIndex(0)] - public byte PetSlot { get; set; } - - [PacketIndex(1)] - public byte SkillSlot { get; set; } - - [PacketIndex(2)] - public byte Option { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Mates/PslPacket.cs b/src/ChickenAPI.Packets/Game/Client/Mates/PslPacket.cs deleted file mode 100644 index 6254c1d2..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Mates/PslPacket.cs +++ /dev/null @@ -1,12 +0,0 @@ -using ChickenAPI.Enums.Packets; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Mates -{ - [PacketHeader("psl")] - public class PslPacket : PacketBase - { - [PacketIndex(0)] - public PslPacketType Type { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Mates/SuCtlPacket.cs b/src/ChickenAPI.Packets/Game/Client/Mates/SuCtlPacket.cs deleted file mode 100644 index d690fec2..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Mates/SuCtlPacket.cs +++ /dev/null @@ -1,24 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Mates -{ - [PacketHeader("suctl")] - public class SuCtlPacket : PacketBase - { - [PacketIndex(0)] - public int CastId { get; set; } - - [PacketIndex(1)] - public int Unknown2 { get; set; } - - [PacketIndex(2)] - public long MateTransportId { get; set; } - - [PacketIndex(3)] - public VisualType TargetType { get; set; } - - [PacketIndex(4)] - public long TargetId { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Mates/UPsPacket.cs b/src/ChickenAPI.Packets/Game/Client/Mates/UPsPacket.cs deleted file mode 100644 index 8e443dcd..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Mates/UPsPacket.cs +++ /dev/null @@ -1,27 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Mates -{ - [PacketHeader("u_ps")] - public class UpsPacket : PacketBase - { - [PacketIndex(0)] - public long MateTransportId { get; set; } - - [PacketIndex(1)] - public VisualType TargetType { get; set; } - - [PacketIndex(2)] - public long TargetId { get; set; } - - [PacketIndex(3)] - public int SkillSlot { get; set; } - - [PacketIndex(4)] - public short MapX { get; set; } - - [PacketIndex(5)] - public short MapY { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Mates/UpetPacket.cs b/src/ChickenAPI.Packets/Game/Client/Mates/UpetPacket.cs deleted file mode 100644 index ea1b9437..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Mates/UpetPacket.cs +++ /dev/null @@ -1,21 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Mates -{ - [PacketHeader("u_pet")] - public class UpetPacket : PacketBase - { - [PacketIndex(0)] - public long MateTransportId { get; set; } - - [PacketIndex(1)] - public VisualType TargetType { get; set; } - - [PacketIndex(2)] - public long TargetId { get; set; } - - [PacketIndex(3)] - public int Unknown2 { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Miniland/AddobjPacket.cs b/src/ChickenAPI.Packets/Game/Client/Miniland/AddobjPacket.cs deleted file mode 100644 index f41ac11b..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Miniland/AddobjPacket.cs +++ /dev/null @@ -1,17 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Miniland -{ - [PacketHeader("addobj")] - public class AddobjPacket : PacketBase - { - [PacketIndex(0)] - public short Slot { get; set; } - - [PacketIndex(1)] - public short MapX { get; set; } - - [PacketIndex(2)] - public short MapY { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Miniland/MlObjPacket.cs b/src/ChickenAPI.Packets/Game/Client/Miniland/MlObjPacket.cs deleted file mode 100644 index 00a73463..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Miniland/MlObjPacket.cs +++ /dev/null @@ -1,38 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Miniland -{ - [PacketHeader("mlobj")] - public class MlobjPacket : PacketBase - { - [PacketIndex(0)] - public bool Deleted { get; set; } - - [PacketIndex(1)] - public short Slot { get; set; } - - [PacketIndex(2)] - public short MapX { get; set; } - - [PacketIndex(3)] - public short MapY { get; set; } - - [PacketIndex(4)] - public short Width { get; set; } - - [PacketIndex(5)] - public short Height { get; set; } - - [PacketIndex(6)] - public byte Unknown { get; set; } // looks like always 0 - - [PacketIndex(7)] - public short DurabilityPoint { get; set; } - - [PacketIndex(8)] - public byte Unknown2 { get; set; } // looks like always 0 - - [PacketIndex(9)] - public bool IsWarehouse { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Miniland/RmvobjPacket.cs b/src/ChickenAPI.Packets/Game/Client/Miniland/RmvobjPacket.cs deleted file mode 100644 index 3dfb68e8..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Miniland/RmvobjPacket.cs +++ /dev/null @@ -1,11 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Miniland -{ - [PacketHeader("rmvobj")] - public class RmvobjPacket : PacketBase - { - [PacketIndex(0)] - public short Slot { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Movement/DirectionPacket.cs b/src/ChickenAPI.Packets/Game/Client/Movement/DirectionPacket.cs deleted file mode 100644 index b1a22f3b..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Movement/DirectionPacket.cs +++ /dev/null @@ -1,22 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Movement -{ - [PacketHeader("dir")] - public class DirectionPacket : PacketBase - { - #region Properties - - [PacketIndex(1)] - public int Option { get; set; } - - [PacketIndex(0)] - public DirectionType DirectionType { get; set; } - - [PacketIndex(2)] - public long CharacterId { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Movement/PreqPacket.cs b/src/ChickenAPI.Packets/Game/Client/Movement/PreqPacket.cs deleted file mode 100644 index 4adf51c4..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Movement/PreqPacket.cs +++ /dev/null @@ -1,9 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Movement -{ - [PacketHeader("preq")] - public class PreqPacket : PacketBase - { - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Movement/SitPacket.cs b/src/ChickenAPI.Packets/Game/Client/Movement/SitPacket.cs deleted file mode 100644 index 12a015a9..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Movement/SitPacket.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Collections.Generic; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Movement -{ - [PacketHeader("rest")] - public class SitPacket : PacketBase - { - #region Properties - - [PacketIndex(0)] - public byte Ammout { get; set; } - - [PacketIndex(1, RemoveSeparator = true)] - public List Users { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Movement/SitSubPacket.cs b/src/ChickenAPI.Packets/Game/Client/Movement/SitSubPacket.cs deleted file mode 100644 index 5a023025..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Movement/SitSubPacket.cs +++ /dev/null @@ -1,14 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Movement -{ - [PacketHeader("sit_sub_packet")] // header will be ignored for serializing just sub list packets - public class SitSubPacket : PacketBase - { - [PacketIndex(0)] - public byte UserType { get; set; } - - [PacketIndex(1)] - public long UserId { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Movement/WalkPacket.cs b/src/ChickenAPI.Packets/Game/Client/Movement/WalkPacket.cs deleted file mode 100644 index 0668de60..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Movement/WalkPacket.cs +++ /dev/null @@ -1,24 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Movement -{ - [PacketHeader("walk")] - public class WalkPacket : PacketBase - { - #region Properties - - [PacketIndex(0)] - public short XCoordinate { get; set; } - - [PacketIndex(1)] - public short YCoordinate { get; set; } - - [PacketIndex(2)] - public short Unknown { get; set; } - - [PacketIndex(3)] - public byte Speed { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Npcs/NrunPacket.cs b/src/ChickenAPI.Packets/Game/Client/Npcs/NrunPacket.cs deleted file mode 100644 index 89ddc018..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Npcs/NrunPacket.cs +++ /dev/null @@ -1,24 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Npcs -{ - [PacketHeader("n_run")] - public class NrunPacket : PacketBase - { - #region Properties - - [PacketIndex(0)] - public short Runner { get; set; } - - [PacketIndex(1)] - public short Type { get; set; } - - [PacketIndex(2)] - public short Value { get; set; } - - [PacketIndex(3)] - public int NpcId { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Npcs/WopenPacket.cs b/src/ChickenAPI.Packets/Game/Client/Npcs/WopenPacket.cs deleted file mode 100644 index 193effa7..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Npcs/WopenPacket.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Npcs -{ - [PacketHeader("wopen")] - public class WopenPacket : PacketBase - { - #region Properties - - [PacketIndex(0)] - public long Type { get; set; } - - [PacketIndex(1)] - public long Unknow { get; set; } - - #endregion Properties - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Player/CharacterOptionPacket.cs b/src/ChickenAPI.Packets/Game/Client/Player/CharacterOptionPacket.cs deleted file mode 100644 index e40389c1..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Player/CharacterOptionPacket.cs +++ /dev/null @@ -1,15 +0,0 @@ -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Player -{ - [PacketHeader("gop")] - public class CharacterOptionPacket : PacketBase - { - [PacketIndex(0)] - public CharacterOption Option { get; set; } - - [PacketIndex(1)] - public bool IsActive { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Player/ClientGuriPacket.cs b/src/ChickenAPI.Packets/Game/Client/Player/ClientGuriPacket.cs deleted file mode 100644 index 2cef7706..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Player/ClientGuriPacket.cs +++ /dev/null @@ -1,23 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Player -{ - [PacketHeader("guri")] - public class ClientGuriPacket : PacketBase - { - [PacketIndex(0)] - public int Type { get; set; } - - [PacketIndex(1)] - public int Argument { get; set; } - - [PacketIndex(2, IsOptional = true)] - public long? VisualId { get; set; } - - [PacketIndex(3, IsOptional = true)] - public long? Data { get; set; } - - [PacketIndex(4, IsOptional = true)] - public long? Value { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Player/ComplimentPacket.cs b/src/ChickenAPI.Packets/Game/Client/Player/ComplimentPacket.cs deleted file mode 100644 index 3ef97ec3..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Player/ComplimentPacket.cs +++ /dev/null @@ -1,15 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Player -{ - [PacketHeader("compl")] - public class ComplimentPacket : PacketBase - { - #region Properties - - [PacketIndex(1)] - public long CharacterId { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Player/EffectPacket.cs b/src/ChickenAPI.Packets/Game/Client/Player/EffectPacket.cs deleted file mode 100644 index d3d49a89..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Player/EffectPacket.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Player -{ - [PacketHeader("eff")] - public class EffectPacket : PacketBase - { - [PacketIndex(0)] - public VisualType EffectType { get; set; } - - [PacketIndex(1)] - public long CharacterId { get; set; } - - [PacketIndex(2)] - public long EffectId { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Player/NpInfoPacket.cs b/src/ChickenAPI.Packets/Game/Client/Player/NpInfoPacket.cs deleted file mode 100644 index 0d7e2ffa..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Player/NpInfoPacket.cs +++ /dev/null @@ -1,11 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Player -{ - [PacketHeader("npinfo")] - public class NpInfoPacket : PacketBase - { - [PacketIndex(0)] - public long UnKnow { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Player/QsetPacket.cs b/src/ChickenAPI.Packets/Game/Client/Player/QsetPacket.cs deleted file mode 100644 index aae44b7b..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Player/QsetPacket.cs +++ /dev/null @@ -1,27 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Player -{ - [PacketHeader("qset")] - public class QsetPacket : PacketBase - { - #region Properties - - [PacketIndex(0)] - public short Type { get; set; } - - [PacketIndex(1)] - public short Q1 { get; set; } - - [PacketIndex(2)] - public short Q2 { get; set; } - - [PacketIndex(3)] - public short? Data1 { get; set; } - - [PacketIndex(4)] - public short? Data2 { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Player/ScrPacket.cs b/src/ChickenAPI.Packets/Game/Client/Player/ScrPacket.cs deleted file mode 100644 index 4ac36a72..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Player/ScrPacket.cs +++ /dev/null @@ -1,26 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Player -{ - [PacketHeader("scr")] - public class ScrPacket : PacketBase - { - [PacketIndex(0)] - public int Unknow1 { get; set; } - - [PacketIndex(1)] - public int Unknow2 { get; set; } - - [PacketIndex(2)] - public int Unknow3 { get; set; } - - [PacketIndex(3)] - public int Unknow4 { get; set; } - - [PacketIndex(4)] - public int Unknow5 { get; set; } - - [PacketIndex(5)] - public int Unknow6 { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Player/TcInfoPacket.cs b/src/ChickenAPI.Packets/Game/Client/Player/TcInfoPacket.cs deleted file mode 100644 index cdcda72b..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Player/TcInfoPacket.cs +++ /dev/null @@ -1,129 +0,0 @@ -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Player -{ - [PacketHeader("tc_info")] - public class TcInfoPacket : PacketBase - { - // return $"tc_info {Level} {Name} {fairy?.Item.Element ?? 0} {ElementRate + (Buff.Any(s => s.Card.CardId == 131) ? 30 : 0)} - // {(byte)Class} {(byte)Gender} {(Family != null ? $"{Family.FamilyId} - // {Family.Name}({Language.Instance.GetMessageFromKey(FamilyCharacter?.Authority.ToString()?.ToUpper() ?? "")})" : "-1 -")} - // {GetReputationIco()} {GetDignityIco()} {(weapon != null ? 1 : 0)} {weapon?.Rare ?? 0} {weapon?.Upgrade ?? 0} {(weapon2 != null ? 1 : 0)} - // {weapon2?.Rare ?? 0} {weapon2?.Upgrade ?? 0} {(armor != null ? 1 : 0)} {armor?.Rare ?? 0} {armor?.Upgrade ?? 0} {Act4Kill} {Act4Dead} {Reputation} - // 0 0 0 {(UseSp ? Morph : 0)} {TalentWin} {TalentLose} {TalentSurrender} 0 {MasterPoints} {Compliment} {Act4Points} {(isPvpPrimary ? 1 : 0)} - // {(isPvpSecondary ? 1 : 0)} {(isPvpArmor ? 1 : 0)} {HeroLevel} - // {(string.IsNullOrEmpty(Biography) ? Language.Instance.GetMessageFromKey("NO_PREZ_MESSAGE") : Biography)}"; - [PacketIndex(0)] - public long Level { get; set; } - - [PacketIndex(1)] - public string Name { get; set; } - - [PacketIndex(2)] - public ElementType Element { get; set; } - - [PacketIndex(3)] - public long ElementRate { get; set; } - - [PacketIndex(4)] - public CharacterClassType Class { get; set; } - - [PacketIndex(5)] - public GenderType Gender { get; set; } - - [PacketIndex(6)] - public string Family { get; set; } - - [PacketIndex(7)] - public CharacterRep ReputationIco { get; set; } - - [PacketIndex(8)] - public CharacterDignity DignityIco { get; set; } - - [PacketIndex(9)] - public int HaveWeapon { get; set; } - - [PacketIndex(10)] - public long WeaponRare { get; set; } - - [PacketIndex(11)] - public long WeaponUpgrade { get; set; } - - [PacketIndex(12)] - public int HaveSecondary { get; set; } - - [PacketIndex(13)] - public long SecondaryRare { get; set; } - - [PacketIndex(14)] - public long SecondaryUpgrade { get; set; } - - [PacketIndex(15)] - public int HaveArmor { get; set; } - - [PacketIndex(16)] - public long ArmorRare { get; set; } - - [PacketIndex(17)] - public long ArmorUpgrade { get; set; } - - [PacketIndex(18)] - public long Act4Kill { get; set; } - - [PacketIndex(19)] - public long Act4Dead { get; set; } - - [PacketIndex(20)] - public long Reputation { get; set; } - - [PacketIndex(21)] - public long Unknow { get; set; } = 0; // Always 0 - - [PacketIndex(22)] - public long Unknow2 { get; set; } = 0; // Always 0 - - [PacketIndex(23)] - public long Unknow3 { get; set; } = 0; // Always 0 - - [PacketIndex(24)] - public long Morph { get; set; } - - [PacketIndex(25)] - public long TalentWin { get; set; } - - [PacketIndex(26)] - public long TalentLose { get; set; } - - [PacketIndex(27)] - public long TalentSurrender { get; set; } - - [PacketIndex(28)] - public long Unknow4 { get; set; } = 0; // always 0 - - [PacketIndex(29)] - public long MasterPoints { get; set; } - - [PacketIndex(30)] - public long Compliments { get; set; } - - [PacketIndex(31)] - public long Act4Points { get; set; } - - [PacketIndex(32)] - public bool isPvpPrimary { get; set; } - - [PacketIndex(33)] - public bool isPvpSecondary { get; set; } - - [PacketIndex(34)] - public bool isPvpArmor { get; set; } - - [PacketIndex(35)] - public long HeroLevel { get; set; } - - [PacketIndex(36)] - public string Biography { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Shops/BuyPacket.cs b/src/ChickenAPI.Packets/Game/Client/Shops/BuyPacket.cs deleted file mode 100644 index 009a8343..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Shops/BuyPacket.cs +++ /dev/null @@ -1,25 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Shops -{ - [PacketHeader("buy")] - public class BuyPacket : PacketBase - { - #region Properties - - [PacketIndex(0)] - public VisualType Type { get; set; } - - [PacketIndex(1)] - public long OwnerId { get; set; } - - [PacketIndex(2)] - public short Slot { get; set; } - - [PacketIndex(3)] - public short Amount { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Shops/MShopPacket.cs b/src/ChickenAPI.Packets/Game/Client/Shops/MShopPacket.cs deleted file mode 100644 index 98a3768d..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Shops/MShopPacket.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ChickenAPI.Enums.Packets; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Shops -{ - [PacketHeader("m_shop")] - public class MShopPacket : PacketBase - { - [PacketIndex(0)] - public MShopPacketType Type { get; set; } - - /// - /// Todo write a better way to handle that - /// - [PacketIndex(1, SerializeToEnd = true)] - public string PacketData { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Shops/NInvPacket.cs b/src/ChickenAPI.Packets/Game/Client/Shops/NInvPacket.cs deleted file mode 100644 index 1d806ba7..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Shops/NInvPacket.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Collections.Generic; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Shops -{ - [PacketHeader("n_inv")] - public class NInvPacket : PacketBase - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long VisualId { get; set; } - - [PacketIndex(2)] - public byte Unknown { get; set; } = 0; - - [PacketIndex(3)] - public int ShopType { get; set; } - - [PacketIndex(4, IsOptional = true)] - public string ShopList { get; set; } - - [PacketIndex(5, IsOptional = true, SeparatorNestedElements = " ")] - public List ShopSkills { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Shops/ReceivedNpcReqPacket.cs b/src/ChickenAPI.Packets/Game/Client/Shops/ReceivedNpcReqPacket.cs deleted file mode 100644 index c7cb7c9a..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Shops/ReceivedNpcReqPacket.cs +++ /dev/null @@ -1,15 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Shops -{ - [PacketHeader("npc_req")] - public class ReceivedNpcReqPacket : PacketBase - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long VisualId { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Shops/SentNpcReqPacket.cs b/src/ChickenAPI.Packets/Game/Client/Shops/SentNpcReqPacket.cs deleted file mode 100644 index 0dc935a3..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Shops/SentNpcReqPacket.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Shops -{ - [PacketHeader("npc_req")] - public class SentNpcReqPacket : PacketBase - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long VisualId { get; set; } - - [PacketIndex(2, IsOptional = true)] - public long? Dialog { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Shops/ShopPacket.cs b/src/ChickenAPI.Packets/Game/Client/Shops/ShopPacket.cs deleted file mode 100644 index 54882b48..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Shops/ShopPacket.cs +++ /dev/null @@ -1,27 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Shops -{ - [PacketHeader("shop")] - public class ShopPacket : PacketBase - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long EntityId { get; set; } - - [PacketIndex(2)] - public long ShopId { get; set; } - - [PacketIndex(3)] - public byte MenuType { get; set; } - - [PacketIndex(4)] - public byte ShopType { get; set; } - - [PacketIndex(5)] - public string Name { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Shops/ShoppingPacket.cs b/src/ChickenAPI.Packets/Game/Client/Shops/ShoppingPacket.cs deleted file mode 100644 index 949dd11a..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Shops/ShoppingPacket.cs +++ /dev/null @@ -1,20 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Shops -{ - [PacketHeader("shopping")] - public class ShoppingPacket : PacketBase - { - [PacketIndex(0)] - public byte Type { get; set; } - - [PacketIndex(1)] - public int Unknown { get; set; } - - [PacketIndex(2)] - public int Unknown1 { get; set; } - - [PacketIndex(3)] - public int NpcId { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Specialists/SlPacket.cs b/src/ChickenAPI.Packets/Game/Client/Specialists/SlPacket.cs deleted file mode 100644 index 3df3403f..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Specialists/SlPacket.cs +++ /dev/null @@ -1,31 +0,0 @@ -using ChickenAPI.Enums.Packets; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Specialists -{ - [PacketHeader("sl")] - public class SlPacket : PacketBase - { - #region Properties - - [PacketIndex(0)] - public SlPacketType Type { get; set; } - - [PacketIndex(3)] - public int TransportId { get; set; } - - [PacketIndex(4)] - public short SpecialistDamage { get; set; } - - [PacketIndex(5)] - public short SpecialistDefense { get; set; } - - [PacketIndex(6)] - public short SpecialistElement { get; set; } - - [PacketIndex(7)] - public short SpecialistHp { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/Specialists/SpPacket.cs b/src/ChickenAPI.Packets/Game/Client/Specialists/SpPacket.cs deleted file mode 100644 index 23811606..00000000 --- a/src/ChickenAPI.Packets/Game/Client/Specialists/SpPacket.cs +++ /dev/null @@ -1,20 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.Specialists -{ - [PacketHeader("sp")] - public class SpPacket : PacketBase - { - [PacketIndex(0)] - public int AdditionalPoints { get; set; } - - [PacketIndex(1)] - public uint MaxAdditionalPoints { get; set; } - - [PacketIndex(2)] - public int Points { get; set; } - - [PacketIndex(3)] - public uint MaxDailyPoints { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Client/UI/EInfoPacket.cs b/src/ChickenAPI.Packets/Game/Client/UI/EInfoPacket.cs deleted file mode 100644 index cfa3d14d..00000000 --- a/src/ChickenAPI.Packets/Game/Client/UI/EInfoPacket.cs +++ /dev/null @@ -1,90 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client.UI -{ - [PacketHeader("e_info")] - public class EInfoPacket : PacketBase - { - [PacketIndex(0)] - public short Unknown1 { get; set; } - - [PacketIndex(1)] - public long MonsterVnum { get; set; } - - [PacketIndex(2)] - public byte Level { get; set; } - - [PacketIndex(3)] - public ElementType Element { get; set; } - - [PacketIndex(4)] - public byte AttackClass { get; set; } - - [PacketIndex(5)] - public short ElementRate { get; set; } - - [PacketIndex(6)] - public byte AttackUpgrade { get; set; } - - [PacketIndex(7)] - public short DamageMinimum { get; set; } - - [PacketIndex(8)] - public short DamageMaximum { get; set; } - - [PacketIndex(9)] - public short Concentrate { get; set; } - - [PacketIndex(10)] - public byte CriticalChance { get; set; } - - [PacketIndex(11)] - public short CriticalRate { get; set; } - - [PacketIndex(12)] - public byte DefenceUpgrade { get; set; } - - [PacketIndex(13)] - public short CloseDefence { get; set; } - - [PacketIndex(14)] - public short DefenceDodge { get; set; } - - [PacketIndex(15)] - public short DistanceDefence { get; set; } - - [PacketIndex(16)] - public short DistanceDefenceDodge { get; set; } - - [PacketIndex(17)] - public short MagicDefence { get; set; } - - [PacketIndex(18)] - public sbyte FireResistance { get; set; } - - [PacketIndex(19)] - public sbyte WaterResistance { get; set; } - - [PacketIndex(20)] - public sbyte LightResistance { get; set; } - - [PacketIndex(21)] - public sbyte DarkResistance { get; set; } - - [PacketIndex(22)] - public int MaxHp { get; set; } - - [PacketIndex(23)] - public int MaxMp { get; set; } - - [PacketIndex(24)] - public short Unknown2 { get; set; } - - [PacketIndex(25)] - public string Name { get; set; } - } -} diff --git a/src/ChickenAPI.Packets/Game/Client/UpgradePacket.cs b/src/ChickenAPI.Packets/Game/Client/UpgradePacket.cs deleted file mode 100644 index 5e700521..00000000 --- a/src/ChickenAPI.Packets/Game/Client/UpgradePacket.cs +++ /dev/null @@ -1,35 +0,0 @@ -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Enums.Packets; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Client -{ - [PacketHeader("up_gr")] - public class UpgradePacket : PacketBase - { - #region Properties - - [PacketIndex(0)] - public UpgradePacketType UpgradeType { get; set; } - - [PacketIndex(1)] - public InventoryType InventoryType { get; set; } - - [PacketIndex(2)] - public byte Slot { get; set; } - - [PacketIndex(3, IsOptional = true)] - public InventoryType? InventoryType2 { get; set; } - - [PacketIndex(4, IsOptional = true)] - public byte? Slot2 { get; set; } - - [PacketIndex(5, IsOptional = true)] - public InventoryType? CellonInventoryType { get; set; } - - [PacketIndex(6, IsOptional = true)] - public byte? CellonSlot { get; set; } - - #endregion Properties - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Auction/RcbListPacket.cs b/src/ChickenAPI.Packets/Game/Server/Auction/RcbListPacket.cs deleted file mode 100644 index 99be83b2..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Auction/RcbListPacket.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System.Collections.Generic; -using ChickenAPI.Packets.Attributes; -using ChickenAPI.Packets.Game.Server.Inventory; - -namespace ChickenAPI.Packets.Game.Server.Auction -{ - [PacketHeader("rc_blist")] - public class RcbListPacket : PacketBase - { - [PacketIndex(0)] - public long PageIndex { get; set; } - - [PacketIndex(1, SeparatorNestedElements = " ")] - public List Items { get; set; } - - [PacketHeader("rc_blist_subpacket")] - public class RcbListElementPacket : PacketBase - { - [PacketIndex(0)] - public long AuctionId { get; set; } - - [PacketIndex(1, SeparatorBeforeProperty = "|")] - public long OwnerId { get; set; } - - [PacketIndex(2, SeparatorBeforeProperty = "|")] - public string OwnerName { get; set; } - - [PacketIndex(3, SeparatorBeforeProperty = "|")] - public long ItemId { get; set; } - - [PacketIndex(4, SeparatorBeforeProperty = "|")] - public long Amount { get; set; } - - [PacketIndex(5, SeparatorBeforeProperty = "|")] - public bool IsPackage { get; set; } - - [PacketIndex(6, SeparatorBeforeProperty = "|")] - public long Price { get; set; } - - [PacketIndex(7, SeparatorNestedElements = "|")] - public long MinutesLeft { get; set; } - - /// - /// Todo find signification but default known value is 2 - /// - [PacketIndex(8, SeparatorBeforeProperty = "|")] - public bool Unknown1 { get; set; } - - [PacketIndex(9, SeparatorBeforeProperty = "|")] - public long Unknown { get; set; } - - [PacketIndex(10, SeparatorBeforeProperty = "|")] - public long Rarity { get; set; } - - [PacketIndex(11, SeparatorBeforeProperty = "|")] - public long Upgrade { get; set; } - - [PacketIndex(12, SeparatorBeforeProperty = "|")] - public EInfoPacket EInfo { get; set; } - } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Auction/RcsListPacket.cs b/src/ChickenAPI.Packets/Game/Server/Auction/RcsListPacket.cs deleted file mode 100644 index 8e4651fb..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Auction/RcsListPacket.cs +++ /dev/null @@ -1,59 +0,0 @@ -using System.Collections.Generic; -using ChickenAPI.Packets.Attributes; -using ChickenAPI.Packets.Game.Server.Inventory; - -namespace ChickenAPI.Packets.Game.Server.Auction -{ - [PacketHeader("rc_slist")] - public class RcsListPacket : PacketBase - { - [PacketIndex(0)] - public int PageNumber { get; set; } - - [PacketIndex(1, SeparatorNestedElements = " ")] - public List Items { get; set; } - - [PacketHeader("rc_slist_element")] - public class RcsListElementPacket : PacketBase - { - [PacketIndex(0)] - public long AuctionId { get; set; } - - [PacketIndex(1, SeparatorBeforeProperty = "|")] - public long OwnerId { get; set; } - - [PacketIndex(2, SeparatorBeforeProperty = "|")] - public long ItemId { get; set; } - - [PacketIndex(3, SeparatorBeforeProperty = "|")] - public long SoldAmount { get; set; } - - [PacketIndex(4, SeparatorBeforeProperty = "|")] - public long Amount { get; set; } - - [PacketIndex(5, SeparatorBeforeProperty = "|")] - public bool IsPackage { get; set; } - - [PacketIndex(6, SeparatorBeforeProperty = "|")] - public long Price { get; set; } - - [PacketIndex(7, SeparatorNestedElements = "|")] - public long MinutesLeft { get; set; } - - [PacketIndex(8, SeparatorBeforeProperty = "|")] - public bool IsSellerUsingMedal { get; set; } - - [PacketIndex(9, SeparatorBeforeProperty = "|")] - public long Unknown { get; set; } - - [PacketIndex(10, SeparatorBeforeProperty = "|")] - public long Rarity { get; set; } - - [PacketIndex(11, SeparatorBeforeProperty = "|")] - public long Upgrade { get; set; } - - [PacketIndex(12, SeparatorBeforeProperty = "|")] - public EInfoPacket EInfo { get; set; } - } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Battle/BfPacket.cs b/src/ChickenAPI.Packets/Game/Server/Battle/BfPacket.cs deleted file mode 100644 index facc01bd..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Battle/BfPacket.cs +++ /dev/null @@ -1,27 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Battle -{ - [PacketHeader("bf")] - public class BfPacket : PacketBase - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long VisualId { get; set; } - - [PacketIndex(2)] - public long ChargeValue { get; set; } - - [PacketIndex(3, SeparatorBeforeProperty = ".")] - public long BuffId { get; set; } - - [PacketIndex(4, SeparatorBeforeProperty = ".")] - public long Duration { get; set; } - - [PacketIndex(5)] - public long BuffLevel { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Battle/CancelPacket.cs b/src/ChickenAPI.Packets/Game/Server/Battle/CancelPacket.cs deleted file mode 100644 index 91b70394..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Battle/CancelPacket.cs +++ /dev/null @@ -1,15 +0,0 @@ -using ChickenAPI.Enums.Packets; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Battle -{ - [PacketHeader("cancel")] - public class CancelPacket : PacketBase - { - [PacketIndex(0)] - public CancelPacketType Type { get; set; } - - [PacketIndex(1)] - public long TargetId { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Battle/CtPacket.cs b/src/ChickenAPI.Packets/Game/Server/Battle/CtPacket.cs deleted file mode 100644 index b3275506..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Battle/CtPacket.cs +++ /dev/null @@ -1,30 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Battle -{ - [PacketHeader("ct")] - public class CtPacket : PacketBase - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long VisualId { get; set; } - - [PacketIndex(2)] - public VisualType TargetVisualType { get; set; } - - [PacketIndex(3)] - public long TargetId { get; set; } - - [PacketIndex(4)] - public long CastAnimationId { get; set; } - - [PacketIndex(5)] - public long CastEffect { get; set; } - - [PacketIndex(6)] - public long SkillId { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Battle/DmPacket.cs b/src/ChickenAPI.Packets/Game/Server/Battle/DmPacket.cs deleted file mode 100644 index 4174b234..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Battle/DmPacket.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Battle -{ - [PacketHeader("dm")] - public class DmPacket - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long VisualId { get; set; } - - [PacketIndex(2)] - public long Damages { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Battle/MscPacket.cs b/src/ChickenAPI.Packets/Game/Server/Battle/MscPacket.cs deleted file mode 100644 index ec019413..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Battle/MscPacket.cs +++ /dev/null @@ -1,11 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Battle -{ - [PacketHeader("ms_c")] - public class MscPacket : PacketBase - { - [PacketIndex(0)] - public long Unknown { get; set; } = 0; - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Battle/RcPacket.cs b/src/ChickenAPI.Packets/Game/Server/Battle/RcPacket.cs deleted file mode 100644 index 4aeafd31..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Battle/RcPacket.cs +++ /dev/null @@ -1,21 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Battle -{ - [PacketHeader("rc")] - public class RcPacket - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long VisualId { get; set; } - - [PacketIndex(2)] - public long HealAmount { get; set; } - - [PacketIndex(3)] - public long Unknown { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Battle/SuPacket.cs b/src/ChickenAPI.Packets/Game/Server/Battle/SuPacket.cs deleted file mode 100644 index d217b88e..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Battle/SuPacket.cs +++ /dev/null @@ -1,55 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Enums.Packets; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Battle -{ - [PacketHeader("su")] - public class SuPacket : PacketBase - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long VisualId { get; set; } - - [PacketIndex(2)] - public VisualType TargetVisualType { get; set; } - - [PacketIndex(3)] - public long TargetId { get; set; } - - [PacketIndex(4)] - public long SkillVnum { get; set; } - - [PacketIndex(5)] - public long SkillCooldown { get; set; } - - [PacketIndex(6)] - public long AttackAnimation { get; set; } - - [PacketIndex(7)] - public long SkillEffect { get; set; } - - [PacketIndex(8)] - public long PositionX { get; set; } - - [PacketIndex(9)] - public long PositionY { get; set; } - - [PacketIndex(10)] - public bool TargetIsAlive { get; set; } - - [PacketIndex(11)] - public byte HpPercentage { get; set; } - - [PacketIndex(12)] - public uint Damage { get; set; } - - [PacketIndex(13)] - public SuPacketHitMode HitMode { get; set; } - - [PacketIndex(14)] - public int SkillTypeMinusOne { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Chat/SayItemPacket.cs b/src/ChickenAPI.Packets/Game/Server/Chat/SayItemPacket.cs deleted file mode 100644 index 6be20292..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Chat/SayItemPacket.cs +++ /dev/null @@ -1,50 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; -using ChickenAPI.Packets.Game.Server.Inventory; - -namespace ChickenAPI.Packets.Game.Server.Chat -{ - [PacketHeader("sayitem")] - public class SayItemPacket : PacketBase - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long VisualId { get; set; } - - [PacketIndex(2)] - public byte OratorSlot { get; set; } - - - [PacketIndex(3)] - public string GlobalPrefix { get; set; } - - [PacketIndex(4, SeparatorBeforeProperty = "^")] - public string CharacterName { get; set; } - - [PacketIndex(5)] - public string ItemName { get; set; } - - /// - /// Spaces should be replaced by '^' - /// - [PacketIndex(6, IsOptional = true, SeparatorBeforeProperty = "^")] - public string Message { get; set; } - - [PacketIndex(6, IsOptional = true, SeparatorBeforeProperty = " ")] - public SayItemSubPacket ItemData { get; set; } - - [PacketHeader("say_item_subpacket")] - public class SayItemSubPacket : PacketBase - { - // disgusting but it's entwell - // :hap: - [PacketIndex(0, IsOptional = true, SeparatorBeforeProperty = "ItemInfo ")] - public long? IconId { get; set; } - - [PacketIndex(1, IsOptional = true, SeparatorBeforeProperty = " ")] - public EInfoPacket EquipmentInfo { get; set; } - } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Entities/CharScPacket.cs b/src/ChickenAPI.Packets/Game/Server/Entities/CharScPacket.cs deleted file mode 100644 index 10790df9..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Entities/CharScPacket.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Entities -{ - [PacketHeader("char_sc")] - public class CharScPacket : PacketBase - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long VisualId { get; set; } - - [PacketIndex(2)] - public byte Size { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Entities/DropPacket.cs b/src/ChickenAPI.Packets/Game/Server/Entities/DropPacket.cs deleted file mode 100644 index d7c50364..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Entities/DropPacket.cs +++ /dev/null @@ -1,32 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Entities -{ - [PacketHeader("drop")] - public class DropPacket : PacketBase - { - [PacketIndex(0)] - public long ItemVnum { get; set; } - - [PacketIndex(1)] - public long TransportId { get; set; } - - [PacketIndex(2)] - public short PositionX { get; set; } - - [PacketIndex(3)] - public short PositionY { get; set; } - - [PacketIndex(4)] - public long Quantity { get; set; } - - [PacketIndex(5)] - public bool IsQuestDrop { get; set; } - - [PacketIndex(6)] - public byte Unknown { get; set; } = 0; - - [PacketIndex(7)] - public short Unknown2 { get; set; } = -1; - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Entities/MvPacket.cs b/src/ChickenAPI.Packets/Game/Server/Entities/MvPacket.cs deleted file mode 100644 index b2bfb8d7..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Entities/MvPacket.cs +++ /dev/null @@ -1,24 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Entities -{ - [PacketHeader("mv")] - public class MvPacket : PacketBase - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long VisualId { get; set; } - - [PacketIndex(2)] - public short MapX { get; set; } - - [PacketIndex(3)] - public short MapY { get; set; } - - [PacketIndex(4)] - public short Speed { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Entities/OutPacket.cs b/src/ChickenAPI.Packets/Game/Server/Entities/OutPacket.cs deleted file mode 100644 index 6c89d09c..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Entities/OutPacket.cs +++ /dev/null @@ -1,15 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Entities -{ - [PacketHeader("out")] - public class OutPacket : PacketBase - { - [PacketIndex(0)] - public VisualType Type { get; set; } - - [PacketIndex(1)] - public long EntityId { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Entities/ReqInfoPacket.cs b/src/ChickenAPI.Packets/Game/Server/Entities/ReqInfoPacket.cs deleted file mode 100644 index 76adce6d..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Entities/ReqInfoPacket.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Entities -{ - [PacketHeader("req_info")] - public class ReqInfoPacket : PacketBase - { - [PacketIndex(0)] - public ReqInfoType ReqType { get; set; } - - [PacketIndex(1)] - public long TargetVNum { get; set; } - - [PacketIndex(2)] - public int? MateVNum { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Entities/RestPacket.cs b/src/ChickenAPI.Packets/Game/Server/Entities/RestPacket.cs deleted file mode 100644 index 8dd9542d..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Entities/RestPacket.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Entities -{ - [PacketHeader("rest")] - public class RestPacket : PacketBase - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long VisualId { get; set; } - - [PacketIndex(2)] - public bool IsSitting { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Entities/StPacket.cs b/src/ChickenAPI.Packets/Game/Server/Entities/StPacket.cs deleted file mode 100644 index 0e104d2e..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Entities/StPacket.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.Collections.Generic; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Entities -{ - [PacketHeader("st")] - public class StPacket : PacketBase - { - //st 1 {CharacterId} {Level} {HeroLevel} {(int)(Hp / (float)HpLoad() * 100)} {(int)(Mp / (float)MpLoad() * 100)} {Hp} {Mp}{Buff.Aggregate(string.Empty, (current, buff) => current + $" {buff.Card.CardId}")} - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long VisualId { get; set; } - - - [PacketIndex(2)] - public byte Level { get; set; } - - - [PacketIndex(3)] - public byte HeroLevel { get; set; } - - - [PacketIndex(4)] - public long HpPercentage { get; set; } - - - [PacketIndex(5)] - public long MpPercentage { get; set; } - - - [PacketIndex(6)] - public long Hp { get; set; } - - [PacketIndex(7)] - public long Mp { get; set; } - - [PacketIndex(8, IsOptional = true, RemoveSeparator = true)] - public List CardIds { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Entities/TpPacket.cs b/src/ChickenAPI.Packets/Game/Server/Entities/TpPacket.cs deleted file mode 100644 index 70fe9509..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Entities/TpPacket.cs +++ /dev/null @@ -1,24 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Entities -{ - [PacketHeader("tp")] - public class TpPacket : PacketBase - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long VisualId { get; set; } - - [PacketIndex(2)] - public short X { get; set; } - - [PacketIndex(3)] - public short Y { get; set; } - - [PacketIndex(4)] - public byte Unknown { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Group/PInitPacket.cs b/src/ChickenAPI.Packets/Game/Server/Group/PInitPacket.cs deleted file mode 100644 index b02fd87a..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Group/PInitPacket.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System.Collections.Generic; -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Group -{ - [PacketHeader("pinit")] - public class PInitPacket : PacketBase - { - [PacketIndex(0)] - public long PartySize { get; set; } - - [PacketIndex(1, SeparatorBeforeProperty = "", SeparatorNestedElements = " ", IsOptional = true)] - public List MateSubPackets { get; set; } - - [PacketIndex(2, SeparatorBeforeProperty = "", SeparatorNestedElements = " ", IsOptional = true)] - public List PlayerSubPackets { get; set; } - - [PacketHeader("pinit_subpacket")] - public class PInitMateSubPacket : PacketBase - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1, SeparatorBeforeProperty = "|")] - public long VisualId { get; set; } - - [PacketIndex(2, SeparatorBeforeProperty = "|")] - public byte GroupIndex { get; set; } - - [PacketIndex(3, SeparatorBeforeProperty = "|")] - public long Level { get; set; } - - [PacketIndex(4, SeparatorBeforeProperty = "|")] - public string Name { get; set; } - - [PacketIndex(5, SeparatorBeforeProperty = "|")] - public short Unknown { get; set; } - - [PacketIndex(6, SeparatorBeforeProperty = "|")] - public long MorphOrNpcMonsterId { get; set; } - - [PacketIndex(7, SeparatorBeforeProperty = "|")] - public short Unknown2 { get; set; } - } - - [PacketHeader("pinit_subpacket")] - public class PInitPlayerSubPacket : PacketBase - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1, SeparatorBeforeProperty = "|")] - public long VisualId { get; set; } - - [PacketIndex(2, SeparatorBeforeProperty = "|")] - public byte GroupIndex { get; set; } - - [PacketIndex(3, SeparatorBeforeProperty = "|")] - public long Level { get; set; } - - [PacketIndex(4, SeparatorBeforeProperty = "|")] - public string Name { get; set; } - - [PacketIndex(5, SeparatorBeforeProperty = "|")] - public byte Unknown { get; set; } - - [PacketIndex(6, SeparatorBeforeProperty = "|")] - public GenderType Gender { get; set; } - - [PacketIndex(7, SeparatorBeforeProperty = "|")] - public CharacterClassType Class { get; set; } - - [PacketIndex(8, SeparatorBeforeProperty = "|")] - public long MorphId { get; set; } - - [PacketIndex(9, SeparatorBeforeProperty = "|")] - public long HeroLevel { get; set; } - } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Group/PJoinPacket.cs b/src/ChickenAPI.Packets/Game/Server/Group/PJoinPacket.cs deleted file mode 100644 index 108c291d..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Group/PJoinPacket.cs +++ /dev/null @@ -1,19 +0,0 @@ -using ChickenAPI.Enums.Packets; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Group -{ - [PacketHeader("pjoin")] - public class PJoinPacket : PacketBase - { - #region Properties - - [PacketIndex(0)] - public PJoinPacketType RequestType { get; set; } - - [PacketIndex(1)] - public long CharacterId { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Group/PidxPacket.cs b/src/ChickenAPI.Packets/Game/Server/Group/PidxPacket.cs deleted file mode 100644 index cd0408fe..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Group/PidxPacket.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Collections.Generic; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Group -{ - [PacketHeader("pidx")] - public class PidxPacket : PacketBase - { - [PacketIndex(0)] - public long GroupId { get; set; } - - [PacketIndex(1, SeparatorNestedElements = " ")] - public List SubPackets { get; set; } - - [PacketHeader("pidx_subpacket")] - public class PidxSubPacket : PacketBase - { - [PacketIndex(0)] - public bool IsMemberOfGroup { get; set; } - - [PacketIndex(1, SeparatorBeforeProperty = ".")] - public long CharacterId { get; set; } - } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Group/PstPacket.cs b/src/ChickenAPI.Packets/Game/Server/Group/PstPacket.cs deleted file mode 100644 index 29800fbc..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Group/PstPacket.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System.Collections.Generic; -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Group -{ - [PacketHeader("pst")] - public class PstPacket : PacketBase - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long VisualId { get; set; } - - [PacketIndex(2)] - public long GroupIndex { get; set; } - - [PacketIndex(3)] - public int HpPercentage { get; set; } - - [PacketIndex(4)] - public int MpPercentage { get; set; } - - [PacketIndex(5)] - public int HpMax { get; set; } - - [PacketIndex(6)] - public int MpMax { get; set; } - - [PacketIndex(7)] - public GenderType Gender { get; set; } - - [PacketIndex(8)] - public CharacterClassType Class { get; set; } - - [PacketIndex(9)] - public int Morph { get; set; } - - [PacketIndex(10, SeparatorNestedElements = " ")] - public List Buffs { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Inventory/EInfoPacket.cs b/src/ChickenAPI.Packets/Game/Server/Inventory/EInfoPacket.cs deleted file mode 100644 index 029711b8..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Inventory/EInfoPacket.cs +++ /dev/null @@ -1,89 +0,0 @@ -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Inventory -{ - [PacketHeader("e_info")] - public class EInfoPacket : PacketBase - { - [PacketIndex(0)] - public EInfoPacketType EInfoType { get; set; } - - [PacketIndex(1)] - public long ItemVNum { get; set; } - - [PacketIndex(2, IsOptional = true)] - public short? Rare { get; set; } - - [PacketIndex(3, IsOptional = true)] - public short? Upgrade { get; set; } - - [PacketIndex(4, IsOptional = true)] - public bool? Fixed { get; set; } - - [PacketIndex(5)] - public byte LevelMinimum { get; set; } - - [PacketIndex(13, IsOptional = true)] - public short? DurabilityPoint { get; set; } - - [PacketIndex(14, IsOptional = true)] - public int? Unknown { get; set; } // default 100 for Amulets - - [PacketIndex(15, IsOptional = true)] - public int? Unknown1 { get; set; } // default 0 for Amulets - - [PacketIndex(16, IsOptional = true)] - public byte? Element { get; set; } - - [PacketIndex(17, IsOptional = true)] - public short? ElementRate { get; set; } - - [PacketIndex(18, IsOptional = true)] - public long? Price { get; set; } - - [PacketIndex(19, IsOptional = true)] - public int? Unknown2 { get; set; } // default -1 for Weapons and Armors - - [PacketIndex(20, IsOptional = true)] - public short Rare2 { get; set; } - - [PacketIndex(21, IsOptional = true)] - public long BoundCharacterId { get; set; } - - [PacketIndex(22, IsOptional = true)] - public byte? ShellEffectCount { get; set; } // Review this - - [PacketIndex(23, IsOptional = true)] - public byte? ShellEffect { get; set; } // Review this - - #region Armor - - [PacketIndex(6, IsOptional = true)] - public short? CloseDefense { get; set; } - - [PacketIndex(7, IsOptional = true)] - public short? RangeDefense { get; set; } - - [PacketIndex(8, IsOptional = true)] - public short? MagicDefense { get; set; } - - [PacketIndex(9, IsOptional = true)] - public short? DefenseDodge { get; set; } - - [PacketIndex(10, IsOptional = true)] - public short? CriticalRate { get; set; } - - #endregion - - #region Weapon - - [PacketIndex(11, IsOptional = true)] - public byte? Ammo { get; set; } - - [PacketIndex(12, IsOptional = true)] - public byte? MaximumAmmo { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Inventory/EqListInfo.cs b/src/ChickenAPI.Packets/Game/Server/Inventory/EqListInfo.cs deleted file mode 100644 index 919de3bc..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Inventory/EqListInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Inventory -{ - [PacketHeader("subpacket_eq_list_info")] - public class EqListInfo : PacketBase - { - [PacketIndex(0)] - public long Hat { get; set; } - - [PacketIndex(1, SeparatorBeforeProperty = ".")] - public long Armor { get; set; } - - [PacketIndex(2, SeparatorBeforeProperty = ".")] - public long MainWeapon { get; set; } - - [PacketIndex(3, SeparatorBeforeProperty = ".")] - public long SecondaryWeapon { get; set; } - - [PacketIndex(4, SeparatorBeforeProperty = ".")] - public long Mask { get; set; } - - [PacketIndex(5, SeparatorBeforeProperty = ".")] - public long Fairy { get; set; } - - [PacketIndex(6, SeparatorBeforeProperty = ".")] - public long CostumeSuit { get; set; } - - [PacketIndex(7, SeparatorBeforeProperty = ".")] - public long CostumeHat { get; set; } - - [PacketIndex(8, SeparatorBeforeProperty = ".")] - public long WeaponSkin { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Inventory/EqPacket.cs b/src/ChickenAPI.Packets/Game/Server/Inventory/EqPacket.cs deleted file mode 100644 index 1a2d0b38..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Inventory/EqPacket.cs +++ /dev/null @@ -1,33 +0,0 @@ -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Inventory -{ - [PacketHeader("eq")] - public class EqPacket : PacketBase - { - [PacketIndex(0)] - public long CharacterId { get; set; } - - [PacketIndex(1)] - public CharacterNameAppearance NameAppearance { get; set; } - - [PacketIndex(2)] - public GenderType GenderType { get; set; } - - [PacketIndex(3)] - public HairStyleType HairStyleType { get; set; } - - [PacketIndex(4)] - public HairColorType HairColorType { get; set; } - - [PacketIndex(5)] - public CharacterClassType CharacterClassType { get; set; } - - [PacketIndex(6)] - public EqListInfo EqList { get; set; } - - [PacketIndex(7, RemoveSeparator = true)] - public EqRareInfo EqInfo { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Inventory/EqRareInfo.cs b/src/ChickenAPI.Packets/Game/Server/Inventory/EqRareInfo.cs deleted file mode 100644 index 8013ffec..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Inventory/EqRareInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Inventory -{ - [PacketHeader("subpacket_eq_rare_info")] - public class EqRareInfo : PacketBase - { - [PacketIndex(0)] - public byte WeaponUpgrade { get; set; } - - [PacketIndex(1, SeparatorBeforeProperty = "")] - public sbyte WeaponRarity { get; set; } - - [PacketIndex(2, SeparatorBeforeProperty = " ")] - public byte ArmorUpgrade { get; set; } - - [PacketIndex(3, SeparatorBeforeProperty = "")] - public sbyte ArmorRarity { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Inventory/EquipPacket.cs b/src/ChickenAPI.Packets/Game/Server/Inventory/EquipPacket.cs deleted file mode 100644 index b98d4187..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Inventory/EquipPacket.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Collections.Generic; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Inventory -{ - [PacketHeader("equip")] - public class EquipPacket : PacketBase - { - [PacketIndex(0, RemoveSeparator = true)] - public EqRareInfo EqRare { get; set; } - - - [PacketIndex(1, SeparatorNestedElements = " ", IsOptional = true)] - public List EqList { get; set; } - - [PacketHeader("equip_subpacket")] - public class EquipSubPacket : PacketBase - { - [PacketIndex(0)] - public int WearIndex { get; set; } - - [PacketIndex(1, SeparatorBeforeProperty = ".")] - public long ItemId { get; set; } - - [PacketIndex(2, SeparatorBeforeProperty = ".")] - public byte ItemRarity { get; set; } - - [PacketIndex(3, SeparatorBeforeProperty = ".")] - public byte UpgradeOrDesign { get; set; } - - [PacketIndex(4, SeparatorBeforeProperty = ".")] - public byte Unknown { get; set; } - } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Inventory/EquipmentInfoPacket.cs b/src/ChickenAPI.Packets/Game/Server/Inventory/EquipmentInfoPacket.cs deleted file mode 100644 index 3a6ca342..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Inventory/EquipmentInfoPacket.cs +++ /dev/null @@ -1,21 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Inventory -{ - [PacketHeader("eqinfo")] - public class EquipmentInfoPacket : PacketBase - { - #region Properties - - [PacketIndex(0)] - public byte Type { get; set; } // todo more information - - [PacketIndex(1)] - public short Slot { get; set; } - - [PacketIndex(2)] - public long? ShopOwnerId { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Inventory/EquipmentListItem.cs b/src/ChickenAPI.Packets/Game/Server/Inventory/EquipmentListItem.cs deleted file mode 100644 index e09571b7..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Inventory/EquipmentListItem.cs +++ /dev/null @@ -1,24 +0,0 @@ -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Inventory -{ - [PacketHeader("subpacket_eq_list")] - public class EquipmentListItem - { - [PacketIndex(0)] - public EquipmentType EquipmentType { get; set; } - - [PacketIndex(1, SeparatorBeforeProperty = ".")] - public long ItemId { get; set; } - - [PacketIndex(2, SeparatorBeforeProperty = ".")] - public sbyte ItemRarity { get; set; } - - [PacketIndex(3, SeparatorBeforeProperty = ".")] - public byte DesignOrUpgrade { get; set; } - - [PacketIndex(4, SeparatorBeforeProperty = ".")] - public byte Unknown { get; set; } = 0; - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Inventory/GetPacket.cs b/src/ChickenAPI.Packets/Game/Server/Inventory/GetPacket.cs deleted file mode 100644 index d67a14a1..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Inventory/GetPacket.cs +++ /dev/null @@ -1,20 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Inventory -{ - [PacketHeader("get")] - public class GetPacket : PacketBase - { - [PacketIndex(0)] - public byte Unknown1 { get; set; } = 1; - - [PacketIndex(1)] - public long CharacterId { get; set; } - - [PacketIndex(2)] - public long ItemId { get; set; } - - [PacketIndex(3)] - public byte Unknown2 { get; set; } = 0; - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Inventory/GoldPacket.cs b/src/ChickenAPI.Packets/Game/Server/Inventory/GoldPacket.cs deleted file mode 100644 index 2e6842e4..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Inventory/GoldPacket.cs +++ /dev/null @@ -1,14 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Inventory -{ - [PacketHeader("gold")] - public class GoldPacket : PacketBase - { - [PacketIndex(0)] - public long Gold { get; set; } - - [PacketIndex(1)] - public byte Unknown { get; set; } = 0; - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Inventory/InvPacket.cs b/src/ChickenAPI.Packets/Game/Server/Inventory/InvPacket.cs deleted file mode 100644 index 2f9b9921..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Inventory/InvPacket.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Collections.Generic; -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Inventory -{ - [PacketHeader("inv")] - public class InvPacket : PacketBase - { - [PacketIndex(0)] - public InventoryType InventoryType { get; set; } - - [PacketIndex(1, SeparatorNestedElements = " ", SeparatorBeforeProperty = " ", IsOptional = true)] - public List Items { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Inventory/InventoryWearSubPacket.cs b/src/ChickenAPI.Packets/Game/Server/Inventory/InventoryWearSubPacket.cs deleted file mode 100644 index c8a54978..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Inventory/InventoryWearSubPacket.cs +++ /dev/null @@ -1,35 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Inventory -{ - [PacketHeader("eq_subpacket")] - public class InventoryWearSubPacket : PacketBase - { - [PacketIndex(0)] - public long Hat { get; set; } - - [PacketIndex(1, SeparatorBeforeProperty = ".")] - public long Armor { get; set; } - - [PacketIndex(2, SeparatorBeforeProperty = ".")] - public long MainWeapon { get; set; } - - [PacketIndex(3, SeparatorBeforeProperty = ".")] - public long SecondaryWeapon { get; set; } - - [PacketIndex(4, SeparatorBeforeProperty = ".")] - public long Mask { get; set; } - - [PacketIndex(5, SeparatorBeforeProperty = ".")] - public long Fairy { get; set; } - - [PacketIndex(6, SeparatorBeforeProperty = ".")] - public long CostumeSuit { get; set; } - - [PacketIndex(7, SeparatorBeforeProperty = ".")] - public long CostumeHat { get; set; } - - [PacketIndex(8, SeparatorBeforeProperty = ".")] - public long WeaponSkin { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Inventory/IvnPacket.cs b/src/ChickenAPI.Packets/Game/Server/Inventory/IvnPacket.cs deleted file mode 100644 index 6854cc2d..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Inventory/IvnPacket.cs +++ /dev/null @@ -1,27 +0,0 @@ -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Inventory -{ - [PacketHeader("ivn")] - public class IvnPacket : PacketBase - { - [PacketIndex(0)] - public InventoryType InventoryType { get; set; } - - [PacketIndex(1)] - public short Slot { get; set; } - - [PacketIndex(2, SeparatorBeforeProperty = ".")] - public long ItemId { get; set; } - - [PacketIndex(3, SeparatorBeforeProperty = ".")] - public short Rare { get; set; } - - [PacketIndex(4, SeparatorBeforeProperty = ".", IsOptional = true)] - public short? Upgrade { get; set; } - - [PacketIndex(5, SeparatorBeforeProperty = ".", IsOptional = true)] - public short? SpStoneUpgrade { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Inventory/PairyPacket.cs b/src/ChickenAPI.Packets/Game/Server/Inventory/PairyPacket.cs deleted file mode 100644 index 14a3462d..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Inventory/PairyPacket.cs +++ /dev/null @@ -1,27 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Inventory -{ - [PacketHeader("pairy")] - public class PairyPacket : PacketBase - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long CharacterId { get; set; } - - [PacketIndex(2)] - public byte FairyMoveType { get; set; } - - [PacketIndex(3)] - public ElementType ElementType { get; set; } - - [PacketIndex(4)] - public short FairyLevel { get; set; } - - [PacketIndex(5)] - public short ItemMorph { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Inventory/SlInfoPacket.cs b/src/ChickenAPI.Packets/Game/Server/Inventory/SlInfoPacket.cs deleted file mode 100644 index 251c3728..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Inventory/SlInfoPacket.cs +++ /dev/null @@ -1,141 +0,0 @@ -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Inventory -{ - [PacketHeader("slinfo")] - public class SlInfoPacket : PacketBase - { - [PacketIndex(0)] - public InventoryType InventoryType { get; set; } - - [PacketIndex(1)] - public long ItemId { get; set; } - - [PacketIndex(2)] - public short ItemMorph { get; set; } - - [PacketIndex(3)] - public byte SpLevel { get; set; } - - [PacketIndex(4)] - public byte LevelJobMinimum { get; set; } - - [PacketIndex(5)] - public byte ReputationMinimum { get; set; } - - [PacketIndex(6)] - public int Unknown { get; set; } - - [PacketIndex(7)] - public int Unknown2 { get; set; } - - [PacketIndex(8)] - public int Unknown3 { get; set; } - - [PacketIndex(9)] - public int Unknown4 { get; set; } - - [PacketIndex(10)] - public int Unknown5 { get; set; } - - [PacketIndex(11)] - public int Unknown6 { get; set; } - - [PacketIndex(12)] - public int Unknown7 { get; set; } - - [PacketIndex(13)] - public byte SpType { get; set; } - - [PacketIndex(14)] - public short FireResistance { get; set; } - - [PacketIndex(15)] - public short WaterResistance { get; set; } - - [PacketIndex(16)] - public short LightResistance { get; set; } - - [PacketIndex(17)] - public short DarkResistance { get; set; } - - [PacketIndex(18)] - public long Xp { get; set; } - - [PacketIndex(19)] - public short SPXpData { get; set; } - - [PacketIndex(20)] - public string Skill { get; set; } - - [PacketIndex(21)] - public int TransportId { get; set; } - - [PacketIndex(22)] - public int SlHit { get; set; } - - [PacketIndex(23)] - public int FreeSpPoints { get; set; } - - [PacketIndex(24)] - public int SlDefence { get; set; } - - [PacketIndex(25)] - public int SlElement { get; set; } - - [PacketIndex(26)] - public int SlHp { get; set; } - - [PacketIndex(27)] - public byte Upgrade { get; set; } - - [PacketIndex(28)] - public int Unknown8 { get; set; } - - [PacketIndex(29)] - public int Unknown9 { get; set; } - - [PacketIndex(30)] - public byte IsSpDestroyed { get; set; } - - [PacketIndex(31)] - public int ShellHit { get; set; } - - [PacketIndex(32)] - public int ShellDefense { get; set; } - - [PacketIndex(33)] - public int ShellElement { get; set; } - - [PacketIndex(34)] - public int ShellHpMp { get; set; } - - [PacketIndex(35)] - public short SpStoneUpgrade { get; set; } - - [PacketIndex(36)] - public short AttackPoints { get; set; } - - [PacketIndex(37)] - public short DefensePoints { get; set; } - - [PacketIndex(38)] - public short ElementPoints { get; set; } - - [PacketIndex(39)] - public short HpMpPoints { get; set; } - - [PacketIndex(40)] - public short SpFireResistance { get; set; } - - [PacketIndex(41)] - public short SpWaterResistance { get; set; } - - [PacketIndex(42)] - public short SpLightResistance { get; set; } - - [PacketIndex(43)] - public short SpDarkResistance { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Map/MapoutPacket.cs b/src/ChickenAPI.Packets/Game/Server/Map/MapoutPacket.cs deleted file mode 100644 index 90fee3fa..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Map/MapoutPacket.cs +++ /dev/null @@ -1,9 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Map -{ - [PacketHeader("mapout")] - public class MapoutPacket : PacketBase - { - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Mates/PSkiPacket.cs b/src/ChickenAPI.Packets/Game/Server/Mates/PSkiPacket.cs deleted file mode 100644 index a1ba1256..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Mates/PSkiPacket.cs +++ /dev/null @@ -1,17 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Mates -{ - [PacketHeader("pski")] - public class PSkiPacket - { - [PacketIndex(0)] - public long FirstSkill { get; set; } - - [PacketIndex(1)] - public long SecondSkill { get; set; } - - [PacketIndex(2)] - public long ThirdSkill { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Mates/SayPetPacket.cs b/src/ChickenAPI.Packets/Game/Server/Mates/SayPetPacket.cs deleted file mode 100644 index f0208f56..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Mates/SayPetPacket.cs +++ /dev/null @@ -1,14 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Mates -{ - [PacketHeader("say_p")] - public class SayPetPacket - { - [PacketIndex(0)] - public long PetId { get; set; } - - [PacketIndex(1, SerializeToEnd = true)] - public string Message { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Mates/ScnPacket.cs b/src/ChickenAPI.Packets/Game/Server/Mates/ScnPacket.cs deleted file mode 100644 index 7fa94176..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Mates/ScnPacket.cs +++ /dev/null @@ -1,242 +0,0 @@ -using ChickenAPI.Enums.Game.Mates; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Mates -{ - /// - /// Packets for partners - /// - [PacketHeader("sc_n")] - public class ScnPacket : PacketBase - { - [PacketIndex(0)] - public long PetId { get; set; } - - [PacketIndex(1)] - public long NpcMonsterVNum { get; set; } - - [PacketIndex(2)] - public long TransportId { get; set; } - - [PacketIndex(3)] - public short Level { get; set; } - - [PacketIndex(4)] - public short Loyalty { get; set; } - - [PacketIndex(5)] - public long Experience { get; set; } - - [PacketIndex(6)] - public ScEquipmentDetails WeaponInstanceDetails { get; set; } - - [PacketIndex(7)] - public ScEquipmentDetails ArmorInstanceDetails { get; set; } - - [PacketIndex(8)] - public ScEquipmentDetails GauntletInstanceDetails { get; set; } - - [PacketIndex(9)] - public ScEquipmentDetails BootsInstanceDetails { get; set; } - - [PacketIndex(10)] - public short Unknown { get; set; } - - [PacketIndex(11)] - public short Unknown2 { get; set; } - - [PacketIndex(12)] - public short Unknown3 { get; set; } - - [PacketIndex(13)] - public short AttackUpgrade { get; set; } - - [PacketIndex(14)] - public int MinimumAttack { get; set; } - - [PacketIndex(15)] - public int MaximumAttack { get; set; } - - [PacketIndex(16)] - public int Precision { get; set; } - - [PacketIndex(17)] - public int CriticalRate { get; set; } - - [PacketIndex(18)] - public int CriticalDamageRate { get; set; } - - [PacketIndex(19)] - public short DefenceUpgrade { get; set; } - - [PacketIndex(20)] - public int Defence { get; set; } - - [PacketIndex(21)] - public int DefenceDodge { get; set; } - - [PacketIndex(22)] - public int DistanceDefence { get; set; } - - [PacketIndex(23)] - public int DistanceDodge { get; set; } - - [PacketIndex(24)] - public int DodgeRate { get; set; } - - [PacketIndex(25)] - public int ElementRate { get; set; } - - [PacketIndex(26)] - public int FireResistance { get; set; } - - [PacketIndex(27)] - public int WaterResistance { get; set; } - - [PacketIndex(28)] - public int LightResistance { get; set; } - - [PacketIndex(29)] - public int DarkResistance { get; set; } - - [PacketIndex(30)] - public int Hp { get; set; } - - [PacketIndex(31)] - public int HpMax { get; set; } - - [PacketIndex(32)] - public int Mp { get; set; } - - [PacketIndex(33)] - public int MpMax { get; set; } - - [PacketIndex(34)] - public int Unknown21 { get; set; } - - [PacketIndex(35)] - public int Unknown22 { get; set; } - - /// - /// Spaces should be replaced by "^" - /// - [PacketIndex(36)] - public string Name { get; set; } - - /// - /// Sp Instance or Skin - /// - [PacketIndex(37)] - public int MorphId { get; set; } - - /// - /// Sp Instance or Skin - /// - [PacketIndex(38)] - public bool IsSummonable { get; set; } - - /// - /// Sp Instance or Skin - /// - [PacketIndex(39)] - public ScSpDetails SpDetails { get; set; } - - /// - /// Sp Instance or Skin - /// - [PacketIndex(40)] - public ScSkillDetails Skill1Details { get; set; } - - /// - /// Sp Instance or Skin - /// - [PacketIndex(41)] - public ScSkillDetails Skill2Details { get; set; } - - /// - /// Sp Instance or Skin - /// - [PacketIndex(42)] - public ScSkillDetails Skill3Details { get; set; } - - [PacketHeader("SUBPACKET_SC_SP")] - public class ScSpDetails : PacketBase - { - [PacketIndex(0)] - public long ItemId { get; set; } - - [PacketIndex(1, SeparatorBeforeProperty = ".")] - public byte AgilityPercentage { get; set; } - } - - [PacketHeader("SUBPACKET_SC_EQ")] - public class ScEquipmentDetails : PacketBase - { - [PacketIndex(0)] - public long ItemId { get; set; } - - [PacketIndex(1, SeparatorBeforeProperty = ".")] - public long ItemRare { get; set; } - - [PacketIndex(2, SeparatorBeforeProperty = ".")] - public long ItemUpgrade { get; set; } - } - - [PacketHeader("SUBPACKET_SC_SP_SKILL")] - public class ScSkillDetails : PacketBase - { - [PacketIndex(0)] - public long SkillId { get; set; } - - [PacketIndex(1, SeparatorBeforeProperty = ".")] - public SpPartnerRank Rank { get; set; } - } - } -} - -/* - sc_n - {PetId} - {NpcMonsterVNum} - {MateTransportId} - {Level} - {Loyalty} - {Experience} - {WeaponDetails (vnum.rare.upgrade) : "-1"} // weapon details - {ArmorDetails (vnum.rare.upgrade) : "-1"} // armor details - {GlovesDetails (vnum.0.0) : "-1"} // gaunt details - {BoostDetails (vnum.0.0) : "-1"} // boots details - 0 // unknown - 0 // unknown 2 - 1 // unknown 3 - 0 // unknown 4 - 142 // unknown 5 - 174 // unknown 6 - 232 // unknown 7 - 4 // unknown 8 - 70 // unknown 9 - 0 // unknown 10 - 73 // unknown 11 - 158 // unknown 12 - 86 // unknown 13 - 158 // unknown 14 - 69 // dodge rate - 0 // element rate 16 - 0 // unknown 17 - 0 // unknown 18 - 0 // unknown 19 - 0 // unknown 20 - {Hp} - {MaxHp} - {Mp} - {MaxMp} - 0 // unknown 21 - 285816 // unknown 22 - {Name.Replace(' ', '^')} - {-1} // skin - {(IsSummonable ? 1 : 0)} - {(SpInstance != null ? $"{SpInstance.ItemVNum}.100" : "-1")} - {(SkillId.SkillRank) :) // unknown 23 SpRank1 - -1 // unknown 24 SpRank2 - -1 // unknown 25 SpRank3 - */ \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Mates/ScpPacket.cs b/src/ChickenAPI.Packets/Game/Server/Mates/ScpPacket.cs deleted file mode 100644 index 1abf8726..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Mates/ScpPacket.cs +++ /dev/null @@ -1,110 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Mates -{ - /// - /// Packets for pets - /// - [PacketHeader("sc_p")] - public class ScpPacket : PacketBase - { - [PacketIndex(0)] - public long PetId { get; set; } - - [PacketIndex(1)] - public long NpcMonsterVNum { get; set; } - - [PacketIndex(2)] - public long TransportId { get; set; } - - [PacketIndex(3)] - public short Level { get; set; } - - [PacketIndex(4)] - public short Loyalty { get; set; } - - [PacketIndex(5)] - public long Experience { get; set; } - - [PacketIndex(6)] - public long Unknow1 { get; set; } - - [PacketIndex(7)] - public long AttackUpgrade { get; set; } - - [PacketIndex(8)] - public long DamageMinimum { get; set; } - - [PacketIndex(9)] - public long DamageMaximum { get; set; } - - [PacketIndex(10)] - public long Concentrate { get; set; } - - [PacketIndex(11)] - public long CriticalChance { get; set; } - - [PacketIndex(12)] - public long CriticalRate { get; set; } - - [PacketIndex(13)] - public long DefenceUpgrade { get; set; } - - [PacketIndex(14)] - public long CloseDefence { get; set; } - - [PacketIndex(15)] - public long DefenceDodge { get; set; } - - [PacketIndex(16)] - public long DistanceDefence { get; set; } - - [PacketIndex(17)] - public long DistanceDefenceDodge { get; set; } - - [PacketIndex(18)] - public long MagicDefence { get; set; } - - [PacketIndex(19)] - public long Element { get; set; } - - [PacketIndex(20)] - public long FireResistance { get; set; } - - [PacketIndex(21)] - public long WaterResistance { get; set; } - - [PacketIndex(22)] - public long LightResistance { get; set; } - - [PacketIndex(23)] - public long DarkResistance { get; set; } - - [PacketIndex(24)] - public long Hp { get; set; } - - [PacketIndex(25)] - public long MaxHp { get; set; } - - [PacketIndex(26)] - public long Mp { get; set; } - - [PacketIndex(27)] - public long MaxMp { get; set; } - - [PacketIndex(28)] - public bool IsTeamMember { get; set; } - - [PacketIndex(29)] - public long XpLoad { get; set; } - - [PacketIndex(30)] - public bool CanPickUp { get; set; } - - [PacketIndex(31)] - public string Name { get; set; } - - [PacketIndex(32)] - public bool IsSummonable { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/MiniMap/AtPacketBase.cs b/src/ChickenAPI.Packets/Game/Server/MiniMap/AtPacketBase.cs deleted file mode 100644 index 32922512..00000000 --- a/src/ChickenAPI.Packets/Game/Server/MiniMap/AtPacketBase.cs +++ /dev/null @@ -1,36 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.MiniMap -{ - [PacketHeader("at")] - public class AtPacketBase : PacketBase - { - #region Properties - - [PacketIndex(0)] - public long CharacterId { get; set; } - - [PacketIndex(1)] - public short MapId { get; set; } - - [PacketIndex(2)] - public short PositionX { get; set; } - - [PacketIndex(3)] - public short PositionY { get; set; } - - [PacketIndex(4)] - public byte Unknown1 { get; set; } - - [PacketIndex(5)] - public byte Unknown2 { get; set; } - - [PacketIndex(6)] - public int Music { get; set; } - - [PacketIndex(7)] - public short Unknown3 { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/MiniMap/CMapPacket.cs b/src/ChickenAPI.Packets/Game/Server/MiniMap/CMapPacket.cs deleted file mode 100644 index b4c6aa3f..00000000 --- a/src/ChickenAPI.Packets/Game/Server/MiniMap/CMapPacket.cs +++ /dev/null @@ -1,21 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.MiniMap -{ - [PacketHeader("c_map")] - public class CMapPacket : PacketBase - { - #region Properties - - [PacketIndex(0)] - public byte Type { get; set; } // Seems to be always equal to 0 - - [PacketIndex(1)] - public short Id { get; set; } - - [PacketIndex(2)] - public byte MapType { get; set; } // depends on the maptype (1 = base & 0 = instanciated I think) - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/MiniMap/RsfpPacket.cs b/src/ChickenAPI.Packets/Game/Server/MiniMap/RsfpPacket.cs deleted file mode 100644 index 5c228344..00000000 --- a/src/ChickenAPI.Packets/Game/Server/MiniMap/RsfpPacket.cs +++ /dev/null @@ -1,14 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.MiniMap -{ - [PacketHeader("rsfp")] - public class RsfpPacket : PacketBase - { - [PacketIndex(0)] - public long MapX { get; set; } = 0; - - [PacketIndex(1)] - public long MapY { get; set; } = -1; - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Player/BnPacket.cs b/src/ChickenAPI.Packets/Game/Server/Player/BnPacket.cs deleted file mode 100644 index 730501bc..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Player/BnPacket.cs +++ /dev/null @@ -1,14 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Player -{ - [PacketHeader("bn")] - public class BnPacket : PacketBase - { - [PacketIndex(0)] - public byte BnNumber { get; set; } - - [PacketIndex(1)] - public string Message { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Player/CInfoPacket.cs b/src/ChickenAPI.Packets/Game/Server/Player/CInfoPacket.cs deleted file mode 100644 index 271bf0db..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Player/CInfoPacket.cs +++ /dev/null @@ -1,67 +0,0 @@ -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Player -{ - [PacketHeader("c_info")] - public class CInfoPacket : PacketBase - { - #region Propertiesf - - [PacketIndex(0)] - public string Name { get; set; } - - [PacketIndex(1)] - public string Unknown1 { get; set; } - - [PacketIndex(2)] - public short GroupId { get; set; } - - [PacketIndex(3)] - public long FamilyId { get; set; } - - [PacketIndex(4)] - public string FamilyName { get; set; } - - [PacketIndex(5)] - public long CharacterId { get; set; } - - [PacketIndex(6)] - public CharacterNameAppearance NameAppearance { get; set; } - - [PacketIndex(7)] - public GenderType Gender { get; set; } - - [PacketIndex(8)] - public HairStyleType HairStyle { get; set; } - - [PacketIndex(9)] - public HairColorType HairColor { get; set; } - - [PacketIndex(10)] - public CharacterClassType Class { get; set; } - - [PacketIndex(11)] - public byte Icon { get; set; } - - [PacketIndex(12)] - public short Compliment { get; set; } - - [PacketIndex(13)] - public short Morph { get; set; } - - [PacketIndex(14)] - public bool Invisible { get; set; } - - [PacketIndex(15)] - public byte FamilyLevel { get; set; } - - [PacketIndex(16)] - public byte SpUpgrade { get; set; } - - [PacketIndex(17)] - public bool ArenaWinner { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Player/CModePacketBase.cs b/src/ChickenAPI.Packets/Game/Server/Player/CModePacketBase.cs deleted file mode 100644 index 7b1bb106..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Player/CModePacketBase.cs +++ /dev/null @@ -1,31 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Player -{ - [PacketHeader("c_mode")] - public class CModePacketBase : PacketBase - { - #region Properties - - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long CharacterId { get; set; } - - [PacketIndex(2)] - public short Morph { get; set; } - - [PacketIndex(3)] - public byte SpUpgrade { get; set; } - - [PacketIndex(4)] - public byte SpDesign { get; set; } - - [PacketIndex(5, IsOptional = true)] - public bool ArenaWinner { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Player/CondPacketBase.cs b/src/ChickenAPI.Packets/Game/Server/Player/CondPacketBase.cs deleted file mode 100644 index 38a02edd..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Player/CondPacketBase.cs +++ /dev/null @@ -1,24 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Player -{ - [PacketHeader("cond")] - public class CondPacketBase : PacketBase - { - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long VisualId { get; set; } - - [PacketIndex(2)] - public bool NoAttack { get; set; } - - [PacketIndex(3)] - public bool NoMove { get; set; } - - [PacketIndex(4)] - public byte Speed { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Player/FdPacket.cs b/src/ChickenAPI.Packets/Game/Server/Player/FdPacket.cs deleted file mode 100644 index e616262d..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Player/FdPacket.cs +++ /dev/null @@ -1,24 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Player -{ - [PacketHeader("fd")] - public class FdPacket : PacketBase - { - #region Properties - - [PacketIndex(0)] - public long Reput { get; set; } - - [PacketIndex(1)] - public int ReputIcon { get; set; } - - [PacketIndex(2)] - public int Dignity { get; set; } - - [PacketIndex(3)] - public int DignityIcon { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Player/FsPacket.cs b/src/ChickenAPI.Packets/Game/Server/Player/FsPacket.cs deleted file mode 100644 index 4c376ad4..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Player/FsPacket.cs +++ /dev/null @@ -1,12 +0,0 @@ -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Player -{ - [PacketHeader("fs")] - public class FsPacket : PacketBase - { - [PacketIndex(0)] - public FactionType Faction { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Player/LevPacket.cs b/src/ChickenAPI.Packets/Game/Server/Player/LevPacket.cs deleted file mode 100644 index 2acab96e..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Player/LevPacket.cs +++ /dev/null @@ -1,45 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Player -{ - /// - /// $"lev {Level} {LevelXp} {(UseSp? SpInstance.SpLevel : JobLevel)} {(UseSp ? SpInstance.XP : JobLevelXp)} {XpLoad()} - /// {(UseSp ? SpxpLoad() : JobXpLoad())} {Reput} {GetCp()} {HeroXp} {HeroLevel} {HeroXpLoad()}"; - /// - [PacketHeader("lev")] - public class LevPacket : PacketBase - { - [PacketIndex(0)] - public byte Level { get; set; } - - [PacketIndex(1)] - public int LevelXp { get; set; } - - [PacketIndex(2)] - public byte JobLevel { get; set; } - - [PacketIndex(3)] - public int JobLevelXp { get; set; } - - [PacketIndex(4)] - public long LevelXpMax { get; set; } - - [PacketIndex(5)] - public long JobLevelXpMax { get; set; } - - [PacketIndex(6)] - public long Reputation { get; set; } - - [PacketIndex(7)] - public int Cp { get; set; } - - [PacketIndex(8)] - public int HeroLevelXp { get; set; } - - [PacketIndex(9)] - public byte HeroLevel { get; set; } - - [PacketIndex(10)] - public int HeroLevelXpMax { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Player/LevelUpPacket.cs b/src/ChickenAPI.Packets/Game/Server/Player/LevelUpPacket.cs deleted file mode 100644 index 155d9b50..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Player/LevelUpPacket.cs +++ /dev/null @@ -1,11 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Player -{ - [PacketHeader("levelup")] - public class LevelUpPacket : PacketBase - { - [PacketIndex(0)] - public long CharacterId { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Player/QSlotPacket.cs b/src/ChickenAPI.Packets/Game/Server/Player/QSlotPacket.cs deleted file mode 100644 index 3f5f2fc6..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Player/QSlotPacket.cs +++ /dev/null @@ -1,14 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Player -{ - [PacketHeader("qslot")] - public class QSlotPacket : PacketBase - { - [PacketIndex(0)] - public long Slot { get; set; } - - [PacketIndex(1)] - public string Data { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Player/QsetPacketReceive.cs b/src/ChickenAPI.Packets/Game/Server/Player/QsetPacketReceive.cs deleted file mode 100644 index 0d403d57..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Player/QsetPacketReceive.cs +++ /dev/null @@ -1,21 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Player -{ - [PacketHeader("qset")] - public class QsetPacketReceive : PacketBase - { - #region Properties - - [PacketIndex(0)] - public short Q1 { get; set; } - - [PacketIndex(1)] - public short Q2 { get; set; } - - [PacketIndex(2)] - public string Data { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Player/RagePacket.cs b/src/ChickenAPI.Packets/Game/Server/Player/RagePacket.cs deleted file mode 100644 index 12a459e7..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Player/RagePacket.cs +++ /dev/null @@ -1,14 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Player -{ - [PacketHeader("rage")] - public class RagePacket : PacketBase - { - [PacketIndex(0)] - public long RagePoints { get; set; } - - [PacketIndex(1)] - public long RagePointsMax { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Player/SayPacket.cs b/src/ChickenAPI.Packets/Game/Server/Player/SayPacket.cs deleted file mode 100644 index 813d7070..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Player/SayPacket.cs +++ /dev/null @@ -1,26 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Enums.Packets; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Player -{ - [PacketHeader("say")] - public class SayPacket : PacketBase - { - #region Properties - - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1)] - public long VisualId { get; set; } - - [PacketIndex(2)] - public SayColorType Type { get; set; } - - [PacketIndex(3)] - public string Message { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Player/ScPacket.cs b/src/ChickenAPI.Packets/Game/Server/Player/ScPacket.cs deleted file mode 100644 index 29dd0933..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Player/ScPacket.cs +++ /dev/null @@ -1,80 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Player -{ - [PacketHeader("sc")] - public class ScPacket : PacketBase - { - [PacketIndex(0)] - public byte Type { get; set; } - - [PacketIndex(1)] - public byte MainWeaponUpgrade { get; set; } - - [PacketIndex(2)] - public int MinHit { get; set; } - - [PacketIndex(3)] - public int MaxHit { get; set; } - - [PacketIndex(4)] - public int HitRate { get; set; } - - [PacketIndex(5)] - public short CriticalHitRate { get; set; } - - [PacketIndex(6)] - public int CriticalHitMultiplier { get; set; } - - [PacketIndex(7)] - public byte Type2 { get; set; } - - [PacketIndex(8)] - public short SecondaryWeaponUpgrade { get; set; } - - [PacketIndex(9)] - public short SecondaryMinHit { get; set; } - - [PacketIndex(10)] - public short SecondaryMaxHit { get; set; } - - [PacketIndex(11)] - public short SecondaryHitRate { get; set; } - - [PacketIndex(12)] - public short SecondaryCriticalHitRate { get; set; } - - [PacketIndex(13)] - public short SecondaryCriticalHitMultiplier { get; set; } - - [PacketIndex(14)] - public byte ArmorUpgrade { get; set; } - - [PacketIndex(15)] - public short Defence { get; set; } - - [PacketIndex(16)] - public short DefenceRate { get; set; } - - [PacketIndex(17)] - public short DistanceDefence { get; set; } - - [PacketIndex(18)] - public short DistanceDefenceRate { get; set; } - - [PacketIndex(19)] - public short MagicalDefence { get; set; } - - [PacketIndex(20)] - public short FireResistance { get; set; } - - [PacketIndex(21)] - public short WaterResistance { get; set; } - - [PacketIndex(22)] - public short LightResistance { get; set; } - - [PacketIndex(23)] - public short DarkResistance { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Player/StatPacket.cs b/src/ChickenAPI.Packets/Game/Server/Player/StatPacket.cs deleted file mode 100644 index 94666aa5..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Player/StatPacket.cs +++ /dev/null @@ -1,26 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Player -{ - [PacketHeader("stat")] - public class StatPacket : PacketBase - { - [PacketIndex(0)] - public long Hp { get; set; } - - [PacketIndex(1)] - public long HpMax { get; set; } - - [PacketIndex(2)] - public long Mp { get; set; } - - [PacketIndex(3)] - public long MpMax { get; set; } - - [PacketIndex(4)] - public long Unknown { get; set; } // seems to be 0 - - [PacketIndex(5)] - public double CharacterOption { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Player/TitPacket.cs b/src/ChickenAPI.Packets/Game/Server/Player/TitPacket.cs deleted file mode 100644 index 1d70b181..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Player/TitPacket.cs +++ /dev/null @@ -1,14 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Player -{ - [PacketHeader("tit")] - public class TitPacket : PacketBase - { - [PacketIndex(0)] - public string ClassType { get; set; } - - [PacketIndex(1)] - public string Name { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Portals/GpPacket.cs b/src/ChickenAPI.Packets/Game/Server/Portals/GpPacket.cs deleted file mode 100644 index fba292ec..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Portals/GpPacket.cs +++ /dev/null @@ -1,30 +0,0 @@ -using ChickenAPI.Enums.Game.Portals; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Portals -{ - /// - /// gp {SourceX} {SourceY} {MapId} {Type} {PortalId} {IsDisabled} - /// - [PacketHeader("gp")] - public class GpPacket : PacketBase - { - [PacketIndex(0)] - public short PositionX { get; set; } - - [PacketIndex(1)] - public short PositionY { get; set; } - - [PacketIndex(2)] - public long DestinationMapId { get; set; } - - [PacketIndex(3)] - public PortalType PortalType { get; set; } - - [PacketIndex(4)] - public long PortalId { get; set; } - - [PacketIndex(5)] - public bool IsDisabled { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Raids/RlPacket.cs b/src/ChickenAPI.Packets/Game/Server/Raids/RlPacket.cs deleted file mode 100644 index 99435b50..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Raids/RlPacket.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System.Collections.Generic; -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Enums.Packets; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Raids -{ - [PacketHeader("rl")] - public class RlPacket - { - [PacketIndex(0)] - public RlPacketType Type { get; set; } - - [PacketIndex(1, SeparatorNestedElements = " ")] - public List Raids { get; set; } - - [PacketHeader("rl_packet_details")] - public class RaidListPacketDetail : PacketBase - { - [PacketIndex(0)] - public long RaidId { get; set; } - - [PacketIndex(1, SeparatorBeforeProperty = ".")] - public long LevelMinimum { get; set; } - - [PacketIndex(2, SeparatorBeforeProperty = ".")] - public long LevelMaximum { get; set; } - - [PacketIndex(3, SeparatorBeforeProperty = ".")] - public string LeaderName { get; set; } - - [PacketIndex(4, SeparatorBeforeProperty = ".")] - public long LeaderLevel { get; set; } - - [PacketIndex(5, SeparatorBeforeProperty = ".")] - public long LeaderMorphId { get; set; } - - [PacketIndex(6, SeparatorBeforeProperty = ".")] - public CharacterClassType LeaderClass { get; set; } - - [PacketIndex(7, SeparatorBeforeProperty = ".")] - public GenderType LeaderGender { get; set; } - - [PacketIndex(8, SeparatorBeforeProperty = ".")] - public long PlayerCountInGroup { get; set; } - - [PacketIndex(9, SeparatorBeforeProperty = ".")] - public long LeaderHeroLevel { get; set; } - } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Relations/BlInitPacket.cs b/src/ChickenAPI.Packets/Game/Server/Relations/BlInitPacket.cs deleted file mode 100644 index ea8ad37d..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Relations/BlInitPacket.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Collections.Generic; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Relations -{ - [PacketHeader("blinit")] - public class BlInitPacket : PacketBase - { - [PacketIndex(0, SeparatorNestedElements = " ")] - public List SubPackets { get; set; } - - [PacketHeader("blinit_subpacket")] - public class BlInitSubPacket - { - [PacketIndex(0)] - public long CharacterId { get; set; } - - [PacketIndex(1)] - public string CharacterName { get; set; } - } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Relations/FInitPacket.cs b/src/ChickenAPI.Packets/Game/Server/Relations/FInitPacket.cs deleted file mode 100644 index 4ec89c41..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Relations/FInitPacket.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Collections.Generic; -using ChickenAPI.Enums.Game.Relations; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Relations -{ - [PacketHeader("finit")] - public class FInitPacket : PacketBase - { - [PacketIndex(0, SeparatorNestedElements = " ")] - public List Packets { get; set; } - - [PacketHeader("finit_subpacket")] - public class FInitSubPacket : PacketBase - { - [PacketIndex(0)] - public long RelationId { get; set; } - - [PacketIndex(1, SeparatorBeforeProperty = "|")] - public CharacterRelationType RelationType { get; set; } - - [PacketIndex(2, SeparatorBeforeProperty = "|")] - public bool IsOnline { get; set; } - - [PacketIndex(3, SeparatorBeforeProperty = "|")] - public string CharacterName { get; set; } - } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Relations/FInsPacket.cs b/src/ChickenAPI.Packets/Game/Server/Relations/FInsPacket.cs deleted file mode 100644 index 947f593e..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Relations/FInsPacket.cs +++ /dev/null @@ -1,15 +0,0 @@ -using ChickenAPI.Enums.Packets; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Relations -{ - [PacketHeader("fins")] - public class FInsPacket : PacketBase - { - [PacketIndex(0)] - public FInsPacketType Type { get; set; } - - [PacketIndex(1)] - public long CharacterId { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Shop/IShopPacket.cs b/src/ChickenAPI.Packets/Game/Server/Shop/IShopPacket.cs deleted file mode 100644 index d784204d..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Shop/IShopPacket.cs +++ /dev/null @@ -1,9 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Shop -{ - [PacketHeader("ishop")] - public class IShopPacket : PacketBase - { - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Shop/PFlagPacket.cs b/src/ChickenAPI.Packets/Game/Server/Shop/PFlagPacket.cs deleted file mode 100644 index 84992ceb..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Shop/PFlagPacket.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Shop -{ - [PacketHeader("pflag")] - public class PFlagPacket : PacketBase - { - [PacketIndex(0)] - public VisualType EntityType { get; set; } - - [PacketIndex(1)] - public long EntityId { get; set; } - - [PacketIndex(2)] - public long ShopId { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Shop/SMemoPacket.cs b/src/ChickenAPI.Packets/Game/Server/Shop/SMemoPacket.cs deleted file mode 100644 index 77ebfe76..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Shop/SMemoPacket.cs +++ /dev/null @@ -1,15 +0,0 @@ -using ChickenAPI.Enums.Packets; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Shop -{ - [PacketHeader("s_memo")] - public class SMemoPacket : PacketBase - { - [PacketIndex(0)] - public SMemoPacketType SMemoPacketType { get; set; } - - [PacketIndex(1)] - public string Message { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Shop/ShopEndPacket.cs b/src/ChickenAPI.Packets/Game/Server/Shop/ShopEndPacket.cs deleted file mode 100644 index 65e4fdb6..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Shop/ShopEndPacket.cs +++ /dev/null @@ -1,12 +0,0 @@ -using ChickenAPI.Enums.Packets; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Shop -{ - [PacketHeader("shop_end")] - public class ShopEndPacket : PacketBase - { - [PacketIndex(0)] - public ShopEndPacketType Type { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Specialist/SdPacket.cs b/src/ChickenAPI.Packets/Game/Server/Specialist/SdPacket.cs deleted file mode 100644 index 68c74adf..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Specialist/SdPacket.cs +++ /dev/null @@ -1,11 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Specialist -{ - [PacketHeader("sd")] - public class SdPacket : PacketBase - { - [PacketIndex(0)] - public int CoolDown { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/UserInterface/Act6Packet.cs b/src/ChickenAPI.Packets/Game/Server/UserInterface/Act6Packet.cs deleted file mode 100644 index 0b71b480..00000000 --- a/src/ChickenAPI.Packets/Game/Server/UserInterface/Act6Packet.cs +++ /dev/null @@ -1,9 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.UserInterface -{ - [PacketHeader("act6")] - public class Act6Packet : PacketBase - { - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/UserInterface/BSInfoPacket.cs b/src/ChickenAPI.Packets/Game/Server/UserInterface/BSInfoPacket.cs deleted file mode 100644 index ef7f4ef6..00000000 --- a/src/ChickenAPI.Packets/Game/Server/UserInterface/BSInfoPacket.cs +++ /dev/null @@ -1,20 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.UserInterface -{ - [PacketHeader("bsinfo")] - public class BSInfoPacket : PacketBase - { - [PacketIndex(0)] - public byte Mode { get; set; } - - [PacketIndex(1)] - public short Title { get; set; } - - [PacketIndex(2)] - public short Time { get; set; } - - [PacketIndex(3)] - public short Text { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/UserInterface/ChdmPacket.cs b/src/ChickenAPI.Packets/Game/Server/UserInterface/ChdmPacket.cs deleted file mode 100644 index 84141ea8..00000000 --- a/src/ChickenAPI.Packets/Game/Server/UserInterface/ChdmPacket.cs +++ /dev/null @@ -1,20 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.UserInterface -{ - [PacketHeader("ch_dm")] - public class ChDMPacket : PacketBase - { - [PacketIndex(0)] - public int Maxhp { get; set; } - - [PacketIndex(1)] - public int AngelDMG { get; set; } - - [PacketIndex(2)] - public int DemonDMG { get; set; } - - [PacketIndex(3)] - public int Time { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/UserInterface/DelayPacket.cs b/src/ChickenAPI.Packets/Game/Server/UserInterface/DelayPacket.cs deleted file mode 100644 index a484b7cc..00000000 --- a/src/ChickenAPI.Packets/Game/Server/UserInterface/DelayPacket.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ChickenAPI.Enums.Packets; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.UserInterface -{ - [PacketHeader("delay")] - public class DelayPacket : PacketBase - { - [PacketIndex(0)] - public int Delay { get; set; } - - [PacketIndex(1)] - public DelayPacketType Type { get; set; } - - [PacketIndex(2)] - public string Argument { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/UserInterface/DialogPacket.cs b/src/ChickenAPI.Packets/Game/Server/UserInterface/DialogPacket.cs deleted file mode 100644 index 281e0c2d..00000000 --- a/src/ChickenAPI.Packets/Game/Server/UserInterface/DialogPacket.cs +++ /dev/null @@ -1,17 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.UserInterface -{ - [PacketHeader("dlg")] - public class DialogPacket : PacketBase - { - [PacketIndex(0, IsReturnPacket = true)] - public PacketBase AcceptPacket { get; set; } - - [PacketIndex(1, IsReturnPacket = true)] - public PacketBase RefusePacket { get; set; } - - [PacketIndex(2, SerializeToEnd = true)] - public string Question { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/UserInterface/GuriPacket.cs b/src/ChickenAPI.Packets/Game/Server/UserInterface/GuriPacket.cs deleted file mode 100644 index 0b264612..00000000 --- a/src/ChickenAPI.Packets/Game/Server/UserInterface/GuriPacket.cs +++ /dev/null @@ -1,21 +0,0 @@ -using ChickenAPI.Enums.Packets; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.UserInterface -{ - [PacketHeader("guri")] - public class GuriPacket : PacketBase - { - [PacketIndex(0)] - public GuriPacketType Type { get; set; } - - [PacketIndex(1)] - public uint Unknown { get; set; } // seems to be a visual type or something - - [PacketIndex(2)] - public long EntityId { get; set; } - - [PacketIndex(3)] - public uint Value { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/UserInterface/InfoPacket.cs b/src/ChickenAPI.Packets/Game/Server/UserInterface/InfoPacket.cs deleted file mode 100644 index 2be5e66d..00000000 --- a/src/ChickenAPI.Packets/Game/Server/UserInterface/InfoPacket.cs +++ /dev/null @@ -1,11 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.UserInterface -{ - [PacketHeader("info")] - public class InfoPacket : PacketBase - { - [PacketIndex(0)] - public string Message { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/UserInterface/ModalPacket.cs b/src/ChickenAPI.Packets/Game/Server/UserInterface/ModalPacket.cs deleted file mode 100644 index b846735f..00000000 --- a/src/ChickenAPI.Packets/Game/Server/UserInterface/ModalPacket.cs +++ /dev/null @@ -1,15 +0,0 @@ -using ChickenAPI.Enums.Packets; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.UserInterface -{ - [PacketHeader("modal")] - public class ModalPacket : PacketBase - { - [PacketIndex(0)] - public ModalPacketType Type { get; set; } // TODO : Create An enum - - [PacketIndex(1)] - public string Message { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/UserInterface/MsgPacket.cs b/src/ChickenAPI.Packets/Game/Server/UserInterface/MsgPacket.cs deleted file mode 100644 index ffb29d5b..00000000 --- a/src/ChickenAPI.Packets/Game/Server/UserInterface/MsgPacket.cs +++ /dev/null @@ -1,15 +0,0 @@ -using ChickenAPI.Enums.Packets; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.UserInterface -{ - [PacketHeader("msg")] - public class MsgPacket : PacketBase - { - [PacketIndex(0)] - public MsgPacketType Type { get; set; } - - [PacketIndex(1, SerializeToEnd = true)] - public string Message { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/UserInterface/PClearPacket.cs b/src/ChickenAPI.Packets/Game/Server/UserInterface/PClearPacket.cs deleted file mode 100644 index 77d41a4f..00000000 --- a/src/ChickenAPI.Packets/Game/Server/UserInterface/PClearPacket.cs +++ /dev/null @@ -1,9 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.UserInterface -{ - [PacketHeader("p_clear")] - public class PClearPacket : PacketBase - { - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/UserInterface/QnaPacket.cs b/src/ChickenAPI.Packets/Game/Server/UserInterface/QnaPacket.cs deleted file mode 100644 index 3f3e68b8..00000000 --- a/src/ChickenAPI.Packets/Game/Server/UserInterface/QnaPacket.cs +++ /dev/null @@ -1,14 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.UserInterface -{ - [PacketHeader("qna")] - public class QnaPacket : PacketBase - { - [PacketIndex(0, IsReturnPacket = true)] - public PacketBase AcceptPacket { get; set; } - - [PacketIndex(1, SerializeToEnd = true)] - public string Question { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/UserInterface/ZzimPacket.cs b/src/ChickenAPI.Packets/Game/Server/UserInterface/ZzimPacket.cs deleted file mode 100644 index 5bbbf08c..00000000 --- a/src/ChickenAPI.Packets/Game/Server/UserInterface/ZzimPacket.cs +++ /dev/null @@ -1,9 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.UserInterface -{ - [PacketHeader("zzim")] - public class ZzimPacket : PacketBase - { - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Visibility/InAliveSubPacketBase.cs b/src/ChickenAPI.Packets/Game/Server/Visibility/InAliveSubPacketBase.cs deleted file mode 100644 index 0da0d1ee..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Visibility/InAliveSubPacketBase.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Visibility -{ - [PacketHeader("in_alive_subpacket")] - public class InAliveSubPacketBase : PacketBase - { - #region Properties - - [PacketIndex(0)] - public byte HpPercentage { get; set; } - - [PacketIndex(1)] - public byte MpPercentage { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Visibility/InCharacterSubPacketBase.cs b/src/ChickenAPI.Packets/Game/Server/Visibility/InCharacterSubPacketBase.cs deleted file mode 100644 index d6df5df2..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Visibility/InCharacterSubPacketBase.cs +++ /dev/null @@ -1,107 +0,0 @@ -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Packets.Attributes; -using ChickenAPI.Packets.Game.Server.Inventory; - -namespace ChickenAPI.Packets.Game.Server.Visibility -{ - [PacketHeader("in_character_subpacket")] - public class InCharacterSubPacketBase : PacketBase - { - #region Properties - - [PacketIndex(0)] - public CharacterNameAppearance NameAppearance { get; set; } - - [PacketIndex(1)] - public GenderType Gender { get; set; } - - [PacketIndex(2)] - public HairStyleType HairStyle { get; set; } - - [PacketIndex(3)] - public HairColorType HairColor { get; set; } - - [PacketIndex(4)] - public CharacterClassType Class { get; set; } - - [PacketIndex(5, IsOptional = true)] - public InventoryWearSubPacket Equipment { get; set; } - - [PacketIndex(6)] - public byte HpPercentage { get; set; } - - [PacketIndex(7)] - public byte MpPercentage { get; set; } - - [PacketIndex(8)] - public bool IsSitting { get; set; } - - [PacketIndex(9)] - public long GroupId { get; set; } - - [PacketIndex(10)] - public byte FairyId { get; set; } - - [PacketIndex(11)] - public byte FairyElement { get; set; } - - [PacketIndex(12)] - public byte IsBoostedFairy { get; set; } - - [PacketIndex(13)] - public short FairyMorph { get; set; } - - [PacketIndex(14)] - public byte EntryType { get; set; } - - [PacketIndex(15)] - public long Morph { get; set; } - - [PacketIndex(16)] - public string WeaponRareAndUpgradeInfo { get; set; } - - [PacketIndex(17)] - public string ArmorRareAndUpgradeInfo { get; set; } - - [PacketIndex(18)] - public long FamilyId { get; set; } - - [PacketIndex(19)] - public string FamilyName { get; set; } - - [PacketIndex(20)] - public CharacterRep ReputationIcon { get; set; } - - [PacketIndex(21)] - public bool Invisible { get; set; } - - [PacketIndex(22)] - public long SpUpgrade { get; set; } - - [PacketIndex(23)] - public FactionType Faction { get; set; } - - [PacketIndex(24)] - public long SpDesign { get; set; } - - [PacketIndex(25)] - public byte Level { get; set; } - - [PacketIndex(26)] - public byte FamilyLevel { get; set; } - - [PacketIndex(27)] - public bool ArenaWinner { get; set; } - - [PacketIndex(28)] - public int Compliment { get; set; } - - [PacketIndex(29)] - public short Size { get; set; } - - [PacketIndex(30)] - public short HeroLevel { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Visibility/InItemSubPacketBase.cs b/src/ChickenAPI.Packets/Game/Server/Visibility/InItemSubPacketBase.cs deleted file mode 100644 index 729b151f..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Visibility/InItemSubPacketBase.cs +++ /dev/null @@ -1,21 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Visibility -{ - [PacketHeader("in_item_subpacket")] - public class InItemSubPacketBase : PacketBase - { - #region Properties - - [PacketIndex(0)] - public short Unknown { get; set; } - - [PacketIndex(1)] - public short Unknown1 { get; set; } - - [PacketIndex(2)] - public short Unknown2 { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Visibility/InMateSubPacket.cs b/src/ChickenAPI.Packets/Game/Server/Visibility/InMateSubPacket.cs deleted file mode 100644 index 0fbfa7be..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Visibility/InMateSubPacket.cs +++ /dev/null @@ -1,69 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Visibility -{ - [PacketHeader("in_mate_subpacket")] - public class InMateSubPacket : PacketBase - { - #region Properties - - [PacketIndex(0)] - public int HpPercentage { get; set; } - - [PacketIndex(1)] - public int MpPercentage { get; set; } - - [PacketIndex(2)] - public int Unknow { get; set; } - - [PacketIndex(3)] - public int Faction { get; set; } - - [PacketIndex(4)] - public int Unknow2 { get; set; } - - [PacketIndex(5)] - public long OwnerId { get; set; } - - [PacketIndex(6)] - public int Unknow3 { get; set; } - - [PacketIndex(7)] - public int Unknow4 { get; set; } - - [PacketIndex(8)] - public int Morph { get; set; } - - [PacketIndex(9)] - public string Name { get; set; } - - [PacketIndex(10)] - public byte MateType { get; set; } - - [PacketIndex(11)] - public byte Unknow5 { get; set; } - - [PacketIndex(12)] - public byte Unknow6 { get; set; } - - [PacketIndex(13)] - public long SPSkill1 { get; set; } - - [PacketIndex(14)] - public long SPSkill2 { get; set; } - - [PacketIndex(15)] - public long SPSkill3 { get; set; } - - [PacketIndex(16)] - public long SPRank1 { get; set; } - - [PacketIndex(17)] - public long SPRank2 { get; set; } - - [PacketIndex(18)] - public long SPRank3 { get; set; } - - #endregion Properties - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Visibility/InMonsterSubPacket.cs b/src/ChickenAPI.Packets/Game/Server/Visibility/InMonsterSubPacket.cs deleted file mode 100644 index a01cd5a9..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Visibility/InMonsterSubPacket.cs +++ /dev/null @@ -1,68 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Visibility -{ - [PacketHeader("in_monster_subpacket")] - public class InMonsterSubPacket : PacketBase - { - [PacketIndex(0)] - public byte HpPercentage { get; set; } - - [PacketIndex(1)] - public byte MpPercentage { get; set; } - - [PacketIndex(2)] - public int Unknown1 { get; set; } - - [PacketIndex(3)] - public int Unknown2 { get; set; } - - [PacketIndex(4)] - public int Unknown3 { get; set; } - - [PacketIndex(5)] - public int Unknown4 { get; set; } - - [PacketIndex(6)] - public bool NoAggressiveIcon { get; set; } - - [PacketIndex(7)] - public int Unknown5 { get; set; } - - [PacketIndex(8)] - public int Unknown6 { get; set; } - - [PacketIndex(9)] - public string Unknown7 { get; set; } - - [PacketIndex(10)] - public int Unknown8 { get; set; } - - [PacketIndex(11)] - public int Unknown9 { get; set; } - - [PacketIndex(12)] - public int Unknown10 { get; set; } - - [PacketIndex(13)] - public int Unknown11 { get; set; } - - [PacketIndex(14)] - public int Unknown12 { get; set; } - - [PacketIndex(15)] - public int Unknown13 { get; set; } - - [PacketIndex(16)] - public int Unknown14 { get; set; } - - [PacketIndex(17)] - public int Unknown15 { get; set; } - - [PacketIndex(18)] - public int Unknown16 { get; set; } - - [PacketIndex(19)] - public int Unknown17 { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Visibility/InNonPlayerSubPacketBase.cs b/src/ChickenAPI.Packets/Game/Server/Visibility/InNonPlayerSubPacketBase.cs deleted file mode 100644 index 9f9509ef..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Visibility/InNonPlayerSubPacketBase.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Visibility -{ - [PacketHeader("in_non_player_subpacket")] - public class InNonPlayerSubPacketBase : PacketBase - { - #region Properties - - [PacketIndex(0)] - public short Dialog { get; set; } - - [PacketIndex(1)] - public byte Unknown { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Visibility/InNpcSubPacket.cs b/src/ChickenAPI.Packets/Game/Server/Visibility/InNpcSubPacket.cs deleted file mode 100644 index f8fbcec6..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Visibility/InNpcSubPacket.cs +++ /dev/null @@ -1,68 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Visibility -{ - [PacketHeader("in_npc_subpacket")] - public class InNpcSubPacket : PacketBase - { - [PacketIndex(0)] - public byte HpPercentage { get; set; } - - [PacketIndex(1)] - public byte MpPercentage { get; set; } - - [PacketIndex(2)] - public int Dialog { get; set; } - - [PacketIndex(3)] - public int Unknown1 { get; set; } - - [PacketIndex(4)] - public int Unknown2 { get; set; } - - [PacketIndex(5)] - public int Unknown3 { get; set; } - - [PacketIndex(6)] - public int Unknown4 { get; set; } - - [PacketIndex(7)] - public bool IsSitting { get; set; } - - [PacketIndex(8)] - public int Unknown5 { get; set; } - - [PacketIndex(9)] - public string Unknown6 { get; set; } - - [PacketIndex(10)] - public int Unknown7 { get; set; } - - [PacketIndex(11)] - public int Unknown8 { get; set; } - - [PacketIndex(12)] - public int Unknown9 { get; set; } - - [PacketIndex(13)] - public int Unknown10 { get; set; } - - [PacketIndex(14)] - public int Unknown11 { get; set; } - - [PacketIndex(15)] - public int Unknown12 { get; set; } - - [PacketIndex(16)] - public int Unknown13 { get; set; } - - [PacketIndex(17)] - public int Unknown14 { get; set; } - - [PacketIndex(18)] - public int Unknown15 { get; set; } - - [PacketIndex(19)] - public int Unknown16 { get; set; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Visibility/InOwnableSubPacketBase.cs b/src/ChickenAPI.Packets/Game/Server/Visibility/InOwnableSubPacketBase.cs deleted file mode 100644 index aed87337..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Visibility/InOwnableSubPacketBase.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Visibility -{ - [PacketHeader("in_ownable_subpacket")] - public class InOwnableSubPacketBase : PacketBase - { - #region Properties - - [PacketIndex(0)] - public short? Unknown { get; set; } - - [PacketIndex(1)] - public long Owner { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/Game/Server/Visibility/InPacket.cs b/src/ChickenAPI.Packets/Game/Server/Visibility/InPacket.cs deleted file mode 100644 index 57b3a53a..00000000 --- a/src/ChickenAPI.Packets/Game/Server/Visibility/InPacket.cs +++ /dev/null @@ -1,52 +0,0 @@ -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Packets.Attributes; - -namespace ChickenAPI.Packets.Game.Server.Visibility -{ - [PacketHeader("in")] - public class InPacket : PacketBase - { - #region Properties - - [PacketIndex(0)] - public VisualType VisualType { get; set; } - - [PacketIndex(1, IsOptional = true)] - public string Name { get; set; } - - [PacketIndex(2)] - public string TransportId { get; set; } - - [PacketIndex(3, IsOptional = true)] - public long? VNum { get; set; } - - [PacketIndex(4)] - public short PositionX { get; set; } - - [PacketIndex(5)] - public short PositionY { get; set; } - - [PacketIndex(6, IsOptional = true)] - public DirectionType DirectionType { get; set; } - - [PacketIndex(7, IsOptional = true)] - public long? Amount { get; set; } - - [PacketIndex(8, IsOptional = true, RemoveSeparator = true)] - public InMonsterSubPacket InMonsterSubPacket { get; set; } - - [PacketIndex(9, IsOptional = true, RemoveSeparator = true)] - public InCharacterSubPacketBase InCharacterSubPacket { get; set; } - - [PacketIndex(10, IsOptional = true, RemoveSeparator = true)] - public InNpcSubPacket InNpcSubPacket { get; set; } - - [PacketIndex(10, IsOptional = true, RemoveSeparator = true)] - public InItemSubPacketBase InDropSubPacket { get; set; } - - [PacketIndex(10, IsOptional = true, RemoveSeparator = true)] - public InMateSubPacket InMateSubPacket { get; set; } - - #endregion Properties - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/IPacket.cs b/src/ChickenAPI.Packets/IPacket.cs deleted file mode 100644 index ea10b095..00000000 --- a/src/ChickenAPI.Packets/IPacket.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; - -namespace ChickenAPI.Packets -{ - public interface IPacket - { - /// - /// Packet's sent date - /// always set UTC time - /// - DateTime SentDateUtc { get; } - - Type PacketType { get; } - - /// - /// Packet's header - /// - string Header { get; } - - /// - /// Packet's content without its header - /// - string Content { get; } - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/IPacketFactory.cs b/src/ChickenAPI.Packets/IPacketFactory.cs deleted file mode 100644 index dab147c8..00000000 --- a/src/ChickenAPI.Packets/IPacketFactory.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; - -namespace ChickenAPI.Packets -{ - public interface IPacketFactory - { - string Serialize(IPacket packet); - - string Serialize(TPacket packet) where TPacket : IPacket; - - IPacket Deserialize(string packetContent, Type packetType, bool includesKeepAliveIdentity); - } -} \ No newline at end of file diff --git a/src/ChickenAPI.Packets/PacketBase.cs b/src/ChickenAPI.Packets/PacketBase.cs deleted file mode 100644 index 0d796ecd..00000000 --- a/src/ChickenAPI.Packets/PacketBase.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; - -namespace ChickenAPI.Packets -{ - public abstract class PacketBase : IPacket - { - #region Properties - - public DateTime SentDateUtc { get; set; } - public Type PacketType { get; set; } - public string Header { get; set; } - - // get the packet without the sessionId - public string Content => OriginalContent.Substring(OriginalContent.IndexOf(' ')); - - /// - /// - public string OriginalContent { get; set; } - - #endregion - } -} \ No newline at end of file diff --git a/src/Login/Cryptography/Decoder/NostaleLoginDecoder.cs b/src/Login/Cryptography/Decoder/NostaleLoginDecoder.cs index bcee8057..efacff04 100644 --- a/src/Login/Cryptography/Decoder/NostaleLoginDecoder.cs +++ b/src/Login/Cryptography/Decoder/NostaleLoginDecoder.cs @@ -10,8 +10,6 @@ namespace Login.Cryptography.Decoder { public class NostaleLoginDecoder : MessageToMessageDecoder, IDecoder { - private static readonly Logger Log = Logger.GetLogger(); - protected override void Decode(IChannelHandlerContext context, IByteBuffer message, List output) { try @@ -29,7 +27,7 @@ protected override void Decode(IChannelHandlerContext context, IByteBuffer messa } catch (Exception e) { - Log.Error("[DECODE]", e); + // Log.Error("[DECODE]", e); } } } diff --git a/src/Login/Cryptography/Encoder/NostaleLoginEncoder.cs b/src/Login/Cryptography/Encoder/NostaleLoginEncoder.cs index d0cde3fe..b3484eac 100644 --- a/src/Login/Cryptography/Encoder/NostaleLoginEncoder.cs +++ b/src/Login/Cryptography/Encoder/NostaleLoginEncoder.cs @@ -10,7 +10,7 @@ namespace Login.Cryptography.Encoder { public class NostaleLoginEncoder : MessageToMessageEncoder, IEncoder { - private static readonly Logger Log = Logger.GetLogger(); + // private static readonly Logger Log = Logger.GetLogger(); protected override void Encode(IChannelHandlerContext context, string message, List output) { @@ -33,7 +33,7 @@ protected override void Encode(IChannelHandlerContext context, string message, L } catch (Exception e) { - Log.Error("[ENCODE]", e); + // Log.Error("[ENCODE]", e); } } } diff --git a/src/Login/IoCPluginManager.cs b/src/Login/IoCPluginManager.cs new file mode 100644 index 00000000..3ef37c95 --- /dev/null +++ b/src/Login/IoCPluginManager.cs @@ -0,0 +1,73 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Reflection; +using Autofac; +using ChickenAPI.Core.Logging; +using ChickenAPI.Core.Plugins; + +namespace Login +{ + public class IoCPluginManager + { + private readonly ILogger _log; + + public IoCPluginManager(ILogger log) + { + _log = log; + } + + private bool PluginMatcher(Type type) + { + return !type.IsInterface && !type.IsAbstract && type.GetInterface(typeof(IPlugin).FullName) != null; + } + + public void RegisterPlugins(Assembly assembly, ContainerBuilder builder) + { + builder.RegisterTypes(assembly.GetTypes().Where(PluginMatcher).ToArray()).AsImplementedInterfaces().AsSelf().InstancePerDependency(); + } + + public void RegisterPlugins(FileInfo file, ContainerBuilder builder) + { + try + { + if (file == null) + { + throw new ArgumentNullException(nameof(file)); + } + + Assembly assembly = Assembly.LoadFrom(file.FullName); + + if (assembly == null) + { + return; + } + + RegisterPlugins(assembly, builder); + } + catch (Exception e) + { + _log.Error("Register plugins", e); + } + } + + public void RegisterPlugins(DirectoryInfo directory, ContainerBuilder builder) + { + if (directory == null) + { + throw new ArgumentNullException(nameof(directory)); + } + + if (directory.Exists) + { + foreach (FileInfo dynamicLibrary in directory.GetFiles("*.dll")) + { + RegisterPlugins(dynamicLibrary, builder); + } + } + + directory.Create(); + } + } +} \ No newline at end of file diff --git a/src/Login/Login.csproj b/src/Login/Login.csproj index 137f175e..0eb13c94 100644 --- a/src/Login/Login.csproj +++ b/src/Login/Login.csproj @@ -25,12 +25,13 @@ - - + + + diff --git a/src/Login/LoginServer.cs b/src/Login/LoginServer.cs index 3127ddf5..d102dda4 100644 --- a/src/Login/LoginServer.cs +++ b/src/Login/LoginServer.cs @@ -9,6 +9,7 @@ using ChickenAPI.Data.Server; using Login.Cryptography.Factories; using Login.Network; +using SaltyEmu.Core.Logging; using SaltyEmu.DatabasePlugin; using SaltyEmu.RedisWrappers; @@ -16,8 +17,7 @@ namespace Login { internal class LoginServer { - private static readonly Logger Log = Logger.GetLogger(); - private static readonly IPluginManager PluginManager = new SimplePluginManager(); + private static readonly ILogger Log = Logger.GetLogger(); private static ushort _port; @@ -42,6 +42,7 @@ private static void PrintHeader() private static void InitializeLogger() { + ChickenContainer.Builder.Register(s => Logger.GetLogger(s.GetType())).As().InstancePerDependency(); Logger.Initialize(); } @@ -61,18 +62,14 @@ private static void InitializePlugins() { try { - IPlugin[] plugins = PluginManager.LoadPlugins(new DirectoryInfo("plugins")); - var dbPlugin = new DatabasePlugin(); + new IoCPluginManager(Logger.GetLogger()).RegisterPlugins(new DirectoryInfo("plugins"), ChickenContainer.Builder); + var dbPlugin = new DatabasePlugin(Logger.GetLogger()); dbPlugin.OnLoad(); - var redisPlugin = new RedisPlugin(); + var redisPlugin = new RedisPlugin(Logger.GetLogger()); redisPlugin.OnLoad(); dbPlugin.OnEnable(); redisPlugin.OnEnable(); - - if (plugins == null) - { - } } catch (Exception e) { @@ -86,7 +83,6 @@ private static void Main(string[] args) InitializeLogger(); InitializeConfiguration(); InitializePlugins(); - ChickenContainer.Builder.Register(s => PluginManager).As(); ChickenContainer.Initialize(); ClientSession.AccountService = ChickenContainer.Instance.Resolve(); ClientSession.ServerApi = ChickenContainer.Instance.Resolve(); diff --git a/src/Login/Network/ClientSession.cs b/src/Login/Network/ClientSession.cs index 47cd5e23..25bb6c28 100644 --- a/src/Login/Network/ClientSession.cs +++ b/src/Login/Network/ClientSession.cs @@ -5,9 +5,9 @@ using ChickenAPI.Core.Logging; using ChickenAPI.Data.Account; using ChickenAPI.Data.Character; +using ChickenAPI.Data.Enums; +using ChickenAPI.Data.Enums.Game; using ChickenAPI.Data.Server; -using ChickenAPI.Enums; -using ChickenAPI.Enums.Game; using DotNetty.Transport.Channels; using DotNetty.Transport.Channels.Groups; using DotNetty.Transport.Channels.Sockets; @@ -16,7 +16,7 @@ namespace Login.Network { public class ClientSession : ChannelHandlerAdapter { - public static readonly Logger Log = Logger.GetLogger(); + public readonly ILogger Log; public static ISessionService SessionService; public static IAccountService AccountService; public static IServerApiService ServerApi; @@ -26,9 +26,10 @@ public class ClientSession : ChannelHandlerAdapter private readonly IChannel _channel; private IPEndPoint _endPoint; - public ClientSession(IChannel channel) + public ClientSession(IChannel channel, ILogger log) { _channel = channel; + Log = log; } public override void ChannelRegistered(IChannelHandlerContext context) diff --git a/src/Login/Network/NetworkManager.cs b/src/Login/Network/NetworkManager.cs index 50169a84..c930828d 100644 --- a/src/Login/Network/NetworkManager.cs +++ b/src/Login/Network/NetworkManager.cs @@ -1,6 +1,8 @@ using System; using System.Threading; using System.Threading.Tasks; +using Autofac; +using ChickenAPI.Core.IoC; using ChickenAPI.Core.Logging; using DotNetty.Buffers; using DotNetty.Codecs; @@ -13,7 +15,7 @@ namespace Login.Network { public class NetworkManager { - public static readonly Logger Log = Logger.GetLogger(); + // public static readonly Logger Log = Logger.GetLogger(); public static async Task RunServerAsync(int port, IPacketCryptoFactory factory) { @@ -32,13 +34,13 @@ public static async Task RunServerAsync(int port, IPacketCryptoFactory factory) IChannelPipeline pipeline = channel.Pipeline; pipeline.AddLast("encoder", (MessageToMessageEncoder)factory.GetEncoder()); pipeline.AddLast("decoder", (MessageToMessageDecoder)factory.GetDecoder()); - pipeline.AddLast("session", new ClientSession(channel)); + pipeline.AddLast("session", new ClientSession(channel, ChickenContainer.Instance.Resolve())); })); IChannel bootstrapChannel = await bootstrap.BindAsync(port).ConfigureAwait(false); - Log.Info($"[LISTENING] Server is listening"); - Log.Info($"-> PORT : {port}"); + // Log.Info($"[LISTENING] Server is listening"); + // Log.Info($"-> PORT : {port}"); while (Console.ReadLine() != "quit") { @@ -49,7 +51,7 @@ public static async Task RunServerAsync(int port, IPacketCryptoFactory factory) } catch (Exception ex) { - Log.Error("[SERVER]", ex); + // Log.Error("[SERVER]", ex); } finally { diff --git a/src/Login/SimplePluginManager.cs b/src/Login/SimplePluginManager.cs deleted file mode 100644 index e2d69daf..00000000 --- a/src/Login/SimplePluginManager.cs +++ /dev/null @@ -1,75 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Reflection; -using ChickenAPI.Core.Logging; -using ChickenAPI.Core.Plugins; - -namespace Login -{ - public class SimplePluginManager : IPluginManager - { - private static readonly Logger Log = Logger.GetLogger(); - - public IPlugin[] LoadPlugin(FileInfo file) - { - try - { - if (file == null) - { - throw new ArgumentNullException(nameof(file)); - } - - Assembly assembly = Assembly.LoadFrom(file.FullName); - - if (assembly == null) - { - return null; - } - - Type[] types = assembly.GetTypes(); - Type pluginType = typeof(IPlugin); - ICollection pluginTypes = types.Where(type => !type.IsInterface && !type.IsAbstract && type.GetInterface(pluginType.FullName) != null).ToArray(); - ICollection plugins = new List(pluginTypes.Count); - foreach (Type type in pluginTypes) - { - var plugin = (IPlugin)Activator.CreateInstance(type); - Log.Info($"{plugin.Name} Loaded !"); - plugins.Add(plugin); - } - - return plugins.ToArray(); - } - catch - { - return null; - } - } - - public IPlugin[] LoadPlugins(DirectoryInfo directory) - { - if (directory == null) - { - throw new ArgumentNullException(nameof(directory)); - } - - if (directory.Exists) - { - return directory.GetFiles("*.dll").SelectMany(s => - { - IPlugin[] tmp = LoadPlugin(s); - - return tmp; - }).Where(s => s != null).ToArray(); - } - - directory.Create(); - return null; - } - - public DirectoryInfo GetPluginDirectory() => null; - - public DirectoryInfo GetConfigDirectory() => null; - } -} \ No newline at end of file diff --git a/src/Plugins/Essentials/Character/CharacterModule.cs b/src/Plugins/Essentials/Character/CharacterModule.cs index adfb92f6..fe558587 100644 --- a/src/Plugins/Essentials/Character/CharacterModule.cs +++ b/src/Plugins/Essentials/Character/CharacterModule.cs @@ -3,18 +3,17 @@ using Autofac; using ChickenAPI.Core.IoC; using ChickenAPI.Data.Character; +using ChickenAPI.Data.Enums; using ChickenAPI.Data.Item; -using ChickenAPI.Enums; -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; using ChickenAPI.Game.Helpers; using ChickenAPI.Game.Inventory.Extensions; +using ChickenAPI.Packets.Enumerations; using Qmmands; using SaltyEmu.Commands.Checks; using SaltyEmu.Commands.Entities; +using EquipmentType = ChickenAPI.Data.Enums.Game.Items.EquipmentType; namespace Essentials.Character { diff --git a/src/Plugins/Essentials/Essentials.csproj b/src/Plugins/Essentials/Essentials.csproj index b96e1b78..5db9c06f 100644 --- a/src/Plugins/Essentials/Essentials.csproj +++ b/src/Plugins/Essentials/Essentials.csproj @@ -5,7 +5,10 @@ - + + + + diff --git a/src/Plugins/Essentials/EssentialsPlugin.cs b/src/Plugins/Essentials/EssentialsPlugin.cs index 9e7e2f60..316f06fb 100644 --- a/src/Plugins/Essentials/EssentialsPlugin.cs +++ b/src/Plugins/Essentials/EssentialsPlugin.cs @@ -16,7 +16,6 @@ namespace Essentials { public class EssentialsPlugin : IPlugin { - private static readonly Logger Log = Logger.GetLogger(); public PluginEnableTime EnableTime => PluginEnableTime.PostContainerBuild; public string Name => "Essentials"; @@ -58,7 +57,7 @@ private static Task RegisterCommands(ICommandContainer container) } catch (Exception e) { - Log.Debug(e.StackTrace); + // Log.Debug(e.StackTrace); } return Task.CompletedTask; @@ -73,7 +72,7 @@ private static async Task UnregisterCommands() } catch (Exception e) { - Log.Debug(e.StackTrace); + // Log.Debug(e.StackTrace); } } diff --git a/src/Plugins/Essentials/Help/HelpModule.cs b/src/Plugins/Essentials/Help/HelpModule.cs index 06aa32c4..e3fbe467 100644 --- a/src/Plugins/Essentials/Help/HelpModule.cs +++ b/src/Plugins/Essentials/Help/HelpModule.cs @@ -1,11 +1,11 @@ -using ChickenAPI.Enums.Packets; -using Qmmands; +using Qmmands; using SaltyEmu.Commands.Entities; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using ChickenAPI.Game.Helpers; +using ChickenAPI.Packets.Enumerations; namespace Essentials.Help { diff --git a/src/Plugins/Essentials/Item/ItemModule.cs b/src/Plugins/Essentials/Item/ItemModule.cs index e1e46bf2..806ea5a9 100644 --- a/src/Plugins/Essentials/Item/ItemModule.cs +++ b/src/Plugins/Essentials/Item/ItemModule.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; using Autofac; using ChickenAPI.Core.IoC; +using ChickenAPI.Data.Enums; using ChickenAPI.Data.Item; -using ChickenAPI.Enums; using ChickenAPI.Game.Inventory.Events; using Qmmands; using SaltyEmu.Commands.Checks; diff --git a/src/Plugins/Essentials/MapManagement/ButcherModule.cs b/src/Plugins/Essentials/MapManagement/ButcherModule.cs index d490e2a5..b98a5c89 100644 --- a/src/Plugins/Essentials/MapManagement/ButcherModule.cs +++ b/src/Plugins/Essentials/MapManagement/ButcherModule.cs @@ -1,14 +1,13 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using ChickenAPI.Data.Enums; using ChickenAPI.Data.Skills; -using ChickenAPI.Enums; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game.Battle.Extensions; using ChickenAPI.Game.Battle.Hitting; using ChickenAPI.Game.Battle.Interfaces; using ChickenAPI.Game.Entities.Monster; +using ChickenAPI.Packets.Enumerations; using Qmmands; using SaltyEmu.Commands.Checks; using SaltyEmu.Commands.Entities; diff --git a/src/Plugins/Essentials/Teleport/TeleportModule.cs b/src/Plugins/Essentials/Teleport/TeleportModule.cs index 1b8ec8b1..6bab729b 100644 --- a/src/Plugins/Essentials/Teleport/TeleportModule.cs +++ b/src/Plugins/Essentials/Teleport/TeleportModule.cs @@ -1,10 +1,10 @@ -using ChickenAPI.Enums; -using ChickenAPI.Game.Entities.Player; +using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Helpers; using Qmmands; using SaltyEmu.Commands.Checks; using SaltyEmu.Commands.Entities; using System.Threading.Tasks; +using ChickenAPI.Data.Enums; using ChickenAPI.Game._ECS.Entities; namespace Essentials.Teleport diff --git a/src/Plugins/NosSharp.BasicAlgorithm/AlgorithmService.cs b/src/Plugins/NosSharp.BasicAlgorithm/AlgorithmService.cs index 04cb56d2..d5439796 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/AlgorithmService.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/AlgorithmService.cs @@ -1,5 +1,5 @@ using ChickenAPI.Data.Character; -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; using SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms; using SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.Close; using SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.Damage; diff --git a/src/Plugins/NosSharp.BasicAlgorithm/BasicAlgorithmPlugin.cs b/src/Plugins/NosSharp.BasicAlgorithm/BasicAlgorithmPlugin.cs index c28da9f4..0a430eb4 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/BasicAlgorithmPlugin.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/BasicAlgorithmPlugin.cs @@ -7,7 +7,7 @@ namespace SaltyEmu.BasicAlgorithmPlugin { public class BasicAlgorithmPlugin : IPlugin { - private static readonly Logger Log = Logger.GetLogger(); + // private static readonly Logger Log = Logger.GetLogger(); public PluginEnableTime EnableTime => PluginEnableTime.PreContainerBuild; public string Name => nameof(BasicAlgorithmPlugin); @@ -21,9 +21,9 @@ public void OnEnable() public void OnLoad() { - Log.Info("Loading..."); + // Log.Info("Loading..."); AlgorithmDependenciesInjector.InjectDependencies(); - Log.Info("Algorithms initialized"); + // Log.Info("Algorithms initialized"); } public void ReloadConfig() diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Close/CloseDefenceAlgorithm.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Close/CloseDefenceAlgorithm.cs index cdb669ed..8e93bfb9 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Close/CloseDefenceAlgorithm.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Close/CloseDefenceAlgorithm.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.Close { @@ -9,7 +9,7 @@ public class CloseDefenceAlgorithm : ICharacterStatAlgorithm public void Initialize() { - _stats = new int[(int)CharacterClassType.Unknown, MAX_LEVEL]; + _stats = new int[(int)CharacterClassType.MartialArtist + 1, MAX_LEVEL]; for (int i = 0; i < MAX_LEVEL; i++) @@ -18,7 +18,7 @@ public void Initialize() _stats[(int)CharacterClassType.Swordman, i] = i + 2; // approx _stats[(int)CharacterClassType.Magician, i] = (i + 11) / 2; // approx _stats[(int)CharacterClassType.Archer, i] = i; // approx - _stats[(int)CharacterClassType.Wrestler, i] = i + 2; // approx + _stats[(int)CharacterClassType.MartialArtist, i] = i + 2; // approx } } diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Close/CloseDodgeAlgorithm.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Close/CloseDodgeAlgorithm.cs index 72c7bc94..c5872260 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Close/CloseDodgeAlgorithm.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Close/CloseDodgeAlgorithm.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.Close { @@ -9,7 +9,7 @@ public class CloseDodgeAlgorithm : ICharacterStatAlgorithm public void Initialize() { - _stats = new int[(int)CharacterClassType.Unknown, MAX_LEVEL]; + _stats = new int[(int)CharacterClassType.MartialArtist + 1, MAX_LEVEL]; for (int i = 0; i < MAX_LEVEL; i++) @@ -18,7 +18,7 @@ public void Initialize() _stats[(int)CharacterClassType.Swordman, i] = i + 12; // approx _stats[(int)CharacterClassType.Magician, i] = i + 24; // approx _stats[(int)CharacterClassType.Archer, i] = i + 41; // approx - _stats[(int)CharacterClassType.Wrestler, i] = i + 12; // approx + _stats[(int)CharacterClassType.MartialArtist, i] = i + 12; // approx } } diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/CriticalDistAlgorithm.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/CriticalDistAlgorithm.cs index 949cf2fb..eeccd36c 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/CriticalDistAlgorithm.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/CriticalDistAlgorithm.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.Damage { @@ -9,7 +9,7 @@ public class CriticalDistAlgorithm : ICharacterStatAlgorithm public void Initialize() { - _criticalDist = new int[(int)CharacterClassType.Unknown, MAX_LEVEL]; + _criticalDist = new int[(int)CharacterClassType.MartialArtist + 1, MAX_LEVEL]; for (int i = 0; i < MAX_LEVEL; i++) { @@ -17,7 +17,7 @@ public void Initialize() _criticalDist[(int)CharacterClassType.Swordman, i] = 0; // approx _criticalDist[(int)CharacterClassType.Magician, i] = 0; // sure _criticalDist[(int)CharacterClassType.Archer, i] = 0; // sure - _criticalDist[(int)CharacterClassType.Wrestler, i] = 0; // sure + _criticalDist[(int)CharacterClassType.MartialArtist, i] = 0; // sure } } diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/CriticalDistRateAlgorithm.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/CriticalDistRateAlgorithm.cs index 3ab2c6cd..f04844e2 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/CriticalDistRateAlgorithm.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/CriticalDistRateAlgorithm.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.Damage { @@ -9,7 +9,7 @@ public class CriticalDistRateAlgorithm : ICharacterStatAlgorithm public void Initialize() { - _criticalDistRate = new int[(int)CharacterClassType.Unknown, MAX_LEVEL]; + _criticalDistRate = new int[(int)CharacterClassType.MartialArtist + 1, MAX_LEVEL]; for (int i = 0; i < MAX_LEVEL; i++) { @@ -17,7 +17,7 @@ public void Initialize() _criticalDistRate[(int)CharacterClassType.Swordman, i] = 0; // approx _criticalDistRate[(int)CharacterClassType.Magician, i] = 0; // sure _criticalDistRate[(int)CharacterClassType.Archer, i] = 0; // sure - _criticalDistRate[(int)CharacterClassType.Wrestler, i] = 0; // sure + _criticalDistRate[(int)CharacterClassType.MartialArtist, i] = 0; // sure } } diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/CriticalHitAlgortihmcs.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/CriticalHitAlgortihmcs.cs index 4ef4486e..519d88e6 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/CriticalHitAlgortihmcs.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/CriticalHitAlgortihmcs.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.Damage { @@ -9,7 +9,7 @@ public class CriticalHitAlgorithm : ICharacterStatAlgorithm public void Initialize() { - _criticalHit = new int[(int)CharacterClassType.Unknown, MAX_LEVEL]; + _criticalHit = new int[(int)CharacterClassType.MartialArtist + 1, MAX_LEVEL]; for (int i = 0; i < MAX_LEVEL; i++) { @@ -17,7 +17,7 @@ public void Initialize() _criticalHit[(int)CharacterClassType.Swordman, i] = 0; // approx _criticalHit[(int)CharacterClassType.Magician, i] = 0; // sure _criticalHit[(int)CharacterClassType.Archer, i] = 0; // sure - _criticalHit[(int)CharacterClassType.Wrestler, i] = 0; // sure + _criticalHit[(int)CharacterClassType.MartialArtist, i] = 0; // sure } } diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/CriticalHitRateAlgorithm.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/CriticalHitRateAlgorithm.cs index fa543d40..d9032fca 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/CriticalHitRateAlgorithm.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/CriticalHitRateAlgorithm.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.Damage { @@ -9,7 +9,7 @@ public class CriticalHitRateAlgorithm : ICharacterStatAlgorithm public void Initialize() { - _criticalHitRate = new int[(int)CharacterClassType.Unknown, MAX_LEVEL]; + _criticalHitRate = new int[(int)CharacterClassType.MartialArtist + 1, MAX_LEVEL]; for (int i = 0; i < MAX_LEVEL; i++) { @@ -17,7 +17,7 @@ public void Initialize() _criticalHitRate[(int)CharacterClassType.Swordman, i] = 0; // approx _criticalHitRate[(int)CharacterClassType.Magician, i] = 0; // sure _criticalHitRate[(int)CharacterClassType.Archer, i] = 0; // sure - _criticalHitRate[(int)CharacterClassType.Wrestler, i] = 0; // sure + _criticalHitRate[(int)CharacterClassType.MartialArtist, i] = 0; // sure } } diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/HitRateAlgorithm.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/HitRateAlgorithm.cs index 6096be33..4cc7234f 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/HitRateAlgorithm.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/HitRateAlgorithm.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.Damage { @@ -9,7 +9,7 @@ public class HitRateAlgorithm : ICharacterStatAlgorithm public void Initialize() { - _hitRate = new int[(int)CharacterClassType.Unknown, MAX_LEVEL]; + _hitRate = new int[(int)CharacterClassType.MartialArtist + 1, MAX_LEVEL]; for (int i = 0; i < MAX_LEVEL; i++) { @@ -19,8 +19,8 @@ public void Initialize() _hitRate[(int)CharacterClassType.Magician, i] = 0; // sure _hitRate[(int)CharacterClassType.Archer, 1] = 41; _hitRate[(int)CharacterClassType.Archer, i] += add; // approx - _hitRate[(int)CharacterClassType.Wrestler, 1] = 41; - _hitRate[(int)CharacterClassType.Wrestler, i] += add; // approx + _hitRate[(int)CharacterClassType.MartialArtist, 1] = 41; + _hitRate[(int)CharacterClassType.MartialArtist, i] += add; // approx } } diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/MaxDistanceAlgorithm.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/MaxDistanceAlgorithm.cs index f4a1763c..41a331af 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/MaxDistanceAlgorithm.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/MaxDistanceAlgorithm.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.Damage { @@ -9,7 +9,7 @@ public class MaxDistanceAlgorithm : ICharacterStatAlgorithm public void Initialize() { - _maxDist = new int[(int)CharacterClassType.Unknown, MAX_LEVEL]; + _maxDist = new int[(int)CharacterClassType.MartialArtist + 1, MAX_LEVEL]; for (int i = 0; i < MAX_LEVEL; i++) { @@ -17,7 +17,7 @@ public void Initialize() _maxDist[(int)CharacterClassType.Swordman, i] = i + 12; // approx _maxDist[(int)CharacterClassType.Magician, i] = 14 + i; // approx _maxDist[(int)CharacterClassType.Archer, i] = 2 * i; // approx - _maxDist[(int)CharacterClassType.Wrestler, i] = 2 * i; // approx + _maxDist[(int)CharacterClassType.MartialArtist, i] = 2 * i; // approx } } diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/MaxHitAlgorithm.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/MaxHitAlgorithm.cs index d893c0c7..01eb0385 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/MaxHitAlgorithm.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/MaxHitAlgorithm.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.Damage { @@ -9,7 +9,7 @@ public class MaxHitAlgorithm : ICharacterStatAlgorithm public void Initialize() { - _maxHit = new int[(int)CharacterClassType.Unknown, MAX_LEVEL]; + _maxHit = new int[(int)CharacterClassType.MartialArtist + 1, MAX_LEVEL]; for (int i = 0; i < MAX_LEVEL; i++) { @@ -17,7 +17,7 @@ public void Initialize() _maxHit[(int)CharacterClassType.Swordman, i] = (2 * i) + 5; // approx Numbers n such that 10n+9 is prime. _maxHit[(int)CharacterClassType.Magician, i] = (2 * i) + 9; // approx Numbers n such that n^2 is of form x^2+40y^2 with positive x,y. _maxHit[(int)CharacterClassType.Archer, i] = 9 + (i * 3); // approx - _maxHit[(int)CharacterClassType.Wrestler, i] = 9 + (i * 3); // nop + _maxHit[(int)CharacterClassType.MartialArtist, i] = 9 + (i * 3); // nop } } diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/MinDistanceAlgorithm.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/MinDistanceAlgorithm.cs index 013c465e..7def543a 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/MinDistanceAlgorithm.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/MinDistanceAlgorithm.cs @@ -1,4 +1,5 @@ -using ChickenAPI.Enums.Game.Character; +using System; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.Damage { @@ -9,7 +10,7 @@ public class MinDistanceAlgorithm : ICharacterStatAlgorithm public void Initialize() { - _minDist = new int[(int)CharacterClassType.Unknown, MAX_LEVEL]; + _minDist = new int[Enum.GetValues(typeof(CharacterClassType)).Length + 1, MAX_LEVEL]; for (int i = 0; i < MAX_LEVEL; i++) { @@ -17,7 +18,7 @@ public void Initialize() _minDist[(int)CharacterClassType.Swordman, i] = i + 12; // approx _minDist[(int)CharacterClassType.Magician, i] = 14 + i; // approx _minDist[(int)CharacterClassType.Archer, i] = 2 * i; // approx - _minDist[(int)CharacterClassType.Wrestler, i] = 2 * i; // approx + _minDist[(int)CharacterClassType.MartialArtist, i] = 2 * i; // approx } } diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/MinHitAlgorithm.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/MinHitAlgorithm.cs index 64ea5a78..b983d0ce 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/MinHitAlgorithm.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Damage/MinHitAlgorithm.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.Damage { @@ -9,7 +9,7 @@ public class MinHitAlgorithm : ICharacterStatAlgorithm public void Initialize() { - _stats = new int[(int)CharacterClassType.Unknown, MAX_LEVEL]; + _stats = new int[(int)CharacterClassType.MartialArtist + 1, MAX_LEVEL]; for (int i = 0; i < MAX_LEVEL; i++) { @@ -17,7 +17,7 @@ public void Initialize() _stats[(int)CharacterClassType.Swordman, i] = (2 * i) + 5; // approx Numbers n such that 10n+9 is prime. _stats[(int)CharacterClassType.Magician, i] = (2 * i) + 9; // approx Numbers n such that n^2 is of form x^ 2 + 40y ^ 2 with positive x,y. _stats[(int)CharacterClassType.Archer, i] = 9 + (i * 3); // approx - _stats[(int)CharacterClassType.Wrestler, i] = 9 + (i * 3); // approx + _stats[(int)CharacterClassType.MartialArtist, i] = 9 + (i * 3); // approx } } diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Distance/RangedDefenceAlgorithm.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Distance/RangedDefenceAlgorithm.cs index 42d3e100..88ff9a35 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Distance/RangedDefenceAlgorithm.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Distance/RangedDefenceAlgorithm.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.Distance { @@ -9,7 +9,7 @@ public class RangedDefenceAlgorithm : ICharacterStatAlgorithm public void Initialize() { - _stats = new int[(int)CharacterClassType.Unknown, MAX_LEVEL]; + _stats = new int[(int)CharacterClassType.MartialArtist + 1, MAX_LEVEL]; for (int i = 0; i < MAX_LEVEL; i++) @@ -18,7 +18,7 @@ public void Initialize() _stats[(int)CharacterClassType.Swordman, i] = i; // approx _stats[(int)CharacterClassType.Magician, i] = i + 20; // approx _stats[(int)CharacterClassType.Archer, i] = i; // approx - _stats[(int)CharacterClassType.Wrestler, i] = i; // approx + _stats[(int)CharacterClassType.MartialArtist, i] = i; // approx } } diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Distance/RangedDodgeAlgorithm.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Distance/RangedDodgeAlgorithm.cs index 00a07a95..39e04e15 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Distance/RangedDodgeAlgorithm.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Distance/RangedDodgeAlgorithm.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.Distance { @@ -9,7 +9,7 @@ public class RangedDodgeAlgorithm : ICharacterStatAlgorithm public void Initialize() { - _stats = new int[(int)CharacterClassType.Unknown, MAX_LEVEL]; + _stats = new int[(int)CharacterClassType.MartialArtist +1, MAX_LEVEL]; for (int i = 0; i < MAX_LEVEL; i++) @@ -18,7 +18,7 @@ public void Initialize() _stats[(int)CharacterClassType.Swordman, i] = i + 12; // approx _stats[(int)CharacterClassType.Magician, i] = i + 14; // approx _stats[(int)CharacterClassType.Archer, i] = i + 2; // approx - _stats[(int)CharacterClassType.Wrestler, i] = i + 12; // approx + _stats[(int)CharacterClassType.MartialArtist, i] = i + 12; // approx } } diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/HpMax.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/HpMax.cs index 67b06eb0..2c52b287 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/HpMax.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/HpMax.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.HpMp { @@ -9,7 +9,7 @@ public class HpMax : ICharacterStatAlgorithm public void Initialize() { - _stats = new int[(int)CharacterClassType.Unknown, MAX_LEVEL]; + _stats = new int[(int)CharacterClassType.MartialArtist + 1, MAX_LEVEL]; // todo improve that shit for (int i = 0; i < MAX_LEVEL; i++) @@ -53,7 +53,7 @@ public void Initialize() _stats[(int)CharacterClassType.Swordman, i] = hpSwordman; _stats[(int)CharacterClassType.Magician, i] = (int)((i + 15) * (i + 15) + i + 15.0 - 465 + 550); // approx _stats[(int)CharacterClassType.Archer, i] = hpArcher; // approx - _stats[(int)CharacterClassType.Wrestler, i] = hpSwordman; // approx + _stats[(int)CharacterClassType.MartialArtist, i] = hpSwordman; // approx } } diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/HpRegen.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/HpRegen.cs index f001f68c..c0f12e1a 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/HpRegen.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/HpRegen.cs @@ -1,5 +1,5 @@ using System; -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.HpMp { @@ -21,10 +21,8 @@ public int GetStat(CharacterClassType type, byte level) return 32; case CharacterClassType.Magician: return 20; - case CharacterClassType.Wrestler: + case CharacterClassType.MartialArtist: return 20; - case CharacterClassType.Unknown: - return 10; default: throw new ArgumentOutOfRangeException(nameof(type), type, null); } diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/HpRegenSitting.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/HpRegenSitting.cs index c67befd2..03f6d3fc 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/HpRegenSitting.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/HpRegenSitting.cs @@ -1,5 +1,5 @@ using System; -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.HpMp { @@ -21,10 +21,8 @@ public int GetStat(CharacterClassType type, byte level) return 60; case CharacterClassType.Magician: return 30; - case CharacterClassType.Wrestler: + case CharacterClassType.MartialArtist: return 80; - case CharacterClassType.Unknown: - return 50; default: throw new ArgumentOutOfRangeException(nameof(type), type, null); } diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/MpMax.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/MpMax.cs index f178add0..d3712703 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/MpMax.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/MpMax.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.HpMp { @@ -9,7 +9,7 @@ public class MpMax : ICharacterStatAlgorithm public void Initialize() { - _stats = new int[(int)CharacterClassType.Unknown, MAX_LEVEL]; + _stats = new int[(int)CharacterClassType.MartialArtist + 1, MAX_LEVEL]; // todo improve that shit int actual = 60; @@ -32,7 +32,7 @@ public void Initialize() _stats[(int)CharacterClassType.Swordman, i] = actual; _stats[(int)CharacterClassType.Magician, i] = 3 * actual; // approx _stats[(int)CharacterClassType.Archer, i] = actual + baseAdventurer; // approx - _stats[(int)CharacterClassType.Wrestler, i] = actual; // approx + _stats[(int)CharacterClassType.MartialArtist, i] = actual; // approx } } diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/MpRegen.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/MpRegen.cs index 62afed18..8f0c56fe 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/MpRegen.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/MpRegen.cs @@ -1,5 +1,5 @@ using System; -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.HpMp { @@ -21,9 +21,7 @@ public int GetStat(CharacterClassType type, byte level) return 28; case CharacterClassType.Magician: return 40; - case CharacterClassType.Wrestler: - return 50; - case CharacterClassType.Unknown: + case CharacterClassType.MartialArtist: return 50; default: throw new ArgumentOutOfRangeException(nameof(type), type, null); diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/MpRegenSitting.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/MpRegenSitting.cs index edb9b559..20b9e767 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/MpRegenSitting.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/HpMp/MpRegenSitting.cs @@ -1,5 +1,5 @@ using System; -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.HpMp { @@ -21,10 +21,8 @@ public int GetStat(CharacterClassType type, byte level) return 50; case CharacterClassType.Magician: return 80; - case CharacterClassType.Wrestler: + case CharacterClassType.MartialArtist: return 80; - case CharacterClassType.Unknown: - return 50; default: throw new ArgumentOutOfRangeException(nameof(type), type, null); } diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/ICharacterStatAlgorithm.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/ICharacterStatAlgorithm.cs index ebc330b8..2214a7fb 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/ICharacterStatAlgorithm.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/ICharacterStatAlgorithm.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms { diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Magical/MagicDefenceAlgorithm.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Magical/MagicDefenceAlgorithm.cs index ab778ae5..22134d46 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Magical/MagicDefenceAlgorithm.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Magical/MagicDefenceAlgorithm.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.Magical { @@ -9,7 +9,7 @@ public class MagicDefenceAlgorithm : ICharacterStatAlgorithm public void Initialize() { - _stats = new int[(int)CharacterClassType.Unknown, MAX_LEVEL]; + _stats = new int[(int)CharacterClassType.MartialArtist + 1, MAX_LEVEL]; for (int i = 0; i < MAX_LEVEL; i++) @@ -18,7 +18,7 @@ public void Initialize() _stats[(int)CharacterClassType.Swordman, i] = (i + 9) / 2; // approx _stats[(int)CharacterClassType.Magician, i] = i + 4; // approx _stats[(int)CharacterClassType.Archer, i] = i + 41; // approx - _stats[(int)CharacterClassType.Wrestler, i] = i + 12; // approx + _stats[(int)CharacterClassType.MartialArtist, i] = i + 12; // approx } } diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Magical/MagicDodgeAlgorithm.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Magical/MagicDodgeAlgorithm.cs index 93131652..7d36532f 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Magical/MagicDodgeAlgorithm.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/Magical/MagicDodgeAlgorithm.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms.Magical { diff --git a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/SpeedAlgorithm.cs b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/SpeedAlgorithm.cs index d0fc61e0..d56ecb98 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/SpeedAlgorithm.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/CharacterAlgorithms/SpeedAlgorithm.cs @@ -1,5 +1,5 @@ using System; -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicAlgorithmPlugin.CharacterAlgorithms { @@ -21,9 +21,7 @@ public int GetStat(CharacterClassType type, byte level) return 12; case CharacterClassType.Magician: return 10; - case CharacterClassType.Wrestler: - return 11; - case CharacterClassType.Unknown: + case CharacterClassType.MartialArtist: return 11; default: throw new ArgumentOutOfRangeException(nameof(type), type, null); diff --git a/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithmService.cs b/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithmService.cs index fd037849..42f72b99 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithmService.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithmService.cs @@ -1,5 +1,5 @@ -using ChickenAPI.Data.NpcMonster; -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Entity; +using ChickenAPI.Data.NpcMonster; using SaltyEmu.BasicAlgorithmPlugin.NpcMonsterAlgorithms; namespace SaltyEmu.BasicAlgorithmPlugin diff --git a/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/HeroXp.cs b/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/HeroXp.cs index 18b6385a..131302b6 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/HeroXp.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/HeroXp.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Entity; namespace SaltyEmu.BasicAlgorithmPlugin.NpcMonsterAlgorithms { diff --git a/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/HpMax.cs b/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/HpMax.cs index 04fc8f94..a4949b8b 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/HpMax.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/HpMax.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Entity; namespace SaltyEmu.BasicAlgorithmPlugin.NpcMonsterAlgorithms { diff --git a/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/IMonsterRaceStatAlgorithm.cs b/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/IMonsterRaceStatAlgorithm.cs index 40da702d..f94ce6a0 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/IMonsterRaceStatAlgorithm.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/IMonsterRaceStatAlgorithm.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Entity; namespace SaltyEmu.BasicAlgorithmPlugin.NpcMonsterAlgorithms { diff --git a/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/JobXp.cs b/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/JobXp.cs index fb503dff..c0b73cd0 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/JobXp.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/JobXp.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Entity; namespace SaltyEmu.BasicAlgorithmPlugin.NpcMonsterAlgorithms { diff --git a/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/MpMax.cs b/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/MpMax.cs index 0f7b7430..1143e73a 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/MpMax.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/MpMax.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Entity; namespace SaltyEmu.BasicAlgorithmPlugin.NpcMonsterAlgorithms { diff --git a/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/Xp.cs b/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/Xp.cs index ab0624ce..e0a7a021 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/Xp.cs +++ b/src/Plugins/NosSharp.BasicAlgorithm/NpcMonsterAlgorithms/Xp.cs @@ -1,4 +1,4 @@ -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Entity; namespace SaltyEmu.BasicAlgorithmPlugin.NpcMonsterAlgorithms { diff --git a/src/Plugins/NosSharp.BasicAlgorithm/SaltyEmu.BasicAlgorithmPlugin.csproj b/src/Plugins/NosSharp.BasicAlgorithm/SaltyEmu.BasicAlgorithmPlugin.csproj index 1cc278aa..09db8f21 100644 --- a/src/Plugins/NosSharp.BasicAlgorithm/SaltyEmu.BasicAlgorithmPlugin.csproj +++ b/src/Plugins/NosSharp.BasicAlgorithm/SaltyEmu.BasicAlgorithmPlugin.csproj @@ -4,6 +4,10 @@ netstandard2.0 + + + + diff --git a/src/Plugins/NosSharp.DatabasePlugin/Configuration/DatabaseConfiguration.cs b/src/Plugins/NosSharp.DatabasePlugin/Configuration/DatabaseConfiguration.cs index 9444cd78..1a7c6993 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Configuration/DatabaseConfiguration.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Configuration/DatabaseConfiguration.cs @@ -1,8 +1,9 @@ using System; +using ChickenAPI.Core.Configurations; namespace SaltyEmu.DatabasePlugin.Configuration { - public class DatabaseConfiguration + public class DatabaseConfiguration : IConfiguration { public DatabaseConfiguration() { diff --git a/src/Plugins/NosSharp.DatabasePlugin/DatabasePlugin.cs b/src/Plugins/NosSharp.DatabasePlugin/DatabasePlugin.cs index 7889d96e..24f3d2fa 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/DatabasePlugin.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/DatabasePlugin.cs @@ -1,9 +1,10 @@ using System; using System.Data.SqlClient; +using ChickenAPI.Core.Configurations; using ChickenAPI.Core.Logging; using ChickenAPI.Core.Plugins; using ChickenAPI.Core.Plugins.Exceptions; -using ChickenAPI.Core.Utils; +using ChickenAPI.Game.Impl; using Microsoft.EntityFrameworkCore; using SaltyEmu.DatabasePlugin.Configuration; using SaltyEmu.DatabasePlugin.Context; @@ -13,7 +14,11 @@ namespace SaltyEmu.DatabasePlugin { public class DatabasePlugin : IPlugin { - private static readonly Logger Log = Logger.GetLogger(); + public DatabasePlugin(ILogger log) + { + Log = log; + } + private readonly ILogger Log; private readonly string _configurationFilePath = $"plugins/config/{nameof(DatabasePlugin)}/conf.json"; private DatabaseConfiguration _configuration; public PluginEnableTime EnableTime => PluginEnableTime.PreContainerBuild; @@ -22,7 +27,8 @@ public class DatabasePlugin : IPlugin public void OnLoad() { Log.Info("Loading..."); - _configuration = ConfigurationHelper.Load(_configurationFilePath, true); // database configuration + var loader = new ConfigurationHelper(new JsonConfigurationSerializer()); + _configuration = loader.Load(_configurationFilePath, true); // database configuration if (!Initialize()) { throw new CriticalPluginException(this, "Verify your configuration in : " + _configurationFilePath); diff --git a/src/Plugins/NosSharp.DatabasePlugin/Models/Cards/CardModel.cs b/src/Plugins/NosSharp.DatabasePlugin/Models/Cards/CardModel.cs index d67330b0..7ccbbe5f 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Models/Cards/CardModel.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Models/Cards/CardModel.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using ChickenAPI.Enums.Game.Buffs; +using ChickenAPI.Data.Enums.Game.Buffs; using SaltyEmu.Database; using SaltyEmu.DatabasePlugin.Models.BCard; diff --git a/src/Plugins/NosSharp.DatabasePlugin/Models/Character/AccountModel.cs b/src/Plugins/NosSharp.DatabasePlugin/Models/Character/AccountModel.cs index 42cafe2a..cbb8764a 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Models/Character/AccountModel.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Models/Character/AccountModel.cs @@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using ChickenAPI.Core.i18n; -using ChickenAPI.Enums; +using ChickenAPI.Data.Enums; using SaltyEmu.Database; namespace SaltyEmu.DatabasePlugin.Models.Character diff --git a/src/Plugins/NosSharp.DatabasePlugin/Models/Character/CharacterFamilyModel.cs b/src/Plugins/NosSharp.DatabasePlugin/Models/Character/CharacterFamilyModel.cs index 4e331ba4..f31a4708 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Models/Character/CharacterFamilyModel.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Models/Character/CharacterFamilyModel.cs @@ -1,5 +1,6 @@ using System.ComponentModel.DataAnnotations; -using ChickenAPI.Enums.Game.Families; +using ChickenAPI.Data.Enums.Game.Families; +using ChickenAPI.Packets.Enumerations; using SaltyEmu.Database; using SaltyEmu.DatabasePlugin.Models.Families; diff --git a/src/Plugins/NosSharp.DatabasePlugin/Models/Character/CharacterItemModel.cs b/src/Plugins/NosSharp.DatabasePlugin/Models/Character/CharacterItemModel.cs index 81f612a4..f0b036f8 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Models/Character/CharacterItemModel.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Models/Character/CharacterItemModel.cs @@ -3,8 +3,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using ChickenAPI.Data; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Enums.Game.Items; +using ChickenAPI.Packets.Enumerations; using SaltyEmu.Database; using SaltyEmu.DatabasePlugin.Models.Item; @@ -32,7 +31,7 @@ public class CharacterItemModel : ISynchronizedModel public short Slot { get; set; } - public InventoryType Type { get; set; } + public PocketType Type { get; set; } public byte Design { get; set; } diff --git a/src/Plugins/NosSharp.DatabasePlugin/Models/Character/CharacterMateModel.cs b/src/Plugins/NosSharp.DatabasePlugin/Models/Character/CharacterMateModel.cs index 7594afaa..55ae0bf0 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Models/Character/CharacterMateModel.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Models/Character/CharacterMateModel.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using ChickenAPI.Data; -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Entity; using SaltyEmu.Database; using SaltyEmu.DatabasePlugin.Models.NpcMonster; diff --git a/src/Plugins/NosSharp.DatabasePlugin/Models/Character/CharacterModel.cs b/src/Plugins/NosSharp.DatabasePlugin/Models/Character/CharacterModel.cs index 438f24d3..f7479d4f 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Models/Character/CharacterModel.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Models/Character/CharacterModel.cs @@ -2,7 +2,8 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using ChickenAPI.Data; -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Data.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; using SaltyEmu.Database; namespace SaltyEmu.DatabasePlugin.Models.Character diff --git a/src/Plugins/NosSharp.DatabasePlugin/Models/Families/FamilyModel.cs b/src/Plugins/NosSharp.DatabasePlugin/Models/Families/FamilyModel.cs index 0c44c372..4530023c 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Models/Families/FamilyModel.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Models/Families/FamilyModel.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Enums.Game.Families; +using ChickenAPI.Packets.Enumerations; using SaltyEmu.Database; using SaltyEmu.DatabasePlugin.Models.Character; diff --git a/src/Plugins/NosSharp.DatabasePlugin/Models/Item/ItemModel.cs b/src/Plugins/NosSharp.DatabasePlugin/Models/Item/ItemModel.cs index c79b7070..fb3a42aa 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Models/Item/ItemModel.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Models/Item/ItemModel.cs @@ -2,11 +2,13 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using ChickenAPI.Data; -using ChickenAPI.Enums.Game.Items; +using ChickenAPI.Data.Enums.Game.Items; +using ChickenAPI.Packets.Enumerations; using SaltyEmu.Database; using SaltyEmu.DatabasePlugin.Models.BCard; using SaltyEmu.DatabasePlugin.Models.Character; using SaltyEmu.DatabasePlugin.Models.Shop; +using EquipmentType = ChickenAPI.Data.Enums.Game.Items.EquipmentType; namespace SaltyEmu.DatabasePlugin.Models.Item { @@ -159,7 +161,7 @@ public class ItemModel : IMappedModel public byte SpType { get; set; } - public InventoryType Type { get; set; } + public PocketType Type { get; set; } public short WaitDelay { get; set; } diff --git a/src/Plugins/NosSharp.DatabasePlugin/Models/Map/MapMonsterModel.cs b/src/Plugins/NosSharp.DatabasePlugin/Models/Map/MapMonsterModel.cs index d56df22b..cd4d41ec 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Models/Map/MapMonsterModel.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Models/Map/MapMonsterModel.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using ChickenAPI.Data; -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Entity; using SaltyEmu.Database; using SaltyEmu.DatabasePlugin.Models.NpcMonster; diff --git a/src/Plugins/NosSharp.DatabasePlugin/Models/Map/MapNpcModel.cs b/src/Plugins/NosSharp.DatabasePlugin/Models/Map/MapNpcModel.cs index 2293d848..52a9359c 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Models/Map/MapNpcModel.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Models/Map/MapNpcModel.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using ChickenAPI.Data; -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Entity; using SaltyEmu.Database; using SaltyEmu.DatabasePlugin.Models.NpcMonster; using SaltyEmu.DatabasePlugin.Models.Shop; diff --git a/src/Plugins/NosSharp.DatabasePlugin/Models/Map/MapPortalModel.cs b/src/Plugins/NosSharp.DatabasePlugin/Models/Map/MapPortalModel.cs index 26fdc055..80e5fc16 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Models/Map/MapPortalModel.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Models/Map/MapPortalModel.cs @@ -1,6 +1,5 @@ using System.ComponentModel.DataAnnotations.Schema; -using ChickenAPI.Data; -using ChickenAPI.Enums.Game.Portals; +using ChickenAPI.Packets.Enumerations; using SaltyEmu.Database; namespace SaltyEmu.DatabasePlugin.Models.Map diff --git a/src/Plugins/NosSharp.DatabasePlugin/Models/NpcMonster/NpcMonsterModel.cs b/src/Plugins/NosSharp.DatabasePlugin/Models/NpcMonster/NpcMonsterModel.cs index 9d7e1c8f..c7fe401f 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Models/NpcMonster/NpcMonsterModel.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Models/NpcMonster/NpcMonsterModel.cs @@ -1,7 +1,8 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; using ChickenAPI.Data; -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Entity; +using ChickenAPI.Packets.Enumerations; using SaltyEmu.Database; using SaltyEmu.DatabasePlugin.Models.BCard; using SaltyEmu.DatabasePlugin.Models.Character; diff --git a/src/Plugins/NosSharp.DatabasePlugin/SaltyEmu.DatabasePlugin.csproj b/src/Plugins/NosSharp.DatabasePlugin/SaltyEmu.DatabasePlugin.csproj index 95d77e0c..d985d15b 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/SaltyEmu.DatabasePlugin.csproj +++ b/src/Plugins/NosSharp.DatabasePlugin/SaltyEmu.DatabasePlugin.csproj @@ -15,6 +15,7 @@ + @@ -27,6 +28,7 @@ + diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/Account/AccountDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/Account/AccountDao.cs index f9815426..1076dcf5 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/Account/AccountDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/Account/AccountDao.cs @@ -2,8 +2,8 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Account; -using ChickenAPI.Data.Character; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; using SaltyEmu.DatabasePlugin.Context; @@ -13,7 +13,7 @@ namespace SaltyEmu.DatabasePlugin.Services.Account { public class AccountDao : MappedRepositoryBase, IAccountService { - public AccountDao(DbContext dbFactory, IMapper mapper) : base(dbFactory, mapper) + public AccountDao(SaltyDbContext dbFactory, IMapper mapper, ILogger log) : base(dbFactory, mapper, log) { } diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/BCard/BCardDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/BCard/BCardDao.cs index e3d0ecd7..95f43a3f 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/BCard/BCardDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/BCard/BCardDao.cs @@ -3,17 +3,19 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.BCard; -using ChickenAPI.Enums.Game.BCard; +using ChickenAPI.Data.Enums.Game.BCard; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; +using SaltyEmu.DatabasePlugin.Context; using SaltyEmu.DatabasePlugin.Models.BCard; namespace SaltyEmu.DatabasePlugin.Services.BCard { public class BCardDao : MappedRepositoryBase, IBCardService { - public BCardDao(DbContext context, IMapper mapper) : base(context, mapper) + public BCardDao(SaltyDbContext context, IMapper mapper, ILogger log) : base(context, mapper, log) { } diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/Card/CardDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/Card/CardDao.cs index 3abaf265..d86a602b 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/Card/CardDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/Card/CardDao.cs @@ -1,4 +1,5 @@ using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Skills; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; @@ -8,7 +9,7 @@ namespace SaltyEmu.DatabasePlugin.Services.Card { public class CardDao : MappedRepositoryBase, ICardService { - public CardDao(DbContext context, IMapper mapper) : base(context, mapper) + public CardDao(DbContext context, IMapper mapper, ILogger log) : base(context, mapper, log) { } } diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/Character/CharacterDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/Character/CharacterDao.cs index 6160d39c..c80df13b 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/Character/CharacterDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/Character/CharacterDao.cs @@ -3,8 +3,9 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Character; -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Data.Enums.Game.Character; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; using SaltyEmu.DatabasePlugin.Models.Character; @@ -16,7 +17,7 @@ public class CharacterDao : MappedRepositoryBase, { private readonly CharacterDto _baseConf; - public CharacterDao(DbContext context, IMapper mapper, CharacterDto baseConf) : base(context, mapper) => _baseConf = baseConf; + public CharacterDao(DbContext context, IMapper mapper, CharacterDto baseConf, ILogger log) : base(context, mapper, log) => _baseConf = baseConf; public IEnumerable GetActiveByAccountId(long accountId) { diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/Character/CharacterFamilyDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/Character/CharacterFamilyDao.cs index 803b98df..707bb696 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/Character/CharacterFamilyDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/Character/CharacterFamilyDao.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Character; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; @@ -12,7 +13,7 @@ namespace SaltyEmu.DatabasePlugin.Services.Character { public class CharacterFamilyDao : MappedRepositoryBase, ICharacterFamilyService { - public CharacterFamilyDao(DbContext context, IMapper mapper) : base(context, mapper) + public CharacterFamilyDao(SaltyDbContext context, IMapper mapper, ILogger log) : base(context, mapper, log) { } @@ -35,5 +36,6 @@ public async Task> GetCharacterFamilyDtosByFamil { return (await DbSet.Where(s => s.FamilyId == familyId).ToArrayAsync()).Select(Mapper.Map); } + } } \ No newline at end of file diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/Character/CharacterItemDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/Character/CharacterItemDao.cs index 57ffa2b4..a14fce3e 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/Character/CharacterItemDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/Character/CharacterItemDao.cs @@ -3,9 +3,10 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; +using ChickenAPI.Core.Logging; +using ChickenAPI.Data.Enums; using ChickenAPI.Data.Item; -using ChickenAPI.Enums; -using ChickenAPI.Enums.Game.Items; +using ChickenAPI.Packets.Enumerations; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; using SaltyEmu.DatabasePlugin.Models.Character; @@ -14,7 +15,7 @@ namespace SaltyEmu.DatabasePlugin.Services.Character { public class CharacterItemDao : SynchronizedRepositoryBase, IItemInstanceService { - public CharacterItemDao(DbContext context, IMapper mapper) : base(context, mapper) + public CharacterItemDao(DbContext context, IMapper mapper, ILogger log) : base(context, mapper, log) { } @@ -37,7 +38,7 @@ public async Task> GetWearByCharacterIdAsync(long c { try { - return (await DbSet.Where(s => s.CharacterId == characterId && s.Item.Type == InventoryType.Wear).ToArrayAsync()).Select(Mapper.Map).ToArray(); + return (await DbSet.Where(s => s.CharacterId == characterId && s.Item.Type == PocketType.Wear).ToArrayAsync()).Select(Mapper.Map).ToArray(); } catch (Exception e) { diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/Character/CharacterMateDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/Character/CharacterMateDao.cs index 7347c40a..2dec4d87 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/Character/CharacterMateDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/Character/CharacterMateDao.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Character; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; @@ -12,7 +13,7 @@ namespace SaltyEmu.DatabasePlugin.Services.Character { public class CharacterMateDao : MappedRepositoryBase, ICharacterMateService { - public CharacterMateDao(DbContext context, IMapper mapper) : base(context, mapper) + public CharacterMateDao(SaltyDbContext context, IMapper mapper, ILogger log) : base(context, mapper, log) { } diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/Character/CharacterQuickListDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/Character/CharacterQuickListDao.cs index a89638a9..4dedb722 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/Character/CharacterQuickListDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/Character/CharacterQuickListDao.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Character; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; @@ -15,7 +16,7 @@ public class CharacterQuickListDao : SynchronizedRepositoryBase, ICharacterSkillService { - public CharacterSkillDao(DbContext context, IMapper mapper) : base(context, mapper) + public CharacterSkillDao(SaltyDbContext context, IMapper mapper, ILogger log) : base(context, mapper, log) { } diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/Drop/DropDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/Drop/DropDao.cs index fcafb415..6d30f99e 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/Drop/DropDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/Drop/DropDao.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Drop; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; @@ -18,7 +19,7 @@ public class DropDao : MappedRepositoryBase, IDropService { private readonly Dictionary _items = new Dictionary(); - public DropDao(DbContext context, IMapper mapper) : base(context, mapper) + public DropDao(DbContext context, IMapper mapper, ILogger log) : base(context, mapper, log) { } diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/Families/FamilyDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/Families/FamilyDao.cs index dad483cd..09525595 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/Families/FamilyDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/Families/FamilyDao.cs @@ -1,6 +1,7 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Families; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; @@ -10,7 +11,7 @@ namespace SaltyEmu.DatabasePlugin.Services.Families { public class FamilyDao : MappedRepositoryBase, IFamilyService { - public FamilyDao(DbContext context, IMapper mapper) : base(context, mapper) + public FamilyDao(DbContext context, IMapper mapper, ILogger log) : base(context, mapper, log) { } diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/Item/ItemDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/Item/ItemDao.cs index 105c5102..c1967487 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/Item/ItemDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/Item/ItemDao.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Item; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; @@ -14,7 +15,7 @@ public class ItemDao : MappedRepositoryBase, IItemService { private readonly Dictionary _items; - public ItemDao(DbContext context, IMapper mapper) : base(context, mapper) + public ItemDao(DbContext context, IMapper mapper, ILogger log) : base(context, mapper, log) { _items = new Dictionary(Get().ToDictionary(s => s.Id, s => s)); } diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/Map/MapDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/Map/MapDao.cs index ff433a06..9c8b6a3a 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/Map/MapDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/Map/MapDao.cs @@ -1,4 +1,5 @@ using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Map; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; @@ -8,7 +9,7 @@ namespace SaltyEmu.DatabasePlugin.Services.Map { public class MapDao : MappedRepositoryBase, IMapService { - public MapDao(DbContext context, IMapper mapper) : base(context, mapper) + public MapDao(DbContext context, IMapper mapper, ILogger log) : base(context, mapper, log) { } } diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/Map/MapMonsterDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/Map/MapMonsterDao.cs index 008dbf56..57070b40 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/Map/MapMonsterDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/Map/MapMonsterDao.cs @@ -3,10 +3,10 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Map; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; -using SaltyEmu.DatabasePlugin.Context; using SaltyEmu.DatabasePlugin.Models.Map; namespace SaltyEmu.DatabasePlugin.Services.Map @@ -15,7 +15,7 @@ public class MapMonsterDao : MappedRepositoryBase _monsters; - public MapMonsterDao(DbContext context, IMapper mapper) : base(context, mapper) + public MapMonsterDao(DbContext context, IMapper mapper, ILogger log) : base(context, mapper, log) { _monsters = new Dictionary(Get().GroupBy(s => s.MapId).ToDictionary(dtos => dtos.Key, dtos => dtos.ToArray())); } diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/Map/MapNpcDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/Map/MapNpcDao.cs index 9204f88f..a12adf76 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/Map/MapNpcDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/Map/MapNpcDao.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Map; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; @@ -14,11 +15,12 @@ public class MapNpcDao : MappedRepositoryBase, IMapNpcSe { private readonly Dictionary _npcs; - public MapNpcDao(DbContext context, IMapper mapper) : base(context, mapper) + public MapNpcDao(DbContext context, IMapper mapper, ILogger log) : base(context, mapper, log) { _npcs = new Dictionary(Get().GroupBy(s => s.MapId).ToDictionary(s => (long)s.Key, s => s.ToArray())); } + public IEnumerable GetByMapId(long mapId) { try diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/Map/MapPortalDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/Map/MapPortalDao.cs index 62ec9d37..ab0afc91 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/Map/MapPortalDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/Map/MapPortalDao.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Map; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; @@ -12,7 +13,7 @@ namespace SaltyEmu.DatabasePlugin.Services.Map { public class MapPortalDao : MappedRepositoryBase, IPortalService { - public MapPortalDao(DbContext context, IMapper mapper) : base(context, mapper) + public MapPortalDao(DbContext context, IMapper mapper, ILogger log) : base(context, mapper, log) { } diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/NpcMonster/NpcMonsterDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/NpcMonster/NpcMonsterDao.cs index 2eff1033..5f7d03b5 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/NpcMonster/NpcMonsterDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/NpcMonster/NpcMonsterDao.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.NpcMonster; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; @@ -13,7 +14,7 @@ public class NpcMonsterDao : MappedRepositoryBase _monsters; - public NpcMonsterDao(DbContext context, IMapper mapper) : base(context, mapper) + public NpcMonsterDao(DbContext context, IMapper mapper, ILogger log) : base(context, mapper, log) { _monsters = Get().ToDictionary(s => s.Id, s => s); } diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/NpcMonster/NpcMonsterSkillDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/NpcMonster/NpcMonsterSkillDao.cs index 0f6dfbdd..d3195b8c 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/NpcMonster/NpcMonsterSkillDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/NpcMonster/NpcMonsterSkillDao.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.NpcMonster; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; @@ -14,7 +15,7 @@ public class NpcMonsterSkillDao : MappedRepositoryBase _cacheByNpcMonsterId; - public NpcMonsterSkillDao(DbContext context, IMapper mapper) : base(context, mapper) + public NpcMonsterSkillDao(DbContext context, IMapper mapper, ILogger log) : base(context, mapper, log) { IEnumerable tmp = Get(); _cacheByNpcMonsterId = tmp.GroupBy(s => s.NpcMonsterId).ToDictionary(s => s.Key, s => s.ToArray()); diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/Shop/RecipeDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/Shop/RecipeDao.cs index 5ef2f8f8..b7b495ef 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/Shop/RecipeDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/Shop/RecipeDao.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Shop; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; @@ -13,7 +14,7 @@ namespace SaltyEmu.DatabasePlugin.Services.Shop { public class RecipeDao : MappedRepositoryBase, IRecipeService { - public RecipeDao(DbContext context, IMapper mapper) : base(context, mapper) + public RecipeDao(DbContext context, IMapper mapper, ILogger log) : base(context, mapper, log) { } diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/Shop/RecipeItemDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/Shop/RecipeItemDao.cs index a51e6606..d3c599ad 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/Shop/RecipeItemDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/Shop/RecipeItemDao.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Shop; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; @@ -13,7 +14,7 @@ namespace SaltyEmu.DatabasePlugin.Services.Shop { public class RecipeItemDao : MappedRepositoryBase, IRecipeItemService { - public RecipeItemDao(DbContext context, IMapper mapper) : base(context, mapper) + public RecipeItemDao(DbContext context, IMapper mapper, ILogger log) : base(context, mapper, log) { } diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/Shop/ShopDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/Shop/ShopDao.cs index d6177a53..6b856f4d 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/Shop/ShopDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/Shop/ShopDao.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Shop; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; @@ -14,7 +15,7 @@ public class ShopDao : MappedRepositoryBase, IShopService { private readonly Dictionary _shops; - public ShopDao(DbContext context, IMapper mapper) : base(context, mapper) + public ShopDao(DbContext context, IMapper mapper, ILogger log) : base(context, mapper, log) { IEnumerable all = Get(); IEnumerable> tmp = all.GroupBy(s => s.MapNpcId); diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/Shop/ShopItemDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/Shop/ShopItemDao.cs index cd17cd54..f74b1442 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/Shop/ShopItemDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/Shop/ShopItemDao.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Shop; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; @@ -15,7 +16,7 @@ public class ShopItemDao : MappedRepositoryBase, ISh { private readonly Dictionary _shops; - public ShopItemDao(DbContext context, IMapper mapper) : base(context, mapper) + public ShopItemDao(DbContext context, IMapper mapper, ILogger log) : base(context, mapper, log) { _shops = new Dictionary(Get().GroupBy(s => s.ShopId).ToDictionary(s => s.Key, s => s.ToArray())); } diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/Shop/ShopSkillDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/Shop/ShopSkillDao.cs index 28473575..8672a4e5 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/Shop/ShopSkillDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/Shop/ShopSkillDao.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Shop; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; @@ -15,7 +16,7 @@ public class ShopSkillDao : MappedRepositoryBase, { private readonly Dictionary _shop; - public ShopSkillDao(DbContext context, IMapper mapper) : base(context, mapper) + public ShopSkillDao(DbContext context, IMapper mapper, ILogger log) : base(context, mapper, log) { _shop = new Dictionary(Get().GroupBy(s => s.ShopId).ToDictionary(s => s.Key, s => s.ToArray())); } diff --git a/src/Plugins/NosSharp.DatabasePlugin/Services/Skill/SkillDao.cs b/src/Plugins/NosSharp.DatabasePlugin/Services/Skill/SkillDao.cs index 827a1739..5f60140f 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Services/Skill/SkillDao.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Services/Skill/SkillDao.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Threading.Tasks; using AutoMapper; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Skills; using Microsoft.EntityFrameworkCore; using SaltyEmu.Database; @@ -14,7 +15,7 @@ public class SkillDao : MappedRepositoryBase, ISkillServic private readonly Dictionary _skills; private readonly Dictionary _skillsByClassId; - public SkillDao(DbContext context, IMapper mapper) : base(context, mapper) + public SkillDao(DbContext context, IMapper mapper, ILogger log) : base(context, mapper, log) { IEnumerable tmp = Get(); _skills = tmp.ToDictionary(s => s.Id, s => s); diff --git a/src/Plugins/NosSharp.DatabasePlugin/Utils/NosSharpDatabasePluginMapper.cs b/src/Plugins/NosSharp.DatabasePlugin/Utils/NosSharpDatabasePluginMapper.cs index 821ea789..a6baec5e 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Utils/NosSharpDatabasePluginMapper.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Utils/NosSharpDatabasePluginMapper.cs @@ -6,14 +6,14 @@ using ChickenAPI.Data.BCard; using ChickenAPI.Data.Character; using ChickenAPI.Data.Drop; +using ChickenAPI.Data.Enums.Game.BCard; +using ChickenAPI.Data.Enums.Game.Drop; using ChickenAPI.Data.Families; using ChickenAPI.Data.Item; using ChickenAPI.Data.Map; using ChickenAPI.Data.NpcMonster; using ChickenAPI.Data.Shop; using ChickenAPI.Data.Skills; -using ChickenAPI.Enums.Game.BCard; -using ChickenAPI.Enums.Game.Drop; using SaltyEmu.DatabasePlugin.Models.BCard; using SaltyEmu.DatabasePlugin.Models.Cards; using SaltyEmu.DatabasePlugin.Models.Character; diff --git a/src/Plugins/NosSharp.DatabasePlugin/Utils/PluginDependencyInjector.cs b/src/Plugins/NosSharp.DatabasePlugin/Utils/PluginDependencyInjector.cs index 65f56c58..85563cb4 100644 --- a/src/Plugins/NosSharp.DatabasePlugin/Utils/PluginDependencyInjector.cs +++ b/src/Plugins/NosSharp.DatabasePlugin/Utils/PluginDependencyInjector.cs @@ -1,17 +1,20 @@ -using Autofac; +using System; +using Autofac; using AutoMapper; using ChickenAPI.Core.IoC; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Account; using ChickenAPI.Data.BCard; using ChickenAPI.Data.Character; using ChickenAPI.Data.Drop; +using ChickenAPI.Data.Enums.Game.Character; using ChickenAPI.Data.Families; using ChickenAPI.Data.Item; using ChickenAPI.Data.Map; using ChickenAPI.Data.NpcMonster; using ChickenAPI.Data.Shop; using ChickenAPI.Data.Skills; -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Packets.Enumerations; using Microsoft.EntityFrameworkCore; using SaltyEmu.DatabasePlugin.Context; using SaltyEmu.DatabasePlugin.Services.Account; @@ -71,40 +74,47 @@ public static void RegisterDaos() State = CharacterState.Active }; // data - ChickenContainer.Builder.Register(s => new MapDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); - ChickenContainer.Builder.Register(s => new SkillDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); - ChickenContainer.Builder.Register(s => new BCardDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); - ChickenContainer.Builder.Register(s => new CardDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); - ChickenContainer.Builder.Register(s => new ItemDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); - ChickenContainer.Builder.Register(s => new NpcMonsterDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); - ChickenContainer.Builder.Register(s => new NpcMonsterSkillDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); - ChickenContainer.Builder.Register(s => new DropDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); + //ChickenContainer.Builder.RegisterTypes(typeof(PluginDependencyInjector).Assembly.GetTypes()).AsImplementedInterfaces().InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new MapDao(s.Resolve(), s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new SkillDao(s.Resolve(), s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new BCardDao(s.Resolve(), s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new CardDao(s.Resolve(), s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new ItemDao(s.Resolve(), s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new NpcMonsterDao(s.Resolve(), s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new NpcMonsterSkillDao(s.Resolve(), s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new DropDao(s.Resolve(), s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); // character - ChickenContainer.Builder.Register(s => new AccountDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); - ChickenContainer.Builder.Register(s => new CharacterDao(s.Resolve(), s.Resolve(), characterConf)).As().InstancePerLifetimeScope(); - ChickenContainer.Builder.Register(s => new CharacterMateDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); - ChickenContainer.Builder.Register(s => new CharacterItemDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); - ChickenContainer.Builder.Register(s => new CharacterSkillDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); - ChickenContainer.Builder.Register(s => new CharacterQuickListDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); - ChickenContainer.Builder.Register(s => new CharacterFamilyDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); + Console.WriteLine("Registering AccountDAO"); + ChickenContainer.Builder.Register(s => new AccountDao(s.Resolve(), s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new CharacterDao(s.Resolve(), s.Resolve(), characterConf, s.Resolve())).As() + .InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new CharacterMateDao(s.Resolve(), s.Resolve(), s.Resolve())).As() + .InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new CharacterItemDao(s.Resolve(), s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new CharacterSkillDao(s.Resolve(), s.Resolve(), s.Resolve())).As() + .InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new CharacterQuickListDao(s.Resolve(), s.Resolve(), s.Resolve())).As() + .InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new CharacterFamilyDao(s.Resolve(), s.Resolve(), s.Resolve())).As() + .InstancePerLifetimeScope(); // family - ChickenContainer.Builder.Register(s => new FamilyDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new FamilyDao(s.Resolve(), s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); // map elements - ChickenContainer.Builder.Register(s => new MapMonsterDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); - ChickenContainer.Builder.Register(s => new MapNpcDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); - ChickenContainer.Builder.Register(s => new MapPortalDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new MapMonsterDao(s.Resolve(), s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new MapNpcDao(s.Resolve(), s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new MapPortalDao(s.Resolve(), s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); // shops - ChickenContainer.Builder.Register(s => new ShopDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); - ChickenContainer.Builder.Register(s => new ShopItemDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); - ChickenContainer.Builder.Register(s => new ShopSkillDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new ShopDao(s.Resolve(), s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new ShopItemDao(s.Resolve(), s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new ShopSkillDao(s.Resolve(), s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); // recipes - ChickenContainer.Builder.Register(s => new RecipeDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); - ChickenContainer.Builder.Register(s => new RecipeItemDao(s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new RecipeDao(s.Resolve(), s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); + ChickenContainer.Builder.Register(s => new RecipeItemDao(s.Resolve(), s.Resolve(), s.Resolve())).As().InstancePerLifetimeScope(); } public static void RegisterDependencies() diff --git a/src/Plugins/NosSharp.PacketHandler/CharacterScreen/CharacterScreenLoadHandler.cs b/src/Plugins/NosSharp.PacketHandler/CharacterScreen/CharacterScreenLoadHandler.cs index ef42cf4a..de7e3683 100644 --- a/src/Plugins/NosSharp.PacketHandler/CharacterScreen/CharacterScreenLoadHandler.cs +++ b/src/Plugins/NosSharp.PacketHandler/CharacterScreen/CharacterScreenLoadHandler.cs @@ -1,21 +1,23 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Core.Utils; using ChickenAPI.Data.Account; using ChickenAPI.Data.Character; +using ChickenAPI.Data.Enums.Game; +using ChickenAPI.Data.Enums.Game.Items; using ChickenAPI.Data.Item; using ChickenAPI.Data.Server; -using ChickenAPI.Enums.Game; -using ChickenAPI.Enums.Game.Items; using ChickenAPI.Game._Network; -using ChickenAPI.Packets.CharacterSelectionScreen.Client; -using ChickenAPI.Packets.CharacterSelectionScreen.Server; +using ChickenAPI.Packets.ClientPackets.Login; +using ChickenAPI.Packets.Interfaces; +using ChickenAPI.Packets.ServerPackets.CharacterSelectionScreen; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.CharacterScreen { - public class CharacterScreenLoadHandler : GenericSessionPacketHandlerAsync + public class CharacterScreenLoadHandler : GenericSessionPacketHandlerAsync { private readonly IAccountService _accountService; private readonly ICharacterMateService _characterMateService; @@ -23,17 +25,18 @@ public class CharacterScreenLoadHandler : GenericSessionPacketHandlerAsync AccountChecks(EntryPointPacketBase packetBase, ISession session) + private async Task AccountChecks(EntryPointPacket packetBase, ISession session) { string name = packetBase.Name; AccountDto accountDto = await _accountService.GetByNameAsync(name); @@ -89,18 +92,19 @@ private async Task AccountChecks(EntryPointPacketBase packetBase, ISession public Task Handle(ISession session) => Handle(null, session); - protected override async Task Handle(EntryPointPacketBase packet, ISession session) + protected override async Task Handle(EntryPointPacket packet, ISession session) { if (session.Account == null && !await AccountChecks(packet, session)) { return; } + List packets = new List(); Log.Info($"[LOAD_CHARACTERS] {session.Account.Name}"); IEnumerable characters = await _characterService.GetActiveByAccountIdAsync(session.Account.Id); // load characterlist packetBase for each characterEntity in Player - await session.SendPacketAsync(new CListStartPacket { Type = 0 }); + packets.Add(new ClistStartPacket { Type = 0 }); foreach (CharacterDto character in characters) { ItemInstanceDto[] equipment = new ItemInstanceDto[16]; @@ -125,7 +129,7 @@ protected override async Task Handle(EntryPointPacketBase packet, ISession sessi } } - await session.SendPacketAsync(new ClistPacketBase + packets.Add(new ClistPacket() { Slot = character.Slot, Name = character.Name, @@ -157,7 +161,8 @@ await session.SendPacketAsync(new ClistPacketBase }); } - await session.SendPacketAsync(new ClistEndPacketBase()); + packets.Add(new ClistEndPacket()); + await session.SendPacketsAsync(packets); } } } \ No newline at end of file diff --git a/src/Plugins/NosSharp.PacketHandler/CharacterScreen/CreateCharacterHandler.cs b/src/Plugins/NosSharp.PacketHandler/CharacterScreen/CreateCharacterHandler.cs index 8613bd0f..91d7b238 100644 --- a/src/Plugins/NosSharp.PacketHandler/CharacterScreen/CreateCharacterHandler.cs +++ b/src/Plugins/NosSharp.PacketHandler/CharacterScreen/CreateCharacterHandler.cs @@ -1,30 +1,33 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using ChickenAPI.Core.i18n; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Character; -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Data.Enums.Game.Character; using ChickenAPI.Game._i18n; using ChickenAPI.Game._Network; -using ChickenAPI.Packets.CharacterSelectionScreen.Client; -using ChickenAPI.Packets.Game.Server.UserInterface; +using ChickenAPI.Packets.ClientPackets.CharacterSelectionScreen; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.UI; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.CharacterScreen { - public class CreateCharacterHandler : GenericSessionPacketHandlerAsync + public class CreateCharacterHandler : GenericSessionPacketHandlerAsync { private readonly ICharacterService _characterService; private readonly IGameLanguageService _gameLanguageService; private readonly CharacterScreenLoadHandler _screenLoader; - public CreateCharacterHandler(ICharacterService characterService, IGameLanguageService gameLanguageService, CharacterScreenLoadHandler screenLoader) + + public CreateCharacterHandler(ILogger log, ICharacterService characterService, IGameLanguageService gameLanguageService, CharacterScreenLoadHandler screenLoader) : base(log) { _characterService = characterService; _gameLanguageService = gameLanguageService; _screenLoader = screenLoader; } - protected override async Task Handle(CharNewPacketBase packet, ISession session) + protected override async Task Handle(CharNewPacket packet, ISession session) { long accountId = session.Account.Id; byte slot = packet.Slot; diff --git a/src/Plugins/NosSharp.PacketHandler/CharacterScreen/CreateCharacterWrestlerHandler.cs b/src/Plugins/NosSharp.PacketHandler/CharacterScreen/CreateCharacterWrestlerHandler.cs index 9136dff2..e29afc1a 100644 --- a/src/Plugins/NosSharp.PacketHandler/CharacterScreen/CreateCharacterWrestlerHandler.cs +++ b/src/Plugins/NosSharp.PacketHandler/CharacterScreen/CreateCharacterWrestlerHandler.cs @@ -1,27 +1,29 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Character; -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Data.Enums.Game.Character; using ChickenAPI.Game._Network; -using ChickenAPI.Packets.CharacterSelectionScreen.Client; -using ChickenAPI.Packets.Game.Server.UserInterface; +using ChickenAPI.Packets.ClientPackets.CharacterSelectionScreen; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.UI; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.CharacterScreen { - public class CreateCharacterWrestlerHandler : GenericSessionPacketHandlerAsync + public class CreateCharacterWrestlerHandler : GenericSessionPacketHandlerAsync { private readonly ICharacterService _characterService; private readonly CharacterScreenLoadHandler _screenLoader; - public CreateCharacterWrestlerHandler(ICharacterService characterService, CharacterScreenLoadHandler screenLoader) + public CreateCharacterWrestlerHandler(ILogger log, ICharacterService characterService, CharacterScreenLoadHandler screenLoader) : base(log) { _characterService = characterService; _screenLoader = screenLoader; } - protected override async Task Handle(CharNewWrestlerPacketBase packet, ISession session) + protected override async Task Handle(CharNewJobPacket packet, ISession session) { long accountId = session.Account.Id; byte slot = packet.Slot; @@ -82,7 +84,7 @@ await session.SendPacketAsync(new InfoPacket CharacterDto newCharacter = _characterService.GetCreationCharacter(); - newCharacter.Class = CharacterClassType.Wrestler; + newCharacter.Class = CharacterClassType.MartialArtist; newCharacter.Gender = packet.Gender; newCharacter.HairColor = packet.HairColor; newCharacter.HairStyle = packet.HairStyle; diff --git a/src/Plugins/NosSharp.PacketHandler/CharacterScreen/DeleteCharacterHandler.cs b/src/Plugins/NosSharp.PacketHandler/CharacterScreen/DeleteCharacterHandler.cs index f934877d..8a8b3844 100644 --- a/src/Plugins/NosSharp.PacketHandler/CharacterScreen/DeleteCharacterHandler.cs +++ b/src/Plugins/NosSharp.PacketHandler/CharacterScreen/DeleteCharacterHandler.cs @@ -1,30 +1,31 @@ using System; using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Core.Utils; using ChickenAPI.Data.Account; using ChickenAPI.Data.Character; -using ChickenAPI.Enums.Game.Character; +using ChickenAPI.Data.Enums.Game.Character; using ChickenAPI.Game._Network; -using ChickenAPI.Packets.CharacterSelectionScreen.Client; -using ChickenAPI.Packets.Game.Server.UserInterface; +using ChickenAPI.Packets.ClientPackets.CharacterSelectionScreen; +using ChickenAPI.Packets.ServerPackets.UI; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.CharacterScreen { - public class DeleteCharacterHandler : GenericSessionPacketHandlerAsync + public class DeleteCharacterHandler : GenericSessionPacketHandlerAsync { private readonly IAccountService _accountService; private readonly ICharacterService _characterService; private readonly CharacterScreenLoadHandler _screenLoader; - public DeleteCharacterHandler(IAccountService accountService, ICharacterService characterService, CharacterScreenLoadHandler screenLoader) + public DeleteCharacterHandler(ILogger log, IAccountService accountService, ICharacterService characterService, CharacterScreenLoadHandler screenLoader) : base(log) { _accountService = accountService; _characterService = characterService; _screenLoader = screenLoader; } - protected override async Task Handle(CharacterDeletePacketBase packet, ISession session) + protected override async Task Handle(CharacterDeletePacket packet, ISession session) { AccountDto account = await _accountService.GetByIdAsync(session.Account.Id); if (account == null) diff --git a/src/Plugins/NosSharp.PacketHandler/CharacterScreen/GameStartPacketHandler.cs b/src/Plugins/NosSharp.PacketHandler/CharacterScreen/GameStartPacketHandler.cs index 25921a34..4dc4f97f 100644 --- a/src/Plugins/NosSharp.PacketHandler/CharacterScreen/GameStartPacketHandler.cs +++ b/src/Plugins/NosSharp.PacketHandler/CharacterScreen/GameStartPacketHandler.cs @@ -1,10 +1,8 @@ using System.Collections.Generic; using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Character; using ChickenAPI.Data.NpcMonster; -using ChickenAPI.Enums.Packets; -using ChickenAPI.Game.Entities.Mates; -using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; using ChickenAPI.Game.Families.Extensions; using ChickenAPI.Game.Helpers; @@ -12,15 +10,18 @@ using ChickenAPI.Game.Managers; using ChickenAPI.Game._ECS.Entities; using ChickenAPI.Game._Network; -using ChickenAPI.Packets.CharacterSelectionScreen.Client; -using ChickenAPI.Packets.Game.Server.Map; -using ChickenAPI.Packets.Game.Server.Player; -using ChickenAPI.Packets.Game.Server.UserInterface; +using ChickenAPI.Game.Entities.Mates; +using ChickenAPI.Game.Entities.Player; +using ChickenAPI.Packets.ClientPackets.CharacterSelectionScreen; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Map; +using ChickenAPI.Packets.ServerPackets.Player; +using ChickenAPI.Packets.ServerPackets.UI; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.CharacterScreen { - public class GameStartPacketHandler : GenericSessionPacketHandlerAsync + public class GameStartPacketHandler : GenericSessionPacketHandlerAsync { private readonly IAlgorithmService _algorithmService; private readonly ICharacterMateService _characterMateService; @@ -32,7 +33,8 @@ public class GameStartPacketHandler : GenericSessionPacketHandlerAsync + public class SelectCharacterHandler : GenericSessionPacketHandlerAsync { private readonly ICharacterService _characterService; - public SelectCharacterHandler(ICharacterService characterService) => _characterService = characterService; + public SelectCharacterHandler(ILogger log, ICharacterService characterService) : base(log) => _characterService = characterService; - protected override async Task Handle(SelectPacketBase packet, ISession session) + protected override async Task Handle(SelectPacket packet, ISession session) { try { @@ -30,7 +31,7 @@ protected override async Task Handle(SelectPacketBase packet, ISession session) } session.InitializeCharacterId(characterDto.Id); - await session.SendPacketAsync(new OkPacketBase()); + await session.SendPacketAsync(new OkPacket()); } catch (Exception ex) { diff --git a/src/Plugins/NosSharp.PacketHandler/Chat/SayPacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Chat/SayPacketHandling.cs index b51db23b..8152a50d 100644 --- a/src/Plugins/NosSharp.PacketHandler/Chat/SayPacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Chat/SayPacketHandling.cs @@ -1,14 +1,19 @@ using System; using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Chat.Events; using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Packets.Game.Client.Chat; +using ChickenAPI.Packets.ClientPackets.Chat; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Chat { public class SayPacketHandling : GenericGamePacketHandlerAsync { + public SayPacketHandling(ILogger log) : base(log) + { + } + protected override async Task Handle(ClientSayPacket packet, IPlayerEntity player) { try diff --git a/src/Plugins/NosSharp.PacketHandler/Drops/GetPacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Drops/GetPacketHandling.cs index fe8f992d..85067b7b 100644 --- a/src/Plugins/NosSharp.PacketHandler/Drops/GetPacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Drops/GetPacketHandling.cs @@ -1,20 +1,25 @@ using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Core.Utils; -using ChickenAPI.Enums.Game.Entity; using ChickenAPI.Game.Entities.Drop; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; using ChickenAPI.Game.Inventory.Events; -using ChickenAPI.Packets.Game.Client.Drops; +using ChickenAPI.Packets.ClientPackets.Drops; +using ChickenAPI.Packets.Enumerations; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Drops { public class GetPacketHandling : GenericGamePacketHandlerAsync { + public GetPacketHandling(ILogger log) : base(log) + { + } + protected override async Task Handle(GetPacket packet, IPlayerEntity player) { - var mapItem = player.CurrentMap.GetEntity(packet.DropId, VisualType.MapObject); + var mapItem = player.CurrentMap.GetEntity(packet.VisualId, VisualType.Object); if (mapItem == null || PositionHelper.GetDistance(mapItem.Position, player.Position) > 8) { diff --git a/src/Plugins/NosSharp.PacketHandler/Entity/NcifPacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Entity/NcifPacketHandling.cs index c106eeed..4f1b0fc9 100644 --- a/src/Plugins/NosSharp.PacketHandler/Entity/NcifPacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Entity/NcifPacketHandling.cs @@ -1,16 +1,21 @@ using System; using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Battle.Extensions; using ChickenAPI.Game.Battle.Interfaces; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Extensions.UserInterface; -using ChickenAPI.Packets.Game.Client.Battle; +using ChickenAPI.Packets.ClientPackets.Battle; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Entity { public class NcifPacketHandling : GenericGamePacketHandlerAsync { + public NcifPacketHandling(ILogger log) : base(log) + { + } + protected override async Task Handle(NcifPacket packet, IPlayerEntity player) { try diff --git a/src/Plugins/NosSharp.PacketHandler/Entity/ReqInfoPacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Entity/ReqInfoPacketHandling.cs index bf01f0ad..117ed5bc 100644 --- a/src/Plugins/NosSharp.PacketHandler/Entity/ReqInfoPacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Entity/ReqInfoPacketHandling.cs @@ -1,13 +1,18 @@ using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Events; using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Packets.Game.Server.Entities; +using ChickenAPI.Packets.ServerPackets.Entities; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Entity { public class ReqInfoPacketHandling : GenericGamePacketHandlerAsync { + public ReqInfoPacketHandling(ILogger log) : base(log) + { + } + protected override async Task Handle(ReqInfoPacket packet, IPlayerEntity player) { if (packet.MateVNum.HasValue) diff --git a/src/Plugins/NosSharp.PacketHandler/Groups/PJoinPacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Groups/PJoinPacketHandling.cs index cf6af153..81c94fd8 100644 --- a/src/Plugins/NosSharp.PacketHandler/Groups/PJoinPacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Groups/PJoinPacketHandling.cs @@ -1,38 +1,40 @@ using System.Linq; using System.Threading.Tasks; -using ChickenAPI.Enums.Packets; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Groups; using ChickenAPI.Game.Groups.Events; using ChickenAPI.Game.Managers; -using ChickenAPI.Packets.Game.Server.Group; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Groups; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Groups { - public class PJoinPacketHandling : GenericGamePacketHandlerAsync + public class PJoinPacketHandling : GenericGamePacketHandlerAsync { private readonly IPlayerManager _manager; private readonly IGroupManager _groupManager; - public PJoinPacketHandling(IPlayerManager manager, IGroupManager groupManager) + + public PJoinPacketHandling(ILogger log, IPlayerManager manager, IGroupManager groupManager) : base(log) { _manager = manager; _groupManager = groupManager; } - protected override async Task Handle(PJoinPacket packet, IPlayerEntity player) + protected override async Task Handle(PjoinPacket packet, IPlayerEntity player) { switch (packet.RequestType) { - case PJoinPacketType.Requested: - case PJoinPacketType.Invited: + case GroupRequestType.Requested: + case GroupRequestType.Invited: await player.EmitEventAsync(new GroupInvitationSendEvent { Target = _manager.GetPlayerByCharacterId(packet.CharacterId) }); break; - case PJoinPacketType.Accepted: + case GroupRequestType.Accepted: GroupInvitDto group = _groupManager.GetPendingInvitationsByCharacterId(player.Id)?.FirstOrDefault(s => s.Target == player); if (group == null) @@ -45,7 +47,7 @@ await player.EmitEventAsync(new GroupInvitationAcceptEvent Invitation = group }); break; - case PJoinPacketType.Declined: + case GroupRequestType.Declined: GroupInvitDto invitation = _groupManager.GetPendingInvitationsByCharacterId(player.Id)?.FirstOrDefault(s => s.Target == player); if (invitation == null) @@ -58,11 +60,11 @@ await player.EmitEventAsync(new GroupInvitationRefuseEvent() Invitation = invitation }); break; - case PJoinPacketType.Sharing: + case GroupRequestType.Sharing: break; - case PJoinPacketType.AcceptedShare: + case GroupRequestType.AcceptedShare: break; - case PJoinPacketType.DeclinedShare: + case GroupRequestType.DeclinedShare: break; } } diff --git a/src/Plugins/NosSharp.PacketHandler/Guri/GuriPacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Guri/GuriPacketHandling.cs index 382b8865..db0bc866 100644 --- a/src/Plugins/NosSharp.PacketHandler/Guri/GuriPacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Guri/GuriPacketHandling.cs @@ -1,20 +1,29 @@ using System.Linq; using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.GuriHandling.Events; -using ChickenAPI.Packets.Game.Client.Player; +using ChickenAPI.Packets.ClientPackets.Player; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Guri { public class GuriPacketHandling : GenericGamePacketHandlerAsync { + public GuriPacketHandling(ILogger log) : base(log) + { + } + protected override async Task Handle(ClientGuriPacket packet, IPlayerEntity player) { - string[] packetsplit = packet.OriginalContent.Split(' ', '^'); + string[] packetsplit = new[] { "", "" }; // todo; if (packetsplit[1].ElementAt(0) == '#') { - if (!packet.VisualId.HasValue) return; + if (!packet.VisualId.HasValue) + { + return; + } + await player.EmitEventAsync(new GuriEvent { EffectId = packet.Type, diff --git a/src/Plugins/NosSharp.PacketHandler/Inventory/EqInfoPacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Inventory/EqInfoPacketHandling.cs index fa173915..853bee21 100644 --- a/src/Plugins/NosSharp.PacketHandler/Inventory/EqInfoPacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Inventory/EqInfoPacketHandling.cs @@ -1,19 +1,26 @@ using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory.Events; -using ChickenAPI.Packets.Game.Server.Inventory; +using ChickenAPI.Packets.ServerPackets.Player; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Inventory { public class EqInfoPacketHandling : GenericGamePacketHandlerAsync { - protected override Task Handle(EquipmentInfoPacket packet, IPlayerEntity player) => - player.EmitEventAsync(new InventoryEqInfoEvent + public EqInfoPacketHandling(ILogger log) : base(log) + { + } + + protected override async Task Handle(EquipmentInfoPacket packet, IPlayerEntity player) + { + await player.EmitEventAsync(new InventoryEqInfoEvent { Type = packet.Type, Slot = packet.Slot, ShopOwnerId = packet.ShopOwnerId }); + } } } \ No newline at end of file diff --git a/src/Plugins/NosSharp.PacketHandler/Inventory/MviPacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Inventory/MviPacketHandling.cs index 79d86bca..f9d7538b 100644 --- a/src/Plugins/NosSharp.PacketHandler/Inventory/MviPacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Inventory/MviPacketHandling.cs @@ -1,20 +1,27 @@ using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory.Events; -using ChickenAPI.Packets.Game.Client.Inventory; +using ChickenAPI.Packets.ClientPackets.Inventory; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Inventory { public class MviPacketHandling : GenericGamePacketHandlerAsync { - protected override Task Handle(MviPacket packet, IPlayerEntity player) => - player.EmitEventAsync(new InventoryMoveEvent + public MviPacketHandling(ILogger log) : base(log) + { + } + + protected override async Task Handle(MviPacket packet, IPlayerEntity player) + { + await player.EmitEventAsync(new InventoryMoveEvent { - InventoryType = packet.InventoryType, + PocketType = packet.InventoryType, Amount = packet.Amount, - SourceSlot = packet.InventorySlot, + SourceSlot = packet.Slot, DestinationSlot = packet.DestinationSlot }); + } } } \ No newline at end of file diff --git a/src/Plugins/NosSharp.PacketHandler/Inventory/PutPacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Inventory/PutPacketHandling.cs index 5efc5b25..b3764b81 100644 --- a/src/Plugins/NosSharp.PacketHandler/Inventory/PutPacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Inventory/PutPacketHandling.cs @@ -1,19 +1,26 @@ using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory.Events; using ChickenAPI.Game.Inventory.Extensions; -using ChickenAPI.Packets.Game.Client.Inventory; +using ChickenAPI.Packets.ClientPackets.Inventory; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Inventory { public class PutPacketHandling : GenericGamePacketHandlerAsync { - protected override Task Handle(PutPacket packet, IPlayerEntity player) => - player.EmitEventAsync(new InventoryRemoveItemEvent + public PutPacketHandling(ILogger log) : base(log) + { + } + + protected override async Task Handle(PutPacket packet, IPlayerEntity player) + { + await player.EmitEventAsync(new InventoryRemoveItemEvent { - ItemInstance = player.Inventory.GetItemFromSlotAndType(packet.InventorySlot, packet.InventoryType), + ItemInstance = player.Inventory.GetItemFromSlotAndType(packet.Slot, packet.PocketType), Amount = packet.Amount }); + } } } \ No newline at end of file diff --git a/src/Plugins/NosSharp.PacketHandler/Inventory/RemovePacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Inventory/RemovePacketHandling.cs index a263b07e..973050a7 100644 --- a/src/Plugins/NosSharp.PacketHandler/Inventory/RemovePacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Inventory/RemovePacketHandling.cs @@ -1,17 +1,24 @@ using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory.Events; -using ChickenAPI.Packets.Game.Client.Inventory; +using ChickenAPI.Packets.ClientPackets.Inventory; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Inventory { public class RemovePacketHandling : GenericGamePacketHandlerAsync { - protected override Task Handle(RemovePacket packet, IPlayerEntity player) => - player.EmitEventAsync(new InventoryUnequipEvent + public RemovePacketHandling(ILogger log) : base(log) + { + } + + protected override async Task Handle(RemovePacket packet, IPlayerEntity player) + { + await player.EmitEventAsync(new InventoryUnequipEvent { - ItemToUnwear = player.Inventory.Wear[packet.InventorySlot] + ItemToUnwear = player.Inventory.Wear[(int)packet.InventorySlot] }); + } } } \ No newline at end of file diff --git a/src/Plugins/NosSharp.PacketHandler/Inventory/UpgradeItemPaketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Inventory/UpgradeItemPaketHandling.cs index 8be97a7f..39130a40 100644 --- a/src/Plugins/NosSharp.PacketHandler/Inventory/UpgradeItemPaketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Inventory/UpgradeItemPaketHandling.cs @@ -1,15 +1,20 @@ using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Item; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory.Extensions; using ChickenAPI.Game.Inventory.ItemUpgrade.Events; -using ChickenAPI.Packets.Game.Client; +using ChickenAPI.Packets.ClientPackets.Player; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Inventory { public class UpgradeItemPaketHandling : GenericGamePacketHandlerAsync { + public UpgradeItemPaketHandling(ILogger log) : base(log) + { + } + protected override async Task Handle(UpgradePacket packet, IPlayerEntity player) { ItemInstanceDto item = player.Inventory.GetItemFromSlotAndType(packet.Slot, packet.InventoryType); diff --git a/src/Plugins/NosSharp.PacketHandler/Inventory/UseItemPaketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Inventory/UseItemPaketHandling.cs index 08db6779..32d9653f 100644 --- a/src/Plugins/NosSharp.PacketHandler/Inventory/UseItemPaketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Inventory/UseItemPaketHandling.cs @@ -1,31 +1,35 @@ -using System.Linq; -using System.Threading.Tasks; +using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Item; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory.Events; using ChickenAPI.Game.Inventory.Extensions; -using ChickenAPI.Packets.Game.Client.Inventory; +using ChickenAPI.Packets.ClientPackets.Inventory; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Inventory { - public class UseItemPaketHandling : GenericGamePacketHandlerAsync + public class UseItemPaketHandling : GenericGamePacketHandlerAsync { - protected override async Task Handle(UiPacket packet, IPlayerEntity player) + public UseItemPaketHandling(ILogger log) : base(log) { - ItemInstanceDto item = player.Inventory.GetItemFromSlotAndType(packet.InventorySlot, packet.InventoryType); + } + + protected override async Task Handle(UseItemPacket packet, IPlayerEntity player) + { + ItemInstanceDto item = player.Inventory.GetItemFromSlotAndType(packet.Slot, packet.Type); if (item == null) { return; } - string[] packetsplit = packet.OriginalContent.Split(' ', '^'); + // string[] packetsplit = packet.OriginalContent.Split(' ', '^'); await player.EmitEventAsync(new InventoryUseItemEvent { Item = item, - Option = packetsplit[1].ElementAt(0) == '#' ? (byte)50 : (byte)0 + Option = packet.Header.StartsWith("#") ? (byte)50 : (byte)0 // packetsplit[1].ElementAt(0) == '#' ? (byte)50 : (byte)0 }); } } diff --git a/src/Plugins/NosSharp.PacketHandler/Inventory/WearPacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Inventory/WearPacketHandling.cs index ec842e3f..3de68751 100644 --- a/src/Plugins/NosSharp.PacketHandler/Inventory/WearPacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Inventory/WearPacketHandling.cs @@ -1,19 +1,24 @@ using System.Threading.Tasks; -using ChickenAPI.Enums.Game.Items; +using ChickenAPI.Core.Logging; +using ChickenAPI.Data.Enums.Game.Items; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory.Events; -using ChickenAPI.Packets.Game.Client.Inventory; +using ChickenAPI.Packets.ClientPackets.Inventory; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Inventory { public class WearPacketHandling : GenericGamePacketHandlerAsync { + public WearPacketHandling(ILogger log) : base(log) + { + } + protected override Task Handle(WearPacket packet, IPlayerEntity player) => player.EmitEventAsync(new InventoryWearEvent { - ItemWearType = packet.WearPacketType == 0 ? ItemWearType.Player : ItemWearType.Partner, - InventorySlot = packet.ItemSlot + ItemWearType = packet.Type == 0 ? ItemWearType.Player : ItemWearType.Partner, + InventorySlot = packet.InventorySlot }); } } \ No newline at end of file diff --git a/src/Plugins/NosSharp.PacketHandler/Move/PreqPacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Move/PreqPacketHandling.cs index 76fc5efd..a19fa98b 100644 --- a/src/Plugins/NosSharp.PacketHandler/Move/PreqPacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Move/PreqPacketHandling.cs @@ -1,14 +1,19 @@ using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Map; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Portals.Events; -using ChickenAPI.Packets.Game.Client.Movement; +using ChickenAPI.Packets.ClientPackets.Movement; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Move { public class PreqPacketHandling : GenericGamePacketHandlerAsync { + public PreqPacketHandling(ILogger log) : base(log) + { + } + protected override async Task Handle(PreqPacket packet, IPlayerEntity player) { PortalDto currentPortal = player.CurrentMap.Map.GetPortalFromPosition(player.Position.X, player.Position.Y); diff --git a/src/Plugins/NosSharp.PacketHandler/Move/SitPacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Move/SitPacketHandling.cs index 4126d050..cb1f103a 100644 --- a/src/Plugins/NosSharp.PacketHandler/Move/SitPacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Move/SitPacketHandling.cs @@ -1,29 +1,36 @@ using System.Linq; using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Movements.Events; -using ChickenAPI.Packets.Game.Client.Movement; +using ChickenAPI.Packets.ClientPackets.Movement; +using ChickenAPI.Packets.Enumerations; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Move { public class SitPacketHandling : GenericGamePacketHandlerAsync { - protected override Task Handle(SitPacket packet, IPlayerEntity player) + public SitPacketHandling(ILogger log) : base(log) + { + } + + protected override async Task Handle(SitPacket packet, IPlayerEntity player) { foreach (SitSubPacket u in packet.Users) { - if (u.UserType == 1 && u.UserId != player.Character.Id) + if (u.VisualType == VisualType.Player && u.VisualId != player.Character.Id) { - return Task.CompletedTask; + // return; + return; } //TODO: rest on mate } - return player.EmitEventAsync(new TriggerSitEvent + await player.EmitEventAsync(new TriggerSitEvent { - ChildsId = packet.Users.Select(s => s.UserId) + ChildsId = packet.Users.Select(s => s.VisualId) }); } } diff --git a/src/Plugins/NosSharp.PacketHandler/Move/WalkPacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Move/WalkPacketHandling.cs index f9e7cd4c..8ee4a35b 100644 --- a/src/Plugins/NosSharp.PacketHandler/Move/WalkPacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Move/WalkPacketHandling.cs @@ -1,15 +1,19 @@ using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory.Extensions; using ChickenAPI.Game.Movements.Extensions; -using ChickenAPI.Game._ECS.Entities; -using ChickenAPI.Packets.Game.Client.Movement; +using ChickenAPI.Packets.ClientPackets.Movement; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Move { public class WalkPacketHandling : GenericGamePacketHandlerAsync { + public WalkPacketHandling(ILogger log) : base(log) + { + } + protected override async Task Handle(WalkPacket packet, IPlayerEntity player) { if (player.Position.X == packet.XCoordinate && player.Position.Y == packet.YCoordinate) @@ -24,7 +28,7 @@ protected override async Task Handle(WalkPacket packet, IPlayerEntity player) player.Position.X = packet.XCoordinate; player.Position.Y = packet.YCoordinate; - player.Speed = packet.Speed; + player.Speed = (byte)packet.Speed; await player.SendPacketAsync(player.GenerateCondPacket()); await player.BroadcastAsync(player.GenerateMvPacket()); diff --git a/src/Plugins/NosSharp.PacketHandler/NW.Plugins.PacketHandling.csproj b/src/Plugins/NosSharp.PacketHandler/NW.Plugins.PacketHandling.csproj index 23366f69..362beb8f 100644 --- a/src/Plugins/NosSharp.PacketHandler/NW.Plugins.PacketHandling.csproj +++ b/src/Plugins/NosSharp.PacketHandler/NW.Plugins.PacketHandling.csproj @@ -7,10 +7,13 @@ - + + + + + - diff --git a/src/Plugins/NosSharp.PacketHandler/Npc/Dialog/NRunPacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Npc/Dialog/NRunPacketHandling.cs index 0ffec52f..987c2660 100644 --- a/src/Plugins/NosSharp.PacketHandler/Npc/Dialog/NRunPacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Npc/Dialog/NRunPacketHandling.cs @@ -1,20 +1,27 @@ using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.NpcDialog.Events; -using ChickenAPI.Packets.Game.Client.Npcs; +using ChickenAPI.Packets.ClientPackets.Npcs; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Npc.Dialog { public class NRunPacketHandling : GenericGamePacketHandlerAsync { - protected override Task Handle(NrunPacket packet, IPlayerEntity player) => - player.EmitEventAsync(new NpcDialogEvent + public NRunPacketHandling(ILogger log) : base(log) + { + } + + protected override async Task Handle(NrunPacket packet, IPlayerEntity player) + { + await player.EmitEventAsync(new NpcDialogEvent { - DialogId = packet.Runner, - Type = packet.Type, - Value = packet.Value, - NpcId = packet.NpcId + DialogId = (long)packet.Runner, + Type = packet.Type.GetValueOrDefault(), + Value = (int)packet.VisualType, + NpcId = packet.VisualId.GetValueOrDefault() }); + } } } \ No newline at end of file diff --git a/src/Plugins/NosSharp.PacketHandler/PacketHandlerPlugin.cs b/src/Plugins/NosSharp.PacketHandler/PacketHandlerPlugin.cs index a7e6fa8b..61fe5afb 100644 --- a/src/Plugins/NosSharp.PacketHandler/PacketHandlerPlugin.cs +++ b/src/Plugins/NosSharp.PacketHandler/PacketHandlerPlugin.cs @@ -11,7 +11,7 @@ namespace NW.Plugins.PacketHandling { public class PacketHandlerPlugin : IPlugin { - private static readonly Logger Log = Logger.GetLogger(); + // private static readonly Logger Log = Logger.GetLogger(); public PluginEnableTime EnableTime => PluginEnableTime.PostContainerBuild; public string Name => "SaltyEmu"; @@ -37,7 +37,7 @@ public void OnEnable() Type type = handlerType.BaseType.GenericTypeArguments[0]; - Log.Info($"[CHARACTER_SCREEN][HANDLING] {handlerType}"); + // Log.Info($"[CHARACTER_SCREEN][HANDLING] {handlerType}"); packetPipeline.RegisterAsync(handler, type).ConfigureAwait(false).GetAwaiter().GetResult(); } catch (Exception) @@ -58,7 +58,7 @@ public void OnEnable() Type type = handlerType.BaseType.GenericTypeArguments[0]; - Log.Info($"[GAME][HANDLING] {handlerType}"); + // Log.Info($"[GAME][HANDLING] {handlerType}"); packetPipeline.RegisterAsync(handler, type).ConfigureAwait(false).GetAwaiter().GetResult(); } catch (Exception) @@ -69,13 +69,13 @@ public void OnEnable() } catch (Exception e) { - Log.Error("OnEnable", e); + // Log.Error("OnEnable", e); } } public void OnLoad() { - Log.Info("Loading..."); + // Log.Info("Loading..."); ChickenContainer.Builder.RegisterAssemblyTypes(typeof(PacketHandlerPlugin).Assembly).AsClosedTypesOf(typeof(GenericSessionPacketHandlerAsync<>)).PropertiesAutowired(); ChickenContainer.Builder.RegisterAssemblyTypes(typeof(PacketHandlerPlugin).Assembly).AsClosedTypesOf(typeof(GenericGamePacketHandlerAsync<>)).PropertiesAutowired(); } diff --git a/src/Plugins/NosSharp.PacketHandler/Relations/FInsPacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Relations/FInsPacketHandling.cs index 314426bd..0289a7c4 100644 --- a/src/Plugins/NosSharp.PacketHandler/Relations/FInsPacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Relations/FInsPacketHandling.cs @@ -1,24 +1,29 @@ using System.Threading.Tasks; -using ChickenAPI.Enums.Game.Relations; -using ChickenAPI.Enums.Packets; +using ChickenAPI.Core.Logging; +using ChickenAPI.Data.Enums.Game.Relations; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Relations.Events; -using ChickenAPI.Packets.Game.Server.Relations; +using ChickenAPI.Packets.ClientPackets.Relations; +using ChickenAPI.Packets.Enumerations; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Relations { - public class FInsPacketHandling : GenericGamePacketHandlerAsync + public class FInsPacketHandling : GenericGamePacketHandlerAsync { - protected override async Task Handle(FInsPacket packet, IPlayerEntity player) + public FInsPacketHandling(ILogger log) : base(log) + { + } + + protected override async Task Handle(FinsPacket packet, IPlayerEntity player) { switch (packet.Type) { - case FInsPacketType.Accept: - case FInsPacketType.Refuse: + case FinsPacketType.Accepted: + case FinsPacketType.Rejected: await player.EmitEventAsync(new RelationInvitationProcessEvent { - Type = packet.Type == FInsPacketType.Accept ? RelationInvitationProcessType.Accept : RelationInvitationProcessType.Refuse, + Type = packet.Type == FinsPacketType.Accepted ? RelationInvitationProcessType.Accept : RelationInvitationProcessType.Refuse, TargetCharacterId = packet.CharacterId }); break; diff --git a/src/Plugins/NosSharp.PacketHandler/Shops/BuyPacketHandler.cs b/src/Plugins/NosSharp.PacketHandler/Shops/BuyPacketHandler.cs index dd993405..f2e816b2 100644 --- a/src/Plugins/NosSharp.PacketHandler/Shops/BuyPacketHandler.cs +++ b/src/Plugins/NosSharp.PacketHandler/Shops/BuyPacketHandler.cs @@ -1,20 +1,27 @@ using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Shops.Events; -using ChickenAPI.Packets.Game.Client.Shops; +using ChickenAPI.Packets.ClientPackets.Shops; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Shops { public class BuyPacketHandler : GenericGamePacketHandlerAsync { - protected override Task Handle(BuyPacket packet, IPlayerEntity player) => - player.EmitEventAsync(new ShopBuyEvent + public BuyPacketHandler(ILogger log) : base(log) + { + } + + protected override async Task Handle(BuyPacket packet, IPlayerEntity player) + { + await player.EmitEventAsync(new ShopBuyEvent { Amount = packet.Amount, - OwnerId = packet.OwnerId, + OwnerId = packet.VisualId, Slot = packet.Slot, - Type = packet.Type + Type = packet.VisualType }); + } } } \ No newline at end of file diff --git a/src/Plugins/NosSharp.PacketHandler/Shops/NpcReqPacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Shops/NpcReqPacketHandling.cs index 761698f2..2ee79100 100644 --- a/src/Plugins/NosSharp.PacketHandler/Shops/NpcReqPacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Shops/NpcReqPacketHandling.cs @@ -1,20 +1,26 @@ using System.Threading.Tasks; -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Npc; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Shops.Events; -using ChickenAPI.Packets.Game.Client.Shops; +using ChickenAPI.Packets.ClientPackets.Npcs; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Shop; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Shops { - public class NpcReqPacketHandling : GenericGamePacketHandlerAsync + public class NpcReqPacketHandling : GenericGamePacketHandlerAsync { - protected override async Task Handle(ReceivedNpcReqPacket packet, IPlayerEntity player) + public NpcReqPacketHandling(ILogger log) : base(log) { - if (packet.VisualType == VisualType.Character) + } + + protected override async Task Handle(RequestNpcPacket packet, IPlayerEntity player) + { + if (packet.Type == VisualType.Player) { - IPlayerEntity shop = player.CurrentMap.GetPlayerById(packet.VisualId); + IPlayerEntity shop = player.CurrentMap.GetPlayerById(packet.TargetId); if (shop == null) { return; @@ -24,13 +30,18 @@ protected override async Task Handle(ReceivedNpcReqPacket packet, IPlayerEntity return; } - var npc = player.CurrentMap.GetEntity(packet.VisualId, VisualType.Npc); + var npc = player.CurrentMap.GetEntity(packet.TargetId, VisualType.Npc); + + if (npc == null) + { + return; + } - await player.SendPacketAsync(new SentNpcReqPacket + await player.SendPacketAsync(new RequestNpcPacket() { - VisualType = VisualType.Npc, - VisualId = npc.MapNpc.Id, - Dialog = npc.MapNpc.Dialog + Type = VisualType.Npc, + TargetId = npc.MapNpc.Id, + Data = npc.MapNpc.Dialog }); } } diff --git a/src/Plugins/NosSharp.PacketHandler/Shops/PersonalShopCreationHandling.cs b/src/Plugins/NosSharp.PacketHandler/Shops/PersonalShopCreationHandling.cs index 7236dfdc..093dfb82 100644 --- a/src/Plugins/NosSharp.PacketHandler/Shops/PersonalShopCreationHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Shops/PersonalShopCreationHandling.cs @@ -2,32 +2,46 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Core.Utils; using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; using ChickenAPI.Game.Inventory.Extensions; using ChickenAPI.Game.Shops; using ChickenAPI.Game.Shops.Events; using ChickenAPI.Game.Shops.Extensions; -using ChickenAPI.Packets.Game.Client.Shops; -using ChickenAPI.Packets.Game.Server.Shop; +using ChickenAPI.Packets.ClientPackets.Shops; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Shop; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Shops { public class PersonalShopCreationHandling : GenericGamePacketHandlerAsync { + public PersonalShopCreationHandling(ILogger log) : base(log) + { + } + protected override async Task Handle(MShopPacket packet, IPlayerEntity player) { switch (packet.Type) { - case MShopPacketType.OpenShop: + case CreateShopPacketType.Create: try { - ShopPlayerShopCreateEvent e = ParseMShopPacket(packet.PacketData, player); + //ShopPlayerShopCreateEvent e = ParseMShopPacket(packet.ItemList, player); + var e = new ShopPlayerShopCreateEvent + { + ShopItems = packet.ItemList.Select(s => new PersonalShopItem + { + Slot = s.Slot, + Price = s.Price, + ItemInstance = player.Inventory.GetItemFromSlotAndType(s.Slot, s.Type), + Quantity = s.Amount + }).ToList() + }; if (e?.ShopItems.Any() == true) { await player.EmitEventAsync(e); @@ -44,13 +58,13 @@ protected override async Task Handle(MShopPacket packet, IPlayerEntity player) } break; - case MShopPacketType.CloseShop: + case CreateShopPacketType.Close: await player.ClosePersonalShopAsync(); player.IsSitting = false; await player.ActualizePlayerCondition(); return; - case MShopPacketType.OpenDialog: - await player.SendPacketAsync(new IShopPacket()); + case CreateShopPacketType.Open: + await player.SendPacketAsync(new IshopPacket()); return; default: return; @@ -65,7 +79,7 @@ private static ShopPlayerShopCreateEvent ParseMShopPacket(string data, IPlayerEn }; string[] packetsplit = data.Split(' '); - InventoryType[] type = new InventoryType[20]; + PocketType[] type = new PocketType[20]; long[] gold = new long[20]; short[] slot = new short[20]; byte[] qty = new byte[20]; diff --git a/src/Plugins/NosSharp.PacketHandler/Shops/ShoppingPacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Shops/ShoppingPacketHandling.cs index 51dd0e02..58300ce3 100644 --- a/src/Plugins/NosSharp.PacketHandler/Shops/ShoppingPacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Shops/ShoppingPacketHandling.cs @@ -1,18 +1,23 @@ using System.Threading.Tasks; -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Npc; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Shops.Events; -using ChickenAPI.Packets.Game.Client.Shops; +using ChickenAPI.Packets.ClientPackets.Shops; +using ChickenAPI.Packets.Enumerations; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Shops { public class ShoppingPacketHandling : GenericGamePacketHandlerAsync { + public ShoppingPacketHandling(ILogger log) : base(log) + { + } + protected override Task Handle(ShoppingPacket packet, IPlayerEntity player) { - var npc = player.CurrentMap.GetEntity(packet.NpcId, VisualType.Npc); + var npc = player.CurrentMap.GetEntity(packet.VisualId, VisualType.Npc); if (npc == null) { Log.Info("npc null"); @@ -22,7 +27,7 @@ protected override Task Handle(ShoppingPacket packet, IPlayerEntity player) return player.EmitEventAsync(new ShopGetInformationEvent { Shop = npc, - Type = packet.Type + Type = (byte)packet.VisualType }); } } diff --git a/src/Plugins/NosSharp.PacketHandler/Skill/MultiTargetListPacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Skill/MultiTargetListPacketHandling.cs index 9233389d..5cc6881d 100644 --- a/src/Plugins/NosSharp.PacketHandler/Skill/MultiTargetListPacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Skill/MultiTargetListPacketHandling.cs @@ -1,15 +1,19 @@ using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Packets.Game.Client.Battle; +using ChickenAPI.Packets.ClientPackets.Battle; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Skill { public class MultiTargetListPacketHandling : GenericGamePacketHandlerAsync { + public MultiTargetListPacketHandling(ILogger log) : base(log) + { + } + protected override Task Handle(MultiTargetListPacket packet, IPlayerEntity player) { - Log.Debug(packet.OriginalContent); return Task.CompletedTask; } } diff --git a/src/Plugins/NosSharp.PacketHandler/Skill/QuickListPacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Skill/QuickListPacketHandling.cs index e2201095..286dc1fb 100644 --- a/src/Plugins/NosSharp.PacketHandler/Skill/QuickListPacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Skill/QuickListPacketHandling.cs @@ -1,13 +1,18 @@ using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Quicklist.Events; -using ChickenAPI.Packets.Game.Client.Player; +using ChickenAPI.Packets.ClientPackets.Quicklist; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Skill { public class QuickListPacketHandling : GenericGamePacketHandlerAsync { + public QuickListPacketHandling(ILogger log) : base(log) + { + } + protected override async Task Handle(QsetPacket packet, IPlayerEntity player) { switch (packet.Type) diff --git a/src/Plugins/NosSharp.PacketHandler/Skill/UseAoeSkillPacketHandler.cs b/src/Plugins/NosSharp.PacketHandler/Skill/UseAoeSkillPacketHandler.cs index b11eabd2..b3fb774a 100644 --- a/src/Plugins/NosSharp.PacketHandler/Skill/UseAoeSkillPacketHandler.cs +++ b/src/Plugins/NosSharp.PacketHandler/Skill/UseAoeSkillPacketHandler.cs @@ -1,12 +1,17 @@ using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Packets.Game.Client.Battle; +using ChickenAPI.Packets.ClientPackets.Battle; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Skill { public class UseAoeSkillPacketHandler : GenericGamePacketHandlerAsync { + public UseAoeSkillPacketHandler(ILogger log) : base(log) + { + } + protected override Task Handle(UseAoeSkillPacket packet, IPlayerEntity player) => Task.CompletedTask; } } \ No newline at end of file diff --git a/src/Plugins/NosSharp.PacketHandler/Skill/UseSkillPacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Skill/UseSkillPacketHandling.cs index ed21e7aa..12cf8d5b 100644 --- a/src/Plugins/NosSharp.PacketHandler/Skill/UseSkillPacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Skill/UseSkillPacketHandling.cs @@ -1,21 +1,25 @@ using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Skills; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game.Battle.Extensions; using ChickenAPI.Game.Battle.Interfaces; using ChickenAPI.Game.Entities.Monster; using ChickenAPI.Game.Entities.Npc; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Skills.Args; -using ChickenAPI.Packets.Game.Client.Battle; -using ChickenAPI.Packets.Game.Server.Battle; +using ChickenAPI.Packets.ClientPackets.Battle; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Battle; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Skill { public class UseSkillPacketHandling : GenericGamePacketHandlerAsync { + public UseSkillPacketHandling(ILogger log) : base(log) + { + } + protected override async Task Handle(UseSkillPacket packet, IPlayerEntity player) { if (packet.CastId != 0) @@ -28,7 +32,7 @@ protected override async Task Handle(UseSkillPacket packet, IPlayerEntity player player.IsSitting = false; } - if (!player.SkillComponent.SkillsByCastId.TryGetValue(packet.CastId, out SkillDto skill)) + if (!player.SkillsByCastId.TryGetValue(packet.CastId, out SkillDto skill)) { // skill does not exist await player.SendPacketAsync(player.GenerateEmptyCancelPacket(CancelPacketType.NotInCombatMode)); @@ -39,8 +43,8 @@ protected override async Task Handle(UseSkillPacket packet, IPlayerEntity player IBattleEntity target = null; switch (packet.TargetVisualType) { - case VisualType.Character: - target = player.CurrentMap.GetEntity(packet.TargetId, VisualType.Character); + case VisualType.Player: + target = player.CurrentMap.GetEntity(packet.TargetId, VisualType.Player); break; case VisualType.Monster: target = player.CurrentMap.GetEntity(packet.TargetId, VisualType.Monster); diff --git a/src/Plugins/NosSharp.PacketHandler/Specialists/SlPacketHandling.cs b/src/Plugins/NosSharp.PacketHandler/Specialists/SlPacketHandling.cs index 98f6c71b..0013e1cd 100644 --- a/src/Plugins/NosSharp.PacketHandler/Specialists/SlPacketHandling.cs +++ b/src/Plugins/NosSharp.PacketHandler/Specialists/SlPacketHandling.cs @@ -1,35 +1,38 @@ using System.Linq; using System.Threading.Tasks; -using ChickenAPI.Enums; -using ChickenAPI.Enums.Packets; +using ChickenAPI.Core.Logging; +using ChickenAPI.Data.Enums; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Specialists.Args; -using ChickenAPI.Packets.Game.Client.Specialists; +using ChickenAPI.Packets.ClientPackets.Specialists; +using ChickenAPI.Packets.Enumerations; using NW.Plugins.PacketHandling.Utils; namespace NW.Plugins.PacketHandling.Specialists { - public class SlPacketHandling : GenericGamePacketHandlerAsync + public class SlPacketHandling : GenericGamePacketHandlerAsync { - protected override Task Handle(SlPacket packet, IPlayerEntity player) + public SlPacketHandling(ILogger log) : base(log) { - string[] packetsplit = packet.OriginalContent.Split(' ', '^'); + } + protected override Task Handle(SpTransformPacket packet, IPlayerEntity player) + { switch (packet.Type) { case SlPacketType.WearSp: return player.EmitEventAsync(new SpTransformEvent { - Wait = packetsplit[1].ElementAt(0) == '#' ? false : player.Session.Account.Authority >= AuthorityType.GameMaster ? false : true + Wait = packet.Header.StartsWith("#") && player.Session.Account.Authority < AuthorityType.GameMaster }); case SlPacketType.ChangePoints: return player.EmitEventAsync(new SpChangePointsEvent { - Attack = packet.SpecialistDamage, - Defense = packet.SpecialistDefense, - Element = packet.SpecialistElement, - HpMp = packet.SpecialistHp + Attack = packet.SpecialistDamage.GetValueOrDefault(), + Defense = packet.SpecialistDefense.GetValueOrDefault(), + Element = packet.SpecialistElement.GetValueOrDefault(), + HpMp = packet.SpecialistHP.GetValueOrDefault() }); } diff --git a/src/Plugins/NosSharp.PacketHandler/Utils/GenericGamePacketHandlerAsync.cs b/src/Plugins/NosSharp.PacketHandler/Utils/GenericGamePacketHandlerAsync.cs index d0d192e9..e0db10f2 100644 --- a/src/Plugins/NosSharp.PacketHandler/Utils/GenericGamePacketHandlerAsync.cs +++ b/src/Plugins/NosSharp.PacketHandler/Utils/GenericGamePacketHandlerAsync.cs @@ -2,13 +2,18 @@ using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game._Network; -using ChickenAPI.Packets; +using ChickenAPI.Packets.Interfaces; namespace NW.Plugins.PacketHandling.Utils { public abstract class GenericGamePacketHandlerAsync : IPacketProcessor where T : class, IPacket { - protected readonly Logger Log = Logger.GetLogger(); + protected readonly ILogger Log; + + protected GenericGamePacketHandlerAsync(ILogger log) + { + Log = log; + } public Task Handle(IPacket packet, ISession session) { diff --git a/src/Plugins/NosSharp.PacketHandler/Utils/GenericSessionPacketHandlerAsync.cs b/src/Plugins/NosSharp.PacketHandler/Utils/GenericSessionPacketHandlerAsync.cs index d8b4539b..bd169373 100644 --- a/src/Plugins/NosSharp.PacketHandler/Utils/GenericSessionPacketHandlerAsync.cs +++ b/src/Plugins/NosSharp.PacketHandler/Utils/GenericSessionPacketHandlerAsync.cs @@ -1,13 +1,18 @@ using System.Threading.Tasks; using ChickenAPI.Core.Logging; using ChickenAPI.Game._Network; -using ChickenAPI.Packets; +using ChickenAPI.Packets.Interfaces; namespace NW.Plugins.PacketHandling.Utils { public abstract class GenericSessionPacketHandlerAsync : IPacketProcessor where T : class, IPacket { - protected readonly Logger Log = Logger.GetLogger(); + protected readonly ILogger Log; + + protected GenericSessionPacketHandlerAsync(ILogger log) + { + Log = log; + } public Task Handle(IPacket packet, ISession session) { diff --git a/src/Plugins/NosSharp.Pathfinder/PathfinderPlugin.cs b/src/Plugins/NosSharp.Pathfinder/PathfinderPlugin.cs index ce1a9325..d2169b66 100644 --- a/src/Plugins/NosSharp.Pathfinder/PathfinderPlugin.cs +++ b/src/Plugins/NosSharp.Pathfinder/PathfinderPlugin.cs @@ -10,15 +10,14 @@ namespace SaltyEmu.PathfinderPlugin { public class PathfinderPlugin : IPlugin { - private static readonly Logger Log = Logger.GetLogger(); public PluginEnableTime EnableTime => PluginEnableTime.PostContainerBuild; public string Name => nameof(PathfinderPlugin); public void OnLoad() { - Log.Info("Loading..."); + //Log.Info("Loading..."); ChickenContainer.Builder.Register(s => new Pathfinder()).As(); - Log.Info("Loaded !"); + // Log.Info("Loaded !"); } public void ReloadConfig() diff --git a/src/Plugins/NosSharp.Pathfinder/SaltyEmu.PathfinderPlugin.csproj b/src/Plugins/NosSharp.Pathfinder/SaltyEmu.PathfinderPlugin.csproj index 1cc278aa..09db8f21 100644 --- a/src/Plugins/NosSharp.Pathfinder/SaltyEmu.PathfinderPlugin.csproj +++ b/src/Plugins/NosSharp.Pathfinder/SaltyEmu.PathfinderPlugin.csproj @@ -4,6 +4,10 @@ netstandard2.0 + + + + diff --git a/src/Plugins/NosSharp.Pathfinder/Test/PathfinderTest.cs b/src/Plugins/NosSharp.Pathfinder/Test/PathfinderTest.cs index f40f5b4b..308b5536 100644 --- a/src/Plugins/NosSharp.Pathfinder/Test/PathfinderTest.cs +++ b/src/Plugins/NosSharp.Pathfinder/Test/PathfinderTest.cs @@ -10,10 +10,16 @@ namespace SaltyEmu.PathfinderPlugin.Test { public class PathfinderTest { - private static readonly Logger Log = Logger.GetLogger(); + private readonly ILogger Log; + + public PathfinderTest(ILogger log) + { + Log = log; + } public void RunTest(int repetition) { + /* var pathfinder = ChickenContainer.Instance.Resolve(); var map = new SimpleMap(new MapDto { @@ -43,6 +49,7 @@ public void RunTest(int repetition) { Log.Info($"x : {pos.X}, y : {pos.Y}"); } + */ } } } \ No newline at end of file diff --git a/src/Plugins/NosSharp.RedisSessionPlugin/Redis/ServerApiService.cs b/src/Plugins/NosSharp.RedisSessionPlugin/Redis/ServerApiService.cs index 2791412b..e78ad736 100644 --- a/src/Plugins/NosSharp.RedisSessionPlugin/Redis/ServerApiService.cs +++ b/src/Plugins/NosSharp.RedisSessionPlugin/Redis/ServerApiService.cs @@ -16,11 +16,12 @@ namespace SaltyEmu.RedisWrappers.Redis public class ServerApiService : IServerApiService { private static readonly string Prefix = nameof(WorldServerDto).ToLower(); - private readonly Logger _log = Logger.GetLogger(); + private readonly ILogger _log; private readonly ICacheClient _cache; - public ServerApiService(RedisConfiguration config) + public ServerApiService(RedisConfiguration config, ILogger log) { + _log = log; var options = new RedisCacheClientOptions { ConnectionMultiplexer = ConnectionMultiplexer.Connect(config.Host), diff --git a/src/Plugins/NosSharp.RedisSessionPlugin/Redis/SessionService.cs b/src/Plugins/NosSharp.RedisSessionPlugin/Redis/SessionService.cs index c9307640..c1867bc4 100644 --- a/src/Plugins/NosSharp.RedisSessionPlugin/Redis/SessionService.cs +++ b/src/Plugins/NosSharp.RedisSessionPlugin/Redis/SessionService.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; +using ChickenAPI.Data.Enums.Game; using ChickenAPI.Data.Server; -using ChickenAPI.Enums.Game; using Foundatio.Caching; using SaltyEmu.Redis; using StackExchange.Redis; diff --git a/src/Plugins/NosSharp.RedisSessionPlugin/RedisPlugin.cs b/src/Plugins/NosSharp.RedisSessionPlugin/RedisPlugin.cs index 38c2b33b..116a53b2 100644 --- a/src/Plugins/NosSharp.RedisSessionPlugin/RedisPlugin.cs +++ b/src/Plugins/NosSharp.RedisSessionPlugin/RedisPlugin.cs @@ -1,20 +1,24 @@ using System; using Autofac; -using ChickenAPI.Core.i18n; +using ChickenAPI.Core.Configurations; using ChickenAPI.Core.IoC; using ChickenAPI.Core.Logging; using ChickenAPI.Core.Plugins; -using ChickenAPI.Core.Utils; using ChickenAPI.Data.Server; using ChickenAPI.Game._i18n; +using ChickenAPI.Game.Impl; using SaltyEmu.Redis; -using SaltyEmu.RedisWrappers.Redis; namespace SaltyEmu.RedisWrappers { public class RedisPlugin : IPlugin { - private static readonly Logger Log = Logger.GetLogger(); + public RedisPlugin(ILogger log) + { + _log = log; + } + + private readonly ILogger _log; private readonly string _configurationPath = $"plugins/config/{nameof(RedisPlugin)}/conf.json"; private RedisConfiguration _configuration; public PluginEnableTime EnableTime => PluginEnableTime.PreContainerBuild; @@ -22,7 +26,6 @@ public class RedisPlugin : IPlugin public void OnDisable() { - throw new NotImplementedException(); } public void OnEnable() @@ -32,14 +35,12 @@ public void OnEnable() public void OnLoad() { - Log.Info("Loading..."); - _configuration = ConfigurationHelper.Load(_configurationPath, true); - ChickenContainer.Builder.Register(s => new RedisSessionService(_configuration)).As(); - Log.Info("ISessionService registered !"); - ChickenContainer.Builder.Register(s => new RedisServerApi(_configuration)).As(); - Log.Info("IServerApiService registered !"); - ChickenContainer.Builder.Register(s => new RedisGameLanguageService(_configuration)).As(); - Log.Info("IGameLanguageService registered !"); + IConfigurationManager conf = new ConfigurationHelper(new JsonConfigurationSerializer()); + _configuration = conf.Load(_configurationPath, true); + ChickenContainer.Builder.Register(s => _configuration).As(); + ChickenContainer.Builder.RegisterType().As(); + ChickenContainer.Builder.RegisterType().As(); + ChickenContainer.Builder.RegisterType().As(); } public void ReloadConfig() diff --git a/src/Plugins/NosSharp.RedisSessionPlugin/RedisSessionService.cs b/src/Plugins/NosSharp.RedisSessionPlugin/RedisSessionService.cs index 0a993449..a9245f88 100644 --- a/src/Plugins/NosSharp.RedisSessionPlugin/RedisSessionService.cs +++ b/src/Plugins/NosSharp.RedisSessionPlugin/RedisSessionService.cs @@ -1,8 +1,8 @@ using System; using System.Linq; using ChickenAPI.Core.Logging; +using ChickenAPI.Data.Enums.Game; using ChickenAPI.Data.Server; -using ChickenAPI.Enums.Game; using SaltyEmu.Redis; using ServiceStack.Redis; using ServiceStack.Redis.Generic; @@ -11,11 +11,12 @@ namespace SaltyEmu.RedisWrappers { public class RedisSessionService : ISessionService { - private readonly Logger _log = Logger.GetLogger(); + private readonly ILogger _log; private readonly IRedisTypedClient _client; - public RedisSessionService(RedisConfiguration configuration) + public RedisSessionService(RedisConfiguration configuration, ILogger log) { + _log = log; _client = new RedisClient(new RedisEndpoint { Host = configuration.Host, diff --git a/src/Plugins/NosSharp.RedisSessionPlugin/SaltyEmu.RedisWrappers.csproj b/src/Plugins/NosSharp.RedisSessionPlugin/SaltyEmu.RedisWrappers.csproj index 3cb41101..47e7dc60 100644 --- a/src/Plugins/NosSharp.RedisSessionPlugin/SaltyEmu.RedisWrappers.csproj +++ b/src/Plugins/NosSharp.RedisSessionPlugin/SaltyEmu.RedisWrappers.csproj @@ -5,6 +5,7 @@ + @@ -12,6 +13,7 @@ + diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/BCardHandlers/BCardBuffHandler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/BCardHandlers/BCardBuffHandler.cs index f73d86d6..25f72e79 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/BCardHandlers/BCardBuffHandler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/BCardHandlers/BCardBuffHandler.cs @@ -3,31 +3,34 @@ using ChickenAPI.Core.Logging; using ChickenAPI.Core.Maths; using ChickenAPI.Data.BCard; +using ChickenAPI.Data.Enums.Game.BCard; using ChickenAPI.Data.Skills; -using ChickenAPI.Enums.Game.BCard; using ChickenAPI.Game.Battle.Extensions; using ChickenAPI.Game.Battle.Interfaces; using ChickenAPI.Game.BCards; using ChickenAPI.Game.Buffs; using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Packets.Game.Server.Battle; +using ChickenAPI.Packets.ServerPackets.Battle; namespace SaltyEmu.BasicPlugin.BCardHandlers { public static class BCardBuffHandler { - static readonly Logger Log = Logger.GetLogger(); - public static BfPacket GenerateBfPacket(this IPlayerEntity player, BuffContainer buff) { return new BfPacket { VisualType = player.Type, VisualId = player.Id, - BuffId = buff.Id, + Buff = new BfPacket.BuffElementSubPacket + { + BuffId = buff.Id, + ChargeValue = 0, + Duration = buff.Duration, + + }, BuffLevel = buff.Level, - ChargeValue = 0, - Duration = buff.Duration, + }; } @@ -44,7 +47,7 @@ public static void Handle(IBattleEntity target, IBattleEntity sender, BCardDto b if (card == null) { - Log.Debug($"Couldn't find any buff with card Id : {bcard.SecondData}"); + //Log.Debug($"Couldn't find any buff with card Id : {bcard.SecondData}"); return; } diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/BCardHandlers/BasicBCardHandlerContainer.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/BCardHandlers/BasicBCardHandlerContainer.cs index 905d8f1b..88548566 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/BCardHandlers/BasicBCardHandlerContainer.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/BCardHandlers/BasicBCardHandlerContainer.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using ChickenAPI.Core.Logging; using ChickenAPI.Data.BCard; -using ChickenAPI.Enums.Game.BCard; +using ChickenAPI.Data.Enums.Game.BCard; using ChickenAPI.Game.Battle.Interfaces; using ChickenAPI.Game.BCards; @@ -13,12 +13,12 @@ namespace SaltyEmu.BasicPlugin.BCardHandlers { public class BasicBCardHandlerContainer : IBCardHandlerContainer { - private static readonly Logger Log = Logger.GetLogger(); - + private readonly ILogger _log; protected readonly Dictionary Useitem = new Dictionary(); - public BasicBCardHandlerContainer() + public BasicBCardHandlerContainer(ILogger log) { + _log = log; Assembly currentAsm = Assembly.GetAssembly(typeof(BasicPlugin)); // get types foreach (Type type in currentAsm.GetTypes().Where(s => s.GetMethods().Any(m => m.GetCustomAttribute() != null))) @@ -39,23 +39,24 @@ public void Register(IBCardEffectHandler handler) } Useitem.Add(handler.HandledType, handler); - Log.Info($"[REGISTER_HANDLER] BCARD_TYPE : {handler.HandledType} REGISTERED !"); + _log.Info($"[REGISTER_HANDLER] BCARD_TYPE : {handler.HandledType} REGISTERED !"); } - public Task Handle(IBattleEntity target, IBattleEntity sender, BCardDto bcard) + public async Task Handle(IBattleEntity target, IBattleEntity sender, BCardDto bcard) { if (target == null) { - return Task.CompletedTask; + return; } - Log.Info($"Trying to cast Bcard id : {bcard.Id} : {bcard.Type}"); + + _log.Info($"Trying to cast Bcard id : {bcard.Id} : {bcard.Type}"); if (!Useitem.TryGetValue(bcard.Type, out IBCardEffectHandler handler)) { - return Task.CompletedTask; + return; } - return handler.Handle(target, sender, bcard); + await handler.Handle(target, sender, bcard); } } } \ No newline at end of file diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/BasicPlugin.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/BasicPlugin.cs index bc1c6c88..36ff4cfc 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/BasicPlugin.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/BasicPlugin.cs @@ -5,7 +5,6 @@ namespace SaltyEmu.BasicPlugin { public class BasicPlugin : IPlugin { - private static readonly Logger Log = Logger.GetLogger(); public PluginEnableTime EnableTime => PluginEnableTime.PostContainerBuild; public string Name => nameof(BasicPlugin); @@ -23,9 +22,9 @@ public void OnEnable() public void OnLoad() { - Log.Info("Loading..."); + // Log.Info("Loading..."); BasicPluginIoCInjector.InjectDependencies(); - Log.Info("Loaded !"); + // Log.Info("Loaded !"); } public void ReloadConfig() diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/BasicPluginIoCInjector.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/BasicPluginIoCInjector.cs index 8d9ed5b7..0a860104 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/BasicPluginIoCInjector.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/BasicPluginIoCInjector.cs @@ -1,6 +1,6 @@ using System; -using System.Collections.Generic; using Autofac; +using ChickenAPI.Core.Configurations; using ChickenAPI.Core.Events; using ChickenAPI.Core.IoC; using ChickenAPI.Core.Logging; @@ -8,28 +8,24 @@ using ChickenAPI.Core.Utils; using ChickenAPI.Data.BCard; using ChickenAPI.Data.Item; -using ChickenAPI.Game; using ChickenAPI.Game.Battle.Hitting; using ChickenAPI.Game.Battle.Interfaces; using ChickenAPI.Game.BCards; using ChickenAPI.Game.Configuration; using ChickenAPI.Game.Entities; -using ChickenAPI.Game.Groups; using ChickenAPI.Game.GuriHandling.Handling; -using ChickenAPI.Game.Inventory.ItemUpgrade; using ChickenAPI.Game.Inventory.ItemUpgrade.Handlers.Handling; using ChickenAPI.Game.Inventory.ItemUsage; using ChickenAPI.Game.Managers; using ChickenAPI.Game.NpcDialog; using ChickenAPI.Game._ECS; using ChickenAPI.Game._Network; +using ChickenAPI.Game.Impl; using SaltyEmu.BasicPlugin.BCardHandlers; -using SaltyEmu.BasicPlugin.EventHandlers.Battle; using SaltyEmu.BasicPlugin.EventHandlers.Guri; using SaltyEmu.BasicPlugin.Implems; using SaltyEmu.BasicPlugin.ItemUpgradeHandlers; using SaltyEmu.BasicPlugin.ItemUsageHandlers; -using SaltyEmu.BasicPlugin.NpcDialogHandlers; using SaltyEmu.Commands; using SaltyEmu.Commands.Interfaces; @@ -37,8 +33,6 @@ namespace SaltyEmu.BasicPlugin { public class BasicPluginIoCInjector { - private static readonly Logger Log = Logger.GetLogger(); - public static void InitializeEventHandlers() { // first version hardcoded, next one through Plugin + Assembly Reflection @@ -60,7 +54,7 @@ public static void InitializeEventHandlers() } catch (Exception e) { - Log.Error("[EVENT_HANDLER]", e); + // Log.Error("[EVENT_HANDLER]", e); // ignored } } @@ -84,7 +78,7 @@ public static void InitializeNpcDialogHandlers() } catch (Exception e) { - Log.Error("[ITEM_USAGE_HANDLER_REGISTRATION]", e); + // Log.Error("[ITEM_USAGE_HANDLER_REGISTRATION]", e); } } } @@ -107,22 +101,23 @@ public static void InitializeItemUsageHandlers() } catch (Exception e) { - Log.Error("[ITEM_USAGE_HANDLER_REGISTRATION]", e); + // Log.Error("[ITEM_USAGE_HANDLER_REGISTRATION]", e); } } } public static void InjectDependencies() { + var config = new ConfigurationHelper(new JsonConfigurationSerializer()); ChickenContainer.Builder.Register(_ => - ConfigurationHelper.Load($"plugins/config/{nameof(BasicPlugin)}/rates.json", true)) + config.Load($"plugins/config/{nameof(BasicPlugin)}/rates.json", true)) .As().SingleInstance(); // packet handlers ChickenContainer.Builder.Register(_ => new BasicPacketPipelineAsync()).As().SingleInstance(); // event handlers - ChickenContainer.Builder.Register(_ => new BasicEventPipelineAsync()).As().SingleInstance(); + ChickenContainer.Builder.Register(_ => new BasicEventPipelineAsync(_.Resolve())).As().SingleInstance(); ChickenContainer.Builder.RegisterAssemblyTypes(typeof(BasicPlugin).Assembly).AsClosedTypesOf(typeof(GenericEventPostProcessorBase<>)).PropertiesAutowired(); ChickenContainer.Builder.RegisterAssemblyTypes(typeof(BasicPlugin).Assembly).Where(s => s.ImplementsInterface()).PropertiesAutowired().AsSelf(); ChickenContainer.Builder.RegisterAssemblyTypes(typeof(BasicPlugin).Assembly).Where(s => s.ImplementsInterface()).PropertiesAutowired().AsSelf(); @@ -137,22 +132,22 @@ public static void InjectDependencies() ChickenContainer.Builder.RegisterType().AsImplementedInterfaces().PropertiesAutowired().SingleInstance(); // bcard - ChickenContainer.Builder.Register(_ => new BasicBCardHandlerContainer()).As().SingleInstance(); + ChickenContainer.Builder.Register(_ => new BasicBCardHandlerContainer(_.Resolve())).As().SingleInstance(); ChickenContainer.Builder.Register(c => new SimpleItemInstanceDtoFactory(c.Resolve())).As().InstancePerDependency(); ChickenContainer.Builder.Register(_ => new RandomGenerator()).As().InstancePerDependency(); - ChickenContainer.Builder.Register(_ => new BaseGuriHandler()).As().SingleInstance(); + ChickenContainer.Builder.Register(_ => new BaseGuriHandler(_.Resolve())).As().SingleInstance(); // item usage - ChickenContainer.Builder.Register(_ => new UseItemHandlerContainer()).As().SingleInstance(); + ChickenContainer.Builder.Register(s => new UseItemHandlerContainer(s.Resolve())).As().SingleInstance(); // npc dialog ChickenContainer.Builder.Register(_ => new NpcDialogHandlerContainer()).As().SingleInstance(); // entityManagerContainer ChickenContainer.Builder.Register(_ => new SimpleEntityManagerContainer()).As().SingleInstance(); // player manager ChickenContainer.Builder.Register(_ => new SimplePlayerManager()).As().SingleInstance(); - ChickenContainer.Builder.Register(_ => new CommandHandler()).As().SingleInstance(); - ChickenContainer.Builder.Register(_ => new BasicUpgradeHandler()).As().SingleInstance(); + ChickenContainer.Builder.Register(context => new CommandHandler(context.Resolve())).As().SingleInstance(); + ChickenContainer.Builder.Register(s => new BasicUpgradeHandler(s.Resolve())).As().SingleInstance(); } } } \ No newline at end of file diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/CharacterSkills/CharacterSkillServiceClient.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/CharacterSkills/CharacterSkillServiceClient.cs index 24b2e03c..9d33251c 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/CharacterSkills/CharacterSkillServiceClient.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/CharacterSkills/CharacterSkillServiceClient.cs @@ -3,13 +3,12 @@ using ChickenAPI.Core.IPC; using ChickenAPI.Data.Character; using SaltyEmu.Communication.Communicators; -using SaltyEmu.Communication.Configs; namespace SaltyEmu.BasicPlugin.CharacterSkills { - public class CharacterSkillServiceClient : SynchronizedRepositoryMqtt, ICharacterSkillService + public class CharacterSkillServiceClient : SynchronizedRpcRepository, ICharacterSkillService { - public CharacterSkillServiceClient(MqttClientConfigurationBuilder builder, IIpcClient client) : base(builder, client) + public CharacterSkillServiceClient(IRpcClient client) : base(client) { } diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Battle/Battle_FillHitRequest_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Battle/Battle_FillHitRequest_Handler.cs index 04c34e3c..2aedd5dd 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Battle/Battle_FillHitRequest_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Battle/Battle_FillHitRequest_Handler.cs @@ -1,6 +1,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Battle.Events; using ChickenAPI.Game.Battle.Hitting; using ChickenAPI.Game.Battle.Interfaces; @@ -11,10 +12,7 @@ public class Battle_FillHitRequest_Handler : GenericEventPostProcessorBase _algorithm = algorithm; protected override Task Handle(FillHitRequestEvent e, CancellationToken cancellation) { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Battle/Battle_ProcessHitRequest_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Battle/Battle_ProcessHitRequest_Handler.cs index 6d643161..5fa27dba 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Battle/Battle_ProcessHitRequest_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Battle/Battle_ProcessHitRequest_Handler.cs @@ -3,8 +3,8 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.BCard; -using ChickenAPI.Enums.Game.Entity; using ChickenAPI.Game.Battle.Events; using ChickenAPI.Game.Battle.Extensions; using ChickenAPI.Game.Battle.Hitting; @@ -17,7 +17,8 @@ using ChickenAPI.Game.Entities.Npc.Events; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Events; -using ChickenAPI.Packets.Game.Server.Battle; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Battle; namespace SaltyEmu.BasicPlugin.EventHandlers.Battle { @@ -25,10 +26,8 @@ public class Battle_ProcessHitRequest_Handler : GenericEventPostProcessorBase _bCardHandlerContainer = bCardHandlerContainer; protected override async Task Handle(ProcessHitRequestEvent e, CancellationToken cancellation) { @@ -76,7 +75,7 @@ protected override async Task Handle(ProcessHitRequestEvent e, CancellationToken Log.Debug($"[{hitRequest.Sender.Type.ToString()}][{hitRequest.Sender.Id}] ATTACK -> [{hitRequest.Target.Type.ToString()}]({hitRequest.Target.Id}) : {givenDamages} damages"); // sets the new target (for AI) - if (hitRequest.Target.Type != VisualType.Character && !hitRequest.Target.HasTarget) + if (hitRequest.Target.Type != VisualType.Player && !hitRequest.Target.HasTarget) { hitRequest.Target.Target = hitRequest.Sender; } diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Battle/BuffEventHandler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Battle/BuffEventHandler.cs index 89be7eda..06f9ead6 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Battle/BuffEventHandler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Battle/BuffEventHandler.cs @@ -3,12 +3,17 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Battle.Events; namespace SaltyEmu.BasicPlugin.EventHandlers.Battle { public class BattleEntity_AddBuff_Handler : GenericEventPostProcessorBase { + public BattleEntity_AddBuff_Handler(ILogger log) : base(log) + { + } + protected override Task Handle(BattleEntityAddBuffEvent e, CancellationToken cancellation) { return Task.CompletedTask; @@ -17,6 +22,10 @@ protected override Task Handle(BattleEntityAddBuffEvent e, CancellationToken can public class BattleEntity_RemoveBuff_Handler : GenericEventPostProcessorBase { + public BattleEntity_RemoveBuff_Handler(ILogger log) : base(log) + { + } + protected override Task Handle(BattleEntityRemoveBuffEvent e, CancellationToken cancellation) { return Task.CompletedTask; diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Chat/Chat_GlobalChat_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Chat/Chat_GlobalChat_Handler.cs index 051d8c05..e3292d2e 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Chat/Chat_GlobalChat_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Chat/Chat_GlobalChat_Handler.cs @@ -1,6 +1,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Chat.Events; using ChickenAPI.Game.Configuration; using ChickenAPI.Game.Entities.Player; @@ -15,7 +16,7 @@ public class Chat_GlobalChat_Handler : GenericEventPostProcessorBase { + public PlayerChatEventHandler(ILogger log) : base(log) + { + } + protected override async Task Handle(ChatGeneralEvent e, CancellationToken cancellation) { var sayPacket = new SayPacket diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Effects/AddEffectHandler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Effects/AddEffectHandler.cs index 6c5f3d52..d6ce3fa8 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Effects/AddEffectHandler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Effects/AddEffectHandler.cs @@ -1,6 +1,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Effects; using ChickenAPI.Game.Effects.Events; @@ -8,6 +9,10 @@ namespace SaltyEmu.BasicPlugin.EventHandlers.Effects { public class AddEffectHandler : GenericEventPostProcessorBase { + public AddEffectHandler(ILogger log) : base(log) + { + } + protected override Task Handle(AddEffectEvent e, CancellationToken cancellation) { var effects = e.Sender.GetComponent(); @@ -18,7 +23,7 @@ protected override Task Handle(AddEffectEvent e, CancellationToken cancellation) e.Sender.AddComponent(effects); } - effects.Effects.Add(new EffectComponent.Effect(e.EffectId, e.Cooldown)); + effects.Effects.Add(new EffectComponent.Effect((int)e.EffectId, e.Cooldown)); return Task.CompletedTask; } } diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Family/Family_Creation_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Family/Family_Creation_Handler.cs index 921e5c36..1d5282e4 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Family/Family_Creation_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Family/Family_Creation_Handler.cs @@ -1,13 +1,13 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Character; using ChickenAPI.Data.Families; -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Enums.Game.Families; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Families.Events; using ChickenAPI.Game.Families.Extensions; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicPlugin.EventHandlers.Family { @@ -16,10 +16,11 @@ public class Family_Creation_Handler : GenericEventPostProcessorBase _characterFamilyService = characterFamilyService; protected override async Task Handle(FamilyJoinEvent e, CancellationToken cancellation) { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Family/Family_Kick_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Family/Family_Kick_Handler.cs index 3f9549bd..c2e05376 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Family/Family_Kick_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Family/Family_Kick_Handler.cs @@ -1,6 +1,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Character; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Families.Events; @@ -15,11 +16,11 @@ public class Family_Kick_Handler : GenericEventPostProcessorBase _characterFamilyService = characterFamilyService; protected override async Task Handle(FamilyLeaveEvent e, CancellationToken cancellation) { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Groups/Group_InvitationAccept_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Groups/Group_InvitationAccept_Handler.cs index 39ffa04c..3abc85cc 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Groups/Group_InvitationAccept_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Groups/Group_InvitationAccept_Handler.cs @@ -1,13 +1,14 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; -using ChickenAPI.Enums.Packets; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; using ChickenAPI.Game.Groups; using ChickenAPI.Game.Groups.Events; using ChickenAPI.Game.Helpers; using ChickenAPI.Game._i18n; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicPlugin.EventHandlers { @@ -15,10 +16,8 @@ public class Group_InvitationAccept_Handler : GenericEventPostProcessorBase _groupManager = groupManager; protected override async Task Handle(GroupInvitationAcceptEvent e, CancellationToken cancellation) { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Groups/Group_InvitationRefuse_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Groups/Group_InvitationRefuse_Handler.cs index 091cbadc..149004bf 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Groups/Group_InvitationRefuse_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Groups/Group_InvitationRefuse_Handler.cs @@ -1,12 +1,17 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Groups.Events; namespace SaltyEmu.BasicPlugin.EventHandlers { public class Group_InvitationRefuse_Handler : GenericEventPostProcessorBase { + public Group_InvitationRefuse_Handler(ILogger log) : base(log) + { + } + protected override Task Handle(GroupInvitationRefuseEvent e, CancellationToken cancellation) { return Task.CompletedTask; diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Groups/Group_InvitationSend_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Groups/Group_InvitationSend_Handler.cs index 0bb2629f..19dd8249 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Groups/Group_InvitationSend_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Groups/Group_InvitationSend_Handler.cs @@ -1,8 +1,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; -using ChickenAPI.Core.i18n; -using ChickenAPI.Enums.Packets; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; using ChickenAPI.Game.Groups; @@ -11,8 +10,8 @@ using ChickenAPI.Game.Managers; using ChickenAPI.Game._i18n; using ChickenAPI.Packets; -using ChickenAPI.Packets.Game.Server.Group; -using ChickenAPI.Packets.Game.Server.UserInterface; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.Groups; namespace SaltyEmu.BasicPlugin.EventHandlers { @@ -21,7 +20,8 @@ public class Group_InvitationSend_Handler : GenericEventPostProcessorBase { + public Group_Join_Handler(ILogger log) : base(log) + { + } + protected override Task Handle(GroupJoinEvent e, CancellationToken cancellation) { // ? diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Guri/BaseGuriHandler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Guri/BaseGuriHandler.cs index 39056ce4..4afa18c7 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Guri/BaseGuriHandler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Guri/BaseGuriHandler.cs @@ -11,11 +11,12 @@ namespace SaltyEmu.BasicPlugin.EventHandlers.Guri { public class BaseGuriHandler : IGuriHandler { - private static readonly Logger Log = Logger.GetLogger(); + private readonly ILogger _log; protected readonly Dictionary HandlersByDialogId; - public BaseGuriHandler() + public BaseGuriHandler(ILogger log) { + _log = log; HandlersByDialogId = new Dictionary(); Assembly currentAsm = Assembly.GetAssembly(typeof(BasicPlugin)); // get types @@ -36,7 +37,7 @@ public void Register(GuriRequestHandler handler) return; } - Log.Info($"[REGISTER_HANDLER] GURI_EFFECT : {handler.GuriEffectId} REGISTERED !"); + _log.Info($"[REGISTER_HANDLER] GURI_EFFECT : {handler.GuriEffectId} REGISTERED !"); HandlersByDialogId.Add(handler.GuriEffectId, handler); } diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Guri/GuriEventHandler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Guri/GuriEventHandler.cs index 0750bf50..98bc6b52 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Guri/GuriEventHandler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Guri/GuriEventHandler.cs @@ -16,10 +16,8 @@ public class GuriEventHandler : GenericEventPostProcessorBase { private readonly IGuriHandler _guriHandler; - public GuriEventHandler(IGuriHandler guriHandler) - { - _guriHandler = guriHandler; - } + + public GuriEventHandler(ILogger log, IGuriHandler guriHandler) : base(log) => _guriHandler = guriHandler; protected override Task Handle(GuriEvent e, CancellationToken cancellation) { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_AddItem_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_AddItem_Handler.cs index 2b210ac0..645fb414 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_AddItem_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_AddItem_Handler.cs @@ -11,12 +11,15 @@ using ChickenAPI.Game.Inventory; using ChickenAPI.Game.Inventory.Events; using ChickenAPI.Game.Inventory.Extensions; -using ChickenAPI.Packets.Game.Server.Inventory; namespace SaltyEmu.BasicPlugin.EventHandlers.Inventory { public class Inventory_AddItem_Handler : GenericEventPostProcessorBase { + public Inventory_AddItem_Handler(ILogger log) : base(log) + { + } + protected override async Task Handle(InventoryAddItemEvent e, CancellationToken cancellation) { if (!(e.Sender is IInventoriedEntity inventoried)) diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_DestroyItem_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_DestroyItem_Handler.cs index 19ae2412..6ea41fb2 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_DestroyItem_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_DestroyItem_Handler.cs @@ -1,19 +1,24 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; using ChickenAPI.Game.Helpers; using ChickenAPI.Game.Inventory; using ChickenAPI.Game.Inventory.Events; using ChickenAPI.Game.Inventory.Extensions; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicPlugin.EventHandlers.Inventory { public class Inventory_DestroyItem_Handler : GenericEventPostProcessorBase { + public Inventory_DestroyItem_Handler(ILogger log) : base(log) + { + } + protected override async Task Handle(InventoryDestroyItemEvent e, CancellationToken cancellation) { if (!(e.Sender is IPlayerEntity player)) diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_ItemInfo_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_ItemInfo_Handler.cs index 323f328d..b6354eec 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_ItemInfo_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_ItemInfo_Handler.cs @@ -1,17 +1,23 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; +using ChickenAPI.Data.Enums.Game.Items; using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory; using ChickenAPI.Game.Inventory.Events; using ChickenAPI.Game.Inventory.Extensions; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicPlugin.EventHandlers.Inventory { public class Inventory_ItemInfo_Handler : GenericEventPostProcessorBase { + public Inventory_ItemInfo_Handler(ILogger log) : base(log) + { + } + protected override async Task Handle(InventoryEqInfoEvent eqInfo, CancellationToken cancellation) { if (!(eqInfo.Sender is IPlayerEntity playerEntity)) @@ -27,7 +33,7 @@ protected override async Task Handle(InventoryEqInfoEvent eqInfo, CancellationTo switch (eqInfo.Type) { case 0: - subInv = inventory.GetSubInvFromInventoryType(InventoryType.Wear); + subInv = inventory.GetSubInvFromInventoryType(PocketType.Wear); if (eqInfo.Slot > subInv.Length) { return; @@ -37,7 +43,7 @@ protected override async Task Handle(InventoryEqInfoEvent eqInfo, CancellationTo break; case 1: - subInv = inventory.GetSubInvFromInventoryType(InventoryType.Equipment); + subInv = inventory.GetSubInvFromInventoryType(PocketType.Equipment); if (eqInfo.Slot > subInv.Length) { return; @@ -48,7 +54,7 @@ protected override async Task Handle(InventoryEqInfoEvent eqInfo, CancellationTo case 7: case 10: - subInv = inventory.GetSubInvFromInventoryType(InventoryType.Specialist); + subInv = inventory.GetSubInvFromInventoryType(PocketType.Specialist); if (eqInfo.Slot > subInv.Length) { return; @@ -58,7 +64,7 @@ protected override async Task Handle(InventoryEqInfoEvent eqInfo, CancellationTo break; case 11: - subInv = inventory.GetSubInvFromInventoryType(InventoryType.Costume); + subInv = inventory.GetSubInvFromInventoryType(PocketType.Costume); if (eqInfo.Slot > subInv.Length) { return; diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_LoadInventory_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_LoadInventory_Handler.cs index 2688235e..50f0e2c3 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_LoadInventory_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_LoadInventory_Handler.cs @@ -3,11 +3,12 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory; using ChickenAPI.Game.Inventory.Events; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicPlugin.EventHandlers.Inventory { @@ -15,10 +16,7 @@ public class Inventory_LoadInventory_Handler : GenericEventPostProcessorBase _characterItemService = characterItemService; protected override async Task Handle(InventoryLoadEvent e, CancellationToken cancellation) { @@ -39,19 +37,19 @@ protected override async Task Handle(InventoryLoadEvent e, CancellationToken can { switch (item.Type) { - case InventoryType.Equipment: + case PocketType.Equipment: inventory.Equipment[item.Slot] = item; break; - case InventoryType.Etc: + case PocketType.Etc: inventory.Etc[item.Slot] = item; break; - case InventoryType.Wear: + case PocketType.Wear: inventory.Wear[item.Slot] = item; break; - case InventoryType.Main: + case PocketType.Main: inventory.Main[item.Slot] = item; break; } diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_MoveItem_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_MoveItem_Handler.cs index 94f7540f..2298c8ea 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_MoveItem_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_MoveItem_Handler.cs @@ -1,14 +1,15 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; using ChickenAPI.Game; using ChickenAPI.Game.Configuration; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory; using ChickenAPI.Game.Inventory.Events; using ChickenAPI.Game.Inventory.Extensions; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicPlugin.EventHandlers.Inventory { @@ -16,10 +17,7 @@ public class Inventory_MoveItem_Handler : GenericEventPostProcessorBase _gameConfiguration = gameConfiguration; protected override async Task Handle(InventoryMoveEvent args, CancellationToken cancellation) { @@ -29,15 +27,15 @@ protected override async Task Handle(InventoryMoveEvent args, CancellationToken } InventoryComponent inv = player.Inventory; - ItemInstanceDto source = inv.GetSubInvFromInventoryType(args.InventoryType)[args.SourceSlot]; - ItemInstanceDto dest = inv.GetSubInvFromInventoryType(args.InventoryType)[args.DestinationSlot]; + ItemInstanceDto source = inv.GetSubInvFromInventoryType(args.PocketType)[args.SourceSlot]; + ItemInstanceDto dest = inv.GetSubInvFromInventoryType(args.PocketType)[args.DestinationSlot]; if (source == null) { return; } - if (dest != null && (args.InventoryType == InventoryType.Main || args.InventoryType == InventoryType.Etc) && dest.ItemId == source.ItemId && + if (dest != null && (args.PocketType == PocketType.Main || args.PocketType == PocketType.Etc) && dest.ItemId == source.ItemId && dest.Amount + source.Amount > _gameConfiguration.Inventory.MaxItemPerSlot) { // if both source & dest are stackable && slots combined are > max slots diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_Pickup_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_Pickup_Handler.cs index 198382b6..9bf21b38 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_Pickup_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_Pickup_Handler.cs @@ -1,6 +1,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Item; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; @@ -13,10 +14,7 @@ public class Inventory_Pickup_Handler : GenericEventPostProcessorBase _itemFactory = itemFactory; protected override async Task Handle(InventoryPickUpEvent e, CancellationToken cancellation) { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_RemoveItem_Event.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_RemoveItem_Event.cs index d15ae6e7..5eb2347c 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_RemoveItem_Event.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_RemoveItem_Event.cs @@ -2,6 +2,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Core.Maths; using ChickenAPI.Core.Utils; using ChickenAPI.Data.Item; @@ -21,11 +22,12 @@ public class Inventory_RemoveItem_Event : GenericEventPostProcessorBase { + public Inventory_SendDetails_Handler(ILogger log) : base(log) + { + } + protected override async Task Handle(InventoryRequestDetailsEvent e, CancellationToken cancellation) { if (!(e.Sender is IPlayerEntity player)) @@ -18,9 +23,9 @@ protected override async Task Handle(InventoryRequestDetailsEvent e, Cancellatio } - await player.SendPacketAsync(player.GenerateInventoryPacket(InventoryType.Equipment)); - await player.SendPacketAsync(player.GenerateInventoryPacket(InventoryType.Main)); - await player.SendPacketAsync(player.GenerateInventoryPacket(InventoryType.Etc)); + await player.SendPacketAsync(player.GenerateInventoryPacket(PocketType.Equipment)); + await player.SendPacketAsync(player.GenerateInventoryPacket(PocketType.Main)); + await player.SendPacketAsync(player.GenerateInventoryPacket(PocketType.Etc)); } } } \ No newline at end of file diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_UseItem_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_UseItem_Handler.cs index 91022cc7..08e98f39 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_UseItem_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_UseItem_Handler.cs @@ -1,6 +1,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory.Events; using ChickenAPI.Game.Inventory.ItemUsage; @@ -11,10 +12,7 @@ public class Inventory_UseItem_Handler : GenericEventPostProcessorBase _itemUsageHandler = itemUsageHandler; protected override Task Handle(InventoryUseItemEvent e, CancellationToken cancellation) { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_WearItem_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_WearItem_Handler.cs index 7c3db13d..7e63a3fc 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_WearItem_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Inventory/Inventory_WearItem_Handler.cs @@ -1,8 +1,9 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; +using ChickenAPI.Data.Enums.Game.Items; using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; using ChickenAPI.Game.Effects; using ChickenAPI.Game.Entities; using ChickenAPI.Game.Entities.Player; @@ -10,11 +11,17 @@ using ChickenAPI.Game.Inventory; using ChickenAPI.Game.Inventory.Events; using ChickenAPI.Game.Inventory.Extensions; +using ChickenAPI.Packets.Enumerations; +using EquipmentType = ChickenAPI.Data.Enums.Game.Items.EquipmentType; namespace SaltyEmu.BasicPlugin.EventHandlers.Inventory { public class Inventory_WearItem_Handler : GenericEventPostProcessorBase { + public Inventory_WearItem_Handler(ILogger log) : base(log) + { + } + protected override async Task Handle(InventoryWearEvent e, CancellationToken cancellation) { if (!(e.Sender is IPlayerEntity player)) @@ -24,7 +31,7 @@ protected override async Task Handle(InventoryWearEvent e, CancellationToken can var inventory = player.Inventory; - ItemInstanceDto item = inventory.GetItemFromSlotAndType(e.InventorySlot, InventoryType.Equipment); + ItemInstanceDto item = inventory.GetItemFromSlotAndType(e.InventorySlot, PocketType.Equipment); if (item == null) { return; @@ -69,7 +76,7 @@ private async Task EquipItem(InventoryComponent inventory, IInventoriedEntity en // todo refacto to "MoveSlot" method inventory.Equipment[itemToEquip.Slot] = alreadyEquipped; alreadyEquipped.Slot = itemToEquip.Slot; - alreadyEquipped.Type = InventoryType.Equipment; + alreadyEquipped.Type = PocketType.Equipment; } else { @@ -83,7 +90,7 @@ private async Task EquipItem(InventoryComponent inventory, IInventoriedEntity en inventory.Wear[(int)itemToEquip.Item.EquipmentSlot] = itemToEquip; itemToEquip.Slot = (short)itemToEquip.Item.EquipmentSlot; - itemToEquip.Type = InventoryType.Wear; + itemToEquip.Type = PocketType.Wear; if (alreadyEquipped == null) { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Locomotion/Locomotion_Transform_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Locomotion/Locomotion_Transform_Handler.cs index 7f7c4c89..8ea680ed 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Locomotion/Locomotion_Transform_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Locomotion/Locomotion_Transform_Handler.cs @@ -1,6 +1,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Item; using ChickenAPI.Game.Effects; using ChickenAPI.Game.Entities.Player; @@ -12,6 +13,10 @@ namespace SaltyEmu.BasicPlugin.EventHandlers.Locomotion { public class Locomotion_Transform_Handler : GenericEventPostProcessorBase { + public Locomotion_Transform_Handler(ILogger log) : base(log) + { + } + protected override async Task Handle(LocomotionTransformEvent e, CancellationToken cancellation) { if (!(e.Sender is IPlayerEntity player)) diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Locomotion/Locomotion_Untransform_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Locomotion/Locomotion_Untransform_Handler.cs index 0a970992..5eba22ee 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Locomotion/Locomotion_Untransform_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Locomotion/Locomotion_Untransform_Handler.cs @@ -1,6 +1,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Character; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; @@ -13,10 +14,8 @@ public class Locomotion_Untransform_Handler : GenericEventPostProcessorBase _algorithm = algorithm; protected override async Task Handle(LocomotionUntransformEvent e, CancellationToken cancellation) { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Maps/Map_Join_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Maps/Map_Join_Handler.cs index 02c8b7cc..97c00bee 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Maps/Map_Join_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Maps/Map_Join_Handler.cs @@ -1,6 +1,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Extensions; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; @@ -13,6 +14,10 @@ namespace SaltyEmu.BasicPlugin.EventHandlers.Maps { public class Map_Join_Handler : GenericEventPostProcessorBase { + public Map_Join_Handler(ILogger log) : base(log) + { + } + protected override async Task Handle(MapJoinEvent e, CancellationToken cancellation) { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Maps/Map_Leave_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Maps/Map_Leave_Handler.cs index 71827fbb..7e890f24 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Maps/Map_Leave_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Maps/Map_Leave_Handler.cs @@ -1,21 +1,26 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory.Extensions; using ChickenAPI.Game.Maps.Events; using ChickenAPI.Game._BroadcastRules; -using ChickenAPI.Packets.Game.Server.Map; +using ChickenAPI.Packets.ServerPackets.Map; namespace SaltyEmu.BasicPlugin.EventHandlers.Maps { public class Map_Leave_Handler : GenericEventPostProcessorBase { + public Map_Leave_Handler(ILogger log) : base(log) + { + } + protected override async Task Handle(MapLeaveEvent e, CancellationToken cancellation) { if (e.Sender is IPlayerEntity session) { - await session.SendPacketAsync(new MapoutPacket()); + await session.SendPacketAsync(new MapOutPacket()); await e.Map.BroadcastAsync(e.Sender.GenerateOutPacket(), new AllExpectOne(session)); return; } diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Mates/PetEventHandler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Mates/PetEventHandler.cs index 68b0fa2a..454a9b88 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Mates/PetEventHandler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Mates/PetEventHandler.cs @@ -22,10 +22,10 @@ public class PetEventHandler : GenericEventPostProcessorBase private readonly IGameEntityFactory _entityFactory; private readonly INpcMonsterService _npcMonsterService; - public PetEventHandler(INpcMonsterService npcMonsterService, IGameEntityFactory entityFactory) + public PetEventHandler(ILogger log, IGameEntityFactory entityFactory, INpcMonsterService npcMonsterService) : base(log) { - _npcMonsterService = npcMonsterService; _entityFactory = entityFactory; + _npcMonsterService = npcMonsterService; } public static void AddPet(IPlayerEntity player, AddPetEvent e) diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Monsters/Monster_DeathEvent_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Monsters/Monster_DeathEvent_Handler.cs index d95adf36..e65cdd03 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Monsters/Monster_DeathEvent_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Monsters/Monster_DeathEvent_Handler.cs @@ -5,6 +5,7 @@ using Autofac; using ChickenAPI.Core.Events; using ChickenAPI.Core.IoC; +using ChickenAPI.Core.Logging; using ChickenAPI.Core.Maths; using ChickenAPI.Core.Utils; using ChickenAPI.Data.NpcMonster; @@ -20,13 +21,13 @@ namespace SaltyEmu.BasicPlugin.EventHandlers { public class Monster_DeathEvent_Handler : GenericEventPostProcessorBase { - private readonly IRandomGenerator Random; - private readonly IPathfinder PathFinder; + private readonly IRandomGenerator _random; + private readonly IPathfinder _pathFinder; - public Monster_DeathEvent_Handler(IRandomGenerator random, IPathfinder pathFinder) + public Monster_DeathEvent_Handler(ILogger log, IRandomGenerator random, IPathfinder pathFinder) : base(log) { - Random = random; - PathFinder = pathFinder; + _random = random; + _pathFinder = pathFinder; } protected override async Task Handle(MonsterDeathEvent e, CancellationToken cancellation) @@ -49,16 +50,16 @@ protected override async Task Handle(MonsterDeathEvent e, CancellationToken canc await player.EmitEventAsync(new ExperienceGainEvent { Experience = xp, JobExperience = jobXp, HeroExperience = heroXp }); } - if (Random.Next(100) < 100) // 100 should be modified with GoldDropRate + if (_random.Next(100) < 100) // 100 should be modified with GoldDropRate { - Position[] pos = PathFinder.GetNeighbors(monster.Position, monster.CurrentMap.Map); + Position[] pos = _pathFinder.GetNeighbors(monster.Position, monster.CurrentMap.Map); IDropEntity drop = new ItemDropEntity(monster.CurrentMap.GetNextId()) { ItemVnum = 1046, IsGold = true, DroppedTimeUtc = DateTime.Now, - Position = pos.Length > 1 ? pos[Random.Next(pos.Length)] : monster.Position, - Quantity = Random.Next(6 * monster.NpcMonster.Level, 12 * monster.NpcMonster.Level) + Position = pos.Length > 1 ? pos[_random.Next(pos.Length)] : monster.Position, + Quantity = _random.Next(6 * monster.NpcMonster.Level, 12 * monster.NpcMonster.Level) }; drop.TransferEntity(monster.CurrentMap); await monster.CurrentMap.BroadcastAsync(drop.GenerateDropPacket()); diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Movements/Movement_PlayerMovement_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Movements/Movement_PlayerMovement_Handler.cs index ebc3e632..1eeb6bca 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Movements/Movement_PlayerMovement_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Movements/Movement_PlayerMovement_Handler.cs @@ -1,6 +1,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory.Extensions; using ChickenAPI.Game.Movements.Events; @@ -10,6 +11,9 @@ namespace SaltyEmu.BasicPlugin.EventHandlers.Movements { public class Movement_PlayerMovement_Handler : GenericEventPostProcessorBase { + public Movement_PlayerMovement_Handler(ILogger log) : base(log) + { + } private static bool PreMovementChecks(IPlayerEntity player, PlayerMovementRequestEvent e) { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Movements/Movement_Sit_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Movements/Movement_Sit_Handler.cs index 5f59798e..9fd9a97e 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Movements/Movement_Sit_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Movements/Movement_Sit_Handler.cs @@ -1,6 +1,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Movements; using ChickenAPI.Game.Movements.Events; @@ -8,6 +9,10 @@ namespace SaltyEmu.BasicPlugin.EventHandlers.Movements { public class Movement_Sit_Handler : GenericEventPostProcessorBase { + public Movement_Sit_Handler(ILogger log) : base(log) + { + } + protected override Task Handle(TriggerSitEvent e, CancellationToken cancellation) { if (!(e.Sender is IMovableEntity movable)) diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/NpcDialog/NpcDialogEventHandler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/NpcDialog/NpcDialogEventHandler.cs index 86648f0a..389a9bc2 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/NpcDialog/NpcDialogEventHandler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/NpcDialog/NpcDialogEventHandler.cs @@ -1,6 +1,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.NpcDialog; using ChickenAPI.Game.NpcDialog.Events; @@ -11,10 +12,8 @@ public class NpcDialogEventHandler : GenericEventPostProcessorBase _npcDialogHandler = npcDialogHandler; protected override Task Handle(NpcDialogEvent e, CancellationToken cancellation) => _npcDialogHandler.Execute(e.Sender as IPlayerEntity, e); } diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Npcs/Npc_DeathEvent_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Npcs/Npc_DeathEvent_Handler.cs index f4d4f5cc..43f2b400 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Npcs/Npc_DeathEvent_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Npcs/Npc_DeathEvent_Handler.cs @@ -3,6 +3,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Npc; using ChickenAPI.Game.Entities.Npc.Events; @@ -10,6 +11,10 @@ namespace SaltyEmu.BasicPlugin.EventHandlers { public class Npc_DeathEvent_Handler : GenericEventPostProcessorBase { + public Npc_DeathEvent_Handler(ILogger log) : base(log) + { + } + protected override Task Handle(NpcDeathEvent e, CancellationToken cancellation) { return Task.CompletedTask; diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Players/Player_ExperienceGain_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Players/Player_ExperienceGain_Handler.cs index 8e73288e..23674244 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Players/Player_ExperienceGain_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Players/Player_ExperienceGain_Handler.cs @@ -1,6 +1,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Events; using ChickenAPI.Game.Entities.Player.Extensions; @@ -9,6 +10,10 @@ namespace SaltyEmu.BasicPlugin.EventHandlers { public class Player_ExperienceGain_Handler : GenericEventPostProcessorBase { + public Player_ExperienceGain_Handler(ILogger log) : base(log) + { + } + protected override async Task Handle(ExperienceGainEvent e, CancellationToken cancellation) { if (!(e.Sender is IPlayerEntity player)) diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Players/Player_LevelUp_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Players/Player_LevelUp_Handler.cs index adabd96f..fb280318 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Players/Player_LevelUp_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Players/Player_LevelUp_Handler.cs @@ -1,14 +1,15 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Character; -using ChickenAPI.Enums.Game.Character; using ChickenAPI.Game.Effects; using ChickenAPI.Game.Entities.Extensions; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Events; using ChickenAPI.Game.Entities.Player.Extensions; using ChickenAPI.Game.Skills.Extensions; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicPlugin.EventHandlers { @@ -16,7 +17,7 @@ public class Player_LevelUp_Handler : GenericEventPostProcessorBase _mapManager = mapManager; protected override Task Handle(PortalTriggerEvent e, CancellationToken cancellation) { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Quicklist/Quicklist_AddElement_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Quicklist/Quicklist_AddElement_Handler.cs index 406dd836..824f90e8 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Quicklist/Quicklist_AddElement_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Quicklist/Quicklist_AddElement_Handler.cs @@ -13,6 +13,10 @@ namespace SaltyEmu.BasicPlugin.EventHandlers.Quicklist { public class Quicklist_AddElement_Handler : GenericEventPostProcessorBase { + public Quicklist_AddElement_Handler(ILogger log) : base(log) + { + } + protected override async Task Handle(QuicklistAddElementEvent args, CancellationToken cancellation) { if (!(args.Sender is IPlayerEntity player)) diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Quicklist/Quicklist_RemoveElement_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Quicklist/Quicklist_RemoveElement_Handler.cs index 7a828e97..e6115daa 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Quicklist/Quicklist_RemoveElement_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Quicklist/Quicklist_RemoveElement_Handler.cs @@ -2,6 +2,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Character; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Quicklist.Events; @@ -11,6 +12,10 @@ namespace SaltyEmu.BasicPlugin.EventHandlers.Quicklist { public class Quicklist_RemoveElement_Handler : GenericEventPostProcessorBase { + public Quicklist_RemoveElement_Handler(ILogger log) : base(log) + { + } + protected override async Task Handle(QuicklistRemoveElementEvent e, CancellationToken cancellation) { if (!(e.Sender is IPlayerEntity player)) diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Quicklist/Quicklist_SwapElement_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Quicklist/Quicklist_SwapElement_Handler.cs index 6c6a7648..63ae334b 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Quicklist/Quicklist_SwapElement_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Quicklist/Quicklist_SwapElement_Handler.cs @@ -2,6 +2,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Character; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Quicklist.Events; @@ -11,6 +12,10 @@ namespace SaltyEmu.BasicPlugin.EventHandlers.Quicklist { public class Quicklist_SwapElement_Handler : GenericEventPostProcessorBase { + public Quicklist_SwapElement_Handler(ILogger log) : base(log) + { + } + protected override async Task Handle(QuicklistSwapElementEvent e, CancellationToken cancellation) { if (!(e.Sender is IPlayerEntity player)) diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Relations/Relation_InvitationProcess_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Relations/Relation_InvitationProcess_Handler.cs index 87247b2a..3ac87ddc 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Relations/Relation_InvitationProcess_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Relations/Relation_InvitationProcess_Handler.cs @@ -6,6 +6,7 @@ using Autofac; using ChickenAPI.Core.Events; using ChickenAPI.Core.IoC; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Relations; using ChickenAPI.Game.Relations.Events; @@ -15,10 +16,7 @@ public class Relation_InvitationProcess_Handler : GenericEventPostProcessorBase< { private readonly IRelationService _relationService; - public Relation_InvitationProcess_Handler(IRelationService relationService) - { - _relationService = relationService; - } + public Relation_InvitationProcess_Handler(ILogger log, IRelationService relationService) : base(log) => _relationService = relationService; protected override async Task Handle(RelationInvitationProcessEvent e, CancellationToken cancellation) { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Relations/Relation_InvitationReceive_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Relations/Relation_InvitationReceive_Handler.cs index 3be1bd30..ad574a6e 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Relations/Relation_InvitationReceive_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Relations/Relation_InvitationReceive_Handler.cs @@ -2,8 +2,8 @@ using System.Threading.Tasks; using ChickenAPI.Core.Events; using ChickenAPI.Core.i18n; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Character; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; using ChickenAPI.Game.Helpers; @@ -11,7 +11,8 @@ using ChickenAPI.Game.Relations.Events; using ChickenAPI.Game._i18n; using ChickenAPI.Packets; -using ChickenAPI.Packets.Game.Server.Relations; +using ChickenAPI.Packets.ClientPackets.Relations; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicPlugin.EventHandlers.Relations { @@ -20,10 +21,10 @@ public class Relation_InvitationReceive_Handler : GenericEventPostProcessorBase< private readonly IPlayerManager _playerManager; private readonly ICharacterService _characterService; - public Relation_InvitationReceive_Handler(ICharacterService characterService, IPlayerManager playerManager) + public Relation_InvitationReceive_Handler(ILogger log, IPlayerManager playerManager, ICharacterService characterService) : base(log) { - _characterService = characterService; _playerManager = playerManager; + _characterService = characterService; } protected override async Task Handle(RelationInvitationReceiveEvent e, CancellationToken cancellation) @@ -49,8 +50,8 @@ protected override async Task Handle(RelationInvitationReceiveEvent e, Cancellat senderInfo = target.Character; } - PacketBase acceptPacket = new FInsPacket { CharacterId = e.Invitation.OwnerId, Type = FInsPacketType.Accept }; - PacketBase refusePacket = new FInsPacket { CharacterId = e.Invitation.OwnerId, Type = FInsPacketType.Refuse }; + PacketBase acceptPacket = new FinsPacket { CharacterId = e.Invitation.OwnerId, Type = FinsPacketType.Accepted }; + PacketBase refusePacket = new FinsPacket { CharacterId = e.Invitation.OwnerId, Type = FinsPacketType.Rejected }; string question = player.GetLanguageFormat(PlayerMessages.FRIEND_X_INVITED_YOU_TO_JOIN_HIS_FRIENDLIST, senderInfo.Name); await player.SendDialog(acceptPacket, refusePacket, question); } diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Relations/Relation_InvitationSend_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Relations/Relation_InvitationSend_Handler.cs index a59ad123..b958ed42 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Relations/Relation_InvitationSend_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Relations/Relation_InvitationSend_Handler.cs @@ -1,6 +1,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Character; using ChickenAPI.Data.Relations; using ChickenAPI.Game.Relations.Events; @@ -12,10 +13,11 @@ public class Relation_InvitationSend_Handler : GenericEventPostProcessorBase { private readonly IPlayerManager _playerManager; private readonly INpcMonsterService _npcMonsterService; - - public ReqInfoEventHandler(IPlayerManager playerManager, INpcMonsterService npcMonsterService) + + public ReqInfoEventHandler(IPlayerManager playerManager, INpcMonsterService npcMonsterService, ILogger log) : base(log) { _playerManager = playerManager; _npcMonsterService = npcMonsterService; diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Shops/Shop_Buy_Event.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Shops/Shop_Buy_Event.cs index fbe9cb08..8ca34442 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Shops/Shop_Buy_Event.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Shops/Shop_Buy_Event.cs @@ -6,13 +6,11 @@ using ChickenAPI.Core.Events; using ChickenAPI.Core.i18n; using ChickenAPI.Core.IoC; +using ChickenAPI.Core.Logging; using ChickenAPI.Core.Maths; using ChickenAPI.Data.Character; using ChickenAPI.Data.Item; using ChickenAPI.Data.Shop; -using ChickenAPI.Enums.Game.Character; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game.Entities.Npc; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; @@ -24,6 +22,7 @@ using ChickenAPI.Game.Shops.Extensions; using ChickenAPI.Game.Skills.Extensions; using ChickenAPI.Game._i18n; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicPlugin.EventHandlers.Shops { @@ -31,10 +30,8 @@ public class Shop_Buy_Event : GenericEventPostProcessorBase { private readonly IRandomGenerator _randomGenerator; - public Shop_Buy_Event(IRandomGenerator randomGenerator) - { - _randomGenerator = randomGenerator; - } + + public Shop_Buy_Event(ILogger log, IRandomGenerator randomGenerator) : base(log) => _randomGenerator = randomGenerator; protected override async Task Handle(ShopBuyEvent e, CancellationToken cancellation) { @@ -45,8 +42,8 @@ protected override async Task Handle(ShopBuyEvent e, CancellationToken cancellat switch (e.Type) { - case VisualType.Character: - IPlayerEntity shop = player.CurrentMap.GetEntitiesByType(VisualType.Character).FirstOrDefault(s => s.Character.Id == e.OwnerId); + case VisualType.Player: + IPlayerEntity shop = player.CurrentMap.GetEntitiesByType(VisualType.Player).FirstOrDefault(s => s.Character.Id == e.OwnerId); if (shop == null) { return; @@ -97,13 +94,13 @@ private static async Task HandleNpcSkillBuyRequest(IPlayerEntity player, ShopBuy } // check skill cooldown - if (player.SkillComponent.CooldownsBySkillId.Any(s => s.Item2 == shopBuy.Slot)) + if (player.CooldownsBySkillId.Any(s => s.Item2 == shopBuy.Slot)) { return; } // check skill already exists in player skills - if (player.SkillComponent.Skills.ContainsKey(shopBuy.Slot)) + if (player.Skills.ContainsKey(shopBuy.Slot)) { return; } @@ -146,12 +143,9 @@ private static async Task HandleNpcSkillBuyRequest(IPlayerEntity player, ShopBuy minimumLevel = skillShop.Skill.MinimumMagicianLevel; break; - case CharacterClassType.Wrestler: + case CharacterClassType.MartialArtist: minimumLevel = skillShop.Skill.MinimumWrestlerLevel; break; - - case CharacterClassType.Unknown: - break; } if (skillShop.Skill.MinimumSwordmanLevel == 0 && skillShop.Skill.MinimumArcherLevel == 0 && skillShop.Skill.MinimumMagicianLevel == 0) @@ -179,11 +173,11 @@ private static async Task HandleNpcSkillBuyRequest(IPlayerEntity player, ShopBuy if (skillShop.SkillId < 200) { - foreach (CharacterSkillDto skill in player.SkillComponent.CharacterSkills.Select(s => s.Value)) + foreach (CharacterSkillDto skill in player.CharacterSkills.Select(s => s.Value)) { if (skillShop.Skill.CastId == skill.Skill.CastId && skill.Skill.Id < 200) { - player.SkillComponent.CharacterSkills.Remove(skill.Id); + player.CharacterSkills.Remove(skill.Id); } } } @@ -192,11 +186,11 @@ private static async Task HandleNpcSkillBuyRequest(IPlayerEntity player, ShopBuy // remove old upgrade if (skillShop.SkillId >= 200 && skillShop.Skill.UpgradeSkill != 0) { - CharacterSkillDto oldupgrade = player.SkillComponent.CharacterSkills.FirstOrDefault(s => + CharacterSkillDto oldupgrade = player.CharacterSkills.FirstOrDefault(s => s.Value.Skill.UpgradeSkill == skillShop.Skill.UpgradeSkill && s.Value.Skill.UpgradeType == skillShop.Skill.UpgradeType && s.Value.Skill.UpgradeSkill != 0).Value; if (oldupgrade != null) { - player.SkillComponent.CharacterSkills.Remove(oldupgrade.Id); + player.CharacterSkills.Remove(oldupgrade.Id); } } @@ -255,7 +249,7 @@ private async Task HandleNpcItemBuyRequest(IPlayerEntity player, ShopBuyEvent sh if (!isReputBuy && price < 0 && price * percent > player.Character.Gold) { - await player.SendPacketAsync(player.GenerateShopMemoPacket(SMemoPacketType.FailNpc, player.GetLanguage(PlayerMessages.YOU_DONT_HAVE_ENOUGH_GOLD))); + await player.SendPacketAsync(player.GenerateShopMemoPacket(SMemoType.Error, player.GetLanguage(PlayerMessages.YOU_DONT_HAVE_ENOUGH_GOLD))); return; } @@ -263,7 +257,7 @@ private async Task HandleNpcItemBuyRequest(IPlayerEntity player, ShopBuyEvent sh { if (price > player.Character.Reput) { - await player.SendPacketAsync(player.GenerateShopMemoPacket(SMemoPacketType.FailNpc, player.GetLanguage(PlayerMessages.YOU_DONT_HAVE_ENOUGH_REPUTATION))); + await player.SendPacketAsync(player.GenerateShopMemoPacket(SMemoType.Error, player.GetLanguage(PlayerMessages.YOU_DONT_HAVE_ENOUGH_REPUTATION))); return; } @@ -288,7 +282,7 @@ private async Task HandleNpcItemBuyRequest(IPlayerEntity player, ShopBuyEvent sh bool canAddItem = player.Inventory.CanAddItem(item.Item, amount); if (!canAddItem) { - await player.SendPacketAsync(player.GenerateShopMemoPacket(SMemoPacketType.FailNpc, player.GetLanguage(PlayerMessages.YOU_DONT_HAVE_ENOUGH_SPACE_IN_INVENTORY))); + await player.SendPacketAsync(player.GenerateShopMemoPacket(SMemoType.Error, player.GetLanguage(PlayerMessages.YOU_DONT_HAVE_ENOUGH_SPACE_IN_INVENTORY))); return; } diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Shops/Shop_CreateShop_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Shops/Shop_CreateShop_Handler.cs index 7f911b7e..ad5c9945 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Shops/Shop_CreateShop_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Shops/Shop_CreateShop_Handler.cs @@ -1,6 +1,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; using ChickenAPI.Game.Shops; @@ -12,6 +13,10 @@ namespace SaltyEmu.BasicPlugin.EventHandlers.Shops public class Shop_CreateShop_Handler : GenericEventPostProcessorBase { + public Shop_CreateShop_Handler(ILogger log) : base(log) + { + } + protected override async Task Handle(ShopPlayerShopCreateEvent e, CancellationToken cancellation) { if (!(e.Sender is IPlayerEntity player)) diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Shops/Shop_GetInformation_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Shops/Shop_GetInformation_Handler.cs index 805ed2f4..d77779ae 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Shops/Shop_GetInformation_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Shops/Shop_GetInformation_Handler.cs @@ -1,6 +1,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Npc; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Shops.Events; @@ -10,6 +11,10 @@ namespace SaltyEmu.BasicPlugin.EventHandlers.Shops { public class Shop_GetInformation_Handler : GenericEventPostProcessorBase { + public Shop_GetInformation_Handler(ILogger log) : base(log) + { + } + protected override async Task Handle(ShopGetInformationEvent e, CancellationToken cancellation) { if (!(e.Sender is IPlayerEntity player)) diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Shops/Shop_Sell_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Shops/Shop_Sell_Handler.cs index 1f50684a..5d462238 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Shops/Shop_Sell_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Shops/Shop_Sell_Handler.cs @@ -1,12 +1,17 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Shops.Events; namespace SaltyEmu.BasicPlugin.EventHandlers.Shops { public class Shop_Sell_Handler : GenericEventPostProcessorBase { + public Shop_Sell_Handler(ILogger log) : base(log) + { + } + protected override Task Handle(ShopSellEvent e, CancellationToken cancellation) { return Task.CompletedTask; diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Skills/Skill_AddSkill_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Skills/Skill_AddSkill_Handler.cs index f6c7a83d..55802936 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Skills/Skill_AddSkill_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Skills/Skill_AddSkill_Handler.cs @@ -2,17 +2,22 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Skills; -using ChickenAPI.Enums.Game.Character; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; using ChickenAPI.Game.Skills; using ChickenAPI.Game.Skills.Args; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicPlugin.EventHandlers.Skills { public class Skill_AddSkill_Handler : GenericEventPostProcessorBase { + public Skill_AddSkill_Handler(ILogger log) : base(log) + { + } + protected override async Task Handle(PlayerAddSkillEvent e, CancellationToken cancellation) { if (!(e.Sender is IPlayerEntity player)) @@ -20,12 +25,12 @@ protected override async Task Handle(PlayerAddSkillEvent e, CancellationToken ca return; } - SkillComponent component = player.SkillComponent; if (e.Skill is null) { return; //the skill doesn't exist? } + if (e.ForceChecks) { if (player.Character is null) @@ -72,13 +77,9 @@ protected override async Task Handle(PlayerAddSkillEvent e, CancellationToken ca classLevel = e.Skill.MinimumMagicianLevel; break; - case CharacterClassType.Wrestler: + case CharacterClassType.MartialArtist: classLevel = e.Skill.MinimumWrestlerLevel; break; - - case CharacterClassType.Unknown: - classLevel = e.Skill.LevelMinimum; - break; } if (classLevel > player.Level) @@ -89,38 +90,38 @@ protected override async Task Handle(PlayerAddSkillEvent e, CancellationToken ca if (e.Skill.Id < 200) { - foreach (SkillDto skill in component.Skills.Values) + foreach (SkillDto skill in player.Skills.Values) { if (e.Skill.CastId == skill.CastId && skill.Id < 200) { - component.Skills.Remove(skill.Id); + player.Skills.Remove(skill.Id); } } } else { - if (component.Skills.ContainsKey(e.Skill.Id)) + if (player.Skills.ContainsKey(e.Skill.Id)) { return; //we already have that skill! } if (e.Skill.UpgradeSkill != 0) //means it's not a skill but an upgrade { - SkillDto oldUpgrade = component.Skills.Values.FirstOrDefault( + SkillDto oldUpgrade = player.Skills.Values.FirstOrDefault( s => s.UpgradeSkill == e.Skill.UpgradeSkill && s.UpgradeType == e.Skill.UpgradeType && s.UpgradeSkill != 0); if (!(oldUpgrade is null)) { - component.Skills.Remove(oldUpgrade.Id); + player.Skills.Remove(oldUpgrade.Id); } } } - if (!component.Skills.ContainsKey(e.Skill.Id)) + if (!player.Skills.ContainsKey(e.Skill.Id)) { - component.Skills.Add(e.Skill.Id, e.Skill); + player.Skills.Add(e.Skill.Id, e.Skill); } //todo: send different packets to add the skill. diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Skills/Skill_UseSkill_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Skills/Skill_UseSkill_Handler.cs index f032595f..322369f7 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Skills/Skill_UseSkill_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Skills/Skill_UseSkill_Handler.cs @@ -3,10 +3,9 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; +using ChickenAPI.Data.Enums.Game.Skill; using ChickenAPI.Data.Skills; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Enums.Game.Skill; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game.Battle.Events; using ChickenAPI.Game.Battle.Extensions; using ChickenAPI.Game.Battle.Hitting; @@ -14,6 +13,7 @@ using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Movements.Extensions; using ChickenAPI.Game.Skills.Args; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicPlugin.EventHandlers.Skills { @@ -21,10 +21,8 @@ public class Skill_UseSkill_Handler : GenericEventPostProcessorBase _hitRequestFactory = hitRequestFactory; protected override async Task Handle(UseSkillEvent e, CancellationToken cancellation) { @@ -67,7 +65,7 @@ protected override async Task Handle(UseSkillEvent e, CancellationToken cancella return; } - if (entity.Type == VisualType.Character && target.Type == VisualType.Character && !entity.CurrentMap.IsPvpEnabled && skill.HitType != 1) + if (entity.Type == VisualType.Player && target.Type == VisualType.Player && !entity.CurrentMap.IsPvpEnabled && skill.HitType != 1) { if (!(player is null)) { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Specialists/Specialist_Remove_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Specialists/Specialist_Remove_Handler.cs index 74ca8312..5e85843e 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Specialists/Specialist_Remove_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Specialists/Specialist_Remove_Handler.cs @@ -2,9 +2,9 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Character; using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game.Effects; using ChickenAPI.Game.Entities.Extensions; using ChickenAPI.Game.Entities.Player; @@ -14,6 +14,7 @@ using ChickenAPI.Game.Movements.Extensions; using ChickenAPI.Game.Specialists.Args; using ChickenAPI.Game.Specialists.Extensions; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicPlugin.EventHandlers.Specialists { @@ -21,7 +22,7 @@ public class Specialist_Remove_Handler : GenericEventPostProcessorBase { + public Upgrading_Celloning_Handler(ILogger log) : base(log) + { + } + protected override async Task Handle(CellonItemEvent e, CancellationToken cancellation) { if (!(e.Sender is IPlayerEntity player)) @@ -31,7 +36,7 @@ protected override async Task Handle(CellonItemEvent e, CancellationToken cancel /* if (option == null || e.Jewelry.EquipmentOptions.Any(s => s.Type == option.Type)) { - player.SendTopscreenMessage("CELLONING_FAILED", MsgPacketType.White); + player.SendTopscreenMessage("CELLONING_FAILED", MessageType.White); player.GenerateShopEndPacket(ShopEndPacketType.CloseSubWindow); return; } @@ -39,7 +44,7 @@ protected override async Task Handle(CellonItemEvent e, CancellationToken cancel // SUCCESS e.Jewelry.EquipmentOptions.Add(option); */ - await player.SendTopscreenMessage("CELLONING_SUCCESS", MsgPacketType.White); + await player.SendTopscreenMessage("CELLONING_SUCCESS", MessageType.White); await player.SendPacketAsync(player.GenerateShopEndPacket(ShopEndPacketType.CloseSubWindow)); } } diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Upgrading/Upgrading_ItemUpgrading_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Upgrading/Upgrading_ItemUpgrading_Handler.cs index 1e6dc430..cc6badf5 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Upgrading/Upgrading_ItemUpgrading_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Upgrading/Upgrading_ItemUpgrading_Handler.cs @@ -1,6 +1,7 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory.ItemUpgrade; using ChickenAPI.Game.Inventory.ItemUpgrade.Events; @@ -12,10 +13,8 @@ public class Upgrading_ItemUpgrading_Handler : GenericEventPostProcessorBase _itemUpgradeHandler = itemUpgradeHandler; protected override Task Handle(ItemUpgradeEvent e, CancellationToken cancellation) { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Upgrading/Upgrading_PerfectSp_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Upgrading/Upgrading_PerfectSp_Handler.cs index 6b59e2bd..1d9e5dce 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Upgrading/Upgrading_PerfectSp_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Upgrading/Upgrading_PerfectSp_Handler.cs @@ -1,8 +1,8 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Core.Maths; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game; using ChickenAPI.Game.Configuration; using ChickenAPI.Game.Effects; @@ -11,6 +11,7 @@ using ChickenAPI.Game.Helpers; using ChickenAPI.Game.Inventory.ItemUpgrade.Events; using ChickenAPI.Game.Shops.Extensions; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicPlugin.EventHandlers { @@ -19,10 +20,11 @@ public class Upgrading_PerfectSp_Handler : GenericEventPostProcessorBase= 8 ? _configuration.UpgradeItem.UpFailR8 : _configuration.UpgradeItem.UpFail; short[] upfix = e.Item.Rarity >= 8 ? _configuration.UpgradeItem.UpFixR8 : _configuration.UpgradeItem.UpFix; int[] goldprice = e.Item.Rarity >= 8 ? _configuration.UpgradeItem.GoldPriceR8 : _configuration.UpgradeItem.GoldPrice; @@ -163,7 +166,7 @@ await player.SendPacketAsync(player.GenerateShopEndPacket(player.Inventory.HasIt if (e.HasAmulet == FixedUpMode.HasAmulet && e.Item.IsFixed) { - var amulet = player.Inventory.GetWeared(EquipmentType.Amulet); + ItemInstanceDto amulet = player.Inventory.GetWeared(EquipmentType.Amulet); /*amulet.DurabilityPoint -= 1; if (amulet.DurabilityPoint <= 0) { @@ -189,14 +192,14 @@ await player.SendPacketAsync(player.GenerateShopEndPacket(player.Inventory.HasIt if (e.Protection == UpgradeProtection.None) { await player.SendChatMessageAsync("UPGRADE_FAILED", SayColorType.Purple); - await player.SendTopscreenMessage("UPGRADE_FAILED", MsgPacketType.Whisper); + await player.SendTopscreenMessage("UPGRADE_FAILED", MessageType.Whisper); //session.Character.DeleteItemByItemInstanceId(Id); } else { await player.BroadcastAsync(player.GenerateEffectPacket(3004)); await player.SendChatMessageAsync("SCROLL_PROTECT_USED", SayColorType.Purple); - await player.SendTopscreenMessage("UPGRADE_FAILED_ITEM_SAVED", MsgPacketType.Whisper); + await player.SendTopscreenMessage("UPGRADE_FAILED_ITEM_SAVED", MessageType.Whisper); } } else if (rnd < upfix[e.Item.Upgrade]) @@ -204,13 +207,13 @@ await player.SendPacketAsync(player.GenerateShopEndPacket(player.Inventory.HasIt await player.BroadcastAsync(player.GenerateEffectPacket(3004)); wearable.IsFixed = true; await player.SendChatMessageAsync("UPGRADE_FIXED", SayColorType.Purple); - await player.SendTopscreenMessage("UPGRADE_FIXED", MsgPacketType.Whisper); + await player.SendTopscreenMessage("UPGRADE_FIXED", MessageType.Whisper); } else { await player.BroadcastAsync(player.GenerateEffectPacket(3005)); await player.SendChatMessageAsync("UPGRADE_SUCCESS", SayColorType.Green); - await player.SendTopscreenMessage("UPGRADE_SUCCESS", MsgPacketType.Whisper); + await player.SendTopscreenMessage("UPGRADE_SUCCESS", MessageType.Whisper); wearable.Upgrade++; if (wearable.Upgrade > 4) { @@ -228,28 +231,28 @@ await player.SendPacketAsync(player.GenerateShopEndPacket(player.Inventory.HasIt await player.BroadcastAsync(player.GenerateEffectPacket(3004)); wearable.IsFixed = true; await player.SendChatMessageAsync("UPGRADE_FIXED", SayColorType.Purple); - await player.SendTopscreenMessage("UPGRADE_FIXED", MsgPacketType.Whisper); + await player.SendTopscreenMessage("UPGRADE_FIXED", MessageType.Whisper); } else if (rnd < upfail[e.Item.Upgrade] + upfix[e.Item.Upgrade]) { if (e.Protection == UpgradeProtection.None) { await player.SendChatMessageAsync("UPGRADE_FAILED", SayColorType.Purple); - await player.SendTopscreenMessage("UPGRADE_FAILED", MsgPacketType.Whisper); + await player.SendTopscreenMessage("UPGRADE_FAILED", MessageType.Whisper); //session.Character.DeleteItemByItemInstanceId(Id); } else { await player.BroadcastAsync(player.GenerateEffectPacket(3004)); await player.SendChatMessageAsync("SCROLL_PROTECT_USED", SayColorType.Purple); - await player.SendTopscreenMessage("UPGRADE_FAILED_ITEM_SAVED", MsgPacketType.Whisper); + await player.SendTopscreenMessage("UPGRADE_FAILED_ITEM_SAVED", MessageType.Whisper); } } else { await player.BroadcastAsync(player.GenerateEffectPacket(3005)); await player.SendChatMessageAsync("UPGRADE_SUCCESS", SayColorType.Green); - await player.SendTopscreenMessage("UPGRADE_SUCCESS", MsgPacketType.Whisper); + await player.SendTopscreenMessage("UPGRADE_SUCCESS", MessageType.Whisper); wearable.Upgrade++; if (wearable.Upgrade > 4) { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Upgrading/Upgrading_UpgradeSp_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Upgrading/Upgrading_UpgradeSp_Handler.cs index b47e2ccd..cef531d0 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Upgrading/Upgrading_UpgradeSp_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Upgrading/Upgrading_UpgradeSp_Handler.cs @@ -1,10 +1,10 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; +using ChickenAPI.Core.Logging; using ChickenAPI.Core.Maths; +using ChickenAPI.Data.Enums.Game.Items.Upgrade; using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game; using ChickenAPI.Game.Configuration; using ChickenAPI.Game.Effects; @@ -14,6 +14,7 @@ using ChickenAPI.Game.Inventory.Extensions; using ChickenAPI.Game.Inventory.ItemUpgrade.Events; using ChickenAPI.Game.Shops.Extensions; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicPlugin.EventHandlers { @@ -22,7 +23,8 @@ public class Upgrading_UpgradeSp_Handler : GenericEventPostProcessorBase { + public Visibility_Invisible_Handler(ILogger log) : base(log) + { + } + protected override async Task Handle(VisibilitySetInvisibleEvent e, CancellationToken cancellation) { if (!(e.Sender is IVisibleCapacity visible)) diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Visibility/Visibility_Visible_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Visibility/Visibility_Visible_Handler.cs index c80a59bf..99e0515e 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Visibility/Visibility_Visible_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/EventHandlers/Visibility/Visibility_Visible_Handler.cs @@ -1,7 +1,8 @@ using System.Threading; using System.Threading.Tasks; using ChickenAPI.Core.Events; -using ChickenAPI.Enums.Game.Visibility; +using ChickenAPI.Core.Logging; +using ChickenAPI.Data.Enums.Game.Visibility; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory.Extensions; using ChickenAPI.Game.Visibility; @@ -11,6 +12,10 @@ namespace SaltyEmu.BasicPlugin.EventHandlers.Visibility { public class Visibility_Visible_Handler : GenericEventPostProcessorBase { + public Visibility_Visible_Handler(ILogger log) : base(log) + { + } + protected override async Task Handle(VisibilitySetVisibleEvent e, CancellationToken cancellation) { if (!(e.Sender is IVisibleCapacity visible)) diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/GuriHandlers/EmoticonGuriHandler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/GuriHandlers/EmoticonGuriHandler.cs index dd88ba66..bff65ccb 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/GuriHandlers/EmoticonGuriHandler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/GuriHandlers/EmoticonGuriHandler.cs @@ -1,5 +1,5 @@ using ChickenAPI.Core.Logging; -using ChickenAPI.Enums.Game.Effects; +using ChickenAPI.Data.Enums.Game.Effects; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.GuriHandling.Events; using ChickenAPI.Game.GuriHandling.Handling; @@ -9,7 +9,7 @@ namespace SaltyEmu.BasicPlugin.GuriHandlers { public class EmoticonGuriHandler { - private static readonly Logger Log = Logger.GetLogger(); + // private static readonly Logger Log = Logger.GetLogger(); /// /// This method will teleport the requester to Act 6 @@ -28,7 +28,7 @@ public static void OnEmoticonRequest(IPlayerEntity player, GuriEvent e) // todo receiver type player.BroadcastAsync(player.EmojiToEffectPacket((EmojiType)e.Data)).ConfigureAwait(false).GetAwaiter().GetResult(); - Log.Info($"[GURI][EMOTICON] {player.Character.Name} used emoji : "); + // Log.Info($"[GURI][EMOTICON] {player.Character.Name} used emoji : "); } } } \ No newline at end of file diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/GuriHandlers/ReleasePetsHandler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/GuriHandlers/ReleasePetsHandler.cs index 8f0e9af5..2ce371b4 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/GuriHandlers/ReleasePetsHandler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/GuriHandlers/ReleasePetsHandler.cs @@ -1,17 +1,17 @@ using ChickenAPI.Core.Logging; using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.GuriHandling.Events; using ChickenAPI.Game.GuriHandling.Handling; using ChickenAPI.Game.Inventory.Events; using ChickenAPI.Game.Inventory.Extensions; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicPlugin.GuriHandlers { public class ReleasePetsHandler { - private static readonly Logger Log = Logger.GetLogger(); + // private static readonly Logger Log = Logger.GetLogger(); /// /// This method will teleport the requester to Act 6 @@ -27,7 +27,7 @@ public static void ReleasePets(IPlayerEntity player, GuriEvent e) return; } - ItemInstanceDto item = player.Inventory.GetItemFromSlotAndType(e.InvSlot, InventoryType.Equipment); + ItemInstanceDto item = player.Inventory.GetItemFromSlotAndType(e.InvSlot, PocketType.Equipment); if (item == null) { @@ -40,7 +40,7 @@ public static void ReleasePets(IPlayerEntity player, GuriEvent e) Option = 50 }); - Log.Info($"[GURI][RELEASE_PETS] {player.Character.Name} used Pearl : "); + // Log.Info($"[GURI][RELEASE_PETS] {player.Character.Name} used Pearl : "); } } } \ No newline at end of file diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/GuriHandlers/ShellIdentifyingGuriHandler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/GuriHandlers/ShellIdentifyingGuriHandler.cs index c98e2d53..6458ede2 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/GuriHandlers/ShellIdentifyingGuriHandler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/GuriHandlers/ShellIdentifyingGuriHandler.cs @@ -7,7 +7,7 @@ namespace SaltyEmu.BasicPlugin.GuriHandlers { public class ShellIdentifyingGuriHandler { - private static readonly Logger Log = Logger.GetLogger(); + // private static readonly Logger Log = Logger.GetLogger(); /// /// This method will teleport the requester to Act 6 @@ -18,7 +18,7 @@ public class ShellIdentifyingGuriHandler [GuriEffect(204)] public static void OnShellIdentifyRequest(IPlayerEntity player, GuriEvent e) { - Log.Info($"[GURI][SHELL_IDENTIFY] {player.Character.Name} identified shell : "); + // Log.Info($"[GURI][SHELL_IDENTIFY] {player.Character.Name} identified shell : "); } } } \ No newline at end of file diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/Implems/BasicPacketPipelineAsync.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/Implems/BasicPacketPipelineAsync.cs index 67f688b5..9f577e0c 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/Implems/BasicPacketPipelineAsync.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/Implems/BasicPacketPipelineAsync.cs @@ -3,8 +3,8 @@ using System.Reflection; using System.Threading.Tasks; using ChickenAPI.Game._Network; -using ChickenAPI.Packets; using ChickenAPI.Packets.Attributes; +using ChickenAPI.Packets.Interfaces; namespace SaltyEmu.BasicPlugin.Implems { @@ -34,7 +34,7 @@ public Task UnregisterAsync(IPacketProcessor processor, Type packetType) public Task Handle(IPacket packet, ISession session) { - if (!_packetProcessors.TryGetValue(packet.PacketType, out IPacketProcessor processor)) + if (!_packetProcessors.TryGetValue(packet.GetType(), out IPacketProcessor processor)) { return Task.CompletedTask; } diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/BasicUpgradeHandler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/BasicUpgradeHandler.cs index b385ccb1..361af11a 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/BasicUpgradeHandler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/BasicUpgradeHandler.cs @@ -2,23 +2,25 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; +using ChickenAPI.Core.IoC; using ChickenAPI.Core.Logging; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory.ItemUpgrade; using ChickenAPI.Game.Inventory.ItemUpgrade.Events; using ChickenAPI.Game.Inventory.ItemUpgrade.Handlers; using ChickenAPI.Game.Inventory.ItemUpgrade.Handlers.Handling; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicPlugin.ItemUpgradeHandlers { public class BasicUpgradeHandler : IItemUpgradeHandler { - private static readonly Logger Log = Logger.GetLogger(); + private readonly ILogger _log; protected readonly Dictionary HandlersByUpgradeType; - public BasicUpgradeHandler() + public BasicUpgradeHandler(ILogger log) { + _log = log; HandlersByUpgradeType = new Dictionary(); Assembly currentAsm = Assembly.GetAssembly(typeof(BasicUpgradeHandler)); // get types @@ -42,7 +44,7 @@ public void Register(ItemUpgradeHandler handlerAttribute) return; } - Log.Info($"[REGISTER_HANDLER] UPGRADE_TYPE : {handlerAttribute.Type} REGISTERED !"); + _log.Info($"[REGISTER_HANDLER] UPGRADE_TYPE : {handlerAttribute.Type} REGISTERED !"); HandlersByUpgradeType.Add(handlerAttribute.Type, handlerAttribute); } diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/CellonItem.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/CellonItem.cs index e70d0eb3..ee009162 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/CellonItem.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/CellonItem.cs @@ -1,10 +1,10 @@ -using ChickenAPI.Enums.Packets; -using ChickenAPI.Game.Entities.Player; +using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Helpers; using ChickenAPI.Game.Inventory.ItemUpgrade.Events; using ChickenAPI.Game.Inventory.ItemUpgrade.Handlers; using ChickenAPI.Game.Inventory.ItemUpgrade.Handlers.Handling; using ChickenAPI.Game.Shops.Extensions; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicPlugin.ItemUpgradeHandlers { @@ -24,7 +24,7 @@ public static void CellonItemNpc(IPlayerEntity player, ItemUpgradeEvent e) if (e.CellonItem.Item.EffectValue > e.SecondItem.Item.MaxCellonLvl) { - player.SendTopscreenMessage("CELLON_LEVEL_TOO_HIGH", MsgPacketType.White); + player.SendTopscreenMessage("CELLON_LEVEL_TOO_HIGH", MessageType.White); player.GenerateShopEndPacket(ShopEndPacketType.CloseSubWindow); return; } @@ -34,7 +34,7 @@ public static void CellonItemNpc(IPlayerEntity player, ItemUpgradeEvent e) if (e.SecondItem.Item.MaxCellon <= equipmentOptionsCount) { - player.SendTopscreenMessage("CELLON_FULL", MsgPacketType.White); + player.SendTopscreenMessage("CELLON_FULL", MessageType.White); player.GenerateShopEndPacket(ShopEndPacketType.CloseSubWindow); return; } @@ -75,7 +75,7 @@ public static void CellonItemNpc(IPlayerEntity player, ItemUpgradeEvent e) if (player.Character.Gold < gold) { - player.SendTopscreenMessage("NOT_ENOUGH_GOLD", MsgPacketType.White); + player.SendTopscreenMessage("NOT_ENOUGH_GOLD", MessageType.White); player.GenerateShopEndPacket(ShopEndPacketType.CloseSubWindow); return; } diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/PerfectSpCard.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/PerfectSpCard.cs index e4f164d8..13cb5abd 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/PerfectSpCard.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/PerfectSpCard.cs @@ -1,8 +1,6 @@ using System; using Autofac; using ChickenAPI.Core.IoC; -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game; using ChickenAPI.Game.Configuration; using ChickenAPI.Game.Entities.Player; @@ -11,6 +9,8 @@ using ChickenAPI.Game.Inventory.ItemUpgrade.Events; using ChickenAPI.Game.Inventory.ItemUpgrade.Handlers; using ChickenAPI.Game.Inventory.ItemUpgrade.Handlers.Handling; +using ChickenAPI.Packets.Enumerations; +using EquipmentType = ChickenAPI.Data.Enums.Game.Items.EquipmentType; namespace SaltyEmu.BasicPlugin.ItemUpgradeHandlers { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/RarifyItemHandler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/RarifyItemHandler.cs index dd57ffa7..93b48b4a 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/RarifyItemHandler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/RarifyItemHandler.cs @@ -1,19 +1,19 @@ using ChickenAPI.Core.Logging; -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Enums.Packets; +using ChickenAPI.Data.Enums.Game.Items.Upgrade; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory.Extensions; using ChickenAPI.Game.Inventory.ItemUpgrade.Events; using ChickenAPI.Game.Inventory.ItemUpgrade.Handlers; using ChickenAPI.Game.Inventory.ItemUpgrade.Handlers.Handling; using ChickenAPI.Game.Shops.Extensions; -using ChickenAPI.Packets.Game.Server.Shop; +using ChickenAPI.Packets.Enumerations; +using EquipmentType = ChickenAPI.Data.Enums.Game.Items.EquipmentType; namespace SaltyEmu.BasicPlugin.ItemUpgradeHandlers { public class RarifyItemHandler { - private static readonly Logger Log = Logger.GetLogger(); + // private static readonly Logger Log = Logger.GetLogger(); [ItemUpgradeHandler(UpgradePacketType.RarifyItem)] public static void RarifyNpc(IPlayerEntity player, ItemUpgradeEvent e) @@ -26,7 +26,7 @@ public static void RarifyNpc(IPlayerEntity player, ItemUpgradeEvent e) var mode = RarifyMode.Normal; var protection = RarifyProtection.None; - var amulet = player.Inventory.GetItemFromSlotAndType((short)EquipmentType.Amulet, InventoryType.Wear); + var amulet = player.Inventory.GetItemFromSlotAndType((short)EquipmentType.Amulet, PocketType.Wear); if (amulet != null) { switch (amulet.Item.Effect) diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/SumItem.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/SumItem.cs index 77fd0cc7..d9f9f649 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/SumItem.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/SumItem.cs @@ -1,8 +1,6 @@ using System; using Autofac; using ChickenAPI.Core.IoC; -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game; using ChickenAPI.Game.Configuration; using ChickenAPI.Game.Entities.Player; @@ -10,6 +8,8 @@ using ChickenAPI.Game.Inventory.ItemUpgrade.Events; using ChickenAPI.Game.Inventory.ItemUpgrade.Handlers; using ChickenAPI.Game.Inventory.ItemUpgrade.Handlers.Handling; +using ChickenAPI.Packets.Enumerations; +using EquipmentType = ChickenAPI.Data.Enums.Game.Items.EquipmentType; namespace SaltyEmu.BasicPlugin.ItemUpgradeHandlers { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/UpgradeItemHandler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/UpgradeItemHandler.cs index 7fe941a8..b616a68c 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/UpgradeItemHandler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/UpgradeItemHandler.cs @@ -1,9 +1,8 @@ using System; using Autofac; using ChickenAPI.Core.IoC; +using ChickenAPI.Data.Enums.Game.Items.Upgrade; using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game; using ChickenAPI.Game.Configuration; using ChickenAPI.Game.Entities.Player; @@ -11,6 +10,8 @@ using ChickenAPI.Game.Inventory.ItemUpgrade.Events; using ChickenAPI.Game.Inventory.ItemUpgrade.Handlers; using ChickenAPI.Game.Inventory.ItemUpgrade.Handlers.Handling; +using ChickenAPI.Packets.Enumerations; +using EquipmentType = ChickenAPI.Data.Enums.Game.Items.EquipmentType; namespace SaltyEmu.BasicPlugin.ItemUpgradeHandlers { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/UpgradeSpCard.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/UpgradeSpCard.cs index 402e8742..14c58236 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/UpgradeSpCard.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUpgradeHandlers/UpgradeSpCard.cs @@ -1,10 +1,11 @@ -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Enums.Packets; +using ChickenAPI.Data.Enums.Game.Items.Upgrade; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Helpers; using ChickenAPI.Game.Inventory.ItemUpgrade.Events; using ChickenAPI.Game.Inventory.ItemUpgrade.Handlers; using ChickenAPI.Game.Inventory.ItemUpgrade.Handlers.Handling; +using ChickenAPI.Packets.Enumerations; +using EquipmentType = ChickenAPI.Data.Enums.Game.Items.EquipmentType; namespace SaltyEmu.BasicPlugin.ItemUpgradeHandlers { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUsageHandlers/Handler/BoxItem/PearlPetsReleaseHandler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUsageHandlers/Handler/BoxItem/PearlPetsReleaseHandler.cs index 84b09d11..1b2ad5e8 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUsageHandlers/Handler/BoxItem/PearlPetsReleaseHandler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUsageHandlers/Handler/BoxItem/PearlPetsReleaseHandler.cs @@ -1,20 +1,18 @@ using System.Threading.Tasks; using ChickenAPI.Core.Logging; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Enums.Game.Items; +using ChickenAPI.Data.Enums.Game.Entity; +using ChickenAPI.Data.Enums.Game.Items; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Helpers; using ChickenAPI.Game.Inventory.Events; using ChickenAPI.Game.Inventory.ItemUsage; using ChickenAPI.Game.Mates.Events; -using ChickenAPI.Packets.Game.Client.Player; +using ChickenAPI.Packets.ClientPackets.Player; namespace SaltyEmu.BasicPlugin.ItemUsageHandlers.Handler.BoxItem { public class PearlPetsReleaseHandler : IUseItemRequestHandlerAsync { - private readonly Logger _log = Logger.GetLogger(); - public ItemType Type => ItemType.Box; public long EffectId => 1; diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUsageHandlers/Handler/LocomotionHandler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUsageHandlers/Handler/LocomotionHandler.cs index e27865d7..5e6381ad 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUsageHandlers/Handler/LocomotionHandler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUsageHandlers/Handler/LocomotionHandler.cs @@ -1,7 +1,6 @@ using System.Threading.Tasks; using ChickenAPI.Core.Logging; -using ChickenAPI.Enums.Game.Items; -using ChickenAPI.Enums.Packets; +using ChickenAPI.Data.Enums.Game.Items; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Helpers; using ChickenAPI.Game.Inventory.Events; @@ -12,7 +11,12 @@ namespace SaltyEmu.BasicPlugin.ItemUsageHandlers.Handler { public class LocomotionHandler : IUseItemRequestHandlerAsync { - private readonly Logger _log = Logger.GetLogger(); + private readonly ILogger _log; + + public LocomotionHandler(ILogger log) + { + _log = log; + } public ItemType Type => ItemType.Special; @@ -24,15 +28,15 @@ public async Task Handle(IPlayerEntity player, InventoryUseItemEvent e) { if (e.Option == 0) { - await player.GenerateDelay(3000, DelayPacketType.Locomotion, $"#u_i^1^{player.Character.Id}^{(byte)e.Item.Type}^{e.Item.Slot}^2"); + // await player.SendDelayAsync(3000, DelayPacketType.Locomotion, $"#u_i^1^{player.Character.Id}^{(byte)e.Item.Type}^{e.Item.Slot}^2"); return; } - player.EmitEvent(new LocomotionTransformEvent { Item = e.Item }); + await player.EmitEventAsync(new LocomotionTransformEvent { Item = e.Item }); return; } - player.EmitEvent(new LocomotionUntransformEvent { }); + await player.EmitEventAsync(new LocomotionUntransformEvent { }); } } } \ No newline at end of file diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUsageHandlers/Handler/WingsSpCard.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUsageHandlers/Handler/WingsSpCard.cs index 4b475e77..adb75413 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUsageHandlers/Handler/WingsSpCard.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUsageHandlers/Handler/WingsSpCard.cs @@ -1,18 +1,18 @@ using System.Threading.Tasks; using ChickenAPI.Core.Logging; -using ChickenAPI.Enums.Game.Entity; -using ChickenAPI.Enums.Game.Items; +using ChickenAPI.Data.Enums.Game.Items; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Helpers; using ChickenAPI.Game.Inventory.Events; using ChickenAPI.Game.Inventory.ItemUsage; -using ChickenAPI.Packets.Game.Client.Inventory; +using ChickenAPI.Packets.ClientPackets.Inventory; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicPlugin.ItemUsageHandlers.Handler { public class WingsSpCardHandler : IUseItemRequestHandlerAsync { - private static readonly Logger Log = Logger.GetLogger(); + // private static readonly Logger Log = Logger.GetLogger(); public ItemType Type => ItemType.Special; public long EffectId => 650; @@ -29,14 +29,14 @@ public async Task Handle(IPlayerEntity player, InventoryUseItemEvent e) return; } - await player.SendQuestionAsync(new UiPacket + await player.SendQuestionAsync(new UseItemPacket { - VisualType = VisualType.Character, - CharacterId = player.Id, - InventoryType = e.Item.Type, - InventorySlot = (byte)e.Item.Slot, - Unknown2 = 3, - Unknown3 = 0 + VisualType = VisualType.Player, + VisualId = player.Id, + Type = e.Item.Type, + Slot = (byte)e.Item.Slot, + Parameter = 3, + Mode = 0, }, "ASK_WINGS_CHANGE"); return; diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUsageHandlers/UseItemHandlerAsync.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUsageHandlers/UseItemHandlerAsync.cs index 7b320760..eb4e9fe6 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUsageHandlers/UseItemHandlerAsync.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/ItemUsageHandlers/UseItemHandlerAsync.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using ChickenAPI.Core.Logging; -using ChickenAPI.Enums.Game.Items; +using ChickenAPI.Data.Enums.Game.Items; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Inventory.Events; using ChickenAPI.Game.Inventory.ItemUsage; @@ -10,10 +10,14 @@ namespace SaltyEmu.BasicPlugin.ItemUsageHandlers { public class UseItemHandlerContainer : IItemUsageContainerAsync { - private readonly Logger _log = Logger.GetLogger(); - + private readonly ILogger _log; private readonly Dictionary<(long, ItemType), IUseItemRequestHandlerAsync> _handlers = new Dictionary<(long, ItemType), IUseItemRequestHandlerAsync>(); + public UseItemHandlerContainer(ILogger log) + { + _log = log; + } + public Task RegisterItemUsageCallback(IUseItemRequestHandlerAsync handler) { _handlers.Add((handler.EffectId, handler.Type), handler); diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/JsonGameConfiguration.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/JsonGameConfiguration.cs index c939dfb6..a70f789d 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/JsonGameConfiguration.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/JsonGameConfiguration.cs @@ -1,10 +1,11 @@ -using ChickenAPI.Game; +using ChickenAPI.Core.Configurations; +using ChickenAPI.Game; using ChickenAPI.Game.Configuration; using ChickenAPI.Game.Configuration.Item_Managements; namespace SaltyEmu.BasicPlugin { - public class JsonGameConfiguration : IGameConfiguration + public class JsonGameConfiguration : IGameConfiguration, IConfiguration { public RateConfiguration Rates { get; set; } = new RateConfiguration { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/NpcDialogHandlers/DialogHandler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/NpcDialogHandlers/DialogHandler.cs index 1b12c548..e67f3d98 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/NpcDialogHandlers/DialogHandler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/NpcDialogHandlers/DialogHandler.cs @@ -1,15 +1,15 @@ using ChickenAPI.Core.Logging; -using ChickenAPI.Enums.Game.Character; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; using ChickenAPI.Game.NpcDialog.Events; using ChickenAPI.Game.NpcDialog.Handling; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicPlugin.NpcDialogHandlers { public class DialogHandler { - private static readonly Logger Log = Logger.GetLogger(); + // private static readonly Logger Log = Logger.GetLogger(); [NpcDialogHandler(1)] public static void ChangeJobMiMi(IPlayerEntity player, NpcDialogEvent args) @@ -36,30 +36,30 @@ public static void ChangeJobMiMi(IPlayerEntity player, NpcDialogEvent args) return; } - player.ChangeClass((CharacterClassType)args.Type); + player.ChangeClass((CharacterClassType)args.Type).ConfigureAwait(false).GetAwaiter().GetResult(); // TODO : LATER - /* if (Session.Character.Inventory.All(i => i.Type == InventoryType.Wear)) + /* if (Session.Character.Inventory.All(i => i.Type == PocketType.Wear)) { await session.SendPacketAsync(UserInterfaceHelper.GenerateMsg(Language.Instance.GetMessageFromKey("EQ_NOT_EMPTY"), 0)); return; } - Session.Character.Inventory.AddNewToInventory((short)(4 + (packet.Type * 14)), type: InventoryType.Wear); - Session.Character.Inventory.AddNewToInventory((short)(81 + (packet.Type * 13)), type: InventoryType.Wear); + Session.Character.Inventory.AddNewToInventory((short)(4 + (packet.Type * 14)), type: PocketType.Wear); + Session.Character.Inventory.AddNewToInventory((short)(81 + (packet.Type * 13)), type: PocketType.Wear); switch (packet.Type) { case 1: - Session.Character.Inventory.AddNewToInventory(68, type: InventoryType.Wear); + Session.Character.Inventory.AddNewToInventory(68, type: PocketType.Wear); Session.Character.Inventory.AddNewToInventory(2082, 10); break; case 2: - Session.Character.Inventory.AddNewToInventory(78, type: InventoryType.Wear); + Session.Character.Inventory.AddNewToInventory(78, type: PocketType.Wear); Session.Character.Inventory.AddNewToInventory(2083, 10); break; case 3: - Session.Character.Inventory.AddNewToInventory(86, type: InventoryType.Wear); + Session.Character.Inventory.AddNewToInventory(86, type: PocketType.Wear); break; default: diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/NpcDialogHandlers/FamilyHandler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/NpcDialogHandlers/FamilyHandler.cs index 977fe1b9..917a259c 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/NpcDialogHandlers/FamilyHandler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/NpcDialogHandlers/FamilyHandler.cs @@ -1,16 +1,14 @@ using ChickenAPI.Core.Logging; -using ChickenAPI.Enums.Game.Families; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; using ChickenAPI.Game.NpcDialog.Events; using ChickenAPI.Game.NpcDialog.Handling; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicPlugin.NpcDialogHandlers { public class FamilyHandler { - private static readonly Logger Log = Logger.GetLogger(); - [NpcDialogHandler(23)] public static void CreateFamily(IPlayerEntity player, NpcDialogEvent args) { @@ -52,6 +50,7 @@ public static void UpgradeFamilySize2(IPlayerEntity player, NpcDialogEvent args) { return; } + if (player.FamilyCharacter.Authority != FamilyAuthority.Head) { /* await session.SendPacketAsync(Session.Character.GenerateSay(Language.Instance.GetMessageFromKey("ONLY_HEAD_CAN_BUY"), 10)); @@ -65,6 +64,7 @@ public static void UpgradeFamilySize2(IPlayerEntity player, NpcDialogEvent args) //await session.SendPacketAsync(Session.Character.GenerateSay(Language.Instance.GetMessageFromKey("NOT_ENOUGH_MONEY"), 10)); return; } + player.GoldLess(10000000); player.Family.MaxSize = 100; /*FamilyDTO fam = Session.Character.Family; diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/NpcDialogHandlers/Handlers/Families/NpcDialog_UpgradeFamily_Handler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/NpcDialogHandlers/Handlers/Families/NpcDialog_UpgradeFamily_Handler.cs index 33d3592d..6383ce07 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/NpcDialogHandlers/Handlers/Families/NpcDialog_UpgradeFamily_Handler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/NpcDialogHandlers/Handlers/Families/NpcDialog_UpgradeFamily_Handler.cs @@ -2,13 +2,13 @@ using System.Collections.Generic; using System.Text; using System.Threading.Tasks; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Entities.Player.Extensions; using ChickenAPI.Game.Helpers; using ChickenAPI.Game.NpcDialog; using ChickenAPI.Game.NpcDialog.Events; using ChickenAPI.Game._i18n; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.BasicPlugin.NpcDialogHandlers.Handlers.Families { @@ -23,7 +23,7 @@ public async Task Execute(IPlayerEntity player, NpcDialogEvent e) return; } - if (player.FamilyCharacter.Authority != ChickenAPI.Enums.Game.Families.FamilyAuthority.Head) + if (player.FamilyCharacter.Authority != FamilyAuthority.Head) { await player.SendChatMessageAsync(PlayerMessages.FAMILY_YOU_NEED_TO_BE_LEADER, SayColorType.Yellow); await player.SendModalAsync(PlayerMessages.FAMILY_YOU_NEED_TO_BE_LEADER, ModalPacketType.Default); diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/NpcDialogHandlers/TeleporterHandler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/NpcDialogHandlers/TeleporterHandler.cs index 0fc7aa53..ed428595 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/NpcDialogHandlers/TeleporterHandler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/NpcDialogHandlers/TeleporterHandler.cs @@ -10,8 +10,6 @@ namespace SaltyEmu.BasicPlugin.NpcDialogHandlers { public class TeleporterHandler { - private static readonly Logger Log = Logger.GetLogger(); - /// /// This method will teleport the requester to Krem or Alveus, depending on which dialog type he choosed /// @@ -28,7 +26,7 @@ public static void OnNpcDialogTeleport(IPlayerEntity player, NpcDialogEvent args if (player.Character.Gold <= 1000 * args.Type) { // No Money -> SendMsg(NOMONEY); - Log.Info($"[TELEPORT][NO-MONEY] {player.Character.Name}"); + // Log.Info($"[TELEPORT][NO-MONEY] {player.Character.Name}"); return; } @@ -45,7 +43,7 @@ public static void OnNpcDialogTeleport(IPlayerEntity player, NpcDialogEvent args break; } } - + [NpcDialogHandler(17)] public static void EnterArenaInstance(IPlayerEntity player, NpcDialogEvent args) { @@ -71,7 +69,7 @@ public static void EnterArenaInstance(IPlayerEntity player, NpcDialogEvent args) if (player.Character.Gold <= 500 * 1 * args.Type) { // No Money -> SendMsg(NOMONEY); - Log.Info($"[TELEPORT][NO-MONEY] {player.Character.Name}"); + // Log.Info($"[TELEPORT][NO-MONEY] {player.Character.Name}"); return; } @@ -93,10 +91,10 @@ public static void EnterArenaInstance(IPlayerEntity player, NpcDialogEvent args) [NpcDialogHandler(301)] public static void OnGrahamDialogTeleport(IPlayerEntity player, NpcDialogEvent args) { - Log.Info($"[TELEPORT][GRAHAM] {player.Character.Name}"); + // Log.Info($"[TELEPORT][GRAHAM] {player.Character.Name}"); // need to provide implementation } - + [NpcDialogHandler(26)] public static void TeleportUnknow(IPlayerEntity player, NpcDialogEvent args) { @@ -109,7 +107,7 @@ public static void TeleportUnknow(IPlayerEntity player, NpcDialogEvent args) if (player.Character.Gold <= 5000 * args.Type) { // No Money -> SendMsg(NOMONEY); - Log.Info($"[TELEPORT][NO-MONEY] {player.Character.Name}"); + // Log.Info($"[TELEPORT][NO-MONEY] {player.Character.Name}"); return; } @@ -117,7 +115,7 @@ public static void TeleportUnknow(IPlayerEntity player, NpcDialogEvent args) //TeleportationHelper.TeleportTo(player, 20, 10, 91); } - + [NpcDialogHandler(45)] public static void TeleportUnknow2(IPlayerEntity player, NpcDialogEvent args) { @@ -130,7 +128,7 @@ public static void TeleportUnknow2(IPlayerEntity player, NpcDialogEvent args) if (player.Character.Gold <= 500) { // No Money -> SendMsg(NOMONEY); - Log.Info($"[TELEPORT][NO-MONEY] {player.Character.Name}"); + // Log.Info($"[TELEPORT][NO-MONEY] {player.Character.Name}"); return; } @@ -138,7 +136,7 @@ public static void TeleportUnknow2(IPlayerEntity player, NpcDialogEvent args) player.TeleportTo(20, 10, 91); } - + [NpcDialogHandler(132)] public static void TeleportUnknow3(IPlayerEntity player, NpcDialogEvent args) { @@ -150,7 +148,7 @@ public static void TeleportUnknow3(IPlayerEntity player, NpcDialogEvent args) //TeleportationHelper.TeleportTo(player, 20, 10, 91); } - + [NpcDialogHandler(301)] public static void TeleportUnknow4(IPlayerEntity player, NpcDialogEvent args) { @@ -162,7 +160,7 @@ public static void TeleportUnknow4(IPlayerEntity player, NpcDialogEvent args) //TeleportationHelper.TeleportTo(player, 20, 10, 91); } - + [NpcDialogHandler(150)] public static void EnterLod(IPlayerEntity player, NpcDialogEvent args) { @@ -193,19 +191,19 @@ public static void EnterLod(IPlayerEntity player, NpcDialogEvent args) player.TeleportTo(150, 153, 145); } - + [NpcDialogHandler(5004)] public static void AlveusFromAct4(IPlayerEntity player, NpcDialogEvent args) { player.TeleportTo(145, 50, 41); } - + [NpcDialogHandler(5011)] public static void GoToAct5(IPlayerEntity player, NpcDialogEvent args) { player.TeleportTo(170, 127, 46); } - + [NpcDialogHandler(5012)] public static void TpUnknow(IPlayerEntity player, NpcDialogEvent args) { diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/NpcDialogHandlers/WopenHandler.cs b/src/Plugins/NosSharp.TemporaryMapPlugins/NpcDialogHandlers/WopenHandler.cs index 62a4efbb..9a25e3d4 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/NpcDialogHandlers/WopenHandler.cs +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/NpcDialogHandlers/WopenHandler.cs @@ -1,23 +1,21 @@ -using ChickenAPI.Core.Logging; -using ChickenAPI.Game.Entities.Player; +using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.NpcDialog.Events; using ChickenAPI.Game.NpcDialog.Handling; -using ChickenAPI.Packets.Game.Client.Npcs; -using ChickenAPI.Packets.Game.Client.Shops; +using ChickenAPI.Packets.ClientPackets.Npcs; +using ChickenAPI.Packets.Enumerations; +using ChickenAPI.Packets.ServerPackets.UI; namespace SaltyEmu.BasicPlugin.NpcDialogHandlers { public class WopenHandler { - private static readonly Logger Log = Logger.GetLogger(); - [NpcDialogHandler(2)] public static void UpgradeFromNpc(IPlayerEntity player, NpcDialogEvent args) { player.SendPacketAsync(new WopenPacket { - Type = 1, - Unknow = 0 + Type = WindowType.UpgradeItem, + Unknown = 0, }); } @@ -26,8 +24,8 @@ public static void Cellon(IPlayerEntity player, NpcDialogEvent args) { player.SendPacketAsync(new WopenPacket { - Type = 3, - Unknow = 0 + Type = WindowType.CellonItem, + Unknown = 0 }); } @@ -36,8 +34,8 @@ public static void Idk(IPlayerEntity player, NpcDialogEvent args) { player.SendPacketAsync(new WopenPacket { - Type = args.Type, - Unknow = 0 + Type = (WindowType)args.Type, + Unknown = 0 }); } @@ -46,8 +44,8 @@ public static void Recipe(IPlayerEntity player, NpcDialogEvent args) { player.SendPacketAsync(new WopenPacket { - Type = 27, - Unknow = 0 + Type = WindowType.Production, + Unknown = 0 }); // Recipe /*string recipelist = "m_list 2"; @@ -69,11 +67,11 @@ public static void Recipe(IPlayerEntity player, NpcDialogEvent args) [NpcDialogHandler(18)] public static void TimeCircle(IPlayerEntity player, NpcDialogEvent args) { - player.SendPacketAsync(new SentNpcReqPacket + player.SendPacketAsync(new RequestNpcPacket { - VisualType = ChickenAPI.Enums.Game.Entity.VisualType.Character, - VisualId = player.Id, - Dialog = 17 + Type = player.Type, + TargetId = player.Id, + Data = 17 }); } @@ -93,8 +91,8 @@ public static void OpenBazzar(IPlayerEntity player, NpcDialogEvent args) */ player.SendPacketAsync(new WopenPacket { - Type = 32, - Unknow = 1 + Type = WindowType.NosBazaar, + Unknown = 1 }); } } diff --git a/src/Plugins/NosSharp.TemporaryMapPlugins/SaltyEmu.BasicPlugin.csproj b/src/Plugins/NosSharp.TemporaryMapPlugins/SaltyEmu.BasicPlugin.csproj index bf27d29b..a906964e 100644 --- a/src/Plugins/NosSharp.TemporaryMapPlugins/SaltyEmu.BasicPlugin.csproj +++ b/src/Plugins/NosSharp.TemporaryMapPlugins/SaltyEmu.BasicPlugin.csproj @@ -4,8 +4,13 @@ netstandard2.0 + + + + + diff --git a/src/Plugins/SaltyEmu.FamilyPlugin/FamilyIpcClient.cs b/src/Plugins/SaltyEmu.FamilyPlugin/FamilyRpcClient.cs similarity index 88% rename from src/Plugins/SaltyEmu.FamilyPlugin/FamilyIpcClient.cs rename to src/Plugins/SaltyEmu.FamilyPlugin/FamilyRpcClient.cs index 04ddd808..07e430db 100644 --- a/src/Plugins/SaltyEmu.FamilyPlugin/FamilyIpcClient.cs +++ b/src/Plugins/SaltyEmu.FamilyPlugin/FamilyRpcClient.cs @@ -7,9 +7,9 @@ namespace SaltyEmu.FamilyPlugin { - public class FamilyIpcClient : MappedIpcRepository, IFamilyService + public class FamilyRpcClient : MappedRpcRepository, IFamilyService { - public FamilyIpcClient(IIpcClient builder) : base(builder) + public FamilyRpcClient(IRpcClient builder) : base(builder) { } diff --git a/src/Plugins/SaltyEmu.FamilyPlugin/SaltyEmu.FamilyPlugin.csproj b/src/Plugins/SaltyEmu.FamilyPlugin/SaltyEmu.FamilyPlugin.csproj index fa6d8cb9..8494324c 100644 --- a/src/Plugins/SaltyEmu.FamilyPlugin/SaltyEmu.FamilyPlugin.csproj +++ b/src/Plugins/SaltyEmu.FamilyPlugin/SaltyEmu.FamilyPlugin.csproj @@ -5,9 +5,7 @@ - - diff --git a/src/Plugins/SaltyEmu.FriendsPlugin/Handlers/SendInvitationHandler.cs b/src/Plugins/SaltyEmu.FriendsPlugin/Handlers/SendInvitationHandler.cs index e918a1f5..cd7da5e2 100644 --- a/src/Plugins/SaltyEmu.FriendsPlugin/Handlers/SendInvitationHandler.cs +++ b/src/Plugins/SaltyEmu.FriendsPlugin/Handlers/SendInvitationHandler.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using Autofac; using ChickenAPI.Core.IoC; +using ChickenAPI.Core.Logging; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Game.Managers; using ChickenAPI.Game.Relations.Events; @@ -9,8 +10,12 @@ namespace SaltyEmu.FriendsPlugin.Handlers { - internal class SendInvitationHandler : GenericIpcPacketHandler + internal class SendInvitationHandler : GenericAsyncRpcRequestHandler { + public SendInvitationHandler(ILogger log) : base(log) + { + } + protected override Task Handle(SendInvitation request) { if (!(request is SendInvitation sendInvitation)) diff --git a/src/Plugins/SaltyEmu.FriendsPlugin/Protocol/ProcessInvitation.cs b/src/Plugins/SaltyEmu.FriendsPlugin/Protocol/ProcessInvitation.cs index 268efeef..771b3dfe 100644 --- a/src/Plugins/SaltyEmu.FriendsPlugin/Protocol/ProcessInvitation.cs +++ b/src/Plugins/SaltyEmu.FriendsPlugin/Protocol/ProcessInvitation.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; +using ChickenAPI.Data.Enums.Game.Relations; using ChickenAPI.Data.Relations; -using ChickenAPI.Enums.Game.Relations; using SaltyEmu.Communication.Protocol; namespace SaltyEmu.FriendsPlugin.Protocol diff --git a/src/Plugins/SaltyEmu.FriendsPlugin/SaltyEmu.FriendsPlugin.csproj b/src/Plugins/SaltyEmu.FriendsPlugin/SaltyEmu.FriendsPlugin.csproj index 33fb54f4..6859861a 100644 --- a/src/Plugins/SaltyEmu.FriendsPlugin/SaltyEmu.FriendsPlugin.csproj +++ b/src/Plugins/SaltyEmu.FriendsPlugin/SaltyEmu.FriendsPlugin.csproj @@ -11,5 +11,8 @@ + + + \ No newline at end of file diff --git a/src/Plugins/SaltyEmu.FriendsPlugin/Services/RelationServiceClient.cs b/src/Plugins/SaltyEmu.FriendsPlugin/Services/RelationServiceClient.cs index 139b8327..762f709a 100644 --- a/src/Plugins/SaltyEmu.FriendsPlugin/Services/RelationServiceClient.cs +++ b/src/Plugins/SaltyEmu.FriendsPlugin/Services/RelationServiceClient.cs @@ -4,8 +4,9 @@ using ChickenAPI.Core.IPC; using ChickenAPI.Core.IPC.Protocol; using ChickenAPI.Core.Logging; +using ChickenAPI.Data.Enums.Game.Relations; using ChickenAPI.Data.Relations; -using ChickenAPI.Enums.Game.Relations; +using ChickenAPI.Packets.Enumerations; using SaltyEmu.Communication.Communicators; using SaltyEmu.Communication.Configs; using SaltyEmu.FriendsPlugin.Protocol; @@ -14,20 +15,21 @@ namespace SaltyEmu.FriendsPlugin.Services { public class RelationServiceClient : IRelationService { - private readonly IIpcClient _client; - private readonly Logger _log = Logger.GetLogger(); + private readonly IRpcClient _client; + private readonly ILogger _log; - public RelationServiceClient(IIpcClient client) + public RelationServiceClient(IRpcClient client, ILogger log) { _client = client; + _log = log; } - private Task RequestAsync(IIpcRequest request) where TResponse : class, IIpcResponse + private Task RequestAsync(ISyncRpcRequest request) where TResponse : class, ISyncRpcResponse { return _client.RequestAsync(request); } - private Task BroadcastAsync(TPacket request) where TPacket : class, IIpcPacket + private Task BroadcastAsync(TPacket request) where TPacket : class, IAsyncRpcRequest { return _client.BroadcastAsync(request); } diff --git a/src/Toolkit/Cleaners/InPacketCleaner.cs b/src/Toolkit/Cleaners/InPacketCleaner.cs index 09069ad0..5ff88dcd 100644 --- a/src/Toolkit/Cleaners/InPacketCleaner.cs +++ b/src/Toolkit/Cleaners/InPacketCleaner.cs @@ -9,7 +9,6 @@ namespace Toolkit.Cleaners { public class InPacketCleaner { - private static readonly Logger Log = Logger.GetLogger(); private readonly List _packetList = new List(); public void Filter(string filePath, string outputPath) diff --git a/src/Toolkit/Cleaners/PortalPacketCleaner.cs b/src/Toolkit/Cleaners/PortalPacketCleaner.cs index 8c2b35f1..b713bec6 100644 --- a/src/Toolkit/Cleaners/PortalPacketCleaner.cs +++ b/src/Toolkit/Cleaners/PortalPacketCleaner.cs @@ -8,7 +8,6 @@ namespace Toolkit.Cleaners { public class PortalPacketCleaner { - private static readonly Logger Log = Logger.GetLogger(); private readonly Queue _packetList = new Queue(); public void Filter(string filePath, string outputPath) @@ -36,7 +35,6 @@ public void Filter(string filePath, string outputPath) builder.Replace('\t', ' '); File.WriteAllText(outputPath, builder.ToString(), Encoding.UTF8); - Log.Info("Portals packet cleaned into " + outputPath); } } } \ No newline at end of file diff --git a/src/Toolkit/Cleaners/ShopPacketCleaner.cs b/src/Toolkit/Cleaners/ShopPacketCleaner.cs index 40d37b88..e0a05f73 100644 --- a/src/Toolkit/Cleaners/ShopPacketCleaner.cs +++ b/src/Toolkit/Cleaners/ShopPacketCleaner.cs @@ -8,7 +8,7 @@ namespace Toolkit.Cleaners { public class ShopPacketCleaner { - private static readonly Logger Log = Logger.GetLogger(); + // private static readonly Logger Log = Logger.GetLogger(); private readonly Queue _packetList = new Queue(); public void Filter(string filePath, string outputPath) diff --git a/src/Toolkit/CliProgram.cs b/src/Toolkit/CliProgram.cs index 427bbc09..c15a8b75 100644 --- a/src/Toolkit/CliProgram.cs +++ b/src/Toolkit/CliProgram.cs @@ -2,13 +2,14 @@ using System.Text; using ChickenAPI.Core.Logging; using CommandLine; +using SaltyEmu.Core.Logging; using Toolkit.Commands; namespace Toolkit { internal class CliProgram { - private static readonly Logger Log = Logger.GetLogger(); + private static readonly ILogger Log = new Logger(typeof(CliProgram)); private static int Main(string[] args) { @@ -20,7 +21,6 @@ private static int Main(string[] args) (ParseCommand opts) => ParseCommand.Handle(opts), (CleanCommand opts) => CleanCommand.Handle(opts), (LanguageCommand opts) => LanguageCommand.Handle(opts), - (DocumentationCommand opts) => DocumentationCommand.Handle(opts), errs => 1); } } diff --git a/src/Toolkit/Commands/CleanCommand.cs b/src/Toolkit/Commands/CleanCommand.cs index 83483322..ca0dd315 100644 --- a/src/Toolkit/Commands/CleanCommand.cs +++ b/src/Toolkit/Commands/CleanCommand.cs @@ -1,6 +1,7 @@ using System.IO; using ChickenAPI.Core.Logging; using CommandLine; +using SaltyEmu.Core.Logging; using Toolkit.Cleaners; namespace Toolkit.Commands @@ -27,11 +28,6 @@ public static int Handle(CleanCommand opts) return 1; } - if (opts.Verbose) - { - Logger.Initialize(); - } - switch (opts.CleanType) { case "e_info": diff --git a/src/Toolkit/Commands/DocumentationCommand.cs b/src/Toolkit/Commands/DocumentationCommand.cs deleted file mode 100644 index 7dc90e9a..00000000 --- a/src/Toolkit/Commands/DocumentationCommand.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using ChickenAPI.Packets.Attributes; -using ChickenAPI.Packets.Game.Server.Player; - -namespace Toolkit.Commands -{ - public class DocumentationCommand - { - public static int Handle(DocumentationCommand command) - { - foreach (Type packet in typeof(SayPacket).Assembly.GetTypes().Where(s => s.GetCustomAttribute() != null)) - { - var header = packet.GetCustomAttribute(); - var packetDesc = packet.GetCustomAttribute(); - List properties = new List(); - - foreach (PropertyInfo property in packet.GetProperties().Where(info => info.GetCustomAttribute() != null)) - { - var propertyDesc = property.GetCustomAttribute(); - } - // serialize packet to markdown file - } - - return 0; - } - } -} \ No newline at end of file diff --git a/src/Toolkit/Commands/GenerateCommand.cs b/src/Toolkit/Commands/GenerateCommand.cs index 2b0ae094..19313946 100644 --- a/src/Toolkit/Commands/GenerateCommand.cs +++ b/src/Toolkit/Commands/GenerateCommand.cs @@ -2,6 +2,7 @@ using ChickenAPI.Core.Logging; using CommandLine; using SaltyEmu.BasicAlgorithmPlugin; +using SaltyEmu.Core.Logging; using SaltyEmu.DatabasePlugin; using Toolkit.Generators.FromPackets; @@ -21,7 +22,7 @@ public static int Handle(GenerateCommand command) var algo = new BasicAlgorithmPlugin(); algo.OnLoad(); algo.OnEnable(); - var tmp = new DatabasePlugin(); + var tmp = new DatabasePlugin(Logger.GetLogger()); tmp.OnLoad(); tmp.OnEnable(); diff --git a/src/Toolkit/Commands/LanguageCommand.cs b/src/Toolkit/Commands/LanguageCommand.cs index 2cd356df..0f7a2d2b 100644 --- a/src/Toolkit/Commands/LanguageCommand.cs +++ b/src/Toolkit/Commands/LanguageCommand.cs @@ -9,6 +9,7 @@ using ChickenAPI.Game._i18n; using CommandLine; using SaltyEmu.Core; +using SaltyEmu.Core.Logging; using SaltyEmu.RedisWrappers; namespace Toolkit.Commands @@ -16,7 +17,7 @@ namespace Toolkit.Commands [Verb("langs", HelpText = "Input languages from langs/ to running GameLanguageService")] public class LanguageCommand { - private static readonly Logger Log = Logger.GetLogger(); + private static readonly ILogger Log = Logger.GetLogger(); private static readonly IGameLanguageService _langs = new Lazy(ChickenContainer.Instance.Resolve).Value; [Value(0, HelpText = "fr, en, de, all")] @@ -52,8 +53,8 @@ private static void ReadFileAndFillService(string file, LanguageKey key) public static int Handle(LanguageCommand command) { - new RedisPlugin().OnLoad(); - new RedisPlugin().OnEnable(); + new RedisPlugin(Logger.GetLogger()).OnLoad(); + new RedisPlugin(Logger.GetLogger()).OnEnable(); ChickenContainer.Initialize(); foreach (object enume in Enum.GetValues(typeof(LanguageKey))) { diff --git a/src/Toolkit/Commands/ParseCommand.cs b/src/Toolkit/Commands/ParseCommand.cs index 20c02a52..412300fc 100644 --- a/src/Toolkit/Commands/ParseCommand.cs +++ b/src/Toolkit/Commands/ParseCommand.cs @@ -7,9 +7,10 @@ using ChickenAPI.Core.Utils; using ChickenAPI.Data.Account; using ChickenAPI.Data.Character; -using ChickenAPI.Enums; +using ChickenAPI.Data.Enums; using CommandLine; using SaltyEmu.BasicAlgorithmPlugin; +using SaltyEmu.Core.Logging; using SaltyEmu.DatabasePlugin; using Toolkit.Converter; using Toolkit.Generators.FromPackets; @@ -19,7 +20,7 @@ namespace Toolkit.Commands [Verb("parse")] public class ParseCommand { - private static readonly Logger Log = Logger.GetLogger(); + private static readonly ILogger Log = Logger.GetLogger(); [Value(0, Default = "all", HelpText = "Parsing type : card, skill, map, item, einfo, monster")] public string ParsingType { get; set; } @@ -103,7 +104,7 @@ public static int Handle(ParseCommand command) var algo = new BasicAlgorithmPlugin(); algo.OnLoad(); algo.OnEnable(); - var tmp = new DatabasePlugin(); + var tmp = new DatabasePlugin(Logger.GetLogger()); tmp.OnLoad(); tmp.OnEnable(); ChickenContainer.Initialize(); diff --git a/src/Toolkit/Converter/CardDatConverter.cs b/src/Toolkit/Converter/CardDatConverter.cs index d7f6e2d6..ca4719d1 100644 --- a/src/Toolkit/Converter/CardDatConverter.cs +++ b/src/Toolkit/Converter/CardDatConverter.cs @@ -6,16 +6,17 @@ using ChickenAPI.Core.IoC; using ChickenAPI.Core.Logging; using ChickenAPI.Data.BCard; +using ChickenAPI.Data.Enums.Game.BCard; +using ChickenAPI.Data.Enums.Game.Buffs; using ChickenAPI.Data.Skills; -using ChickenAPI.Enums.Game.BCard; -using ChickenAPI.Enums.Game.Buffs; +using SaltyEmu.Core.Logging; namespace Toolkit.Converter { public class CardDatConverter { private const string FILE = "Card.dat"; - private static readonly Logger Log = Logger.GetLogger(); + private static readonly ILogger Log = Logger.GetLogger(); private static string _inputDirectory; private readonly Queue _cardBcards = new Queue(); diff --git a/src/Toolkit/Converter/EInfoFiller.cs b/src/Toolkit/Converter/EInfoFiller.cs index eda05cab..7e3c548c 100644 --- a/src/Toolkit/Converter/EInfoFiller.cs +++ b/src/Toolkit/Converter/EInfoFiller.cs @@ -7,12 +7,13 @@ using ChickenAPI.Core.IoC; using ChickenAPI.Core.Logging; using ChickenAPI.Data.NpcMonster; +using SaltyEmu.Core.Logging; namespace Toolkit.Converter { public class EInfoFiller { - private static readonly Logger Log = Logger.GetLogger(); + private static readonly ILogger Log = Logger.GetLogger(); private readonly List _npcMonsters = new List(); private INpcMonsterService _npcMonsterService; diff --git a/src/Toolkit/Converter/ItemDatConverter.cs b/src/Toolkit/Converter/ItemDatConverter.cs index 343562d1..b939db57 100644 --- a/src/Toolkit/Converter/ItemDatConverter.cs +++ b/src/Toolkit/Converter/ItemDatConverter.cs @@ -7,15 +7,18 @@ using ChickenAPI.Core.IoC; using ChickenAPI.Core.Logging; using ChickenAPI.Data.BCard; +using ChickenAPI.Data.Enums.Game.BCard; +using ChickenAPI.Data.Enums.Game.Items; using ChickenAPI.Data.Item; -using ChickenAPI.Enums.Game.BCard; -using ChickenAPI.Enums.Game.Items; +using ChickenAPI.Packets.Enumerations; +using SaltyEmu.Core.Logging; +using EquipmentType = ChickenAPI.Data.Enums.Game.Items.EquipmentType; namespace Toolkit.Converter { public class ItemDatConverter { - private static readonly Logger Log = Logger.GetLogger(); + private static readonly ILogger Log = Logger.GetLogger(); private static readonly string _file = "Item.dat"; private readonly List _itemCards = new List(); private readonly List _items = new List(); @@ -62,23 +65,23 @@ private void DoWork(string inputDirectory) switch (Convert.ToByte(currentLine[2])) { case 4: - item.Type = InventoryType.Equipment; + item.Type = PocketType.Equipment; break; case 8: - item.Type = InventoryType.Equipment; + item.Type = PocketType.Equipment; break; case 9: - item.Type = InventoryType.Main; + item.Type = PocketType.Main; break; case 10: - item.Type = InventoryType.Etc; + item.Type = PocketType.Etc; break; default: - item.Type = (InventoryType)Enum.Parse(typeof(InventoryType), currentLine[2]); + item.Type = (PocketType)Enum.Parse(typeof(PocketType), currentLine[2]); break; } @@ -1026,7 +1029,7 @@ private void DoWork(string inputDirectory) case ItemType.Specialist: - // item.isSpecialist = Convert.ToByte(currentLine[2]); item.Unknown = Convert.ToInt16(currentLine[3]); + // item.isSpecialist = Convert.ToByte(currentLine[2]); item.FairyMoveType = Convert.ToInt16(currentLine[3]); item.ElementRate = Convert.ToInt16(currentLine[4]); item.Speed = Convert.ToByte(currentLine[5]); item.SpType = Convert.ToByte(currentLine[13]); @@ -1195,7 +1198,7 @@ private void DoWork(string inputDirectory) break; } - if (item.Type == InventoryType.Miniland) + if (item.Type == PocketType.Miniland) { item.MinilandObjectPoint = int.Parse(currentLine[2]); item.EffectValue = short.Parse(currentLine[8]); diff --git a/src/Toolkit/Converter/MapDatConverter.cs b/src/Toolkit/Converter/MapDatConverter.cs index a2fe6b8a..f1b979b7 100644 --- a/src/Toolkit/Converter/MapDatConverter.cs +++ b/src/Toolkit/Converter/MapDatConverter.cs @@ -6,12 +6,13 @@ using ChickenAPI.Core.IoC; using ChickenAPI.Core.Logging; using ChickenAPI.Data.Map; +using SaltyEmu.Core.Logging; namespace Toolkit.Converter { public class MapDatConverter { - private static readonly Logger Log = Logger.GetLogger(); + private static readonly ILogger Log = Logger.GetLogger(); private readonly List _maps = new List(); private IMapService _mapService; diff --git a/src/Toolkit/Converter/MonsterDatConverter.cs b/src/Toolkit/Converter/MonsterDatConverter.cs index 96467cdc..05ed8e62 100644 --- a/src/Toolkit/Converter/MonsterDatConverter.cs +++ b/src/Toolkit/Converter/MonsterDatConverter.cs @@ -9,17 +9,19 @@ using ChickenAPI.Data; using ChickenAPI.Data.BCard; using ChickenAPI.Data.Drop; +using ChickenAPI.Data.Enums.Game.BCard; +using ChickenAPI.Data.Enums.Game.Drop; +using ChickenAPI.Data.Enums.Game.Entity; using ChickenAPI.Data.NpcMonster; using ChickenAPI.Data.Skills; -using ChickenAPI.Enums.Game.BCard; -using ChickenAPI.Enums.Game.Drop; -using ChickenAPI.Enums.Game.Entity; +using ChickenAPI.Packets.Enumerations; +using SaltyEmu.Core.Logging; namespace Toolkit.Converter { public class MonsterDatConverter { - private static readonly Logger Log = Logger.GetLogger(); + private static readonly ILogger Log = Logger.GetLogger(); private static readonly string _file = "Monster.dat"; private static string _inputDirectory; private readonly List _monsterBcards = new List(); diff --git a/src/Toolkit/Converter/SkillDatConverter.cs b/src/Toolkit/Converter/SkillDatConverter.cs index a535c3aa..fc904c23 100644 --- a/src/Toolkit/Converter/SkillDatConverter.cs +++ b/src/Toolkit/Converter/SkillDatConverter.cs @@ -8,15 +8,16 @@ using ChickenAPI.Core.Logging; using ChickenAPI.Data; using ChickenAPI.Data.BCard; +using ChickenAPI.Data.Enums.Game.BCard; using ChickenAPI.Data.Skills; -using ChickenAPI.Enums.Game.BCard; +using SaltyEmu.Core.Logging; namespace Toolkit.Converter { public class SkillDatConverter { private const string FILE = "Skill.dat"; - private static readonly Logger Log = Logger.GetLogger(); + private static readonly ILogger Log = Logger.GetLogger(); private static string _inputDirectory; private readonly List _skillBCards = new List(); diff --git a/src/Toolkit/Generators/FromPackets/MapMonsterGenerator.cs b/src/Toolkit/Generators/FromPackets/MapMonsterGenerator.cs index 46e16102..95515a35 100644 --- a/src/Toolkit/Generators/FromPackets/MapMonsterGenerator.cs +++ b/src/Toolkit/Generators/FromPackets/MapMonsterGenerator.cs @@ -6,15 +6,16 @@ using Autofac; using ChickenAPI.Core.IoC; using ChickenAPI.Core.Logging; +using ChickenAPI.Data.Enums.Game.Entity; using ChickenAPI.Data.Map; using ChickenAPI.Data.NpcMonster; -using ChickenAPI.Enums.Game.Entity; +using SaltyEmu.Core.Logging; namespace Toolkit.Generators.FromPackets { public class MapMonsterGenerator { - private static readonly Logger Log = Logger.GetLogger(); + private static readonly ILogger Log = Logger.GetLogger(); private readonly List _monsters = new List(); diff --git a/src/Toolkit/Generators/FromPackets/MapNpcGenerator.cs b/src/Toolkit/Generators/FromPackets/MapNpcGenerator.cs index 54e7a200..c511fca0 100644 --- a/src/Toolkit/Generators/FromPackets/MapNpcGenerator.cs +++ b/src/Toolkit/Generators/FromPackets/MapNpcGenerator.cs @@ -6,14 +6,15 @@ using Autofac; using ChickenAPI.Core.IoC; using ChickenAPI.Core.Logging; +using ChickenAPI.Data.Enums.Game.Entity; using ChickenAPI.Data.Map; -using ChickenAPI.Enums.Game.Entity; +using SaltyEmu.Core.Logging; namespace Toolkit.Generators.FromPackets { public class MapNpcGenerator { - private static readonly Logger Log = Logger.GetLogger(); + private static readonly ILogger Log = Logger.GetLogger(); private readonly List _npcs = new List(); diff --git a/src/Toolkit/Generators/FromPackets/PacketPortalGenerator.cs b/src/Toolkit/Generators/FromPackets/PacketPortalGenerator.cs index 0aca0aa7..14e5ad3f 100644 --- a/src/Toolkit/Generators/FromPackets/PacketPortalGenerator.cs +++ b/src/Toolkit/Generators/FromPackets/PacketPortalGenerator.cs @@ -7,13 +7,14 @@ using ChickenAPI.Core.IoC; using ChickenAPI.Core.Logging; using ChickenAPI.Data.Map; -using ChickenAPI.Enums.Game.Portals; +using ChickenAPI.Packets.Enumerations; +using SaltyEmu.Core.Logging; namespace Toolkit.Generators.FromPackets { public class PacketPortalGenerator { - private static readonly Logger Log = Logger.GetLogger(); + private static readonly ILogger Log = Logger.GetLogger(); private readonly List _destinationPortals = new List(); private readonly List _sourcePortals = new List(); diff --git a/src/Toolkit/Generators/FromPackets/RecipeGenerator.cs b/src/Toolkit/Generators/FromPackets/RecipeGenerator.cs index 3795a741..f4a8eff5 100644 --- a/src/Toolkit/Generators/FromPackets/RecipeGenerator.cs +++ b/src/Toolkit/Generators/FromPackets/RecipeGenerator.cs @@ -7,12 +7,13 @@ using ChickenAPI.Core.IoC; using ChickenAPI.Core.Logging; using ChickenAPI.Data.Shop; +using SaltyEmu.Core.Logging; namespace Toolkit.Generators.FromPackets { public class RecipeGenerator { - private static readonly Logger Log = Logger.GetLogger(); + private static readonly ILogger Log = Logger.GetLogger(); private readonly List _recipeItems = new List(); private readonly List _recipes = new List(); diff --git a/src/Toolkit/Generators/FromPackets/ShopItemGenerator.cs b/src/Toolkit/Generators/FromPackets/ShopItemGenerator.cs index 1e458121..01592617 100644 --- a/src/Toolkit/Generators/FromPackets/ShopItemGenerator.cs +++ b/src/Toolkit/Generators/FromPackets/ShopItemGenerator.cs @@ -7,6 +7,7 @@ using ChickenAPI.Core.IoC; using ChickenAPI.Core.Logging; using ChickenAPI.Data.Shop; +using SaltyEmu.Core.Logging; namespace Toolkit.Generators.FromPackets { diff --git a/src/Toolkit/Generators/FromPackets/ShopParserGenerator.cs b/src/Toolkit/Generators/FromPackets/ShopParserGenerator.cs index fa850a39..ba2595e1 100644 --- a/src/Toolkit/Generators/FromPackets/ShopParserGenerator.cs +++ b/src/Toolkit/Generators/FromPackets/ShopParserGenerator.cs @@ -8,12 +8,13 @@ using ChickenAPI.Core.Logging; using ChickenAPI.Data.Map; using ChickenAPI.Data.Shop; +using SaltyEmu.Core.Logging; namespace Toolkit.Generators.FromPackets { public class ShopParserGenerator { - private static readonly Logger Log = Logger.GetLogger(); + private static readonly ILogger Log = Logger.GetLogger(); private readonly List _shops = new List(); diff --git a/src/Toolkit/Generators/FromPackets/ShopSkillGenerator.cs b/src/Toolkit/Generators/FromPackets/ShopSkillGenerator.cs index f549ecd2..02d48b93 100644 --- a/src/Toolkit/Generators/FromPackets/ShopSkillGenerator.cs +++ b/src/Toolkit/Generators/FromPackets/ShopSkillGenerator.cs @@ -7,12 +7,13 @@ using ChickenAPI.Core.IoC; using ChickenAPI.Core.Logging; using ChickenAPI.Data.Shop; +using SaltyEmu.Core.Logging; namespace Toolkit.Generators.FromPackets { public class ShopSkillGenerator { - private static readonly Logger Log = Logger.GetLogger(); + private static readonly ILogger Log = Logger.GetLogger(); private readonly List _shopSkills = new List(); diff --git a/src/Toolkit/Toolkit.csproj b/src/Toolkit/Toolkit.csproj index acfb9fc1..3ecd603c 100644 --- a/src/Toolkit/Toolkit.csproj +++ b/src/Toolkit/Toolkit.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/World/Network/ClientSession.cs b/src/World/Network/ClientSession.cs index d5f0ab38..684c2f7f 100644 --- a/src/World/Network/ClientSession.cs +++ b/src/World/Network/ClientSession.cs @@ -18,20 +18,20 @@ using SaltyEmu.Commands.Interfaces; using ChickenAPI.Game._Network; using ChickenAPI.Packets.Attributes; +using ChickenAPI.Packets.Interfaces; +using SaltyEmu.Core.Logging; namespace World.Network { public class ClientSession : ChannelHandlerAdapter, ISession { - private const byte PACKET_SPLIT_CHARACTER = 0xFF; - - private static readonly IPlayerManager PlayerManager = new Lazy(ChickenContainer.Instance.Resolve).Value; private static readonly ISessionService SessionService = new Lazy(ChickenContainer.Instance.Resolve).Value; private static readonly ICommandContainer Commands = new Lazy(ChickenContainer.Instance.Resolve).Value; private static readonly IPacketPipelineAsync PacketPipeline = new Lazy(ChickenContainer.Instance.Resolve).Value; - private static readonly IPacketFactory PacketFactory = new Lazy(ChickenContainer.Instance.Resolve).Value; + private static readonly IDeserializer packetDeserializer = new Lazy(ChickenContainer.Instance.Resolve).Value; + private static readonly ISerializer packetSerializer = new Lazy(ChickenContainer.Instance.Resolve).Value; private static readonly Logger Log = Logger.GetLogger(); private static Guid _worldServerId; @@ -123,7 +123,7 @@ public void SendPacket(T packet) where T : IPacket return; } - string tmp = PacketFactory.Serialize(packet); + string tmp = packetSerializer.Serialize(packet); #if DEBUG if (BlacklistedDebug.All(s => !tmp.StartsWith(s))) @@ -152,7 +152,7 @@ public void SendPackets(IEnumerable packets) where T : IPacket continue; } - string tmp = PacketFactory.Serialize(packet); + string tmp = packetSerializer.Serialize(packet); #if DEBUG if (BlacklistedDebug.All(s => !tmp.StartsWith(s))) { @@ -183,7 +183,7 @@ public void SendPackets(IEnumerable packets) continue; } - string tmp = PacketFactory.Serialize(packet); + string tmp = packetSerializer.Serialize(packet); #if DEBUG if (BlacklistedDebug.All(s => !tmp.StartsWith(s))) { @@ -210,7 +210,7 @@ public Task SendPacketAsync(T packet) where T : IPacket return Task.CompletedTask; } - string tmp = PacketFactory.Serialize(packet); + string tmp = packetSerializer.Serialize(packet); #if DEBUG if (BlacklistedDebug.All(s => !tmp.StartsWith(s))) @@ -218,8 +218,8 @@ public Task SendPacketAsync(T packet) where T : IPacket Log.Debug($"[{Ip}][SOCKET_WRITE] {tmp}"); } #endif - - var task = _channel.WriteAsync(tmp); + + Task task = _channel.WriteAsync(tmp); _channel.Flush(); return Task.CompletedTask; } @@ -240,7 +240,7 @@ public Task SendPacketsAsync(IEnumerable packets) where T : IPacket continue; } - string tmp = PacketFactory.Serialize(packet); + string tmp = packetSerializer.Serialize(packet); #if DEBUG if (BlacklistedDebug.All(s => !tmp.StartsWith(s))) { @@ -258,6 +258,7 @@ public Task SendPacketsAsync(IEnumerable packets) where T : IPacket Log.Error("[SendPackets]", e); Disconnect(); } + return Task.CompletedTask; } @@ -272,7 +273,7 @@ public Task SendPacketsAsync(IEnumerable packets) continue; } - string tmp = PacketFactory.Serialize(packet); + string tmp = packetSerializer.Serialize(packet); #if DEBUG if (BlacklistedDebug.All(s => !tmp.StartsWith(s))) { @@ -290,6 +291,7 @@ public Task SendPacketsAsync(IEnumerable packets) Log.Error("[SendPackets(IPacket)]", e); Disconnect(); } + return Task.CompletedTask; } @@ -327,7 +329,7 @@ public override void ExceptionCaught(IChannelHandlerContext context, Exception e #endif context.CloseAsync(); } - + public override void ChannelRead(IChannelHandlerContext context, object message) { try @@ -342,8 +344,6 @@ public override void ChannelRead(IChannelHandlerContext context, object message) BufferToUnauthedPackets(buff, context); return; } - - BufferToPackets(buff); } catch (Exception e) { @@ -378,33 +378,8 @@ private void BufferToUnauthedPackets(string packets, IChannelHandlerContext cont SessionId = sessid; SocketSessionManager.Instance.RegisterSession(context.Channel.Id.AsLongText(), this); // CLIENT ARRIVED - if (!_waitForPacketsAmount.HasValue) - { - TriggerHandler("EntryPoint", string.Empty, false); - } } - private bool WaitForPackets(string packetstring, IReadOnlyList packetsplit) - { - _waitForPacketList.Add(packetstring); - string[] packetssplit = packetstring.Split(' '); - if (packetssplit.Length > 3 && packetsplit[1] == "DAC") - { - _waitForPacketList.Add("0 CrossServerAuthenticate"); - } - - if (_waitForPacketList.Count != _waitForPacketsAmount) - { - return true; - } - - _waitForPacketsAmount = null; - string queuedPackets = string.Join(" ", _waitForPacketList.ToArray()); - string header = queuedPackets.Split(' ', '^')[1]; - TriggerHandler(header, queuedPackets, true); - _waitForPacketList.Clear(); - return false; - } private void KeepAliveCheck(int nextKeepAlive) { @@ -422,140 +397,6 @@ private void KeepAliveCheck(int nextKeepAlive) } private const string CommandPrefix = "$"; - - private void BufferToPackets(string packets) - { - foreach (string packet in packets.Split((char)PACKET_SPLIT_CHARACTER, StringSplitOptions.RemoveEmptyEntries)) - { - string packetstring = packet.Replace('^', ' '); - string[] packetsplit = packetstring.Split(' '); - - // keep alive - string nextKeepAliveRaw = packetsplit[0]; - if (!int.TryParse(nextKeepAliveRaw, out int nextKeepAlive) && nextKeepAlive != (LastKeepAliveIdentity + 1)) - { - Disconnect(); - return; - } - - KeepAliveCheck(nextKeepAlive); - - if (_waitForPacketsAmount.HasValue) - { - if (WaitForPackets(packetstring, packetsplit)) - { - continue; - } - - return; - } - - if (packetsplit.Length <= 1) - { - continue; - } - - if (packetsplit[1].Length >= 1 && ChatDelimiter.Any(s => s == packetsplit[1][0])) - { - packetsplit[1] = packetsplit[1][0].ToString(); - packetstring = packet.Insert(packet.IndexOf(' ') + 2, " "); - - //^ wtf is this - - if (packetsplit[1] == CommandPrefix) //it's a command - { - // temporary fix on the deadlock - // todo fix where the deadlock appear - _ = Task.Run(() => Commands.HandleMessageAsync(packetstring, Player)); - } - } - - if (packetsplit[1] != "0") - { - TriggerHandler(packetsplit[1].Replace("#", ""), packetstring, false); - } - } - } - - private static readonly char[] ChatDelimiter = { '/', ':', ';', '$' }; - - private void GameHandler(string packetHeader, string packet) - { - Type type = PacketPipeline.PacketTypeByHeader(packetHeader); - - if (type == null) - { - Log.Debug($"[{Ip}][GAME_HANDLER_NOT_FOUND] {packetHeader}"); - return; - } - -#if DEBUG - Log.Debug($"[{Ip}][HANDLING] {packet}"); -#endif - - IPacket deserializedPacketBase; - try - { - deserializedPacketBase = PacketFactory.Deserialize(packet, type, IsAuthenticated); - Task.Run(() => PacketPipeline.Handle(deserializedPacketBase, this)).ConfigureAwait(false).GetAwaiter().GetResult(); - } - catch (Exception e) - { - Log.Warn($"[GAME_HANDLER] {e.Message}"); - return; - } - } - - private void CharacterHandler(string packet, Type packetType) - { - IPacket deserializedPacketBase; - try - { - deserializedPacketBase = PacketFactory.Deserialize(packet, packetType, IsAuthenticated); - } - catch (Exception e) - { - Log.Warn($"[CHARACTER_HANDLER] {e.Message}"); - return; - } - - Task.Run(() => PacketPipeline.Handle(deserializedPacketBase, this)).ConfigureAwait(false).GetAwaiter().GetResult(); - } - - private void TriggerHandler(string packetHeader, string packet, bool force) - { - if (Player != null) - { - GameHandler(packetHeader, packet); - return; - } - - Type packetType = PacketPipeline.PacketTypeByHeader(packetHeader); - if (packetType == null) - { -#if DEBUG - Log.Warn($"[{Ip}][HANDLER_NOT_FOUND] {packetHeader}"); -#endif - return; - } - - if (force) - { - CharacterHandler(packet, packetType); - return; - } - - // hardcoded for entrypoint since entwell sucks - var headerAttribute = packetType.GetCustomAttribute(); - if (headerAttribute != null && headerAttribute.Amount > 1 && !_waitForPacketsAmount.HasValue) - { - _waitForPacketsAmount = headerAttribute.Amount; - _waitForPacketList.Add(packet != string.Empty ? packet : $"1 {packetHeader} "); - return; - } - - CharacterHandler(packet, packetType); - } } #endregion diff --git a/src/World/Network/Server.cs b/src/World/Network/Server.cs index 01264063..f13f2dd1 100644 --- a/src/World/Network/Server.cs +++ b/src/World/Network/Server.cs @@ -4,21 +4,22 @@ using Autofac; using ChickenAPI.Core.IoC; using ChickenAPI.Core.Logging; +using ChickenAPI.Data.Enums.Game.Character; using ChickenAPI.Data.Server; -using ChickenAPI.Enums.Game.Character; using ChickenAPI.Game._ECS; using ChickenAPI.Game._ECS.Entities; using DotNetty.Common.Concurrency; using DotNetty.Transport.Bootstrapping; using DotNetty.Transport.Channels; using DotNetty.Transport.Channels.Sockets; +using SaltyEmu.Core.Logging; namespace World.Network { public class Server { // Server Tick config - private static readonly Logger Log = Logger.GetLogger(); + private static readonly ILogger Log = Logger.GetLogger(); public static WorldServerDto WorldServer; private static IEntityManagerContainer _container; diff --git a/src/World/Packets/PacketInformation.cs b/src/World/Packets/PacketInformation.cs deleted file mode 100644 index 4b69073c..00000000 --- a/src/World/Packets/PacketInformation.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; - -namespace World.Packets -{ - public class PacketInformation - { - public string Header { get; set; } - public Type Type { get; set; } - - public PacketPropertyContainer[] PacketProps { get; set; } - } -} \ No newline at end of file diff --git a/src/World/Packets/PacketPropertyContainer.cs b/src/World/Packets/PacketPropertyContainer.cs deleted file mode 100644 index 7bda3c2b..00000000 --- a/src/World/Packets/PacketPropertyContainer.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Reflection; -using ChickenAPI.Packets.Attributes; - -namespace World.Packets -{ - public class PacketPropertyContainer - { - public PacketIndexAttribute PacketIndex { get; set; } - public PropertyInfo PropertyInfo { get; set; } - public IEnumerable Validations { get; set; } - } -} \ No newline at end of file diff --git a/src/World/Packets/PluggablePacketFactory.cs b/src/World/Packets/PluggablePacketFactory.cs deleted file mode 100644 index 2cb6ecaa..00000000 --- a/src/World/Packets/PluggablePacketFactory.cs +++ /dev/null @@ -1,500 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Text.RegularExpressions; -using ChickenAPI.Core.Logging; -using ChickenAPI.Packets; -using ChickenAPI.Packets.Attributes; -using ChickenAPI.Packets.Game.Server.Entities; -using World.Extensions; - -namespace World.Packets -{ - /// - /// First version of a pluggable PacketFactory - /// - public class PluggablePacketFactory : IPacketFactory - { - private static readonly Logger Log = Logger.GetLogger(); - private readonly Dictionary _packetTypesByHeader = new Dictionary(); - private readonly Dictionary _deserializationInformations = new Dictionary(); - - - public string Serialize(IPacket packet) => Serialize(packet, packet.GetType()); - - public string Serialize(TPacket packet) where TPacket : IPacket => - Serialize(packet, typeof(TPacket)); - - public string Serialize(IPacket packet, Type type) - { - try - { - // load pregenerated serialization information - PacketInformation serializationInformation = GetSerializationInformation(type); - - var builder = new StringBuilder(); - builder.Append(serializationInformation.Header); - - int lastIndex = 0; - - foreach (PacketPropertyContainer property in serializationInformation.PacketProps) - { - PacketIndexAttribute packetIndex = property.PacketIndex; - PropertyInfo propertyType = property.PropertyInfo; - IEnumerable validations = property.Validations; - // check if we need to add a non mapped values (pseudovalues) - if (packetIndex.Index > lastIndex + 1) - { - int amountOfEmptyValuesToAdd = packetIndex.Index - (lastIndex + 1); - - for (int j = 0; j < amountOfEmptyValuesToAdd; j++) - { - builder.Append(" 0"); - } - } - - // add value for current configuration - builder.Append(SerializeValue(propertyType.PropertyType, propertyType.GetValue(packet), validations, packetIndex)); - - // check if the value should be serialized to end - if (packetIndex.SerializeToEnd) - { - // we reached the end - break; - } - - // set new index - lastIndex = packetIndex.Index; - } - - return builder.ToString(); - } - catch (Exception e) - { - Log.Error($"Wrong Packet format {type}\n", e); - return string.Empty; - } - } - - public IPacket Deserialize(string packetContent, Type packetType, bool includesKeepAliveIdentity) - { - try - { - PacketInformation serializationInformation = GetSerializationInformation(packetType); - var deserializedPacket = (PacketBase)packetType.CreateInstance(); - SetDeserializationInformations(deserializedPacket, packetContent, serializationInformation.Header, packetType); - return Deserialize(packetContent, deserializedPacket, serializationInformation, includesKeepAliveIdentity); - } - catch (Exception e) - { - Log.Error($"The serialized packetBase has the wrong format. Packet: {packetContent}", e); - return null; - } - } - - #region Serialization - - private string SerializeValue(Type propertyType, object value, IEnumerable validationAttributes, PacketIndexAttribute packetIndexAttribute = null) - { - if (propertyType == null && validationAttributes.All(a => a.IsValid(value))) - { - return string.Empty; - } - - if (packetIndexAttribute?.IsOptional == true && string.IsNullOrEmpty(Convert.ToString(value))) - { - return string.Empty; - } - - // check for nullable without value or string - if (propertyType == typeof(string) && string.IsNullOrEmpty(Convert.ToString(value))) - { - return $"{packetIndexAttribute?.SeparatorBeforeProperty}-"; - } - - if (Nullable.GetUnderlyingType(propertyType) != null && string.IsNullOrEmpty(Convert.ToString(value))) - { - return $"{packetIndexAttribute?.SeparatorBeforeProperty}-1"; - } - - // enum should be casted to number - if (propertyType.BaseType?.Equals(typeof(Enum)) == true) - { - return $"{packetIndexAttribute?.SeparatorBeforeProperty}{Convert.ToInt16(value)}"; - } - - if (propertyType == typeof(bool)) - { - // bool is 0 or 1 not True or False - return Convert.ToBoolean(value) ? $"{packetIndexAttribute?.SeparatorBeforeProperty}1" : $"{packetIndexAttribute?.SeparatorBeforeProperty}0"; - } - - if (value is PacketBase) - { - PacketInformation subpacketSerializationInfo = GetSerializationInformation(value.GetType()); - return SerializeSubpacket(value, subpacketSerializationInfo, packetIndexAttribute?.IsReturnPacket ?? false, packetIndexAttribute?.RemoveSeparator ?? false); - } - - if (propertyType.BaseType?.Equals(typeof(PacketBase)) == true) - { - PacketInformation subpacketSerializationInfo = GetSerializationInformation(propertyType); - return SerializeSubpacket(value, subpacketSerializationInfo, packetIndexAttribute?.IsReturnPacket ?? false, packetIndexAttribute?.RemoveSeparator ?? false); - } - - if (propertyType.IsGenericType && propertyType.GetGenericTypeDefinition().IsAssignableFrom(typeof(List<>)) - && propertyType.GenericTypeArguments[0].BaseType == typeof(PacketBase)) - { - return packetIndexAttribute?.SeparatorBeforeProperty + SerializeSubpackets((IList)value, propertyType, packetIndexAttribute?.RemoveSeparator ?? false); - } - - if (propertyType.IsGenericType && propertyType.GetGenericTypeDefinition().IsAssignableFrom(typeof(List<>))) //simple list - { - return packetIndexAttribute?.SeparatorBeforeProperty + SerializeSimpleList((IList)value, propertyType, packetIndexAttribute); - } - - return $"{packetIndexAttribute?.SeparatorBeforeProperty}{value}"; - } - - private string SerializeSimpleList(IList listValues, Type propertyType, PacketIndexAttribute index) - { - string resultListPacket = string.Empty; - int listValueCount = listValues.Count; - if (listValueCount <= 0) - { - return resultListPacket; - } - - resultListPacket += SerializeValue(propertyType.GenericTypeArguments[0], listValues[0], propertyType.GenericTypeArguments[0].GetCustomAttributes()); - - for (int i = 1; i < listValueCount; i++) - { - resultListPacket += - $"{index.SeparatorNestedElements}{SerializeValue(propertyType.GenericTypeArguments[0], listValues[i], propertyType.GenericTypeArguments[0].GetCustomAttributes()).Replace(" ", "")}"; - } - - return resultListPacket; - } - - private string SerializeSubpacket(object value, PacketInformation subpacketSerializationInfo, bool isReturnPacket, - bool shouldRemoveSeparator) - { - string serializedSubpacket = isReturnPacket ? $" #{subpacketSerializationInfo.Header}^" : " "; - - // iterate thru configure subpacket properties - foreach (PacketPropertyContainer tmp in subpacketSerializationInfo.PacketProps) - { - PacketIndexAttribute key = tmp.PacketIndex; - PropertyInfo propertyInfo = tmp.PropertyInfo; - // first element - if (key.Index != 0) - { - serializedSubpacket += isReturnPacket ? "^" : shouldRemoveSeparator ? key.SeparatorBeforeProperty : key.SeparatorNestedElements; - } - - serializedSubpacket += SerializeValue(propertyInfo.PropertyType, propertyInfo.GetValue(value), tmp.Validations, key).Replace(" ", ""); - } - - return serializedSubpacket; - } - - private PacketInformation GenerateSerializationInformations(Type serializationType) - { - string header = serializationType.GetCustomAttribute()?.Identification; - - if (string.IsNullOrEmpty(header)) - { - throw new Exception($"Packet header cannot be empty. PacketType: {serializationType.Name}"); - } - - Dictionary packetsForPacketDefinition = new Dictionary(); - - IEnumerable packetIndexProperties = serializationType.GetProperties().Where(x => x.GetCustomAttributes(false).OfType().Any()).ToArray(); - - - List packetProperties = - (from packetBasePropertyInfo in packetIndexProperties.OrderBy(s => s.GetCustomAttribute(false).Index) - let indexAttribute = packetBasePropertyInfo.GetCustomAttributes(false).OfType().FirstOrDefault() - where indexAttribute != null - select new PacketPropertyContainer - { - PacketIndex = indexAttribute, PropertyInfo = packetBasePropertyInfo, - Validations = packetBasePropertyInfo.GetCustomAttributes() - }).ToList(); - - var tmp = new PacketInformation - { - Type = serializationType, - Header = header, - PacketProps = packetProperties.OrderBy(container => container.PacketIndex.Index).ToArray() - }; - - if (!_packetTypesByHeader.ContainsKey(tmp.Header)) - { - _packetTypesByHeader.Add(tmp.Header, serializationType); - } - - _deserializationInformations.Add(serializationType, tmp); - - return tmp; - } - - private PacketInformation GetSerializationInformation(Type serializationType) - { - if (_deserializationInformations.TryGetValue(serializationType, out PacketInformation packetInfo)) - { - return packetInfo; - } - - return GenerateSerializationInformations(serializationType); - } - - private string SerializeSubpackets(ICollection listValues, Type packetBasePropertyType, bool shouldRemoveSeparator) - { - string serializedSubPacket = string.Empty; - PacketInformation subpacketSerializationInfo = GetSerializationInformation(packetBasePropertyType.GetGenericArguments()[0]); - - if (listValues?.Count > 0) - { - serializedSubPacket = listValues.Cast().Aggregate(serializedSubPacket, - (current, listValue) => current + SerializeSubpacket(listValue, subpacketSerializationInfo, false, shouldRemoveSeparator)); - } - - return serializedSubPacket; - } - - #endregion - - - #region Deserialization - - private PacketBase Deserialize(string packetContent, PacketBase packet, PacketInformation serializeInfos, bool includeKeepAlive) - { - MatchCollection matches = Regex.Matches(packetContent, @"([^\040]+[\.][^\040]+[\040]?)+((?=\040)|$)|([^\040]+)((?=\040)|$)"); - if (matches.Count <= 0) - { - return packet; - } - - for (int i = 0; i < serializeInfos.PacketProps.Length; i++) - { - int currentIndex = i + (includeKeepAlive ? 2 : 1); - if (currentIndex >= matches.Count) - { - break; - } - - PacketIndexAttribute index = serializeInfos.PacketProps[i].PacketIndex; - PropertyInfo property = serializeInfos.PacketProps[i].PropertyInfo; - IEnumerable validations = serializeInfos.PacketProps[i].Validations; - - if (index.SerializeToEnd) - { - // get the value to the end and stop deserialization - int tmp = matches.Count > currentIndex ? matches[currentIndex].Index : packetContent.Length; - string valueToEnd = packetContent.Substring(tmp, packetContent.Length - tmp); - property.SetValue(packet, DeserializeValue(property.PropertyType, valueToEnd, index, validations, matches, includeKeepAlive)); - break; - } - - string currentValue = matches[currentIndex].Value; - - // set the value & convert currentValue - property.SetValue(packet, DeserializeValue(property.PropertyType, currentValue, index, validations, matches, includeKeepAlive)); - } - - return packet; - } - - private IList DeserializeSimpleList(string currentValues, Type genericListType) - { - var subpackets = (IList)Convert.ChangeType((IList)genericListType.CreateInstance(), genericListType); - IEnumerable splittedValues = currentValues.Split('.'); - - foreach (string currentValue in splittedValues) - { - object value = DeserializeValue(genericListType.GenericTypeArguments[0], currentValue, null, genericListType.GenericTypeArguments[0].GetCustomAttributes(), null); - subpackets.Add(value); - } - - return subpackets; - } - - private object DeserializeSubpacket(string currentSubValues, Type packetBasePropertyType, PacketInformation subpacketSerializationInfo, bool isReturnPacket = false) - { - string[] subpacketValues = currentSubValues.Split(isReturnPacket ? '^' : '.'); - object newSubpacket = packetBasePropertyType.CreateInstance(); - foreach (PacketPropertyContainer tmp in subpacketSerializationInfo.PacketProps) - { - PacketIndexAttribute key = tmp.PacketIndex; - PropertyInfo value = tmp.PropertyInfo; - int currentSubIndex = isReturnPacket ? key.Index + 1 : key.Index; // return packets do include header - string currentSubValue = subpacketValues[currentSubIndex]; - - value.SetValue(newSubpacket, DeserializeValue(value.PropertyType, currentSubValue, key, tmp.Validations, null)); - } - - return newSubpacket; - } - - private IList DeserializeSubpackets(string currentValue, Type packetBasePropertyType, bool shouldRemoveSeparator, MatchCollection packetMatchCollections, int? currentIndex, - bool includesKeepAliveIdentity) - { - // split into single values - List splittedSubpackets = currentValue.Split(' ').ToList(); - // generate new list - var subpackets = (IList)Convert.ChangeType(packetBasePropertyType.CreateInstance(), packetBasePropertyType); - - Type subPacketType = packetBasePropertyType.GetGenericArguments()[0]; - PacketInformation subpacketSerializationInfo = GetSerializationInformation(subPacketType); - - // handle subpackets with separator - if (shouldRemoveSeparator) - { - if (!currentIndex.HasValue || packetMatchCollections == null) - { - return subpackets; - } - - List splittedSubpacketParts = packetMatchCollections.Select(m => m.Value).ToList(); - splittedSubpackets = new List(); - - string generatedPseudoDelimitedString = string.Empty; - int subPacketTypePropertiesCount = subpacketSerializationInfo.PacketProps.Length; - - // check if the amount of properties can be serialized properly - if (((splittedSubpacketParts.Count + (includesKeepAliveIdentity ? 1 : 0)) - % subPacketTypePropertiesCount) == 0) // amount of properties per subpacket does match the given value amount in % - { - for (int i = currentIndex.Value + 1 + (includesKeepAliveIdentity ? 1 : 0); i < splittedSubpacketParts.Count; i++) - { - int j; - for (j = i; j < i + subPacketTypePropertiesCount; j++) - { - // add delimited value - generatedPseudoDelimitedString += splittedSubpacketParts[j] + "."; - } - - i = j - 1; - - //remove last added separator - generatedPseudoDelimitedString = generatedPseudoDelimitedString.Substring(0, generatedPseudoDelimitedString.Length - 1); - - // add delimited values to list of values to serialize - splittedSubpackets.Add(generatedPseudoDelimitedString); - generatedPseudoDelimitedString = string.Empty; - } - } - else - { - throw new Exception("The amount of splitted subpacket values without delimiter do not match the % property amount of the serialized type."); - } - } - - foreach (string subpacket in splittedSubpackets) - { - subpackets.Add(DeserializeSubpacket(subpacket, subPacketType, subpacketSerializationInfo)); - } - - return subpackets; - } - - private object DeserializeValue(Type packetPropertyType, string currentValue, PacketIndexAttribute packetIndexAttribute, IEnumerable validationAttributes, - MatchCollection packetMatches, - bool includesKeepAliveIdentity = false) - { - foreach (ValidationAttribute i in validationAttributes) - { - if (!i.IsValid(currentValue)) - { - throw new ValidationException(i.ErrorMessage); - } - } - - // check for empty value and cast it to null - if (currentValue == "-1" || currentValue == "-") - { - currentValue = null; - } - - // enum should be casted to number - if (packetPropertyType.BaseType?.Equals(typeof(Enum)) == true) - { - object convertedValue = null; - try - { - if (currentValue != null && packetPropertyType.IsEnumDefined(Enum.Parse(packetPropertyType, currentValue))) - { - convertedValue = Enum.Parse(packetPropertyType, currentValue); - } - } - catch (Exception) - { - Log.Warn($"Could not convert value {currentValue} to type {packetPropertyType.Name}"); - } - - return convertedValue; - } - - if (packetPropertyType == typeof(bool)) // handle boolean values - { - return currentValue != "0"; - } - - if (packetPropertyType.BaseType?.Equals(typeof(PacketBase)) == true) // subpacket - { - PacketInformation subpacketSerializationInfo = GetSerializationInformation(packetPropertyType); - return DeserializeSubpacket(currentValue, packetPropertyType, subpacketSerializationInfo, packetIndexAttribute?.IsReturnPacket ?? false); - } - - if (packetPropertyType.IsGenericType && packetPropertyType.GetGenericTypeDefinition().IsAssignableFrom(typeof(List<>)) // subpacket list - && packetPropertyType.GenericTypeArguments[0].BaseType == typeof(PacketBase)) - { - return DeserializeSubpackets(currentValue, packetPropertyType, packetIndexAttribute?.RemoveSeparator ?? false, packetMatches, packetIndexAttribute?.Index, includesKeepAliveIdentity); - } - - if (packetPropertyType.IsGenericType && packetPropertyType.GetGenericTypeDefinition().IsAssignableFrom(typeof(List<>))) // simple list - { - return DeserializeSimpleList(currentValue, packetPropertyType); - } - - if (Nullable.GetUnderlyingType(packetPropertyType) != null && string.IsNullOrEmpty(currentValue)) // empty nullable value - { - return null; - } - - if (Nullable.GetUnderlyingType(packetPropertyType) != null) // nullable value - { - return packetPropertyType.GenericTypeArguments[0]?.BaseType == typeof(Enum) - ? Enum.Parse(packetPropertyType.GenericTypeArguments[0], currentValue) - : Convert.ChangeType(currentValue, packetPropertyType.GenericTypeArguments[0]); - } - - if (packetPropertyType == typeof(string) && string.IsNullOrEmpty(currentValue) && !packetIndexAttribute.SerializeToEnd) - { - throw new NullReferenceException(); - } - - if (packetPropertyType == typeof(string) && currentValue == null) - { - currentValue = string.Empty; - } - - return Convert.ChangeType(currentValue, packetPropertyType); // cast to specified type - } - - - private static void SetDeserializationInformations(PacketBase packetBaseDefinition, string packetContent, string packetHeader, Type packetType) - { - packetBaseDefinition.OriginalContent = packetContent; - packetBaseDefinition.SentDateUtc = DateTime.UtcNow; - packetBaseDefinition.Header = packetHeader; - packetBaseDefinition.PacketType = packetType; - } - - #endregion - } -} \ No newline at end of file diff --git a/src/World/WorldServer.cs b/src/World/WorldServer.cs index c3955774..c49d35a0 100644 --- a/src/World/WorldServer.cs +++ b/src/World/WorldServer.cs @@ -2,15 +2,13 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Reflection; using System.Text; using Autofac; using ChickenAPI.Core.IoC; using ChickenAPI.Core.Plugins; using ChickenAPI.Core.Plugins.Exceptions; using ChickenAPI.Packets; -using ChickenAPI.Packets.Attributes; -using ChickenAPI.Packets.Game.Server.Player; +using ChickenAPI.Packets.Interfaces; using Essentials; using NLog; using NW.Plugins.PacketHandling; @@ -23,8 +21,7 @@ using SaltyEmu.PathfinderPlugin; using SaltyEmu.RedisWrappers; using World.Network; -using World.Packets; -using Logger = ChickenAPI.Core.Logging.Logger; +using Logger = SaltyEmu.Core.Logging.Logger; namespace World { @@ -35,9 +32,9 @@ internal class WorldServer private static readonly List Plugins = new List { - new DatabasePlugin(), + new DatabasePlugin(Logger.GetLogger()), new BasicAlgorithmPlugin(), - new RedisPlugin(), + new RedisPlugin(Logger.GetLogger()), new BasicPlugin(), new PathfinderPlugin(), new PacketHandlerPlugin(), @@ -139,7 +136,15 @@ private static void Main() PrintHeader(); InitializeLogger(); InitializeConfigs(); - ChickenContainer.Builder.Register(_ => new PluggablePacketFactory()).As().SingleInstance(); + IEnumerable packetTypes = typeof(IPacket).Assembly.GetTypes() + .Where(p => p.Namespace != "ChickenAPI.Packets.ServerPackets.Login" && p.Name != "NoS0575Packet" + && p.GetInterfaces().Contains(typeof(IPacket)) && p.IsClass && !p.IsAbstract).ToArray(); + ChickenContainer.Builder.Register(c => new Deserializer(packetTypes)) + .AsImplementedInterfaces() + .SingleInstance(); + ChickenContainer.Builder.Register(c => new Serializer(packetTypes)) + .AsImplementedInterfaces() + .SingleInstance(); if (InitializePlugins()) { return; diff --git a/src/libs/SaltyEmu.Commands/Checks/RequireAuthorityAttribute.cs b/src/libs/SaltyEmu.Commands/Checks/RequireAuthorityAttribute.cs index a01959f9..abbe0d68 100644 --- a/src/libs/SaltyEmu.Commands/Checks/RequireAuthorityAttribute.cs +++ b/src/libs/SaltyEmu.Commands/Checks/RequireAuthorityAttribute.cs @@ -1,6 +1,6 @@ using System; using System.Threading.Tasks; -using ChickenAPI.Enums; +using ChickenAPI.Data.Enums; using ChickenAPI.Game.Entities.Player; using Qmmands; using SaltyEmu.Commands.Entities; diff --git a/src/libs/SaltyEmu.Commands/CommandHandler.cs b/src/libs/SaltyEmu.Commands/CommandHandler.cs index 2f5634e8..0719d798 100644 --- a/src/libs/SaltyEmu.Commands/CommandHandler.cs +++ b/src/libs/SaltyEmu.Commands/CommandHandler.cs @@ -1,9 +1,7 @@ using Autofac.Extensions.DependencyInjection; using ChickenAPI.Core.IoC; using ChickenAPI.Core.Logging; -using ChickenAPI.Enums.Packets; using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Game.Helpers; using Qmmands; using SaltyEmu.Commands.Entities; using SaltyEmu.Commands.Interfaces; @@ -12,6 +10,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; +using ChickenAPI.Game.Helpers; +using ChickenAPI.Packets.Enumerations; namespace SaltyEmu.Commands { @@ -21,17 +21,16 @@ namespace SaltyEmu.Commands public class CommandHandler : ICommandContainer { private readonly CommandService _commands; - private readonly Logger _logger; + private readonly ILogger _logger; public IServiceProvider Services { get; } /// /// This class should be instanciated with our Container. /// - public CommandHandler() + public CommandHandler(ILogger logger) { - _logger = Logger.GetLogger(); - + _logger = logger; _commands = new CommandService(new CommandServiceConfiguration { CaseSensitive = false, @@ -45,7 +44,7 @@ public CommandHandler() public async Task AddModuleAsync() where T : SaltyModuleBase { - await _commands.AddModuleAsync(); + _commands.AddModule(); IReadOnlyList readOnlyList = _commands.GetAllModules().FirstOrDefault(s => s.Type == typeof(T))?.Commands; if (readOnlyList != null) @@ -66,7 +65,7 @@ public async Task RemoveModuleAsync() where T : SaltyModuleBase throw new ArgumentException("The given module is not registered in the command container."); } - await _commands.RemoveModuleAsync(module); + _commands.RemoveModule(module); } public Module[] GetModulesByName(string name, bool caseSensitive = true) @@ -148,8 +147,8 @@ public async Task RemoveCommandAsync(Command command) builder.AddCommand(cmdBuilder); } - await _commands.RemoveModuleAsync(oldModule); - await _commands.AddModuleAsync(builder); + _commands.RemoveModule(oldModule); + _commands.AddModule(builder); } public void AddTypeParser(TypeParser typeParser) @@ -190,7 +189,7 @@ private Task _commands_CommandExecuted(Command command, CommandResult result, IC var ctx = context as SaltyCommandContext; if (ctx is null) { - _logger.Debug($"Unknown context: {context.GetType()}. This is bad. Please report this."); + _logger.Debug($"FairyMoveType context: {context.GetType()}. This is bad. Please report this."); } _logger.Debug($"The command {command.Name} (from player {ctx.Player.Character.Name} [{ctx.Player.Character.Id}]) has successfully been executed."); diff --git a/src/libs/SaltyEmu.Commands/SaltyEmu.Commands.csproj b/src/libs/SaltyEmu.Commands/SaltyEmu.Commands.csproj index 196eb1cf..9662d683 100644 --- a/src/libs/SaltyEmu.Commands/SaltyEmu.Commands.csproj +++ b/src/libs/SaltyEmu.Commands/SaltyEmu.Commands.csproj @@ -9,11 +9,11 @@ - + - + diff --git a/src/libs/SaltyEmu.Commands/TypeParsers/ItemDtoTypeParser.cs b/src/libs/SaltyEmu.Commands/TypeParsers/ItemDtoTypeParser.cs index dd8bc5e6..42d61f1a 100644 --- a/src/libs/SaltyEmu.Commands/TypeParsers/ItemDtoTypeParser.cs +++ b/src/libs/SaltyEmu.Commands/TypeParsers/ItemDtoTypeParser.cs @@ -10,8 +10,10 @@ namespace SaltyEmu.Commands.TypeParsers { public sealed class ItemDtoTypeParser : TypeParser { - public override async Task> ParseAsync(string value, ICommandContext context, IServiceProvider provider) + + public override async Task> ParseAsync(Parameter parameter, string value, ICommandContext context, IServiceProvider provider) { + if (!long.TryParse(value, out long result)) { return await Task.FromResult(new TypeParserResult($"The given Item ID was invalid. ({value})")); diff --git a/src/libs/SaltyEmu.Commands/TypeParsers/MapLayerTypeParser.cs b/src/libs/SaltyEmu.Commands/TypeParsers/MapLayerTypeParser.cs index 62b19ffb..e744f8d3 100644 --- a/src/libs/SaltyEmu.Commands/TypeParsers/MapLayerTypeParser.cs +++ b/src/libs/SaltyEmu.Commands/TypeParsers/MapLayerTypeParser.cs @@ -10,7 +10,7 @@ namespace SaltyEmu.Commands.TypeParsers { public sealed class MapLayerTypeParser : TypeParser { - public override Task> ParseAsync(string value, ICommandContext context, IServiceProvider provider) + public override Task> ParseAsync(Parameter param, string value, ICommandContext context, IServiceProvider provider) { if (!long.TryParse(value, out var result)) { @@ -25,4 +25,4 @@ public override Task> ParseAsync(string value, IComm : Task.FromResult(new TypeParserResult(map)); } } -} +} \ No newline at end of file diff --git a/src/libs/SaltyEmu.Commands/TypeParsers/PlayerEntityTypeParser.cs b/src/libs/SaltyEmu.Commands/TypeParsers/PlayerEntityTypeParser.cs index 84bd0264..f0c0619a 100644 --- a/src/libs/SaltyEmu.Commands/TypeParsers/PlayerEntityTypeParser.cs +++ b/src/libs/SaltyEmu.Commands/TypeParsers/PlayerEntityTypeParser.cs @@ -10,7 +10,7 @@ namespace SaltyEmu.Commands.TypeParsers { public sealed class PlayerEntityTypeParser : TypeParser { - public override Task> ParseAsync(string value, ICommandContext context, IServiceProvider provider) + public override Task> ParseAsync(Parameter param, string value, ICommandContext context, IServiceProvider provider) { var manager = ChickenContainer.Instance.Resolve(); IPlayerEntity player = manager.GetPlayerByCharacterName(value); @@ -20,4 +20,4 @@ public override Task> ParseAsync(string value, I : Task.FromResult(new TypeParserResult(player)); } } -} +} \ No newline at end of file diff --git a/src/libs/SaltyEmu.Communication/Communicators/MappedIpcRepository.cs b/src/libs/SaltyEmu.Communication/Communicators/MappedRPCRepository.cs similarity index 95% rename from src/libs/SaltyEmu.Communication/Communicators/MappedIpcRepository.cs rename to src/libs/SaltyEmu.Communication/Communicators/MappedRPCRepository.cs index 4703cea6..6c942e68 100644 --- a/src/libs/SaltyEmu.Communication/Communicators/MappedIpcRepository.cs +++ b/src/libs/SaltyEmu.Communication/Communicators/MappedRPCRepository.cs @@ -7,10 +7,10 @@ namespace SaltyEmu.Communication.Communicators { - public abstract class MappedIpcRepository : IMappedRepository where T : class, IMappedDto + public abstract class MappedRpcRepository : IMappedRepository where T : class, IMappedDto { - protected readonly IIpcClient Client; - protected MappedIpcRepository(IIpcClient client) + protected readonly IRpcClient Client; + protected MappedRpcRepository(IRpcClient client) { Client = client; } diff --git a/src/libs/SaltyEmu.Communication/Communicators/MqttIpcClient.cs b/src/libs/SaltyEmu.Communication/Communicators/MqttIpcClient.cs index 6d8dd4f1..dba39157 100644 --- a/src/libs/SaltyEmu.Communication/Communicators/MqttIpcClient.cs +++ b/src/libs/SaltyEmu.Communication/Communicators/MqttIpcClient.cs @@ -17,9 +17,9 @@ namespace SaltyEmu.Communication.Communicators { - public sealed class MqttIpcClient : IIpcClient + public sealed class MqttIpcClient : IRpcClient { - private readonly Logger _log = Logger.GetLogger(); + private readonly ILogger _log; private readonly IIpcPacketRouter _router; private readonly IIpcSerializer _serializer; @@ -93,7 +93,7 @@ private async Task CheckRouting(Type type) return routingInfos; } - public async Task RequestAsync(IIpcRequest packet) where TResponse : class, IIpcResponse + public async Task RequestAsync(ISyncRpcRequest packet) where TResponse : class, ISyncRpcResponse { // add packet to requests PendingRequest request = _requestFactory.Create(packet); @@ -106,7 +106,7 @@ public async Task RequestAsync(IIpcRequest packet) where T PacketContainer container = _packetFactory.ToPacket(packet.GetType(), packet); await SendAsync(container); - IIpcResponse tmp = await request.Response.Task; + ISyncRpcResponse tmp = await request.Response.Task; return tmp as TResponse; } @@ -121,7 +121,7 @@ await _client.PublishAsync(builder => ); } - public Task BroadcastAsync(T packet) where T : IIpcPacket + public Task BroadcastAsync(T packet) where T : IAsyncRpcRequest { PacketContainer container = _packetFactory.ToPacket(typeof(T), packet); return SendAsync(container); diff --git a/src/libs/SaltyEmu.Communication/Communicators/MqttIpcServer.cs b/src/libs/SaltyEmu.Communication/Communicators/MqttIpcServer.cs index e75923e1..cccee832 100644 --- a/src/libs/SaltyEmu.Communication/Communicators/MqttIpcServer.cs +++ b/src/libs/SaltyEmu.Communication/Communicators/MqttIpcServer.cs @@ -17,9 +17,9 @@ namespace SaltyEmu.Communication.Communicators { - public class MqttIpcServer : IIpcServer + public class MqttIpcServer : IRpcServer { - private readonly Logger _log = Logger.GetLogger(); + private readonly ILogger _log; private readonly HashSet _queues; private readonly IManagedMqttClient _client; private readonly IIpcSerializer _serializer; @@ -29,16 +29,18 @@ public class MqttIpcServer : IIpcServer private readonly IIpcPacketHandlersContainer _packetHandlersContainer; private readonly IIpcPacketRouter _router; - public MqttIpcServer(MqttServerConfigurationBuilder builder, IIpcSerializer serializer, IIpcPacketRouter router, IIpcPacketHandlersContainer packetHandlersContainer) : this(builder.Build(), - serializer, router, packetHandlersContainer) + public MqttIpcServer(MqttServerConfigurationBuilder builder, IIpcSerializer serializer, IIpcPacketRouter router, IIpcPacketHandlersContainer packetHandlersContainer, ILogger log) : this( + builder.Build(), + serializer, router, packetHandlersContainer, log) { } - private MqttIpcServer(MqttIpcServerConfiguration configuration, IIpcSerializer serializer, IIpcPacketRouter router, IIpcPacketHandlersContainer packetHandlersContainer) + private MqttIpcServer(MqttIpcServerConfiguration configuration, IIpcSerializer serializer, IIpcPacketRouter router, IIpcPacketHandlersContainer packetHandlersContainer, ILogger log) { _serializer = serializer; _router = router; _packetHandlersContainer = packetHandlersContainer; + _log = log; string clientName = configuration.ClientName; string endPoint = configuration.EndPoint; @@ -98,7 +100,7 @@ public void OnRequest(BaseRequest request, Type type) _packetHandlersContainer.HandleAsync(request, type).ConfigureAwait(false).GetAwaiter().GetResult(); } - public async Task ResponseAsync(T response, Type packetType) where T : IIpcResponse + public async Task ResponseAsync(T response, Type packetType) where T : ISyncRpcResponse { PacketContainer container = _packetFactory.ToPacket(response); #if DEBUG diff --git a/src/libs/SaltyEmu.Communication/Communicators/RabbitMQServer.cs b/src/libs/SaltyEmu.Communication/Communicators/RabbitMQServer.cs index e3db6354..19ef8c77 100644 --- a/src/libs/SaltyEmu.Communication/Communicators/RabbitMQServer.cs +++ b/src/libs/SaltyEmu.Communication/Communicators/RabbitMQServer.cs @@ -12,14 +12,14 @@ namespace SaltyEmu.Communication.Communicators { - public abstract class RabbitMqServer : IIpcServer + public abstract class RabbitMqServer : IRpcServer { private readonly RabbitMqConfiguration _configuration; private readonly string _requestQueueName; private readonly string _responseQueueName; private readonly string _broadcastQueueName; private const string ExchangeName = ""; // default exchange - private static readonly Logger Log = Logger.GetLogger(); + protected readonly ILogger Log; private readonly IModel _channel; private readonly IConnection _connection; @@ -27,10 +27,11 @@ public abstract class RabbitMqServer : IIpcServer private readonly IIpcPacketHandlersContainer _packetHandlersContainer; - protected RabbitMqServer(RabbitMqConfiguration config, IIpcPacketHandlersContainer packetHandlersContainer) + protected RabbitMqServer(RabbitMqConfiguration config, IIpcPacketHandlersContainer packetHandlersContainer, ILogger log) { _configuration = config; _packetHandlersContainer = packetHandlersContainer; + Log = log; var factory = new ConnectionFactory { HostName = _configuration.Address, Password = _configuration.Password, Port = _configuration.Port }; _requestQueueName = _configuration.RequestQueueName; @@ -53,7 +54,7 @@ protected RabbitMqServer(RabbitMqConfiguration config, IIpcPacketHandlersContain Log.Info("IPC Server launched !"); } - public Task ResponseAsync(T response) where T : IIpcResponse + public Task ResponseAsync(T response) where T : ISyncRpcResponse { return Task.Run(() => { Publish(_packetContainerFactory.ToPacket(response), _responseQueueName); }); } @@ -99,7 +100,7 @@ private void Publish(PacketContainer container, string queueName) _channel.BasicPublish(ExchangeName, queueName, props, messageBytes); } - public Task ResponseAsync(T response, Type requestType) where T : IIpcResponse + public Task ResponseAsync(T response, Type requestType) where T : ISyncRpcResponse { return Task.Run(() => { Publish(_packetContainerFactory.ToPacket(response), _responseQueueName); }); } diff --git a/src/libs/SaltyEmu.Communication/Communicators/RabbitMqClient.cs b/src/libs/SaltyEmu.Communication/Communicators/RabbitMqClient.cs index 2c6c4693..decaf9ec 100644 --- a/src/libs/SaltyEmu.Communication/Communicators/RabbitMqClient.cs +++ b/src/libs/SaltyEmu.Communication/Communicators/RabbitMqClient.cs @@ -14,9 +14,9 @@ namespace SaltyEmu.Communication.Communicators { - public abstract class RabbitMqClient : IDisposable, IIpcClient + public abstract class RabbitMqClient : IDisposable, IRpcClient { - private static readonly Logger Log = Logger.GetLogger(); + private static readonly ILogger Log; private readonly RabbitMqConfiguration _configuration; private readonly string _requestQueueName; private readonly string _responseQueueName; @@ -63,7 +63,7 @@ public void Dispose() _channel?.Dispose(); } - public async Task RequestAsync(IIpcRequest packet) where T : class, IIpcResponse + public async Task RequestAsync(ISyncRpcRequest packet) where T : class, ISyncRpcResponse { // add packet to requests PendingRequest request = _requestFactory.Create(packet); @@ -77,15 +77,15 @@ public async Task RequestAsync(IIpcRequest packet) where T : class, IIpcRe Publish(container, _requestQueueName); - IIpcResponse tmp = await request.Response.Task; + ISyncRpcResponse tmp = await request.Response.Task; return tmp as T; } - public Task BroadcastAsync(T packet) where T : IIpcPacket + public Task BroadcastAsync(T packet) where T : IAsyncRpcRequest { return Task.Run(() => { - PacketContainer tmp = _packetFactory.ToPacket(packet); + PacketContainer tmp = _packetFactory.ToPacket(packet); Publish(tmp, _broadcastQueueName); }); } diff --git a/src/libs/SaltyEmu.Communication/Communicators/SynchronizedIpcRepository.cs b/src/libs/SaltyEmu.Communication/Communicators/SynchronizedIpcRepository.cs index 53e5cbb0..01b1f012 100644 --- a/src/libs/SaltyEmu.Communication/Communicators/SynchronizedIpcRepository.cs +++ b/src/libs/SaltyEmu.Communication/Communicators/SynchronizedIpcRepository.cs @@ -4,16 +4,14 @@ using System.Threading.Tasks; using ChickenAPI.Core.IPC; using ChickenAPI.Data; -using SaltyEmu.Communication.Configs; using SaltyEmu.Communication.Protocol.RepositoryPacket; -using SaltyEmu.Communication.Serializers; namespace SaltyEmu.Communication.Communicators { - public abstract class SynchronizedRepositoryMqtt : ISynchronizedRepository where T : class, ISynchronizedDto + public abstract class SynchronizedRpcRepository : ISynchronizedRepository where T : class, ISynchronizedDto { - private readonly IIpcClient _client; - protected SynchronizedRepositoryMqtt(MqttClientConfigurationBuilder builder, IIpcClient client) + private readonly IRpcClient _client; + protected SynchronizedRpcRepository(IRpcClient client) { _client = client; } diff --git a/src/libs/SaltyEmu.Communication/Protocol/BaseBroadcastedPacket.cs b/src/libs/SaltyEmu.Communication/Protocol/BaseBroadcastedPacket.cs index cb040327..d6405c59 100644 --- a/src/libs/SaltyEmu.Communication/Protocol/BaseBroadcastedPacket.cs +++ b/src/libs/SaltyEmu.Communication/Protocol/BaseBroadcastedPacket.cs @@ -4,7 +4,7 @@ namespace SaltyEmu.Communication.Protocol { - public abstract class BaseBroadcastedPacket : IIpcPacket + public abstract class BaseBroadcastedPacket : IAsyncRpcRequest { public Guid Id { get; set; } diff --git a/src/libs/SaltyEmu.Communication/Protocol/BaseRequest.cs b/src/libs/SaltyEmu.Communication/Protocol/BaseRequest.cs index 66d29441..3ad1856c 100644 --- a/src/libs/SaltyEmu.Communication/Protocol/BaseRequest.cs +++ b/src/libs/SaltyEmu.Communication/Protocol/BaseRequest.cs @@ -5,11 +5,11 @@ namespace SaltyEmu.Communication.Protocol { - public class BaseRequest : IIpcRequest + public class BaseRequest : ISyncRpcRequest { private Guid _id; - public IIpcServer Server { get; set; } + public IRpcServer Server { get; set; } public Guid Id { @@ -17,7 +17,7 @@ public Guid Id set => _id = value; } - public Task ReplyAsync(T response) where T : IIpcResponse + public Task ReplyAsync(T response) where T : ISyncRpcResponse { response.RequestId = Id; return Server.ResponseAsync(response, typeof(TRequest)); diff --git a/src/libs/SaltyEmu.Communication/Protocol/BaseResponse.cs b/src/libs/SaltyEmu.Communication/Protocol/BaseResponse.cs index 2193832f..f78cac06 100644 --- a/src/libs/SaltyEmu.Communication/Protocol/BaseResponse.cs +++ b/src/libs/SaltyEmu.Communication/Protocol/BaseResponse.cs @@ -3,7 +3,7 @@ namespace SaltyEmu.Communication.Protocol { - public class BaseResponse : IIpcResponse + public class BaseResponse : ISyncRpcResponse { private Guid _id; diff --git a/src/libs/SaltyEmu.Communication/Protocol/IPacketContainerFactory.cs b/src/libs/SaltyEmu.Communication/Protocol/IPacketContainerFactory.cs index 22f000e1..1fbce178 100644 --- a/src/libs/SaltyEmu.Communication/Protocol/IPacketContainerFactory.cs +++ b/src/libs/SaltyEmu.Communication/Protocol/IPacketContainerFactory.cs @@ -8,7 +8,7 @@ public interface IPacketContainerFactory PacketContainer Create(string content); PacketContainer Create(Type type, string content); - PacketContainer ToPacket(IIpcPacket packet); - PacketContainer ToPacket(Type type, IIpcPacket packet); + PacketContainer ToPacket(T packet) where T : IAsyncRpcRequest; + PacketContainer ToPacket(Type type, IAsyncRpcRequest packet); } } \ No newline at end of file diff --git a/src/libs/SaltyEmu.Communication/Protocol/PacketContainerFactory.cs b/src/libs/SaltyEmu.Communication/Protocol/PacketContainerFactory.cs index de2de2da..977ee1f6 100644 --- a/src/libs/SaltyEmu.Communication/Protocol/PacketContainerFactory.cs +++ b/src/libs/SaltyEmu.Communication/Protocol/PacketContainerFactory.cs @@ -15,8 +15,8 @@ public PacketContainer Create(Type type, string content) => Content = content }; - public PacketContainer ToPacket(IIpcPacket packet) => ToPacket(typeof(T), packet); + public PacketContainer ToPacket(T packet) where T : IAsyncRpcRequest => ToPacket(typeof(T), packet); - public PacketContainer ToPacket(Type type, IIpcPacket packet) => Create(type, JsonConvert.SerializeObject(packet)); + public PacketContainer ToPacket(Type type, IAsyncRpcRequest packet) => Create(type, JsonConvert.SerializeObject(packet)); } } \ No newline at end of file diff --git a/src/libs/SaltyEmu.Communication/Routing/RoutingInformationFactory.cs b/src/libs/SaltyEmu.Communication/Routing/RoutingInformationFactory.cs index 3a88c3b8..81e00d04 100644 --- a/src/libs/SaltyEmu.Communication/Routing/RoutingInformationFactory.cs +++ b/src/libs/SaltyEmu.Communication/Routing/RoutingInformationFactory.cs @@ -6,10 +6,16 @@ namespace SaltyEmu.Communication { public class RoutingInformationFactory : IRoutingInformationFactory { - private readonly Logger Log = Logger.GetLogger(); + private readonly ILogger _log; + + public RoutingInformationFactory(ILogger log) + { + _log = log; + } + public Task Create(string topic, string responseTopic) { - Log.Info($"[PACKET] Routing to : {topic}"); + _log.Info($"[PACKET] Routing to : {topic}"); return Task.FromResult((IRoutingInformation)new RoutingInformation { IncomingTopic = topic, diff --git a/src/libs/SaltyEmu.Communication/Routing/RuntimeSmartIpcRouter.cs b/src/libs/SaltyEmu.Communication/Routing/RuntimeSmartIpcRouter.cs index 91e7a0a8..f04fbc51 100644 --- a/src/libs/SaltyEmu.Communication/Routing/RuntimeSmartIpcRouter.cs +++ b/src/libs/SaltyEmu.Communication/Routing/RuntimeSmartIpcRouter.cs @@ -38,12 +38,12 @@ private async Task RegisterGenericRequestAsync(Type type) string requestTopic = newTopic.ToString(); string responseTopic = ""; - if (type.GetInterfaces().Any(s => s == typeof(IIpcRequest))) + if (type.GetInterfaces().Any(s => s == typeof(ISyncRpcRequest))) { requestTopic += RequestTopicSuffix; responseTopic = newTopic + ResponseTopicSuffix; } - else if (type.GetInterfaces().Any(s => s == typeof(IIpcPacket))) + else if (type.GetInterfaces().Any(s => s == typeof(IAsyncRpcRequest))) { requestTopic += PacketTopicSuffix; } @@ -62,16 +62,16 @@ public async Task RegisterAsync(Type type) string requestTopic = ""; string responseTopic = ""; - if (type.GetInterfaces().Any(s => s == typeof(IIpcRequest))) + if (type.GetInterfaces().Any(s => s == typeof(ISyncRpcRequest))) { requestTopic = type.FullName.ToLower() + RequestTopicSuffix; responseTopic = type.FullName.ToLower() + ResponseTopicSuffix; } - else if (type.GetInterfaces().Any(s => s == typeof(IIpcPacket))) + else if (type.GetInterfaces().Any(s => s == typeof(IAsyncRpcRequest))) { requestTopic = type.FullName.ToLower() + PacketTopicSuffix; } - else if (type.IsNested && type.GetInterfaces().Any(s => s == typeof(IIpcResponse))) + else if (type.IsNested && type.GetInterfaces().Any(s => s == typeof(ISyncRpcResponse))) { responseTopic = type.FullName.ToLower().Replace('+', '.'); } diff --git a/src/libs/SaltyEmu.Communication/SaltyEmu.Communication.csproj b/src/libs/SaltyEmu.Communication/SaltyEmu.Communication.csproj index 872650ce..7cdac008 100644 --- a/src/libs/SaltyEmu.Communication/SaltyEmu.Communication.csproj +++ b/src/libs/SaltyEmu.Communication/SaltyEmu.Communication.csproj @@ -5,13 +5,14 @@ + + - diff --git a/src/libs/SaltyEmu.Communication/Utils/CommunicationIocInjector.cs b/src/libs/SaltyEmu.Communication/Utils/CommunicationIocInjector.cs index ef77966a..434530c7 100644 --- a/src/libs/SaltyEmu.Communication/Utils/CommunicationIocInjector.cs +++ b/src/libs/SaltyEmu.Communication/Utils/CommunicationIocInjector.cs @@ -17,8 +17,8 @@ public static void Inject() ChickenContainer.Builder.RegisterType().As().PropertiesAutowired().SingleInstance(); ChickenContainer.Builder.RegisterType().As().PropertiesAutowired().SingleInstance(); - ChickenContainer.Builder.RegisterType().As().PropertiesAutowired().SingleInstance(); - ChickenContainer.Builder.RegisterType().As().PropertiesAutowired().SingleInstance(); + ChickenContainer.Builder.RegisterType().As().PropertiesAutowired().SingleInstance(); + ChickenContainer.Builder.RegisterType().As().PropertiesAutowired().SingleInstance(); } } } \ No newline at end of file diff --git a/src/libs/SaltyEmu.Communication/Utils/GenericIpcPacketHandler.cs b/src/libs/SaltyEmu.Communication/Utils/GenericAsyncRpcRequestHandler.cs similarity index 60% rename from src/libs/SaltyEmu.Communication/Utils/GenericIpcPacketHandler.cs rename to src/libs/SaltyEmu.Communication/Utils/GenericAsyncRpcRequestHandler.cs index 20d2be60..4f969ab7 100644 --- a/src/libs/SaltyEmu.Communication/Utils/GenericIpcPacketHandler.cs +++ b/src/libs/SaltyEmu.Communication/Utils/GenericAsyncRpcRequestHandler.cs @@ -5,11 +5,16 @@ namespace SaltyEmu.Communication.Utils { - public abstract class GenericIpcPacketHandler : IIpcPacketHandler where T : IIpcPacket + public abstract class GenericAsyncRpcRequestHandler : IIpcPacketHandler where T : IAsyncRpcRequest { - protected readonly Logger Log = Logger.GetLogger>(); + protected readonly ILogger Log; - public Task Handle(IIpcPacket packet) + protected GenericAsyncRpcRequestHandler(ILogger log) + { + Log = log; + } + + public Task Handle(IAsyncRpcRequest packet) { if (packet is T request) { diff --git a/src/libs/SaltyEmu.Communication/Utils/GenericIpcRequestHandler.cs b/src/libs/SaltyEmu.Communication/Utils/GenericIpcRequestHandler.cs index da83496a..1c605fae 100644 --- a/src/libs/SaltyEmu.Communication/Utils/GenericIpcRequestHandler.cs +++ b/src/libs/SaltyEmu.Communication/Utils/GenericIpcRequestHandler.cs @@ -5,12 +5,14 @@ namespace SaltyEmu.Communication.Utils { - public abstract class GenericIpcRequestHandler : IIpcPacketHandler where TRequest : IIpcRequest - where TResponse : IIpcResponse + public abstract class GenericIpcRequestHandler : IIpcPacketHandler where TRequest : ISyncRpcRequest + where TResponse : ISyncRpcResponse { - protected readonly Logger Log = Logger.GetLogger>(); + protected readonly ILogger Log; - public async Task Handle(IIpcPacket packet) + protected GenericIpcRequestHandler(ILogger log) => Log = log; + + public async Task Handle(IAsyncRpcRequest packet) { if (packet is TRequest request) { diff --git a/src/libs/SaltyEmu.Communication/Utils/IPendingRequestFactory.cs b/src/libs/SaltyEmu.Communication/Utils/IPendingRequestFactory.cs index e736f586..ec3894d0 100644 --- a/src/libs/SaltyEmu.Communication/Utils/IPendingRequestFactory.cs +++ b/src/libs/SaltyEmu.Communication/Utils/IPendingRequestFactory.cs @@ -4,6 +4,6 @@ namespace SaltyEmu.Communication.Utils { public interface IPendingRequestFactory { - PendingRequest Create(IIpcRequest request); + PendingRequest Create(ISyncRpcRequest request); } } \ No newline at end of file diff --git a/src/libs/SaltyEmu.Communication/Utils/PacketHandlersContainer.cs b/src/libs/SaltyEmu.Communication/Utils/PacketHandlersContainer.cs index dec770bf..81103dfa 100644 --- a/src/libs/SaltyEmu.Communication/Utils/PacketHandlersContainer.cs +++ b/src/libs/SaltyEmu.Communication/Utils/PacketHandlersContainer.cs @@ -9,9 +9,14 @@ namespace SaltyEmu.Communication.Utils { public sealed class PacketHandlersContainer : IIpcPacketHandlersContainer { - private static readonly Logger Log = Logger.GetLogger(); + private readonly ILogger _log; private readonly Dictionary _packetHandlers = new Dictionary(); + public PacketHandlersContainer(ILogger log) + { + _log = log; + } + public event EventHandler Registered; public event EventHandler Unregistered; @@ -19,25 +24,25 @@ public Task RegisterAsync(IIpcPacketHandler handler, Type type) { if (_packetHandlers.ContainsKey(type)) { - Log.Info($"{type} is already handled"); + _log.Info($"{type} is already handled"); return Task.CompletedTask; } - Log.Warn($"HANDLING -> {type}"); + _log.Warn($"HANDLING -> {type}"); _packetHandlers.Add(type, handler); OnRegistered(type); return Task.CompletedTask; } - public Task HandleAsync(IIpcPacket request, Type type) + public Task HandleAsync(IAsyncRpcRequest request, Type type) { if (!_packetHandlers.TryGetValue(type, out IIpcPacketHandler handler)) { - Log.Warn($"{type} could not be found !"); + _log.Warn($"{type} could not be found !"); return Task.CompletedTask; } - Log.Info($"Handling {type.Name} request"); + _log.Info($"Handling {type.Name} request"); return handler.Handle(request); } diff --git a/src/libs/SaltyEmu.Communication/Utils/PendingRequest.cs b/src/libs/SaltyEmu.Communication/Utils/PendingRequest.cs index baa9e391..a3615a09 100644 --- a/src/libs/SaltyEmu.Communication/Utils/PendingRequest.cs +++ b/src/libs/SaltyEmu.Communication/Utils/PendingRequest.cs @@ -5,7 +5,7 @@ namespace SaltyEmu.Communication.Utils { public class PendingRequest { - public IIpcRequest Request { get; set; } - public TaskCompletionSource Response { get; set; } + public ISyncRpcRequest Request { get; set; } + public TaskCompletionSource Response { get; set; } } } \ No newline at end of file diff --git a/src/libs/SaltyEmu.Communication/Utils/PendingRequestFactory.cs b/src/libs/SaltyEmu.Communication/Utils/PendingRequestFactory.cs index 58c08fc2..7231e10f 100644 --- a/src/libs/SaltyEmu.Communication/Utils/PendingRequestFactory.cs +++ b/src/libs/SaltyEmu.Communication/Utils/PendingRequestFactory.cs @@ -5,10 +5,10 @@ namespace SaltyEmu.Communication.Utils { public class PendingRequestFactory : IPendingRequestFactory { - public PendingRequest Create(IIpcRequest request) => new PendingRequest + public PendingRequest Create(ISyncRpcRequest request) => new PendingRequest { Request = request, - Response = new TaskCompletionSource() + Response = new TaskCompletionSource() }; } } \ No newline at end of file diff --git a/src/libs/SaltyEmu.Core/EncodingExtensions.cs b/src/libs/SaltyEmu.Core/EncodingExtensions.cs index 71f53463..13554e3a 100644 --- a/src/libs/SaltyEmu.Core/EncodingExtensions.cs +++ b/src/libs/SaltyEmu.Core/EncodingExtensions.cs @@ -1,9 +1,18 @@ using System; using System.Text; +using ChickenAPI.Core.Configurations; using ChickenAPI.Core.i18n; +using Newtonsoft.Json; namespace SaltyEmu.Core { + public class JsonConfigurationSerializer : IConfigurationSerializer + { + public string Serialize(T conf) where T : IConfiguration => JsonConvert.SerializeObject(conf); + + public T Deserialize(string buffer) where T : IConfiguration => JsonConvert.DeserializeObject(buffer); + } + public static class EncodingExtensions { public static string GetKeyForLangFiles(this LanguageKey key) diff --git a/src/ChickenAPI.Core/Logging/Logger.cs b/src/libs/SaltyEmu.Core/Logging/Logger.cs similarity index 88% rename from src/ChickenAPI.Core/Logging/Logger.cs rename to src/libs/SaltyEmu.Core/Logging/Logger.cs index cce1d29b..f7ff0c94 100644 --- a/src/ChickenAPI.Core/Logging/Logger.cs +++ b/src/libs/SaltyEmu.Core/Logging/Logger.cs @@ -4,16 +4,22 @@ using NLog.Config; using NLog.Targets; -namespace ChickenAPI.Core.Logging +namespace SaltyEmu.Core.Logging { - public class Logger + public class Logger : ChickenAPI.Core.Logging.ILogger { private const string DefaultLayout = "[${date}][${level:uppercase=true}][${logger:shortName=true}] ${message} ${exception:format=tostring}"; - private Logger(Type type) => Log = LogManager.GetLogger(type.ToString()); - private Logger(string prefix) => Log = LogManager.GetLogger(prefix); + public Logger(Type type) => Log = LogManager.GetLogger(type.ToString()); + public Logger(string prefix) => Log = LogManager.GetLogger(prefix); - private ILogger Log { get; } + public static Logger GetLogger(string prefix) => new Logger(prefix); + + public static Logger GetLogger(Type type) => GetLogger(type.ToString()); + + public static Logger GetLogger() where TClass : class => GetLogger(typeof(TClass)); + + private NLog.ILogger Log { get; } /// /// Initialize logger's configuration. @@ -68,10 +74,6 @@ public static void Initialize() Initialize(DefaultLayout, DefaultLayout); } - public static Logger GetLogger(string prefix) => new Logger(prefix); - - public static Logger GetLogger() where TClass : class => new Logger(typeof(TClass)); - public void Trace(string msg) { Log?.Trace(msg); diff --git a/src/libs/SaltyEmu.Core/PacketHandling/GenericGamePacketHandlerAsync.cs b/src/libs/SaltyEmu.Core/PacketHandling/GenericGamePacketHandlerAsync.cs index 1b986661..e2f0d4ab 100644 --- a/src/libs/SaltyEmu.Core/PacketHandling/GenericGamePacketHandlerAsync.cs +++ b/src/libs/SaltyEmu.Core/PacketHandling/GenericGamePacketHandlerAsync.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using ChickenAPI.Game.Entities.Player; using ChickenAPI.Packets; +using ChickenAPI.Packets.Interfaces; namespace SaltyEmu.Core.PacketHandling { diff --git a/src/libs/SaltyEmu.Core/PacketHandling/GenericSessionPacketHandlerAsync.cs b/src/libs/SaltyEmu.Core/PacketHandling/GenericSessionPacketHandlerAsync.cs index fb88423e..7b8b6be8 100644 --- a/src/libs/SaltyEmu.Core/PacketHandling/GenericSessionPacketHandlerAsync.cs +++ b/src/libs/SaltyEmu.Core/PacketHandling/GenericSessionPacketHandlerAsync.cs @@ -1,6 +1,7 @@ using System.Threading.Tasks; using ChickenAPI.Game._Network; using ChickenAPI.Packets; +using ChickenAPI.Packets.Interfaces; namespace SaltyEmu.Core.PacketHandling { diff --git a/src/libs/SaltyEmu.Core/Plugins/SimplePluginManager.cs b/src/libs/SaltyEmu.Core/Plugins/SimplePluginManager.cs index 1e6fb983..3f7b9615 100644 --- a/src/libs/SaltyEmu.Core/Plugins/SimplePluginManager.cs +++ b/src/libs/SaltyEmu.Core/Plugins/SimplePluginManager.cs @@ -5,12 +5,13 @@ using System.Reflection; using ChickenAPI.Core.Logging; using ChickenAPI.Core.Plugins; +using Logger = SaltyEmu.Core.Logging.Logger; namespace SaltyEmu.Core.Plugins { public class SimplePluginManager : IPluginManager { - private static readonly Logger Log = Logger.GetLogger(); + // private static readonly Logger Log = Logger.GetLogger(); public IPlugin[] LoadPlugin(FileInfo file) { @@ -35,7 +36,7 @@ public IPlugin[] LoadPlugin(FileInfo file) foreach (Type type in pluginTypes) { var plugin = (IPlugin)Activator.CreateInstance(type); - Log.Info($"{plugin.Name} Loaded !"); + // Log.Info($"{plugin.Name} Loaded !"); plugin.OnLoad(); plugins.Add(plugin); } diff --git a/src/libs/SaltyEmu.Core/SaltyEmu.Core.csproj b/src/libs/SaltyEmu.Core/SaltyEmu.Core.csproj index db5ae9ec..43be11a5 100644 --- a/src/libs/SaltyEmu.Core/SaltyEmu.Core.csproj +++ b/src/libs/SaltyEmu.Core/SaltyEmu.Core.csproj @@ -1,12 +1,17 @@ - + netcoreapp2.2 - - + + + + + + + diff --git a/src/libs/SaltyEmu.Database.MongoDB/SynchronizedMongoRepository.cs b/src/libs/SaltyEmu.Database.MongoDB/SynchronizedMongoRepository.cs index 61661046..fde704dc 100644 --- a/src/libs/SaltyEmu.Database.MongoDB/SynchronizedMongoRepository.cs +++ b/src/libs/SaltyEmu.Database.MongoDB/SynchronizedMongoRepository.cs @@ -11,16 +11,17 @@ namespace SaltyEmu.Database.MongoDB { public abstract class SynchronizedMongoRepository : ISynchronizedRepository where TObject : class, ISynchronizedDto { - protected readonly Logger Log = Logger.GetLogger($"Mongo-{typeof(TObject).Name}"); + protected readonly ILogger Log; protected readonly IMongoDatabase Database; protected readonly IMongoCollection Collection; - protected SynchronizedMongoRepository(MongoConfigurationBuilder builder) : this(builder.Build()) + protected SynchronizedMongoRepository(MongoConfigurationBuilder builder, ILogger log) : this(builder.Build(), log) { } - private SynchronizedMongoRepository(MongoConfiguration conf) + private SynchronizedMongoRepository(MongoConfiguration conf, ILogger log) { + Log = log; MongoClientSettings settings = MongoClientSettings.FromConnectionString($"mongodb://{conf.Endpoint}:{conf.Port}"); var client = new MongoClient(settings); client.Cluster.Initialize(); diff --git a/src/libs/SaltyEmu.Database/MappedRepositoryBase.cs b/src/libs/SaltyEmu.Database/MappedRepositoryBase.cs index 85ec4ee0..1964b9a2 100644 --- a/src/libs/SaltyEmu.Database/MappedRepositoryBase.cs +++ b/src/libs/SaltyEmu.Database/MappedRepositoryBase.cs @@ -10,22 +10,22 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.ChangeTracking; using Microsoft.EntityFrameworkCore.Storage; -using Newtonsoft.Json; using Z.EntityFramework.Plus; namespace SaltyEmu.Database { public class MappedRepositoryBase : IMappedRepository where TObject : class, IMappedDto where TModel : class, IMappedModel, new() { - protected static readonly Logger Log = Logger.GetLogger(); + protected readonly ILogger Log; protected readonly DbContext Context; protected readonly DbSet DbSet; protected readonly IMapper Mapper; - public MappedRepositoryBase(DbContext context, IMapper mapper) + public MappedRepositoryBase(DbContext context, IMapper mapper, ILogger log) { Context = context; Mapper = mapper; + Log = log; DbSet = context.Set(); } @@ -78,7 +78,6 @@ public virtual TObject Save(TObject obj) } catch (Exception e) { - Log.Warn($"{JsonConvert.SerializeObject(obj)}"); Log.Error("[SAVE]", e); return null; } @@ -245,7 +244,6 @@ public virtual async Task SaveAsync(TObject obj) } catch (Exception e) { - Log.Warn($"{JsonConvert.SerializeObject(obj)}"); Log.Error("[SAVE]", e); return null; } diff --git a/src/libs/SaltyEmu.Database/SynchronizedRepositoryBase.cs b/src/libs/SaltyEmu.Database/SynchronizedRepositoryBase.cs index f4e05f8d..44bb4573 100644 --- a/src/libs/SaltyEmu.Database/SynchronizedRepositoryBase.cs +++ b/src/libs/SaltyEmu.Database/SynchronizedRepositoryBase.cs @@ -15,15 +15,16 @@ namespace SaltyEmu.Database public class SynchronizedRepositoryBase : ISynchronizedRepository where TObject : class, ISynchronizedDto where TModel : class, ISynchronizedModel, new() { - protected static readonly Logger Log = Logger.GetLogger(); + protected readonly ILogger Log; protected readonly DbContext Context; protected readonly DbSet DbSet; protected readonly IMapper Mapper; - public SynchronizedRepositoryBase(DbContext context, IMapper mapper) + public SynchronizedRepositoryBase(DbContext context, IMapper mapper, ILogger log) { Context = context; Mapper = mapper; + Log = log; DbSet = context.Set(); } diff --git a/src/libs/SaltyEmu.Redis/GenericRedisCacheClient.cs b/src/libs/SaltyEmu.Redis/GenericRedisCacheClient.cs index 21e604cb..6124a21f 100644 --- a/src/libs/SaltyEmu.Redis/GenericRedisCacheClient.cs +++ b/src/libs/SaltyEmu.Redis/GenericRedisCacheClient.cs @@ -13,7 +13,7 @@ namespace SaltyEmu.Redis { public abstract class GenericRedisCacheClient : ISynchronizedRepository where TObject : class, ISynchronizedDto { - protected readonly Logger Log = Logger.GetLogger($"RedisCache({typeof(TObject).Name})"); + protected readonly ILogger Log; protected readonly string DataPrefix; protected readonly string KeySetKey; protected readonly RedisHybridCacheClient CacheClient; @@ -31,12 +31,13 @@ public abstract class GenericRedisCacheClient : ISynchronizedRepository protected string ToKey(TObject obj) => ToKey(obj.Id); - protected GenericRedisCacheClient(RedisConfiguration conf) : this(typeof(TObject).Name.ToLower(), conf) + protected GenericRedisCacheClient(RedisConfiguration conf, ILogger log) : this(typeof(TObject).Name.ToLower(), conf, log) { } - private GenericRedisCacheClient(string basePrefix, RedisConfiguration conf) + private GenericRedisCacheClient(string basePrefix, RedisConfiguration conf, ILogger log) { + Log = log; DataPrefix = "data:" + basePrefix + ':'; KeySetKey = "keys:" + basePrefix; var tmp = new RedisCacheClientOptions diff --git a/src/libs/SaltyEmu.Redis/RedisConfiguration.cs b/src/libs/SaltyEmu.Redis/RedisConfiguration.cs index 15938875..02f19743 100644 --- a/src/libs/SaltyEmu.Redis/RedisConfiguration.cs +++ b/src/libs/SaltyEmu.Redis/RedisConfiguration.cs @@ -1,6 +1,8 @@ -namespace SaltyEmu.Redis +using ChickenAPI.Core.Configurations; + +namespace SaltyEmu.Redis { - public class RedisConfiguration + public class RedisConfiguration : IConfiguration { public RedisConfiguration() { diff --git a/src/services/SaltyEmu.CharacterSkillService/DAO/CharacterSkillServiceDao.cs b/src/services/SaltyEmu.CharacterSkillService/DAO/CharacterSkillServiceDao.cs index 140cde16..cefb1604 100644 --- a/src/services/SaltyEmu.CharacterSkillService/DAO/CharacterSkillServiceDao.cs +++ b/src/services/SaltyEmu.CharacterSkillService/DAO/CharacterSkillServiceDao.cs @@ -1,11 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; using System.Threading.Tasks; -using ChickenAPI.Data; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Character; -using MongoDB.Bson.Serialization.Attributes; -using MongoDB.Bson.Serialization.IdGenerators; using MongoDB.Driver; using SaltyEmu.Database.MongoDB; @@ -13,7 +9,7 @@ namespace SaltyEmu.CharacterSkillService.DAO { public class CharacterSkillServiceDao : SynchronizedMongoRepository, ICharacterSkillService { - public CharacterSkillServiceDao(MongoConfigurationBuilder builder) : base(builder) + public CharacterSkillServiceDao(MongoConfigurationBuilder builder, ILogger log) : base(builder, log) { } diff --git a/src/services/SaltyEmu.CharacterSkillService/Program.cs b/src/services/SaltyEmu.CharacterSkillService/Program.cs index 6fea6722..6dba2cba 100644 --- a/src/services/SaltyEmu.CharacterSkillService/Program.cs +++ b/src/services/SaltyEmu.CharacterSkillService/Program.cs @@ -7,6 +7,7 @@ using ChickenAPI.Core.Logging; using ChickenAPI.Core.Plugins; using ChickenAPI.Core.Plugins.Exceptions; +using SaltyEmu.Core.Logging; using SaltyEmu.Core.Plugins; namespace SaltyEmu.CharacterSkillService @@ -14,7 +15,7 @@ namespace SaltyEmu.CharacterSkillService class Program { private static readonly IPluginManager PluginManager = new SimplePluginManager(); - private static readonly Logger Log = Logger.GetLogger("RelationService"); + private static readonly ILogger Log = Logger.GetLogger(); private static void PrintHeader() { diff --git a/src/services/SaltyEmu.FamilyService/Program.cs b/src/services/SaltyEmu.FamilyService/Program.cs index 7ea5f81b..f9766d65 100644 --- a/src/services/SaltyEmu.FamilyService/Program.cs +++ b/src/services/SaltyEmu.FamilyService/Program.cs @@ -28,7 +28,6 @@ private static void PrintHeader() private static void InitializeLogger() { - Logger.Initialize(); } private static void Main() diff --git a/src/services/SaltyEmu.FamilyService/SaltyEmu.FamilyService.csproj b/src/services/SaltyEmu.FamilyService/SaltyEmu.FamilyService.csproj index 245f141f..aab5f7cc 100644 --- a/src/services/SaltyEmu.FamilyService/SaltyEmu.FamilyService.csproj +++ b/src/services/SaltyEmu.FamilyService/SaltyEmu.FamilyService.csproj @@ -11,9 +11,7 @@ - - diff --git a/src/services/SaltyEmu.RelationService/DAO/RelationDao.cs b/src/services/SaltyEmu.RelationService/DAO/RelationDao.cs index fad84966..503f1494 100644 --- a/src/services/SaltyEmu.RelationService/DAO/RelationDao.cs +++ b/src/services/SaltyEmu.RelationService/DAO/RelationDao.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Relations; using SaltyEmu.Redis; @@ -8,7 +9,7 @@ namespace SaltyEmu.RelationService.DAO { public class RelationDao : GenericRedisCacheClient, IRelationDao { - public RelationDao(RedisConfiguration conf) : base(conf) + public RelationDao(RedisConfiguration conf, ILogger log) : base(conf, log) { } diff --git a/src/services/SaltyEmu.RelationService/DAO/RelationInvitationDao.cs b/src/services/SaltyEmu.RelationService/DAO/RelationInvitationDao.cs index a05d80b9..6ef391d5 100644 --- a/src/services/SaltyEmu.RelationService/DAO/RelationInvitationDao.cs +++ b/src/services/SaltyEmu.RelationService/DAO/RelationInvitationDao.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Relations; using SaltyEmu.Redis; @@ -8,7 +9,7 @@ namespace SaltyEmu.RelationService.DAO { public class RelationInvitationDao : GenericRedisCacheClient, IRelationInvitationDao { - public RelationInvitationDao(RedisConfiguration conf) : base(conf) + public RelationInvitationDao(RedisConfiguration conf, ILogger log) : base(conf, log) { } diff --git a/src/services/SaltyEmu.RelationService/DAO/RelationMessageDao.cs b/src/services/SaltyEmu.RelationService/DAO/RelationMessageDao.cs index 2338a350..2480f40a 100644 --- a/src/services/SaltyEmu.RelationService/DAO/RelationMessageDao.cs +++ b/src/services/SaltyEmu.RelationService/DAO/RelationMessageDao.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Relations; using SaltyEmu.Redis; @@ -8,7 +9,7 @@ namespace SaltyEmu.RelationService.DAO { public class RelationMessageDao : GenericRedisCacheClient, IRelationMessageDao { - public RelationMessageDao(RedisConfiguration conf) : base(conf) + public RelationMessageDao(RedisConfiguration conf, ILogger log) : base(conf, log) { } diff --git a/src/services/SaltyEmu.RelationService/Handling/GetInvitationsByCharacterIdHandler.cs b/src/services/SaltyEmu.RelationService/Handling/GetInvitationsByCharacterIdHandler.cs index 286a6843..9a055d4f 100644 --- a/src/services/SaltyEmu.RelationService/Handling/GetInvitationsByCharacterIdHandler.cs +++ b/src/services/SaltyEmu.RelationService/Handling/GetInvitationsByCharacterIdHandler.cs @@ -1,5 +1,6 @@ using System.Linq; using System.Threading.Tasks; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Relations; using SaltyEmu.Communication.Utils; using SaltyEmu.FriendsPlugin.Protocol; @@ -10,10 +11,8 @@ public class GetInvitationsByCharacterIdHandler : GenericIpcRequestHandler _repository = repository; protected override async Task Handle(GetRelationsInvitationByCharacterId request) { diff --git a/src/services/SaltyEmu.RelationService/Handling/GetRelationsByCharacterIdHandler.cs b/src/services/SaltyEmu.RelationService/Handling/GetRelationsByCharacterIdHandler.cs index 7c0118b1..4fd5b4bb 100644 --- a/src/services/SaltyEmu.RelationService/Handling/GetRelationsByCharacterIdHandler.cs +++ b/src/services/SaltyEmu.RelationService/Handling/GetRelationsByCharacterIdHandler.cs @@ -1,5 +1,6 @@ using System.Threading.Tasks; using ChickenAPI.Core.IPC.Protocol; +using ChickenAPI.Core.Logging; using ChickenAPI.Data.Relations; using SaltyEmu.Communication.Utils; using SaltyEmu.FriendsPlugin.Protocol; @@ -10,10 +11,7 @@ public class GetRelationsByCharacterIdHandler : GenericIpcRequestHandler _repository = repository; protected override async Task Handle(GetRelationsByCharacterId request) { diff --git a/src/services/SaltyEmu.RelationService/Handling/ProcessInvitationHandler.cs b/src/services/SaltyEmu.RelationService/Handling/ProcessInvitationHandler.cs index c02e2c50..ad1f8560 100644 --- a/src/services/SaltyEmu.RelationService/Handling/ProcessInvitationHandler.cs +++ b/src/services/SaltyEmu.RelationService/Handling/ProcessInvitationHandler.cs @@ -3,10 +3,11 @@ using System.Linq; using System.Threading.Tasks; using ChickenAPI.Core.IPC.Protocol; +using ChickenAPI.Core.Logging; using ChickenAPI.Data; using ChickenAPI.Data.Character; +using ChickenAPI.Data.Enums.Game.Relations; using ChickenAPI.Data.Relations; -using ChickenAPI.Enums.Game.Relations; using SaltyEmu.Communication.Utils; using SaltyEmu.FriendsPlugin.Protocol; @@ -18,7 +19,8 @@ public class ProcessInvitationHandler : GenericIpcRequestHandler + public class RemoveRelationsHandler : GenericAsyncRpcRequestHandler { private readonly IRelationDao _relations; - public RemoveRelationsHandler(IRelationDao relations) - { - _relations = relations; - } + public RemoveRelationsHandler(ILogger log, IRelationDao relations) : base(log) => _relations = relations; protected override Task Handle(RemoveRelations request) { diff --git a/src/services/SaltyEmu.RelationService/Handling/SendInvitationHandler.cs b/src/services/SaltyEmu.RelationService/Handling/SendInvitationHandler.cs index ca93b18a..f4ed1952 100644 --- a/src/services/SaltyEmu.RelationService/Handling/SendInvitationHandler.cs +++ b/src/services/SaltyEmu.RelationService/Handling/SendInvitationHandler.cs @@ -8,11 +8,12 @@ namespace SaltyEmu.RelationService.Handling { - public class SendInvitationHandler : GenericIpcPacketHandler + public class SendInvitationHandler : GenericAsyncRpcRequestHandler { private readonly IRelationInvitationDao _invitations; - public SendInvitationHandler(IRelationInvitationDao invitation) => _invitations = invitation; + + public SendInvitationHandler(ILogger log, IRelationInvitationDao invitations) : base(log) => _invitations = invitations; protected override async Task Handle(SendInvitation request) { diff --git a/src/services/SaltyEmu.RelationService/RelationService.cs b/src/services/SaltyEmu.RelationService/RelationService.cs index a70e6159..360df3e8 100644 --- a/src/services/SaltyEmu.RelationService/RelationService.cs +++ b/src/services/SaltyEmu.RelationService/RelationService.cs @@ -11,6 +11,7 @@ using ChickenAPI.Core.Utils; using SaltyEmu.Communication.Configs; using SaltyEmu.Communication.Utils; +using SaltyEmu.Core.Logging; using SaltyEmu.Core.Plugins; using SaltyEmu.Redis; @@ -18,8 +19,10 @@ namespace SaltyEmu.RelationService { internal class RelationService { + private static ILogger Log; + private static readonly IPluginManager PluginManager = new SimplePluginManager(); - private static readonly Logger Log = Logger.GetLogger("RelationService"); + //private static readonly Logger Log = Logger.GetLogger("RelationService"); private static void PrintHeader() { @@ -43,7 +46,7 @@ private static void PrintHeader() private static readonly List Plugins = new List { - new DatabasePlugin.DatabasePlugin(), + new DatabasePlugin.DatabasePlugin(Logger.GetLogger()), }; @@ -79,6 +82,7 @@ private static bool InitializePlugins() private static void InitializeLogger() { + ChickenContainer.Builder.Register(s => new Logger(typeof(RelationService))).As(); Logger.Initialize(); } @@ -97,7 +101,7 @@ private static void RegisterDependencies() ChickenContainer.Builder.Register(s => new MqttClientConfigurationBuilder().ConnectTo("localhost").WithName("relation-service-client")); ChickenContainer.Builder.Register(s => new MqttServerConfigurationBuilder().ConnectTo("localhost").WithName("relation-service-server")); ChickenContainer.Builder.RegisterAssemblyTypes(typeof(RelationService).Assembly).AsClosedTypesOf(typeof(GenericIpcRequestHandler<,>)).PropertiesAutowired(); - ChickenContainer.Builder.RegisterAssemblyTypes(typeof(RelationService).Assembly).AsClosedTypesOf(typeof(GenericIpcPacketHandler<>)).PropertiesAutowired(); + ChickenContainer.Builder.RegisterAssemblyTypes(typeof(RelationService).Assembly).AsClosedTypesOf(typeof(GenericAsyncRpcRequestHandler<>)).PropertiesAutowired(); ChickenContainer.Builder.RegisterAssemblyTypes(typeof(RelationService).Assembly).AsImplementedInterfaces().PropertiesAutowired(); } @@ -115,9 +119,9 @@ private static void Main() CommunicationIocInjector.Inject(); ChickenContainer.Initialize(); EnablePlugins(PluginEnableTime.PostContainerBuild); - var server = ChickenContainer.Instance.Resolve(); + var server = ChickenContainer.Instance.Resolve(); var container = ChickenContainer.Instance.Resolve(); - foreach (Type handlerType in typeof(RelationService).Assembly.GetTypesImplementingGenericClass(typeof(GenericIpcRequestHandler<,>), typeof(GenericIpcPacketHandler<>))) + foreach (Type handlerType in typeof(RelationService).Assembly.GetTypesImplementingGenericClass(typeof(GenericIpcRequestHandler<,>), typeof(GenericAsyncRpcRequestHandler<>))) { try { diff --git a/src/services/SaltyEmu.RelationService/SaltyEmu.RelationService.csproj b/src/services/SaltyEmu.RelationService/SaltyEmu.RelationService.csproj index 06c80e7c..0a7d6d9b 100644 --- a/src/services/SaltyEmu.RelationService/SaltyEmu.RelationService.csproj +++ b/src/services/SaltyEmu.RelationService/SaltyEmu.RelationService.csproj @@ -11,9 +11,7 @@ - - diff --git a/test/ChickenAPI.Game.Test/ChickenAPI.Game.Test.csproj b/test/ChickenAPI.Game.Test/ChickenAPI.Game.Test.csproj deleted file mode 100644 index d939ca79..00000000 --- a/test/ChickenAPI.Game.Test/ChickenAPI.Game.Test.csproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - netcoreapp2.1 - - false - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/ChickenAPI.Game.Test/Inventory/Inventory_Get_Test.cs b/test/ChickenAPI.Game.Test/Inventory/Inventory_Get_Test.cs deleted file mode 100644 index 21ac3260..00000000 --- a/test/ChickenAPI.Game.Test/Inventory/Inventory_Get_Test.cs +++ /dev/null @@ -1,38 +0,0 @@ -using ChickenAPI.Data.Character; -using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Game.Families; -using ChickenAPI.Game.Inventory.Extensions; -using NUnit.Framework; - -namespace ChickenAPI.Game.Test.Inventory -{ - - [TestFixture] - public class Inventory_Get_Test - { - [OneTimeSetUp] - public void Setup() - { - } - - [Test] - public void Inventory_Get_Item_Quantity_By_Id() - { - Assert.Pass("NOT YET FINISHED"); - } - - [Test] - public void Inventory_Can_Add_Item_Inventory_Free() - { - //_player.Inventory.CanAddItem(); - Assert.Pass("NOT YET FINISHED"); - } - - [Test] - public void Inventory_Can_Add_Item_Inventory_Full() - { - - Assert.Pass("Inventory_Can_Add_Item_Inventory_Full"); - } - } -} diff --git a/test/ChickenAPI.Game.Test/Mocks/MapLayerMock.cs b/test/ChickenAPI.Game.Test/Mocks/MapLayerMock.cs deleted file mode 100644 index 234302ed..00000000 --- a/test/ChickenAPI.Game.Test/Mocks/MapLayerMock.cs +++ /dev/null @@ -1,6 +0,0 @@ -using ChickenAPI.Data.Map; -using ChickenAPI.Game.Maps; - -namespace ChickenAPI.Game.Test.Mocks -{ -} \ No newline at end of file diff --git a/test/ChickenAPI.Game.Test/Mocks/SessionMock.cs b/test/ChickenAPI.Game.Test/Mocks/SessionMock.cs deleted file mode 100644 index 6a498ce5..00000000 --- a/test/ChickenAPI.Game.Test/Mocks/SessionMock.cs +++ /dev/null @@ -1,96 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Net; -using System.Threading.Tasks; -using ChickenAPI.Core.i18n; -using ChickenAPI.Data.Account; -using ChickenAPI.Data.Character; -using ChickenAPI.Enums; -using ChickenAPI.Game.Entities.Player; -using ChickenAPI.Game._Network; -using ChickenAPI.Packets; -using Moq; - -namespace ChickenAPI.Game.Test.Mocks -{ - public class SessionMock : ISession - { - private readonly ISession _session; - private readonly List> _packets = new List>(); - - public SessionMock() - { - Mock mock = new Mock(); - mock.Setup(_ => _.Account).Returns(new AccountDto - { - Authority = AuthorityType.User - }); - _session = mock.Object; - } - - public int SessionId => _session.SessionId; - - public long CharacterId => _session.CharacterId; - - public bool IsAuthenticated => _session.IsAuthenticated; - - public IPAddress Ip => _session.Ip; - - public AccountDto Account => _session.Account; - - public IPlayerEntity Player => _session.Player; - - public LanguageKey Language => _session.Language; - - public void InitializeAccount(AccountDto dto) - { - _session.InitializeAccount(dto); - } - - public void InitializeCharacterId(long id) - { - _session.InitializeCharacterId(id); - } - - public void InitializeEntity(IPlayerEntity ett) - { - _session.InitializeEntity(ett); - } - - public void SendPacket(T packet) where T : IPacket - { - _packets.Add(new Tuple(typeof(T), packet)); - _session.SendPacketAsync(packet); - } - - public IReadOnlyList> Packets => _packets; - - public void SendPackets(IEnumerable packets) where T : IPacket - { - foreach (T i in packets) - { - SendPacket(i); - } - } - - public void SendPackets(IEnumerable packets) - { - foreach (IPacket packet in packets) - { - _packets.Add(new Tuple(packet.GetType(), packet)); - _session.SendPacketAsync(packet); - } - } - - public Task SendPacketAsync(T packet) where T : IPacket => throw new NotImplementedException(); - - public Task SendPacketsAsync(IEnumerable packets) where T : IPacket => throw new NotImplementedException(); - - public Task SendPacketsAsync(IEnumerable packets) => throw new NotImplementedException(); - - public void Disconnect() - { - _session.Disconnect(); - } - } -} \ No newline at end of file diff --git a/test/SaltyEmu.RelationService.Tests/RelationInvitationProcessing.cs b/test/SaltyEmu.RelationService.Tests/RelationInvitationProcessing.cs index a74f536e..6f8be862 100644 --- a/test/SaltyEmu.RelationService.Tests/RelationInvitationProcessing.cs +++ b/test/SaltyEmu.RelationService.Tests/RelationInvitationProcessing.cs @@ -4,8 +4,9 @@ using System.Threading.Tasks; using Autofac; using ChickenAPI.Core.IoC; +using ChickenAPI.Data.Enums.Game.Relations; using ChickenAPI.Data.Relations; -using ChickenAPI.Enums.Game.Relations; +using ChickenAPI.Packets.Enumerations; using NUnit.Framework; using SaltyEmu.Communication.Configs; using SaltyEmu.Communication.Utils;