hotfix: movement speed penalty attack speed application

src/Executables/Game/Extensions/ItemExtensions.cs

@@ -27,6 +27,13 @@
     {
         return (uint) item.Values[2];
     }
+
+    public static int GetApplyValue(this ItemData item, EApplyType type)
+    {
+        var apply = item.Applies.FirstOrDefault(x => (EApplyType)x.Type == type);
+
+        return (int)(apply?.Value ?? 0);
+    }
 
     /// <summary>
     /// Weapon damage added additionally to the base damage
@@ -117,7 +124,7 @@
         }
 
         var item = await repository.GetItemAsync(id);
         await cacheManager.Server.Set(key, item);
         return item;
     }
 

src/Executables/Game/PlayerConstants.cs

@@ -3,4 +3,7 @@
 public static class PlayerConstants
 {
     public const int MAX_PLAYERS_PER_ACCOUNT = 4;
+
+    public const byte DEFAULT_ATTACK_SPEED = 95;
+    public const byte DEFAULT_MOVEMENT_SPEED = 150;
 }

src/Executables/Game/World/Entities/Entity.cs

@@ -65,6 +65,7 @@ public bool PositionChanged
         public int StartPositionY { get; private set; }
         public uint MovementDuration { get; private set; }
         public byte MovementSpeed { get; protected set; }
+        public byte AttackSpeed { get; protected set; }
 
         public IReadOnlyCollection<IEntity> NearbyEntities => _nearbyEntities;
         private readonly List<IEntity> _nearbyEntities = new();

src/Executables/Game/World/Entities/PlayerEntity.cs

@@ -88,10 +88,7 @@ public EAntiFlags AntiFlagGender
             }
         }
 
-        private byte _attackSpeed = 140;
         private uint _defence;
-        private byte _minMovespeed = 20;
-        private byte _maxMovespeed = byte.MaxValue;
 
         private const int PersistInterval = 30 * 1000; // 30s
         private int _persistTime = 0;
@@ -141,7 +138,8 @@ public PlayerEntity(PlayerData player, IGameConnection connection, IItemManager
                 _scope.ServiceProvider.GetRequiredService<IOptions<GameOptions>>().Value.Skills
             );
 
-            MovementSpeed = 150;
+            MovementSpeed = PlayerConstants.DEFAULT_MOVEMENT_SPEED;
+            AttackSpeed = PlayerConstants.DEFAULT_ATTACK_SPEED;
             EntityClass = player.PlayerClass;
 
             Groups = new List<Guid>();
@@ -183,6 +181,7 @@ public async Task Load()
 
             CalculateDefence();
             CalculateMovement();
+            CalculateAttackSpeed();
         }
 
         public async Task ReloadPermissions()
@@ -274,7 +273,7 @@ private void CalculateDefence()
 
         private void CalculateMovement()
         {
-            MovementSpeed = 150;
+            MovementSpeed = PlayerConstants.DEFAULT_MOVEMENT_SPEED;
             float modifier = 0;
             foreach (var slot in Enum.GetValues<EquipmentSlots>())
             {
@@ -283,14 +282,28 @@ private void CalculateMovement()
                 var proto = _itemManager.GetItem(item.ItemId);
                 if (proto?.Type != (byte)EItemType.Armor) continue;
 
-                var moveSpeedFromItem = proto.Applies.FirstOrDefault(apply => apply.Type == (byte)EApplyType.MovSpeed);
-                if (moveSpeedFromItem is null) continue;
-                modifier += (byte)proto.Applies[0].Value;
+                modifier += proto.GetApplyValue(EApplyType.MovSpeed);
             }
+            var calculatedSpeed = MovementSpeed * (1 + modifier / 100);
 
-            MovementSpeed = (byte) Math.Clamp((MovementSpeed * (1+(modifier/100))), _minMovespeed, _maxMovespeed);
+            MovementSpeed = (byte) Math.Min(calculatedSpeed, byte.MaxValue);
             _logger.LogDebug("Calculate Movement value for {Name}, result: {MovementSpeed}", Name, MovementSpeed);
+        }
 
+        private void CalculateAttackSpeed()
+        {
+            AttackSpeed = PlayerConstants.DEFAULT_ATTACK_SPEED;
+            float modifier = 0;
+            foreach (var slot in Enum.GetValues<EquipmentSlots>())
+            {
+                var item = Inventory.EquipmentWindow.GetItem(slot);
+                if (item == null) continue;
+                var proto = _itemManager.GetItem(item.ItemId);
+                if (proto == null) continue;
+
+                modifier += proto.GetApplyValue(EApplyType.AttackSpeed);
+            }
+            AttackSpeed = (byte) Math.Min(AttackSpeed * (1 + modifier / 100), byte.MaxValue);
         }
 
         public override void Die()
@@ -715,9 +728,9 @@ public override uint GetPoint(EPoints point)
                 case EPoints.Iq:
                     return Player.Iq;
                 case EPoints.AttackSpeed:
-                    return _attackSpeed;
+                    return AttackSpeed;
                 case EPoints.MoveSpeed:
-                    return this.MovementSpeed;
+                    return MovementSpeed;
                 case EPoints.Gold:
                     return Player.Gold;
                 case EPoints.MinWeaponDamage:
@@ -1043,6 +1056,7 @@ public void RemoveItem(ItemInstance item)
                         Inventory.EquipmentWindow.RemoveItem(item);
                         CalculateDefence();
                         CalculateMovement();
+                        CalculateAttackSpeed();
                         SendCharacterUpdate();
                         SendPoints();
                     }
@@ -1070,6 +1084,7 @@ public void SetItem(ItemInstance item, byte window, ushort position)
                             item.Set(_cacheManager, Player.Id, window, position, _itemRepository).Wait(); // TODO
                             CalculateDefence();
                             CalculateMovement();
+                            CalculateAttackSpeed();
                             SendCharacterUpdate();
                             SendPoints();
                         }
@@ -1170,7 +1185,7 @@ public void SendCharacter(IConnection connection)
                 PositionY = PositionY,
                 Class = Player.PlayerClass,
                 MoveSpeed = MovementSpeed,
-                AttackSpeed = _attackSpeed
+                AttackSpeed = AttackSpeed
             });
         }
 
@@ -1204,7 +1219,7 @@ public void SendCharacterUpdate()
                     (ushort) (Inventory.EquipmentWindow.Hair?.ItemId ?? 0)
                 },
                 MoveSpeed = MovementSpeed,
-                AttackSpeed = _attackSpeed
+                AttackSpeed = AttackSpeed,
             };
 
             Connection.Send(packet);