Dziuala 3 strzlowiec

sources/Plansza.cpp

@@ -3,15 +3,20 @@
 #include "../headers/Plansza.h"
 #include "../headers/ObjectItem.hpp"
 
-Plansza::Plansza(unsigned int windowHeight, unsigned int windowWidth, sf::RenderWindow *mainWindow)
+Plansza::Plansza(unsigned int windowHeight, unsigned int windowWidth, sf::RenderWindow *mainWindow,
+    const sf::Texture& playerTexture,
+    const sf::Texture& playerBulletTexture,
+    const sf::Texture& playerRocketTexture)
 : background("../assets/img/background/background.png", 2.0f),
-ship(static_cast<int>(mainWindow->getSize().x) / 2, static_cast<int>(mainWindow->getSize().y) - 100, "../assets/ship/Dreadnought-Base.png")
+ship(static_cast<int>(mainWindow->getSize().x) / 2, static_cast<int>(mainWindow->getSize().y) - 100, playerTexture, playerBulletTexture, playerRocketTexture)
 {
 
     window = mainWindow;
     size.height = static_cast<int>(windowHeight);
     size.width = static_cast<int>(windowWidth);
 
+
+
     ship.setMovingSpeed(8);
     ship.setFirerate(200);
 
@@ -23,8 +28,19 @@ ship(static_cast<int>(mainWindow->getSize().x) / 2, static_cast<int>(mainWindow-
     audioManager.loadSoundEffect("fail", "../assets/sounds/fail.mp3");
 
 
+
     meteorTexture1.loadFromFile("../assets/img/meteors/meteor-1.png");
     meteorTexture2.loadFromFile("../assets/img/meteors/meteor-2.png");
+
+    // Ładowanie tekstur wrogów
+    if (!enemyTexture.loadFromFile("../assets/img/enemy/enemy.png")) {
+        std::cerr << "Failed to load enemy 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);
+    }
     spawnClock.restart();
 }
 
@@ -69,6 +85,7 @@ void Plansza::update() {
         // generowanie nowego meteoru
         spawn_meteor();
         spawn_enemy();
+        spawn_advanced_enemy();
 
         // utrzymanie meteorów i pocisków w ruchu
         for (auto& meteor : getMeteors()) {
@@ -204,6 +221,58 @@ void Plansza::update() {
             ++it;
         }
     }
+    for (auto it = AEnemies.begin(); it != AEnemies.end();) {
+        it->update();  // Ruch zaawansowanego przeciwnika
+        it->shoot();   // Strzał przeciwnika
+
+        window->draw(it->getSprite()); // Rysowanie na ekranie
+
+        if (!it->isAlive()) {
+            std::cout << "Advanced Enemy has been eliminated." << std::endl;
+            it = AEnemies.erase(it); // Usunięcie martwych przeciwników
+        } else {
+            ++it;
+        }
+    }
+   // std::cout << "Current AEnemies size: " << AEnemies.size() << std::endl;
+    // Obsługa pocisków zaawansowanych przeciwników
+    for (auto& aEnemy : AEnemies) {
+        for (auto it = aEnemy.getBullets().begin(); it != aEnemy.getBullets().end();) {
+            if (ship.getSprite().getGlobalBounds().intersects(it->getSprite().getGlobalBounds())) {
+                ship.takeDamage(); // Zadanie obrażeń graczowi
+                it = aEnemy.getBullets().erase(it); // Usuwanie pocisku po trafieniu
+            } else {
+                ++it;
+            }
+        }
+    }
+
+    for (auto advancedIt = AEnemies.begin(); advancedIt != AEnemies.end();) {
+        bool hit = false;
+        for (auto bulletIt = ship.getBullets().begin(); bulletIt != ship.getBullets().end();) {
+            if (advancedIt->getSprite().getGlobalBounds().intersects(bulletIt->getSprite().getGlobalBounds())) {
+                bulletIt = ship.getBullets().erase(bulletIt);
+                advancedIt->takeDamage();
+                hit = true;
+                break;
+            } else {
+                ++bulletIt;
+            }
+        }
+        if (hit && !advancedIt->isAlive()) {
+            advancedIt = AEnemies.erase(advancedIt); // Usunięcie przeciwnika AdvancedEnemy
+        } else {
+            ++advancedIt;
+        }
+    }
+
+    for (auto& advancedEnemy : AEnemies) {
+        advancedEnemy.updateBullets(); // Obsługuje pociski zaawansowanych przeciwników
+        for (auto& bullet : advancedEnemy.getBullets()) {
+            bullet.update();
+            window->draw(bullet.getSprite());
+        }
+    }
 
     for (auto& enemy : enemies) {
         for (auto it = enemy.getBullets().begin(); it != enemy.getBullets().end();) {
@@ -282,6 +351,26 @@ void Plansza::update() {
         }
     }
 
+    for (auto advancedIt = AEnemies.begin(); advancedIt != AEnemies.end();) {
+        bool hit = false;
+        for (auto rocketIt = ship.getRockets().begin(); rocketIt != ship.getRockets().end();) {
+            if (advancedIt->getSprite().getGlobalBounds().intersects(rocketIt->getSprite().getGlobalBounds())) {
+                rocketIt = ship.getRockets().erase(rocketIt);
+                advancedIt->takeDamage();
+                hit = true;
+                break;
+            } else {
+                ++rocketIt;
+            }
+        }
+        if (hit && !advancedIt->isAlive()) {
+            advancedIt = AEnemies.erase(advancedIt);
+        } else {
+            ++advancedIt;
+        }
+    }
+
+
 }
 
 // Meteor-related niżej
@@ -309,14 +398,26 @@ void Plansza::update_meteors() {
 }
 
 void Plansza::spawn_enemy() {
-    if (enemySpawnClock.getElapsedTime().asSeconds() >= 10) { // Spawn co 10 sekund
+    if (enemySpawnClock.getElapsedTime().asSeconds() >= 6) { // Spawn co 10 sekund
         int spawnX = RandomNumberGenerator::getRandomNumber(50, size.width - 50);
-        enemies.emplace_back(spawnX, -50, "../assets/img/enemy/enemy.png");
+        enemies.emplace_back(spawnX, -50, enemyTexture);
+
         enemySpawnClock.restart();
 
     }
 }
 
+void Plansza::spawn_advanced_enemy() {
+    if (AenemySpawnClock.getElapsedTime().asSeconds() >= 5) { // Spawn co 10 sekund
+        int spawnX = RandomNumberGenerator::getRandomNumber(50, size.width - 50);
+        AEnemies.emplace_back(spawnX, 50, advancedEnemyTexture, enemyBulletTexture);
+        std::cout << "Spawned Advanced Enemy at X: " << spawnX << std::endl;
+        AenemySpawnClock.restart();
+    }
+}
+
+
+
 Size Plansza::getSize() {
     return size;
 }