Merge branch 'livingEntities'

DangerousD/Content/Content.mgcb

@@ -14,14 +14,7 @@
 
 #---------------------------------- Content ---------------------------------#
 
-#begin ButtonFont.spritefont
+#begin MonstersAnimations.png
-/importer:FontDescriptionImporter
-/processor:FontDescriptionProcessor
-/processorParam:PremultiplyAlpha=True
-/processorParam:TextureFormat=Compressed
-/build:ButtonFont.spritefont
-
-#begin checkboxs_off-on.png
 /importer:TextureImporter
 /processor:TextureProcessor
 /processorParam:ColorKeyColor=255,0,255,255
@@ -259,7 +252,19 @@
 /processorParam:TextureFormat=Color
 /build:textboxbackground6-1.png
 
-#begin tiles.png
+#begin MonstersAnimations.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:MonstersAnimations.png
+
+#begin PC_Computer_Dangerous_Dave_In_The_Haunted_Mansion_Death_Sequences.png
 /importer:TextureImporter
 /processor:TextureProcessor
 /processorParam:ColorKeyColor=255,0,255,255
@@ -271,6 +276,18 @@
 /processorParam:TextureFormat=Color
 /build:tiles.png
 
+#begin playerAnimation.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:playerAnimation.png
+
 #begin wall.jpg
 /importer:TextureImporter
 /processor:TextureProcessor

DangerousD/Content/animations/HunchmanAttackLeft

@@ -0,0 +1 @@
+{"id":"HunchmanAttackLeft","textureName":"MonstersAnimations","startSpriteRectangle":{"X":101,"Y":124,"Width":40,"Height":24},"frameSecond":[{"Item1":0,"Item2":10}],"textureFrameInterval":1,"framesCount":3,"isCycle":true,"offset":"0, 0"}

DangerousD/Content/animations/HunchmanAttackRight

@@ -0,0 +1 @@
+{"id":"HunchmanAttackRight","textureName":"MonstersAnimations","startSpriteRectangle":{"X":101,"Y":99,"Width":40,"Height":24},"frameSecond":[{"Item1":0,"Item2":10}],"textureFrameInterval":1,"framesCount":3,"isCycle":true,"offset":"0, 0"}

DangerousD/Content/animations/HunchmanMoveLeft

@@ -0,0 +1 @@
+{"id":"HunchmanMoveLeft","textureName":"MonstersAnimations","startSpriteRectangle":{"X":1,"Y":124,"Width":24,"Height":24},"frameSecond":[{"Item1":0,"Item2":10}],"textureFrameInterval":1,"framesCount":4,"isCycle":true,"offset":"0, 0"}

DangerousD/Content/animations/HunchmanMoveRight

@@ -0,0 +1,3 @@
+
+{"id":"HunchmanMoveRight","textureName":"MonstersAnimations","startSpriteRectangle":{"X":1,"Y":99,"Width":24,"Height":24},"frameSecond":[{"Item1":0,"Item2":10}],"textureFrameInterval":1,"framesCount":4,"isCycle":true,"offset":"0, 0"}
+

DangerousD/Content/animations/playerJumpLeft

@@ -0,0 +1 @@
+{"id":"playerJumpLeft","textureName":"playerAnimation","startSpriteRectangle":{"X":101,"Y":34,"Width":24,"Height":32},"frameSecond":[{"Item1":0,"Item2":12}],"textureFrameInterval":1,"framesCount":3,"isCycle":false,"offset":"0, 0"}

DangerousD/Content/animations/playerJumpRight

@@ -0,0 +1 @@
+{"id":"playerJumpRight","textureName":"playerAnimation","startSpriteRectangle":{"X":126,"Y":1,"Width":24,"Height":32},"frameSecond":[{"Item1":0,"Item2":12}],"textureFrameInterval":1,"framesCount":3,"isCycle":false,"offset":"0, 0"}

DangerousD/Content/animations/playerMoveLeft

@@ -0,0 +1,20 @@
+{
+  "id": "playerMoveLeft",
+  "textureName": "playerAnimation",
+  "startSpriteRectangle": {
+    "X": 26,
+    "Y": 34,
+    "Width": 24,
+    "Height": 32
+  },
+  "frameSecond": [
+    {
+      "Item1": 0,
+      "Item2": 8
+    }
+  ],
+  "textureFrameInterval": 1,
+  "framesCount": 4,
+  "isCycle": true,
+  "offset": "0, 0"
+}

