hamx/LotoStatek
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Dodanie bombera

Browse Source
This commit is contained in:
Kuba
2024-12-11 16:33:24 +01:00
parent 81b04bae0f
commit 2234e4d973
9 changed files with 255 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
sources/Plansza.cpp
View File

@@ -7,16 +7,14 @@ Plansza::Plansza(unsigned int windowHeight, unsigned int windowWidth, sf::Render
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, playerTexture, playerBulletTexture, playerRocketTexture)
{
: background("../assets/img/background/background.png", 2.0f),
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);
@@ -28,7 +26,6 @@ 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");
@@ -41,6 +38,10 @@ ship(static_cast<int>(mainWindow->getSize().x) / 2, static_cast<int>(mainWindow-
std::cerr << "Failed to load advanced enemy texture!" << std::endl;
exit(-1);
}
if (!BomberEnemyTexture.loadFromFile("../assets/img/enemy/wiazkowiec.png")) {
std::cerr << "Failed to load advanced enemy texture!" << std::endl;
exit(-1);
}
spawnClock.restart();
}
@@ -83,9 +84,11 @@ void Plansza::update() {
}
// generowanie nowego meteoru
spawn_meteor();
//spawn_meteor();
spawn_enemy();
spawn_advanced_enemy();
//spawn_wiazkowiec();
spawn_bomber();
// utrzymanie meteorów i pocisków w ruchu
for (auto& meteor : getMeteors()) {
@@ -143,6 +146,7 @@ void Plansza::update() {
}
if (!ship.isAlive()) {
std::cout << "Game Over! Player is dead." << std::endl;
std::cout << "You lost the game!\n";
@@ -216,6 +220,7 @@ void Plansza::update() {
// Usunięcie martwych przeciwników
if (!it->isAlive()) {
std::cout << "Basic Enemy has been eliminated." << std::endl;
it = enemies.erase(it);
} else {
++it;
@@ -234,7 +239,21 @@ void Plansza::update() {
++it;
}
}
// std::cout << "Current AEnemies size: " << AEnemies.size() << std::endl;
for (auto it = BEnemies.begin(); it != BEnemies.end();) {
it->update(); // Ruch b
it->shoot(); // Strzał przeciwnika
window->draw(it->getSprite()); // Rysowanie na ekranie
if (!it->isAlive()) {
std::cout << "Bomber has been eliminated." << std::endl;
it = BEnemies.erase(it); // Usunięcie martwych przeciwników
} else {
++it;
}
}
// Obsługa pocisków zaawansowanych przeciwników
for (auto& aEnemy : AEnemies) {
for (auto it = aEnemy.getBullets().begin(); it != aEnemy.getBullets().end();) {
@@ -247,22 +266,25 @@ void Plansza::update() {
}
}
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;
// Obsługa bomb
for (auto& aEnemy : BEnemies) {
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 {
++bulletIt;
++it;
}
}
if (hit && !advancedIt->isAlive()) {
advancedIt = AEnemies.erase(advancedIt); // Usunięcie przeciwnika AdvancedEnemy
} else {
++advancedIt;
}
for (auto& enemy : enemies) {
enemy.shoot();
enemy.updateBullets();
for (auto& bullet : enemy.getBullets()) {
bullet.update();
window->draw(bullet.getSprite());
}
}
@@ -274,6 +296,14 @@ void Plansza::update() {
}
}
for (auto& bomberEnemy : BEnemies) {
bomberEnemy.updateBullets(); // Obsługuje bomby
for (auto& bullet : bomberEnemy.getBullets()) {
bullet.update();
window->draw(bullet.getSprite());
}
}
for (auto& enemy : enemies) {
for (auto it = enemy.getBullets().begin(); it != enemy.getBullets().end();) {
if (ship.getSprite().getGlobalBounds().intersects(it->getSprite().getGlobalBounds())) {
@@ -290,16 +320,7 @@ void Plansza::update() {
}
}
for (auto& enemy : enemies) {
enemy.shoot();
enemy.updateBullets();
for (auto& bullet : enemy.getBullets()) {
bullet.update();
window->draw(bullet.getSprite());
}
}
// Usuwanie pocisków, które są poza ekranem
// 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();) {
if (bulletIt->isOutOfBounds()) {
@@ -331,6 +352,47 @@ void Plansza::update() {
++enemyIt;
}
}
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 bomberIt = BEnemies.begin(); bomberIt != BEnemies.end();) {
bool hit = false;
for (auto bulletIt = ship.getBullets().begin(); bulletIt != ship.getBullets().end();) {
if (bomberIt->getSprite().getGlobalBounds().intersects(bulletIt->getSprite().getGlobalBounds())) {
bulletIt = ship.getBullets().erase(bulletIt);
bomberIt->takeDamage();
hit = true;
break;
} else {
++bulletIt;
}
}
if (hit && !bomberIt->isAlive()) {
bomberIt = BEnemies.erase(bomberIt); // Usunięcie przeciwnika AdvancedEnemy
} else {
++bomberIt;
}
}
//oblsuga dla rakiety
for (auto enemyIt = enemies.begin(); enemyIt != enemies.end();) {
bool hit = false;
@@ -370,6 +432,25 @@ void Plansza::update() {
}
}
for (auto bomberIt = BEnemies.begin(); bomberIt != BEnemies.end();) {
bool hit = false;
for (auto rocketIt = ship.getRockets().begin(); rocketIt != ship.getRockets().end();) {
if (bomberIt->getSprite().getGlobalBounds().intersects(rocketIt->getSprite().getGlobalBounds())) {
rocketIt = ship.getRockets().erase(rocketIt);
bomberIt->takeDamage();
hit = true;
break;
} else {
++rocketIt;
}
}
if (hit && !bomberIt->isAlive()) {
bomberIt = BEnemies.erase(bomberIt);
} else {
++bomberIt;
}
}
}
@@ -398,7 +479,7 @@ void Plansza::update_meteors() {
}
void Plansza::spawn_enemy() {
if (enemySpawnClock.getElapsedTime().asSeconds() >= 6) { // Spawn co 10 sekund
if (enemySpawnClock.getElapsedTime().asSeconds() >= 110) { // Spawn co 10 sekund
int spawnX = RandomNumberGenerator::getRandomNumber(50, size.width - 50);
enemies.emplace_back(spawnX, -50, enemyTexture);
@@ -408,14 +489,25 @@ void Plansza::spawn_enemy() {
}
void Plansza::spawn_advanced_enemy() {
if (AenemySpawnClock.getElapsedTime().asSeconds() >= 5) { // Spawn co 10 sekund
if (AenemySpawnClock.getElapsedTime().asSeconds() >= 100) { // Spawn co 10 sekund
int spawnX = RandomNumberGenerator::getRandomNumber(50, size.width - 50);
AEnemies.emplace_back(spawnX, 50, advancedEnemyTexture, enemyBulletTexture);
AEnemies.emplace_back(spawnX, -50, advancedEnemyTexture, enemyBulletTexture);
std::cout << "Spawned Advanced Enemy at X: " << spawnX << std::endl;
AenemySpawnClock.restart();
}
}
void Plansza::spawn_bomber() {
if (BomberSpawnClock.getElapsedTime().asSeconds() >= 5) { // 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;
BomberSpawnClock.restart();
}
}
Size Plansza::getSize() {