From 67f396ae84275b5e269f41f81acb9e0e4b895c4d Mon Sep 17 00:00:00 2001
From: Andrii Solianyk <asolianik2015@gmail.com>
Date: Mon, 13 Jan 2025 15:55:45 +0100
Subject: [PATCH 1/2] =?UTF-8?q?Zaimplementowano=20debuff.=20Do=20doko?=
 =?UTF-8?q?=C5=84czenia=20resetowanie=20debuff?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt                        |   2 +
 assets/img/debuffs/BulletSpeedDBF.png | Bin 0 -> 1440 bytes
 assets/img/debuffs/firerateDBF.png    | Bin 0 -> 2847 bytes
 assets/img/debuffs/movingSpeedDBF.png | Bin 0 -> 6551 bytes
 headers/Bullet.h                      |   5 +-
 headers/Debuff.h                      |  24 +++++++
 headers/Plansza.h                     |  30 ++++++--
 headers/Player.h                      |   2 +
 sources/Bullet.cpp                    |   6 ++
 sources/Debuff.cpp                    |  21 ++++++
 sources/Plansza.cpp                   | 100 ++++++++++++++++++++++----
 sources/Player.cpp                    |  19 +++--
 12 files changed, 184 insertions(+), 25 deletions(-)
 create mode 100644 assets/img/debuffs/BulletSpeedDBF.png
 create mode 100644 assets/img/debuffs/firerateDBF.png
 create mode 100644 assets/img/debuffs/movingSpeedDBF.png
 create mode 100644 headers/Debuff.h
 create mode 100644 sources/Debuff.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67e2d81..8857b57 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,8 @@ add_executable(LotoStatek main.cpp
         sources/Heart.cpp
         headers/PowerUp.h
         sources/PowerUp.cpp
+        headers/Debuff.h
+        sources/Debuff.cpp
 )
 
 if(WIN32)