DangerousD/Content/animations/playerMoveRight

@@ -0,0 +1,20 @@
+{
+  "id": "playerMoveRight",
+  "textureName": "playerAnimation",
+  "startSpriteRectangle": {
+    "X": 26,
+    "Y": 1,
+    "Width": 24,
+    "Height": 32
+  },
+  "frameSecond": [
+    {
+      "Item1": 0,
+      "Item2": 8
+    }
+  ],
+  "textureFrameInterval": 1,
+  "framesCount": 4,
+  "isCycle": true,
+  "offset": "0, 0"
+}

DangerousD/Content/animations/playerRightStay

@@ -0,0 +1 @@
+{"id":"playerRightStay","textureName":"playerAnimation","startSpriteRectangle":{"X":1,"Y":1,"Width":24,"Height":32},"frameSecond":[{"Item1":0,"Item2":12}],"textureFrameInterval":1,"framesCount":1,"isCycle":true,"offset":"0, 0"}

DangerousD/Content/animations/playerStayLeft

@@ -0,0 +1 @@
+{"id":"playerStayLeft","textureName":"playerAnimation","startSpriteRectangle":{"X":1,"Y":34,"Width":24,"Height":32},"frameSecond":[{"Item1":0,"Item2":12}],"textureFrameInterval":1,"framesCount":1,"isCycle":true,"offset":"0, 0"}

DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Hunchman.cs

@@ -4,7 +4,9 @@ using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
+using System.Security.Authentication.ExtendedProtection;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -12,15 +14,71 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
 {
     public class Hunchman : CoreEnemy
     {
+        GameManager gameManager;
+        bool isAttacking;
         public Hunchman(Vector2 position) : base(position)
         {
+            Width = 48;
+            Height = 48;
+            monster_speed = -2;
+            monster_health = 1;
+            name = "HunchMan";
+            velocity = new Vector2(monster_speed, 0);
+            gameManager = AppManager.Instance.GameManager;
+            isAttacking = false;
+            isAlive = true;
         }
 
-        protected override GraphicsComponent GraphicsComponent { get; } = new(new List<string> { "HunchmanMoveLeft", "HunchmanMoveRight", "HunchmanAttackLeft", "HunchmanAttackRight" }, "HunchmanMoveRight");
+        protected override GraphicsComponent GraphicsComponent { get; } = new(new List<string> 
+            { "HunchmanMoveLeft", "HunchmanMoveRight", "HunchmanAttackLeft", "HunchmanAttackRight" }, "HunchmanMoveLeft");
+
+        public override void Update(GameTime gameTime)
+        {
+            // P.S. Всё в классе можешь смело удалять и переписывать с нуля.
+            gameManager = AppManager.Instance.GameManager;
+           
+            if (!isAttacking)
+            {
+                Attack();
+                Move(gameTime);
+            }
+            else
+            {
+                velocity.X = 0;
+            }
+            Death();
+
+        }
 
         public override void Attack()
         {
-
+            GameObject gameObject;
+            foreach (var player in gameManager.players)
+            {
+                if (player.Pos.Y + player.Height >= Pos.Y && player.Pos.Y <= Pos.Y + Height)
+                {
+                    gameObject = gameManager.physicsManager.RayCast(this, player);
+                    if (gameObject is null)
+                    {
+                        isAttacking = true;
+                        GraphicsComponent.StopAnimation();
+                        if (velocity.X > 0)
+                        {
+                            if (GraphicsComponent.GetCurrentAnimation != "HunchmanAttackRight")
+                            {
+                                GraphicsComponent.StartAnimation("HunchmanAttackRight");
+                            }
+                        }
+                        else if (velocity.X < 0)
+                        {
+                            if (GraphicsComponent.GetCurrentAnimation != "HunchmanAttackLeft")
+                            {
+                                GraphicsComponent.StartAnimation("HunchmanAttackLeft");
+                            }
+                        }
+                    }
+                }
+            }
         }
 
         public override void Attack(GameTime gameTime)
@@ -29,13 +87,46 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
         }
 
         public override void Death()
+        {
+            if (monster_health <= 0)
             {
 
             }
+        }
 
         public override void Move(GameTime gameTime)
         {
+            if (gameManager.physicsManager.RayCast(this, new Vector2(Pos.X + Width + 10, Pos.Y + Height)) is not null)
+            {
+                monster_speed *= -1;
+            }
             
+            velocity.X = monster_speed;
+
+            if (velocity.X > 0)
+            {
+                if (GraphicsComponent.GetCurrentAnimation != "HunchmanMoveRight")
+                {
+                    GraphicsComponent.StartAnimation("HunchmanMoveRight");
+                }
+
+            }
+
+            else if (velocity.X < 0)
+            {
+                if (GraphicsComponent.GetCurrentAnimation != "HunchmanMoveLeft")
+                {
+                    GraphicsComponent.StartAnimation("HunchmanMoveLeft");
+                }
+            }
+
+        }
+
+        public override void OnCollision(GameObject gameObject)
+        { 
+            monster_speed *= -1;
+            _pos.X += 5 * monster_speed;
+            Debug.WriteLine("Collision");
         }
 
         public override void Target()

DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs

@@ -13,7 +13,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
 {
     public class Zombie : CoreEnemy
     {
-        private bool isGoRight = true;
         float leftBorder;
         float rightBorder;
         bool isAttaking = false;
@@ -25,9 +24,18 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
             Height = 40;
             monster_speed = 3;
             name = "Zombie";
-            leftBorder = (int)position.X - 100;
+            leftBorder = (int)position.X - 50;
-            rightBorder = (int)position.X + 100;
+            rightBorder = (int)position.X + 50;
             physicsManager = new PhysicsManager();
+            Random random = new Random();
+            if(random.Next(0, 2) == 0)
+            {
+                isGoRight = true;
+            }
+            else
+            {
+                isGoRight = false;
+            }
         }
         protected override GraphicsComponent GraphicsComponent { get; } = new(new List<string> { "ZombieMoveRight", "ZombieMoveLeft", "ZombieRightAttack", "ZombieLeftAttack" }, "ZombieMoveLeft");
 
@@ -38,7 +46,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
                 Target();
                 Move(gameTime);
             }
-
+            fixBorder();
             base.Update(gameTime);
         }
 
