diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/CoreEnemy.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/CoreEnemy.cs index 22ea566..06fed0f 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/CoreEnemy.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/CoreEnemy.cs @@ -13,11 +13,9 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities public abstract class CoreEnemy : LivingEntity { protected int monster_health; - protected float monster_speed = 2; + protected int monster_speed; protected string name; protected bool isAlive = true; - protected bool isAttack = false; - protected bool isGoRight; protected int leftBoarder = 0; protected int rightBoarder = 700; @@ -33,7 +31,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities public abstract void Death(); public abstract void Attack(); - public abstract void Attack(GameTime gameTime); public abstract void Move(GameTime gameTime); @@ -46,7 +43,5 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities isAlive = false; } } - - public abstract void Target(); } } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FlameSkull.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FlameSkull.cs index f7591ac..b4f3ec7 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FlameSkull.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FlameSkull.cs @@ -12,6 +12,9 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters { public class FlameSkull : CoreEnemy { + private bool isGoRight; + private bool isAttack; + public FlameSkull(Vector2 position) : base(position) { Width = 62; @@ -71,14 +74,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } } - public override void Attack(GameTime gameTime) - { - } - - public override void Target() - { - throw new NotImplementedException(); - } } } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Frank.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Frank.cs index 8ecddcd..fd25246 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Frank.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Frank.cs @@ -12,6 +12,8 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters { internal class Frank : CoreEnemy { + private bool isGoRight; + public Frank(Vector2 position) : base(position) { isGoRight = false; @@ -70,12 +72,12 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } } - public override void Attack(GameTime gameTime) + public void Attack(GameTime gameTime) { } - public override void Target() + public void Target() { throw new NotImplementedException(); } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FrankBalls.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FrankBalls.cs index bc28f6b..4c37e6a 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FrankBalls.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FrankBalls.cs @@ -82,12 +82,12 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } } - public override void Attack(GameTime gameTime) + public void Attack(GameTime gameTime) { } - public override void Target() + public void Target() { throw new NotImplementedException(); } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Ghost.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Ghost.cs index 6236554..3df9012 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Ghost.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Ghost.cs @@ -10,6 +10,9 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters { public class Ghost : CoreEnemy { + private bool isGoRight; + private bool isAttack; + public Ghost(Vector2 position) : base(position) { isGoRight = true; @@ -76,12 +79,12 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } } - public override void Attack(GameTime gameTime) + public void Attack(GameTime gameTime) { } - public override void Target() + public void Target() { throw new NotImplementedException(); } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Hunchman.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Hunchman.cs index ba342ec..d804512 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Hunchman.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Hunchman.cs @@ -81,7 +81,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } } - public override void Attack(GameTime gameTime) + public void Attack(GameTime gameTime) { } @@ -129,7 +129,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters Debug.WriteLine("Collision"); } - public override void Target() + public void Target() { throw new NotImplementedException(); } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/HunchmanDagger.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/HunchmanDagger.cs index 9cd2b4f..9c2415b 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/HunchmanDagger.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/HunchmanDagger.cs @@ -27,7 +27,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } - public override void Attack(GameTime gameTime) + public void Attack(GameTime gameTime) { } @@ -42,7 +42,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } - public override void Target() + public void Target() { throw new NotImplementedException(); } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasHands.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasHands.cs index 16c06e1..ed4dfcb 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasHands.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasHands.cs @@ -30,7 +30,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } - public override void Attack(GameTime gameTime) + public void Attack(GameTime gameTime) { } @@ -61,7 +61,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } } - public override void Target() + public void Target() { throw new NotImplementedException(); } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasMaster.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasMaster.cs index 5dc8df2..66f9527 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasMaster.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasMaster.cs @@ -72,7 +72,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } - public override void Attack(GameTime gameTime) + public void Attack(GameTime gameTime) { } @@ -113,7 +113,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } } - public override void Target() + public void Target() { throw new NotImplementedException(); } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Slime.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Slime.cs index 0e5e954..1cdf9bb 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Slime.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Slime.cs @@ -233,12 +233,12 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters base.Update(gameTime); } - public override void Target() + public void Target() { } - public override void Attack(GameTime gameTime) + public void Attack(GameTime gameTime) { } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Spider.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Spider.cs index 0d797aa..93f3ef4 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Spider.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Spider.cs @@ -12,6 +12,9 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters { public class Spider : CoreEnemy { + private bool isGoRight; + private bool isAttack; + protected SpiderWeb web; protected float delay; protected int webLength; @@ -57,7 +60,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters /// Атака паука РАБОЧАЯ /// /// - public override void Attack(GameTime gameTime) + public void Attack(GameTime gameTime) { //48 72 if (isDownUp) { @@ -144,7 +147,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } } - public override void Target() + public void Target() { throw new NotImplementedException(); } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SpiderWeb.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SpiderWeb.cs index cde2ab0..8bd0af1 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SpiderWeb.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SpiderWeb.cs @@ -28,7 +28,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } - public override void Attack(GameTime gameTime) + public void Attack(GameTime gameTime) { } @@ -43,7 +43,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } - public override void Target() + public void Target() { throw new NotImplementedException(); } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Werewolf.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Werewolf.cs index 2d9ebae..c5f1b8c 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Werewolf.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Werewolf.cs @@ -12,6 +12,9 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters { public class Werewolf : CoreEnemy { + private bool isGoRight; + private bool isAttack; + public Werewolf(Vector2 position) : base(position) { name = "Wolf"; @@ -70,11 +73,11 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } } - public override void Attack(GameTime gameTime) + public void Attack(GameTime gameTime) { } - public override void Target() + public void Target() { throw new NotImplementedException(); } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs index 4ab4494..06c41a1 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs @@ -13,6 +13,9 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters { public class Zombie : CoreEnemy { + private bool isGoRight; + private bool isAttack; + float leftBorder; float rightBorder; bool isAttaking = false; @@ -118,7 +121,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } base.OnCollision(gameObject); } - public override void Target() + public void Target() { if (AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X - 50, (int)Pos.Y, Width + 100, Height), typeof(Player)).Count > 0) { @@ -149,7 +152,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } } - public override void Attack(GameTime gameTime) + public void Attack(GameTime gameTime) {} } }