Changeset 325:30169e7b8e90

Timestamp:

11/10/08 00:27:30 (21 months ago)

Author:

Deubeuliou <deubeuliou@…>

Parents:

323:98625c7b7a08 (diff), 324:5ec886be77cd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Branch:

madcat-porn

Tags:

tip

Message:

Merged with madcat

Files:

• src/game/tremulous.h (modified) (2 diffs)

src/game/tremulous.h

@@ -80 +80 @@
 #define LEVEL2_CLAW_U_REPEAT        400
 #define LEVEL2_CLAW_U_K_SCALE       1.0f
-#define LEVEL2_AREAZAP_DMG          ADM(20)
+#define LEVEL2_AREAZAP_DMG          ADM(15)
 #define LEVEL2_AREAZAP_BOUNCE_DMG   ADM(10)
-#define LEVEL2_AREAZAP_RANGE        150.0f
-#define LEVEL2_AREAZAP_CUTOFF       350.0f
+#define LEVEL2_AREAZAP_RANGE        200.0f
+#define LEVEL2_AREAZAP_CUTOFF       250.0f
 #define LEVEL2_AREAZAP_BOUNCE       150.0f
-#define LEVEL2_AREAZAP_TOLERANCE    1.04
+#define LEVEL2_AREAZAP_TOLERANCE    0.50
 #define LEVEL2_AREAZAP_REPEAT       1500
-#define LEVEL2_AREAZAP_MAX_TARGETS  16
+#define LEVEL2_AREAZAP_MAX_TARGETS  10
 #define LEVEL2_AREAZAP_MIN_TIME     400
 #define LEVEL2_WALLJUMP_MAXSPEED    1000.0f
@@ -672 +672 @@
 #define REPEATER_SPLASHRADIUS       100
 #define REPEATER_INACTIVE_TIME      90000
-#define REPEATER_VALUE              (ALIEN_CREDITS_PER_FRAG * 3 / 2)
+#define REPEATER_VALUE              (ALIEN_CREDITS_PER_FRAG * 2 / 3)
 
 /*