progtime/DangerousD
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge?

Browse source
This commit is contained in:
N4K 2023-08-18 20:21:21 +03:00
parent 2dad49fc95
commit 868990579a
2 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Ghost.cs
View file

@ -111,20 +111,15 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
public void TakeDamage()
{
monster_health--;
<<<<<<< HEAD
public override void Target()
=======
if (monster_health <= 0)
{
Death();
}
}
public void Target()
>>>>>>> черешня
public override void Target()
{
throw new NotImplementedException();
}
}
}

18
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Werewolf.cs
View file

@ -18,17 +18,11 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
public Werewolf(Vector2 position) : base(position)
{
name = "Wolf";
<<<<<<< HEAD
monster_speed = 4;
Width = 39;
Height = 48;
=======
monster_speed = 3;
Width = 39;
Height = 48;
delay = 10;
monster_health = 3;
>>>>>>> черешня
}
protected override GraphicsComponent GraphicsComponent { get; } = new(new List<string> { "WolfMoveRight", "WolfMoveLeft", "WolfJumpRight", "WolfJumpLeft" }, "WolfMoveRight");
@ -108,10 +102,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
public override void Attack(GameTime gameTime)
{
}
<<<<<<< HEAD
public override void Target()
=======
public void Jump()
{
var getCols = AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X, (int)Pos.Y + Height / 2 - 2, 50, 2));
@ -157,11 +148,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
}
}
base.OnCollision(gameObject);/*/
}
public void Target()
>>>>>>> черешня
{
}
public void TakeDamage()
{
@ -173,5 +159,9 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
Death();
}
}
public override void Target()
{
}
}
}