Add SFX for sit when receiving SIT_REPLY or CHAIR_REPLY packet (#396)

ethanmoffat · Nov 5, 2024 · caad8e7 · caad8e7
1 parent 795c324
commit caad8e7
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 14 deletions.
diff --git a/EOBot/Program.cs b/EOBot/Program.cs
@@ -145,6 +145,8 @@ public void JunkItem(int id, int amountRemoved)
             }
 
             public void NotifyFrozen() { }
+
+            public void NotifySit() { }
         }
 
         [AutoMappedType]

diff --git a/EOLib/Domain/Notifiers/IMainCharacterEventNotifier.cs b/EOLib/Domain/Notifiers/IMainCharacterEventNotifier.cs
@@ -16,6 +16,8 @@ public interface IMainCharacterEventNotifier
         void JunkItem(int id, int amountRemoved);
 
         void NotifyFrozen();
+
+        void NotifySit();
     }
 
     [AutoMappedType]
@@ -32,5 +34,7 @@ public void DropItem(int id, int amountDropped) { }
         public void JunkItem(int id, int amountTaken) { }
 
         public void NotifyFrozen() { }
+
+        public void NotifySit() { }
     }
 }
diff --git a/EOLib/PacketHandlers/Chair/ChairReplyHandler.cs b/EOLib/PacketHandlers/Chair/ChairReplyHandler.cs
@@ -1,7 +1,10 @@
-using AutomaticTypeMapper;
+using System.Collections;
+using System.Collections.Generic;
+using AutomaticTypeMapper;
 using EOLib.Domain.Character;
 using EOLib.Domain.Login;
 using EOLib.Domain.Map;
+using EOLib.Domain.Notifiers;
 using EOLib.PacketHandlers.Sit;
 using Moffat.EndlessOnline.SDK.Protocol.Net;
 using Moffat.EndlessOnline.SDK.Protocol.Net.Server;
@@ -14,18 +17,28 @@ namespace EOLib.PacketHandlers.Chair
     [AutoMappedType]
     public class ChairReplyHandler : PlayerSitHandlerBase<ChairReplyServerPacket>
     {
+        private readonly IEnumerable<IMainCharacterEventNotifier> _mainCharacterEventNotifiers;
+
         public override PacketFamily Family => PacketFamily.Chair;
 
         public override PacketAction Action => PacketAction.Reply;
 
         public ChairReplyHandler(IPlayerInfoProvider playerInfoProvider,
-                                  ICharacterRepository characterRepository,
-                                  ICurrentMapStateRepository currentMapStateRepository)
-            : base(playerInfoProvider, characterRepository, currentMapStateRepository) { }
+                                 ICharacterRepository characterRepository,
+                                 ICurrentMapStateRepository currentMapStateRepository,
+                                 IEnumerable<IMainCharacterEventNotifier> mainCharacterEventNotifiers)
+            : base(playerInfoProvider, characterRepository, currentMapStateRepository)
+        {
+            _mainCharacterEventNotifiers = mainCharacterEventNotifiers;
+        }
 
         public override bool HandlePacket(ChairReplyServerPacket packet)
         {
             Handle(packet.PlayerId, packet.Coords.X, packet.Coords.Y, (EODirection)packet.Direction);
+
+            foreach (var notifier in _mainCharacterEventNotifiers)
+                notifier.NotifySit();
+
             return true;
         }
     }

diff --git a/EOLib/PacketHandlers/Sit/SitReplyHandler.cs b/EOLib/PacketHandlers/Sit/SitReplyHandler.cs
@@ -1,7 +1,9 @@
-using AutomaticTypeMapper;
+using System.Collections.Generic;
+using AutomaticTypeMapper;
 using EOLib.Domain.Character;
 using EOLib.Domain.Login;
 using EOLib.Domain.Map;
+using EOLib.Domain.Notifiers;
 using Moffat.EndlessOnline.SDK.Protocol.Net;
 using Moffat.EndlessOnline.SDK.Protocol.Net.Server;
 
@@ -13,18 +15,28 @@ namespace EOLib.PacketHandlers.Sit
     [AutoMappedType]
     public class SitReplyHandler : PlayerSitHandlerBase<SitReplyServerPacket>
     {
+        private readonly IEnumerable<IMainCharacterEventNotifier> _mainCharacterEventNotifiers;
+
         public override PacketFamily Family => PacketFamily.Sit;
 
         public override PacketAction Action => PacketAction.Reply;
 
         public SitReplyHandler(IPlayerInfoProvider playerInfoProvider,
-                                  ICharacterRepository characterRepository,
-                                  ICurrentMapStateRepository currentMapStateRepository)
-            : base(playerInfoProvider, characterRepository, currentMapStateRepository) { }
+                               ICharacterRepository characterRepository,
+                               ICurrentMapStateRepository currentMapStateRepository,
+                               IEnumerable<IMainCharacterEventNotifier> mainCharacterEventNotifiers)
+            : base(playerInfoProvider, characterRepository, currentMapStateRepository)
+        {
+            _mainCharacterEventNotifiers = mainCharacterEventNotifiers;
+        }
 
         public override bool HandlePacket(SitReplyServerPacket packet)
         {
             Handle(packet.PlayerId, packet.Coords.X, packet.Coords.Y, (EODirection)packet.Direction);
+
+            foreach (var notifier in _mainCharacterEventNotifiers)
+                notifier.NotifySit();
+
             return true;
         }
     }

diff --git a/EndlessClient/Audio/SoundEffectID.cs b/EndlessClient/Audio/SoundEffectID.cs
@@ -27,6 +27,7 @@ public enum SoundEffectID
         UnknownWarpSound,
         PrivateMessageTargetNotFound = 12,
         HudStatusBarClick,
+        Sit = HudStatusBarClick,
         AdminAnnounceReceived,
         MeleeWeaponAttack,
         MemberLeftParty = 16,

diff --git a/EndlessClient/GameExecution/EndlessGame.cs b/EndlessClient/GameExecution/EndlessGame.cs
@@ -19,8 +19,6 @@
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Input;
 
-
-
 #if DEBUG
 using System.Diagnostics;
 using MonoGame.Extended.BitmapFonts;

diff --git a/EndlessClient/Subscribers/MainCharacterEventSubscriber.cs b/EndlessClient/Subscribers/MainCharacterEventSubscriber.cs
@@ -89,9 +89,8 @@ public void JunkItem(int id, int amountRemoved)
                 $" {amountRemoved} {rec.Name}");
         }
 
-        public void NotifyFrozen()
-        {
-            _sfxPlayer.PlaySfx(SoundEffectID.PlayerFrozen);
-        }
+        public void NotifyFrozen() => _sfxPlayer.PlaySfx(SoundEffectID.PlayerFrozen);
+
+        public void NotifySit() => _sfxPlayer.PlaySfx(SoundEffectID.Sit);
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -145,6 +145,8 @@ public void JunkItem(int id, int amountRemoved) @@
                 }
                 public void NotifyFrozen() { }
+                public void NotifySit() { }
             }
             [AutoMappedType]
@@ Expand Down @@