qf/prozac-qfcc
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/prozac-qfcc synced 2025-03-02 15:41:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Conc tweakage

Browse source
This commit is contained in:
Finny Merrill 2004-04-07 16:22:57 +00:00
parent 2aa5d42857
commit 61b91623e5
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
defs.qh
View file

@ -830,11 +830,15 @@ float (entity e) EF_GlowColor;
#define GR_CONCUSS_DEC 0.5 // Amount of conc to remove each timer #define GR_CONCUSS_DEC 0.5 // Amount of conc to remove each timer
#define GR_CONCUSS_MAX 100 // Highest amount of conc you can get #define GR_CONCUSS_MAX 100 // Highest amount of conc you can get
#define GR_CONCUSS_IDLE 1 // Idlescale amount with OLD_CONC_GRENADE #define GR_CONCUSS_IDLE 1 // Idlescale amount with OLD_CONC_GRENADE
#define GR_CONCUSS_X 0.13 // X mult #define GR_CONCUSS_X 0.039 // X mult
#define GR_CONCUSS_Y 0.188 // Y mult #define GR_CONCUSS_Y 0.056 // Y mult
#define GR_CONCUSS_MAX_X 30
#define GR_CONCUSS_MAX_Y 60
#define GR_CONCUSS_MIN_X -30
#define GR_CONCUSS_MIN_Y -60
#define GR_CONCUSS_KICK 0.032 // Amount of stumbling you do while moving #define GR_CONCUSS_KICK 0.032 // Amount of stumbling you do while moving
#define GR_CONCUSS_FIXTIME 0.2 // Time between sending setangles and resetting #define GR_CONCUSS_FIXTIME 5 // Time between sending setangles and resetting
#define GR_CONCUSS_BUBBLETIME 3 #define GR_CONCUSS_BUBBLETIME 5
#define GR_ANTIGRAV_AMOUNT 100 #define GR_ANTIGRAV_AMOUNT 100
#define GR_ANTIGRAV_TIME 3 #define GR_ANTIGRAV_TIME 3

19
scout.qc
View file

@ -209,7 +209,7 @@ void() ConcussionGrenadeTimer =
if (self.health == 0) if (self.health == 0)
{ {
sprint (self.owner, PRINT_HIGH, "Your head better now\n"); sprint (self.owner, PRINT_HIGH, "Your head feels better now\n");
#ifdef OLD_CONC_GRENADE #ifdef OLD_CONC_GRENADE
stuffcmd (self.owner, "v_idlescale 0\n"); stuffcmd (self.owner, "v_idlescale 0\n");
#endif #endif
@ -259,15 +259,16 @@ void() ConcussionGrenadeTimer =
else else
self.owner.mangle_y -= y * GR_CONCUSS_Y; self.owner.mangle_y -= y * GR_CONCUSS_Y;
local float rat = self.health / GR_CONCUSS_MAX;
if (self.owner.mangle_x < -60) if (self.owner.mangle_x > GR_CONCUSS_MAX_X * rat)
self.owner.mangle_x = -60; self.owner.mangle_x = GR_CONCUSS_MAX_X * rat;
if (self.owner.mangle_x > 60) if (self.owner.mangle_x < GR_CONCUSS_MIN_X * rat)
self.owner.mangle_x = 60; self.owner.mangle_x = GR_CONCUSS_MIN_X * rat;
if (self.owner.mangle_y > 120) if (self.owner.mangle_y > GR_CONCUSS_MAX_Y * rat)
self.owner.mangle_y = 120; self.owner.mangle_y = GR_CONCUSS_MAX_Y * rat;
if (self.owner.mangle_y < -120) if (self.owner.mangle_y < GR_CONCUSS_MIN_Y * rat)
self.owner.mangle_y = -120; self.owner.mangle_y = GR_CONCUSS_MIN_Y * rat;;
if (self.owner.waterlevel || (self.owner.flags & FL_ONGROUND)) if (self.owner.waterlevel || (self.owner.flags & FL_ONGROUND))