From 77c6ec9bcac98d659d3145b5691379d0bda3e97a Mon Sep 17 00:00:00 2001
From: Timofey06 <tima.loktionov@yandex.ru>
Date: Fri, 18 Aug 2023 12:53:44 +0300
Subject: [PATCH 1/5] AddBossArena

---
 DangerousD/Content/LastLvl.tmx                | 130 ++++++++++++++++++
 DangerousD/GameCore/GameObjects/GameObject.cs |   4 +-
 .../GameCore/Graphics/GraphicsComponent.cs    |   3 +-
 DangerousD/GameCore/Managers/AppManager.cs    |   2 +-
 4 files changed, 134 insertions(+), 5 deletions(-)
 create mode 100644 DangerousD/Content/LastLvl.tmx

diff --git a/DangerousD/Content/LastLvl.tmx b/DangerousD/Content/LastLvl.tmx
new file mode 100644
index 0000000..2efe988
--- /dev/null
+++ b/DangerousD/Content/LastLvl.tmx
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="left-up" width="30" height="20" tilewidth="16" tileheight="16" infinite="1" nextlayerid="7" nextobjectid="5">
+ <tileset firstgid="1" source="map.tsx"/>
+ <layer id="2" name="Platform" class="StopTile" width="30" height="20">
+  <data encoding="csv">
+   <chunk x="-32" y="0" width="16" height="16">
+410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,
+410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+410,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</chunk>
+   <chunk x="-16" y="0" width="16" height="16">
+410,410,410,410,410,410,410,410,410,410,410,410,410,410,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,410,0,0
+</chunk>
+   <chunk x="-32" y="16" width="16" height="16">
+410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</chunk>
+   <chunk x="-16" y="16" width="16" height="16">
+410,410,410,410,410,410,410,410,410,410,410,410,410,410,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</chunk>
+  </data>
+ </layer>
+ <layer id="3" name="BackGround" class="Tile" width="30" height="20">
+  <data encoding="csv">
+   <chunk x="-32" y="0" width="16" height="16">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,376,375,369,370,388,389,726,390,369,370,376,389,376,388,726,
+0,376,389,369,370,390,726,388,388,369,370,390,726,388,389,389,
+0,388,726,369,370,390,377,375,377,369,370,431,389,389,431,431,
+0,389,431,369,370,377,377,389,388,369,370,431,389,375,375,431,
+0,377,377,369,370,390,376,389,431,369,370,375,375,726,388,390,
+0,388,431,369,370,388,390,376,726,369,370,375,377,376,388,377,
+0,388,375,369,370,376,375,377,388,369,370,376,375,389,388,431,
+0,390,726,369,370,377,431,431,388,369,370,389,390,390,376,377,
+0,377,376,369,370,389,377,431,376,369,370,389,431,726,431,388,
+0,377,431,369,370,375,390,390,377,369,370,375,377,389,388,376,
+0,390,390,369,370,431,376,389,390,369,370,390,431,376,389,390,
+0,431,377,369,370,376,390,388,388,369,370,377,375,390,389,377,
+0,390,726,369,370,375,377,726,390,369,370,389,376,388,388,375,
+0,390,389,382,383,388,377,388,390,382,383,431,726,390,388,431,
+0,389,377,395,396,389,431,377,431,395,396,375,388,726,376,389
+</chunk>
+   <chunk x="-16" y="0" width="16" height="16">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+389,388,375,369,370,388,377,389,389,369,370,390,375,0,0,0,
+390,388,726,369,370,375,726,376,726,369,370,388,375,0,0,0,
+388,389,431,369,370,726,377,726,431,369,370,377,375,0,0,0,
+388,376,431,369,370,377,375,726,726,369,370,431,376,0,0,0,
+376,389,388,369,370,377,390,431,389,369,370,376,431,0,0,0,
+389,388,389,369,370,376,726,390,377,369,370,389,377,0,0,0,
+431,377,389,369,370,431,726,726,389,369,370,431,390,0,0,0,
+390,389,377,369,370,390,390,376,431,369,370,390,376,0,0,0,
+388,388,377,369,370,388,431,390,388,369,370,389,377,0,0,0,
+388,389,390,369,370,726,377,377,388,369,370,390,390,0,0,0,
+388,376,390,369,370,377,377,389,726,369,370,375,726,0,0,0,
+431,726,390,369,370,375,431,377,726,369,370,389,389,0,0,0,
+390,388,726,369,370,389,375,390,388,369,370,377,726,0,0,0,
+375,375,375,382,383,376,390,726,388,382,383,431,726,0,0,0,
+389,389,390,395,396,390,390,726,390,395,396,431,390,0,0,0
+</chunk>
+  </data>
+ </layer>
+ <objectgroup id="5" name="SilasMaster" class="LivingEntities.Monsters.SilasMaster">
+  <object id="1" x="-279.333" y="121.333">
+   <point/>
+  </object>
+ </objectgroup>
+ <objectgroup id="6" name="player" class="LivingEntities.Player">
+  <object id="3" x="-329.333" y="111.333">
+   <point/>
+  </object>
+ </objectgroup>
+</map>
diff --git a/DangerousD/GameCore/GameObjects/GameObject.cs b/DangerousD/GameCore/GameObjects/GameObject.cs
index a583904..030334a 100644
--- a/DangerousD/GameCore/GameObjects/GameObject.cs
+++ b/DangerousD/GameCore/GameObjects/GameObject.cs
@@ -62,9 +62,7 @@ namespace DangerousD.GameCore
             if (AppManager.Instance.InputManager.CollisionsCheat)
             {
                 spriteBatch.Draw(debugTexture,
-                    new Rectangle(Rectangle.X - GraphicsComponent.CameraPosition.X,
-                        Rectangle.Y - GraphicsComponent.CameraPosition.Y, Rectangle.Width, Rectangle.Height),
-                    Color.White);
+                                     new Rectangle((Rectangle.X - GraphicsComponent.CameraPosition.X) * GraphicsComponent.scaling, (Rectangle.Y - GraphicsComponent.CameraPosition.Y) * GraphicsComponent.scaling, Rectangle.Width * GraphicsComponent.scaling, Rectangle.Height * GraphicsComponent.scaling),Color.White);
             }
 
         }
