coin patterns

includes/coin.c

@@ -7,6 +7,20 @@
 #include "coin.h"
 #include "barry.h"
 
+// Patterns
+const COIN_PATTERN coin_patterns[] = {
+    {// Square pattern
+     .count = 9,
+     .coins = {{0, 0}, {8, 0}, {16, 0}, {0, 8}, {8, 8}, {16, 8}, {0, 16}, {8, 16}, {16, 16}}},
+    {// Wavy pattern (approximate sine wave)
+     .count = 8,
+     .coins = {{0, 8}, {8, 16}, {16, 24}, {24, 16}, {32, 8}, {40, 0}, {48, 8}, {56, 16}}},
+    {// Diagonal pattern
+     .count = 5,
+     .coins = {{0, 0}, {8, 8}, {16, 16}, {24, 24}, {32, 32}}},
+    // Add more patterns here
+};
+
 void coin_tick(COIN* const coins, BARRY* const barry, int* const poins) {
     // Move coins towards the player
     for(int i = 0; i < COINS_MAX; i++) {
@@ -32,13 +46,38 @@ bool coin_colides(COIN* const coin, BARRY* const barry) {
 }
 
 void spawn_random_coin(COIN* const coins) {
-    // Check for an available slot for a new coin
+    // Select a random pattern
+    int pattern_index = rand() % (sizeof(coin_patterns) / sizeof(coin_patterns[0]));
+    const COIN_PATTERN* pattern = &coin_patterns[pattern_index];
+
+    // Count available slots for new coins
+    int available_slots = 0;
     for(int i = 0; i < COINS_MAX; ++i) {
         if(coins[i].point.x <= 0) {
-            coins[i].point.x = 127;
-            coins[i].point.y = rand() % 64;
-            break;
+            ++available_slots;
+        }
+    }
+
+    // If there aren't enough slots, return without spawning coins
+    if(available_slots < pattern->count) return;
+
+    // Spawn coins according to the selected pattern
+    int coin_index = 0;
+    int random_offset = rand() % (64 - 32);
+    for(int i = 0; i < pattern->count; ++i) {
+        // Find an available slot for a new coin
+        while(coins[coin_index].point.x > 0 && coin_index < COINS_MAX) {
+            ++coin_index;
         }
+        // If no slot is available, stop spawning coins
+        if(coin_index == COINS_MAX) break;
+
+        // Spawn the coin
+        coins[coin_index].point.x = 127 + pattern->coins[i].x;
+        coins[coin_index].point.y =
+            random_offset +
+            pattern->coins[i]
+                .y; // The pattern is spawned at a random y position, but not too close to the screen edge
     }
 }
 
@@ -46,7 +85,11 @@ void draw_coins(const COIN* coins, Canvas* const canvas) {
     canvas_set_color(canvas, ColorBlack);
     for(int i = 0; i < COINS_MAX; ++i) {
         if(coins[i].point.x > 0) {
+            canvas_set_color(canvas, ColorBlack);
             canvas_draw_icon(canvas, coins[i].point.x, coins[i].point.y, &I_coin);
+
+            canvas_set_color(canvas, ColorWhite);
+            canvas_draw_icon(canvas, coins[i].point.x, coins[i].point.y, &I_coin_infill);
         }
     }
 }

includes/coin.h

@@ -6,13 +6,18 @@
 #include "point.h"
 #include "barry.h"
 
-#define COINS_MAX 25
+#define COINS_MAX 15
 
 typedef struct {
     float gravity;
     POINT point;
 } COIN;
 
+typedef struct {
+    int count;
+    POINT coins[COINS_MAX];
+} COIN_PATTERN;
+
 void coin_tick(COIN* const coins, BARRY* const barry, int* const poins);
 void spawn_random_coin(COIN* const coins);
 bool coin_colides(COIN* const coin, BARRY* const barry);

includes/missile.c

@@ -13,7 +13,7 @@ void missile_tick(MISSILE* const missiles, BARRY* const barry, State* const stat
     // Move missiles towards the player
     for(int i = 0; i < MISSILES_MAX; i++) {
         if(missile_colides(&missiles[i], barry)) {
-            (*state) = GameStateGameOver;
+            // (*state) = GameStateGameOver;
             UNUSED(state);
         }
         if(missiles[i].point.x > 0) {

includes/missile.h

@@ -8,7 +8,7 @@
 #include "point.h"
 #include "barry.h"
 
-#define MISSILES_MAX 5
+#define MISSILES_MAX 2
 
 typedef struct {
     float gravity;

includes/scientist.c

@@ -54,8 +54,16 @@ void draw_scientists(const SCIENTIST* scientists, Canvas* const canvas, const Ga
                                                     sprites->scientist_left_infill);
 
             } else {
+                canvas_set_color(canvas, ColorBlack);
                 canvas_draw_icon(
                     canvas, scientists[i].point.x, scientists[i].point.y + 5, &I_dead_scientist);
+
+                canvas_set_color(canvas, ColorWhite);
+                canvas_draw_icon(
+                    canvas,
+                    scientists[i].point.x,
+                    scientists[i].point.y + 5,
+                    &I_dead_scientist_infill);
             }
         }
     }

jetpack.c

@@ -119,8 +119,8 @@ static void jetpack_game_render_callback(Canvas* const canvas, void* ctx) {
         for(int i = 0; i < 3; ++i) {
             // Check if the image is within the screen's boundaries
             if(game_state->sprites.bg_pos[i].x >= -127 && game_state->sprites.bg_pos[i].x < 128) {
-                canvas_draw_icon(
-                    canvas, game_state->sprites.bg_pos[i].x, 0, game_state->sprites.bg[i]);
+                // canvas_draw_icon(
+                //     canvas, game_state->sprites.bg_pos[i].x, 0, game_state->sprites.bg[i]);
             }
         }