Balance tweaks

* increased goon repeat 700 -> 900
* increased advanced goon repeat 600 -> 800
* increased goon (both) pounce charge time 700 -> 900
* increased tyrant repeat 750 -> 800
* decreased hive health 175 -> 125
* swapped prices of flamer and prifle

3 files changed, 42 insertions, 42 deletions

diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index f9cdb545..204fa878 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -2118,22 +2118,24 @@ static const weaponAttributes_t bg_weapons[ ] =
     TEAM_HUMANS           //team_t    team;
   },
   {
-    WP_PULSE_RIFLE,       //int       weaponNum;
-    PRIFLE_PRICE,         //int       price;
+    WP_FLAMER,            //int       weaponNum;
+    FLAMER_PRICE,         //int       price;
     ( 1 << S2 )|( 1 << S3 ), //int  stages
     SLOT_WEAPON,          //int       slots;
-    "prifle",             //char      *weaponName;
-    "Pulse Rifle",        //char      *humanName;
-    "An energy weapon that fires rapid pulses of concentrated energy.",
-    PRIFLE_CLIPS,         //int       maxAmmo;
-    PRIFLE_MAXCLIPS,      //int       maxClips;
+    "flamer",             //char      *weaponName;
+    "Flame Thrower",      //char      *humanName;
+    "Sprays fire at its target. It is powered by compressed "
+      "gas. The relatively low rate of fire means this weapon is most "
+      "effective against static targets.",
+    FLAMER_GAS,           //int       maxAmmo;
+    0,                    //int       maxClips;
     qfalse,               //int       infiniteAmmo;
-    qtrue,                //int       usesEnergy;
-    PRIFLE_REPEAT,        //int       repeatRate1;
+    qfalse,               //int       usesEnergy;
+    FLAMER_REPEAT,        //int       repeatRate1;
     0,                    //int       repeatRate2;
     0,                    //int       repeatRate3;
-    PRIFLE_RELOAD,        //int       reloadTime;
-    PRIFLE_K_SCALE,       //float     knockbackScale;
+    0,                    //int       reloadTime;
+    FLAMER_K_SCALE,       //float     knockbackScale;
     qfalse,               //qboolean  hasAltMode;
     qfalse,               //qboolean  hasThirdMode;
     qfalse,               //qboolean  canZoom;
@@ -2143,24 +2145,22 @@ static const weaponAttributes_t bg_weapons[ ] =
     TEAM_HUMANS           //team_t    team;
   },
   {
-    WP_FLAMER,            //int       weaponNum;
-    FLAMER_PRICE,         //int       price;
+    WP_PULSE_RIFLE,       //int       weaponNum;
+    PRIFLE_PRICE,         //int       price;
     ( 1 << S2 )|( 1 << S3 ), //int  stages
     SLOT_WEAPON,          //int       slots;
-    "flamer",             //char      *weaponName;
-    "Flame Thrower",      //char      *humanName;
-    "Sprays fire at its target. It is powered by compressed "
-      "gas. The relatively low rate of fire means this weapon is most "
-      "effective against static targets.",
-    FLAMER_GAS,           //int       maxAmmo;
-    0,                    //int       maxClips;
+    "prifle",             //char      *weaponName;
+    "Pulse Rifle",        //char      *humanName;
+    "An energy weapon that fires rapid pulses of concentrated energy.",
+    PRIFLE_CLIPS,         //int       maxAmmo;
+    PRIFLE_MAXCLIPS,      //int       maxClips;
     qfalse,               //int       infiniteAmmo;
-    qfalse,               //int       usesEnergy;
-    FLAMER_REPEAT,        //int       repeatRate1;
+    qtrue,                //int       usesEnergy;
+    PRIFLE_REPEAT,        //int       repeatRate1;
     0,                    //int       repeatRate2;
     0,                    //int       repeatRate3;
-    0,                    //int       reloadTime;
-    FLAMER_K_SCALE,       //float     knockbackScale;
+    PRIFLE_RELOAD,        //int       reloadTime;
+    PRIFLE_K_SCALE,       //float     knockbackScale;
     qfalse,               //qboolean  hasAltMode;
     qfalse,               //qboolean  hasThirdMode;
     qfalse,               //qboolean  canZoom;
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index 9649de98..c8f95098 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -338,8 +338,8 @@ typedef enum
   WP_LAS_GUN,
   WP_MASS_DRIVER,
   WP_CHAINGUN,
-  WP_PULSE_RIFLE,
   WP_FLAMER,
+  WP_PULSE_RIFLE,
   WP_LUCIFER_CANNON,
   WP_GRENADE,
 
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index d81aae73..0bffc37f 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -92,16 +92,16 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define LEVEL3_CLAW_RANGE           72.0f
 #define LEVEL3_CLAW_UPG_RANGE       LEVEL3_CLAW_RANGE + 3.0f          
 #define LEVEL3_CLAW_WIDTH           12.0f
-#define LEVEL3_CLAW_REPEAT          700
+#define LEVEL3_CLAW_REPEAT          900
 #define LEVEL3_CLAW_K_SCALE         1.0f
-#define LEVEL3_CLAW_U_REPEAT        600
+#define LEVEL3_CLAW_U_REPEAT        800
 #define LEVEL3_CLAW_U_K_SCALE       1.0f
 #define LEVEL3_POUNCE_DMG           ADM(100)
 #define LEVEL3_POUNCE_RANGE         54.0f
 #define LEVEL3_POUNCE_UPG_RANGE     LEVEL3_POUNCE_RANGE + 3.0f
 #define LEVEL3_POUNCE_WIDTH         14.0f
-#define LEVEL3_POUNCE_TIME          700      // msec for full Dragoon pounce
-#define LEVEL3_POUNCE_TIME_UPG      700      // msec for full Adv. Dragoon pounce
+#define LEVEL3_POUNCE_TIME          900      // msec for full Dragoon pounce
+#define LEVEL3_POUNCE_TIME_UPG      900      // msec for full Adv. Dragoon pounce
 #define LEVEL3_POUNCE_TIME_MIN      200      // msec before which pounce cancels  
 #define LEVEL3_POUNCE_REPEAT        400      // msec before a new pounce starts
 #define LEVEL3_POUNCE_SPEED_MOD     0.75f    // walking speed modifier for pounce charging
@@ -117,7 +117,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define LEVEL4_CLAW_RANGE           100.0f
 #define LEVEL4_CLAW_WIDTH           14.0f
 #define LEVEL4_CLAW_HEIGHT          20.0f
-#define LEVEL4_CLAW_REPEAT          750
+#define LEVEL4_CLAW_REPEAT          800
 #define LEVEL4_CLAW_K_SCALE         1.0f
 
 #define LEVEL4_TRAMPLE_DMG             ADM(111)
@@ -284,7 +284,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #define HIVE_BP                     12
 #define HIVE_BT                     20000
-#define HIVE_HEALTH                 ABHM(175)
+#define HIVE_HEALTH                 ABHM(125)
 #define HIVE_REGEN                  10
 #define HIVE_SPLASHDAMAGE           30
 #define HIVE_SPLASHRADIUS           200
@@ -435,17 +435,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define CHAINGUN_SPREAD             900
 #define CHAINGUN_DMG                HDM(5)
 
-#define PRIFLE_PRICE                400
-#define PRIFLE_CLIPS                40
-#define PRIFLE_MAXCLIPS             5
-#define PRIFLE_REPEAT               100
-#define PRIFLE_K_SCALE              1.0f
-#define PRIFLE_RELOAD               2000
-#define PRIFLE_DMG                  HDM(9)
-#define PRIFLE_SPEED                1200
-#define PRIFLE_SIZE                 5
-
-#define FLAMER_PRICE                450
+#define FLAMER_PRICE                400
 #define FLAMER_GAS                  150
 #define FLAMER_REPEAT               200
 #define FLAMER_K_SCALE              1.0f
@@ -456,6 +446,16 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define FLAMER_SPEED                300.0f
 #define FLAMER_LAG                  0.65f    // the amount of player velocity that is added to the fireball
 
+#define PRIFLE_PRICE                450
+#define PRIFLE_CLIPS                40
+#define PRIFLE_MAXCLIPS             5
+#define PRIFLE_REPEAT               100
+#define PRIFLE_K_SCALE              1.0f
+#define PRIFLE_RELOAD               2000
+#define PRIFLE_DMG                  HDM(9)
+#define PRIFLE_SPEED                1200
+#define PRIFLE_SIZE                 5
+
 #define LCANNON_PRICE               600
 #define LCANNON_AMMO                80
 #define LCANNON_K_SCALE             1.0f