diff --git a/DangerousD/GameCore/Graphics/GraphicsComponent.cs b/DangerousD/GameCore/Graphics/GraphicsComponent.cs
index 5a659c8..589096d 100644
--- a/DangerousD/GameCore/Graphics/GraphicsComponent.cs
+++ b/DangerousD/GameCore/Graphics/GraphicsComponent.cs
@@ -5,6 +5,7 @@ using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Cryptography.X509Certificates;
 using System.Text;
 
 namespace DangerousD.GameCore.Graphics
@@ -17,7 +18,7 @@ namespace DangerousD.GameCore.Graphics
         private List<Texture2D> textures;
         private List<string> texturesNames;
         private AnimationContainer currentAnimation;
-        static private int scaling = 4;
+        static public int scaling = 4;
         public AnimationContainer CurrentAnimation
         {
             get
diff --git a/DangerousD/GameCore/Managers/AppManager.cs b/DangerousD/GameCore/Managers/AppManager.cs
index 33327c7..25dfeb2 100644
--- a/DangerousD/GameCore/Managers/AppManager.cs
+++ b/DangerousD/GameCore/Managers/AppManager.cs
@@ -205,7 +205,7 @@ namespace DangerousD.GameCore
                 case GameState.Lobby:
                     break;
                 case GameState.Game:
-                    GameManager.mapManager.LoadLevel("lvl");
+                    GameManager.mapManager.LoadLevel("LastLvl");
                     GameManager.FindBorders();
                     break;
                 case GameState.Death:

From 2cb30ab0f38dba48793948308402790e1016ea5e Mon Sep 17 00:00:00 2001
From: Kaktus200020 <artemkremnev2007@gmail.com>
Date: Fri, 18 Aug 2023 14:54:00 +0300
Subject: [PATCH 2/5] NiceBalls

---
 .../LivingEntities/Monsters/FrankBalls.cs     | 81 +++++++++++++------
 1 file changed, 55 insertions(+), 26 deletions(-)

diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FrankBalls.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FrankBalls.cs
index 013ed10..9400485 100644
--- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FrankBalls.cs
+++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FrankBalls.cs
@@ -15,6 +15,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
         private Rectangle collision;
         private Vector2 position;
         private bool isFlyRight = true;
+        private bool isFlyUp = true;
         private bool isAttacking = false;
 
         public Rectangle Collision
@@ -29,6 +30,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
             Width = 40;
             Height = 40;
             monster_speed = 3;
+            velocity = new Vector2(3,-3);
             acceleration = Vector2.Zero;
         }
 
