Add handling for PK spells

ethanmoffat · Apr 18, 2022 · ae959e8 · ae959e8
1 parent 7e2809e
commit ae959e8
Show file tree

Hide file tree

Showing 2 changed files with 104 additions and 6 deletions.
diff --git a/EOLib/PacketHandlers/PlayerPKSpellHandler.cs b/EOLib/PacketHandlers/PlayerPKSpellHandler.cs
@@ -0,0 +1,98 @@
+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
+{
+    [AutoMappedType]
+    public class PlayerPKSpellHandler : InGameOnlyPacketHandler
+    {
+        private readonly ICharacterRepository _characterRepository;
+        private readonly ICurrentMapStateRepository _currentMapStateRepository;
+        private readonly IEnumerable<IOtherCharacterAnimationNotifier> _animationNotifiers;
+
+        public override PacketFamily Family => PacketFamily.Avatar;
+
+        public override PacketAction Action => PacketAction.Admin;
+
+        public PlayerPKSpellHandler(IPlayerInfoProvider playerInfoProvider,
+                                    ICharacterRepository characterRepository,
+                                    ICurrentMapStateRepository currentMapStateRepository,
+                                    IEnumerable<IOtherCharacterAnimationNotifier> animationNotifiers)
+            : base(playerInfoProvider)
+        {
+            _characterRepository = characterRepository;
+            _currentMapStateRepository = currentMapStateRepository;
+            _animationNotifiers = animationNotifiers;
+        }
+
+        public override bool HandlePacket(IPacket packet)
+        {
+            var sourcePlayerId = packet.ReadShort();
+            var targetPlayerId = packet.ReadShort();
+            var damage = packet.ReadThree();
+            var sourcePlayerDirection = (EODirection)packet.ReadChar();
+            var targetPercentHealth = packet.ReadChar();
+            var targetIsDead = packet.ReadChar() != 0;
+            var spellId = packet.ReadShort();
+
+            if (sourcePlayerId == _characterRepository.MainCharacter.ID)
+            {
+                var renderProps = _characterRepository.MainCharacter.RenderProperties.WithDirection(sourcePlayerDirection);
+                _characterRepository.MainCharacter = _characterRepository.MainCharacter.WithRenderProperties(renderProps);
+            }
+            else if (_currentMapStateRepository.Characters.ContainsKey(sourcePlayerId))
+            {
+                var character = _currentMapStateRepository.Characters[sourcePlayerId];
+                var updatedCharacter = character.WithRenderProperties(character.RenderProperties.WithDirection(sourcePlayerDirection));
+                _currentMapStateRepository.Characters[sourcePlayerId] = updatedCharacter;
+            }
+            else
+            {
+                _currentMapStateRepository.UnknownPlayerIDs.Add(sourcePlayerId);
+                return true;
+            }
+
+            if (targetPlayerId == _characterRepository.MainCharacter.ID)
+            {
+                var renderProps = _characterRepository.MainCharacter.RenderProperties;
+                if (targetIsDead)
+                    renderProps = renderProps.WithDead();
+
+                var stats = _characterRepository.MainCharacter.Stats;
+                stats = stats.WithNewStat(CharacterStat.HP, stats[CharacterStat.HP] - damage);
+                _characterRepository.MainCharacter = _characterRepository.MainCharacter
+                    .WithStats(stats)
+                    .WithRenderProperties(renderProps);
+            }
+            else if (_currentMapStateRepository.Characters.ContainsKey(targetPlayerId))
+            {
+                var c = _currentMapStateRepository.Characters[targetPlayerId];
+
+                var renderProps = c.RenderProperties;
+                if (targetIsDead)
+                    renderProps = renderProps.WithDead();
+
+                var stats = c.Stats;
+                stats = stats.WithNewStat(CharacterStat.HP, stats[CharacterStat.HP] - damage);
+
+                _currentMapStateRepository.Characters[targetPlayerId] = c.WithStats(stats).WithRenderProperties(renderProps);
+            }
+            else
+            {
+                _currentMapStateRepository.UnknownPlayerIDs.Add(targetPlayerId);
+                return true;
+            }
+
+            foreach (var notifier in _animationNotifiers)
+                notifier.NotifyTargetOtherSpellCast(sourcePlayerId, targetPlayerId, spellId, damage, targetPercentHealth);
+
+            return true;
+        }
+    }
+}
diff --git a/EndlessClient/Rendering/Character/CharacterAnimationActions.cs b/EndlessClient/Rendering/Character/CharacterAnimationActions.cs
@@ -159,8 +159,6 @@ public void NotifySelfSpellCast(short playerId, short spellId, int spellHp, byte
 
         public void NotifyTargetOtherSpellCast(short sourcePlayerID, short targetPlayerID, short spellId, int recoveredHP, byte targetPercentHealth)
         {
-            var spellGraphic = _esfFileProvider.ESFFile[spellId].Graphic;
-
             if (sourcePlayerID == _characterRepository.MainCharacter.ID)
             {
                 _characterRendererProvider.MainCharacterRenderer.MatchSome(cr => cr.ShoutSpellCast());
@@ -171,18 +169,20 @@ public void NotifyTargetOtherSpellCast(short sourcePlayerID, short targetPlayerI
                 _characterRendererProvider.CharacterRenderers[sourcePlayerID].ShoutSpellCast();
             }
 
+            var spellData = _esfFileProvider.ESFFile[spellId];
+
             if (targetPlayerID == _characterRepository.MainCharacter.ID)
             {
                 _characterRendererProvider.MainCharacterRenderer.MatchSome(cr =>
                 {
-                    cr.ShowSpellAnimation(spellGraphic);
-                    cr.ShowDamageCounter(recoveredHP, targetPercentHealth, isHeal: true);
+                    cr.ShowSpellAnimation(spellData.Graphic);
+                    cr.ShowDamageCounter(recoveredHP, targetPercentHealth, isHeal: spellData.Type == EOLib.IO.SpellType.Heal);
                 });
             }
             else
             {
-                _characterRendererProvider.CharacterRenderers[targetPlayerID].ShowSpellAnimation(spellGraphic);
-                _characterRendererProvider.CharacterRenderers[targetPlayerID].ShowDamageCounter(recoveredHP, targetPercentHealth, isHeal: true);
+                _characterRendererProvider.CharacterRenderers[targetPlayerID].ShowSpellAnimation(spellData.Graphic);
+                _characterRendererProvider.CharacterRenderers[targetPlayerID].ShowDamageCounter(recoveredHP, targetPercentHealth, isHeal: spellData.Type == EOLib.IO.SpellType.Heal);
             }
         }