diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/g_active.c | 16 | ||||
| -rw-r--r-- | src/game/g_local.h | 1 | ||||
| -rw-r--r-- | src/game/tremulous.h | 8 |
3 files changed, 21 insertions, 4 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c index 418b89c6..c74dda37 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -589,6 +589,7 @@ void ClientTimerActions( gentity_t *ent, int msec ) client = ent->client; client->time100 += msec; client->time1000 += msec; + client->time10000 += msec; while ( client->time100 >= 100 ) { @@ -741,6 +742,21 @@ void ClientTimerActions( gentity_t *ent, int msec ) client->voiceEnthusiasm = 0.0f; } + while( client->time10000 >= 10000 ) + { + client->time10000 -= 10000; + + if( ent->client->ps.weapon == WP_ABUILD || + ent->client->ps.weapon == WP_ABUILD2 ) + { + AddScore( ent, ALIEN_BUILDER_SCOREINC ); + } + else if( ent->client->ps.weapon == WP_HBUILD ) + { + AddScore( ent, HUMAN_BUILDER_SCOREINC ); + } + } + // Regenerate Adv. Dragoon barbs if( client->ps.weapon == WP_ALEVEL3_UPG ) { diff --git a/src/game/g_local.h b/src/game/g_local.h index 08cc3270..f1432ebc 100644 --- a/src/game/g_local.h +++ b/src/game/g_local.h @@ -411,6 +411,7 @@ struct gclient_s int time100; // timer for 100ms interval events int time1000; // timer for one second interval events + int time10000; // timer for ten second interval events char *areabits; diff --git a/src/game/tremulous.h b/src/game/tremulous.h index 15d712ea..55db6bce 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -221,7 +221,7 @@ 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 60.0f +#define ALIEN_BVALUE_MODIFIER 90.0f #define ABVM(h) ((int)((float)h*ALIEN_BVALUE_MODIFIER)) #define CREEP_BASESIZE 700 @@ -529,7 +529,7 @@ 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 160.0f +#define HUMAN_BVALUE_MODIFIER 240.0f #define HBVM(h) ((int)((float)h*(float)HUMAN_BVALUE_MODIFIER)) // remember these are measured in credits not frags (c.f. ALIEN_CREDITS_PER_FRAG) #define REACTOR_BASESIZE 1000 @@ -643,8 +643,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define HUMAN_MAX_CREDITS 2000 #define HUMAN_TK_SUICIDE_PENALTY 150 -#define HUMAN_BUILDER_SCOREINC AVM( LEVEL0_VALUE ); -#define ALIEN_BUILDER_SCOREINC HVM( ALIEN_CREDITS_PER_FRAG ); +#define HUMAN_BUILDER_SCOREINC 50 // builders receive this many points every 10 seconds +#define ALIEN_BUILDER_SCOREINC AVM(50) // builders receive this many points every 10 seconds /* * Misc |