* A smattering of fondulations

5 files changed, 36 insertions, 11 deletions

diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index 24e6940d..ebfe0b15 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -2919,7 +2919,22 @@ static void PM_Weapon( void )
   }
     
   if( !( pm->ps->persistant[ PERS_STATE ] & PS_NONSEGMODEL ) )
-    PM_StartTorsoAnim( TORSO_ATTACK );
+  {
+    //FIXME: this should be an option in the client weapon.cfg
+    switch( pm->ps->weapon )
+    { 
+      case WP_FLAMER:
+        if( pm->ps->weaponstate == WEAPON_READY )
+        {
+          PM_StartTorsoAnim( TORSO_ATTACK );
+        }
+        break;
+
+      default:
+        PM_StartTorsoAnim( TORSO_ATTACK );
+        break;
+    }
+  }
   else
   {
     if( pm->ps->weapon == WP_BIGMOFO )
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index 8249eddb..17503b26 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -423,8 +423,8 @@ void Cmd_Kill_f( gentity_t *ent )
   {
     if( ent->suicideTime == 0 )
     {
-      trap_SendServerCommand( ent-g_entities, "print \"You will suicide in 10 seconds.\n\"" );
-      ent->suicideTime = level.time + 10000;
+      trap_SendServerCommand( ent-g_entities, "print \"You will suicide in 20 seconds.\n\"" );
+      ent->suicideTime = level.time + 20000;
     }
     else if( ent->suicideTime > level.time )
     {
@@ -1623,6 +1623,16 @@ void Cmd_Buy_f( gentity_t *ent )
             !BG_FindInfinteAmmoForWeapon( i ) )
         {
           BG_FindAmmoForWeapon( i, &quan, &clips, &maxClips );
+          
+          if( buyingEnergyAmmo )
+          {
+            G_AddEvent( ent, EV_RPTUSE_SOUND, 0 );
+            ent->client->lastRefilTime = level.time;
+            
+            if( BG_gotItem( UP_BATTPACK, ent->client->ps.stats ) )
+              quan = (int)( (float)quan * BATTPACK_MODIFIER );
+          }
+
           BG_packAmmoArray( i, ent->client->ps.ammo, ent->client->ps.powerups,
                             quan, clips, maxClips );
         }
diff --git a/src/game/g_local.h b/src/game/g_local.h
index 84acff1c..ee802f47 100644
--- a/src/game/g_local.h
+++ b/src/game/g_local.h
@@ -703,7 +703,7 @@ void      G_InitDamageLocations( void );
 #define DAMAGE_NO_ARMOR       0x00000002  // armour does not protect from this damage
 #define DAMAGE_NO_KNOCKBACK   0x00000004  // do not affect velocity, just view angles
 #define DAMAGE_NO_PROTECTION  0x00000008  // armor, shields, invulnerability, and godmode have no effect
-#define DAMAGE_NO_LOCDAMAGE   0x00000010  // so not apply locational damage
+#define DAMAGE_NO_LOCDAMAGE   0x00000010  // do not apply locational damage
 
 //
 // g_missile.c
diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c
index dbcf33d2..2ab1abd5 100644
--- a/src/game/g_weapon.c
+++ b/src/game/g_weapon.c
@@ -961,12 +961,12 @@ void areaZapFire( gentity_t *ent )
     
     //do some damage
     G_Damage( enemy, ent, ent, dir, tr.endpos,
-              damage, DAMAGE_NO_KNOCKBACK, MOD_CHIMERA_ZAP );
+              damage, DAMAGE_NO_KNOCKBACK | DAMAGE_NO_LOCDAMAGE, MOD_CHIMERA_ZAP );
     
     // snap the endpos to integers to save net bandwidth, but nudged towards the line
     SnapVectorTowards( tr.endpos, muzzle );
 
-    // send railgun beam effect
+    // send arc effect
     tent = G_TempEntity( enemy->s.pos.trBase, EV_ALIENZAP );
 
     VectorCopy( ent->client->ps.origin, tent->s.origin2 );
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index 2ba0dd50..8f2ffd34 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -60,7 +60,7 @@
 #define CHIMERA_CLAW_WIDTH          12.0f
 #define CHIMERA_CLAW_REPEAT         500
 #define CHIMERA_CLAW_U_REPEAT       400
-#define CHIMERA_AREAZAP_DMG         ADM(200)
+#define CHIMERA_AREAZAP_DMG         ADM(100)
 #define CHIMERA_AREAZAP_RANGE       300.0f
 #define CHIMERA_AREAZAP_REPEAT      1500
 #define CHIMERA_WALLJUMP_MAXSPEED   1000.0f
@@ -465,7 +465,7 @@
 
 #define MGTURRET_BP                 8
 #define MGTURRET_BT                 10000
-#define MGTURRET_HEALTH             HBHM(400)
+#define MGTURRET_HEALTH             HBHM(300)
 #define MGTURRET_SPLASHDAMAGE       200
 #define MGTURRET_SPLASHRADIUS       150
 #define MGTURRET_ANGULARSPEED       6  //degrees/think ~= 200deg/sec
@@ -489,13 +489,13 @@
 
 #define DC_BP                       8
 #define DC_BT                       10000
-#define DC_HEALTH                   HBHM(150)
+#define DC_HEALTH                   HBHM(300)
 #define DC_SPLASHDAMAGE             50
 #define DC_SPLASHRADIUS             100
 
 #define ARMOURY_BP                  10
 #define ARMOURY_BT                  10000
-#define ARMOURY_HEALTH              HBHM(200)
+#define ARMOURY_HEALTH              HBHM(400)
 #define ARMOURY_SPLASHDAMAGE        50
 #define ARMOURY_SPLASHRADIUS        100
 
@@ -511,7 +511,7 @@
 
 #define REPEATER_BP                 10
 #define REPEATER_BT                 10000
-#define REPEATER_HEALTH             HBHM(200)
+#define REPEATER_HEALTH             HBHM(400)
 #define REPEATER_SPLASHDAMAGE       50
 #define REPEATER_SPLASHRADIUS       100