Add handling for sit/stand from chairs

ethanmoffat · Jan 27, 2021 · e5b8084 · e5b8084
1 parent 33f01f7
commit e5b8084
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 8 deletions.
diff --git a/EOLib/Domain/Character/CharacterActions.cs b/EOLib/Domain/Character/CharacterActions.cs
@@ -54,13 +54,18 @@ public void Attack()
             _packetSendService.SendPacket(packet);
         }
 
-        public void Sit()
+        public void ToggleSit()
         {
-            var sitAction = _characterProvider.MainCharacter.RenderProperties.SitState == SitState.Standing
+            var renderProperties = _characterProvider.MainCharacter.RenderProperties;
+            var sitAction = renderProperties.SitState == SitState.Standing
                 ? SitAction.Sit
                 : SitAction.Stand;
 
-            var packet = new PacketBuilder(PacketFamily.Sit, PacketAction.Request)
+            var packetFamily = renderProperties.SitState == SitState.Chair
+                ? PacketFamily.Chair
+                : PacketFamily.Sit;
+
+            var packet = new PacketBuilder(packetFamily, PacketAction.Request)
                 .AddChar((byte)sitAction)
                 .Build();
 
@@ -76,6 +81,6 @@ public interface ICharacterActions
 
         void Attack();
 
-        void Sit();
+        void ToggleSit();
     }
 }
diff --git a/EOLib/Domain/Character/WalkValidationActions.cs b/EOLib/Domain/Character/WalkValidationActions.cs
@@ -31,8 +31,7 @@ public bool CanMoveToDestinationCoordinates()
             if (_currentMapStateProvider.MapWarpState == WarpState.WarpStarted)
                 return false;
 
-            var mainCharacter = _characterProvider.MainCharacter;
-            var renderProperties = mainCharacter.RenderProperties;
+            var renderProperties = _characterProvider.MainCharacter.RenderProperties;
             var destX = renderProperties.GetDestinationX();
             var destY = renderProperties.GetDestinationY();
 
@@ -43,6 +42,9 @@ public bool CanMoveToCoordinates(int gridX, int gridY)
         {
             var mainCharacter = _characterProvider.MainCharacter;
 
+            if (mainCharacter.RenderProperties.SitState != SitState.Standing)
+                return false;
+
             var cellState = _mapCellStateProvider.GetCellStateAt(gridX, gridY);
 
             if (cellState.Character.HasValue) //todo: walk through players after certain elapsed time

diff --git a/EOLib/PacketHandlers/PlayerStandHandler.cs b/EOLib/PacketHandlers/PlayerStandHandler.cs
@@ -75,4 +75,15 @@ public class MainPlayerStandHandler : PlayerStandHandler
                                       ICurrentMapStateRepository currentMapStateRepository)
             : base(playerInfoProvider, characterRepository, currentMapStateRepository) { }
     }
+
+    [AutoMappedType]
+    public class MainPlayerStandFromChairHandler : MainPlayerStandHandler
+    {
+        public override PacketFamily Family => PacketFamily.Chair;
+
+        public MainPlayerStandFromChairHandler(IPlayerInfoProvider playerInfoProvider,
+                                               ICharacterRepository characterRepository,
+                                               ICurrentMapStateRepository currentMapStateRepository)
+            : base(playerInfoProvider, characterRepository, currentMapStateRepository) { }
+    }
 }
diff --git a/EndlessClient/Controllers/FunctionKeyController.cs b/EndlessClient/Controllers/FunctionKeyController.cs
@@ -19,7 +19,7 @@ public class FunctionKeyController : IFunctionKeyController
 
         public bool Sit()
         {
-            _characterActions.Sit();
+            _characterActions.ToggleSit();
             return true;
         }
 

diff --git a/EndlessClient/Controllers/MapInteractionController.cs b/EndlessClient/Controllers/MapInteractionController.cs
@@ -8,6 +8,7 @@
 using EndlessClient.HUD.Inventory;
 using EndlessClient.Input;
 using EndlessClient.Rendering;
