From 1e586ce7ab8df9e9e32e46343a1f0148ecfe415c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Sun, 22 Mar 2020 11:31:02 +0100
Subject: [PATCH] Limit ammo and health

---
 TODO.txt          |  30 ++++++++++++++++--------------
 assets/levelY.gif | Bin 0 -> 2838 bytes
 constants.h       |  13 ++++++++++++-
 main.c            |  30 ++++++++++++++++++++++--------
 settings.h        |   7 ++++++-
 5 files changed, 56 insertions(+), 24 deletions(-)
 create mode 100644 assets/levelY.gif

diff --git a/TODO.txt b/TODO.txt
index 6334ade..5f0f80a 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,21 +1,8 @@
 general:
 
-- try to make z-buffer 3 line instead of 1D, possibly like this (to keep
-  performance):
-  - at compile time selct X = power of 2 closest to vertical resolution
-    (or something like that)
-  - in pixel funct do something like
-      if (pixel->y % X == 0 && pixel->y != 0)
-        write to z-buffer
-- let player start with 100 HP, but allow for collecting a higher amount, e.g.
-  up to 150.
-- Add blinking:
-  - In menu, the selected level number should blink to indicate it can be
-    changed.
-  - Near locked door the specific unlocking card should blink on the HUD bar.
-  - Add setting SFG_BLINK_PERIOD to control blinking speed.
 - try to remove the debug flag (-g1) from compiler and see if it decreases size
 - port to GB Meta
+- add enemy moving/dying sound
 - sounds (music?)
 - level 2D map (with revealing, bitmap), special key for quick displaying map
 - save/load (optional)
@@ -64,6 +51,9 @@ level ideas:
       has to slowly kill, which means he has to first get rid of the other
       monsters.
 
+- ceiling with "holes" through which sky (background) can be seen -- can be done
+  by having the ceiling texture set transparent and then alternating ceiling and
+  no ceiling
 - boss level: skyscraper top, player goes upwards in a spiral along the OUTSIDE
   side of the skyscraper
 - two levels could partially overlap, e.g. level one, a city, could overlap
@@ -141,6 +131,7 @@ bugs:
 done:
 
 - add headbob
+- add blinking
 - make zBuffer 8bit only?
 - texture coords of floor walls should start from the floor? NO, CAUSES ISSUES
 - vertical visual noise when standing on elevator
@@ -161,4 +152,15 @@ done:
   check collisions for both player and monsters against this array (elevate
   these squares for collisions only) -- will also be faster
 - more level prop items
+- let player start with 100 HP, but allow for collecting a higher amount, e.g.
+  up to 150.
+- limit maximum ammo amounts
 
+scratched:
+- try to make z-buffer 3 line instead of 1D, possibly like this (to keep
+  performance):
+  - at compile time selct X = power of 2 closest to vertical resolution
+    (or something like that)
+  - in pixel funct do something like
+      if (pixel->y % X == 0 && pixel->y != 0)
+        write to z-buffer
diff --git a/assets/levelY.gif b/assets/levelY.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a73ba268de035887c6e3e70aec152549c4210c70
GIT binary patch
literal 2838
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

literal 0
HcmV?d00001

diff --git a/constants.h b/constants.h
index 84f0610..35b03b0 100644
--- a/constants.h
+++ b/constants.h
@@ -114,7 +114,12 @@
 /**
   Maximum player health.
 */
-#define SFG_PLAYER_MAX_HEALTH 100
+#define SFG_PLAYER_MAX_HEALTH 150
+
+/**
+  Start health of player.
+*/
+#define SFG_PLAYER_START_HEALTH 100
 
 /**
   At which value health indicator shows a warning (red color).
@@ -166,6 +171,10 @@
 #define SFG_AMMO_INCREASE_ROCKETS 5
 #define SFG_AMMO_INCREASE_PLASMA 8
 
+#define SFG_AMMO_MAX_BULLETS 200
+#define SFG_AMMO_MAX_ROCKETS 100
+#define SFG_AMMO_MAX_PLASMA 150
+
 /**
   Duration of story text (intro/outro) in ms.
 */
@@ -355,6 +364,8 @@
   #define SFG_HUD_BORDER_INDICATOR_DURATION_FRAMES 1
 #endif
 
