From 71dc642a1dce6a0cb0b751cd21202501a02e16c3 Mon Sep 17 00:00:00 2001 From: bmvolf Date: Thu, 17 Aug 2023 15:10:08 +0300 Subject: [PATCH] started work wirk with player --- DangerousD/Content/Content.mgcb | 46 +++++++++++------- DangerousD/Content/animations/playerMoveLeft | 1 + DangerousD/Content/animations/playerMoveRight | 1 + DangerousD/Content/animations/playerRightStay | 1 + DangerousD/Content/animations/playerStayLeft | 1 + DangerousD/Content/playerAnimation.png | Bin 0 -> 12892 bytes .../LivingEntities/Monsters/Zombie.cs | 9 ++-- .../LivingEntities/Player/DeathRectangle.cs | 4 +- .../LivingEntities/Player/Player.cs | 18 +++++-- DangerousD/GameCore/Levels/Level1.cs | 6 +-- 10 files changed, 55 insertions(+), 32 deletions(-) create mode 100644 DangerousD/Content/animations/playerMoveLeft create mode 100644 DangerousD/Content/animations/playerMoveRight create mode 100644 DangerousD/Content/animations/playerRightStay create mode 100644 DangerousD/Content/animations/playerStayLeft create mode 100644 DangerousD/Content/playerAnimation.png diff --git a/DangerousD/Content/Content.mgcb b/DangerousD/Content/Content.mgcb index 0ea387f..24e8d23 100644 --- a/DangerousD/Content/Content.mgcb +++ b/DangerousD/Content/Content.mgcb @@ -13,17 +13,12 @@ #---------------------------------- Content ---------------------------------# -#begin MonstersAnimations.png -/importer:TextureImporter -/processor:TextureProcessor -/processorParam:ColorKeyColor=255,0,255,255 -/processorParam:ColorKeyEnabled=True -/processorParam:GenerateMipmaps=False +#begin ButtonFont.spritefont +/importer:FontDescriptionImporter +/processor:FontDescriptionProcessor /processorParam:PremultiplyAlpha=True -/processorParam:ResizeToPowerOfTwo=False -/processorParam:MakeSquare=False -/processorParam:TextureFormat=Color -/build:MonstersAnimations.png +/processorParam:TextureFormat=Compressed +/build:ButtonFont.spritefont #begin deathAnimation.png /importer:TextureImporter @@ -37,13 +32,6 @@ /processorParam:TextureFormat=Color /build:deathAnimation.png -#begin ButtonFont.spritefont -/importer:FontDescriptionImporter -/processor:FontDescriptionProcessor -/processorParam:PremultiplyAlpha=True -/processorParam:TextureFormat=Compressed -/build:ButtonFont.spritefont - #begin DoomTestSong.mp3 /importer:Mp3Importer /processor:SoundEffectProcessor @@ -107,6 +95,18 @@ /processorParam:TextureFormat=Color /build:menuFon3.jpg +#begin MonstersAnimations.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:MonstersAnimations.png + #begin PC_Computer_Dangerous_Dave_In_The_Haunted_Mansion_Death_Sequences.png /importer:TextureImporter /processor:TextureProcessor @@ -119,6 +119,18 @@ /processorParam:TextureFormat=Color /build:PC_Computer_Dangerous_Dave_In_The_Haunted_Mansion_Death_Sequences.png +#begin playerAnimation.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:playerAnimation.png + #begin wall.jpg /importer:TextureImporter /processor:TextureProcessor diff --git a/DangerousD/Content/animations/playerMoveLeft b/DangerousD/Content/animations/playerMoveLeft new file mode 100644 index 0000000..404639c --- /dev/null +++ b/DangerousD/Content/animations/playerMoveLeft @@ -0,0 +1 @@ +{"id":"playerMoveLeft","textureName":"playerAnimation","startSpriteRectangle":{"X":26,"Y":1,"Width":24,"Height":32},"frameSecond":[{"Item1":0,"Item2":8}],"textureFrameInterval":1,"framesCount":4,"isCycle":true,"offset":"0, 0"} diff --git a/DangerousD/Content/animations/playerMoveRight b/DangerousD/Content/animations/playerMoveRight new file mode 100644 index 0000000..5ed3010 --- /dev/null +++ b/DangerousD/Content/animations/playerMoveRight @@ -0,0 +1 @@ +{"id":"playerMoveRight","textureName":"playerAnimation","startSpriteRectangle":{"X":26,"Y":34,"Width":24,"Height":32},"frameSecond":[{"Item1":0,"Item2":8}],"textureFrameInterval":1,"framesCount":4,"isCycle":true,"offset":"0, 0"} diff --git a/DangerousD/Content/animations/playerRightStay b/DangerousD/Content/animations/playerRightStay new file mode 100644 index 0000000..bbeb120 --- /dev/null +++ b/DangerousD/Content/animations/playerRightStay @@ -0,0 +1 @@ +{"id":"playerRightStay","textureName":"playerAnimation","startSpriteRectangle":{"X":1,"Y":1,"Width":24,"Height":32},"frameSecond":[{"Item1":0,"Item2":12}],"textureFrameInterval":1,"framesCount":1,"isCycle":true,"offset":"0, 0"} diff --git a/DangerousD/Content/animations/playerStayLeft b/DangerousD/Content/animations/playerStayLeft new file mode 100644 index 0000000..993f1e1 --- /dev/null +++ b/DangerousD/Content/animations/playerStayLeft @@ -0,0 +1 @@ +{"id":"playerStayLeft","textureName":"playerAnimation","startSpriteRectangle":{"X":1,"Y":34,"Width":24,"Height":32},"frameSecond":[{"Item1":0,"Item2":12}],"textureFrameInterval":1,"framesCount":1,"isCycle":true,"offset":"0, 0"} diff --git a/DangerousD/Content/playerAnimation.png b/DangerousD/Content/playerAnimation.png new file mode 100644 index 0000000000000000000000000000000000000000..ed061f33849682ebbc3185570f321e015897662d GIT binary patch literal 12892 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 literal 0 HcmV?d00001 diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs index b679a37..b5402e8 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Monsters/Zombie.cs @@ -25,8 +25,8 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters Height = 40; monster_speed = 3; name = "Zombie"; - leftBorder = (int)position.X - 100; - rightBorder = (int)position.X + 100; + leftBorder = (int)position.X - 50; + rightBorder = (int)position.X + 50; physicsManager = new PhysicsManager(); } protected override GraphicsComponent GraphicsComponent { get; } = new(new List { "ZombieMoveRight", "ZombieMoveLeft", "ZombieRightAttack", "ZombieLeftAttack" }, "ZombieMoveLeft"); @@ -48,9 +48,9 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters isAttaking = true; if (isGoRight) { - if (GraphicsComponent.GetCurrentAnimation != "ZombieMoveRight") + if (GraphicsComponent.GetCurrentAnimation != "ZombieRightAttack") { - GraphicsComponent.StartAnimation("ZombieAttackRight"); + GraphicsComponent.StartAnimation("ZombieRightAttack"); } AppManager.Instance.GameManager.players[0].Death(name); } @@ -71,7 +71,6 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities.Monsters public override void Move(GameTime gameTime) { - float delta = (float)gameTime.ElapsedGameTime.TotalSeconds; if (isGoRight) { if (GraphicsComponent.GetCurrentAnimation != "ZombieMoveRight") diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Player/DeathRectangle.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Player/DeathRectangle.cs index 1867b60..7dda1b1 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Player/DeathRectangle.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Player/DeathRectangle.cs @@ -13,8 +13,8 @@ namespace DangerousD.GameCore.GameObjects.PlayerDeath { public DeathRectangle(Vector2 pos, string DeathType) : base(pos) { - Height = 128; - Width = 128; + Height = 48; + Width = 48; PlayDeath(DeathType); } diff --git a/DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs b/DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs index 0122b50..df59603 100644 --- a/DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs +++ b/DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs @@ -12,16 +12,18 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities public class Player : LivingEntity { bool isAlive = true; + bool isRight; + string stayAnimation; public Player(Vector2 position) : base(position) { - Width = 32; - Height = 64; - AppManager.Instance.InputManager.MovEventJump += AnimationJump; + Width = 24; + Height = 32; + AppManager.Instance.InputManager.MovEventJump += Jump; } public bool IsAlive { get { return isAlive; } } - protected override GraphicsComponent GraphicsComponent { get; } = new(new List { "ZombieMoveRight", "ZombieMoveLeft", "ZombieRightAttack", "ZombieLeftAttack", "DeathFromZombie" }, "ZombieMoveLeft");//TODO: Change to player + protected override GraphicsComponent GraphicsComponent { get; } = new(new List { "playerMoveLeft", "playerMoveRight", "DeathFromZombie", "playerRightStay", "playerStayLeft" }, "playerStayLeft"); public void Kill() { @@ -43,9 +45,15 @@ namespace DangerousD.GameCore.GameObjects.LivingEntities } isAlive = false; } - public void AnimationJump() + public override void Update(GameTime gameTime) + { + + base.Update(gameTime); + } + public void Jump() { velocity.Y = -300; + //сюда анимацию и доделать } } } diff --git a/DangerousD/GameCore/Levels/Level1.cs b/DangerousD/GameCore/Levels/Level1.cs index 7bf184b..7a0f8d9 100644 --- a/DangerousD/GameCore/Levels/Level1.cs +++ b/DangerousD/GameCore/Levels/Level1.cs @@ -10,8 +10,8 @@ namespace DangerousD.GameCore.Levels { public void InitLevel() { - new Player(new Vector2(80,0)); - var Zombie = new Zombie(new Vector2(250, 128)); + new Player(new Vector2(350,0)); + var Zombie = new Zombie(new Vector2(100, 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)); @@ -27,7 +27,7 @@ namespace DangerousD.GameCore.Levels } new GrassBlock(new Vector2(500, 224)); Player player = new Player(new Vector2(400, 64)); - player.AnimationJump(); + player.Jump(); //new GrassBlock(new Vector2(500, 224)); }