feat(game): legacy commands for stats

src/CorePluginAPI/Core/Models/IPlayer.cs

@@ -7,7 +7,7 @@ public class PlayerData
     public uint Id { get; set; }
     public Guid AccountId { get; set; }
     public string Name { get; set; } = "";
-    public byte PlayerClass { get; set; }
+    public EPlayerClassGendered PlayerClass { get; set; }
     public byte SkillGroup { get; set; }
     public ulong PlayTime { get; set; }
     public byte Level { get; set; } = 1;

src/CorePluginAPI/EPlayerClass.cs

@@ -1,6 +1,6 @@
 namespace QuantumCore.API;
 
-public enum EPlayerClass
+public enum EPlayerClass : byte
 {
     Warrior = 0,
     Ninja = 1,

src/CorePluginAPI/EPlayerClassGendered.cs

@@ -0,0 +1,13 @@
+namespace QuantumCore.API;
+
+public enum EPlayerClassGendered : byte
+{
+    WarriorMale = 0,
+    NinjaFemale = 1,
+    SuraMale = 2,
+    ShamanFemale = 3,
+    WarriorFemale = 4,
+    NinjaMale = 5,
+    SuraFemale = 6,
+    ShamanMale = 7,
+}

src/CorePluginAPI/EPlayerJob.cs

@@ -0,0 +1,19 @@
+namespace QuantumCore.API;
+
+public enum EPlayerJob : byte
+{
+    WarriorBody = 0,
+    NinjaDagger = 1,
+    SuraWeapons = 2,
+    ShamanDragon = 3,
+    WarriorMind = 4,
+    NinjaBow = 5,
+    SuraMagic = 6,
+    ShamanLightning = 7
+}
+
+public enum EPlayerGender : byte
+{
+    Male = 0,
+    Female = 1
+}

src/CorePluginAPI/EquipmentSlots.cs

@@ -1,6 +1,6 @@
 namespace QuantumCore.API;
 
-public enum EquipmentSlots
+public enum EquipmentSlots : byte
 {
     Body = 0,
     Head = 1,
@@ -11,6 +11,8 @@ public enum EquipmentSlots
     Earring = 6,
     Unique1 = 7,
     Unique2 = 8,
+    Arrow = 9,
+    Shield = 10,
     Costume = 19,
     Hair = 20
 }

src/CorePluginAPI/Extensions/PlayerExtensions.cs

@@ -0,0 +1,36 @@
+namespace QuantumCore.API.Extensions;
+
+public static class PlayerExtensions
+{
+    public static EPlayerClass GetClass(this EPlayerClassGendered playerClass)
+    {
+        return playerClass switch
+        {
+            EPlayerClassGendered.WarriorMale => EPlayerClass.Warrior,
+            EPlayerClassGendered.NinjaFemale => EPlayerClass.Ninja,
+            EPlayerClassGendered.SuraMale => EPlayerClass.Sura,
+            EPlayerClassGendered.ShamanFemale => EPlayerClass.Shaman,
+            EPlayerClassGendered.WarriorFemale => EPlayerClass.Warrior,
+            EPlayerClassGendered.NinjaMale => EPlayerClass.Ninja,
+            EPlayerClassGendered.SuraFemale => EPlayerClass.Sura,
+            EPlayerClassGendered.ShamanMale => EPlayerClass.Shaman,
+            _ => throw new ArgumentOutOfRangeException(nameof(playerClass), playerClass, null)
+        };
+    }
+
+    public static EPlayerGender GetGender(this EPlayerClassGendered playerClass)
+    {
+        return playerClass switch
+        {
+            EPlayerClassGendered.WarriorMale => EPlayerGender.Male,
+            EPlayerClassGendered.NinjaFemale => EPlayerGender.Female,
+            EPlayerClassGendered.SuraMale => EPlayerGender.Male,
+            EPlayerClassGendered.ShamanFemale => EPlayerGender.Female,
+            EPlayerClassGendered.WarriorFemale => EPlayerGender.Female,
+            EPlayerClassGendered.NinjaMale => EPlayerGender.Male,
+            EPlayerClassGendered.SuraFemale => EPlayerGender.Female,
+            EPlayerClassGendered.ShamanMale => EPlayerGender.Male,
+            _ => throw new ArgumentOutOfRangeException(nameof(playerClass), playerClass, null)
+        };
+    }
+}

src/CorePluginAPI/Game/Guild/GuildMemberData.cs

@@ -5,8 +5,8 @@ public class GuildMemberData
     public uint Id { get; set; }
     public string Name { get; set; } = "";
     public byte Level { get; set; }
-    public byte Class { get; set; }
+    public EPlayerClassGendered Class { get; set; }
     public bool IsLeader { get; set; }
     public byte Rank { get; set; }
     public uint SpentExperience { get; set; }
-}
+}

