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

added smoke after shoot

Browse source
This commit is contained in:
bmvolf 2023-08-18 10:34:41 +03:00
parent ae3d9dd65d
commit b8dab6da8a
9 changed files with 92 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
DangerousD/Content/Content.mgcb
View file

@ -223,6 +223,18 @@
/processorParam:TextureFormat=Color
/build:sliderBackground.png
#begin SmokeAnimation2.png
/importer:TextureImporter
/processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255
/processorParam:ColorKeyEnabled=True
/processorParam:GenerateMipmaps=False
/processorParam:PremultiplyAlpha=True
/processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
/build:SmokeAnimation2.png
#begin textboxbackground1-1.png
/importer:TextureImporter
/processor:TextureProcessor

BIN
DangerousD/Content/SmokeAnimation2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 20 KiB

1
DangerousD/Content/animations/smokeAfterShoot Normal file
View file

@ -0,0 +1 @@
{"id":"smokeAfterShoot","textureName":"smokeAnimation2","startSpriteRectangle":{"X":0,"Y":0,"Width":64,"Height":64},"frameSecond":[{"Item1":0,"Item2":3}],"textureFrameInterval":1,"framesCount":10,"isCycle":false,"offset":"0, 0"}

BIN
DangerousD/Content/smokeAnimation.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

13
DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs
View file

@ -39,6 +39,14 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
{
isGoRight = false;
}
this.GraphicsComponent.actionOfAnimationEnd += (a) =>
{
if (a == "ZombieRightAttack" || a == "ZombieLeftAttack")
{
isAttaking = false;
}
};
}
protected override GraphicsComponent GraphicsComponent { get; } = new(new List<string> { "ZombieMoveRight", "ZombieMoveLeft", "ZombieRightAttack", "ZombieLeftAttack" }, "ZombieMoveLeft");
@ -123,7 +131,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
if (AppManager.Instance.GameManager.players[0].IsAlive)
{
Attack();
isAttack = false;
}
}
base.OnCollision(gameObject);
@ -136,14 +143,14 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters
if(isGoRight && this._pos.X <= AppManager.Instance.GameManager.players[0].Pos.X)
{
isTarget = true;
leftBorder = Pos.X - 10;
leftBorder = Pos.X - 100;
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;
rightBorder = Pos.X + 100;
leftBorder = AppManager.Instance.GameManager.players[0].Pos.X;
}
}

4
DangerousD/GameCore/GameObjects/LivingEntities/Player/DeathRectangle.cs → DangerousD/GameCore/GameObjects/LivingEntities/Player/AnimationRectangle.cs
View file

