From 07412ddba135c5df4201c5661d0ad98d26e30730 Mon Sep 17 00:00:00 2001
From: N4K <pronin6030@gmail.com>
Date: Fri, 18 Aug 2023 05:46:37 +0300
Subject: [PATCH] fix conflicts

---
 DangerousD/GameCore/GUI/AbstractGui.cs               |  4 ----
 .../GameObjects/LivingEntities/Monsters/CoreEnemy.cs |  2 ++
 .../LivingEntities/Monsters/FlameSkull.cs            |  6 ++++--
 .../GameObjects/LivingEntities/Monsters/Frank.cs     |  4 +---
 .../LivingEntities/Monsters/FrankBalls.cs            |  7 +++----
 .../GameObjects/LivingEntities/Monsters/Ghost.cs     |  3 +--
 .../GameObjects/LivingEntities/Monsters/Hunchman.cs  |  2 +-
 .../LivingEntities/Monsters/HunchmanDagger.cs        |  2 +-
 .../LivingEntities/Monsters/SilasHands.cs            |  7 ++++---
 .../LivingEntities/Monsters/SilasMaster.cs           |  2 +-
 .../GameObjects/LivingEntities/Monsters/Slime.cs     |  2 +-
 .../GameObjects/LivingEntities/Monsters/Spider.cs    |  3 +--
 .../GameObjects/LivingEntities/Monsters/SpiderWeb.cs |  2 +-
 .../GameObjects/LivingEntities/Monsters/Werewolf.cs  |  3 +--
 .../GameObjects/LivingEntities/Monsters/Zombie.cs    | 12 +-----------
 DangerousD/GameCore/Managers/AppManager.cs           |  4 ----
 DangerousD/GameCore/Managers/MapManager.cs           |  5 -----
 17 files changed, 23 insertions(+), 47 deletions(-)

diff --git a/DangerousD/GameCore/GUI/AbstractGui.cs b/DangerousD/GameCore/GUI/AbstractGui.cs
index 2e30de0..a8dc9c0 100644
--- a/DangerousD/GameCore/GUI/AbstractGui.cs
+++ b/DangerousD/GameCore/GUI/AbstractGui.cs
@@ -19,11 +19,7 @@ public abstract class AbstractGui : IDrawableObject
     private GraphicsDevice graphicsDevice;
     public virtual void Initialize()
     {
-<<<<<<< HEAD
         Manager.Initialize(AppManager.Instance.GraphicsDevice);
-=======
-        Manager.Initialize(AppManager.Instance.GraphicsDevice); 
->>>>>>> ea55e2b4f2b2b9af627579f3c4b82bdf0171d80b
         CreateUI();
     }
 
diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/CoreEnemy.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/CoreEnemy.cs
index b7b4351..38b1cc0 100644
--- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/CoreEnemy.cs
+++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/CoreEnemy.cs
@@ -18,6 +18,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
         protected bool isAlive = true;
         protected int leftBoarder = 0;
         protected int rightBoarder = 800;
+        protected bool isGoRight;
 
         public CoreEnemy(Vector2 position) : base(position)
         {
@@ -31,6 +32,7 @@ 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);
 
diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FlameSkull.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FlameSkull.cs
index b4f3ec7..c93b40a 100644
--- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FlameSkull.cs
+++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FlameSkull.cs
@@ -12,7 +12,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
 {
     public class FlameSkull : CoreEnemy
     {
-        private bool isGoRight;
         private bool isAttack;
 
         public FlameSkull(Vector2 position) : base(position)
@@ -74,6 +73,9 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
             }
         }
 
