diff --git a/DangerousD/Content/animations/WolfMoveLeft b/DangerousD/Content/animations/WolfMoveLeft index 924a49c..74a3dd0 100644 --- a/DangerousD/Content/animations/WolfMoveLeft +++ b/DangerousD/Content/animations/WolfMoveLeft @@ -1 +1 @@ -{"id":"WolfMoveLeft","textureName":"MonstersAnimations","startSpriteRectangle":{"X":1,"Y":292,"Width":32,"Height":32},"frameSecond":[{"Item1":0,"Item2":10}],"textureFrameInterval":1,"framesCount":4,"isCycle":true,"offset":"0, 0"} +{"id":"WolfMoveLeft","textureName":"MonstersAnimations","startSpriteRectangle":{"X":1,"Y":291,"Width":32,"Height":32},"frameSecond":[{"Item1":0,"Item2":10}],"textureFrameInterval":1,"framesCount":4,"isCycle":true,"offset":"0, 0"} diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/CoreEnemy.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/CoreEnemy.cs index 4fbe6ff..22ea566 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/CoreEnemy.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/CoreEnemy.cs @@ -13,9 +13,13 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities public abstract class CoreEnemy : LivingEntity { protected int monster_health; - protected int monster_speed; + protected float monster_speed = 2; protected string name; protected bool isAlive = true; + protected bool isAttack = false; + protected bool isGoRight; + protected int leftBoarder = 0; + protected int rightBoarder = 700; public CoreEnemy(Vector2 position) : base(position) { @@ -29,6 +33,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); @@ -41,5 +46,7 @@ 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 cd00606..f7591ac 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FlameSkull.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FlameSkull.cs @@ -18,10 +18,21 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters Height = 40; monster_speed = 3; name = "Skull"; + acceleration = Vector2.Zero; } protected override GraphicsComponent GraphicsComponent { get; } = new(new List { "FlameSkullMoveRight" , "FlameSkullMoveLeft"}, "FlameSkullMoveRight"); + public override void Update(GameTime gameTime) + { + if (!isAttack) + { + Move(gameTime); + } + + base.Update(gameTime); + } + public override void Attack() { @@ -34,7 +45,40 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters public override void Move(GameTime gameTime) { + if (isGoRight) + { + if (GraphicsComponent.GetCurrentAnimation != "FlameSkullMoveRight") + { + GraphicsComponent.StartAnimation("FlameSkullMoveRight"); + } + velocity.X = monster_speed; + } + else + { + if (GraphicsComponent.GetCurrentAnimation != "FlameSkullMoveLeft") + { + GraphicsComponent.StartAnimation("FlameSkullMoveLeft"); + } + velocity.X = -monster_speed; + } + if (Pos.X >= rightBoarder) + { + isGoRight = false; + } + else if (Pos.X <= leftBoarder) + { + isGoRight = true; + } + } + 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 b67dd12..807473e 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Frank.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Frank.cs @@ -12,6 +12,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters { internal class Frank : CoreEnemy { +<<<<<<< HEAD private Vector2 position; private bool isGoRight = false; @@ -23,13 +24,26 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters public Frank(Vector2 position) : base(position) { this.position = position; +======= + public Frank(Vector2 position) : base(position) + { + isGoRight = false; +>>>>>>> livingEntitiesVlad Width = 112; Height = 160; + leftBoarder = 50; + rightBoarder = 300; GraphicsComponent.StartAnimation("FrankMoveLeft"); - monster_speed = 1; + monster_speed = 2; name = "Frank"; } - protected override GraphicsComponent GraphicsComponent { get; } = new(new List { "FrankMoveRight", "FrankMoveLeft" }, "FrankMoveRight"); + protected override GraphicsComponent GraphicsComponent { get; } = new(new List { "FrankMoveRight", "FrankMoveLeft" }, "FrankMoveLeft"); + + public override void Update(GameTime gameTime) + { + Move(gameTime); + base.Update(gameTime); + } public override void Attack() { @@ -43,14 +57,8 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters public override void Move(GameTime gameTime) { - var player = AppManager.Instance.GameManager.players[0]; - if (player.Pos.X - _pos.X <= 20 || player.Pos.X - _pos.X <= -20) - { - player.Death(name); - } - if (isGoRight) - { + { if (GraphicsComponent.GetCurrentAnimation != "FrankMoveRight") { GraphicsComponent.StartAnimation("FrankMoveRight"); @@ -65,6 +73,24 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } velocity.X = -monster_speed; } + if (Pos.X >= rightBoarder) + { + isGoRight = false; + } + else if (Pos.X <= leftBoarder) + { + isGoRight = true; + } + } + + public override void Attack(GameTime gameTime) + { + + } + + public override void Target() + { + throw new NotImplementedException(); } } } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FrankBalls.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FrankBalls.cs index a235c3b..85d124e 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FrankBalls.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FrankBalls.cs @@ -37,6 +37,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters public override void Update(GameTime gameTime) { +<<<<<<< HEAD if(!isAttacking) { Move(gameTime); @@ -45,6 +46,11 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters base.Update(gameTime); } +======= + + base.Update(gameTime); + } +>>>>>>> livingEntitiesVlad public override void Attack() { collision = new Rectangle((int)position.X, (int)position.Y, 40, 40); @@ -82,5 +88,15 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters velocity.Y -= monster_speed; } } + + public override void Attack(GameTime gameTime) + { + + } + + public override void Target() + { + throw new NotImplementedException(); + } } } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Ghost.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Ghost.cs index 1e47e99..6236554 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Ghost.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Ghost.cs @@ -12,16 +12,28 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters { public Ghost(Vector2 position) : base(position) { - monster_speed = 1; + isGoRight = true; + monster_speed = 3; name = "Ghost"; Width = 48; Height = 62; GraphicsComponent.StartAnimation("GhostSpawn"); + acceleration = Vector2.Zero; } protected override GraphicsComponent GraphicsComponent { get; } = new(new List { "GhostMoveRight", "GhostMoveLeft", "GhostSpawn", "GhostAttack" }, "GhostMoveRight"); + public override void Update(GameTime gameTime) + { + if (!isAttack) + { + Move(gameTime); + } + + base.Update(gameTime); + } + public override void Attack() { @@ -34,7 +46,44 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters public override void Move(GameTime gameTime) { + if (isGoRight) + { + if (GraphicsComponent.GetCurrentAnimation != "GhostMoveRight") + { + GraphicsComponent.StartAnimation("GhostMoveRight"); + } + velocity.X = monster_speed; + } + else + { + if (GraphicsComponent.GetCurrentAnimation != "GhostMoveLeft") + { + GraphicsComponent.StartAnimation("GhostMoveLeft"); + } + velocity.X = -monster_speed; + } + if (Pos.X >= rightBoarder) + { + isGoRight = false; + } + else if (Pos.X <= leftBoarder) + { + isGoRight = true; + } + if (true) + { + } + } + + public override void Attack(GameTime gameTime) + { + + } + + public override void Target() + { + throw new NotImplementedException(); } } } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Hunchman.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Hunchman.cs index cc6ecd5..e309d9e 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Hunchman.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Hunchman.cs @@ -23,6 +23,11 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } + public override void Attack(GameTime gameTime) + { + + } + public override void Death() { @@ -32,5 +37,10 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters { } + + public override void Target() + { + throw new NotImplementedException(); + } } } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/HunchmanDagger.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/HunchmanDagger.cs index 9e616ed..9cd2b4f 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/HunchmanDagger.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/HunchmanDagger.cs @@ -27,6 +27,11 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } + public override void Attack(GameTime gameTime) + { + + } + public override void Death() { @@ -36,5 +41,10 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters { } + + public override void Target() + { + throw new NotImplementedException(); + } } } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasHands.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasHands.cs index d16936a..16c06e1 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasHands.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasHands.cs @@ -27,7 +27,12 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters public override void Attack() { - throw new NotImplementedException(); + + } + + public override void Attack(GameTime gameTime) + { + } public override void Death() @@ -55,6 +60,12 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters velocity.X = monster_speed; } } + + public override void Target() + { + throw new NotImplementedException(); + } + public override void Update(GameTime gameTime) { base.Update(gameTime); diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasMaster.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasMaster.cs index d4fb5d2..dfecd2d 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasMaster.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SilasMaster.cs @@ -61,6 +61,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } currentTime++; } +<<<<<<< HEAD private void SpawnAttackBall() { for (int i = 0; i < balls.Count; i++) @@ -70,9 +71,17 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } +======= + + public override void Attack(GameTime gameTime) + { + + } + +>>>>>>> livingEntitiesVlad public override void Death() { - throw new NotImplementedException(); + } public override void Move(GameTime gameTime) @@ -105,6 +114,12 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters isGoRight = true; } } + + public override void Target() + { + throw new NotImplementedException(); + } + public override void Update(GameTime gameTime) { base.Update(gameTime); diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Slime.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Slime.cs index 3234dc0..07e0600 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Slime.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Slime.cs @@ -51,6 +51,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters { GraphicsComponent.StartAnimation("SlimeReadyJumpLeftBottom"); +<<<<<<< HEAD } delay--; if (delay <= 0) @@ -149,6 +150,13 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters spriteBatch.Draw(debugTexture, new Rectangle((int)Pos.X, (int)Pos.Y + Height, 48, 5), Color.White); base.Draw(spriteBatch); } +======= + public override void Attack(GameTime gameTime) + { + + } + +>>>>>>> livingEntitiesVlad public override void Death() { @@ -233,5 +241,10 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters base.Update(gameTime); } + + public override void Target() + { + throw new NotImplementedException(); + } } } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Spider.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Spider.cs index bffa5f6..0d797aa 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Spider.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Spider.cs @@ -17,6 +17,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters protected int webLength; protected bool isDown; protected bool isDownUp; + public Spider(Vector2 position) : base(position) { isDownUp = true; @@ -27,7 +28,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters Height = 24; delay = 0; webLength = 0; - monster_speed = 1; + monster_speed = 2; acceleration = Vector2.Zero; } @@ -35,6 +36,29 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters public override void Update(GameTime gameTime) { + if (!isAttack) + { + Move(gameTime); + } + else + { + Attack(gameTime); + } + + base.Update(gameTime); + } + /// + /// НИЧЕГО НЕ ДЕЛАЕТ! НУЖЕН ДЛЯ ПЕРЕОПРЕДЕЛЕНИЯ + /// + public override void Attack() + { + } + /// + /// Атака паука РАБОЧАЯ + /// + /// + public override void Attack(GameTime gameTime) + { //48 72 if (isDownUp) { Width = 48; @@ -46,7 +70,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters webLength++; _pos.Y += 25; web.Height = webLength * 25; - web.SetPosition(new Vector2(_pos.X + Width / 2 - web.Width / 2, Pos.Y - 25 * webLength)); + web.SetPosition(new Vector2(_pos.X + Width / 2 - web.Width / 2 + 2, Pos.Y - 25 * webLength)); delay = 0; if (webLength == 4) { @@ -59,7 +83,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters webLength--; _pos.Y -= 25; web.Height = webLength * 25; - web.SetPosition(new Vector2(_pos.X + Width / 2 - web.Width / 2, Pos.Y - 25 * webLength)); + web.SetPosition(new Vector2(_pos.X + Width / 2 - web.Width / 2 + 2, Pos.Y - 25 * webLength)); delay = 0; if (webLength == 0) { @@ -72,12 +96,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters Height = 24; } } - - base.Update(gameTime); - } - public override void Attack() - { //48 72 - } public override void Draw(SpriteBatch spriteBatch) @@ -100,7 +118,35 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters public override void Move(GameTime gameTime) { + if (isGoRight) + { + if (GraphicsComponent.GetCurrentAnimation != "SpiderMoveRight") + { + GraphicsComponent.StartAnimation("SpiderMoveRight"); + } + velocity.X = monster_speed; + } + else + { + if (GraphicsComponent.GetCurrentAnimation != "SpiderMoveLeft") + { + GraphicsComponent.StartAnimation("SpiderMoveLeft"); + } + velocity.X = -monster_speed; + } + if (Pos.X >= rightBoarder) + { + isGoRight = false; + } + else if (Pos.X <= leftBoarder) + { + isGoRight = true; + } + } + public override void Target() + { + throw new NotImplementedException(); } } } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SpiderWeb.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SpiderWeb.cs index d91ccaf..cde2ab0 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SpiderWeb.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/SpiderWeb.cs @@ -28,6 +28,11 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters } + public override void Attack(GameTime gameTime) + { + + } + public override void Death() { @@ -37,5 +42,10 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters { } + + public override void Target() + { + throw new NotImplementedException(); + } } } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Werewolf.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Werewolf.cs index 9d5acb8..2d9ebae 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Werewolf.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Werewolf.cs @@ -15,13 +15,23 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters public Werewolf(Vector2 position) : base(position) { name = "Wolf"; - monster_speed = 1; + monster_speed = 4; Width = 78; Height = 96; } protected override GraphicsComponent GraphicsComponent { get; } = new(new List { "WolfMoveRight", "WolfMoveLeft", "WolfJumpRight", "WolfJumpLeft" }, "WolfMoveRight"); + public override void Update(GameTime gameTime) + { + if (!isAttack) + { + Move(gameTime); + } + + base.Update(gameTime); + } + public override void Attack() { @@ -34,7 +44,39 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters public override void Move(GameTime gameTime) { + if (isGoRight) + { + if (GraphicsComponent.GetCurrentAnimation != "WolfMoveRight") + { + GraphicsComponent.StartAnimation("WolfMoveRight"); + } + velocity.X = monster_speed; + } + else + { + if (GraphicsComponent.GetCurrentAnimation != "WolfMoveLeft") + { + GraphicsComponent.StartAnimation("WolfMoveLeft"); + } + velocity.X = -monster_speed; + } + if (Pos.X >= rightBoarder) + { + isGoRight = false; + } + else if (Pos.X <= leftBoarder) + { + isGoRight = true; + } + } + public override void Attack(GameTime gameTime) + { + } + + public override void Target() + { + throw new NotImplementedException(); } } } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs index 7302e72..a5d943d 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs @@ -17,8 +17,12 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters float leftBorder; float rightBorder; bool isAttaking = false; +<<<<<<< HEAD bool isTarget = false; PhysicsManager physicsManager; +======= + +>>>>>>> livingEntitiesVlad public Zombie(Vector2 position) : base(position) { Width = 24; @@ -112,6 +116,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters base.OnCollision(gameObject); } +<<<<<<< HEAD public void Target() { if(AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X-50, (int)Pos.Y, Width+100, Height), typeof(Player))!=null) @@ -130,6 +135,16 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters leftBorder = AppManager.Instance.GameManager.players[0].Pos.X; } } +======= + public override void Attack(GameTime gameTime) + { + throw new NotImplementedException(); + } + + public override void Target() + { + throw new NotImplementedException(); +>>>>>>> livingEntitiesVlad } } } diff --git a/DangerousD/GameCore/Levels/Level1.cs b/DangerousD/GameCore/Levels/Level1.cs new file mode 100644 index 0000000..29f1a6e --- /dev/null +++ b/DangerousD/GameCore/Levels/Level1.cs @@ -0,0 +1,33 @@ +using DangerousD.GameCore.GameObjects.LivingEntities; +using DangerousD.GameCore.GameObjects.MapObjects; +using Microsoft.Xna.Framework; +using DangerousD.GameCore.GameObjects.LivingEntities.Monsters; +using System.Collections.Generic; + +namespace DangerousD.GameCore.Levels +{ + public class Level1 : ILevel + { + public void InitLevel() + { + new Player(new Vector2(80,0)); + var Zombie = new Zombie(new Vector2(140, 128)); + var Frank = new Frank(new Vector2(300, 0)); + + var Spider = new Spider(new Vector2(112, 0)); + var FlameSkull = new FlameSkull(new Vector2(512, 0)); + var Werewolf = new Werewolf(new Vector2(640, 0)); + var Ghost = new Ghost(new Vector2(300, 0)); + var FrankBalls = new FrankBalls(new Vector2(Frank.Pos.X, Frank.Pos.Y)); + + var SilasHand = new SilasHands(new Vector2(200,64)); + var SilasMaster = new SilasMaster(new Vector2(400, 64)); + new GrassBlock(new Vector2(0, 224)); + for (int i = 0; i < 50; i++) + { + new GrassBlock(new Vector2(i*32, 256)); + } + new GrassBlock(new Vector2(500, 224)); + } + } +} diff --git a/DangerousD/GameCore/Managers/AppManager.cs b/DangerousD/GameCore/Managers/AppManager.cs index 3379b3c..bda0c27 100644 --- a/DangerousD/GameCore/Managers/AppManager.cs +++ b/DangerousD/GameCore/Managers/AppManager.cs @@ -178,6 +178,7 @@ namespace DangerousD.GameCore { foreach (NetworkTask networkTask in networkTasks) { +<<<<<<< HEAD switch (networkTask.operation) { case NetworkTaskOperationEnum.TakeDamage: @@ -198,6 +199,25 @@ namespace DangerousD.GameCore default: break; } +======= + case NetworkTaskOperationEnum.TakeDamage: + break; + case NetworkTaskOperationEnum.SendSound: + // SoundManager.StartSound(networkTask.name, networkTask.position, GameManager.GetPlayer1.Pos); + break; + case NetworkTaskOperationEnum.CreateEntity: + break; + case NetworkTaskOperationEnum.SendPosition: + break; + case NetworkTaskOperationEnum.ChangeState: + break; + case NetworkTaskOperationEnum.ConnectToHost: + break; + case NetworkTaskOperationEnum.GetClientPlayerId: + break; + default: + break; +>>>>>>> livingEntitiesVlad } } diff --git a/DangerousD/GameCore/Managers/GameManager.cs b/DangerousD/GameCore/Managers/GameManager.cs index f0ab19f..b12f88c 100644 --- a/DangerousD/GameCore/Managers/GameManager.cs +++ b/DangerousD/GameCore/Managers/GameManager.cs @@ -24,10 +24,15 @@ namespace DangerousD.GameCore public PhysicsManager physicsManager; public List players; public List otherObjects = new(); + public Player GetPlayer1 { get; private set; } public GameManager() { +<<<<<<< HEAD others = new List(); +======= + +>>>>>>> livingEntitiesVlad GetAllGameObjects = new List(); livingEntities = new List(); mapObjects = new List(); @@ -43,10 +48,15 @@ namespace DangerousD.GameCore internal void Register(GameObject gameObject) { +<<<<<<< HEAD GetAllGameObjects.Add(gameObject); if (gameObject is Player objPl) +======= + GetAllGameObjects.Add(gameObject); + if (gameObject is Player) +>>>>>>> livingEntitiesVlad { livingEntities.Add(gameObject as LivingEntity); players.Add(objPl); diff --git a/DangerousD/GameCore/Managers/PhysicsManager.cs b/DangerousD/GameCore/Managers/PhysicsManager.cs index c89d9c1..50b6da0 100644 --- a/DangerousD/GameCore/Managers/PhysicsManager.cs +++ b/DangerousD/GameCore/Managers/PhysicsManager.cs @@ -156,6 +156,7 @@ namespace DangerousD.GameCore.Managers } return gameObject; } + public GameObject RayCast(LivingEntity entity1, Vector2 targetCast) { Rectangle rectangle; @@ -196,7 +197,6 @@ namespace DangerousD.GameCore.Managers } return gameObject; } - public List CheckRectangle(Rectangle rectangle, Type type) { var gameObjects = AppManager.Instance.GameManager.GetAllGameObjects;