@@ -36,27 +38,24 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
 
         public override void Update(GameTime gameTime)
         {
-            if(!isAttacking)
-            {
-                Move(gameTime);
-            }
-
+            Move(gameTime);
+            AppManager.Instance.DebugHUD.Set(name, velocity.ToString());
             base.Update(gameTime);
         }
         public override void Attack()
         {
-            collision = new Rectangle((int)position.X, (int)position.Y, 40, 40);
-            isAttacking = true;
 
-            if(isFlyRight)
+        }
+        public override void OnCollision(GameObject gameObject)
+        {
+            if (gameObject is Player)
             {
-                AppManager.Instance.GameManager.players[0].Death(name);
+                if (AppManager.Instance.GameManager.players[0].IsAlive)
+                {
+                    AppManager.Instance.GameManager.players[0].Death(name);
+                }
             }
-            else if(!isFlyRight)
-            {
-                AppManager.Instance.GameManager.players[0].Death(name);
-            }
-
+            base.OnCollision(gameObject);
         }
 
         public override void Death()
@@ -66,20 +65,50 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
 
         public override void Move(GameTime gameTime)
         {
-            velocity.X = 0;
-            velocity.Y = 0;
+            
+            var getColsHor = AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X, (int)Pos.Y + Height / 2 - 2, 50, 2));
+            var getColsVer= AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X, (int)Pos.Y + Height / 2 - 2, 50, 2)); ;
+            if (isFlyRight)
+            {
+                getColsHor = AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X, (int)Pos.Y , 42, 40));
+                if(getColsHor.Count > 0)
+                {
+                    isFlyRight = false;
+                    velocity.X = -velocity.X;
+                }
+            }
+            else
+            {
+                getColsHor = AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X-2, (int)Pos.Y, 42, 40));
+                if (getColsHor.Count > 0)
+                {
+                    isFlyRight = true;
+                    velocity.X = -velocity.X;
+                }
+            }
+            if (isFlyUp)
+            {
+                
+                getColsVer = AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X , (int)Pos.Y-3, 40, 43));
+                if (getColsVer.Count > 0)
+                {
+                    isFlyUp = false;
+                    velocity.Y = -velocity.Y;
+                }
+            }
+            else
+            {
+                getColsVer = AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X, (int)Pos.Y, 40, 43));
+                if (getColsVer.Count > 0)
+                {
+                    isFlyUp = true;
+                    velocity.Y = -velocity.Y;
+                }
+            }
 
-            if(isFlyRight)
-            {
-                velocity.X += monster_speed;
-                velocity.Y += monster_speed;
-            }
-            else if(!isFlyRight)
-            {
-                velocity.X -= monster_speed;
-                velocity.Y -= monster_speed;
-            }
+           
         }
+
         public void Target()
         {
             throw new NotImplementedException();

From e587ee34efd5d43681b33084abb6f4b8e037f918 Mon Sep 17 00:00:00 2001
From: Timofey06 <tima.loktionov@yandex.ru>
Date: Fri, 18 Aug 2023 16:37:59 +0300
Subject: [PATCH 3/5] StartRestart

---
 DangerousD/GameCore/Managers/AppManager.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/DangerousD/GameCore/Managers/AppManager.cs b/DangerousD/GameCore/Managers/AppManager.cs
index 10124d6..d871eae 100644
--- a/DangerousD/GameCore/Managers/AppManager.cs
+++ b/DangerousD/GameCore/Managers/AppManager.cs
@@ -38,7 +38,7 @@ namespace DangerousD.GameCore
         IDrawableObject HUD;
         public DebugHUD DebugHUD;
         public List<NetworkTask> NetworkTasks = new List<NetworkTask>();
-
+        public string currentMap;
         public GameManager GameManager { get; private set; } = new();
         public AnimationBuilder AnimationBuilder { get; private set; } = new AnimationBuilder();
         public NetworkManager NetworkManager { get; private set; } = new NetworkManager();
@@ -74,6 +74,7 @@ namespace DangerousD.GameCore
             DebugHUD = new DebugHUD();
             UIManager.resolution = resolution;
             UIManager.resolutionInGame = inGameResolution;
+            currentMap = "lvl";
         }
 
         protected override void Initialize()