@@ -50,7 +58,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
             {
                 if (GraphicsComponent.GetCurrentAnimation != "ZombieRightAttack")
                 {
-                    GraphicsComponent.StartAnimation("ZombieAttackRight");
+                    GraphicsComponent.StartAnimation("ZombieRightAttack");
                 }
                 AppManager.Instance.GameManager.players[0].Death(name);
             }
@@ -71,7 +79,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
 
         public override void Move(GameTime gameTime)
         {
-            float delta = (float)gameTime.ElapsedGameTime.TotalSeconds;
             if (isGoRight)
             {
                 if (GraphicsComponent.GetCurrentAnimation != "ZombieMoveRight")
@@ -113,7 +120,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
         }
         public override void Target()
         {
-            if (AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X - 50, (int)Pos.Y, Width + 100, Height), typeof(Player)) != null)
+            if (AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X - 50, (int)Pos.Y, Width + 100, Height), typeof(Player)).Count > 0)
             {
                 if (isGoRight && this._pos.X <= AppManager.Instance.GameManager.players[0].Pos.X)
                 {
@@ -130,10 +137,19 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
                 }
             }
         }
-        public override void Attack(GameTime gameTime)
+        public void fixBorder()
         {
-            throw new NotImplementedException();
+            if(leftBorder <= 0)
+            {
+                leftBorder = 0;
+            }
+            if(rightBorder >= 800)
+            {
+                rightBorder = 760;
+            }
         }
 
+        public override void Attack(GameTime gameTime)
+        {}
     }
 }

DangerousD/GameCore/GameObjects/LivingEntities/Player/DeathRectangle.cs

