From 2e55002c3c472621d3a36949aaa9a31764741f3a Mon Sep 17 00:00:00 2001
From: Mark B <Canneddonuts@protonmail.com>
Date: Wed, 29 Jun 2022 12:11:37 -0400
Subject: [PATCH] swaped hearts for feathers

---
 asset-src/gfx/feather.piskel |   1 +
 assets/gfx/feather.png       | Bin 0 -> 237 bytes
 src/Gameplay.c               |  40 +++++++++++++++++------------------
 src/Gameplay.h               |   2 +-
 src/Main.c                   |   2 +-
 src/Textures.h               |   2 +-
 6 files changed, 24 insertions(+), 23 deletions(-)
 create mode 100644 asset-src/gfx/feather.piskel
 create mode 100644 assets/gfx/feather.png

diff --git a/asset-src/gfx/feather.piskel b/asset-src/gfx/feather.piskel
new file mode 100644
index 0000000..4cbbd47
--- /dev/null
+++ b/asset-src/gfx/feather.piskel
@@ -0,0 +1 @@
+{"modelVersion":2,"piskel":{"name":"feather","description":"","fps":12,"height":32,"width":14,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":1,\"chunks\":[{\"layout\":[[0]],\"base64PNG\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAgCAYAAAAi7kmXAAAAc0lEQVQ4je2TSwrAIAxEPVvwmnPWdFUo08lHpNCFWQWZh28ExxDjNCpTQm0YwAsCkIPPoNpbmgCcb1/SbOmyGuu2NNUuYQ6ojlI30ix1IzU+Ox3/3TGDUyh6oG//Y1iwAjM4hbZABbege6aZT7M16ICb4AWUhhtQdcveMQAAAABJRU5ErkJggg==\"}]}"],"hiddenFrames":[""]}}
\ No newline at end of file
diff --git a/assets/gfx/feather.png b/assets/gfx/feather.png
new file mode 100644
index 0000000000000000000000000000000000000000..01d05272a3dcb8be1b35809c5e8530dd3e848b89
GIT binary patch
literal 237
zcmV<J022R+P)<h;3K|Lk000e1NJLTq000~S002M;1^@s62|*Va0002ANkl<ZScUD@
zQ3`-C3<FTlCSJ2=onHkRNMfBcg9QAM(Kp5-ZX1~f!p@;H4MfmzcsdvnEg~S4>(&A9
z2D0zh1A71+wLZvRmb(q<gZ%&&%IJdZKz2iVAR55dg1$V{LH4K+l+gvB!sU<n?;slJ
z9_oSYQ6VU!3qFP2LmkjPMA7eI6<+7Rv<DGfF1#Gr1Fs7&3$oD%t8f`I_!-E;!=T^5
n%(3t7`g{f%G-%MEK^^b}1Xyi7jdYQL00000NkvXXu0mjffpT4Q

literal 0
HcmV?d00001

diff --git a/src/Gameplay.c b/src/Gameplay.c
index 85dcd87..902ebd4 100644
--- a/src/Gameplay.c
+++ b/src/Gameplay.c
@@ -26,7 +26,7 @@ void InitGameplayScreen(void)
   player_sprite = LoadTexture("assets/gfx/player.png");
   player.currentframe = 0;
   player.speed = 300.0f;
-  player.hp = MAX_PLAYER_HP;
+  player.hp = PLAYER_HP;
   player.frameRec = (Rectangle) {
     player.hitbox.x,
     player.hitbox.y,
@@ -46,7 +46,7 @@ void InitGameplayScreen(void)
 
   enemy_sprite = LoadTexture("assets/gfx/enemy.png");
   enemy.currentframe = 0;
-  enemy.speed = 100.0f;
+  enemy.speed = 2.0f;
   enemy.hp = 30;
   enemy.hitbox = (Rectangle) {
     690,
@@ -57,12 +57,12 @@ void InitGameplayScreen(void)
   enemy.color = RAYWHITE;
 
 
-  heart_sprite = LoadTexture("assets/gfx/health.png");
+  feather_sprite = LoadTexture("assets/gfx/feather.png");
   heart.hitbox = (Rectangle) {
-    GetRandomValue(0, GetScreenWidth() - heart_sprite.width),
-    GetRandomValue(0, GetScreenHeight() - heart_sprite.height),
-    (float) heart_sprite.width,
-    (float) heart_sprite.height
+    GetRandomValue(0, GetScreenWidth() - feather_sprite.width),
+    GetRandomValue(0, GetScreenHeight() - feather_sprite.height),
+    (float) feather_sprite.width,
+    (float) feather_sprite.height
   };
   heart.active = true;
 
@@ -91,7 +91,7 @@ void ResetGameplayScreen(void)
   // code to reset all variables without reloading assets
    player.currentframe = 0;
    player.speed = 300.0f;
-   player.hp = MAX_PLAYER_HP;
+   player.hp = PLAYER_HP;
    player.hitbox = (Rectangle) {
      0,
      50,
@@ -104,7 +104,7 @@ void ResetGameplayScreen(void)
    player_flashtimer = 0;
 
    enemy.currentframe = 0;
-   enemy.speed = 100.0f;
+   enemy.speed = 2.0f;
    enemy.hp = 30;
    enemy.hitbox = (Rectangle) {
      690,
@@ -114,10 +114,10 @@ void ResetGameplayScreen(void)
    };
 
    heart.hitbox = (Rectangle) {
-     GetRandomValue(0, GetScreenWidth() - heart_sprite.width),
-     GetRandomValue(0, GetScreenHeight() - heart_sprite.height),
-     (float) heart_sprite.width,
-     (float) heart_sprite.height
+     GetRandomValue(0, GetScreenWidth() - feather_sprite.width),
+     GetRandomValue(0, GetScreenHeight() - feather_sprite.height),
+     (float) feather_sprite.width,
+     (float) feather_sprite.height
    };
    heart.active = true;
 
@@ -216,9 +216,9 @@ void UpdateGameplayScreen(void)
 
          if (heart.active) {
              if (CheckCollisionRecs(player.hitbox,  heart.hitbox)) {
-                 player.hp = MAX_PLAYER_HP;
-                 heart.hitbox.x = GetRandomValue(0, GetScreenWidth() - heart_sprite.width);
-                 heart.hitbox.y = GetRandomValue(0, GetScreenHeight() - heart_sprite.height);
+                 player.hp++;
+                 heart.hitbox.x = GetRandomValue(0, GetScreenWidth() - feather_sprite.width);
+                 heart.hitbox.y = GetRandomValue(0, GetScreenHeight() - feather_sprite.height);
                  heart.active = false;
              }
          }
@@ -227,7 +227,7 @@ void UpdateGameplayScreen(void)
            score++;
            if (score >= bestscore)  bestscore = score;
 
-           enemy.hitbox.y += GetFrameTime() * enemy.speed;
+           enemy.hitbox.y += enemy.speed;
 
            if (((enemy.hitbox.y + enemy.hitbox.height) >= GetScreenHeight()
            || (enemy.hitbox.y <= 0))) enemy.speed *= -1.0f;
@@ -264,7 +264,7 @@ void DrawGameplayScreen(void)
   DrawFPS(10, 430);
   if (DebugMode) {
     DrawRectangleRec(player.hitbox, BLUE);
-    DrawRectangleRec(heart.hitbox, GREEN);
+    DrawRectangleRec(heart.hitbox, WHITE);
     DrawText(TextFormat("enemy.hitbox.y: %f", enemy.hitbox.y), 10, 200, 20, GREEN);
     DrawText(TextFormat("player.hitbox.y: %f", player.hitbox.y), 10, 230, 20, GREEN);
     DrawRectangleRec(enemy.hitbox, BLACK);
@@ -276,7 +276,7 @@ void DrawGameplayScreen(void)
     DrawText(TextFormat("player_iframeTimer: %d", player_iframeTimer), 10, 300, 20, GREEN);
     DrawText(TextFormat("player_in: %d", player_in), 10, 320, 20, GREEN);
   }
-  if (heart.active) DrawTexture(heart_sprite, heart.sprite_pos.x, heart.sprite_pos.y, RAYWHITE);
+  if (heart.active) DrawTexture(feather_sprite, heart.sprite_pos.x, heart.sprite_pos.y, GREEN);
   DrawTexture(enemy_sprite, enemy.sprite_pos.x, enemy.sprite_pos.y, enemy.color);
   for (int i = 0; i < MAX_FIREWORKS; i++) {
     DrawTexture(firework_sprite, fireworks[i].sprite_pos.x, fireworks[i].sprite_pos.y, fireworks[i].color);
@@ -291,7 +291,7 @@ void UnloadGameplayScreen()
 {
   UnloadSound(fxbounce);
   UnloadTexture(player_sprite);
-  UnloadTexture(heart_sprite);
+  UnloadTexture(feather_sprite);
   UnloadTexture(enemy_sprite);
   UnloadTexture(firework_sprite);
 }
diff --git a/src/Gameplay.h b/src/Gameplay.h
index 18ddc8f..f5f2636 100644
--- a/src/Gameplay.h
+++ b/src/Gameplay.h
@@ -10,7 +10,7 @@
 #define GAMEPLAY_HEADER
 
 #define MAX_FIREWORKS 10
-#define MAX_PLAYER_HP 5
+#define PLAYER_HP 3
 
 struct Actor {
     float speed;
diff --git a/src/Main.c b/src/Main.c
index ec486b3..8397d0c 100644
--- a/src/Main.c
+++ b/src/Main.c
@@ -22,7 +22,7 @@ GameScreen currentScreen = 0;
 
 Texture2D background;
 Texture2D player_sprite;
-Texture2D heart_sprite;
+Texture2D feather_sprite;
 Texture2D enemy_sprite;
 Texture2D firework_sprite;
 
diff --git a/src/Textures.h b/src/Textures.h
index e284ade..f8c2960 100644
--- a/src/Textures.h
+++ b/src/Textures.h
@@ -11,7 +11,7 @@
 
 extern Texture2D background;
 extern Texture2D player_sprite;
-extern Texture2D heart_sprite;
+extern Texture2D feather_sprite;
 extern Texture2D enemy_sprite;
 extern Texture2D firework_sprite;