model: PoE get region by region and global coord methods. core: fixed…

… Region.GetNearbyRegions returning invalid regions
justas-d · Nov 2, 2017 · fbe8b4e · fbe8b4e
1 parent 555a8ba
commit fbe8b4e
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 33 deletions.
diff --git a/CScape.Core/Commands/TestCommandClass.cs b/CScape.Core/Commands/TestCommandClass.cs
@@ -292,6 +292,7 @@ public void GetPos(CommandContext ctx)
             var ent = ctx.Callee.Parent;
 
             ent.SystemMessage($"X: {t.X} Y: {t.Y} Z: {t.Z}", CoreSystemMessageFlags.Debug | CoreSystemMessageFlags.Entity);
+            ent.SystemMessage($"REGX: {t.Region.X} REGY: {t.Region.Y}", CoreSystemMessageFlags.Debug | CoreSystemMessageFlags.Entity);
             ent.SystemMessage($"LX: {client.Local.X} LY: {client.Local.Y}", CoreSystemMessageFlags.Debug | CoreSystemMessageFlags.Entity);
             ent.SystemMessage($"CRX: {client.ClientRegion.Y} + 6 CRY: {client.ClientRegion.Y} + 6", CoreSystemMessageFlags.Debug | CoreSystemMessageFlags.Entity);
 

diff --git a/CScape.Core/Game/Entity/Component/NearbyEntityWatcherComponent.cs b/CScape.Core/Game/Entity/Component/NearbyEntityWatcherComponent.cs
@@ -85,7 +85,6 @@ private void CatchNearbyEntityDying(EntityMessage msg)
             TryDeleteEntityFromSeeables(msg.Entity);
         }
 
-        // TODO : lightweight version of the VisionComponent whose only purpose is to send out NearbyEntityQueuedForDeath upon receiving QueuedForDeath WITHOUT relying on VisionComponent
         public override void ReceiveMessage(IGameMessage msg)
         {
             switch (msg.EventId)

diff --git a/CScape.Core/Game/Entity/Component/Transform.cs b/CScape.Core/Game/Entity/Component/Transform.cs
@@ -102,7 +102,7 @@ public void SetInteractingEntity([NotNull] IInteractingEntity ent)
 
         private void UpdateRegion()
         {
-            var region = PoE.GetRegion(X, Y) ?? throw new ArgumentNullException("PoE.GetRegion(X, Y)");
+            var region = PoE.GetRegionByWorldCoordinate(X, Y) ?? throw new ArgumentNullException(nameof(PoE.GetRegionByWorldCoordinate));
 
             if (Region == region) return;
 

diff --git a/CScape.Core/Game/Entity/Message/SystemMessage.cs b/CScape.Core/Game/Entity/Message/SystemMessage.cs
@@ -11,11 +11,11 @@ public enum CoreSystemMessageFlags : ulong
         None = SystemMessageFlags.None,
         Normal = SystemMessageFlags.Normal,
         Debug = SystemMessageFlags.Debug,
-        Skill,
-        Item,
-        Network,
-        Interface,
-        Entity
+        Skill = 2,
+        Item = 4,
+        Network = 8,
+        Interface = 16,
+        Entity = 32
     }
 
     public sealed class SystemMessage : IGameMessage

diff --git a/CScape.Core/Game/World/PlaneOfExistence.cs b/CScape.Core/Game/World/PlaneOfExistence.cs
@@ -36,12 +36,14 @@ public PlaneOfExistence([NotNull] IGameServer server, [NotNull] string name)
         /// Gets the region coords by global position.
         /// </summary>
         [NotNull]
-        public IRegion GetRegion(int x, int y)
+        public IRegion GetRegionByWorldCoordinate(int x, int y)
         {
             var key = (x >> Region.Shift, y >> Region.Shift);
             return GetRegion(key);
         }
 
+        public IRegion GetRegionByRegionCoordinate(int x, int y) => GetRegion((x, y));
+
         public void GC()
         {
             _entities.RemoveWhere(e => e.IsDead());

diff --git a/CScape.Core/Game/World/Region.cs b/CScape.Core/Game/World/Region.cs
@@ -65,17 +65,17 @@ public IEnumerable<IRegion> GetNearbyInclusive()
         {
             return _nearbyRegions ?? (_nearbyRegions = new[]
             {
-                Poe.GetRegion(X + 1, Y),
-                Poe.GetRegion(X + 1, Y + 1),
-                Poe.GetRegion(X + 1, Y - 1),
+                Poe.GetRegionByRegionCoordinate(X + 1, Y),
+                Poe.GetRegionByRegionCoordinate(X + 1, Y + 1),
+                Poe.GetRegionByRegionCoordinate(X + 1, Y - 1),
 
-                Poe.GetRegion(X - 1, Y),
-                Poe.GetRegion(X - 1, Y + 1),
-                Poe.GetRegion(X - 1, Y - 1),
+                Poe.GetRegionByRegionCoordinate(X - 1, Y),
+                Poe.GetRegionByRegionCoordinate(X - 1, Y + 1),
+                Poe.GetRegionByRegionCoordinate(X - 1, Y - 1),
 
                 this,
-                Poe.GetRegion(X, Y + 1),
-                Poe.GetRegion(X, Y - 1)
+                Poe.GetRegionByRegionCoordinate(X, Y + 1),
+                Poe.GetRegionByRegionCoordinate(X, Y - 1)
             });
         }
     }

diff --git a/CScape.Core/Network/Entity/Component/MessageNetworkSyncComponent.cs b/CScape.Core/Network/Entity/Component/MessageNetworkSyncComponent.cs
@@ -37,24 +37,41 @@ public MessageNetworkSyncComponent(IEntity parent)
 #endif
         }
 