@@ -204,7 +205,7 @@ namespace DangerousD.GameCore
                 case GameState.Lobby:
                     break;
                 case GameState.Game:
-                    GameManager.mapManager.LoadLevel("LastLvl");
+                    GameManager.mapManager.LoadLevel(currentMap);
                     GameManager.FindBorders();
                     break;
                 case GameState.Death:
@@ -290,5 +291,9 @@ namespace DangerousD.GameCore
         {
             this.multiPlayerStatus = multiPlayerStatus;
         }
+        public void Restart(string map)
+        {
+
+        }
     }
 }

From eb89ae4de9eee7111ec5601358628d680303dc01 Mon Sep 17 00:00:00 2001
From: AnloGames <7383an@gmail.com>
Date: Fri, 18 Aug 2023 16:50:18 +0300
Subject: [PATCH 4/5] GameOver NetworkSupport

---
 DangerousD/GameCore/GameObjects/GameObject.cs |  1 +
 .../LivingEntities/Monsters/Zombie.cs         | 20 +++++++++----
 DangerousD/GameCore/Managers/AppManager.cs    | 13 ++++++++-
 DangerousD/GameCore/Network/NetworkTask.cs    | 29 +++++++++----------
 .../Network/NetworkTaskOperationEnum.cs       |  2 +-
 5 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/DangerousD/GameCore/GameObjects/GameObject.cs b/DangerousD/GameCore/GameObjects/GameObject.cs
index 8526427..60009ee 100644
--- a/DangerousD/GameCore/GameObjects/GameObject.cs
+++ b/DangerousD/GameCore/GameObjects/GameObject.cs
@@ -15,6 +15,7 @@ namespace DangerousD.GameCore
         protected Vector2 _pos;
         public Vector2 Pos => _pos;
         public int id;
+        public bool isChildEntity = false;
         public bool isIdFromHost = false;
         public int Width { get; set; }
         public int Height { get; set; }
diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs
index c1737f2..c8c685c 100644
--- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs
+++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using DangerousD.GameCore.Managers;
+using DangerousD.GameCore.Network;
 
 namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
 {
@@ -62,6 +63,10 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
         }
 
         public override void Attack()
+        {
+            AppManager.Instance.GameManager.GetPlayer1.Death(name);
+        }
+        public void PlayAttackAnimation()
         {
             velocity.X = 0;
             isAttaking = true;
@@ -71,7 +76,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
                 {
                     GraphicsComponent.StartAnimation("ZombieRightAttack");
                 }
-                AppManager.Instance.GameManager.players[0].Death(name);
             }
             else if (!isGoRight)
             {
@@ -79,7 +83,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
                 {
                     GraphicsComponent.StartAnimation("ZombieLeftAttack");
                 }
-                AppManager.Instance.GameManager.players[0].Death(name);
             }
         }
 
