Implement Arena handling

- All packets implemented - Client-side arena block timer implemented - SFX names added - Unknown chat icon name added - Missing resource IDs added
ethanmoffat · Apr 6, 2024 · 739ecf0 · 739ecf0
1 parent 23d6661
commit 739ecf0
Show file tree

Hide file tree

Showing 13 changed files with 446 additions and 7 deletions.
diff --git a/EOLib.Localization/EOResourceID.cs b/EOLib.Localization/EOResourceID.cs
@@ -205,6 +205,21 @@ public enum EOResourceID
         SPELL_ONLY_WORKS_ON_GROUP = 304,
         STATUS_LABEL_THE_NPC_DROPPED = 305,
 
+        YOU_HAVE_BEEN_FROZEN = 306,
+
+        REBOOT_SERVER_REBOOTING = 307,
+        REBOOT_SEQUENCE_STARTED = 308,
+
+        //ARENA_EVENT_ABORTED_LAST_OPPONENT_DC = 309, // not used
+        ARENA_ROUND_DELAYED_STILL_PLAYERS = 310,
+        ARENA_WON_EVENT = 311,
+        ARENA_PLAYERS_LAUNCHED = 312,
+        ARENA_WAS_ELIMINATED_BY = 313,
+        ARENA_KILLED = 314,
+        ARENA_PLAYERS = 315,
+        ARENA_DO_NOT_BLOCK_LINE = 316,
+        ARENA_PLEASE_MOVE_FROM_PLACE = 317,
+
         WEDDING_PLEASE_ENTER_NAME = 318,
         WEDDING_IS_ASKING_YOU_TO_MARRY = 319,
         WEDDING_REGISTRATION_SERVICE = 320,

diff --git a/EOLib/Domain/Chat/ChatIcon.cs b/EOLib/Domain/Chat/ChatIcon.cs
@@ -28,7 +28,7 @@ public enum ChatIcon
         DotDotDotDot,
         GSymbol,
         Skeleton,
-        WhatTheFuck,
+        Trophy,
         Information,
         QuestMessage
     }

diff --git a/EOLib/Domain/Notifiers/IArenaNotifier.cs b/EOLib/Domain/Notifiers/IArenaNotifier.cs
@@ -0,0 +1,27 @@
+using AutomaticTypeMapper;
+
+namespace EOLib.Domain.Notifiers
+{
+    public interface IArenaNotifier
+    {
+        void NotifyArenaBusy();
+
+        void NotifyArenaStart(int players);
+
+        void NotifyArenaKill(int killCount, string killer, string victim);
+
+        void NotifyArenaWin(string winner);
+    }
+
+    [AutoMappedType]
+    public class NoOpArenaNotifer : IArenaNotifier
+    {
+        public void NotifyArenaBusy() { }
+
+        public void NotifyArenaStart(int players) { }
+
+        public void NotifyArenaKill(int killCount, string killer, string victim) { }
+
+        public void NotifyArenaWin(string winner) { }
+    }
+}
diff --git a/EOLib/Domain/Notifiers/IChatEventNotifier.cs b/EOLib/Domain/Notifiers/IChatEventNotifier.cs
@@ -8,7 +8,6 @@ public enum ChatEventType
         AdminChat,
         AdminAnnounce,
         Group,
-        Server,
     }
 
     public interface IChatEventNotifier
@@ -18,6 +17,9 @@ public interface IChatEventNotifier
         void NotifyPrivateMessageRecipientNotFound(string recipientName);
 
         void NotifyPlayerMutedByAdmin(string adminName);
+
+        void NotifyServerMessage(string serverMessage);
+        void NotifyServerPing(int timeInMS);
     }
 
     [AutoMappedType]
@@ -28,5 +30,9 @@ public void NotifyChatReceived(ChatEventType eventType) { }
         public void NotifyPrivateMessageRecipientNotFound(string recipientName) { }
 
         public void NotifyPlayerMutedByAdmin(string adminName) { }
+
+        public void NotifyServerMessage(string serverMessage) { }
+
+        public void NotifyServerPing(int timeInMS) { }
     }
 }
