From a27ff09a0a5ca475677144fdcd9f839575be96aa Mon Sep 17 00:00:00 2001
From: Skullheadx <94652084+Skullheadx@users.noreply.github.com>
Date: Sat, 1 Jul 2023 13:58:19 -0400
Subject: [PATCH] bomb cached

---
 bomb.py | 13 +++++++------
 game.py | 34 +++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/bomb.py b/bomb.py
index 911ffd8..e414edf 100644
--- a/bomb.py
+++ b/bomb.py
@@ -108,10 +108,11 @@ class Bomb(Fruit):
             surf.blit(self.image, self.image.get_rect(
                 topleft=(self.position.x - self.EXPLOSION_RADIUS, self.position.y - self.EXPLOSION_RADIUS)))
         else:
-            # pygame.draw.circle(surf, BLACK, self.position, self.radius)
+            # pygame.draw.circle(surf, WHITE, self.position, self.radius)
             if self.position.y - self.radius <= HEIGHT:
-                rotated_image = pygame.transform.rotate(self.image, self.angle)
-                new_rect = rotated_image.get_rect(center=self.image.get_rect(
-                    topleft=(self.position.x - self.radius, self.position.y - self.radius)).center)
-                self.width, self.height = new_rect.size
-                surf.blit(rotated_image, new_rect.topleft)
+                rotated_image,new_rect = rotate_center(self.image, self.angle, self.position)
+                # rotated_image = pygame.transform.rotate(self.image, self.angle)
+                # new_rect = rotated_image.get_rect(center=self.image.get_rect(
+                #     topleft=(self.position.x - self.radius, self.position.y - self.radius)).center)
+                self.width, self.height = rotated_image.get_size()
+                surf.blit(rotated_image, new_rect)
diff --git a/game.py b/game.py
index 7fab447..1cf7c87 100644
--- a/game.py
+++ b/game.py
@@ -9,7 +9,7 @@ from setup import *
 
 
 class Game:
-    BOMB_CHANCE = 0
+    BOMB_CHANCE = 0 # usually 0.1
     EFFECT_COUNT_PER_FRUIT = 20
     EFFECT_COUNT_PER_BOMB = 0
     COMBO_TIME = 250
@@ -50,7 +50,7 @@ class Game:
             [FadeInEffect(fade_time=1000)] # Fade in/fade out effects
         ]
         self.combo_counters = []
-        self.wave = 10
+        self.wave = 10 # increase number of fruits for testing
         self.score = 0
         self.time_since_last_hit = 0
         self.current_combo = 0
@@ -149,11 +149,11 @@ class Game:
             if hit in self.fruits:
                 self.fruits.remove(hit)
 
-        for layer in self.effects:
-            for effect in layer:
-                effect_status = effect.update(delta)
-                if effect_status:
-                    layer.remove(effect)
+        # for layer in self.effects:
+        #     for effect in layer:
+        #         effect_status = effect.update(delta)
+        #         if effect_status:
+        #             layer.remove(effect)
         for combo in self.combo_counters:
             combo_status = combo.update(delta)
             if combo_status:
@@ -203,23 +203,23 @@ class Game:
         # text_surf2 = font.render(f"TIME SINCE LAST HIT {round(self.time_since_last_hit / 1000, 1)}", True, BLACK)
         # surf.blit(text_surf2, (WIDTH - text_surf2.get_width(), text_surf.get_height()))
 
-        for effect in self.effects[0]:
-            effect.draw(surf)
-        for effect in self.effects[1]:
-            effect.draw(surf)
+        # for effect in self.effects[0]:
+        #     effect.draw(surf)
+        # for effect in self.effects[1]:
+        #     effect.draw(surf)
         for bomb in self.bombs:
             bomb.draw(surf)
-        for effect in self.effects[2]:
-            effect.draw(surf)
+        # for effect in self.effects[2]:
+        #     effect.draw(surf)
         for fruit in self.fruits:
             fruit.draw(surf)
-        for effect in self.effects[3]:
-            effect.draw(surf)
+        # for effect in self.effects[3]:
+        #     effect.draw(surf)
         for combo in self.combo_counters:
             combo.draw(surf)
         self.player.draw(surf)
-        for effect in self.effects[4]:
-            effect.draw(surf)
+        # for effect in self.effects[4]:
+        #     effect.draw(surf)
         if self.game_over:
             title = font_large.render("GAME OVER", True, WHITE)
             subtitle = font.render(f"HIGHSCORE {self.highscore}", True, WHITE)
-- 
2.54.0