@@ -120,12 +123,19 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
         }
         public override void OnCollision(GameObject gameObject)
         {
-            if(gameObject is Player)
+            if (gameObject.id == AppManager.Instance.GameManager.GetPlayer1.id && AppManager.Instance.GameManager.GetPlayer1.IsAlive)
             {
-                if (AppManager.Instance.GameManager.players[0].IsAlive)
+                if (AppManager.Instance.multiPlayerStatus != MultiPlayerStatus.Client)
                 {
                     Attack();
-                    
+                }
+            }
+            else if (gameObject is Player)
+            {
+                if (AppManager.Instance.multiPlayerStatus == MultiPlayerStatus.Host)
+                {
+                    NetworkTask task = new NetworkTask();
+                    AppManager.Instance.NetworkTasks.Add(task.KillPlayer(gameObject.id, name));
                 }
             }
             base.OnCollision(gameObject);
diff --git a/DangerousD/GameCore/Managers/AppManager.cs b/DangerousD/GameCore/Managers/AppManager.cs
index 5a2cf29..12616f9 100644
--- a/DangerousD/GameCore/Managers/AppManager.cs
+++ b/DangerousD/GameCore/Managers/AppManager.cs
@@ -220,7 +220,12 @@ namespace DangerousD.GameCore
             {
                 switch (networkTask.operation)
                 {
-                    case NetworkTaskOperationEnum.TakeDamage:
+                    case NetworkTaskOperationEnum.DeleteObject:
+                        GameObject gameObject = GameManager.GetAllGameObjects.Find(x => x.id == networkTask.objId);
+                        if (gameObject != null)
+                        {
+                            GameManager.Remove(gameObject);
+                        }
                         break;
                     case NetworkTaskOperationEnum.SendSound:
                         SoundManager.StartSound(networkTask.name, networkTask.position, GameManager.GetPlayer1.Pos);
@@ -276,6 +281,12 @@ namespace DangerousD.GameCore
                         remoteConnectedPlayer.id = networkTask.objId;
                         remoteConnectedPlayer.GetGraphicsComponent().parentId = networkTask.objId;
                         break;
+                    case NetworkTaskOperationEnum.KillPlayer:
+                        Player player1 = GameManager.players.Find(x => x.id==networkTask.objId);
+                        player1.Death(networkTask.name);
+                        NetworkTask task1 = new NetworkTask();
+                        NetworkTasks.Add(task1.DeleteObject(player1.id));
+                        break;
                     default:
                         break;
                 }
diff --git a/DangerousD/GameCore/Network/NetworkTask.cs b/DangerousD/GameCore/Network/NetworkTask.cs
index 8611d78..f9b6072 100644
--- a/DangerousD/GameCore/Network/NetworkTask.cs
+++ b/DangerousD/GameCore/Network/NetworkTask.cs
@@ -20,18 +20,6 @@ namespace DangerousD.GameCore.Network
         public Type type { get; set; }
 
         public NetworkTask() { }
-        /// <summary>
-        /// Нанести урон сущности
-        /// </summary>
-        /// <param name="LivingEntityId"></param>
-        /// <param name="Damage"></param>
-        public NetworkTask(int LivingEntityId, int Damage)
-        {
-            operation = NetworkTaskOperationEnum.TakeDamage;
-            objId = LivingEntityId;
-            value = Damage;
-        }
-
         /// <summary>
         /// Проиграть звук на позиции
         /// </summary>
@@ -49,14 +37,12 @@ namespace DangerousD.GameCore.Network
         /// </summary>
         /// <param name="EntityType"></param>
         /// <param name="EntityPosition"></param>
-        /// <param name="EntityVelocity"></param>
         /// <param name="ParentId"></param>
-        public NetworkTask(Type EntityType, Vector2 EntityPosition, Vector2 EntityVelocity, int ParentId)
+        public NetworkTask(Type EntityType, Vector2 EntityPosition, int ParentId)
         {
             operation = NetworkTaskOperationEnum.CreateEntity;
             type = EntityType;
             position = EntityPosition;
-            velocity = EntityVelocity;
             objId = ParentId;
         }
 
@@ -134,5 +120,18 @@ namespace DangerousD.GameCore.Network
             position = playerPosition;
             return this;
         }
+        public NetworkTask DeleteObject(int objectId)
+        {
+            operation = NetworkTaskOperationEnum.DeleteObject;
+            objId = objectId;
+            return this;
+        }
+        public NetworkTask KillPlayer(int playerId, string mosterName)
+        {
+            operation = NetworkTaskOperationEnum.KillPlayer;
+            name = mosterName;
+            objId = playerId;
+            return this;
+        }
     }
 }
diff --git a/DangerousD/GameCore/Network/NetworkTaskOperationEnum.cs b/DangerousD/GameCore/Network/NetworkTaskOperationEnum.cs
index 7fad430..5b746f5 100644
--- a/DangerousD/GameCore/Network/NetworkTaskOperationEnum.cs
+++ b/DangerousD/GameCore/Network/NetworkTaskOperationEnum.cs
@@ -9,6 +9,6 @@ namespace DangerousD.GameCore.Network
     [Serializable]
     public enum NetworkTaskOperationEnum
     {
-        TakeDamage, SendSound, CreateEntity, SendPosition, ChangeState, ConnectToHost, GetClientPlayerId, AddConnectedPlayer
+        DeleteObject, SendSound, CreateEntity, SendPosition, ChangeState, ConnectToHost, GetClientPlayerId, AddConnectedPlayer, KillPlayer
     }
 }

