summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/game/g_active.c10
-rw-r--r--src/game/tremulous.h11
2 files changed, 15 insertions, 6 deletions
diff --git a/src/game/g_active.c b/src/game/g_active.c
index c857e57..ac0717e 100644
--- a/src/game/g_active.c
+++ b/src/game/g_active.c
@@ -856,9 +856,17 @@ void ClientTimerActions( gentity_t *ent, int msec )
boostEntity = &g_entities[ entityList[ i ] ];
if( boostEntity->client && boostEntity->client->ps.stats[ STAT_PTEAM ] == PTE_ALIENS &&
- boostEntity->client->ps.stats[ STAT_PCLASS ] == PCL_ALIEN_LEVEL1_UPG )
+ boostEntity->client->ps.stats[ STAT_PCLASS ] == PCL_ALIEN_LEVEL1_UPG &&
+ boostEntity->health > 0 )
{
modifier = LEVEL1_REGEN_MOD;
+
+ if( ent != boostEntity && ent->health < client->ps.stats[ STAT_MAX_HEALTH ] )
+ {
+ G_AddCreditToClient( boostEntity->client, LEVEL1_REGEN_REWARD, qtrue );
+ boostEntity->client->pers.statscounters.earned += LEVEL1_REGEN_REWARD;
+ }
+
break;
}
else if( boostEntity->s.eType == ET_BUILDABLE &&
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index 0e02398..815113e 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -77,9 +77,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define LEVEL1_PCLOUD_RANGE 200.0f
#define LEVEL1_PCLOUD_REPEAT 2000
#define LEVEL1_PCLOUD_TIME 10000
-#define LEVEL1_PCLOUD_BOOST_TIME 5000
-#define LEVEL1_REGEN_RANGE 200.0f
-#define LEVEL1_REGEN_MOD 2.0f
+#define LEVEL1_PCLOUD_BOOST_TIME 15000
+#define LEVEL1_REGEN_RANGE 300.0f
+#define LEVEL1_REGEN_MOD 3.0f
+#define LEVEL1_REGEN_REWARD EVOS(0.005f)
#define LEVEL2_CLAW_DMG ADM(40)
#define LEVEL2_CLAW_RANGE 96.0f
@@ -165,13 +166,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define LEVEL0_COST EVOS(0)
#define LEVEL1_SPEED 1.25f
-#define LEVEL1_VALUE AVM(225)
+#define LEVEL1_VALUE AVM(450)
#define LEVEL1_HEALTH AHM(75)
#define LEVEL1_REGEN 2
#define LEVEL1_COST EVOS(1)
#define LEVEL1_UPG_SPEED 1.25f
-#define LEVEL1_UPG_VALUE AVM(275)
+#define LEVEL1_UPG_VALUE AVM(550)
#define LEVEL1_UPG_HEALTH AHM(100)
#define LEVEL1_UPG_REGEN 3
#define LEVEL1_UPG_COST EVOS(1)