@@ -13,8 +13,8 @@ namespace DangerousD.GameCore.GameObjects.PlayerDeath
     {
         public DeathRectangle(Vector2 pos, string DeathType) : base(pos)
         {
-            Height = 128;
+            Height = 48;
-            Width = 128;
+            Width = 48;
             PlayDeath(DeathType);
         }
 

DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs

@@ -14,6 +14,8 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
     public class Player : LivingEntity
     {
         bool isAlive = true;
+        bool isRight;
+        string stayAnimation;
         bool isJump = false;
         public int health;
         public bool isGoRight = false;
@@ -21,6 +23,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
         public int rightBorder;
         public int leftBorder;
         public bool isVisible = true;
+        private bool isAttacked = false;
         public GameObject objectAttack;
 
         public Player(Vector2 position) : base(position)
@@ -30,7 +33,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
 
             AppManager.Instance.InputManager.ShootEvent += Shoot;
 
-            AppManager.Instance.InputManager.MovEventJump += AnimationJump;
+            AppManager.Instance.InputManager.MovEventJump += Jump;
             AppManager.Instance.InputManager.MovEventDown += MoveDown;
 
            velocity = new Vector2(0, 0);
@@ -38,9 +41,11 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
             leftBorder = (int)position.X - 100;
 
         }
+
         public bool IsAlive { get { return isAlive; } }
 
-        protected override GraphicsComponent GraphicsComponent { get; } = new(new List<string> { "ZombieMoveRight", "ZombieMoveLeft", "ZombieRightAttack", "ZombieLeftAttack", "DeathFromZombie" }, "ZombieMoveLeft");//TODO: Change to player
+        protected override GraphicsComponent GraphicsComponent { get; } = new(new List<string> { "playerMoveLeft", "playerMoveRight", "DeathFromZombie", "playerRightStay", "playerStayLeft",
+            "playerJumpRight" , "playerJumpLeft"}, "playerStayLeft");
 
         public void Attack()
         {
@@ -66,20 +71,21 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
         }
         public void Death(string monsterName)
         {
-            /*if(monsterName == "Zombie")
+            isAttacked = true;
+            if(monsterName == "Zombie")
             {
                 DeathRectangle deathRectangle = new DeathRectangle(Pos, "DeathFrom" + monsterName);
                 deathRectangle.Gr.actionOfAnimationEnd += (a) =>
                 {
                     if (a == "DeathFrom" + monsterName)
                     {
-                        AppManager.Instance.ChangeGameState(GameState.GameOver);
+                        AppManager.Instance.ChangeGameState(GameState.Death);
                     }
                 };
             }
-            isAlive = false;*/
+            isAlive = false;
         }
-        public void AnimationJump()
+        public void Jump()
         {
             if (isOnGround)
             {
@@ -95,9 +101,16 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
         public override void Update(GameTime gameTime)
         {
             GraphicsComponent.CameraPosition = (_pos-new Vector2(200, 350)).ToPoint();
-            base.Update(gameTime);
+            if (!isAttacked)
+            {
                 Move(gameTime);
             }
+            else
+            {
+                velocity.X = 0;
+            }
+            base.Update(gameTime);
+        }
 
         public void Move(GameTime gameTime)
         {
@@ -105,16 +118,16 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
             velocity.X = 5 * AppManager.Instance.InputManager.VectorMovementDirection.X;
             if (AppManager.Instance.InputManager.VectorMovementDirection.X > 0)
             {
-                if (GraphicsComponent.GetCurrentAnimation != "ZombieMoveRight")//идёт направо
+                if (GraphicsComponent.GetCurrentAnimation != "playerMoveRight")//идёт направо
                 {
-                    GraphicsComponent.StartAnimation("ZombieMoveRight");
+                    GraphicsComponent.StartAnimation("playerMoveRight");
                 }
             }
             else if (AppManager.Instance.InputManager.VectorMovementDirection.X < 0)//идёт налево
             {
-                if (GraphicsComponent.GetCurrentAnimation != "ZombieMoveLeft")
+                if (GraphicsComponent.GetCurrentAnimation != "playerMoveLeft")
                 {
-                    GraphicsComponent.StartAnimation("ZombieMoveLeft");
+                    GraphicsComponent.StartAnimation("playerMoveLeft");
                 }
             }
             else if(AppManager.Instance.InputManager.VectorMovementDirection.X == 0)//стоит

DangerousD/GameCore/Managers/AppManager.cs

@@ -14,7 +14,9 @@ using DangerousD.GameCore.Managers;
 namespace DangerousD.GameCore
 {
     public enum MultiPlayerStatus { SinglePlayer, Host, Client }
-    public enum GameState { Menu, Options, Lobby, Game, Login, Death }
+    public enum GameState { Menu, Options, Lobby, Game, Login, Death,
+        GameOver
+    }
     public class AppManager : Game
     {
         public static AppManager Instance { get; private set; }