Add option for map animations to be considered blocks

AscensionGameDev · Oct 2, 2020 · 2609352 · 2609352
1 parent 58ce0cc
commit 2609352
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 6 deletions.
diff --git a/Intersect (Core)/GameObjects/Maps/MapAttribute.cs b/Intersect (Core)/GameObjects/Maps/MapAttribute.cs
@@ -181,10 +181,13 @@ public class MapAnimationAttribute : MapAttribute
 
         public Guid AnimationId { get; set; }
 
+        public bool IsBlock { get; set; }
+
         public override MapAttribute Clone()
         {
             var att = (MapAnimationAttribute) base.Clone();
             att.AnimationId = AnimationId;
+            att.IsBlock = IsBlock;
 
             return att;
         }

diff --git a/Intersect.Client/Entities/Player.cs b/Intersect.Client/Entities/Player.cs
@@ -1669,7 +1669,8 @@ public int IsTileBlocked(
                 {
                     if (gameMap.Attributes[tmpX, tmpY] != null)
                     {
-                        if (gameMap.Attributes[tmpX, tmpY].Type == MapAttributes.Blocked)
+                        if (gameMap.Attributes[tmpX, tmpY].Type == MapAttributes.Blocked || 
+                            (gameMap.Attributes[tmpX, tmpY].Type == MapAttributes.Animation && ((MapAnimationAttribute)gameMap.Attributes[tmpX, tmpY]).IsBlock))
                         {
                             return -2;
                         }

diff --git a/Intersect.Editor/Forms/DockingElements/frmMapLayers.Designer.cs b/Intersect.Editor/Forms/DockingElements/frmMapLayers.Designer.cs
diff --git a/Intersect.Editor/Forms/DockingElements/frmMapLayers.cs b/Intersect.Editor/Forms/DockingElements/frmMapLayers.cs
@@ -621,6 +621,7 @@ public MapAttribute CreateAttribute()
                 case MapAttributes.Animation:
                     var animationAttribute = attribute as MapAnimationAttribute;
                     animationAttribute.AnimationId = AnimationBase.IdFromList(cmbAnimationAttribute.SelectedIndex);
+                    animationAttribute.IsBlock = chkAnimationBlock.Checked;
                     break;
 
                 case MapAttributes.Slide:
@@ -896,6 +897,7 @@ private void InitLocalization()
             //Map Animation Groupbox
             grpAnimation.Text = Strings.Attributes.mapanimation;
             lblAnimation.Text = Strings.Attributes.mapanimation;
+            chkAnimationBlock.Text = Strings.Attributes.mapanimationblock;
 
             //Slide Groupbox
             grpSlide.Text = Strings.Attributes.slide;

diff --git a/Intersect.Editor/Localization/Strings.cs b/Intersect.Editor/Localization/Strings.cs
@@ -630,6 +630,8 @@ public struct Attributes
 
             public static LocalizedString mapanimation = @"Animation";
 
+            public static LocalizedString mapanimationblock = @"Block Tile";
+
             public static LocalizedString mapsound = @"Map Sound";
 
             public static LocalizedString npcavoid = @"NPC Avoid";

diff --git a/Intersect.Server/Entities/Entity.cs b/Intersect.Server/Entities/Entity.cs
@@ -328,7 +328,7 @@ public virtual int CanMove(int moveDir)
                 var tileAttribute = MapInstance.Get(tile.GetMapId()).Attributes[tile.GetX(), tile.GetY()];
                 if (tileAttribute != null)
                 {
-                    if (tileAttribute.Type == MapAttributes.Blocked)
+                    if (tileAttribute.Type == MapAttributes.Blocked || (tileAttribute.Type == MapAttributes.Animation && ((MapAnimationAttribute)tileAttribute).IsBlock))
                     {
                         return -2;
                     }

diff --git a/Intersect.Server/Entities/Projectile.cs b/Intersect.Server/Entities/Projectile.cs
@@ -383,7 +383,7 @@ public bool CheckForCollision(ProjectileSpawn spawn)
                 }
 
                 if (attribute != null &&
-                    attribute.Type == MapAttributes.Blocked &&
+                    (attribute.Type == MapAttributes.Blocked || attribute.Type == MapAttributes.Animation && ((MapAnimationAttribute)attribute).IsBlock) &&
                     !spawn.ProjectileBase.IgnoreMapBlocks)
                 {
                     killSpawn = true;

diff --git a/Intersect.Server/Maps/MapInstance.cs b/Intersect.Server/Maps/MapInstance.cs
@@ -163,7 +163,8 @@ private void CacheMapBlocks()
                     if (Attributes[x, y] != null)
                     {
                         if (Attributes[x, y].Type == MapAttributes.Blocked ||
-                            Attributes[x, y].Type == MapAttributes.GrappleStone)
+                            Attributes[x, y].Type == MapAttributes.GrappleStone ||
+                            Attributes[x,y].Type == MapAttributes.Animation && ((MapAnimationAttribute)Attributes[x,y]).IsBlock) 
                         {
                             blocks.Add(new BytePoint(x, y));
                             npcBlocks.Add(new BytePoint(x, y));
@@ -1107,7 +1108,8 @@ public void ClearConnections(int side = -1)
         public bool TileBlocked(int x, int y)
         {
             //Check if tile is a blocked attribute
-            if (Attributes[x, y] != null && Attributes[x, y].Type == MapAttributes.Blocked)
+            if (Attributes[x, y] != null && (Attributes[x, y].Type == MapAttributes.Blocked ||
+                Attributes[x,y].Type == MapAttributes.Animation && ((MapAnimationAttribute)Attributes[x,y]).IsBlock))
             {
                 return true;
             }