src/CorePluginAPI/Game/Skills/IPlayerSkills.cs

@@ -4,17 +4,22 @@ public interface IPlayerSkills
 {
     Task LoadAsync();
     Task PersistAsync();
-    
+
     ISKill? this[ESkillIndexes skillId] { get; }
-    
+
     void SetSkillGroup(byte skillGroup);
     void ClearSkills();
     void ClearSubSkills();
     void Reset(ESkillIndexes skillId);
     void SetLevel(ESkillIndexes skillId, byte level);
     void SkillUp(ESkillIndexes skillId, ESkillLevelMethod method = ESkillLevelMethod.Point);
     bool CanUse(ESkillIndexes skillId);
-    void SendAsync();
+
+    /// <summary>
+    /// Send skill info to client
+    /// </summary>
+    void Send();
+
     bool LearnSkillByBook(ESkillIndexes skillId);
     void SetSkillNextReadTime(ESkillIndexes skillId, int time);
 }

src/CorePluginAPI/Game/Types/EPoints.cs

@@ -19,6 +19,8 @@ public enum EPoints
         AttackGrade = 18,
         MoveSpeed = 19,
         Defence = 20,
+        MagicAttackGrade = 22,
+        MagicDefenceGrade = 23,
         StatusPoints = 26,
         SubSkill = 27,
         Skill = 28,
@@ -27,17 +29,58 @@ public enum EPoints
         PlayTime = 31,
         CriticalPercentage = 40,
         PenetratePercentage = 41,
-
+        AttackBonusHuman = 43,
+        AttackBonusAnimal = 44,
+        AttackBonusOrc = 45,
+        AttackBonusEsoterics = 46,
+        AttackBonusUndead = 47,
+        AttackBonusDevil = 48,
+        AttackBonusInsect = 49,
+        AttackBonusFire = 50,
+        AttackBonusIce = 51,
+        AttackBonusDesert = 52,
+        AttackBonusMonster = 53,
+        AttackBonusWarrior = 54,
+        AttackBonusAssassin = 55,
+        AttackBonusSura = 56,
+        AttackBonusShaman = 57,
+        AttackBonusTree = 58,
+        ResistWarrior = 59,
+        ResistAssassin = 60,
+        ResistSura = 61,
+        ResistShaman = 62,
+        Block = 67,
+        Dodge = 68,
+        ResistSword = 69,
+        ResistTwoHanded = 70,
+        ResistDagger = 71,
+        ResistBell = 72,
+        ResistFan = 73,
+        ResistBow = 74,
+        ResistFire = 75,
+        ResistElectric = 76,
+        ResistMagic = 77,
+        ResistWind = 78,
         ItemDropBonus = 85,
-        
+
         AttackBonus = 93,
         DefenceBonus = 94,
-        
+
         HorseSkill = 113,
-
+
+        MallAttBonus = 114,
+        MallDefBonus = 115,
+        MallExpBonus = 116,
         MallItemBonus = 117,
-
+        MallGoldBonus = 118,
+        SkillDamageBonus = 121,
+        NormalHitDamageBonus = 122,
+        SkillDefendBonus = 123,
+        NormalHitDefendBonus = 124,
         MagicAttackBonus = 132,
