diff --git a/DangerousD/Content/animations/FlameSkullMoveRight b/DangerousD/Content/animations/FlameSkullMoveRight new file mode 100644 index 0000000..c0c96b6 --- /dev/null +++ b/DangerousD/Content/animations/FlameSkullMoveRight @@ -0,0 +1 @@ +{"id":"FlameSkullMoveRight","textureName":"MonstersAnimations","startSpriteRectangle":{"X":1,"Y":576,"Width":24,"Height":16},"frameSecond":[{"Item1":0,"Item2":10}],"textureFrameInterval":1,"framesCount":2,"isCycle":true,"offset":"0, 0"} diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/CoreEnemy.cs b/DangerousD/GameCore/GameObjects/LivingEntities/CoreEnemy.cs index 9c02d2b..fafc936 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/CoreEnemy.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/CoreEnemy.cs @@ -22,7 +22,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities //здесь я не понял } - public virtual void Update(GameTime gameTime) + public override void Update(GameTime gameTime) { if (monster_health <= 0) { diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FlameSkull.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FlameSkull.cs index c521c2e..da492f2 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FlameSkull.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FlameSkull.cs @@ -14,10 +14,11 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters { public FlameSkull(Vector2 position) : base(position) { - + Width = 62; + Height = 40; } - protected override GraphicsComponent GraphicsComponent { get; } = new(new List { "FlameSkullMoveLeft", "FlameSkullMoveRight" }, "FlameSkullMoveRight"); + protected override GraphicsComponent GraphicsComponent { get; } = new(new List { "FlameSkullMoveRight" }, "FlameSkullMoveRight"); public override void Attack() { diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Frank.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Frank.cs index 0434e4d..a0615f0 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Frank.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Frank.cs @@ -19,7 +19,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters Height = 160; GraphicsComponent.StartAnimation("FrankMoveLeft"); monster_speed = 1; - name = "Фрэнк"; + name = "Frank"; } protected override GraphicsComponent GraphicsComponent { get; } = new(new List { "FrankMoveRight", "FrankMoveLeft" }, "FrankMoveRight"); @@ -39,17 +39,19 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters { player.Death(name); } */ - - if (isGoRight) + + if (_pos.X <= 1) { + isGoRight = true; if (GraphicsComponent.GetCurrentAnimation != "FrankMoveRight") { GraphicsComponent.StartAnimation("FrankMoveRight"); velocity = new Vector2(monster_speed, 0); } } - else if (!isGoRight) + else if (_pos.X >= 500) { + isGoRight = false; if (GraphicsComponent.GetCurrentAnimation != "FrankMoveLeft") { GraphicsComponent.StartAnimation("FrankMoveLeft"); @@ -57,13 +59,13 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } } - if (_pos.X <= 1) + if (isGoRight) { - isGoRight = true; + _pos.X += monster_speed; } - else if (_pos.X >= 500) + else { - isGoRight = false; + _pos.X -= monster_speed; } } } diff --git a/DangerousD/GameCore/Levels/Level1.cs b/DangerousD/GameCore/Levels/Level1.cs index 835674c..e718794 100644 --- a/DangerousD/GameCore/Levels/Level1.cs +++ b/DangerousD/GameCore/Levels/Level1.cs @@ -12,8 +12,9 @@ namespace DangerousD.GameCore.Levels { var Трава = new GrassBlock(new Vector2(0, 128)); var Death = new TestAnimationDeath(new Vector2(128, 128)); - var Zombie = new Zombie(new Vector2(256, 128)); + //var Zombie = new Zombie(new Vector2(256, 128)); var Frank = new Frank(new Vector2(384, 128)); + var FlameSkull = new FlameSkull(new Vector2(512, 128)); } } }