Merge branch 'master' into feature/guilds

ethanmoffat · Oct 27, 2024 · c8c6879 · c8c6879
2 parents efde12a + cdffe68
commit c8c6879
Show file tree

Hide file tree

Showing 43 changed files with 401 additions and 160 deletions.
diff --git a/EOBot/Program.cs b/EOBot/Program.cs
@@ -143,7 +143,7 @@ public void JunkItem(int id, int amountRemoved)
                 ConsoleHelper.WriteMessage(ConsoleHelper.Type.JunkItem, $"{weight,3}/{maxWeight,3} - weight - {inventoryCount?.Amount ?? 0} in inventory");
             }
 
-            public void MakeDrunk() { }
+            public void NotifyFrozen() { }
         }
 
         [AutoMappedType]

diff --git a/EOBot/TrainerBot.cs b/EOBot/TrainerBot.cs
@@ -275,7 +275,7 @@ private async Task Walk()
         {
             var renderProps = _characterRepository.MainCharacter.RenderProperties;
             ConsoleHelper.WriteMessage(ConsoleHelper.Type.Walk, $"{renderProps.GetDestinationX(),3},{renderProps.GetDestinationY(),3}");
-            await TrySend(_characterActions.Walk);
+            await TrySend(() => _characterActions.Walk(false));
             await Delay(WALK_BACKOFF_MS);
         }
 

diff --git a/EOLib.IO/EOLib.IO.csproj b/EOLib.IO/EOLib.IO.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AutomaticTypeMapper" Version="1.4.1" />
-    <PackageReference Include="Moffat.EndlessOnline.SDK" Version="1.0.0-rc2" />
+    <PackageReference Include="Moffat.EndlessOnline.SDK" Version="1.0.0-rc3" />
     <PackageReference Include="System.Memory" Version="4.5.5" />
   </ItemGroup>
 </Project>
diff --git a/EOLib.Localization/EOLib.Localization.csproj b/EOLib.Localization/EOLib.Localization.csproj
@@ -17,6 +17,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="AutomaticTypeMapper" Version="1.4.1" />
-    <PackageReference Include="Moffat.EndlessOnline.SDK" Version="1.0.0-rc2" />
+    <PackageReference Include="Moffat.EndlessOnline.SDK" Version="1.0.0-rc3" />
   </ItemGroup>
 </Project>
diff --git a/EOLib/Domain/Character/AttackValidationActions.cs b/EOLib/Domain/Character/AttackValidationActions.cs
@@ -27,9 +27,13 @@ public AttackValidationActions(ICharacterProvider characterProvider,
 
         public AttackValidationError ValidateCharacterStateBeforeAttacking()
         {
+            if (_characterProvider.MainCharacter.Frozen)
+                return AttackValidationError.Frozen;
+
             if (_characterProvider.MainCharacter.Stats[CharacterStat.Weight] >
                 _characterProvider.MainCharacter.Stats[CharacterStat.MaxWeight])
                 return AttackValidationError.Overweight;
+
             if (_characterProvider.MainCharacter.Stats[CharacterStat.SP] <= 0)
                 return AttackValidationError.Exhausted;
 
@@ -73,6 +77,7 @@ public enum AttackValidationError
         Overweight,
         Exhausted,
         NotYourBattle,
-        MissingArrows
+        MissingArrows,
+        Frozen,
     }
 }
diff --git a/EOLib/Domain/Character/Character.cs b/EOLib/Domain/Character/Character.cs
@@ -55,6 +55,8 @@ public sealed partial class Character : ISpellTargetable
 
         public bool NoWall { get; }
 
+        public bool Frozen { get; }
+
         public static Character FromCharacterSelectionListEntry(CharacterSelectionListEntry selectionListEntry)
         {
             return new Builder

diff --git a/EOLib/Domain/Character/CharacterActions.cs b/EOLib/Domain/Character/CharacterActions.cs
@@ -38,7 +38,7 @@ public void Face(EODirection direction)
             _packetSendService.SendPacket(packet);
         }
 
