diff --git a/assets/img/ultimate/ultimate_0.png b/assets/img/ultimate/ultimate_0.png index add8904..8e6efb5 100644 Binary files a/assets/img/ultimate/ultimate_0.png and b/assets/img/ultimate/ultimate_0.png differ diff --git a/assets/img/ultimate/ultimate_10.png b/assets/img/ultimate/ultimate_10.png index 04ab312..e095eab 100644 Binary files a/assets/img/ultimate/ultimate_10.png and b/assets/img/ultimate/ultimate_10.png differ diff --git a/assets/img/ultimate/ultimate_100.png b/assets/img/ultimate/ultimate_100.png index 513f14d..a72cec0 100644 Binary files a/assets/img/ultimate/ultimate_100.png and b/assets/img/ultimate/ultimate_100.png differ diff --git a/assets/img/ultimate/ultimate_20.png b/assets/img/ultimate/ultimate_20.png index ef308de..bca5851 100644 Binary files a/assets/img/ultimate/ultimate_20.png and b/assets/img/ultimate/ultimate_20.png differ diff --git a/assets/img/ultimate/ultimate_30.png b/assets/img/ultimate/ultimate_30.png index ff69c1c..3dcc1cf 100644 Binary files a/assets/img/ultimate/ultimate_30.png and b/assets/img/ultimate/ultimate_30.png differ diff --git a/assets/img/ultimate/ultimate_40.png b/assets/img/ultimate/ultimate_40.png index 3653ef4..1fcf1a4 100644 Binary files a/assets/img/ultimate/ultimate_40.png and b/assets/img/ultimate/ultimate_40.png differ diff --git a/assets/img/ultimate/ultimate_50.png b/assets/img/ultimate/ultimate_50.png index d19935d..5f55cb2 100644 Binary files a/assets/img/ultimate/ultimate_50.png and b/assets/img/ultimate/ultimate_50.png differ diff --git a/assets/img/ultimate/ultimate_60.png b/assets/img/ultimate/ultimate_60.png index 1e99ac9..0476dec 100644 Binary files a/assets/img/ultimate/ultimate_60.png and b/assets/img/ultimate/ultimate_60.png differ diff --git a/assets/img/ultimate/ultimate_70.png b/assets/img/ultimate/ultimate_70.png index 9b8ed9f..f6408cf 100644 Binary files a/assets/img/ultimate/ultimate_70.png and b/assets/img/ultimate/ultimate_70.png differ diff --git a/assets/img/ultimate/ultimate_80.png b/assets/img/ultimate/ultimate_80.png index b2bcdc1..38f6b73 100644 Binary files a/assets/img/ultimate/ultimate_80.png and b/assets/img/ultimate/ultimate_80.png differ diff --git a/assets/img/ultimate/ultimate_90.png b/assets/img/ultimate/ultimate_90.png index c76ca18..8083d4d 100644 Binary files a/assets/img/ultimate/ultimate_90.png and b/assets/img/ultimate/ultimate_90.png differ diff --git a/sources/AdvancedEnemy.cpp b/sources/AdvancedEnemy.cpp index 635dd1a..7a91f0f 100644 --- a/sources/AdvancedEnemy.cpp +++ b/sources/AdvancedEnemy.cpp @@ -6,7 +6,7 @@ AdvancedEnemy::AdvancedEnemy(int x, int y, const sf::Texture& texture, const sf: enemyBulletTexture = bulletTexture; hp = 2; // 2 punkty życia firerate = 2000; // Strzela co 2 - moving_speed = 2.0f; // Prędkość + moving_speed = 4.0f; // Prędkość enemyBulletTexture.loadFromFile("../assets/img/bullets/enemy_bullet.png"); } diff --git a/sources/Bomber.cpp b/sources/Bomber.cpp index 2f7e55d..b0ca5a8 100644 --- a/sources/Bomber.cpp +++ b/sources/Bomber.cpp @@ -6,8 +6,8 @@ Bomber::Bomber(int x, int y, const sf::Texture& texture, const sf::Texture& bulletTexture) : Actor(x, y, texture) { BombaTexture = bulletTexture; hp = 2; // 2 punkty życia - firerate = 10000; // Strzela co 10 - moving_speed = 10.0f; // Prędkość + firerate = 6000; // Strzela co 6 + moving_speed = 8.0f; // Prędkość } void Bomber::setPlanszaHeight(float height, float width) { diff --git a/sources/Boss.cpp b/sources/Boss.cpp index cf9982b..3543e14 100644 --- a/sources/Boss.cpp +++ b/sources/Boss.cpp @@ -13,7 +13,7 @@ Boss::Boss(int x, int y, const sf::Texture& bossTexture, const sf::Texture& bull } hp = 100; firerate = 2000; - movementSpeed = 2.0f; + movementSpeed = 3.0f; } diff --git a/sources/Enemy.cpp b/sources/Enemy.cpp index 9056f2f..ad3a94a 100644 --- a/sources/Enemy.cpp +++ b/sources/Enemy.cpp @@ -5,7 +5,7 @@ Enemy::Enemy(int x, int y, const sf::Texture& texture) : Actor(x, y, texture) { hp = 1; // Przeciwnik ma 1 punkt życia firerate = 2000; // Strzela co 2 - moving_speed = 2.0f; // Prędkość + moving_speed = 2.5f; // Prędkość enemyBulletTexture.loadFromFile("../assets/img/bullets/enemy_bullet.png"); } diff --git a/sources/Kamikadze.cpp b/sources/Kamikadze.cpp index 81b8712..0697cc9 100644 --- a/sources/Kamikadze.cpp +++ b/sources/Kamikadze.cpp @@ -8,7 +8,7 @@ Kamikadze::Kamikadze(int x, int y, const sf::Texture& texture) : Actor(x, y, texture) { hp = 3; // 3 punkty życia - moving_speed = 2.0f; // Prędkość + moving_speed = 5.0f; // Prędkość } void Kamikadze::shoot(){} diff --git a/sources/Plansza.cpp b/sources/Plansza.cpp index d6688be..3e140f5 100644 --- a/sources/Plansza.cpp +++ b/sources/Plansza.cpp @@ -63,6 +63,7 @@ Plansza::Plansza(unsigned int windowHeight, unsigned int windowWidth, sf::Render audioManager.loadSoundEffect("shoot", "../assets/sounds/shoot.ogg"); audioManager.loadSoundEffect("shoot_alt", "../assets/sounds/shoot_alt.ogg"); audioManager.loadSoundEffect("fail", "../assets/sounds/fail.mp3"); + audioManager.loadSoundEffect("destroyed", "../assets/sounds/destroyed.ogg"); heartStats.emplace_back(heartTexture); heartStats.emplace_back(heartTexture); @@ -102,7 +103,7 @@ void Plansza::loadUltimateIndicators() { sf::Sprite sprite; sprite.setTexture(ultimateIndicatorTextures[i]); sprite.setPosition(10, window->getSize().y - 60); - sprite.setScale(0.5f, 0.5f); + sprite.setScale(0.7f, 0.7f); ultimateIndicators.push_back(sprite); } @@ -168,7 +169,7 @@ void Plansza::update() { spawn_wiazkowiec(); spawn_bomber(); spawn_kamikadze(); - // spawn_boss(); + spawn_boss(); // utrzymanie meteorów i pocisków w ruchu for (auto &meteor: meteors) { @@ -984,7 +985,7 @@ void Plansza::spawn_player() { } void Plansza::spawn_enemy() { - if (enemySpawnClock.getElapsedTime().asSeconds() >= 10) { // Spawn co 10 sekund + if (enemySpawnClock.getElapsedTime().asSeconds() >= 3) { // Spawn co 3 sekund int spawnX = RandomNumberGenerator::getRandomNumber(50, size.width - 50); enemies.emplace_back(spawnX, -50, enemyTexture); std::cout << "Spawned Basic Enemy at X: " << spawnX << std::endl; @@ -994,7 +995,7 @@ void Plansza::spawn_enemy() { } void Plansza::spawn_advanced_enemy() { - if (AenemySpawnClock.getElapsedTime().asSeconds() >= 8) { // Spawn co 10 sekund + if (AenemySpawnClock.getElapsedTime().asSeconds() >= 5) { // Spawn co 5 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; @@ -1003,7 +1004,7 @@ void Plansza::spawn_advanced_enemy() { } void Plansza::spawn_bomber() { - if (BomberSpawnClock.getElapsedTime().asSeconds() >= 5) { // Spawn co 10 sekund + if (BomberSpawnClock.getElapsedTime().asSeconds() >= 7) { // Spawn co 7 sekund int spawnX = RandomNumberGenerator::getRandomNumber(50, size.width - 50); Bomber bomber(spawnX, -50, BomberEnemyTexture, BombaTexture); bomber.setPlanszaHeight(size.height, size.width); // Przekazanie wysokości i szerokości okna @@ -1014,7 +1015,7 @@ void Plansza::spawn_bomber() { } void Plansza::spawn_kamikadze() { - if (KamikadzeSpawnClock.getElapsedTime().asSeconds() >= 40) { // Spawn co 10 sekund + if (KamikadzeSpawnClock.getElapsedTime().asSeconds() >= 9) { // Spawn co 9 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; @@ -1023,7 +1024,7 @@ void Plansza::spawn_kamikadze() { } void Plansza::spawn_wiazkowiec() { - if (WiazkowiecSpawnClock.getElapsedTime().asSeconds() >= 3) { // Spawn co 10 sekund + if (WiazkowiecSpawnClock.getElapsedTime().asSeconds() >= 6) { // Spawn co 6 sekund if (WEnemies.size() < 1) { int spawnX = RandomNumberGenerator::getRandomNumber(50, size.width - 50); Wiazkowiec wiazkowiec(spawnX, -50, WiazkowiecTexture, window); @@ -1036,7 +1037,7 @@ void Plansza::spawn_wiazkowiec() { } void Plansza::spawn_boss() { - if (!bossSpawned && score >= nextBossScoreThreshold) { // Spawn po 60 sekundach + if (!bossSpawned && score >= nextBossScoreThreshold) { // Spawn po BossThreshold i jesli go nie ma boss = new Boss(size.width / 2, -100, BossTexture, enemyBulletTexture, BombaTexture, window); boss->setPlanszaHeight(size.width, size.height); bossSpawned = true;