+        ResistIce = 133,
+        ResistEarth = 134,
+        ResistDark = 135,
         ResistCritical = 136,
         ResistPenetrate = 137,
         MinWeaponDamage = 200,

src/CorePluginAPI/Game/World/IEntity.cs

@@ -62,6 +62,8 @@ public interface IEntity
         public void ShowEntity(IConnection connection);
         public void HideEntity(IConnection connection);
         IReadOnlyCollection<IEntity> NearbyEntities { get; }
+        byte MovementSpeed { get; set; }
+        byte AttackSpeed { get; set; }
 
         public uint GetPoint(EPoints point);
         public int GetMinDamage();

src/CorePluginAPI/Game/World/IPlayerEntity.cs

@@ -60,5 +60,6 @@ public interface IPlayerEntity : IEntity
         int GetPremiumRemainSeconds(EPremiumTypes type);
         bool IsUsableSkillMotion(int motion);
         Task RefreshGuildAsync();
+        void RecalculateStatusPoints();
     }
 }

src/CorePluginAPI/Game/World/IWorld.cs

@@ -14,6 +14,7 @@ public interface IWorld : ILoadable
         CoreHost GetMapHost(int x, int y);
 #nullable enable
         SpawnGroup? GetGroup(uint id);
+        SpawnGroup GetRandomGroup();
         SpawnGroupCollection? GetGroupCollection(uint id);
 #nullable restore
         void SpawnEntity(IEntity e);
@@ -36,4 +37,4 @@ public interface IWorld : ILoadable
         IList<IPlayerEntity> GetPlayers();
         IPlayerEntity? GetPlayerById(uint playerId);
     }
-}
+}

src/CorePluginAPI/IJobManager.cs

@@ -2,6 +2,5 @@
 
 public interface IJobManager
 {
-    byte GetJobFromClass(byte playerClass);
-    Job? Get(byte playerClass);
-}
+    Job? Get(EPlayerClassGendered playerClass);
+}

src/Data/Game.Persistence/DbPlayerRepository.cs

@@ -36,7 +36,7 @@ public async Task CreateAsync(PlayerData player)
             Id = player.Id,
             AccountId = player.AccountId,
             Name = player.Name,
-            PlayerClass = player.PlayerClass,
+            PlayerClass = (byte)player.PlayerClass,
             SkillGroup = player.SkillGroup,
             PlayTime = player.PlayTime,
             Level = player.Level,
@@ -83,7 +83,7 @@ public async Task SetPlayerAsync(PlayerData data)
         if (entity is null) return;
 
         entity.Empire = data.Empire;
-        entity.PlayerClass = data.PlayerClass;
+        entity.PlayerClass = (byte)data.PlayerClass;
         entity.SkillGroup = data.SkillGroup;
         entity.PlayTime = data.PlayTime;
         entity.Level = data.Level;

src/Data/Game.Persistence/Extensions/QueryExtensions.cs

@@ -1,4 +1,5 @@
 using System.Collections.Immutable;
+using QuantumCore.API;
 using QuantumCore.API.Core.Models;
 using QuantumCore.API.Game.Guild;
 using QuantumCore.API.Game.Skills;
