wiazkowiec strzela, gora dol

sources/Plansza.cpp

@@ -34,11 +34,15 @@ Plansza::Plansza(unsigned int windowHeight, unsigned int windowWidth, sf::Render
         std::cerr << "Failed to load enemy texture!" << std::endl;
         exit(-1);
     }
+    if (!WiazkaTexture.loadFromFile("../assets/img/bullets/wiazka.png")) {
+        std::cerr << "Failed to load wiazka texture!" << std::endl;
+        exit(-1);
+    }
     if (!advancedEnemyTexture.loadFromFile("../assets/img/enemy/advanced_enemy.png")) {
         std::cerr << "Failed to load advanced enemy texture!" << std::endl;
         exit(-1);
     }
-    if (!BomberEnemyTexture.loadFromFile("../assets/img/enemy/wiazkowiec.png")) {
+    if (!BomberEnemyTexture.loadFromFile("../assets/img/enemy/bomber.png")) {
         std::cerr << "Failed to load advanced enemy texture!" << std::endl;
         exit(-1);
     }
@@ -50,6 +54,10 @@ Plansza::Plansza(unsigned int windowHeight, unsigned int windowWidth, sf::Render
         std::cerr << "Failed to load BombaTexture!" << std::endl;
         exit(-1);
     }
+    if (!WiazkowiecTexture.loadFromFile("../assets/img/enemy/wiazkowiec.png")) {
+        std::cerr << "Failed to load BombaTexture!" << std::endl;
+        exit(-1);
+    }
     spawnClock.restart();
 }
 
@@ -95,7 +103,7 @@ void Plansza::update() {
         //spawn_meteor();
         spawn_enemy();
         spawn_advanced_enemy();
-        //spawn_wiazkowiec();
+        spawn_wiazkowiec();
         spawn_bomber();
         spawn_kamikadze();
 
@@ -361,6 +369,51 @@ void Plansza::update() {
         }
     }
 
+    for (auto& bomberEnemy : BEnemies) {
+        for (auto it = bomberEnemy.getBullets().begin(); it != bomberEnemy.getBullets().end();) {
+            bool bulletDestroyed = false;
+
+            // Kolizja pocisku gracza z pociskiem Bombera
+            for (auto playerBulletIt = ship.getBullets().begin(); playerBulletIt != ship.getBullets().end();) {
+                if (playerBulletIt->getSprite().getGlobalBounds().intersects(it->getSprite().getGlobalBounds())) {
+                    // Usuń pocisk Bombera i pocisk gracza
+                    it = bomberEnemy.getBullets().erase(it);
+                    playerBulletIt = ship.getBullets().erase(playerBulletIt);
+                    bulletDestroyed = true;
+                    break;
+                } else {
+                    ++playerBulletIt;
+                }
+            }
+
+            // Kolizja rakiety gracza z pociskiem Bombera
+            if (!bulletDestroyed) {
+                for (auto rocketIt = ship.getRockets().begin(); rocketIt != ship.getRockets().end();) {
+                    if (rocketIt->getSprite().getGlobalBounds().intersects(it->getSprite().getGlobalBounds())) {
+                        // Usuń pocisk Bombera i rakietę gracza
+                        it = bomberEnemy.getBullets().erase(it);
+                        rocketIt = ship.getRockets().erase(rocketIt);
+                        bulletDestroyed = true;
+                        break;
+                    } else {
+                        ++rocketIt;
+                    }
+                }
+            }
+
+            // Jeśli pocisk Bombera przetrwał dotychczasowe sprawdzenia, wykonaj inne działania
+            if (!bulletDestroyed) {
+                if (ship.getSprite().getGlobalBounds().intersects(it->getSprite().getGlobalBounds())) {
+                    // Kolizja pocisku Bombera z graczem
+                    ship.takeDamage();
+                    it = bomberEnemy.getBullets().erase(it);
+                } else {
+                    ++it;
+                }
+            }
+        }
+    }
+
     // Usuwanie pocisków, które są poza ekranem srednio to dziala
     for (auto enemyIt = enemies.begin(); enemyIt != enemies.end(); ) {
         for (auto bulletIt = enemyIt->getBullets().begin(); bulletIt != enemyIt->getBullets().end();) {
@@ -451,7 +504,18 @@ void Plansza::update() {
         }
     }
 
+    for (auto& wiazkowiec : WEnemies) {
+        wiazkowiec.update();
 
+        if (wiazkowiec.isShooting() && wiazkowiec.getBeam().isVisible()) {
+            if (ship.getSprite().getGlobalBounds().intersects(wiazkowiec.getBeam().getBounds())) {
+                ship.takeDamage(); // Gracz otrzymuje obrażenia
+            }
+        }
+
+        window->draw(wiazkowiec.getSprite());
+        wiazkowiec.render(*window);
+    }
 
     //oblsuga dla rakiety
     for (auto enemyIt = enemies.begin(); enemyIt != enemies.end();) {
@@ -577,7 +641,7 @@ void Plansza::spawn_advanced_enemy() {
 }
 
 void Plansza::spawn_bomber() {
-    if (BomberSpawnClock.getElapsedTime().asSeconds() >= 10) { // Spawn co 10 sekund
+    if (BomberSpawnClock.getElapsedTime().asSeconds() >= 120) { // Spawn co 10 sekund
         int spawnX = RandomNumberGenerator::getRandomNumber(50, size.width - 50);
         BEnemies.emplace_back(spawnX, -50, BomberEnemyTexture, BombaTexture);
         std::cout << "Spawned Bomber Enemy at X: " << spawnX << std::endl;
@@ -586,7 +650,7 @@ void Plansza::spawn_bomber() {
 }
 
 void Plansza::spawn_kamikadze() {
-    if (KamikadzeSpawnClock.getElapsedTime().asSeconds() >= 50) { // Spawn co 10 sekund
+    if (KamikadzeSpawnClock.getElapsedTime().asSeconds() >= 220) { // Spawn co 10 sekund
         int spawnX = RandomNumberGenerator::getRandomNumber(50, size.width - 50);
         KEnemies.emplace_back(spawnX, -50, KamikadzeTexture);
         std::cout << "Spawned Kamikadze Enemy at X: " << spawnX << std::endl;
@@ -594,6 +658,14 @@ void Plansza::spawn_kamikadze() {
     }
 }
 
+void Plansza::spawn_wiazkowiec() {
+    if (WiazkowiecSpawnClock.getElapsedTime().asSeconds() >= 10) { // Spawn co 10 sekund
+        int spawnX = RandomNumberGenerator::getRandomNumber(50, size.width - 50);
+        WEnemies.emplace_back(spawnX, -50, WiazkowiecTexture);
+        std::cout << "Spawned Wiazkowiec Enemy at X: " << spawnX << std::endl;
+        WiazkowiecSpawnClock.restart();
+    }
+}