From 7e300eb46dd10496bf118440a416f50c49ebfa1b Mon Sep 17 00:00:00 2001
From: Mootfrost777 <andrey13102007@gmail.com>
Date: Fri, 18 Aug 2023 17:08:35 +0300
Subject: [PATCH 5/5] Lvel1 mobs

---
 DangerousD/Content/Door.tsx |  2 +-
 DangerousD/Content/lvl.tmx  | 40 ++++++++++++++++++++++++++++++++++---
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/DangerousD/Content/Door.tsx b/DangerousD/Content/Door.tsx
index a250dd5..8e5687c 100644
--- a/DangerousD/Content/Door.tsx
+++ b/DangerousD/Content/Door.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <tileset version="1.10" tiledversion="1.10.2" name="Door" tilewidth="32" tileheight="48" tilecount="2" columns="2">
- <image source="door.png" width="64" height="48"/>
+ <image source="doors.png" width="64" height="48"/>
 </tileset>
diff --git a/DangerousD/Content/lvl.tmx b/DangerousD/Content/lvl.tmx
index 5fcea6a..5d448e5 100644
--- a/DangerousD/Content/lvl.tmx
+++ b/DangerousD/Content/lvl.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="left-up" width="30" height="20" tilewidth="16" tileheight="16" infinite="1" nextlayerid="15" nextobjectid="80">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="left-up" width="30" height="20" tilewidth="16" tileheight="16" infinite="1" nextlayerid="18" nextobjectid="105">
  <tileset firstgid="1" name="map" tilewidth="16" tileheight="16" tilecount="871" columns="13">
   <image source="tiles.BMP" width="208" height="1072"/>
  </tileset>
@@ -683,7 +683,7 @@
   <object id="36" x="70" y="181">
    <point/>
   </object>
-  <object id="37" x="20" y="87">
+  <object id="37" x="39.3333" y="87.6667">
    <point/>
   </object>
   <object id="38" x="99.5" y="84.5">
@@ -698,13 +698,47 @@
   <object id="41" x="582" y="83">
    <point/>
   </object>
+  <object id="80" x="-139.333" y="84">
+   <point/>
+  </object>
+  <object id="81" x="620.667" y="180">
+   <point/>
+  </object>
+  <object id="103" x="-96.6667" y="270">
+   <point/>
+  </object>
+  <object id="104" x="693.333" y="477.333">
+   <point/>
+  </object>
+ </objectgroup>
+ <objectgroup id="15" name="Monster" class="LivingEntities.Monsters">
+  <object id="82" type="FlameSkull" x="68.6667" y="279.333">
+   <point/>
+  </object>
+  <object id="97" type="Werewolf" x="536" y="88.6667">
+   <point/>
+  </object>
+ </objectgroup>
+ <objectgroup id="17" name="Hunchman" class="LivingEntities.Monsters.Hunchman">
+  <object id="98" x="-92" y="144">
+   <point/>
+  </object>
+  <object id="99" x="115.333" y="182">
+   <point/>
+  </object>
+  <object id="100" x="191.333" y="277.333">
+   <point/>
+  </object>
+  <object id="101" x="249.333" y="88.6667">
+   <point/>
+  </object>
  </objectgroup>
  <objectgroup id="10" name="Player" class="LivingEntities.Player">
   <object id="47" x="-500" y="461.333">
    <point/>
   </object>
  </objectgroup>
- <objectgroup id="12" name="Doors" class="Entities.Door">
+ <objectgroup id="12" name="Doors" class="Entities.Door" visible="0">
   <object id="69" gid="873" x="640" y="64" width="32" height="48"/>
   <object id="70" gid="872" x="672" y="192" width="32" height="48"/>
   <object id="71" gid="872" x="672" y="288" width="32" height="48"/>