2 Commits

Author SHA1 Message Date
6a833f5698 Merge remote-tracking branch 'origin/BossV1' into BossV1 2025-01-14 15:38:14 +01:00
2539892b71 Boss nie wylazi 2025-01-14 15:38:02 +01:00
2 changed files with 9 additions and 10 deletions

View File

@@ -161,9 +161,9 @@ void Boss::setRandomDirection() {
direction = static_cast<BossDirection>(randomValue); direction = static_cast<BossDirection>(randomValue);
} while ( } while (
(direction == BossDirection::Left && position.x <= 0) || (direction == BossDirection::Left && position.x <= 0) ||
(direction == BossDirection::Right && position.x >= planszaWidth) || (direction == BossDirection::Right && position.x >= 600) ||
(direction == BossDirection::Up && position.y <= 0) || (direction == BossDirection::Up && position.y <= 0) ||
(direction == BossDirection::Down && position.y >= planszaHeight) (direction == BossDirection::Down && position.y >= 800)
); );
if (previousDirection == direction) { if (previousDirection == direction) {
std::cerr << "Boss kept the same direction: " << static_cast<int>(direction) << std::endl; std::cerr << "Boss kept the same direction: " << static_cast<int>(direction) << std::endl;
@@ -174,18 +174,14 @@ void Boss::setRandomDirection() {
void Boss::handleBounds() { void Boss::handleBounds() {
if (position.x < 0) { if (position.x < 0) {
position.x = 0;
direction = BossDirection::Right; direction = BossDirection::Right;
} else if (position.x > planszaWidth - actorSprite.getGlobalBounds().width) { } else if (position.x > 600 - actorSprite.getGlobalBounds().width) {
position.x = planszaWidth - actorSprite.getGlobalBounds().width;
direction = BossDirection::Left; direction = BossDirection::Left;
} }
if (position.y < 0) { if (position.y < 0) {
position.y = 0;
direction = BossDirection::Down; direction = BossDirection::Down;
} else if (position.y > planszaHeight - actorSprite.getGlobalBounds().height) { } else if (position.y > 800 - actorSprite.getGlobalBounds().height) {
position.y = planszaHeight - actorSprite.getGlobalBounds().height;
direction = BossDirection::Up; direction = BossDirection::Up;
} }
} }

View File

@@ -118,7 +118,7 @@ void Plansza::update() {
spawn_hearts(); spawn_hearts();
spawn_power_up(); spawn_power_up();
// spawn_enemy(); // spawn_enemy();
spawn_advanced_enemy(); // spawn_advanced_enemy();
// spawn_wiazkowiec(); // spawn_wiazkowiec();
// spawn_bomber(); // spawn_bomber();
// spawn_kamikadze(); // spawn_kamikadze();
@@ -414,6 +414,9 @@ void Plansza::update() {
} }
} }
if (boss->isShooting() && boss->getBeam() != nullptr) { if (boss->isShooting() && boss->getBeam() != nullptr) {
if (ship->getSprite().getGlobalBounds().intersects(boss->getBeam()->getSprite().getGlobalBounds())) { if (ship->getSprite().getGlobalBounds().intersects(boss->getBeam()->getSprite().getGlobalBounds())) {
ship->takeDamage(); // Gracz otrzymuje obrażenia ship->takeDamage(); // Gracz otrzymuje obrażenia
@@ -858,7 +861,7 @@ void Plansza::spawn_advanced_enemy() {
} }
void Plansza::spawn_bomber() { void Plansza::spawn_bomber() {
if (BomberSpawnClock.getElapsedTime().asSeconds() >= 30) { // Spawn co 10 sekund if (BomberSpawnClock.getElapsedTime().asSeconds() >= 5) { // Spawn co 10 sekund
int spawnX = RandomNumberGenerator::getRandomNumber(50, size.width - 50); int spawnX = RandomNumberGenerator::getRandomNumber(50, size.width - 50);
Bomber bomber(spawnX, -50, BomberEnemyTexture, BombaTexture); Bomber bomber(spawnX, -50, BomberEnemyTexture, BombaTexture);
bomber.setPlanszaHeight(size.height, size.width); // Przekazanie wysokości i szerokości okna bomber.setPlanszaHeight(size.height, size.width); // Przekazanie wysokości i szerokości okna