-
+        public override void Attack(GameTime gameTime)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Frank.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Frank.cs
index 2afe14b..f164455 100644
--- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Frank.cs
+++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Frank.cs
@@ -12,8 +12,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
 {
     internal class Frank : CoreEnemy
     {
-        private bool isGoRight;
-
         public Frank(Vector2 position) : base(position)
         {
             isGoRight = false;
@@ -71,7 +69,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
             }
         }
 
-        public void Attack(GameTime gameTime)
+        public override void Attack(GameTime gameTime)
         {
 
         }
diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FrankBalls.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FrankBalls.cs
index 031d594..013ed10 100644
--- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FrankBalls.cs
+++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FrankBalls.cs
@@ -80,13 +80,12 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
                 velocity.Y -= monster_speed;
             }
         }
-
-        public void Attack(GameTime gameTime)
+        public void Target()
         {
-
+            throw new NotImplementedException();
         }
 
-        public void Target()
+        public override void Attack(GameTime gameTime)
         {
             throw new NotImplementedException();
         }
diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Ghost.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Ghost.cs
index 3df9012..214a4c2 100644
--- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Ghost.cs
+++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Ghost.cs
@@ -10,7 +10,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
 {
     public class Ghost : CoreEnemy
     {
-        private bool isGoRight;
         private bool isAttack;
 
         public Ghost(Vector2 position) : base(position)
@@ -79,7 +78,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
             }
         }
 
-        public void Attack(GameTime gameTime)
+        public override void Attack(GameTime gameTime)
         {
 
         }
diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Hunchman.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Hunchman.cs
index d804512..5db5359 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 void Attack(GameTime gameTime)
+        public override void Attack(GameTime gameTime)
         {
 
         }
diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/HunchmanDagger.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/HunchmanDagger.cs
index 9c2415b..740c360 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 void Attack(GameTime gameTime)
+        public override void Attack(GameTime gameTime)
         {
 
         }
diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasHands.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasHands.cs
index a54a59b..15018ea 100644
--- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasHands.cs
+++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasHands.cs
@@ -10,7 +10,8 @@ using System.Threading.Tasks;
 
 namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
 {
-    public class SilasHands : CoreEnemy
+    public class 
+        SilasHands : CoreEnemy
     {
         public SilasHands(Vector2 position) : base(position)
         {
@@ -30,9 +31,9 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
 
         }
 
-        public  void Attack(GameTime gameTime)
+        public override void Attack(GameTime gameTime)
         {
-
+            throw new NotImplementedException();
         }
 
         public override void Death()
diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasMaster.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasMaster.cs
index 1b502be..6b436b7 100644
--- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasMaster.cs
+++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasMaster.cs
@@ -70,7 +70,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
 
         }
 
-        public void Attack(GameTime gameTime)
+        public override void Attack(GameTime gameTime)
         {
 
         }
diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Slime.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Slime.cs
index c263a25..0f9e9c9 100644
--- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Slime.cs
+++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Slime.cs
@@ -237,7 +237,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
 
         }
 
-        public void Attack(GameTime gameTime)
+        public override void Attack(GameTime gameTime)
         {
 
         }
diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Spider.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Spider.cs
index 8bc703b..a4963bf 100644
--- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Spider.cs
+++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Spider.cs
@@ -14,7 +14,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
 {
     public class Spider : CoreEnemy
     {
-        private bool isGoRight;
         private bool isAttack;
 
         protected SpiderWeb web;
@@ -68,7 +67,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
         /// Атака паука РАБОЧАЯ
         /// </summary>
         /// <param name="gameTime"></param>
-        public void Attack(GameTime gameTime)
+        public override void Attack(GameTime gameTime)
         { //48 72
             velocity.X = 0;
             delay += (float)gameTime.ElapsedGameTime.TotalSeconds;
diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SpiderWeb.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SpiderWeb.cs
index 8bd0af1..c5971de 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 void Attack(GameTime gameTime)
+        public override void Attack(GameTime gameTime)
         {
 
         }
diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Werewolf.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Werewolf.cs
index c5f1b8c..837932f 100644
--- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Werewolf.cs
+++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Werewolf.cs
@@ -12,7 +12,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
 {
     public class Werewolf : CoreEnemy
     {
-        private bool isGoRight;
         private bool isAttack;
 
         public Werewolf(Vector2 position) : base(position)
@@ -73,7 +72,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
             }
         }
 
-        public void Attack(GameTime gameTime)
+        public override void Attack(GameTime gameTime)
         {
         }
 
diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs
index b1f8405..5a5711e 100644
--- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs
+++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs
@@ -13,7 +13,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
 {
     public class Zombie : CoreEnemy
     {
-        private bool isGoRight;
         private bool isAttack;
 
         float leftBorder;
@@ -128,12 +127,8 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
             }
             base.OnCollision(gameObject);
         }
-<<<<<<< HEAD
 
-        public override void Target()
-=======
         public void Target()
->>>>>>> ea55e2b4f2b2b9af627579f3c4b82bdf0171d80b
         {
             if (AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X - 50, (int)Pos.Y, Width + 100, Height), typeof(Player)).Count > 0)
             {
@@ -163,11 +158,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
                 rightBorder = 760;
             }
         }
-
-<<<<<<< HEAD
-        public override void Attack(GameTime gameTime) { }
-=======
-        public  void Attack(GameTime gameTime)
+        public override void Attack(GameTime gameTime)
         {}
 
         public void TakeDamage()
@@ -180,6 +171,5 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
                 Death();
             }
         }
->>>>>>> ea55e2b4f2b2b9af627579f3c4b82bdf0171d80b
     }
 }
diff --git a/DangerousD/GameCore/Managers/AppManager.cs b/DangerousD/GameCore/Managers/AppManager.cs
index 7b79e45..33327c7 100644
--- a/DangerousD/GameCore/Managers/AppManager.cs
+++ b/DangerousD/GameCore/Managers/AppManager.cs
@@ -205,12 +205,8 @@ namespace DangerousD.GameCore
                 case GameState.Lobby:
                     break;
                 case GameState.Game:
-<<<<<<< HEAD
-                    GameManager.mapManager.LoadLevel("map");
-=======
                     GameManager.mapManager.LoadLevel("lvl");
                     GameManager.FindBorders();
->>>>>>> main
                     break;
                 case GameState.Death:
                     break;
diff --git a/DangerousD/GameCore/Managers/MapManager.cs b/DangerousD/GameCore/Managers/MapManager.cs
index a97a2f5..6ab49b0 100644
--- a/DangerousD/GameCore/Managers/MapManager.cs
+++ b/DangerousD/GameCore/Managers/MapManager.cs
@@ -92,10 +92,6 @@ namespace DangerousD.GameCore.Managers
             float offsetY = group.Attributes["offsety"] is not null ? float.Parse(group.Attributes["offsety"].Value) : 0;
             foreach (XmlNode entity in group.ChildNodes)
             {
-<<<<<<< HEAD
-                Type type = Type.GetType($"DangerousD.GameCore.GameObjects.{entityType}");
-                Entity inst = (Entity)Activator.CreateInstance(type, new Vector2(float.Parse(entity.Attributes["x"].Value, CultureInfo.InvariantCulture) + offsetX, float.Parse(entity.Attributes["y"].Value, CultureInfo.InvariantCulture) + offsetY ) * _scale);
-=======
                 string entityType = entity.Attributes["type"] is not null ? "." + entity.Attributes["type"].Value : "";
                 Type type = Type.GetType($"DangerousD.GameCore.GameObjects.{entityGroup}{entityType}");
                 Vector2 pos =
@@ -110,7 +106,6 @@ namespace DangerousD.GameCore.Managers
                 {
                     inst = (Entity)Activator.CreateInstance(type, pos);
                 }
->>>>>>> ea55e2b4f2b2b9af627579f3c4b82bdf0171d80b
                 inst.SetPosition(new Vector2(inst.Pos.X, inst.Pos.Y - inst.Height));
                 inst.Height *= _scale;
                 inst.Width *= _scale;