diff --git a/EOLib/PacketHandlers/Arena/ArenaAcceptHandler.cs b/EOLib/PacketHandlers/Arena/ArenaAcceptHandler.cs
@@ -0,0 +1,48 @@
+using AutomaticTypeMapper;
+using EOLib.Domain.Login;
+using EOLib.Domain.Notifiers;
+using EOLib.Net;
+using EOLib.Net.Handlers;
+using System.Collections.Generic;
+
+namespace EOLib.PacketHandlers.Arena
+{
+    /// <summary>
+    /// Arena win message
+    /// </summary>
+    [AutoMappedType]
+    public class ArenaAcceptHandler : InGameOnlyPacketHandler
+    {
+        private readonly IEnumerable<IArenaNotifier> _arenaNotifiers;
+
+        public override PacketFamily Family => PacketFamily.Arena;
+
+        public override PacketAction Action => PacketAction.Accept;
+
+        public ArenaAcceptHandler(IPlayerInfoProvider playerInfoProvider,
+                                  IEnumerable<IArenaNotifier> arenaNotifiers)
+            : base(playerInfoProvider)
+        {
+            _arenaNotifiers = arenaNotifiers;
+        }
+
+        public override bool HandlePacket(IPacket packet)
+        {
+            var winnerName = packet.ReadBreakString();
+
+            var killsCount = packet.ReadInt();
+            packet.ReadByte();
+
+            var killerName = packet.ReadBreakString();
+            var victimName = packet.ReadBreakString();
+
+            foreach (var notifier in _arenaNotifiers)
+            {
+                notifier.NotifyArenaKill(killsCount, killerName, victimName);
+                notifier.NotifyArenaWin(winnerName);
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/EOLib/PacketHandlers/Arena/ArenaDropHandler.cs b/EOLib/PacketHandlers/Arena/ArenaDropHandler.cs
@@ -0,0 +1,42 @@
+using AutomaticTypeMapper;
+using EOLib.Domain.Login;
+using EOLib.Domain.Notifiers;
+using EOLib.Net;
+using EOLib.Net.Handlers;
+using System.Collections.Generic;
+
+namespace EOLib.PacketHandlers.Arena
+{
+    /// <summary>
+    /// "Arena is blocked" message
+    /// </summary>
+    [AutoMappedType]
+    public class ArenaDropHandler : InGameOnlyPacketHandler
+    {
+        private readonly IEnumerable<IArenaNotifier> _arenaNotifiers;
+
+        public override PacketFamily Family => PacketFamily.Arena;
+
+        public override PacketAction Action => PacketAction.Drop;
+
+        public ArenaDropHandler(IPlayerInfoProvider playerInfoProvider,
+                                IEnumerable<IArenaNotifier> arenaNotifiers)
+            : base(playerInfoProvider)
+        {
+            _arenaNotifiers = arenaNotifiers;
+        }
+
+        public override bool HandlePacket(IPacket packet)
+        {
+            if (packet.ReadEndString().Length < 1)
+                return false;
+
+            foreach (var  notifier in _arenaNotifiers)
+            {
+                notifier.NotifyArenaBusy();
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/EOLib/PacketHandlers/Arena/ArenaSpecHandler.cs b/EOLib/PacketHandlers/Arena/ArenaSpecHandler.cs
@@ -0,0 +1,76 @@
+using AutomaticTypeMapper;
+using EOLib.Domain.Character;
+using EOLib.Domain.Login;
+using EOLib.Domain.Map;
+using EOLib.Domain.Notifiers;
+using EOLib.Net;
+using EOLib.Net.Handlers;
+using System.Collections.Generic;
+
+namespace EOLib.PacketHandlers.Arena
+{
+    /// <summary>
+    /// Arena kill message
+    /// </summary>
+    [AutoMappedType]
+    public class ArenaSpecHandler : InGameOnlyPacketHandler
+    {
+        private readonly ICharacterRepository _characterRepository;
+        private readonly ICurrentMapStateRepository _currentMapStateRepository;
+        private readonly IEnumerable<IArenaNotifier> _arenaNotifiers;
+
+        public override PacketFamily Family => PacketFamily.Arena;
+
+        public override PacketAction Action => PacketAction.Spec;
+
+        public ArenaSpecHandler(IPlayerInfoProvider playerInfoProvider,
+                                ICharacterRepository characterRepository,
+                                ICurrentMapStateRepository currentMapStateRepository,
+                                IEnumerable<IArenaNotifier> arenaNotifiers)
+            : base(playerInfoProvider)
+        {
+            _characterRepository = characterRepository;
+            _currentMapStateRepository = currentMapStateRepository;
+            _arenaNotifiers = arenaNotifiers;
+        }
+
+        public override bool HandlePacket(IPacket packet)
+        {
+            var playerId = packet.ReadShort();
+            packet.ReadByte();
+
+            var playerDirection = (EODirection)packet.ReadChar();
+            packet.ReadByte();
+
+            if (playerId == _characterRepository.MainCharacter.ID)
+            {
+                var rp = _characterRepository.MainCharacter.RenderProperties.WithDirection(playerDirection);
+                _characterRepository.MainCharacter = _characterRepository.MainCharacter.WithRenderProperties(rp);
+            }
+            else if (_currentMapStateRepository.Characters.ContainsKey(playerId))
+            {
+                var character = _currentMapStateRepository.Characters[playerId];
+                var rp = character.RenderProperties.WithDirection(playerDirection);
+                var newCharacter = character.WithRenderProperties(rp);
+                _currentMapStateRepository.Characters.Update(character, newCharacter);
+            }
+            else if (playerId > 0)
+            {
+                _currentMapStateRepository.UnknownPlayerIDs.Add(playerId);
+            }
+
+            var killsCount = packet.ReadInt();
+            packet.ReadByte();
+
+            var killerName = packet.ReadBreakString();
+            var victimName = packet.ReadBreakString();
+
+            foreach (var  notifier in _arenaNotifiers)
+            {
+                notifier.NotifyArenaKill(killsCount, killerName, victimName);
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/EOLib/PacketHandlers/Arena/ArenaUseHandler.cs b/EOLib/PacketHandlers/Arena/ArenaUseHandler.cs
@@ -0,0 +1,41 @@
+using AutomaticTypeMapper;
+using EOLib.Domain.Login;
+using EOLib.Domain.Notifiers;
+using EOLib.Net;
+using EOLib.Net.Handlers;
+using System.Collections.Generic;
+
+namespace EOLib.PacketHandlers.Arena
+{
+    /// <summary>
+    /// Arena start message
+    /// </summary>
+    [AutoMappedType]
+    public class ArenaUseHandler : InGameOnlyPacketHandler
+    {
+        private readonly IEnumerable<IArenaNotifier> _arenaNotifiers;
+
+        public override PacketFamily Family => PacketFamily.Arena;
+
+        public override PacketAction Action => PacketAction.Use;
+
+        public ArenaUseHandler(IPlayerInfoProvider playerInfoProvider,
+                               IEnumerable<IArenaNotifier> arenaNotifiers)
+            : base(playerInfoProvider)
+        {
+            _arenaNotifiers = arenaNotifiers;
+        }
+
+        public override bool HandlePacket(IPacket packet)
+        {
+            var playersCount = packet.ReadChar();
+
+            foreach (var  notifier in _arenaNotifiers)
+            {
+                notifier.NotifyArenaStart(playersCount);
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/EndlessClient/Audio/SoundEffectID.cs b/EndlessClient/Audio/SoundEffectID.cs
@@ -66,6 +66,7 @@ public enum SoundEffectID
         Guitar3,
         Thunder,
         MapEvacTimer,
+        ArenaTickSound = MapEvacTimer,
         ArenaWin = 52,
         Gun,
         UltimaBlastSpell,

diff --git a/EndlessClient/HUD/Controls/HudControlsFactory.cs b/EndlessClient/HUD/Controls/HudControlsFactory.cs
@@ -61,6 +61,7 @@ public class HudControlsFactory : IHudControlsFactory
         private readonly IPathFinder _pathFinder;
         private readonly ICharacterActions _characterActions;
         private readonly IWalkValidationActions _walkValidationActions;
+        private readonly IChatBubbleActions _chatBubbleActions;
         private readonly IPacketSendService _packetSendService;
         private readonly IUserInputTimeProvider _userInputTimeProvider;
         private readonly ISpellSlotDataRepository _spellSlotDataRepository;
@@ -70,7 +71,7 @@ public class HudControlsFactory : IHudControlsFactory
         private readonly IFixedTimeStepRepository _fixedTimeStepRepository;
         private readonly IClickDispatcherFactory _clickDispatcherFactory;
         private readonly IMetadataProvider<WeaponMetadata> _weaponMetadataProvider;
-
+        private readonly ILocalizedStringFinder _localizedStringFinder;
         private IChatController _chatController;
         private IMainButtonController _mainButtonController;
 
@@ -95,6 +96,7 @@ public HudControlsFactory(IHudButtonController hudButtonController,
                                   IPathFinder pathFinder,
                                   ICharacterActions characterActions,
                                   IWalkValidationActions walkValidationActions,
+                                  IChatBubbleActions chatBubbleActions,
                                   IPacketSendService packetSendService,
                                   IUserInputTimeProvider userInputTimeProvider,
                                   ISpellSlotDataRepository spellSlotDataRepository,
@@ -103,7 +105,8 @@ public HudControlsFactory(IHudButtonController hudButtonController,
                                   INewsProvider newsProvider,
                                   IFixedTimeStepRepository fixedTimeStepRepository,
                                   IClickDispatcherFactory clickDispatcherFactory,
-                                  IMetadataProvider<WeaponMetadata> weaponMetadataProvider)
+                                  IMetadataProvider<WeaponMetadata> weaponMetadataProvider,
+                                  ILocalizedStringFinder localizedStringFinder)
         {
             _hudButtonController = hudButtonController;
             _hudPanelFactory = hudPanelFactory;
@@ -126,6 +129,7 @@ public HudControlsFactory(IHudButtonController hudButtonController,
             _pathFinder = pathFinder;
             _characterActions = characterActions;
             _walkValidationActions = walkValidationActions;
+            _chatBubbleActions = chatBubbleActions;
             _packetSendService = packetSendService;
             _userInputTimeProvider = userInputTimeProvider;
             _spellSlotDataRepository = spellSlotDataRepository;
@@ -135,6 +139,7 @@ public HudControlsFactory(IHudButtonController hudButtonController,
             _fixedTimeStepRepository = fixedTimeStepRepository;
             _clickDispatcherFactory = clickDispatcherFactory;
             _weaponMetadataProvider = weaponMetadataProvider;
+            _localizedStringFinder = localizedStringFinder;
         }
 
         public void InjectChatController(IChatController chatController,
@@ -580,7 +585,11 @@ private INPCAnimator CreateNPCAnimator()
 
         private IPeriodicEmoteHandler CreatePeriodicEmoteHandler(ICharacterAnimator characterAnimator)
         {
-            return new PeriodicEmoteHandler(_endlessGameProvider, _characterActions, _userInputTimeProvider, _characterRepository, characterAnimator, _statusLabelSetter, _mainButtonController);
+            return new PeriodicEmoteHandler(
+                _endlessGameProvider, _characterActions, _chatBubbleActions,
+                _userInputTimeProvider, _characterRepository, characterAnimator,
+                _statusLabelSetter, _mainButtonController, _localizedStringFinder,
+                _sfxPlayer);
         }
 
         private PreviousUserInputTracker CreatePreviousUserInputTracker()

diff --git a/EndlessClient/Rendering/Character/CharacterAnimationActions.cs b/EndlessClient/Rendering/Character/CharacterAnimationActions.cs
@@ -80,6 +80,8 @@ public void StartWalking(Option<MapCoordinate> targetCoordinate)
             if (!_hudControlProvider.IsInGame)
                 return;
 
+            _hudControlProvider.GetComponent<IPeriodicEmoteHandler>(HudControlIdentifier.PeriodicEmoteHandler).CancelArenaBlockTimer();
+
             CancelSpellPrep();
             Animator.StartMainCharacterWalkAnimation(targetCoordinate, () =>
             {