+using EOLib.Domain.Character;
 using EOLib.Domain.Item;
 using EOLib.Domain.Map;
 using EOLib.Extensions;
@@ -19,21 +20,27 @@ namespace EndlessClient.Controllers
     public class MapInteractionController : IMapInteractionController
     {
         private readonly IMapActions _mapActions;
+        private readonly ICharacterActions _characterActions;
         private readonly ICurrentMapStateProvider _currentMapStateProvider;
+        private readonly ICharacterProvider _characterProvider;
         private readonly IStatusLabelSetter _statusLabelSetter;
         private readonly IInventorySpaceValidator _inventorySpaceValidator;
         private readonly IHudControlProvider _hudControlProvider;
         private readonly IEOMessageBoxFactory _eoMessageBoxFactory;
 
         public MapInteractionController(IMapActions mapActions,
+                                        ICharacterActions characterActions,
                                         ICurrentMapStateProvider currentMapStateProvider,
+                                        ICharacterProvider characterProvider,
                                         IStatusLabelSetter statusLabelSetter,
                                         IInventorySpaceValidator inventorySpaceValidator,
                                         IHudControlProvider hudControlProvider,
                                         IEOMessageBoxFactory eoMessageBoxFactory)
         {
             _mapActions = mapActions;
+            _characterActions = characterActions;
             _currentMapStateProvider = currentMapStateProvider;
+            _characterProvider = characterProvider;
             _statusLabelSetter = statusLabelSetter;
             _inventorySpaceValidator = inventorySpaceValidator;
             _hudControlProvider = hudControlProvider;
@@ -42,6 +49,12 @@ public class MapInteractionController : IMapInteractionController
 
         public async Task LeftClickAsync(IMapCellState cellState, IMouseCursorRenderer mouseRenderer)
         {
+            if (_characterProvider.MainCharacter.RenderProperties.SitState != SitState.Standing)
+            {
+                _characterActions.ToggleSit();
+                return;
+            }
+
             var item = cellState.Items.OptionalFirst();
             if (item.HasValue)
             {

diff --git a/EndlessClient/Input/UnwalkableTileActions.cs b/EndlessClient/Input/UnwalkableTileActions.cs
@@ -41,6 +41,9 @@ public class UnwalkableTileActions : IUnwalkableTileActions
 
         public void HandleUnwalkableTile()
         {
+            if (MainCharacter.RenderProperties.SitState != SitState.Standing)
+                return;
+
             var destX = MainCharacter.RenderProperties.GetDestinationX();
             var destY = MainCharacter.RenderProperties.GetDestinationY();
 
@@ -104,13 +107,14 @@ private void HandleWalkToTileSpec(IMapCellState cellState)
         {
             switch (cellState.TileSpec)
             {
-                case TileSpec.ChairDown: //todo: chairs
+                case TileSpec.ChairDown:
                 case TileSpec.ChairLeft:
                 case TileSpec.ChairRight:
                 case TileSpec.ChairUp:
                 case TileSpec.ChairDownRight:
                 case TileSpec.ChairUpLeft:
                 case TileSpec.ChairAll:
+                    HandleWalkToChair();
                     break;
                 case TileSpec.Chest: //todo: chests
                     //if (!walkValid)
@@ -164,6 +168,20 @@ private void HandleWalkToTileSpec(IMapCellState cellState)
             }
         }
 
+        private void HandleWalkToChair()
+        {
+            // server validates that chair direction is OK and that no one is already sitting there
+            var rp = _characterProvider.MainCharacter.RenderProperties;
+            var action = rp.SitState == SitState.Chair ? SitAction.Stand : SitAction.Sit;
+            var packet = new PacketBuilder(PacketFamily.Chair, PacketAction.Request)
+                .AddChar((byte)action)
+                .AddChar((byte)rp.GetDestinationX())
+                .AddChar((byte)rp.GetDestinationY())
+                .Build();
+
+            _packetSendService.SendPacket(packet);
+        }
+
         private ICharacter MainCharacter => _characterProvider.MainCharacter;
     }