* Improved rifle effectiveness by approximately 30%

* Prevented selling ckit exploit
* Increased build times by about 50%
* Reduced effectiveness of teslagen

3 files changed, 22 insertions, 13 deletions

diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index b24b8526..6327ece5 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -500,9 +500,9 @@ void Cmd_Team_f( gentity_t *ent )
   G_ChangeTeam( ent, team );
   
   if( team == PTE_ALIENS )
-    trap_SendServerCommand( -1, va( "print \"%s joined the aliens.\n\"", ent->client->pers.netname ) );
+    trap_SendServerCommand( -1, va( "print \"%s" S_COLOR_WHITE " joined the aliens.\n\"", ent->client->pers.netname ) );
   else if( team == PTE_HUMANS )
-    trap_SendServerCommand( -1, va( "print \"%s joined the humans.\n\"", ent->client->pers.netname ) );
+    trap_SendServerCommand( -1, va( "print \"%s" S_COLOR_WHITE " joined the humans.\n\"", ent->client->pers.netname ) );
 }
 
 
@@ -1615,7 +1615,7 @@ void Cmd_Sell_f( gentity_t *ent )
     //are we /allowed/ to sell this?
     if( !BG_FindPurchasableForWeapon( weapon ) )
     {
-      trap_SendServerCommand( ent-g_entities, va( "print \"You can't sell this item\n\"" ) );
+      trap_SendServerCommand( ent-g_entities, va( "print \"You can't sell this weapon.\n\"" ) );
       return;
     }
     
@@ -1628,6 +1628,14 @@ void Cmd_Sell_f( gentity_t *ent )
       ent->client->ps.persistant[ PERS_CREDIT ] += (short)BG_FindPriceForWeapon( weapon );
     }
 
+    //guard against selling the HBUILD weapons exploit
+    if( weapon == WP_HBUILD || weapon == WP_HBUILD2 &&
+        ent->client->ps.stats[ STAT_MISC ] != 0 )
+    {
+      trap_SendServerCommand( ent-g_entities, va( "print \"Cannot sell until build timer expires.\n\"" ) );
+      return;
+    }
+    
     //if we have this weapon selected, force a new selection
     if( weapon == ent->client->ps.weapon )
     {
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index 6ffe9edc..592ecc67 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -999,7 +999,8 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
     if( attacker->client && attacker->client->ps.stats[ STAT_STATE ] & SS_BOOSTED )
     {
       if( !( targ->client->ps.stats[ STAT_STATE ] & SS_POISONED ) &&
-          !BG_gotItem( UP_BATTLESUIT, targ->client->ps.stats ) )
+          !BG_gotItem( UP_BATTLESUIT, targ->client->ps.stats ) &&
+          mod != MOD_CHIMERA_ZAP )
       {
         targ->client->ps.stats[ STAT_STATE ] |= SS_POISONED;
         targ->client->lastPoisonTime = level.time;
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index 8ea2b8be..a188fcba 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -30,8 +30,8 @@
 #define ABUILDER_CLAW_RANGE         64.0f
 #define ABUILDER_CLAW_WIDTH         4.0f
 #define ABUILDER_CLAW_REPEAT        1000
-#define ABUILDER_BASE_DELAY         9000
-#define ABUILDER_ADV_DELAY          7000
+#define ABUILDER_BASE_DELAY         15000
+#define ABUILDER_ADV_DELAY          10000
 #define ABUILDER_BLOB_DMG           ADM(5)
 #define ABUILDER_BLOB_REPEAT        1000
 #define ABUILDER_BLOB_SPEED         800.0f
@@ -318,11 +318,11 @@
 #define RIFLE_CLIPSIZE              30
 #define RIFLE_SPAWNCLIPS            3
 #define RIFLE_MAXCLIPS              3
-#define RIFLE_REPEAT                100
+#define RIFLE_REPEAT                90
 #define RIFLE_RELOAD                2000
 #define RIFLE_PRICE                 0
 #define RIFLE_SPREAD                200
-#define RIFLE_DMG                   HDM(5)
+#define RIFLE_DMG                   HDM(6)
 
 #define PAINSAW_PRICE               100
 #define PAINSAW_REPEAT              75
@@ -337,7 +337,7 @@
 #define SHOTGUN_REPEAT              1200
 #define SHOTGUN_RELOAD              2000
 #define SHOTGUN_SPREAD              900
-#define SHOTGUN_DMG                 HDM(12)
+#define SHOTGUN_DMG                 HDM(9)
 
 #define LASGUN_PRICE                250
 #define LASGUN_AMMO                 100
@@ -392,11 +392,11 @@
 
 #define HBUILD_PRICE                0
 #define HBUILD_REPEAT               1000
-#define HBUILD_DELAY                9000
+#define HBUILD_DELAY                15000
 
 #define HBUILD2_PRICE               75
 #define HBUILD2_REPEAT              1000
-#define HBUILD2_DELAY               7000
+#define HBUILD2_DELAY               10000
 
 
 
@@ -485,8 +485,8 @@
 #define TESLAGEN_SPLASHDAMAGE       50
 #define TESLAGEN_SPLASHRADIUS       100
 #define TESLAGEN_REPEAT             500
-#define TESLAGEN_RANGE              300
-#define TESLAGEN_DMG                HDM(20)
+#define TESLAGEN_RANGE              250
+#define TESLAGEN_DMG                HDM(15)
 
 #define DC_BP                       8
 #define DC_BT                       10000