diff --git a/assets/img/debuffs/BulletSpeedDBF.png b/assets/img/debuffs/BulletSpeedDBF.png
new file mode 100644
index 0000000000000000000000000000000000000000..be563c24f03e0dd77fed6c3c662f61973b64365e
GIT binary patch
literal 1440
zcmV;R1z-A!P)<h;3K|Lk000e1NJLTq000sI001Hg1^@s6QnZQs0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmP!xqvQ;Q-M2aAX}WN4l2qEZ}76^me@v=v%)FnQ@8G-*gu
zTpR`0f`dPcRR<SmT^(EnLGTB}U2sx#krMAq3N2#1@OU5R-E(;FK0s*Im}>UL0ade%
zOfn(n3#(%PD|`rG6cNNEX6mWzVh*15bx++?cTt|@-S=k=DMgb3K9M-ibi*RvAdYQX
zI_G`j5UWTE@j3C7K^G)`<htzg8|Sja0?!N?xy(Fqh*&K5u-wC}VyMKk#9>9%C|}6C
ztZ?4qtkxQ=b5H)lU{PDia-G%$l2}3tX^4=~KovDuh|;c+Vj@H52@n6c<4==ICRY`V
z91EyJh2;3b|KRs*&C<-Yn-oj{ffw8UhyeY&K)Y$%-^aGyJ^}pCz?IhZ*IU5cC+W?u
z7Cr)ow}Ff6t|spRmpj1NlP(#OBl&3wr4sOdM&DEbMs9(@HFs{EbDTZ^Ihxh-4RCM>
zOqMBo-Q(Q@y>t7wr!&7F=_Yd4s0+Q-00006VoOIv0RI600RN!9r;`8x010qNS#tmY
zE+YT{E+YYWr9XB6000McNliru=>Y{6IxA+M!IJ<002y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{00VeQL_t(Y$E}uKXj^3%$A2e_P21BnA8*p8VH>rr_QTGA
z)Y%W$Rz*AFkZIMidNDz~5xg)W6P=7)<ieX>l;Ndpj1I**C(CLJV}S{}twY;%tIUlc
z%CsLjX=oBzm$=spIU!AxG#x%S=kUDG`+NV-$9p*NU}m%1?H>Xj9@HLEs2hBC=*H(`
zXOsJf4}J_(02sE&>FOHT_ilIJV28~n)N{deFAE`*ErTkyais5=y+^wDJkJid1OF$7
zBbugBHmFuL8J*5L_amLVpK5ULK-g+&f3yijF$@D;WrJ2zYX|ncFg*Fn!M9v)R~>e%
zN-_~=a&j^vgt%Td$Yf-=xpmjB-kx6EP7C+a|FEpZ@pwG5nx?Im1+rQ#?(Y7f-rY|;
zPHg#4zB~U7OH0c<+}KD*NBc{_a{$K8K<Twqe=@OJKYx9Om3W-qo*r(@{X|P+Jr^&A
zVydeCl1imE2i?1y+4p4si!8_gCXq-}Ayc%r?Bt8DzGZxT{0HF9rl|=boK~l6AoA-x
zb3f0K$ruS;x`M@AP59a+3<iRFtf6#TTA$U?ygiXJq1HBF6AtX#TUlIOCX>m;?%yX=
z76@pt*xc!=YBN>URah)$YHDqq`uYN)Q0S`5<@&8G(D-rdXJ)HwR#6nx8kHKeipf+-
zt=UX07CXPNupr9<4ICQewL90ko=(S5Yt&R_rD-LT$s`y4`u(H<CURr96@#qF{c^1H
z7Kg$+N#2c;o|Y9&?Tb}Or73j$)5EVySjmky7U`D!{?u9EF~&M?0Z^|j5%@#!<~xHQ
z6xyQ{19^Jh0N|t7N12yXbSOg{cu$~dTERUfYt-D@!k4q7%!O|<FQ-bj*TDZ|hC*rS
zY5>lh@B=UxzPWCFON!2%@DsdnH47`-gb-3nDTNSH2q8yLPRV?q{$4gnhrIp%=sG|#
zkRcZmjYhdV69K^Q8$lm|qsLC;a5w<CJQE=rjc%w_(HiLx-HskRT{0VEzMARq?UEbx
z^=LGT!{LznfNnaFxvej2j&wDC-w0l>m)Rf3)&=T*zi));@a=3ZOJ3Txwl*dvCN|8E
z?k}k*SB-97uNR-sx51~YDyYcs8_AyP@%;C<qMxombNzaJ!TTkIkilRuJH>%OKn8<B
u83+WjK7Bp^-YJEEdP{Qy^L_c>rGEi&NQq4*Ht6dB0000<MNUMnLSTYEB%;9p

literal 0
HcmV?d00001

diff --git a/assets/img/debuffs/firerateDBF.png b/assets/img/debuffs/firerateDBF.png
new file mode 100644
index 0000000000000000000000000000000000000000..61b795fa13ac84ab787399a5ae3c7075727c5e8f
GIT binary patch
literal 2847
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

literal 0
HcmV?d00001

diff --git a/assets/img/debuffs/movingSpeedDBF.png b/assets/img/debuffs/movingSpeedDBF.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e45d16db102a4d1502fa4284bd3025f899beb95
GIT binary patch
literal 6551
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

literal 0
HcmV?d00001

diff --git a/headers/Bullet.h b/headers/Bullet.h
index f521be2..f3bf184 100644
--- a/headers/Bullet.h
+++ b/headers/Bullet.h
@@ -5,7 +5,10 @@
 
 class Bullet : public Projectile {
 public:
-    Bullet(float x, float y, sf::Texture &texture) : Projectile(x,y, texture) {};
+    Bullet(float x, float y, sf::Texture &texture);
+
+    Bullet(float x, float y, sf::Texture &texture, float speed);
+
     void update() override;
 };
 
diff --git a/headers/Debuff.h b/headers/Debuff.h
new file mode 100644
index 0000000..6f02900
--- /dev/null
+++ b/headers/Debuff.h
@@ -0,0 +1,24 @@
+#ifndef DEBUFF_H
+#define DEBUFF_H
+#include "ObjectItem.hpp"
+
+class Debuff : public ObjectItem {
+public:
+    enum Type {
+        movingSpeedDbf,
+        firerateDbf,
+        bulletSpeedDbf
+    };
+    Debuff(float x, float y, sf::Texture &texture, Type type);
+
+    void update() override;
+
+    Type getType() const {
+        return type_;
+    }
+
+private:
+    Type type_;
+};
+
+#endif //DEBUFF_H
diff --git a/headers/Plansza.h b/headers/Plansza.h
index 5365dd8..1952ba3 100644
--- a/headers/Plansza.h
+++ b/headers/Plansza.h
@@ -16,6 +16,7 @@
 #include "Plansza.h"
 #include "Heart.hpp"
 #include "PowerUp.h"
+#include "Debuff.h"
 #include "Size.h"
 
 enum ships{
@@ -33,9 +34,11 @@ public:
     void spawn_meteor();
     void spawn_hearts();
     void spawn_power_up();
+    void spawn_debuff();
     void update_meteors();
     void update_hearts();
     void update_power_ups();
+    void update_debuffs();
 
 
     void update();
@@ -44,6 +47,7 @@ public:
     void check_PowerUp_collisions();
     void check_Heart_collisions();
     void check_Meteor_collisions();
+    void check_Debuff_collisions();
 
     void spawn_player();
     void spawn_enemy();
@@ -58,19 +62,27 @@ public:
     static ships selectedShip;
     static unsigned int score;
     sf::Font font;
+
 private:
     Background background;
     AudioManager audioManager;
     Player *ship;
     Size size;
     sf::RenderWindow *window;
-    sf::Clock meteorSpawnClock;
-    sf::Clock heartSpawnClock;
-    sf::Clock powerUpSpawnClock;
+    // Timers
     sf::Clock movingSpeedPUTimer;
     sf::Clock fireratePUTimer;
     sf::Clock tripleShotPUTimer;
-    sf::Clock spawnClock;
+    sf::Clock movingSpeedDebuffTimer;
+    sf::Clock firerateDebuffTimer;
+    sf::Clock bulletSpeedDebuffTimer;
+
+    // Zegary
+    sf::Clock meteorSpawnClock;
+    sf::Clock heartSpawnClock;
+    sf::Clock powerUpSpawnClock;
+    sf::Clock debuffSpawnClock;
+    // sf::Clock spawnClock;
     sf::Clock scoreClock;
     sf::Clock shooterSpawnClock;
     sf::Clock enemySpawnClock;
@@ -78,6 +90,8 @@ private:
     sf::Clock BomberSpawnClock;
     sf::Clock KamikadzeSpawnClock;
     sf::Clock WiazkowiecSpawnClock;
+
+    //Textury
     sf::Texture playerTexture;
     sf::Texture playerBulletTexture;
     sf::Texture playerRocketTexture;
@@ -96,6 +110,11 @@ private:
     sf::Texture movingSpeedPowerUpTexture;
     sf::Texture fireratePowerUpTexture;
     sf::Texture tripleShotPowerUpTexture;
+    sf::Texture movingSpeedDebuffTexture;
+    sf::Texture firerateDebuffTexture;
+    sf::Texture bulletSpeedDebuffTexture;
+
+    // Tablice
     std::vector<Enemy> enemies;
     std::vector<AdvancedEnemy> AEnemies;
     std::vector<Bomber> BEnemies;
@@ -105,6 +124,9 @@ private:
     std::vector<Heart> hearts;
     std::vector<sf::Sprite> heartStats;
     std::vector<PowerUp> powerUps;
+    std::vector<Debuff> debuffs;
+
+    // Zmienne prymitywne
     bool gameOver = false;
 };
 
diff --git a/headers/Player.h b/headers/Player.h
index 6c4ab63..a8a99ec 100644
--- a/headers/Player.h
+++ b/headers/Player.h
@@ -30,6 +30,7 @@ public:
     void moveDown() override;
     void takeDamage();
     void setTripleShot(bool toogle);
+    void setBulletSpeed(float speed);
 
     void update();
     std::vector<Rocket>& getRockets();
@@ -44,6 +45,7 @@ private:
     sf::Color originalColor;
     sf::Clock immortalityClock;       // Zegar kontrolujący czas nieśmiertelności
     float immortalityDuration = 1.5f; // Czas trwania nieśmiertelności w sec
+    float bulletSpeed = 10.0f;         // prędkość pocisku
     bool isImmortal = false;           // flaga na immortal
     bool tripleShot = false;           // flaga na potrójny strzał
 };
diff --git a/sources/Bullet.cpp b/sources/Bullet.cpp
index 5b766c7..d7dff67 100644
--- a/sources/Bullet.cpp
+++ b/sources/Bullet.cpp
@@ -1,5 +1,11 @@
 #include "../headers/Bullet.h"
 
+Bullet::Bullet(float x, float y, sf::Texture &texture): Projectile(x,y, texture) {}
+
+Bullet::Bullet(float x, float y, sf::Texture &texture, float speed): Projectile(x,y, texture) {
+    this->speed = -speed;
+}
+
 void Bullet::update() {
     //std::cout << "Start update: speed = " << speed << ", position.y = " << position.y << std::endl;
     sprite.move(0.0f, speed);
diff --git a/sources/Debuff.cpp b/sources/Debuff.cpp
new file mode 100644
index 0000000..cd73f09
--- /dev/null
+++ b/sources/Debuff.cpp
@@ -0,0 +1,21 @@
+#include "../headers/Debuff.h"
+
+Debuff::Debuff(float x, float y, sf::Texture &texture, Type type) : ObjectItem(x, y, texture) {
+    position.x = x;
+    position.y = y;
+    texture_ = texture;
+    sprite.setTexture(texture);
+    sprite.setOrigin(sprite.getLocalBounds().width / 2, sprite.getLocalBounds().height / 2); // wycentrowanie sprite
+    sprite.setScale(0.5f, 0.5f);
+    sprite.setPosition(x, y);
+    movingSpeed = 3.0f;
+    this->type_ = type;
+}
+
+void Debuff::update() {
+    sprite.move(0.0f, movingSpeed); // przesunięcie sprajta
+    position.y += int(movingSpeed); // przesunięcie pozycji
+    if(position.y > 900) {
+        outOfBounds = true; // jeżeli wyszedł poza granice ekranu ustaw tą zmienną
+    }
+}
diff --git a/sources/Plansza.cpp b/sources/Plansza.cpp
index 84b6f5c..e6d151b 100644
--- a/sources/Plansza.cpp
+++ b/sources/Plansza.cpp
@@ -29,6 +29,9 @@ Plansza::Plansza(unsigned int windowHeight, unsigned int windowWidth, sf::Render
         movingSpeedPowerUpTexture.loadFromFile("../assets/img/powerups/movingSpeedPU.png");
         fireratePowerUpTexture.loadFromFile("../assets/img/powerups/fireratePU.png");
         tripleShotPowerUpTexture.loadFromFile("../assets/img/powerups/TripleShotPU.png");
+        movingSpeedDebuffTexture.loadFromFile("../assets/img/debuffs/movingSpeedDBF.png");
+        firerateDebuffTexture.loadFromFile("../assets/img/debuffs/firerateDBF.png");
+        bulletSpeedDebuffTexture.loadFromFile("../assets/img/debuffs/BulletSpeedDBF.png");
         // Ładowanie tekstur wrogów
         enemyTexture.loadFromFile("../assets/img/enemy/enemy.png");
         advancedEnemyTexture.loadFromFile("../assets/img/enemy/advanced_enemy.png");
@@ -65,9 +68,10 @@ Plansza::Plansza(unsigned int windowHeight, unsigned int windowWidth, sf::Render
 
     meteorSpawnClock.restart();
     powerUpSpawnClock.restart();
+    debuffSpawnClock.restart();
     spawn_player();
 
-    spawnClock.restart();
+    // spawnClock.restart();
 }
 
 // TODO: Refactor tej metody bo rozrosła się za bardzo już
@@ -112,14 +116,15 @@ void Plansza::update() {
     ship->update(); // migotanie statku
     update_score(); // naliczanie punktów
     // Sprawnowanie wszystkich rodzajów wrogów
-    spawn_meteor();
-    spawn_hearts();
-    spawn_power_up();
-    spawn_enemy();
-    spawn_advanced_enemy();
-    spawn_wiazkowiec();
-    spawn_bomber();
-    spawn_kamikadze();
+    // spawn_meteor();
+    // spawn_hearts();
+    // spawn_power_up();
+    spawn_debuff();
+    // spawn_enemy();
+    // spawn_advanced_enemy();
+    // spawn_wiazkowiec();
+    // spawn_bomber();
+    // spawn_kamikadze();
 
     // utrzymanie meteorów i pocisków w ruchu
     for (auto &meteor: meteors) {
@@ -137,6 +142,11 @@ void Plansza::update() {
         window->draw(powerUp.getSprite());
     }
 
+    for (auto &debuff: debuffs) {
+        debuff.update();
+        window->draw(debuff.getSprite());
+    }
+
     for (auto &bullet: ship->getBullets()) {
         bullet.update();
         window->draw(bullet.getSprite());
@@ -151,6 +161,7 @@ void Plansza::update() {
     update_meteors();
     update_hearts();
     update_power_ups();
+    update_debuffs();
     ship->updateBullets();
 
     window->draw(ship->getSprite());
@@ -158,15 +169,27 @@ void Plansza::update() {
     check_Meteor_collisions();
     check_Heart_collisions();
     check_PowerUp_collisions();
+    check_Debuff_collisions();
 
-    if (movingSpeedPUTimer.getElapsedTime().asSeconds() >= 5.0f) {
+
+    // TODO: Dodać flagę aby warunek był sprawdzany nie tylko pod kątem Timeru ale również pod kątem ustawionej flagi
+    // if (movingSpeedPUTimer.getElapsedTime().asSeconds() >= 5.0f) {
+    //     ship->setMovingSpeed(8.0f);
+    // }
+    // if (fireratePUTimer.getElapsedTime().asSeconds() >= 10.0f ) {
+    //     ship->setFirerate(200);
+    // }
+    // if (tripleShotPUTimer.getElapsedTime().asSeconds() >= 5.0f) {
+    //     ship->setTripleShot(false);
+    // }
+    if (movingSpeedDebuffTimer.getElapsedTime().asSeconds() >= 5.0f) {
         ship->setMovingSpeed(8.0f);
     }
-    if (fireratePUTimer.getElapsedTime().asSeconds() >= 10.0f) {
+    if (firerateDebuffTimer.getElapsedTime().asSeconds() >= 5.0f) {
         ship->setFirerate(200);
     }
-    if (tripleShotPUTimer.getElapsedTime().asSeconds() >= 5.0f) {
-        ship->setTripleShot(false);
+    if (bulletSpeedDebuffTimer.getElapsedTime().asSeconds() >= 5.0f) {
+        ship->setBulletSpeed(10.0f);
     }
 
     if (gameOver) {
@@ -729,6 +752,14 @@ void Plansza::update_power_ups() {
     }
 }
 
+void Plansza::update_debuffs() {
+    for (auto& debuff : debuffs) {
+        if(debuff.getStatus()) {
+            debuffs.erase(debuffs.begin());
+        }
+    }
+}
+
 void Plansza::spawn_meteor() {
     if (meteorSpawnClock.getElapsedTime().asSeconds() > rand() % 30 + 5) { // randomowy spawn meteorytów od 10 do 1 sekundy
         if (meteors.size() < 3) { // jeśli jest mniej niż 5 meteorów na planszy
@@ -764,6 +795,7 @@ void Plansza::spawn_power_up() {
                     break;
                 case 2:
                     powerUps.emplace_back(RandomNumberGenerator::getRandomNumber(50,499), -100, tripleShotPowerUpTexture, PowerUp::tripleShotUp);
+                    break;
             }
 
 
@@ -772,6 +804,25 @@ void Plansza::spawn_power_up() {
     }
 }
 
+void Plansza::spawn_debuff() {
+    if (debuffSpawnClock.getElapsedTime().asSeconds() > 5) {
+        if (debuffs.size() < 1) {
+            switch (rand() % 3) {
+                case 0:
+                    debuffs.emplace_back(RandomNumberGenerator::getRandomNumber(50, 499), -100, movingSpeedDebuffTexture, Debuff::movingSpeedDbf);
+                    break;
+                case 1:
+                    debuffs.emplace_back(RandomNumberGenerator::getRandomNumber(50, 499), -100, firerateDebuffTexture, Debuff::firerateDbf);
+                    break;
+                case 2:
+                    debuffs.emplace_back(RandomNumberGenerator::getRandomNumber(50,499), -100, bulletSpeedDebuffTexture, Debuff::bulletSpeedDbf);
+                    break;
+            }
+        }
+        debuffSpawnClock.restart();
+    }
+}
+
 void Plansza::spawn_player() {
     ship = Player::getInstance(static_cast<int>(window->getSize().x) / 2, static_cast<int>(window->getSize().y) - 100, this->playerTexture);
     ship->loadTexture();
@@ -873,6 +924,28 @@ void Plansza::check_PowerUp_collisions() {
     }
 }
 
+void Plansza::check_Debuff_collisions() {
+    for (auto debuffIt = debuffs.begin(); debuffIt != debuffs.end();) {
+        if (ship->getSprite().getGlobalBounds().intersects(debuffIt->getSprite().getGlobalBounds())) {
+            if (debuffIt->getType() == Debuff::movingSpeedDbf) {
+                ship->setMovingSpeed(20.0f);
+                movingSpeedDebuffTimer.restart();
+            }
+            if (debuffIt->getType() == Debuff::firerateDbf) {
+                ship->setFirerate(500);
+                firerateDebuffTimer.restart();
+            }
+            if (debuffIt->getType() == Debuff::bulletSpeedDbf) {
+                ship->setBulletSpeed(5.0f);
+                bulletSpeedDebuffTimer.restart();
+            }
+            debuffIt = debuffs.erase(debuffIt);
+        } else {
+            ++debuffIt;
+        }
+    }
+}
+
 void Plansza::check_Heart_collisions() {
     for (auto heartIt = hearts.begin(); heartIt != hearts.end();) {
         if (ship->getSprite().getGlobalBounds().intersects(heartIt->getSprite().getGlobalBounds())) {
@@ -892,5 +965,6 @@ void Plansza::check_Meteor_collisions() {
     }
 }
 
+
 ships Plansza::selectedShip = none;
 unsigned int Plansza::score = 0;
\ No newline at end of file
diff --git a/sources/Player.cpp b/sources/Player.cpp
index 26e505e..e9cc08e 100644
--- a/sources/Player.cpp
+++ b/sources/Player.cpp
@@ -1,11 +1,11 @@
-#include "../headers/Player.h"
-
 #include <iostream>
 #include <SFML/Graphics/Font.hpp>
-#include <SFML/Graphics/Text.hpp>
 
+#include "../headers/Player.h"
 #include "../headers/Plansza.h"
 
+
+
 Player::Player(int x, int y, const sf::Texture& texture) : Actor(x, y, texture) {
     hp = 3;
     if(Plansza::selectedShip != none) {
@@ -37,13 +37,13 @@ void Player::shoot() {
     auto now = std::chrono::steady_clock::now();
     if (std::chrono::duration_cast<std::chrono::milliseconds>(now - lastShotTime).count() >= firerate) {
         if (tripleShot == true) {
-            bullets.emplace_back(position.x - 40, position.y, bulletTexture);
-            bullets.emplace_back(position.x, position.y, bulletTexture);
-            bullets.emplace_back(position.x + 40, position.y, bulletTexture);
+            bullets.emplace_back(position.x - 40, position.y, bulletTexture, bulletSpeed);
+            bullets.emplace_back(position.x, position.y, bulletTexture, bulletSpeed);
+            bullets.emplace_back(position.x + 40, position.y, bulletTexture, bulletSpeed);
             lastShotTime = now;
         }
         if (tripleShot == false) {
-            bullets.emplace_back(position.x, position.y, bulletTexture);
+            bullets.emplace_back(position.x, position.y, bulletTexture, bulletSpeed);
             lastShotTime = now;
         }
     }
@@ -123,4 +123,9 @@ std::vector<Rocket> &Player::getRockets() {
     return rockets;
 }
 
+void Player::setBulletSpeed(float speed) {
+    this->bulletSpeed = speed;
+}
+
+
 Player* Player::player_ = nullptr;

From 7a808d46a6e556cc601ded13ed63b7cc688668ab Mon Sep 17 00:00:00 2001
From: Andrii Solianyk <asolianik2015@gmail.com>
Date: Mon, 13 Jan 2025 23:24:43 +0100
Subject: [PATCH 2/2] Debuffs fully implemented

---
 headers/Plansza.h   | 10 ++++++++++
 sources/Plansza.cpp | 40 ++++++++++++++++++++++++++--------------
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/headers/Plansza.h b/headers/Plansza.h
index 1952ba3..aeb0739 100644
--- a/headers/Plansza.h
+++ b/headers/Plansza.h
@@ -128,6 +128,16 @@ private:
 
     // Zmienne prymitywne
     bool gameOver = false;
+    struct {
+        bool movingSpeed = false;
+        bool firerate = false;
+        bool tripleShot = false;
+    } powerUpCollected;
+    struct {
+        bool movingSpeed = false;
+        bool firerate = false;
+        bool bulletSpeed = false;
+    } debuffCollected;
 };
 
 #endif //PLANSZA_H
diff --git a/sources/Plansza.cpp b/sources/Plansza.cpp
index e6d151b..2ff27ef 100644
--- a/sources/Plansza.cpp
+++ b/sources/Plansza.cpp
@@ -118,7 +118,7 @@ void Plansza::update() {
     // Sprawnowanie wszystkich rodzajów wrogów
     // spawn_meteor();
     // spawn_hearts();
-    // spawn_power_up();
+    spawn_power_up();
     spawn_debuff();
     // spawn_enemy();
     // spawn_advanced_enemy();
@@ -173,22 +173,28 @@ void Plansza::update() {
 
 
     // TODO: Dodać flagę aby warunek był sprawdzany nie tylko pod kątem Timeru ale również pod kątem ustawionej flagi
-    // if (movingSpeedPUTimer.getElapsedTime().asSeconds() >= 5.0f) {
-    //     ship->setMovingSpeed(8.0f);
-    // }
-    // if (fireratePUTimer.getElapsedTime().asSeconds() >= 10.0f ) {
-    //     ship->setFirerate(200);
-    // }
-    // if (tripleShotPUTimer.getElapsedTime().asSeconds() >= 5.0f) {
-    //     ship->setTripleShot(false);
-    // }
-    if (movingSpeedDebuffTimer.getElapsedTime().asSeconds() >= 5.0f) {
+    if (movingSpeedPUTimer.getElapsedTime().asSeconds() >= 5.0f && powerUpCollected.movingSpeed) {
+        powerUpCollected.movingSpeed = false;
         ship->setMovingSpeed(8.0f);
     }
-    if (firerateDebuffTimer.getElapsedTime().asSeconds() >= 5.0f) {
+    if (fireratePUTimer.getElapsedTime().asSeconds() >= 10.0f && powerUpCollected.firerate) {
+        powerUpCollected.firerate = false;
         ship->setFirerate(200);
     }
-    if (bulletSpeedDebuffTimer.getElapsedTime().asSeconds() >= 5.0f) {
+    if (tripleShotPUTimer.getElapsedTime().asSeconds() >= 5.0f && powerUpCollected.tripleShot) {
+        powerUpCollected.tripleShot = false;
+        ship->setTripleShot(false);
+    }
+    if (movingSpeedDebuffTimer.getElapsedTime().asSeconds() >= 5.0f && debuffCollected.movingSpeed) {
+        debuffCollected.movingSpeed = false;
+        ship->setMovingSpeed(8.0f);
+    }
+    if (firerateDebuffTimer.getElapsedTime().asSeconds() >= 5.0f && debuffCollected.firerate) {
+        debuffCollected.firerate = false;
+        ship->setFirerate(200);
+    }
+    if (bulletSpeedDebuffTimer.getElapsedTime().asSeconds() >= 5.0f && debuffCollected.bulletSpeed) {
+        debuffCollected.bulletSpeed = false;
         ship->setBulletSpeed(10.0f);
     }
 
@@ -907,14 +913,17 @@ void Plansza::check_PowerUp_collisions() {
         if (ship->getSprite().getGlobalBounds().intersects(powerUpIt->getSprite().getGlobalBounds())) {
             if (powerUpIt->getType() == PowerUp::movingSpeedUp) {
                 ship->setMovingSpeed(15.0f);
+                powerUpCollected.movingSpeed = true;
                 movingSpeedPUTimer.restart();
             }
             if (powerUpIt->getType() == PowerUp::firerateUp) {
                 ship->setFirerate(100);
+                powerUpCollected.firerate = true;
                 fireratePUTimer.restart();
             }
             if (powerUpIt->getType() == PowerUp::tripleShotUp) {
                 ship->setTripleShot(true);
+                powerUpCollected.tripleShot = true;
                 tripleShotPUTimer.restart();
             }
             powerUpIt = powerUps.erase(powerUpIt);
@@ -928,15 +937,18 @@ void Plansza::check_Debuff_collisions() {
     for (auto debuffIt = debuffs.begin(); debuffIt != debuffs.end();) {
         if (ship->getSprite().getGlobalBounds().intersects(debuffIt->getSprite().getGlobalBounds())) {
             if (debuffIt->getType() == Debuff::movingSpeedDbf) {
-                ship->setMovingSpeed(20.0f);
+                ship->setMovingSpeed(4.0f);
+                debuffCollected.movingSpeed = true;
                 movingSpeedDebuffTimer.restart();
             }
             if (debuffIt->getType() == Debuff::firerateDbf) {
                 ship->setFirerate(500);
+                debuffCollected.firerate = true;
                 firerateDebuffTimer.restart();
             }
             if (debuffIt->getType() == Debuff::bulletSpeedDbf) {
                 ship->setBulletSpeed(5.0f);
+                debuffCollected.bulletSpeed = true;
                 bulletSpeedDebuffTimer.restart();
             }
             debuffIt = debuffs.erase(debuffIt);