From 72a666d3ad567ab51a517f786eda8cbe230a2fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Wed, 1 Jan 2020 20:53:05 +0100
Subject: [PATCH] Move projcount to table

---
 constants.h | 37 ++++++++++++++++++++-----------------
 main.c      | 13 +++----------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/constants.h b/constants.h
index 989e6a7..6cfe83b 100644
--- a/constants.h
+++ b/constants.h
@@ -334,38 +334,41 @@ uint16_t SFG_monsterAttributeTable[SFG_MONSTERS_TOTAL] =
 
 #define SFG_WEAPONS_TOTAL 6
 
-#define SFG_WEAPON_ATTRIBUTE(fireType,fireCooldownMs) \
-  ((uint8_t) (fireType | ((fireCooldownMs / (SFG_MS_PER_FRAME * 4)) << 3)))
+#define SFG_WEAPON_ATTRIBUTE(fireType,projectileCount,fireCooldownMs) \
+  ((uint8_t) (fireType | ((projectileCount - 1) << 2) | ((fireCooldownMs / (SFG_MS_PER_FRAME * 16)) << 4)))
 
 #define SFG_GET_WEAPON_FIRE_TYPE(weaponNumber) \
-  (SFG_weaponAttributeTable[weaponNumber] & 0x7)
+  (SFG_weaponAttributeTable[weaponNumber] & 0x03)
 
 #define SFG_GET_WEAPON_FIRE_COOLDOWN_FRAMES(weaponNumber) \
-  ((SFG_weaponAttributeTable[weaponNumber] >> 3) * 4)
+  ((SFG_weaponAttributeTable[weaponNumber] >> 4) * 16)
+
+#define SFG_GET_WEAPON_PROJECTILE_COUNT(weaponNumber) \
+  (((SFG_weaponAttributeTable[weaponNumber] >> 2) & 0x03) + 1)
 
 #define SFG_WEAPON_FIRE_TYPE_MELEE 0
 #define SFG_WEAPON_FIRE_TYPE_BULLET 1
-#define SFG_WEAPON_FIRE_TYPE_SPREAD_BULLETS 2
-#define SFG_WEAPON_FIRE_TYPE_FIREBALL 3
-#define SFG_WEAPON_FIRE_TYPE_PLASMA 4
+#define SFG_WEAPON_FIRE_TYPE_FIREBALL 2
+#define SFG_WEAPON_FIRE_TYPE_PLASMA 3
 
 /**
   Table of weapon attributes, each as a byte in format:
 
-  MSB cccccfff LSB
+  MSB ccccnnff LSB
 
-  fff:    fire type
-  ccccc:  fire cooldown in frames, i.e. time after which the next shot can be
-          shot again, ccccc has to be multiplied by 32 to ge the real value
+  ff:     fire type
+  nn:     number of projectiles - 1
+  cccc:   fire cooldown in frames, i.e. time after which the next shot can be
+          shot again, ccccc has to be multiplied by 16 to ge the real value
 */
 SFG_PROGRAM_MEMORY uint8_t SFG_weaponAttributeTable[SFG_WEAPONS_TOTAL] =
 {
-  /* knife    */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_MELEE,400),
-  /* shotgun  */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_SPREAD_BULLETS,800),
-  /* m. gun   */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_BULLET,300),
-  /* r. laun. */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_FIREBALL,900),
-  /* plasma   */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_PLASMA,350),
-  /* solution */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_PLASMA,750)
+  /* knife    */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_MELEE,1,650),
+  /* shotgun  */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_BULLET,2,800),
+  /* m. gun   */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_BULLET,1,500),
+  /* r. laun. */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_FIREBALL,1,900),
+  /* plasma   */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_PLASMA,1,600),
+  /* solution */ SFG_WEAPON_ATTRIBUTE(SFG_WEAPON_FIRE_TYPE_PLASMA,4,1000)
 };
 
 #define SFG_PROJECTILE_EXPLOSION 0
diff --git a/main.c b/main.c
index baab4c0..4682901 100755
--- a/main.c
+++ b/main.c
@@ -1596,7 +1596,6 @@ void SFG_gameStep()
         projectile = SFG_PROJECTILE_FIREBALL;
         break;
 
-      case SFG_WEAPON_FIRE_TYPE_SPREAD_BULLETS:
       case SFG_WEAPON_FIRE_TYPE_BULLET:
         projectile = SFG_PROJECTILE_BULLET;
         break;
@@ -1612,13 +1611,8 @@ void SFG_gameStep()
         
     if (projectile != SFG_PROJECTILE_NONE)
     {
-      uint8_t projectileCount = 1;
-
-// TODO: move bullet count to weapon table
-if (SFG_player.weapon == SFG_WEAPON_SHOTGUN)
-projectileCount = 2;
-else if (SFG_player.weapon == SFG_WEAPON_SOLUTION)
-projectileCount = 4;
+      uint8_t projectileCount = 
+        SFG_GET_WEAPON_PROJECTILE_COUNT(SFG_player.weapon);
 
       uint16_t angleAdd = SFG_PROJECTILE_SPREAD_ANGLE / (projectileCount + 1);
 
@@ -2444,8 +2438,7 @@ void SFG_drawWeapon(int16_t bobOffset)
    
       if (
         ((fireType == SFG_WEAPON_FIRE_TYPE_FIREBALL) ||
-         (fireType == SFG_WEAPON_FIRE_TYPE_BULLET) ||
-         (fireType == SFG_WEAPON_FIRE_TYPE_SPREAD_BULLETS)) &&
+         (fireType == SFG_WEAPON_FIRE_TYPE_BULLET)) &&
         shotAnimationFrame < animationLength / 2)
         SFG_blitImage(SFG_effectSprites[0],
           SFG_WEAPON_IMAGE_POSITION_X,