diff options
| -rw-r--r-- | src/cgame/cg_main.c | 2 | ||||
| -rw-r--r-- | src/game/bg_misc.c | 2 | ||||
| -rw-r--r-- | src/game/g_buildable.c | 4 | ||||
| -rw-r--r-- | src/game/g_combat.c | 4 | ||||
| -rw-r--r-- | src/game/g_missile.c | 2 | ||||
| -rw-r--r-- | src/game/g_weapon.c | 3 | ||||
| -rw-r--r-- | src/game/tremulous.h | 8 |
7 files changed, 13 insertions, 12 deletions
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index be99e312..a5db719c 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -253,7 +253,7 @@ static cvarTable_t cvarTable[ ] = { &cg_simpleItems, "cg_simpleItems", "0", CVAR_ARCHIVE }, { &cg_addMarks, "cg_marks", "1", CVAR_ARCHIVE }, { &cg_lagometer, "cg_lagometer", "0", CVAR_ARCHIVE }, - { &cg_teslaTrailTime, "cg_teslaTrailTime", "600", CVAR_ARCHIVE }, + { &cg_teslaTrailTime, "cg_teslaTrailTime", "250", CVAR_ARCHIVE }, { &cg_railTrailTime, "cg_railTrailTime", "400", CVAR_ARCHIVE }, { &cg_gun_x, "cg_gunX", "0", CVAR_CHEAT }, { &cg_gun_y, "cg_gunY", "0", CVAR_CHEAT }, diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c index d2aefabc..062ffdaf 100644 --- a/src/game/bg_misc.c +++ b/src/game/bg_misc.c @@ -194,7 +194,7 @@ buildableAttributes_t bg_buildableList[ ] = 0, //int turretRange; 0, //int turretFireSpeed; WP_HIVE, //weapon_t turretProjType; - 0.707f, //float minNormal; + 0.0f, //float minNormal; qtrue, //qboolean invertNormal; qtrue, //qboolean creepTest; HIVE_CREEPSIZE, //int creepSize; diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index 923d210f..4bd8e963 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -1277,10 +1277,6 @@ void ABooster_Touch( gentity_t *self, gentity_t *other, trace_t *trace ) if( client->lastBoostedTime + BOOSTER_INTERVAL > level.time ) return; - //restore ammo, if any - BG_FindAmmoForWeapon( client->ps.weapon, &maxAmmo, &maxClips ); - BG_PackAmmoArray( client->ps.weapon, client->ps.ammo, client->ps.powerups, maxAmmo, maxClips ); - if( !( client->ps.stats[ STAT_STATE ] & SS_BOOSTED ) ) { client->ps.stats[ STAT_STATE ] |= SS_BOOSTED; diff --git a/src/game/g_combat.c b/src/game/g_combat.c index fb822c3c..732e50f2 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -935,6 +935,10 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker, knockback = damage; + // silly hack to give norf his knockbacking teslas + if( !strcmp( inflictor->classname, "team_human_tesla" ) ) + knockback *= 4; + if( targ->client ) { knockback = (int)( (float)knockback * diff --git a/src/game/g_missile.c b/src/game/g_missile.c index c55ab11f..4f019f41 100644 --- a/src/game/g_missile.c +++ b/src/game/g_missile.c @@ -790,7 +790,7 @@ gentity_t *fire_bounceBall( gentity_t *self, vec3_t start, vec3_t dir ) bolt->clipmask = MASK_SHOT; bolt->target_ent = NULL; - bolt->s.pos.trType = TR_LINEAR; + bolt->s.pos.trType = TR_GRAVITY; bolt->s.pos.trTime = level.time - MISSILE_PRESTEP_TIME; // move a bit on the very first frame VectorCopy( start, bolt->s.pos.trBase ); VectorScale( dir, LEVEL3_BOUNCEBALL_SPEED, bolt->s.pos.trDelta ); diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c index 34174e4d..94a1aabe 100644 --- a/src/game/g_weapon.c +++ b/src/game/g_weapon.c @@ -1293,7 +1293,8 @@ qboolean CheckPounceAttack( gentity_t *ent ) damage = (int)( ( (float)ent->client->pouncePayload / (float)LEVEL3_POUNCE_SPEED ) * LEVEL3_POUNCE_DMG ); - G_Damage( traceEnt, ent, ent, forward, tr.endpos, damage, DAMAGE_NO_KNOCKBACK, MOD_LEVEL3_POUNCE ); + G_Damage( traceEnt, ent, ent, forward, tr.endpos, damage, + DAMAGE_NO_KNOCKBACK|DAMAGE_NO_LOCDAMAGE, MOD_LEVEL3_POUNCE ); ent->client->allowedToPounce = qfalse; diff --git a/src/game/tremulous.h b/src/game/tremulous.h index ddee71de..085fabbf 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -64,7 +64,7 @@ #define LEVEL2_AREAZAP_DMG ADM(80) #define LEVEL2_AREAZAP_RANGE 200.0f #define LEVEL2_AREAZAP_WIDTH 15.0f -#define LEVEL2_AREAZAP_REPEAT 3000 +#define LEVEL2_AREAZAP_REPEAT 2000 #define LEVEL2_AREAZAP_TIME 1000 #define LEVEL2_AREAZAP_MAX_TARGETS 3 #define LEVEL2_WALLJUMP_MAXSPEED 1000.0f @@ -74,7 +74,7 @@ #define LEVEL3_CLAW_WIDTH 16.0f #define LEVEL3_CLAW_REPEAT 700 #define LEVEL3_CLAW_U_REPEAT 600 -#define LEVEL3_POUNCE_DMG ADM(160) +#define LEVEL3_POUNCE_DMG ADM(100) #define LEVEL3_POUNCE_RANGE 96.0f #define LEVEL3_POUNCE_WIDTH 16.0f #define LEVEL3_POUNCE_SPEED 700 @@ -498,9 +498,9 @@ #define TESLAGEN_HEALTH HBHM(220) #define TESLAGEN_SPLASHDAMAGE 50 #define TESLAGEN_SPLASHRADIUS 100 -#define TESLAGEN_REPEAT 500 +#define TESLAGEN_REPEAT 250 #define TESLAGEN_RANGE 250 -#define TESLAGEN_DMG HDM(13) +#define TESLAGEN_DMG HDM(7) #define DC_BP 8 #define DC_BT 10000 |