Code cleanup (#628)

data/extensions/Players/Loaders/GodLoader.cs

@@ -35,10 +35,10 @@ public override IPlayer Load(PlayerEntity playerEntity)
         if (Guard.IsNull(playerEntity)) return null;
 
         var town = GetTown(playerEntity);
-        
+
         var playerLocation =
             new Location((ushort)playerEntity.PosX, (ushort)playerEntity.PosY, (byte)playerEntity.PosZ);
-        
+
         var currentTile = GetCurrentTile(playerLocation);
 
         var newPlayer = new God(
@@ -66,7 +66,7 @@ public override IPlayer Load(PlayerEntity playerEntity)
             Guild = GuildStore.Get((ushort)(playerEntity.GuildMember?.GuildId ?? 0)),
             GuildLevel = (ushort)(playerEntity.GuildMember?.RankId ?? 0)
         };
-        
+
         newPlayer.SetCurrentTile(currentTile);
         newPlayer.AddInventory(ConvertToInventory(newPlayer, playerEntity));
         var god = CreatureFactory.CreatePlayer(newPlayer);

data/extensions/Players/Loaders/TutorLoader.cs

@@ -37,7 +37,7 @@ public override IPlayer Load(PlayerEntity playerEntity)
         var town = GetTown(playerEntity);
         var playerLocation =
             new Location((ushort)playerEntity.PosX, (ushort)playerEntity.PosY, (byte)playerEntity.PosZ);
-        
+
         var currentTile = GetCurrentTile(playerLocation);
         var newPlayer = new Tutor(
             (uint)playerEntity.Id,

data/extensions/Spells/Support/Knight/BloodRage.cs

@@ -17,12 +17,12 @@ public override bool OnCast(ICombatActor actor, string words, out InvalidOperati
         error = InvalidOperation.None;
 
         if (actor is not IPlayer player) return false;
-        
+
         player.AddSkillBonus(SkillType.Axe, (sbyte)Math.Abs(player.Skills[SkillType.Axe].Level * 0.35));
         player.AddSkillBonus(SkillType.Sword, (sbyte)Math.Abs(player.Skills[SkillType.Axe].Level * 0.35));
         player.AddSkillBonus(SkillType.Club, (sbyte)Math.Abs(player.Skills[SkillType.Axe].Level * 0.35));
         player.AddSkillBonus(SkillType.Fist, (sbyte)Math.Abs(player.Skills[SkillType.Axe].Level * 0.35));
-        
+
         actor.DisableShieldDefense();
         actor.IncreaseDamageReceived(15);
         return true;
@@ -31,12 +31,12 @@ public override bool OnCast(ICombatActor actor, string words, out InvalidOperati
     public override void OnEnd(ICombatActor actor)
     {
         if (actor is not IPlayer player) return;
-        
+
         player.RemoveSkillBonus(SkillType.Axe, (sbyte)Math.Abs(player.Skills[SkillType.Axe].Level * 0.35));
         player.RemoveSkillBonus(SkillType.Sword, (sbyte)Math.Abs(player.Skills[SkillType.Axe].Level * 0.35));
         player.RemoveSkillBonus(SkillType.Club, (sbyte)Math.Abs(player.Skills[SkillType.Axe].Level * 0.35));
         player.RemoveSkillBonus(SkillType.Fist, (sbyte)Math.Abs(player.Skills[SkillType.Axe].Level * 0.35));
-        
+
         actor.EnableShieldDefense();
         actor.DecreaseDamageReceived(15);
 

src/ApplicationServer/NeoServer.Server.Commands/Player/PlayerLogInCommand.cs

@@ -2,11 +2,8 @@
 using System.Linq;
 using NeoServer.Data.Entities;
 using NeoServer.Game.Common;
-using NeoServer.Game.Common.Contracts.World.Tiles;
 using NeoServer.Game.Common.Location.Structs;
 using NeoServer.Game.Common.Results;
-using NeoServer.Game.Creatures;
-using NeoServer.Game.World;
 using NeoServer.Loaders.Guilds;
 using NeoServer.Loaders.Interfaces;
 using NeoServer.Server.Common.Contracts;
@@ -20,9 +17,9 @@ namespace NeoServer.Server.Commands.Player;
 public class PlayerLogInCommand : ICommand
 {
     private readonly ILogger _logger;
+    private readonly PlayerLocationResolver _playerLocationResolver;
     private readonly IGameServer game;
     private readonly GuildLoader guildLoader;
-    private readonly PlayerLocationResolver _playerLocationResolver;
     private readonly IEnumerable<IPlayerLoader> playerLoaders;
 
     public PlayerLogInCommand(IGameServer game, IEnumerable<IPlayerLoader> playerLoaders, GuildLoader guildLoader,
@@ -41,7 +38,7 @@ public Result Execute(PlayerEntity playerRecord, IConnection connection)
         if (playerRecord is null)
             //todo validations here
             return Result.Fail(InvalidOperation.PlayerNotFound);
-      
+
         if (!game.CreatureManager.TryGetLoggedPlayer((uint)playerRecord.Id, out var player))
         {
             if (playerLoaders.FirstOrDefault(x => x.IsApplicable(playerRecord)) is not { } playerLoader)
@@ -51,11 +48,11 @@ public Result Execute(PlayerEntity playerRecord, IConnection connection)
 
             var playerLocation = _playerLocationResolver.GetPlayerLocation(playerRecord);
             if (playerLocation == Location.Zero) return Result.Fail(InvalidOperation.PlayerLocationInvalid);
-            
+
             playerRecord.PosX = playerLocation.X;
             playerRecord.PosY = playerLocation.Y;
             playerRecord.PosZ = playerLocation.Z;
-            
+
             player = playerLoader.Load(playerRecord);
         }
 
@@ -64,7 +61,7 @@ public Result Execute(PlayerEntity playerRecord, IConnection connection)
         player.Login();
         player.Vip.LoadVipList(playerRecord.Account.VipList.Select(x => ((uint)x.PlayerId, x.Player?.Name)));
         _logger.Information("Player {PlayerName} logged in", player.Name);
-        
+
         return Result.Success;
     }
 }

src/ApplicationServer/NeoServer.Server.Events/Player/PlayerConditionChangedEventHandler.cs

@@ -20,10 +20,7 @@ public void Execute(ICreature creature, ICondition c)
         if (!game.CreatureManager.GetPlayerConnection(creature.CreatureId, out var connection)) return;
 
         ushort icons = 0;
-        foreach (var condition in player.Conditions)
-        {
-            icons |= (ushort)ConditionIconParser.Parse(condition.Key);
-        }
+        foreach (var condition in player.Conditions) icons |= (ushort)ConditionIconParser.Parse(condition.Key);
 
         connection.OutgoingPackets.Enqueue(new ConditionIconPacket(icons));
         connection.Send();

src/ApplicationServer/NeoServer.Server/Services/PlayerLocationResolver.cs

@@ -21,23 +21,21 @@ public Location GetPlayerLocation(PlayerEntity playerEntity)
             : null;
 
         if (playerTile is not null) return location;
-        
+
         foreach (var neighbour in location.Neighbours)
         {
             world.TryGetTile(ref location, out var neighbourTile);
             if (neighbourTile is IDynamicTile && PlayerEnterTileRule.Rule.CanEnter(neighbourTile, neighbour))
-            {
                 return location;
-            }
         }
 
         var town = GetTown(playerEntity);
         if (town is null) return Location.Zero;
-        
+
         var townLocation = town.Coordinate.Location;
 
         playerTile = world.TryGetTile(ref townLocation, out var townTile) && townTile is IDynamicTile townDynamicTile &&
-                     PlayerEnterTileRule.Rule.CanEnter(townDynamicTile, townLocation) 
+                     PlayerEnterTileRule.Rule.CanEnter(townDynamicTile, townLocation)
             ? townDynamicTile
             : null;
 

src/ApplicationServer/NeoServer.Server/Tasks/Dispatcher.cs

@@ -42,7 +42,7 @@ public void Start(CancellationToken token)
         Task.Run(async () =>
         {
             while (await _reader.WaitToReadAsync(token))
-            
+
             {
                 if (token.IsCancellationRequested) _writer.Complete();
                 // Fast loop around available jobs

src/Database/NeoServer.Data/Entities/WorldEntity.cs

@@ -6,4 +6,4 @@ public class WorldEntity
     public string Name { get; set; }
     public string Ip { get; set; }
     public int Port { get; set; }
-}
+}

src/Database/NeoServer.Data/Seeds/WorldModelSeed.cs

@@ -1,6 +1,6 @@
-using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using System;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using NeoServer.Data.Entities;
-using System;
 
 namespace NeoServer.Data.Seeds;
 

src/GameWorldSimulator/NeoServer.Game.Combat/Spells/Spell.cs

@@ -23,25 +23,25 @@ public abstract class BaseSpell : ISpell
     public bool InvokeOn(ICombatActor actor, ICombatActor onCreature, string words, out InvalidOperation error)
     {
         if (!CanBeUsedBy(actor, out error)) return false;
-       
+
         if (!onCreature.HasCondition(ConditionType))
             if (!OnCast(onCreature, words, out error))
                 return false;
 
         AddCondition(onCreature);
 
         if (actor is IPlayer) AddCooldown(actor);
-        
+
         OnSpellInvoked?.Invoke(onCreature, this);
         if (actor is IPlayer player) player.ConsumeMana(Mana);
-        
+
         return true;
     }
 
     public bool Invoke(ICombatActor actor, string words, out InvalidOperation error)
     {
         if (!CanBeUsedBy(actor, out error)) return false;
-        
+
         if (!actor.HasCondition(ConditionType))
             if (!OnCast(actor, words, out error))
                 return false;

src/GameWorldSimulator/NeoServer.Game.Common/Contracts/World/Tiles/ITile.cs

@@ -25,6 +25,7 @@ public bool IsNextTo(ITile dest)
     bool TryGetStackPositionOfThing(IPlayer player, IThing thing, out byte stackPosition);
     byte GetCreatureStackPositionIndex(IPlayer observer);
     bool HasFlag(TileFlags flag);
+
     public bool CanEnter(ICreature creature)
     {
         if (creature is not IWalkableCreature walkableCreature) return false;

src/GameWorldSimulator/NeoServer.Game.Common/Creatures/CooldownType.cs

@@ -25,5 +25,5 @@ public enum CooldownType
     Advertise,
     WalkAround,
     UseItem,
-    SupportSpell,
+    SupportSpell
 }

src/GameWorldSimulator/NeoServer.Game.Creatures/CreatureEnterTileRule.cs

@@ -34,6 +34,7 @@ public virtual bool CanEnter(ITile tile, ICreature creature)
             !dynamicTile.HasFlag(TileFlags.Unpassable),
             dynamicTile.Ground is not null);
     }
+
     public virtual bool CanEnter(ITile tile, Location location)
     {
         if (tile is not IDynamicTile dynamicTile) return false;
@@ -73,6 +74,7 @@ public override bool CanEnter(ITile tile, ICreature creature)
             !dynamicTile.HasFlag(TileFlags.Unpassable),
             dynamicTile.Ground is not null);
     }
+
     public override bool CanEnter(ITile tile, Location location)
     {
         if (tile is not IDynamicTile dynamicTile) return false;

src/GameWorldSimulator/NeoServer.Game.Creatures/Events/CreatureTeleportedEventHandler.cs

@@ -21,11 +21,9 @@ public void Execute(IWalkableCreature creature, Location location)
         if (creature.Location == location) return;
 
         var destination = location;
-        
+
         if (map[location] is not IDynamicTile { FloorDirection: FloorChangeDirection.None } tile)
-        {
             tile = FindNeighbourTile(creature, location);
-        }
 
         if (destination == Location.Zero) return;
         if (tile is null || !creature.TileEnterRule.CanEnter(tile, creature)) return;
@@ -36,12 +34,8 @@ public void Execute(IWalkableCreature creature, Location location)
     private IDynamicTile FindNeighbourTile(IWalkableCreature creature, Location location)
     {
         foreach (var neighbour in location.Neighbours)
-        {
             if (map[neighbour] is IDynamicTile toTile)
-            {
                 return toTile;
-            }
-        }
 
         return null;
     }

src/GameWorldSimulator/NeoServer.Game.Creatures/Models/Bases/CombatActor.cs

@@ -34,11 +34,12 @@ protected CombatActor(ICreatureType type, IMapTool mapTool, IOutfit outfit = nul
     {
     }
 
-    public abstract int DefendUsingShield(int attack);
-    public abstract int DefendUsingArmor(int attack);
     public bool IsShieldDefenseEnabled { get; private set; } = true;
     public byte DamageReceivedPercentage { get; private set; }
 
+    public abstract int DefendUsingShield(int attack);
+    public abstract int DefendUsingArmor(int attack);
+
     public void AddCondition(ICondition condition)
     {
         var result = Conditions.TryAdd(condition.Type, condition);
@@ -348,6 +349,26 @@ public Result Attack(ICombatActor enemy, ICombatAttack attack, CombatAttackValue
         return Result.Success;
     }
 
+    public void DisableShieldDefense()
+    {
+        IsShieldDefenseEnabled = false;
+    }
+
+    public void EnableShieldDefense()
+    {
+        IsShieldDefenseEnabled = true;
+    }
+
+    public void IncreaseDamageReceived(byte percentage)
+    {
+        DamageReceivedPercentage += percentage;
+    }
+
+    public void DecreaseDamageReceived(byte percentage)
+    {
+        DamageReceivedPercentage -= percentage;
+    }
+
     public abstract bool HasImmunity(Immunity immunity);
 
     public virtual bool CanBlock(DamageType damage)
@@ -437,18 +458,6 @@ protected void InvokeAttackCanceled()
     {
         OnAttackCanceled?.Invoke(this);
     }
-
-    public void DisableShieldDefense() => IsShieldDefenseEnabled = false;
-    public void EnableShieldDefense() => IsShieldDefenseEnabled = true;
-    public void IncreaseDamageReceived(byte percentage)
-    {
-        DamageReceivedPercentage += percentage;
-    }
-
-    public void DecreaseDamageReceived(byte percentage)
-    {
-        DamageReceivedPercentage -= percentage;
-    }
 
     #region Events
 

src/GameWorldSimulator/NeoServer.Game.Creatures/Player/Player.cs

@@ -253,6 +253,7 @@ public ushort GetRawSkillLevel(SkillType skillType)
         var skillLevel = hasSkill ? skill.Level : 1;
         return (ushort)Math.Max(0, skillLevel);
     }
+
     public ushort GetSkillLevel(SkillType skillType)
     {
         var hasSkill = Skills.TryGetValue(skillType, out var skill);
@@ -415,7 +416,7 @@ public void ChangeSecureMode(byte mode)
     public override int DefendUsingShield(int attack)
     {
         if (!IsShieldDefenseEnabled) return attack;
-        
+
         var defense = Inventory.TotalDefense * Skills[SkillType.Shielding].Level *
             (DefenseFactor / 100d) - attack / 100d * ArmorRating * (Vocation.Formula?.Defense ?? 1f);
 

src/GameWorldSimulator/NeoServer.Game.Creatures/Player/Skill.cs

@@ -35,8 +35,15 @@ public Skill(SkillType type, ushort level = 0, double count = 0)
 
     public sbyte Bonus { get; private set; }
 
-    public void AddBonus(sbyte increase) => Bonus = (sbyte)(Bonus + increase);
-    public void RemoveBonus(sbyte decrease) => Bonus = (sbyte)(Bonus - decrease);
+    public void AddBonus(sbyte increase)
+    {
+        Bonus = (sbyte)(Bonus + increase);
+    }
+
+    public void RemoveBonus(sbyte decrease)
+    {
+        Bonus = (sbyte)(Bonus - decrease);
+    }
 
     public SkillType Type { get; }
     public ushort Level { get; private set; }

src/GameWorldSimulator/NeoServer.Game.World/Map/Map.cs

@@ -358,7 +358,7 @@ public void PlaceCreature(ICreature creature)
     {
         if (this[creature.Location] is not IDynamicTile tile) return;
 
-        if(!tile.CanEnter(creature)) return;
+        if (!tile.CanEnter(creature)) return;
 
         if (tile.HasCreature)
             foreach (var location in tile.Location.Neighbours)

src/GameWorldSimulator/NeoServer.Game.World/Models/Tiles/BaseTile.cs

@@ -30,6 +30,7 @@ public bool HasFlag(TileFlags flag)
     {
         return ((uint)flag & Flags) != 0;
     }
+
     public bool BlockMissile => HasFlag(TileFlags.BlockMissile);
 
     public Location Location { get; private set; }

src/GameWorldSimulator/NeoServer.Game.World/Models/Tiles/DynamicTile.cs

@@ -597,7 +597,7 @@ private void SetGround(IGround ground)
 
         TileOperationEvent.OnChanged(this, ground, operations);
     }
-    
+
     public Result<OperationResultList<ICreature>> AddCreature(ICreature creature)
     {
         if (creature is not IWalkableCreature walkableCreature)

src/Loaders/NeoServer.Loaders/Interfaces/IPlayerLoader.cs

@@ -1,6 +1,5 @@
 using NeoServer.Data.Entities;
 using NeoServer.Game.Common.Contracts.Creatures;
-using NeoServer.Game.Common.Results;
 
 namespace NeoServer.Loaders.Interfaces;