Add bonus sound, tweak some bug spawn parameters

include/debuggers.h

@@ -103,6 +103,7 @@ public:
     int bugCatchSample;
     int hoverSample;
     int clickSample;
+    int bonusSample;
 
     const int gravity = 20;
 #ifdef _DEBUG

src/debuggers.cpp

@@ -91,6 +91,13 @@ bool Debuggers::OnUserCreate()
         return false;
     }
 
+    fileName = "res/bonus.wav";
+    bonusSample = olc::SOUND::LoadAudioSample(fileName, &pack);
+    if (bonusSample < 0) {
+        std::cerr << "[Load bonus] File " << fileName << " is not found" << std::endl;
+        return false;
+    }
+
     // Load background
 
     fileName = "res/bg.pgs";

src/debuggers_states.cpp

@@ -12,7 +12,7 @@ bool Debuggers::GamePlay(float fElapsedTime)
     DrawSprite(0, 0, &backgroundSprite);
 
     uint32_t bugsSize = bugs.size();
-    auto aliveBugs = std::count_if(bugs.begin(), bugs.end(), [](Bug* bug) { return bug->IsActive() && bug->IsAlive(); });
+    int aliveBugs = std::count_if(bugs.begin(), bugs.end(), [](Bug* bug) { return bug->IsActive() && bug->IsAlive(); });
 
     Programmer* player = programmers.front();
 
@@ -27,14 +27,16 @@ bool Debuggers::GamePlay(float fElapsedTime)
                         bugsCatchedByPlayer++;
                     }
                     SpawnBugParticles(bug);
-                    bug->Kill();
                     if (state == STATE_GAME)
                         olc::SOUND::PlaySample(bugCatchSample);
+
+                    bug->Kill();
                     SpawnBug();
                 }
             }
         } else if (bug->IsAlive()) {
             bugsMissed++;
+            bug->Kill();
             SpawnBug();
             if (state == STATE_GAME) {
                 sourceCode.erase(sourceCode.begin());
@@ -59,20 +61,20 @@ bool Debuggers::GamePlay(float fElapsedTime)
             if (player->Collides(bonus)) {
                 auto type = bonus->GetType();
                 if (type == BONUS_DOCUMENTATION) {
-                    if (aliveBugs > 1) {
-                        for (auto& bug : bugs) {
-                            if (bug->IsAlive() && bug->IsActive()) {
-                                SpawnBugParticles(bug);
-                                bug->Kill();
-                                break;
-                            }
+                    auto count = std::max(aliveBugs / 10, 1);
+                    for (auto& bug : bugs) {
+                        SpawnBugParticles(bug);
+                        bug->Kill();
+                        count--;
+                        if (count <= 0) {
+                            break;
                         }
                     }
                 } else {
                     bonusesCatched[type]++;
                 }
                 bonus->Kill();
-                // TODO play pickup sound
+                olc::SOUND::PlaySample(bonusSample);
             }
         } else {
             bonus->Kill();
@@ -99,11 +101,11 @@ bool Debuggers::GamePlay(float fElapsedTime)
         SpawnProgrammer();
     }
 
-    if (bugsCatched > 12 * bugsSize) {
+    if (bugsCatched > 14 * bugsSize) {
         SpawnBug();
     }
 
-    if (GetRandom<float>() < 0.01 * fElapsedTime) {
+    if (GetRandom<float>() < 0.03 * fElapsedTime) {
         SpawnBonus();
     }
 

src/entity.cpp

@@ -32,14 +32,16 @@ bool Entity::Collides(Entity* entity)
 
 void Entity::Draw()
 {
+    if (IsInScreen()) {
 #ifdef _DEBUG
-    if (game->debug) {
-        game->DrawRect(pos.x - size.x / 2, pos.y - size.y / 2, size.x, size.y, DEBUG_COLOR);
-    }
+        if (game->debug) {
+            game->DrawRect(pos.x - size.x / 2, pos.y - size.y / 2, size.x, size.y, DEBUG_COLOR);
+        }
 #endif
-    game->SetPixelMode(olc::Pixel::MASK);
-    olc::GFX2D::DrawPartialSprite(sprite, tile.x * size.x, tile.y * size.y, size.x, size.y, transform, true);
-    game->SetPixelMode(olc::Pixel::NORMAL);
+        game->SetPixelMode(olc::Pixel::MASK);
+        olc::GFX2D::DrawPartialSprite(sprite, tile.x * size.x, tile.y * size.y, size.x, size.y, transform, true);
+        game->SetPixelMode(olc::Pixel::NORMAL);
+    }
 }
 
 bool Entity::IsActive()

src/programmer.cpp

@@ -145,6 +145,7 @@ void Programmer::Draw()
         olc::GFX2D::DrawPartialSprite(&game->playerSprite, tile.x * size.x + xOff, size.y + tile.y * size.y, size.x - xOff, size.y, transform, true);
     }
     game->SetPixelMode(olc::Pixel::NORMAL);
+    
 #ifdef _DEBUG
     if (game->debug) {
         game->DrawRect(pos.x - size.x / 2, pos.y - size.y / 2, size.x, size.y, DEBUG_COLOR);