merge commit
This commit is contained in:
commit
9568f313fd
2 changed files with 43 additions and 18 deletions
|
@ -7,23 +7,27 @@ using System.Collections.Generic;
|
|||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using DangerousD.GameCore.Managers;
|
||||
|
||||
namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
|
||||
{
|
||||
public class Zombie : CoreEnemy
|
||||
{
|
||||
private bool isGoRight = true;
|
||||
int leftBorder;
|
||||
int rightBorder;
|
||||
float leftBorder;
|
||||
float rightBorder;
|
||||
bool isAttaking = false;
|
||||
bool isTarget = false;
|
||||
PhysicsManager physicsManager;
|
||||
public Zombie(Vector2 position) : base(position)
|
||||
{
|
||||
Width = 72;
|
||||
Height = 120;
|
||||
Width = 24;
|
||||
Height = 40;
|
||||
monster_speed = 3;
|
||||
name = "Zombie";
|
||||
leftBorder = (int)position.X - 60;
|
||||
rightBorder = (int)position.X + 120;
|
||||
leftBorder = (int)position.X - 100;
|
||||
rightBorder = (int)position.X + 100;
|
||||
physicsManager = new PhysicsManager();
|
||||
}
|
||||
protected override GraphicsComponent GraphicsComponent { get; } = new(new List<string> { "ZombieMoveRight", "ZombieMoveLeft", "ZombieRightAttack", "ZombieLeftAttack" }, "ZombieMoveLeft");
|
||||
|
||||
|
@ -31,6 +35,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
|
|||
{
|
||||
if (!isAttaking)
|
||||
{
|
||||
Target();
|
||||
Move(gameTime);
|
||||
}
|
||||
|
||||
|
@ -106,5 +111,25 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
|
|||
}
|
||||
base.OnCollision(gameObject);
|
||||
}
|
||||
|
||||
public void Target()
|
||||
{
|
||||
if(physicsManager.RayCast(this, AppManager.Instance.GameManager.players[0]) == null)
|
||||
{
|
||||
if(isGoRight && this._pos.X <= AppManager.Instance.GameManager.players[0].Pos.X)
|
||||
{
|
||||
isTarget = true;
|
||||
leftBorder = Pos.X - 10;
|
||||
rightBorder = Pos.X + AppManager.Instance.GameManager.players[0].Pos.X;
|
||||
}
|
||||
|
||||
else if(!isGoRight && this._pos.X >= AppManager.Instance.GameManager.players[0].Pos.X)
|
||||
{
|
||||
isTarget = true;
|
||||
rightBorder = Pos.X + 10;
|
||||
leftBorder = AppManager.Instance.GameManager.players[0].Pos.X;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -10,18 +10,16 @@ namespace DangerousD.GameCore.Levels
|
|||
{
|
||||
public void InitLevel()
|
||||
{
|
||||
new Player(new Vector2(0,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(730, 0));
|
||||
var Frank = new Frank(new Vector2(100, 64));
|
||||
var FrankBalls = new FrankBalls(new Vector2(Frank.Pos.X, Frank.Pos.Y));
|
||||
var Zombie = new Zombie(new Vector2(300, 64));
|
||||
|
||||
var SilasHand = new SilasHands(new Vector2(200,64));
|
||||
var SilasMaster = new SilasMaster(new Vector2(400, 64));
|
||||
new Player(new Vector2(80,0));
|
||||
var Zombie = new Zombie(new Vector2(250, 128));
|
||||
//var Frank = new Frank(new Vector2(384, 128));
|
||||
//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(730, 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++)
|
||||
{
|
||||
|
@ -30,6 +28,8 @@ namespace DangerousD.GameCore.Levels
|
|||
new GrassBlock(new Vector2(500, 224));
|
||||
Player player = new Player(new Vector2(400, 64));
|
||||
player.AnimationJump();
|
||||
|
||||
//new GrassBlock(new Vector2(500, 224));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue