summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2006-01-11 18:52:29 +0000
committerTim Angus <tim@ngus.net>2006-01-11 18:52:29 +0000
commitce70dcdb3f657f8fa1cf48ca9ba9a6074f40c3f5 (patch)
tree35f44ac89c1acd77e877a927a3e3e751ae9fe81f /src
parent1159d6240a349ae0d644cb8375d348964ecb56de (diff)
* Flamer damage down to 20 from 31
* Zap repeat rate down to 1500ms from 2000ms * Knockback from pouncing now 3 times as strong * Updates to the particle and trail systems sections of the manual * Merged ioq3-r470
Diffstat (limited to 'src')
-rw-r--r--src/game/g_combat.c4
-rw-r--r--src/game/tremulous.h4
-rw-r--r--src/unix/unix_main.c2
3 files changed, 7 insertions, 3 deletions
diff --git a/src/game/g_combat.c b/src/game/g_combat.c
index eb8698c1..7e38f119 100644
--- a/src/game/g_combat.c
+++ b/src/game/g_combat.c
@@ -962,6 +962,10 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
if( !strcmp( inflictor->classname, "team_human_tesla" ) )
knockback *= 4;
+ // ...and for goon pouncing
+ if( mod == MOD_LEVEL3_POUNCE )
+ knockback *= 3;
+
if( targ->client )
{
knockback = (int)( (float)knockback *
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index 002d7a81..8508a1e4 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -74,7 +74,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define LEVEL2_AREAZAP_DMG ADM(80)
#define LEVEL2_AREAZAP_RANGE 200.0f
#define LEVEL2_AREAZAP_WIDTH 15.0f
-#define LEVEL2_AREAZAP_REPEAT 2000
+#define LEVEL2_AREAZAP_REPEAT 1500
#define LEVEL2_AREAZAP_TIME 1000
#define LEVEL2_AREAZAP_MAX_TARGETS 3
#define LEVEL2_WALLJUMP_MAXSPEED 1000.0f
@@ -390,7 +390,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define FLAMER_PRICE 450
#define FLAMER_GAS 150
#define FLAMER_REPEAT 200
-#define FLAMER_DMG HDM(31)
+#define FLAMER_DMG HDM(20)
#define FLAMER_RADIUS 50
#define FLAMER_LIFETIME 800.0f
#define FLAMER_SPEED 200.0f
diff --git a/src/unix/unix_main.c b/src/unix/unix_main.c
index 9171c8dd..d5b69ffb 100644
--- a/src/unix/unix_main.c
+++ b/src/unix/unix_main.c
@@ -1358,7 +1358,7 @@ void Sys_ParseArgs( int argc, char* argv[] ) {
}
#ifndef DEFAULT_BASEDIR
-# define DEFAULT_BASEDIR Sys_Cwd()
+# define DEFAULT_BASEDIR Sys_DefaultCDPath()
#endif
#include "../client/client.h"