@@ -16,7 +17,7 @@ public static IQueryable<PlayerData> SelectPlayerData(this IQueryable<Player> qu
             Id = x.Id,
             AccountId = x.AccountId,
             Name = x.Name,
-            PlayerClass = x.PlayerClass,
+            PlayerClass = (EPlayerClassGendered)x.PlayerClass,
             SkillGroup = x.SkillGroup,
             PlayTime = x.PlayTime,
             Level = x.Level,
@@ -46,7 +47,7 @@ public static IQueryable<Skill> SelectPlayerSkill(this IQueryable<PlayerSkill> q
         return query.Select(x => new Skill
         {
             PlayerId = x.PlayerId,
-            SkillId = (ESkillIndexes) x.SkillId,
+            SkillId = (ESkillIndexes)x.SkillId,
             MasterType = x.MasterType,
             Level = x.Level,
             NextReadTime = x.NextReadTime,
@@ -70,16 +71,14 @@ public static IQueryable<GuildData> SelectData(this IQueryable<Guild> query)
                 Id = member.Player.Id,
                 Name = member.Player.Name,
                 Level = member.Player.Level,
-                Class = member.Player.PlayerClass,
+                Class = (EPlayerClassGendered)member.Player.PlayerClass,
                 SpentExperience = member.SpentExperience,
                 Rank = member.RankPosition,
                 IsLeader = member.IsLeader
             }).ToImmutableArray(),
             Ranks = x.Ranks.Select(rank => new GuildRankData
             {
-                Position = rank.Position,
-                Name = rank.Name,
-                Permissions = rank.Permissions
+                Position = rank.Position, Name = rank.Name, Permissions = rank.Permissions
             }).ToImmutableArray()
         });
     }
@@ -96,4 +95,4 @@ public static IQueryable<ItemInstance> SelectInstance(this IQueryable<Item> quer
             Count = x.Count
         });
     }
-}
+}

src/Game.Benchmarks/Benchmarks/WorldUpdateBenchmark.cs

@@ -97,7 +97,7 @@ public void GlobalSetup()
             .Replace(new ServiceDescriptor(typeof(IJobManager), _ =>
             {
                 var mock = Substitute.For<IJobManager>();
-                mock.Get(1).Returns(new Job());
+                mock.Get(EPlayerClassGendered.NinjaFemale).Returns(new Job());
                 return mock;
             }, ServiceLifetime.Singleton))
             .Replace(new ServiceDescriptor(typeof(IMonsterManager), _ =>
@@ -113,7 +113,10 @@ public void GlobalSetup()
 
         foreach (var i in Enumerable.Range(0, PlayerAmount))
         {
-            var player = new PlayerData {Name = i.ToString(), PlayerClass = 1, PositionX = 1, PositionY = 1};
+            var player = new PlayerData
+            {
+                Name = i.ToString(), PlayerClass = EPlayerClassGendered.NinjaFemale, PositionX = 1, PositionY = 1
+            };
             var conn = Substitute.For<IGameConnection>();
             var entity = ActivatorUtilities.CreateInstance<PlayerEntity>(services, _world, player, conn);
             _world.SpawnEntity(entity);

src/Libraries/Game.Commands/CommandManager.cs

@@ -1,6 +1,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using CommandLine;
+using CommandLine.Text;
 using Microsoft.CodeAnalysis;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -225,8 +226,31 @@ public async Task Handle(IGameConnection connection, string chatline)
                         }
                         else
                         {
-                            connection.Player.SendChatInfo(
-                                $"Comannd validation failed: {string.Join(", ", errors.Select(x => x.GetType().Name))}");
+                            Func<HelpText, HelpText> helpTextFunc = h =>
+                            {
+                                h.Copyright = "";
+                                h.AutoVersion = false;
+                                h.AutoHelp = false;
+                                h.Heading = "";
+                                return h;
+                            };
+                            Func<Example, Example> exampleFunc = example => example;
+                            var verbsIndex = false;
+                            var maxDisplayWidth = 80;
+                            var helpTextMethod = typeof(HelpText)
+                                .GetMethods(BindingFlags.Static | BindingFlags.Public)
+                                .First(x => x.Name == nameof(HelpText.AutoBuild) && x.GetParameters().Length == 5)!
+                                .MakeGenericMethod(commandCache.OptionsType);
+                            var help = (HelpText)helpTextMethod.Invoke(null,
+                                [parserResult, helpTextFunc, exampleFunc, verbsIndex, maxDisplayWidth])!;
+                            var messages = help.ToString().Split(Environment.NewLine)
+                                .Where(x => !string.IsNullOrWhiteSpace(x));
+                            connection.Player.SendChatInfo("Comannd validation failed:");
+                            foreach (var message in messages)
+                            {
+                                connection.Player.SendChatInfo(message);
+                            }
+
                             return;
                         }
                     }