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

flameskull move fix

Browse source
This commit is contained in:
N4K 2023-08-18 18:26:08 +03:00
parent 6714513814
commit 0921ecc24c
4 changed files with 33 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FlameSkull.cs
View file

@ -14,25 +14,27 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
{ {
private bool isAttack; private bool isAttack;
protected Vector2 startPosition; protected Vector2 startPosition;
protected Vector2[] positions = { new Vector2(-25, 242), new Vector2(-25, 332), new Vector2(582, 332), new Vector2(-25, 332), /*protected Vector2[] positions = { new Vector2(0, 242), new Vector2(0, 332), new Vector2(582, 332), new Vector2(0, 332),
new Vector2(-25, 444), new Vector2(581, 444), new Vector2(-25, 444), new Vector2(-25, 242), new Vector2(-25, 242), new Vector2(0, 444), new Vector2(582, 444), new Vector2(0, 444), new Vector2(0, 242), new Vector2(582, 242),
new Vector2(-25, 242), new Vector2(-25, 149), new Vector2(-25, 149) }; new Vector2(0, 242), new Vector2(0, 149), new Vector2(582, 149), new Vector2(0,149)};*/
protected Vector2[] positions = { new Vector2(0,246), new Vector2(0, 344), new Vector2(550,344), new Vector2(520, 246)};
protected int i; protected int i;
public FlameSkull(Vector2 position) : base(position) public FlameSkull(Vector2 position) : base(position)
{ { // v3 -> v2 -> s2 -> v2 -> v1 -> s1 -> v1 -> v3 -> s3 -> v3 -> v4 -> s4 -> v4
//581 149 stairs 4 [7] //0 149 verv 4 [7]
//-25 149 verv 4 [6] //582 108 stairs 4 [6]
//-25 242 spawn 3 [5] //0 242 verv 3 [5]
//-25 242 verv 3 [4] //582 220 stairs 3 [4]
//-25 332 verv 2 [3] //0 332 verv 2 [3]
//582 332 stairs 2 [2] //582 332 stairs 2 [2]
//-25 444 verv 1 [1] //0 444 verv 1 [1]
//581 444 stairs 1 [0] //582 444 stairs 1 [0]
startPosition = new Vector2(500, 242);
_pos = startPosition;
i = 0; i = 0;
Width = 62; Width = 31;
Height = 40; Height = 20;
monster_speed = 1; monster_speed = 2;
name = "Skull"; name = "Skull";
acceleration = Vector2.Zero; acceleration = Vector2.Zero;
startPosition = new Vector2(); startPosition = new Vector2();
@ -42,6 +44,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
public override void Update(GameTime gameTime) public override void Update(GameTime gameTime)
{ {
AppManager.Instance.DebugHUD.Set("number i: ", i.ToString());
if (!isAttack) if (!isAttack)
{ {
Move(gameTime); Move(gameTime);
@ -110,6 +113,10 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
i++; i++;
} }
} }
if (i == positions.Length)
{
i = 0;
}
} }
public override void Attack(GameTime gameTime) public override void Attack(GameTime gameTime)

10
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/FrankBalls.cs
View file

@ -108,19 +108,15 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
} }
<<<<<<< HEAD
public override void Target()
=======
public void Target() public override void Target()
>>>>>>> 211eac278c07f06a177b7be1fc84dd05cbf5c449
{ {
throw new NotImplementedException();
} }
public override void Attack(GameTime gameTime) public override void Attack(GameTime gameTime)
{ {
throw new NotImplementedException();
} }
} }
} }

16
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Spider.cs
View file

@ -33,8 +33,8 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
isDown = true; isDown = true;
physicsManager = AppManager.Instance.GameManager.physicsManager; physicsManager = AppManager.Instance.GameManager.physicsManager;
name = "Spider"; name = "Spider";
Width = 112; Width = 28;
Height = 24; Height = 6;
widthS = Width; widthS = Width;
web = new SpiderWeb(new Vector2(Pos.X+Width/2,Pos.Y)); web = new SpiderWeb(new Vector2(Pos.X+Width/2,Pos.Y));
delay = 0; delay = 0;
@ -80,8 +80,8 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
if (delay > 0.25 && webLength <= 4 && isDown) if (delay > 0.25 && webLength <= 4 && isDown)
{ {
Width = 48; Width = 12;
Height = 72; Height = 18;
StartCicycleAnimation("SpiderOnWeb"); StartCicycleAnimation("SpiderOnWeb");
acceleration = Vector2.Zero; acceleration = Vector2.Zero;
webLength++; webLength++;
@ -96,8 +96,8 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
} }
else if (delay > 0.5 && webLength != 0 && !isDown) else if (delay > 0.5 && webLength != 0 && !isDown)
{ {
Width = 48; Width = 12;
Height = 72; Height = 18;
StartCicycleAnimation("SpiderOnWeb"); StartCicycleAnimation("SpiderOnWeb");
webLength--; webLength--;
_pos.Y -= 25; _pos.Y -= 25;
@ -144,8 +144,8 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
public override void Move(GameTime gameTime) public override void Move(GameTime gameTime)
{ {
Width = 112; Width = 28;
Height = 24; Height = 6;
foreach (var entity in physicsManager.CheckRectangle(new Rectangle((int)Pos.X - 7, (int)Pos.Y, 126, 10))) foreach (var entity in physicsManager.CheckRectangle(new Rectangle((int)Pos.X - 7, (int)Pos.Y, 126, 10)))
{ {
if (entity.GetType() == typeof(StopTile)) if (entity.GetType() == typeof(StopTile))

15
DangerousD/GameCore/Managers/AppManager.cs
View file

@ -208,22 +208,7 @@ namespace DangerousD.GameCore
case GameState.Lobby: case GameState.Lobby:
break; break;
case GameState.Game: case GameState.Game:
<<<<<<< HEAD
GameManager.mapManager.LoadLevel("map");
=======
<<<<<<< HEAD
<<<<<<< HEAD
GameManager.mapManager.LoadLevel("map");
=======
GameManager.mapManager.LoadLevel("lvl"); GameManager.mapManager.LoadLevel("lvl");
>>>>>>> main
=======
GameManager.mapManager.LoadLevel("lvl");
>>>>>>> 211eac278c07f06a177b7be1fc84dd05cbf5c449
>>>>>>> main
GameManager.FindBorders(); GameManager.FindBorders();
break; break;
case GameState.Death: case GameState.Death: