* Reimplemented how buildables play damage sounds to not use the event system

* Reworked the ammo/clips packing system to remove the confusion of concepts
* Marauder lightning now requires aim, does damage over time and chains to other entities
* Implemented the Medkit -- a means for a human to restore health and cure poison in the field
* "Disable Build Warnings" replaced with "Disable Warning Dialogs" and improved
* Disabled client side ET_MISSILE collision
* Sped spectator move speed up
* Implemented "step down" physics for all characters; no more jumping down stairs
* Re-adjusted step time values
* Increased frequency with which the Acid Tube deals damage
* G_RadiusSelectiveDamage no longer applies locational damage
* Moved some speed adjustment code into prediction; should prevent some prediction misses
* Tyrant can no longer charge up forever and must pass a specific minimum charge level
* Wrapped all calls to trap_SendServerCommand in order to circumvent the q3amsgboom.cfg exploit
* Implemented command queueing for commands sent to clients in order to prevent overflows even sv_floodProtect is off, but not by dropping commands
* Added LOS check to creep slowing
* Overmind now only complains if there are 0 spawns
* Spawns can no longer be built when there is no Overmind/Reactor
* The spawn closest to the point of death is chosen preferably if available
* Evolving no longer restores all health
* "give weapons" and "give ammo" cheats removed
* Fixed restoration of energy weapons bug
* When selling the battery pack, max ammo is given
* Fixed a bug where locational damage could sometimes scale damage to 0
* Added stage information to the end of game stats
* Hacked around trap_LinkEntity to allow missiles to have a bounding box displayed
* Added G_ClosestEnt
* Reduced Dragoon spitball damage from 120 to 110
* Reduced Tyrant claw damage from 120 to 100
* Reduced Tyrant charge damage from 160 to 110
* Increased Barricade regeneration rate from 12 to 14
* Increased Overmind health from 500 to 750
* Decreased Overmind regeneration rate from 10 to 6
* Doubled Blaster speed from 700 to 1400
* Reduced Painsaw damage from 18 to 15
* Reduced Painsaw range from 48.0 to 40.0
* Reduced Grenade price from 300 to 200
* Reduced Shotgun repeat rate from 1200 to 1000
* Increased Shotgun damage from 6 to 7
* Increased Mass driver damage from 35 to 38
* Increased Chaingun damage from 5 to 6
* Reduced Flamer repeat rate from 300 to 200
* Extended Flamer range
* Increased ammo on all human weapons
* Reduced splashdamage on MG Turrets
* Moved build directory from tremulous to tremulous-dev

1 files changed, 14 insertions, 10 deletions

diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index c2b3805f..1104dccb 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -233,6 +233,8 @@ typedef enum
 #define SS_BOOSTED              0x00000200
 #define SS_SLOWLOCKED           0x00000400
 #define SS_POISONCLOUDED        0x00000800
+#define SS_MEDKIT_ACTIVE        0x00001000
+#define SS_CHARGING             0x00002000
 
 #define SB_VALID_TOGGLEBIT      0x00004000
 
@@ -369,7 +371,7 @@ typedef enum
 
   UP_LIGHTARMOUR,
   UP_HELMET,
-  UP_ANTITOXIN,
+  UP_MEDKIT,
   UP_BATTPACK,
   UP_JETPACK,
   UP_BATTLESUIT,
@@ -527,7 +529,6 @@ typedef enum
   EV_MISSILE_MISS,
   EV_MISSILE_MISS_METAL,
   EV_TESLATRAIL,
-  EV_ALIENZAP,
   EV_BULLET,        // otherEntity is the shooter
 
   EV_LEV1_GRAB,
@@ -550,8 +551,8 @@ typedef enum
   EV_HUMAN_BUILDABLE_EXPLOSION,
   EV_ALIEN_BUILDABLE_EXPLOSION,
   EV_ALIEN_ACIDTUBE,
-  EV_HUMAN_BUILDABLE_DAMAGE,
-  EV_ALIEN_BUILDABLE_DAMAGE,
+
+  EV_MEDKIT_USED,
 
   EV_ALIEN_EVOLVE,
   EV_ALIEN_EVOLVE_FAILED,
@@ -1031,8 +1032,7 @@ typedef struct
   char      *weaponName;
   char      *weaponHumanName;
 
-  int       quan;
-  int       clips;
+  int       maxAmmo;
   int       maxClips;
   qboolean  infiniteAmmo;
   qboolean  usesEnergy;
@@ -1070,14 +1070,16 @@ typedef struct
 
   char      *icon;
   
+  qboolean  purchasable;
+  
   WUTeam_t  team;
 } upgradeAttributes_t;
 
 
 //TA:
-void      BG_UnpackAmmoArray( int weapon, int ammo[ ], int ammo2[ ], int *quan, int *clips, int *maxclips );
-void      BG_PackAmmoArray( int weapon, int ammo[ ], int ammo2[ ], int quan, int clips, int maxclips );
-qboolean  BG_WeaponIsFull( weapon_t weapon, int ammo[ ], int ammo2[ ] );
+void      BG_UnpackAmmoArray( int weapon, int psAmmo[ ], int psAmmo2[ ], int *ammo, int *clips );
+void      BG_PackAmmoArray( int weapon, int psAmmo[ ], int psAmmo2[ ], int ammo, int clips );
+qboolean  BG_WeaponIsFull( weapon_t weapon, int stats[ ], int psAmmo[ ], int psAmmo2[ ] );
 void      BG_AddWeaponToInventory( int weapon, int stats[ ] );
 void      BG_RemoveWeaponFromInventory( int weapon, int stats[ ] );
 qboolean  BG_InventoryContainsWeapon( int weapon, int stats[ ] );
@@ -1175,7 +1177,7 @@ char      *BG_FindModelsForWeapon( int weapon, int modelNum );
 char      *BG_FindIconForWeapon( int weapon );
 char      *BG_FindCrosshairForWeapon( int weapon );
 int       BG_FindCrosshairSizeForWeapon( int weapon );
-void      BG_FindAmmoForWeapon( int weapon, int *quan, int *clips, int *maxClips );
+void      BG_FindAmmoForWeapon( int weapon, int *maxAmmo, int *maxClips );
 qboolean  BG_FindInfinteAmmoForWeapon( int weapon );
 qboolean  BG_FindUsesEnergyForWeapon( int weapon );
 int       BG_FindRepeatRate1ForWeapon( int weapon );
@@ -1197,6 +1199,7 @@ char      *BG_FindNameForUpgrade( int upgrade );
 int       BG_FindUpgradeNumForName( char *name );
 char      *BG_FindHumanNameForUpgrade( int upgrade );
 char      *BG_FindIconForUpgrade( int upgrade );
+qboolean  BG_FindPurchasableForUpgrade( int upgrade );
 WUTeam_t  BG_FindTeamForUpgrade( int upgrade );
 
 // content masks
@@ -1235,6 +1238,7 @@ typedef enum
   ET_ANIMMAPOBJ,
   ET_MODELDOOR,
   ET_LIGHTFLARE,
+  ET_LEV2_ZAP_CHAIN,
 
   ET_EVENTS       // any of the EV_* events can be added freestanding
               // by setting eType to ET_EVENTS + eventNum