+#define SFG_BLINK_PERIOD_FRAMES (SFG_BLINK_PERIOD / SFG_MS_PER_FRAME)
+
 #define SFG_HUD_BAR_HEIGHT \
   (SFG_FONT_CHARACTER_SIZE * SFG_FONT_SIZE_MEDIUM + SFG_HUD_MARGIN * 2 + 1)
 
diff --git a/main.c b/main.c
index 75df9ce..59d53d8 100755
--- a/main.c
+++ b/main.c
@@ -1119,7 +1119,7 @@ void SFG_initPlayer()
   SFG_player.lastHurtFrame = SFG_game.frame;
   SFG_player.lastItemTakenFrame = SFG_game.frame;
 
-  SFG_player.health = SFG_PLAYER_MAX_HEALTH;
+  SFG_player.health = SFG_PLAYER_START_HEALTH;
 
   SFG_player.cards = 0;
 
@@ -2479,7 +2479,7 @@ void SFG_gameStepPlaying()
     return;
   }
 
-  int8_t recomputeDirection = 0;
+  int8_t recomputeDirection = SFG_currentLevel.frameStart == SFG_game.frame;
 
   RCL_Vector2D moveOffset;
 
@@ -2877,21 +2877,33 @@ void SFG_gameStepPlaying()
         switch (e->type)
         {
           case SFG_LEVEL_ELEMENT_HEALTH:
-            SFG_playerChangeHealth(SFG_HEALTH_KIT_VALUE);
+            if (SFG_player.health < SFG_PLAYER_MAX_HEALTH)
+              SFG_playerChangeHealth(SFG_HEALTH_KIT_VALUE);
+            else
+              eliminate = 0;
             break;
-          
+
+#define addAmmo(type) \
+  if (SFG_player.ammo[SFG_AMMO_##type] < SFG_AMMO_MAX_##type) \
+    SFG_player.ammo[SFG_AMMO_##type] = RCL_min(SFG_AMMO_MAX_##type,\
+      SFG_player.ammo[SFG_AMMO_##type] + SFG_AMMO_INCREASE_##type);\
+  else\
+    eliminate = 0;
+
           case SFG_LEVEL_ELEMENT_BULLETS:
-            SFG_player.ammo[SFG_AMMO_BULLETS] += SFG_AMMO_INCREASE_BULLETS;
+            addAmmo(BULLETS)
             break;
 
           case SFG_LEVEL_ELEMENT_ROCKETS:
-            SFG_player.ammo[SFG_AMMO_ROCKETS] += SFG_AMMO_INCREASE_ROCKETS;
+            addAmmo(ROCKETS)
             break;
 
           case SFG_LEVEL_ELEMENT_PLASMA:
-            SFG_player.ammo[SFG_AMMO_PLASMA] += SFG_AMMO_INCREASE_PLASMA;
+            addAmmo(PLASMA)
             break;
 
+#undef addAmmo
+
           case SFG_LEVEL_ELEMENT_CARD0:
           case SFG_LEVEL_ELEMENT_CARD1:
           case SFG_LEVEL_ELEMENT_CARD2:
@@ -3562,7 +3574,9 @@ void SFG_drawMenu()
   
     SFG_drawText(text,drawX,y,SFG_FONT_SIZE_MEDIUM,textColor,0,0);
 
-    if (item == SFG_MENU_ITEM_PLAY)
+    if (item == SFG_MENU_ITEM_PLAY &&
+        (((i != SFG_game.selectedMenuItem) ||
+          (SFG_game.frame / SFG_BLINK_PERIOD_FRAMES) % 2)))
       SFG_drawNumber((SFG_game.selectedLevel + 1), 
       drawX + SFG_characterSize(SFG_FONT_SIZE_MEDIUM) * (textLen + 1),
       y,SFG_FONT_SIZE_MEDIUM,93);
diff --git a/settings.h b/settings.h
index 5b54e53..2020210 100644
--- a/settings.h
+++ b/settings.h
@@ -189,12 +189,17 @@
 */
 #define SFG_BACKGROUND_BLUR 0
 
+/**
+  Defines the period, in ms, of things that blink, such as text.
+*/
+#define SFG_BLINK_PERIOD 500
+
 //------ developer/debug settings ------
 
 /**
   Developer cheat for having infinite ammo in all weapons.
 */
-#define SFG_INFINITE_AMMO 1
+#define SFG_INFINITE_AMMO 0
 
 /**
   Developer cheat for immortality.