summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorBen Millwood <thebenmachine@gmail.com>2009-10-03 12:55:13 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:16:19 +0000
commit5f6c719d651ab27de04ce1eff7e631751e6c849e (patch)
tree93a3a2befb3f2a4c75b6f1e35e716f3e7a9a0fb2 /src/game
parent292b4da1fef014a7b3d1f7eb22710fb5aa27e11b (diff)
* Repeaters cost 2 BP that take away from the main (reactor's) pool.
* By default, repeater BP queue return is instant * Repeaters can be built at stage 1 * Increase the alien build point and build queue time defaults by 50%
Diffstat (limited to 'src/game')
-rw-r--r--src/game/bg_misc.c2
-rw-r--r--src/game/g_buildable.c6
-rw-r--r--src/game/g_main.c6
-rw-r--r--src/game/tremulous.h8
4 files changed, 15 insertions, 7 deletions
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index a8f5579b..a5c371c5 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -572,7 +572,7 @@ static const buildableAttributes_t bg_buildableList[ ] =
TR_GRAVITY, //trType_t traj;
0.0, //float bounce;
REPEATER_BP, //int buildPoints;
- ( 1 << S2 )|( 1 << S3 ), //int stages
+ ( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages
REPEATER_HEALTH, //int health;
0, //int regenRate;
REPEATER_SPLASHDAMAGE, //int splashDamage;
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index 704a8c7c..f8b4eb99 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -3152,7 +3152,11 @@ static itemBuildError_t G_SufficientBPAvailable( buildable_t buildable,
}
else if( team == TEAM_HUMANS )
{
- remainingBP = G_GetBuildPoints( origin, team, 0 );
+ if( buildable == BA_H_REACTOR || buildable == BA_H_REPEATER )
+ remainingBP = level.humanBuildPoints;
+ else
+ remainingBP = G_GetBuildPoints( origin, team, 0 );
+
remainingSpawns = level.numHumanSpawns;
bpError = IBE_NOHUMANBP;
spawn = BA_H_SPAWN;
diff --git a/src/game/g_main.c b/src/game/g_main.c
index ab9e77b5..44fafba0 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -1231,7 +1231,11 @@ void G_CalculateBuildPoints( void )
if( BG_Buildable( buildable )->team == TEAM_HUMANS )
{
- if( buildable != BA_H_REACTOR && buildable != BA_H_REPEATER )
+ if( buildable == BA_H_REACTOR || buildable == BA_H_REPEATER )
+ {
+ level.humanBuildPoints -= BG_Buildable( buildable )->buildPoints;
+ }
+ else
{
gentity_t *powerEntity = G_PowerEntityForEntity( ent );
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index 776f9835..fac554bf 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -609,7 +609,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define REACTOR_ATTACK_DCC_DAMAGE 40
#define REACTOR_VALUE HBVM(30)
-#define REPEATER_BP 0
+#define REPEATER_BP 2
#define REPEATER_BT 10000
#define REPEATER_HEALTH HBHM(250)
#define REPEATER_SPLASHDAMAGE 50
@@ -659,15 +659,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define FREEKILL_ALIEN ALIEN_CREDITS_PER_KILL
#define FREEKILL_HUMAN LEVEL0_VALUE
-#define DEFAULT_ALIEN_BUILDPOINTS "100"
-#define DEFAULT_ALIEN_QUEUE_TIME "7000"
+#define DEFAULT_ALIEN_BUILDPOINTS "150"
+#define DEFAULT_ALIEN_QUEUE_TIME "10500"
#define DEFAULT_ALIEN_STAGE2_THRESH "8000"
#define DEFAULT_ALIEN_STAGE3_THRESH "16000"
#define DEFAULT_ALIEN_MAX_STAGE "2"
#define DEFAULT_HUMAN_BUILDPOINTS "100"
#define DEFAULT_HUMAN_QUEUE_TIME "7000"
#define DEFAULT_HUMAN_REPEATER_BUILDPOINTS "20"
-#define DEFAULT_HUMAN_REPEATER_QUEUE_TIME "7000"
+#define DEFAULT_HUMAN_REPEATER_QUEUE_TIME "0"
#define DEFAULT_HUMAN_REPEATER_MAX_ZONES "3"
#define DEFAULT_HUMAN_REPEATER_ALLOW_OVERLAP "1"
#define DEFAULT_HUMAN_STAGE2_THRESH "4000"