-        public void Walk()
+        public void Walk(bool ghosted)
         {
             var admin = _characterRepository.MainCharacter.NoWall &&
                         _characterRepository.MainCharacter.AdminLevel != AdminLevel.Player;
@@ -56,6 +56,7 @@ public void Walk()
 
             var packet = admin
                 ? (IPacket)new WalkAdminClientPacket { WalkAction = walkAction }
+                : ghosted ? (IPacket)new WalkSpecClientPacket { WalkAction = walkAction }
                 : (IPacket)new WalkPlayerClientPacket { WalkAction = walkAction };
             _packetSendService.SendPacket(packet);
         }
@@ -169,7 +170,7 @@ public interface ICharacterActions
     {
         void Face(EODirection direction);
 
-        void Walk();
+        void Walk(bool ghosted);
 
         void Attack();
 

diff --git a/EOLib/Domain/Character/WalkValidationActions.cs b/EOLib/Domain/Character/WalkValidationActions.cs
@@ -13,7 +13,8 @@ public enum WalkValidationResult
         NotWalkable,
         Walkable,
         BlockedByCharacter,
-        GhostComplete
+        GhostComplete,
+        Frozen
     }
 
     [AutoMappedType]
@@ -36,6 +37,7 @@ public WalkValidationActions(IMapCellStateProvider mapCellStateProvider,
             _currentMapStateProvider = currentMapStateProvider;
             _unlockDoorValidator = unlockDoorValidator;
             _ghostingRepository = ghostingRepository;
+
         }
 
         public WalkValidationResult CanMoveToDestinationCoordinates()
@@ -65,6 +67,9 @@ public WalkValidationResult IsCellStateWalkable(IMapCellState cellState)
         {
             ClearGhostCache();
 
+            if (_characterProvider.MainCharacter.Frozen)
+                return WalkValidationResult.Frozen;
+
             var mc = _characterProvider.MainCharacter;
 
             var cellChar = cellState.Character.FlatMap(c => c.SomeWhen(cc => cc != mc));

diff --git a/EOLib/Domain/Login/LoginActions.cs b/EOLib/Domain/Login/LoginActions.cs
@@ -106,7 +106,7 @@ public async Task<int> RequestCharacterLogin(Character.Character character)
                 .WithAdminLevel(data.Admin)
                 .WithStats(CharacterStats.FromSelectCharacterData(data));
 
-            _playerInfoRepository.IsFirstTimePlayer = data.LoginMessageCode == LoginMessageCode.Yes;
+            _playerInfoRepository.IsFirstTimePlayer = data.LoginMessageCode != LoginMessageCode.No;
             _playerInfoRepository.PlayerHasAdminCharacter = _characterSelectorRepository.Characters.Any(x => x.AdminLevel > 0);
 
             _currentMapStateRepository.CurrentMapID = data.MapId;

diff --git a/EOLib/Domain/Notifiers/IEffectNotifier.cs b/EOLib/Domain/Notifiers/IEffectNotifier.cs
@@ -15,6 +15,8 @@ public interface IEffectNotifier
         void NotifyMapEffect(IO.Map.MapEffect effect, int strength = 0);
 
         void NotifyEffectAtLocation(MapCoordinate location, int effectId);
+
+        void NotifyAdminHideEffect(int playerId);
     }
 
     [AutoMappedType]
@@ -29,5 +31,7 @@ public void NotifyPotionEffect(int playerId, int effectId) { }
         public void NotifyMapEffect(IO.Map.MapEffect effect, int strength = 0) { }
 
         public void NotifyEffectAtLocation(MapCoordinate location, int effectId) { }
+
+        public void NotifyAdminHideEffect(int playerId) { }
     }
 }
diff --git a/EOLib/Domain/Notifiers/IMainCharacterEventNotifier.cs b/EOLib/Domain/Notifiers/IMainCharacterEventNotifier.cs
@@ -14,6 +14,8 @@ public interface IMainCharacterEventNotifier
         void DropItem(int id, int amountDropped);
 
         void JunkItem(int id, int amountRemoved);
+
+        void NotifyFrozen();
     }
 
     [AutoMappedType]
@@ -28,5 +30,7 @@ public void TakeItemFromMap(int id, int amountTaken) { }
         public void DropItem(int id, int amountDropped) { }
 
         public void JunkItem(int id, int amountTaken) { }
+
+        public void NotifyFrozen() { }
     }
 }
diff --git a/EOLib/Domain/Spells/SpellCastValidationActions.cs b/EOLib/Domain/Spells/SpellCastValidationActions.cs
@@ -1,7 +1,10 @@
 using System.Linq;
+
 using AutomaticTypeMapper;
+
 using EOLib.Domain.Character;
 using EOLib.Domain.Map;
+using EOLib.Domain.Party;
 using EOLib.IO;
 using EOLib.IO.Repositories;
 
@@ -13,31 +16,42 @@ public class SpellCastValidationActions : ISpellCastValidationActions
         private readonly IPubFileProvider _pubFileProvider;
         private readonly ICurrentMapProvider _currentMapProvider;
         private readonly ICharacterProvider _characterProvider;
+        private readonly IPartyDataProvider _partyDataProvider;
 
         public SpellCastValidationActions(IPubFileProvider pubFileProvider,
                                           ICurrentMapProvider currentMapProvider,
-                                          ICharacterProvider characterProvider)
+                                          ICharacterProvider characterProvider,
+                                          IPartyDataProvider partyDataProvider)
         {
             _pubFileProvider = pubFileProvider;
             _currentMapProvider = currentMapProvider;
             _characterProvider = characterProvider;
+            _partyDataProvider = partyDataProvider;
         }
 
         public SpellCastValidationResult ValidateSpellCast(int spellId)
         {
+            if (_characterProvider.MainCharacter.Frozen)
+                return SpellCastValidationResult.Frozen;
+
             var spellData = _pubFileProvider.ESFFile[spellId];
 
             var stats = _characterProvider.MainCharacter.Stats;
             if (stats[CharacterStat.SP] - spellData.SP < 0)
                 return SpellCastValidationResult.ExhaustedNoSp;
             if (stats[CharacterStat.TP] - spellData.TP < 0)
                 return SpellCastValidationResult.ExhaustedNoTp;
+            if (spellData.Target == SpellTarget.Group && !_partyDataProvider.Members.Any())
+                return SpellCastValidationResult.NotMemberOfGroup;
 
             return SpellCastValidationResult.Ok;
         }
 
         public SpellCastValidationResult ValidateSpellCast(int spellId, ISpellTargetable spellTarget)
         {
+            if (_characterProvider.MainCharacter.Frozen)
+                return SpellCastValidationResult.Frozen;
+
             var res = ValidateSpellCast(spellId);
             if (res != SpellCastValidationResult.Ok)
                 return res;
@@ -75,6 +89,9 @@ public SpellCastValidationResult ValidateSpellCast(int spellId, ISpellTargetable
 
         public bool ValidateBard()
         {
+            if (_characterProvider.MainCharacter.Frozen)
+                return false;
+
             var weapon = _characterProvider.MainCharacter.RenderProperties.WeaponGraphic;
             return Constants.Instruments.Any(x => x == weapon);
         }

diff --git a/EOLib/Domain/Spells/SpellCastValidationResult.cs b/EOLib/Domain/Spells/SpellCastValidationResult.cs
@@ -7,5 +7,7 @@ public enum SpellCastValidationResult
         WrongTargetType,
         ExhaustedNoSp,
         ExhaustedNoTp,
+        NotMemberOfGroup,
+        Frozen,
     }
 }
diff --git a/EOLib/EOLib.csproj b/EOLib/EOLib.csproj
@@ -22,7 +22,7 @@
   <ItemGroup>
     <PackageReference Include="Amadevus.RecordGenerator" Version="0.6.0" />
     <PackageReference Include="AutomaticTypeMapper" Version="1.4.1" />
-    <PackageReference Include="Moffat.EndlessOnline.SDK" Version="1.0.0-rc2" />
+    <PackageReference Include="Moffat.EndlessOnline.SDK" Version="1.0.0-rc3" />
     <PackageReference Include="Optional" Version="4.0.0" />
   </ItemGroup>
 </Project>
