Macros to describe structure values in terms of build points

Balance change:
	* Advanced basilisk gas range reduced from 150 to 120

1 files changed, 20 insertions, 16 deletions

diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index 0bcd81fe..a3019a8d 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -228,6 +228,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #define ALIEN_BHLTH_MODIFIER        1.0f
 #define ABHM(h)                     ((int)((float)h*ALIEN_BHLTH_MODIFIER))
+#define ALIEN_BVALUE_MODIFIER        10.0f
+#define ABVM(h)                      ((int)((float)h*ALIEN_BVALUE_MODIFIER))
 
 #define CREEP_BASESIZE              700
 #define CREEP_TIMEOUT               1000
@@ -245,7 +247,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define ASPAWN_SPLASHDAMAGE         50
 #define ASPAWN_SPLASHRADIUS         100
 #define ASPAWN_CREEPSIZE            120
-#define ASPAWN_VALUE                100
+#define ASPAWN_VALUE                ABVM(ASPAWN_BP)
 
 #define BARRICADE_BP                8
 #define BARRICADE_BT                20000
@@ -256,7 +258,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define BARRICADE_CREEPSIZE         120
 #define BARRICADE_SHRINKPROP        0.25f
 #define BARRICADE_SHRINKTIMEOUT     500
-#define BARRICADE_VALUE             80
+#define BARRICADE_VALUE             ABVM(BARRICADE_BP)
 
 #define BOOSTER_BP                  12
 #define BOOSTER_BT                  15000
@@ -266,7 +268,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define BOOSTER_SPLASHRADIUS        100
 #define BOOSTER_CREEPSIZE           120
 #define BOOSTER_REGEN_MOD           3.0f
-#define BOOSTER_VALUE               120
+#define BOOSTER_VALUE               ABVM(BOOSTER_BP)
 #define BOOST_TIME                  20000
 
 #define ACIDTUBE_BP                 8
@@ -280,7 +282,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define ACIDTUBE_RANGE              300.0f
 #define ACIDTUBE_REPEAT             300
 #define ACIDTUBE_REPEAT_ANIM        2000
-#define ACIDTUBE_VALUE              80
+#define ACIDTUBE_VALUE              ABVM(ACIDTUBE_BP)
 
 #define HIVE_BP                     12
 #define HIVE_BT                     20000
@@ -296,7 +298,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define HIVE_DMG                    50
 #define HIVE_SPEED                  240.0f
 #define HIVE_DIR_CHANGE_PERIOD      500
-#define HIVE_VALUE                  120
+#define HIVE_VALUE                  ABVM(HIVE_BP)
 
 #define TRAPPER_BP                  8
 #define TRAPPER_BT                  12000
@@ -307,7 +309,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define TRAPPER_CREEPSIZE           30
 #define TRAPPER_RANGE               400
 #define TRAPPER_REPEAT              1000
-#define TRAPPER_VALUE               80
+#define TRAPPER_VALUE               ABVM(TRAPPER_BP)
 #define LOCKBLOB_SPEED              650.0f
 #define LOCKBLOB_LOCKTIME           5000
 #define LOCKBLOB_DOT                0.85f // max angle = acos( LOCKBLOB_DOT )
@@ -322,7 +324,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define OVERMIND_CREEPSIZE          120
 #define OVERMIND_ATTACK_RANGE       150.0f
 #define OVERMIND_ATTACK_REPEAT      1000
-#define OVERMIND_VALUE              300
+#define OVERMIND_VALUE              ABVM(30)
 
 #define HOVEL_BP                    0
 #define HOVEL_BT                    15000
@@ -331,7 +333,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define HOVEL_SPLASHDAMAGE          20
 #define HOVEL_SPLASHRADIUS          200
 #define HOVEL_CREEPSIZE             120
-#define HOVEL_VALUE                 80
+#define HOVEL_VALUE                 ABVM(8)
 
 /*
  * ALIEN misc
@@ -531,6 +533,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #define HUMAN_BHLTH_MODIFIER        1.0f
 #define HBHM(h)                     ((int)((float)h*HUMAN_BHLTH_MODIFIER))
+#define HUMAN_BVALUE_MODIFIER        0.1f
+#define HBVM(h)                     ((int)((float)h*(float)ALIEN_CREDITS_PER_FRAG*HUMAN_BVALUE_MODIFIER))
 
 #define REACTOR_BASESIZE            1000
 #define REPEATER_BASESIZE           500
@@ -541,14 +545,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define HSPAWN_HEALTH               HBHM(310)
 #define HSPAWN_SPLASHDAMAGE         50
 #define HSPAWN_SPLASHRADIUS         100
-#define HSPAWN_VALUE                400
+#define HSPAWN_VALUE                HBVM(HSPAWN_BP)
 
 #define MEDISTAT_BP                 8
 #define MEDISTAT_BT                 10000
 #define MEDISTAT_HEALTH             HBHM(190)
 #define MEDISTAT_SPLASHDAMAGE       50
 #define MEDISTAT_SPLASHRADIUS       100
-#define MEDISTAT_VALUE              320
+#define MEDISTAT_VALUE              HBVM(MEDISTAT_BP)
 
 #define MGTURRET_BP                 8
 #define MGTURRET_BT                 10000
@@ -567,7 +571,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define MGTURRET_SPINUP_TIME        750 // time between target sighted and fire
 #define MGTURRET_SPIN_DURATION      50  // time that the turret stays spun-up
 #define MGTURRET_SPINDOWN_TIME      50  // time to return to idle state after a spinup
-#define MGTURRET_VALUE              320
+#define MGTURRET_VALUE              HBVM(MGTURRET_BP)
 
 #define TESLAGEN_BP                 10
 #define TESLAGEN_BT                 15000
@@ -578,7 +582,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define TESLAGEN_K_SCALE            4.0f
 #define TESLAGEN_RANGE              150
 #define TESLAGEN_DMG                HDM(10)
-#define TESLAGEN_VALUE              400
+#define TESLAGEN_VALUE              HBVM(TESLAGEN_BP)
 
 #define DC_BP                       8
 #define DC_BT                       10000
@@ -588,14 +592,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define DC_ATTACK_PERIOD            10000 // how often to spam "under attack"
 #define DC_HEALRATE                 3
 #define DC_RANGE                    10000
-#define DC_VALUE                    320
+#define DC_VALUE                    HBVM(DC_BP)
 
 #define ARMOURY_BP                  10
 #define ARMOURY_BT                  10000
 #define ARMOURY_HEALTH              HBHM(420)
 #define ARMOURY_SPLASHDAMAGE        50
 #define ARMOURY_SPLASHRADIUS        100
-#define ARMOURY_VALUE               400
+#define ARMOURY_VALUE               HBVM(ARMOURY_BP)
 
 #define REACTOR_BP                  0
 #define REACTOR_BT                  20000
@@ -608,7 +612,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define REACTOR_ATTACK_DCC_REPEAT   1000
 #define REACTOR_ATTACK_DCC_RANGE    150.0f
 #define REACTOR_ATTACK_DCC_DAMAGE   40
-#define REACTOR_VALUE               1200
+#define REACTOR_VALUE               HBVM(30)
 
 #define REPEATER_BP                 0
 #define REPEATER_BT                 10000
@@ -616,7 +620,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define REPEATER_SPLASHDAMAGE       50
 #define REPEATER_SPLASHRADIUS       100
 #define REPEATER_INACTIVE_TIME      90000
-#define REPEATER_VALUE              80
+#define REPEATER_VALUE              HBVM(2)
 
 /*
  * HUMAN misc