@ -9,9 +9,9 @@ using Microsoft.Xna.Framework;
namespace DangerousD.GameCore.GameObjects.PlayerDeath
{
public class DeathRectangle : GameObject
public class AnimationRectangle : GameObject
{
public DeathRectangle(Vector2 pos, string DeathType) : base(pos)
public AnimationRectangle(Vector2 pos, string DeathType) : base(pos)
{
Height = 48;
Width = 48;

25
DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs
View file

@ -16,11 +16,10 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
public class Player : LivingEntity
{
bool isAlive = true;
bool isRight;
bool isRight = true;
string stayAnimation;
bool isJump = false;
public int health;
public bool isGoRight = false;
public Vector2 playerVelocity;
public int rightBorder;
public int leftBorder;
@ -32,6 +31,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
private int bullets;
public bool FallingThroughPlatform = false;
public bool isUping = false;
private int shootLength = 160;
@ -71,7 +71,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
public bool IsAlive { get { return isAlive; } }
protected override GraphicsComponent GraphicsComponent { get; } = new(new List<string> { "playerMoveLeft", "playerMoveRight", "DeathFromZombie", "playerRightStay", "playerStayLeft",
"playerJumpRight" , "playerJumpLeft", "playerShootLeft", "playerShootRight", "playerReload"}, "playerReload");
"playerJumpRight" , "playerJumpLeft", "playerShootLeft", "playerShootRight", "playerReload", "smokeAfterShoot"}, "playerReload");
public void Attack()
{
@ -94,11 +94,10 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
}
public void Death(string monsterName)
{
return; //godmode
isAttacked = true;
if(monsterName == "Zombie")
{
DeathRectangle deathRectangle = new DeathRectangle(Pos, "DeathFrom" + monsterName);
AnimationRectangle deathRectangle = new AnimationRectangle(Pos, "DeathFrom" + monsterName);
deathRectangle.Gr.actionOfAnimationEnd += (a) =>
{
if (a == "DeathFrom" + monsterName)
@ -109,7 +108,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
}
else if(monsterName == "Spider")
{
DeathRectangle deathRectangle = new DeathRectangle(Pos, "DeathFrom" + monsterName);
AnimationRectangle deathRectangle = new AnimationRectangle(Pos, "DeathFrom" + monsterName);
deathRectangle.Gr.actionOfAnimationEnd += (a) =>
{
if (a == "DeathFrom" + monsterName)
@ -142,7 +141,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
{
GraphicsComponent.StartAnimation("playerShootRight");
}
var targets = AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X, (int)(Pos.Y - 10f), 100, 10), typeof(Zombie));
var targets = AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X, (int)(Pos.Y - 10f), shootLength + 24, 10), typeof(Zombie));
if (targets != null)
{
foreach (var target in targets)
@ -151,14 +150,15 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
targetZombie.TakeDamage();
}
}
SmokeAfterShoot smokeAfterShoot = new SmokeAfterShoot(new Vector2(Pos.X + 30, Pos.Y + 7));
}
else
{
if (GraphicsComponent.GetCurrentAnimation != "playerShootRight")
if (GraphicsComponent.GetCurrentAnimation != "playerShootLeft")
{
GraphicsComponent.StartAnimation("playerShootRight");
GraphicsComponent.StartAnimation("playerShootLeft");
}
var targets = AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X, (int)(Pos.Y - 10f), -100, 10), typeof(Zombie));
var targets = AppManager.Instance.GameManager.physicsManager.CheckRectangle(new Rectangle((int)Pos.X - shootLength, (int)(Pos.Y - 10f), shootLength, 10), typeof(Zombie));
if (targets != null)
{
foreach (var target in targets)
@ -167,6 +167,7 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
targetZombie.TakeDamage();
}
}
SmokeAfterShoot smokeAfterShoot = new SmokeAfterShoot(new Vector2(Pos.X - 12, Pos.Y + 7));
}
}
}
@ -188,6 +189,8 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
}
GraphicsComponent.SetCameraPosition(Pos);
if (!isAttacked || isInvincible)
{
if (!isShooting)
{
Move(gameTime);
}
@ -195,6 +198,8 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities
{
velocity.X = 0;
}
}
base.Update(gameTime);
}

42
DangerousD/GameCore/GameObjects/LivingEntities/Player/SmokeAfterShoot.cs Normal file
View file

@ -0,0 +1,42 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using DangerousD.GameCore.GameObjects;
using DangerousD.GameCore.Graphics;
using Microsoft.Xna.Framework;
namespace DangerousD.GameCore.GameObjects.PlayerDeath
{
public class SmokeAfterShoot : GameObject
{
public SmokeAfterShoot(Vector2 pos) : base(pos)
{
Height = 6;
Width = 6;
PlaySmoke();
this.GraphicsComponent.actionOfAnimationEnd += (a) =>
{
if (a == "smokeAfterShoot")
{
AppManager.Instance.GameManager.Remove(this);
}
};
}
protected override GraphicsComponent GraphicsComponent { get; } = new(new List<string> { "smokeAfterShoot" },
"smokeAfterShoot");
public GraphicsComponent Gr => GraphicsComponent;
private void PlaySmoke()
{
if (GraphicsComponent.GetCurrentAnimation != "smokeAfterShoot")
{
GraphicsComponent.StartAnimation("smokeAfterShoot");
}
}
}
}

6
DangerousD/GameCore/Managers/GameManager.cs
View file

@ -158,8 +158,10 @@ namespace DangerousD.GameCore
}
}
GetPlayer1.Update(gameTime);
foreach (var item in otherObjects)
item.Update(gameTime);
for(int i = 0; i < otherObjects.Count; i++)
{
otherObjects[i].Update(gameTime);
}
physicsManager.UpdateCollisions(entities, livingEntities, mapObjects, players, gameTime);
}