-        public override void ReceiveMessage(IGameMessage msg)
+        private static bool IsBitSet(ulong flags, CoreSystemMessageFlags bit)
+        {
+            return (flags & ((ulong)bit)) != 0;
+        }
+
+        private bool CanSync()
+        {
+            // don't sync messages if the user has got a chat interface open.
+            var interf = Parent.GetInterfaces();
+            return interf?.Chat == null;
+        }
+
+        private bool IsMessageIgnored(ulong msgFlags)
         {
-
+            if (IsBitSet(msgFlags, CoreSystemMessageFlags.Network))
+                return true;
 
+            if (IsBitSet(msgFlags, CoreSystemMessageFlags.Debug))
+                return !SyncDebugMessages;
+
+            return false;
+        }
+
+        public override void ReceiveMessage(IGameMessage msg)
+        {
             if (msg.EventId == (int)MessageId.NewSystemMessage)
             {
-                // don't sync messages if the user has got a chat interface open.
-                var interf = Parent.GetInterfaces();
-                if (interf?.Chat != null)
+                if (!CanSync())
                     return;
 
-                var msgStr = msg.AsSystemMessage();
-                var isDebugBitSet = (msgStr.Flags & (ulong)CoreSystemMessageFlags.Debug) != 0;
-
-                if (!isDebugBitSet || SyncDebugMessages)
-                    Network.SendPacket(new SystemChatMessagePacket(msgStr.Msg));
+                var sysMsgData = msg.AsSystemMessage();
+
+                if(!IsMessageIgnored(sysMsgData.Flags))
+                    Network.SendPacket(new SystemChatMessagePacket(sysMsgData.Msg));
             }
         }
-
     }
 }
diff --git a/CScape.Core/Network/Handler/PickupGroundItemPacketHandler.cs b/CScape.Core/Network/Handler/PickupGroundItemPacketHandler.cs
@@ -21,9 +21,7 @@ public void Handle(IEntity entity, PacketMessage packet)
             var id = packet.Data.ReadInt16() + 1;
             var x = packet.Data.ReadInt16();
 
-
-
-            var region = entity.GetTransform().PoE.GetRegion(x, y);
+            var region = entity.GetTransform().PoE.GetRegionByWorldCoordinate(x, y);
 
             // select first item in the region's item list
             // where the pos of the item matches the packet data

diff --git a/CScape.Models/Game/World/IPlaneOfExistence.cs b/CScape.Models/Game/World/IPlaneOfExistence.cs
@@ -40,10 +40,15 @@ public interface IPlaneOfExistence : IEnumerable<IEntityHandle>, IEquatable<IPla
         void RegisterNewEntity([NotNull] ITransform transform);
 
         /// <summary>
-        /// Returns a region at the given coordinates. If it doesn't exist, a new one is created.
-        /// If x or y are negative, this method is undefined.
+        /// Returns the region to which the tile at the given position belongs to.
         /// </summary>
         [CanBeNull]
-        IRegion GetRegion(int x, int y);
+        IRegion GetRegionByWorldCoordinate(int x, int y);
+
+        /// <summary>
+        /// Returns the region at the given region coordinates.
+        /// </summary>
+        [CanBeNull]
+        IRegion GetRegionByRegionCoordinate(int x, int y);
     }
 }