From e793e08e85564e7b16fe905363561dd95462aa97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= Date: Sun, 22 Aug 2021 09:41:17 +0200 Subject: [PATCH] added player2 gfx --- media/gfx/coffee_machine.png | Bin 661 -> 0 bytes media/gfx/items.png | Bin 1797 -> 2426 bytes media/gfx/player_body.png | Bin 6560 -> 0 bytes media/gfx/player_death.png | Bin 672 -> 0 bytes media/gfx/player_head.png | Bin 7214 -> 0 bytes media/gfx/player_legs.png | Bin 785 -> 0 bytes source/const.h | 1 + source/director.cpp | 12 ++++++++---- source/game.cpp | 16 ++++++++++++++-- source/item.cpp | 18 ++++++++++++++++-- source/player.cpp | 2 +- 11 files changed, 40 insertions(+), 9 deletions(-) delete mode 100644 media/gfx/coffee_machine.png delete mode 100644 media/gfx/player_body.png delete mode 100644 media/gfx/player_death.png delete mode 100644 media/gfx/player_head.png delete mode 100644 media/gfx/player_legs.png diff --git a/media/gfx/coffee_machine.png b/media/gfx/coffee_machine.png deleted file mode 100644 index f2a4dfb50445a9d027d9bdfd1d5e6efe4838e9bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 661 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 literal 1797 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 diff --git a/media/gfx/player_death.png b/media/gfx/player_death.png deleted file mode 100644 index 6ee12f05be3ff37221c353e40c008d2717aa654b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 672 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 diff --git a/media/gfx/player_legs.png b/media/gfx/player_legs.png deleted file mode 100644 index 24218209f55f55d4d89b47f3623a3f1a5b526f99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 785 zcmV+s1Md8ZP)Px%%Sl8*RCt{2+&^d&Q5*;GZ#0+#p}2O^p%glI31sM$W;mpSm{Ki5&@MW0I&=PcMCmn=95X*D8yvw_ncbE4rSO0!LQ!aP+?)QH8F3Wuh zKtx1DL_|bHL_|bHL_`)UrMk#+JpbWArsMsoa_YwVk}m+@-AOb2UTsA4&Hc#n>M=h) zeMGCfZQP%vQmTvmo#n{*>NV4j`?tu;59>?5Sef@mTYlJpSNJpq_w?v}u3f8&US}9y%k&Fy)%8#O1gXsjfDaeL*n(uia#A+u#GRic?Gt614-l=- zby4jwLG^so#7zxzd7@ON`Ka~9-5?vkqJAPGA|fIpA|fIp zA|j%HRMr`vY5tcCkcsgW{pX zmkoTp*vHH7%f?2_r{nD?FSK=RN=Br639a9dv}9D~TltYN<$rpeAy)VHb7^8IN%iWP zARESDR3nq*DBR?OehzXD!O-Y-nk>}eS=NfY{)ozm!a+O8>#%!od)<-YG zrTK9UNpn+eLsgiveExtraHit(); JA_PlaySound(mSoundItemPickup); break; + case ITEM_COFFEE_MACHINE: + mPlayer->setPowerUp(true); + JA_PlaySound(mSoundItemPickup); + break; default: break; @@ -2130,10 +2135,13 @@ void Game::resetItems() // Devuelve un item en función del azar Uint8 Game::dropItem() { - //return ITEM_COFFEE; + if (mPlayer->isPowerUp()) + return NO_KIND; + else + return ITEM_COFFEE_MACHINE; const Uint8 luckyNumber = rand() % 99; - const Uint8 item = rand() % 5; + const Uint8 item = rand() % 6; switch (item) { @@ -2157,6 +2165,10 @@ Uint8 Game::dropItem() if (luckyNumber < 5) return ITEM_COFFEE; break; + case 5: + if (luckyNumber < 4) + return ITEM_COFFEE_MACHINE; + break; default: break; } diff --git a/source/item.cpp b/source/item.cpp index fe701b2..1242161 100644 --- a/source/item.cpp +++ b/source/item.cpp @@ -5,14 +5,12 @@ Item::Item() { mSprite = new AnimatedSprite(); - //init(NO_KIND, 0, 0, nullptr, nullptr); mClass = NO_KIND; } // Destructor Item::~Item() { - //init(NO_KIND, 0, 0, nullptr, nullptr); delete mSprite; mSprite = nullptr; } @@ -82,6 +80,22 @@ void Item::init(Uint8 value, float x, float y, LTexture *texture, SDL_Renderer * mSprite->setAnimationFrames(0, 1, 16 * 5, 16 * 1, mWidth, mHeight); break; + case ITEM_COFFEE_MACHINE: + mWidth = 32; + mHeight = 32; + mPosX = (rand() % (PLAY_AREA_WIDTH - mWidth - 3)) + 3; + mPosY = PLAY_AREA_TOP - mHeight; + mVelX = 0.0f; + mVelY = -2.0f; + mSprite->setAnimationNumFrames(0, 4); + mSprite->setAnimationFrames(0, 0, 32 * 0, 16 * 2, mWidth, mHeight); + mSprite->setAnimationFrames(0, 1, 32 * 1, 16 * 2, mWidth, mHeight); + mSprite->setAnimationFrames(0, 2, 32 * 2, 16 * 2, mWidth, mHeight); + mSprite->setAnimationFrames(0, 3, 32 * 3, 16 * 2, mWidth, mHeight); + mCollider.r = mWidth / 2; + shiftColliders(); + break; + default: break; } diff --git a/source/player.cpp b/source/player.cpp index 85da73c..fe4b2a6 100644 --- a/source/player.cpp +++ b/source/player.cpp @@ -31,7 +31,7 @@ void Player::init(float x, int y, LTexture *textureLegs, LTexture *textureBody, mStatusFiring = PLAYER_STATUS_FIRING_NO; mInvulnerable = false; mInvulnerableCounter = PLAYER_INVULNERABLE_COUNTER; - mPowerUp = true; + mPowerUp = false; mPowerUpCounter = PLAYER_POWERUP_COUNTER; mExtraHit = false; mCoffees = 0;