diff --git a/EOLib/PacketHandlers/AdminInteract/AdminInteractAgree.cs b/EOLib/PacketHandlers/AdminInteract/AdminInteractAgree.cs
@@ -3,6 +3,7 @@
 using EOLib.Domain.Character;
 using EOLib.Domain.Login;
 using EOLib.Domain.Map;
+using EOLib.Domain.Notifiers;
 using EOLib.Net.Handlers;
 using Moffat.EndlessOnline.SDK.Protocol.Net;
 using Moffat.EndlessOnline.SDK.Protocol.Net.Server;
@@ -17,17 +18,20 @@ public class AdminInteractAgree : InGameOnlyPacketHandler<AdminInteractAgreeServ
     {
         private readonly ICharacterRepository _characterRepository;
         private readonly ICurrentMapStateRepository _currentMapStateRepository;
+        private readonly IEnumerable<IEffectNotifier> _effectNotifiers;
 
         public override PacketFamily Family => PacketFamily.AdminInteract;
         public override PacketAction Action => PacketAction.Agree;
 
         public AdminInteractAgree(IPlayerInfoProvider playerInfoProvider,
                                   ICharacterRepository characterRepository,
-                                  ICurrentMapStateRepository currentMapStateRepository)
+                                  ICurrentMapStateRepository currentMapStateRepository,
+                                  IEnumerable<IEffectNotifier> effectNotifiers)
             : base(playerInfoProvider)
         {
             _characterRepository = characterRepository;
             _currentMapStateRepository = currentMapStateRepository;
+            _effectNotifiers = effectNotifiers;
         }
 
         public override bool HandlePacket(AdminInteractAgreeServerPacket packet)
@@ -46,9 +50,13 @@ public override bool HandlePacket(AdminInteractAgreeServerPacket packet)
                 else
                 {
                     _currentMapStateRepository.UnknownPlayerIDs.Add(packet.PlayerId);
+                    return true;
                 }
             }
 
+            foreach (var notifier in _effectNotifiers)
+                notifier.NotifyAdminHideEffect(packet.PlayerId);
+
             return true;
         }
 

diff --git a/EOLib/PacketHandlers/AdminInteract/AdminInteractRemove.cs b/EOLib/PacketHandlers/AdminInteract/AdminInteractRemove.cs
@@ -3,6 +3,7 @@
 using EOLib.Domain.Character;
 using EOLib.Domain.Login;
 using EOLib.Domain.Map;
+using EOLib.Domain.Notifiers;
 using EOLib.Net.Handlers;
 using Moffat.EndlessOnline.SDK.Protocol.Net;
 using Moffat.EndlessOnline.SDK.Protocol.Net.Server;
@@ -17,17 +18,20 @@ public class AdminInteractRemove : InGameOnlyPacketHandler<AdminInteractRemoveSe
     {
         private readonly ICharacterRepository _characterRepository;
         private readonly ICurrentMapStateRepository _currentMapStateRepository;
+        private readonly IEnumerable<IEffectNotifier> _effectNotifiers;
 
         public override PacketFamily Family => PacketFamily.AdminInteract;
         public override PacketAction Action => PacketAction.Remove;
 
         public AdminInteractRemove(IPlayerInfoProvider playerInfoProvider,
                                   ICharacterRepository characterRepository,
-                                  ICurrentMapStateRepository currentMapStateRepository)
+                                  ICurrentMapStateRepository currentMapStateRepository,
+                                  IEnumerable<IEffectNotifier> effectNotifiers)
             : base(playerInfoProvider)
         {
             _characterRepository = characterRepository;
             _currentMapStateRepository = currentMapStateRepository;
+            _effectNotifiers = effectNotifiers;
         }
 
         public override bool HandlePacket(AdminInteractRemoveServerPacket packet)
@@ -46,9 +50,13 @@ public override bool HandlePacket(AdminInteractRemoveServerPacket packet)
                 else
                 {
                     _currentMapStateRepository.UnknownPlayerIDs.Add(packet.PlayerId);
+                    return true;
                 }
             }
 
+            foreach (var notifier in _effectNotifiers)
+                notifier.NotifyAdminHideEffect(packet.PlayerId);
+
             return true;
         }