2001-07-17 05:58:10 +00:00
|
|
|
/*======================================================
|
|
|
|
|
COMBAT.QC Custom TeamFortress v3.2
|
|
|
|
|
|
|
|
|
|
(c) TeamFortress Software Pty Ltd 29/2/97
|
|
|
|
|
(c) William Kerney 5/19/00
|
|
|
|
|
========================================================
|
|
|
|
|
All the functions pertaining to killing people
|
|
|
|
|
======================================================*/
|
2001-07-23 20:52:47 +00:00
|
|
|
#include "defs.qh"
|
|
|
|
|
#include "jobs.qh"
|
2001-07-17 05:58:10 +00:00
|
|
|
|
|
|
|
|
void(string gibname, float dm) ThrowGib;
|
|
|
|
|
void() T_MissileTouch;
|
|
|
|
|
void() info_player_start;
|
2001-10-02 01:24:28 +00:00
|
|
|
void(entity targ, entity attacker) Obituary;
|
2001-07-17 05:58:10 +00:00
|
|
|
|
|
|
|
|
// TeamFortress Prototypes
|
|
|
|
|
void(entity Goal, entity AP, float addb) DoResults;
|
|
|
|
|
float(entity Goal, entity AP) Activated;
|
|
|
|
|
void() monster_death_use;
|
|
|
|
|
float (entity targ, entity attacker, float damage) TeamEqualiseDamage;
|
|
|
|
|
void(entity bastard,float threshold) createBastard;
|
|
|
|
|
void (entity targ,float pain) RevealThief;
|
|
|
|
|
|
|
|
|
|
//WK
|
|
|
|
|
void() GuerillaExplode;
|
|
|
|
|
float(entity tester) IsBuilding;
|
|
|
|
|
//float(entity happyboy,float newtime) makeImmune;
|
|
|
|
|
|
|
|
|
|
//- OfN -
|
|
|
|
|
float(entity thing) IsMonster;
|
|
|
|
|
void(entity body) ExpBody;
|
|
|
|
|
string(entity thebuilding) GetBuildingName;
|
|
|
|
|
string(entity thething) GetEnemyName;
|
|
|
|
|
void(entity tfield, vector where, entity thing) FieldExplosion;
|
|
|
|
|
void(entity field) PutFieldWork;
|
|
|
|
|
|
|
|
|
|
#ifndef COOP_MODE
|
|
|
|
|
|
|
|
|
|
/*================
|
|
|
|
|
monster_death_use (from monsters.qc)
|
|
|
|
|
|
|
|
|
|
When a monster dies, it fires all of its targets with the current
|
|
|
|
|
enemy as activator.
|
|
|
|
|
================
|
|
|
|
|
*/
|
|
|
|
|
void() monster_death_use =
|
|
|
|
|
{
|
|
|
|
|
// fall to ground
|
2001-07-23 20:52:47 +00:00
|
|
|
if (self.flags & FL_FLY)
|
|
|
|
|
self.flags = self.flags - FL_FLY;
|
|
|
|
|
if (self.flags & FL_SWIM)
|
|
|
|
|
self.flags = self.flags - FL_SWIM;
|
2001-07-17 05:58:10 +00:00
|
|
|
|
|
|
|
|
if (!self.target)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
activator = self.enemy;
|
|
|
|
|
SUB_UseTargets ();
|
|
|
|
|
};
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//============================================================================
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
============
|
|
|
|
|
CanDamage
|
|
|
|
|
|
|
|
|
|
Returns true if the inflictor can directly damage the target. Used for
|
|
|
|
|
explosions and melee attacks.
|
|
|
|
|
============
|
|
|
|
|
*/
|
|
|
|
|
float(entity targ, entity inflictor) CanDamage =
|
|
|
|
|
{
|
|
|
|
|
local vector soffset; // - OfN - hackish fix for turretized sentry guns
|
|
|
|
|
soffset='0 0 0';
|
|
|
|
|
|
|
|
|
|
// bmodels need special checking because their origin is 0,0,0
|
2001-07-23 20:52:47 +00:00
|
|
|
if (targ.movetype == MOVETYPE_PUSH)
|
2001-07-17 05:58:10 +00:00
|
|
|
{
|
2001-07-23 20:52:47 +00:00
|
|
|
traceline(inflictor.origin, 0.5 * (targ.absmin + targ.absmax), TRUE, self);
|
2001-07-17 05:58:10 +00:00
|
|
|
if (trace_fraction == 1)
|
2001-07-23 20:52:47 +00:00
|
|
|
return TRUE;
|
2001-07-17 05:58:10 +00:00
|
|
|
if (trace_ent == targ)
|
2001-07-23 20:52:47 +00:00
|
|
|
return TRUE;
|
|
|
|
|
return FALSE;
|
2001-07-17 05:58:10 +00:00
|
|
|
}
|
|
|
|
|
|
2001-07-23 20:52:47 +00:00
|
|
|
if (targ.classname == "building_sentrygun" && (targ.tf_items & NIT_TURRET))
|
2001-07-17 05:58:10 +00:00
|
|
|
soffset='0 0 -20';
|
|
|
|
|
|
|
|
|
|
// OfN - Force field
|
2001-07-23 20:52:47 +00:00
|
|
|
traceline(inflictor.origin, targ.origin + soffset, FALSE, self);
|
2001-07-17 05:58:10 +00:00
|
|
|
if (trace_ent.classname == "force_field")
|
|
|
|
|
{
|
|
|
|
|
FieldExplosion(trace_ent,trace_endpos,trace_ent);
|
|
|
|
|
PutFieldWork(trace_ent);
|
2001-07-23 20:52:47 +00:00
|
|
|
return FALSE;
|
2001-07-17 05:58:10 +00:00
|
|
|
}
|
|
|
|
|
|
2001-07-23 20:52:47 +00:00
|
|
|
traceline(inflictor.origin, targ.origin + soffset, TRUE, self);
|
2001-07-17 05:58:10 +00:00
|
|
|
if (trace_fraction == 1)
|
2001-07-23 20:52:47 +00:00
|
|
|
return TRUE;
|
|
|
|
|
/*traceline(inflictor.origin, targ.origin + '15 15 0' + soffset, TRUE, self);
|
2001-07-17 05:58:10 +00:00
|
|
|
if (trace_fraction == 1)
|
2001-07-23 20:52:47 +00:00
|
|
|
return TRUE;
|
|
|
|
|
traceline(inflictor.origin, targ.origin + '-15 -15 0' + soffset, TRUE, self);
|
2001-07-17 05:58:10 +00:00
|
|
|
if (trace_fraction == 1)
|
2001-07-23 20:52:47 +00:00
|
|
|
return TRUE;
|
|
|
|
|
traceline(inflictor.origin, targ.origin + '-15 15 0' + soffset, TRUE, self);
|
2001-07-17 05:58:10 +00:00
|
|
|
if (trace_fraction == 1)
|
2001-07-23 20:52:47 +00:00
|
|
|
return TRUE;
|
|
|
|
|
traceline(inflictor.origin, targ.origin + '15 -15 0' + soffset, TRUE, self);
|
2001-07-17 05:58:10 +00:00
|
|
|
if (trace_fraction == 1)
|
2001-07-23 20:52:47 +00:00
|
|
|
return TRUE;*/ // OfN - Fixes dets thru wall?
|
2001-07-17 05:58:10 +00:00
|
|
|
|
2001-07-23 20:52:47 +00:00
|
|
|
return FALSE;
|
2001-07-17 05:58:10 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
============
|
|
|
|
|
Killed
|
|
|
|
|
============
|
|
|
|
|
*/
|
|
|
|
|
void(entity targ, entity attacker) Killed =
|
|
|
|
|
{
|
|
|
|
|
// SOLVES BUG ???? // Stack overflow?
|
2001-07-23 20:52:47 +00:00
|
|
|
if (targ.is_killed == TRUE)
|
2001-07-17 05:58:10 +00:00
|
|
|
{
|
|
|
|
|
if (IsBuilding(targ))
|
|
|
|
|
{
|
|
|
|
|
local string st;
|
|
|
|
|
RPrint("(OfN WARNING:) Building: '");
|
|
|
|
|
st=GetBuildingName(targ);
|
|
|
|
|
RPrint(st);
|
|
|
|
|
RPrint("' was going to be Killed() again!\n");
|
|
|
|
|
RPrint("Attacker: '");
|
|
|
|
|
st=GetEnemyName(attacker);
|
|
|
|
|
RPrint(st);
|
|
|
|
|
RPrint("\n");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (targ.classname == "player")
|
|
|
|
|
{
|
|
|
|
|
local string st;
|
|
|
|
|
RPrint("(OfN WARNING:) Player: '");
|
|
|
|
|
RPrint(targ.netname);
|
|
|
|
|
|
2001-07-23 20:52:47 +00:00
|
|
|
if (targ.cutf_items & CUTF_EXPBODY)
|
2001-07-17 05:58:10 +00:00
|
|
|
{
|
|
|
|
|
RPrint(" (with expbody) ");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
RPrint(" (without expbody) ");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
RPrint("' is Killed() again!\n");
|
|
|
|
|
RPrint("Attacker: '");
|
|
|
|
|
st=GetEnemyName(attacker);
|
|
|
|
|
RPrint(st);
|
|
|
|
|
|
2001-07-23 20:52:47 +00:00
|
|
|
if (attacker.classname == "player" && attacker.cutf_items & CUTF_EXPBODY)
|
2001-07-17 05:58:10 +00:00
|
|
|
{
|
|
|
|
|
RPrint(" (with expbody) ");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
RPrint(" (without expbody) ");
|
|
|
|
|
}
|
|
|
|
|
RPrint("\n");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
// NOT BUGS, HAPPEN OFTEN WITH BUTTONS ETC..
|
|
|
|
|
|
|
|
|
|
/*RPrint("(OfN WARNING:) Object: '");
|
|
|
|
|
RPrint(targ.classname);
|
|
|
|
|
RPrint("' is Killed() again!\n");
|
|
|
|
|
RPrint("Attacker: '");
|
|
|
|
|
st=GetEnemyName(attacker);
|
|
|
|
|
RPrint(st);
|
2001-07-23 20:52:47 +00:00
|
|
|
if (attacker.classname == "player" && attacker.cutf_items & CUTF_EXPBODY)
|
2001-07-17 05:58:10 +00:00
|
|
|
{
|
|
|
|
|
RPrint(" (with expbody) ");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
RPrint(" (without expbody) ");
|
|
|
|
|
}
|
|
|
|
|
RPrint("\n"); */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2001-07-23 20:52:47 +00:00
|
|
|
targ.is_killed = TRUE;
|
2001-07-17 05:58:10 +00:00
|
|
|
/////////////////////////////////////
|
|
|
|
|
|
|
|
|
|
local entity oself;
|
|
|
|
|
|
|
|
|
|
//WK Have cursed person respawn immediately
|
|
|
|
|
if (targ.classname == "player") {
|
|
|
|
|
if (targ.penance_time > time) {
|
|
|
|
|
targ.real_frags = targ.real_frags - 1;
|
2001-07-23 20:52:47 +00:00
|
|
|
if (!(toggleflags & TFLAG_TEAMFRAGS))
|
2001-07-17 05:58:10 +00:00
|
|
|
targ.frags = targ.real_frags;
|
|
|
|
|
targ.health = 50; //Give em a little so they can die again
|
2001-07-23 20:52:47 +00:00
|
|
|
targ.is_killed = FALSE;
|
2001-07-17 05:58:10 +00:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
oself = self;
|
|
|
|
|
self = targ;
|
|
|
|
|
|
|
|
|
|
// don't let sbar look bad if a player
|
|
|
|
|
if (self.health < -99)
|
|
|
|
|
self.health = -99;
|
|
|
|
|
|
|
|
|
|
// doors, triggers, etc // - ofn added sensor, it now calls clientobituary when dead
|
2001-07-23 20:52:47 +00:00
|
|
|
if ((self.movetype == MOVETYPE_PUSH || self.movetype == MOVETYPE_NONE) && self.classname != "building_camera" && self.classname!="building_sensor") //CH stop bug.
|
2001-07-17 05:58:10 +00:00
|
|
|
{
|
|
|
|
|
self.th_die ();
|
|
|
|
|
self = oself;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
self.enemy = attacker;
|
|
|
|
|
|
|
|
|
|
// bump the monster counter
|
2001-07-23 20:52:47 +00:00
|
|
|
if (self.flags & FL_MONSTER)
|
2001-07-17 05:58:10 +00:00
|
|
|
{
|
|
|
|
|
killed_monsters = killed_monsters + 1;
|
2001-07-23 20:52:47 +00:00
|
|
|
WriteByte (MSG_ALL, SVC_KILLEDMONSTER);
|
2001-07-17 05:58:10 +00:00
|
|
|
}
|
|
|
|
|
|
2001-10-02 01:24:28 +00:00
|
|
|
Obituary(self, attacker);
|
2001-07-17 05:58:10 +00:00
|
|
|
|
2001-07-23 20:52:47 +00:00
|
|
|
self.takedamage = DAMAGE_NO;
|
2001-10-17 07:48:11 +00:00
|
|
|
self.touch = NIL;
|
2001-07-17 05:58:10 +00:00
|
|
|
|
|
|
|
|
monster_death_use();
|
|
|
|
|
self.th_die ();
|
|
|
|
|
|
|
|
|
|
self = oself;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
============
|
|
|
|
|
T_Damage
|
|
|
|
|
|
|
|
|
|
The damage is coming from inflictor, but get mad at attacker
|
|
|
|
|
This should be the only function that ever reduces health.
|
|
|
|
|
============
|
|
|
|
|
*/
|
|
|
|
|
void(entity targ, entity inflictor, entity attacker, float damage) T_Damage =
|
|
|
|
|
{
|
|
|
|
|
//WK Just call TF_T_Damage instead, so no updating two functions
|
|
|
|
|
//WK that do exactly the same thing.
|
|
|
|
|
TF_T_Damage(targ,inflictor,attacker,damage,0,0);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
============
|
|
|
|
|
TF_T_Damage
|
|
|
|
|
same thing as T_Damage (see above), just with some more details
|
|
|
|
|
|
|
|
|
|
T_Flags:
|
2001-07-23 20:52:47 +00:00
|
|
|
TF_TD_IGNOREARMOUR: bypasses the armour of the target
|
|
|
|
|
TF_TD_NOTTEAM: doesn't damage a team member
|
|
|
|
|
TF_TD_NOTSELF: doesn't damage self
|
2001-07-17 05:58:10 +00:00
|
|
|
|
|
|
|
|
The following is used to determine whether this attack is affected
|
|
|
|
|
the type of armor the defender is wearing.
|
|
|
|
|
T_AttackType:
|
2001-07-23 20:52:47 +00:00
|
|
|
TF_TD_OTHER : type ignored
|
|
|
|
|
TF_TD_SHOT : bullet damage
|
|
|
|
|
TF_TD_NAIL : nailgun damage
|
|
|
|
|
TF_TD_EXPLOSION : explosion damage
|
|
|
|
|
TF_TD_ELECTRICITY : electricity damage
|
|
|
|
|
TF_TD_FIRE : fire damage
|
|
|
|
|
|
|
|
|
|
TF_TD_NOSOUND : Special Value. Health is adjusted without
|
2001-07-17 05:58:10 +00:00
|
|
|
any sound, painframe, etc
|
|
|
|
|
Health is _set_ to damage, not altered.
|
|
|
|
|
|
|
|
|
|
============
|
|
|
|
|
*/
|
|
|
|
|
void(entity targ, entity inflictor, entity attacker, float damage, float T_flags, float T_AttackType) TF_T_Damage =
|
|
|
|
|
{
|
|
|
|
|
local vector dir;
|
|
|
|
|
local entity oldself, te;
|
|
|
|
|
local float save;
|
|
|
|
|
local float take;
|
|
|
|
|
local float mirror;
|
|
|
|
|
local float dist;
|
|
|
|
|
local string output;
|
|
|
|
|
local float knockem;
|
|
|
|
|
|
|
|
|
|
mirror = 0;
|
2001-11-02 17:00:52 +00:00
|
|
|
if (infokey(NIL,"ceasefire")=="on") //Cyto
|
2001-07-17 05:58:10 +00:00
|
|
|
return;
|
2001-11-02 17:00:52 +00:00
|
|
|
if (!targ)
|
2001-07-17 05:58:10 +00:00
|
|
|
return;
|
|
|
|
|
if (!targ.takedamage)
|
|
|
|
|
return;
|
|
|
|
|
|
1) Attempted to give players positive frags whenever possible. You now
should get frags for blowing people up with others' dispensers/mines/expbody,
airfisting rockets, etc.
2) Redid Give_Frags_Out
3) Changed many uses of pointcontents and ugly hacks to use hullpointcontents
and checkmove, now a lot cleaner and less buggy
4) You can grapple builds again. This caused really odd bugs.
5) You can now damage your own buildings again (gasp). Any time a tesla or sentry
is damaged it turns on its attacker, friendly or otherwise. This is both a counter-TK
and counter-spy mechanism.
6) Teslas are now entirely inside their bounding box
7) Now check every frame for players startsolid and for outside of the map cube.
8) #define WALL_HURT to make it hurt when you hit a wall
9) Used some cool ideas (aka laws of physics) to make the airfist a little less annoying
10) You now only get 1 mirv per slot without bandolier. Demoman and hwguy gain bandolier.
demoman loses his extra mirv but gains an extra grenade and pair of detpacks. Hwguy
gets extra grenade.
11) New and improved EMP grenade now does damage based on range. no longer blows up shells.
Doesn't directly damage sentries anymore, but does significant damage to dispensers.
EMP someone who's setting a det and it blows up in their face.
12) Players now do radius damage from getting EMPed (again)
13) EMPs now go through walls (again)
14) EMP number lowered by one (3 without, 4 with bandolier) and cost raised by $100
15) You can only have 2 frag grens, 3 with bandolier now.
16) Hover boots will now eat cells if they get low on charge. In addition, the silly bug
where their charge wasn't restored when you die is fixed now.
17) EMPing a detpack now sets its timer to anywhere between 1 and 121 seconds from current time,
with a logarithmic probability of it being lower. (random() * random() * 120 + 1). Also, probably
more time the closer it is to the EMP.
18) Judo can now be blocked by people with close combat, knife or judo. Blocked judo means that the
attacker loses 3 seconds of attack.
19) Judo missing now makes them unable to fire.
20) Shortened judo range (back to normal if w/ close combat)
21) Attempted to rework the railgun. Seems to be okay now.
Probably still a lot of bugs in here, but since this is the devel version I thought I would commit
all my changes so people could start testing it. I'll commit fixes as soon as I find the bugs.
2003-11-26 08:53:44 +00:00
|
|
|
//WK Set off land mines GR Done with .th_pain now
|
|
|
|
|
#if 0
|
2001-07-17 05:58:10 +00:00
|
|
|
if (targ.classname == "grenade" && targ.netname == "land_mine")
|
|
|
|
|
{
|
1) Attempted to give players positive frags whenever possible. You now
should get frags for blowing people up with others' dispensers/mines/expbody,
airfisting rockets, etc.
2) Redid Give_Frags_Out
3) Changed many uses of pointcontents and ugly hacks to use hullpointcontents
and checkmove, now a lot cleaner and less buggy
4) You can grapple builds again. This caused really odd bugs.
5) You can now damage your own buildings again (gasp). Any time a tesla or sentry
is damaged it turns on its attacker, friendly or otherwise. This is both a counter-TK
and counter-spy mechanism.
6) Teslas are now entirely inside their bounding box
7) Now check every frame for players startsolid and for outside of the map cube.
8) #define WALL_HURT to make it hurt when you hit a wall
9) Used some cool ideas (aka laws of physics) to make the airfist a little less annoying
10) You now only get 1 mirv per slot without bandolier. Demoman and hwguy gain bandolier.
demoman loses his extra mirv but gains an extra grenade and pair of detpacks. Hwguy
gets extra grenade.
11) New and improved EMP grenade now does damage based on range. no longer blows up shells.
Doesn't directly damage sentries anymore, but does significant damage to dispensers.
EMP someone who's setting a det and it blows up in their face.
12) Players now do radius damage from getting EMPed (again)
13) EMPs now go through walls (again)
14) EMP number lowered by one (3 without, 4 with bandolier) and cost raised by $100
15) You can only have 2 frag grens, 3 with bandolier now.
16) Hover boots will now eat cells if they get low on charge. In addition, the silly bug
where their charge wasn't restored when you die is fixed now.
17) EMPing a detpack now sets its timer to anywhere between 1 and 121 seconds from current time,
with a logarithmic probability of it being lower. (random() * random() * 120 + 1). Also, probably
more time the closer it is to the EMP.
18) Judo can now be blocked by people with close combat, knife or judo. Blocked judo means that the
attacker loses 3 seconds of attack.
19) Judo missing now makes them unable to fire.
20) Shortened judo range (back to normal if w/ close combat)
21) Attempted to rework the railgun. Seems to be okay now.
Probably still a lot of bugs in here, but since this is the devel version I thought I would commit
all my changes so people could start testing it. I'll commit fixes as soon as I find the bugs.
2003-11-26 08:53:44 +00:00
|
|
|
targ.martyr_enemy = inflictor;
|
2001-07-17 05:58:10 +00:00
|
|
|
targ.think = GuerillaExplode;
|
|
|
|
|
targ.nextthink = time + 0.1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
1) Attempted to give players positive frags whenever possible. You now
should get frags for blowing people up with others' dispensers/mines/expbody,
airfisting rockets, etc.
2) Redid Give_Frags_Out
3) Changed many uses of pointcontents and ugly hacks to use hullpointcontents
and checkmove, now a lot cleaner and less buggy
4) You can grapple builds again. This caused really odd bugs.
5) You can now damage your own buildings again (gasp). Any time a tesla or sentry
is damaged it turns on its attacker, friendly or otherwise. This is both a counter-TK
and counter-spy mechanism.
6) Teslas are now entirely inside their bounding box
7) Now check every frame for players startsolid and for outside of the map cube.
8) #define WALL_HURT to make it hurt when you hit a wall
9) Used some cool ideas (aka laws of physics) to make the airfist a little less annoying
10) You now only get 1 mirv per slot without bandolier. Demoman and hwguy gain bandolier.
demoman loses his extra mirv but gains an extra grenade and pair of detpacks. Hwguy
gets extra grenade.
11) New and improved EMP grenade now does damage based on range. no longer blows up shells.
Doesn't directly damage sentries anymore, but does significant damage to dispensers.
EMP someone who's setting a det and it blows up in their face.
12) Players now do radius damage from getting EMPed (again)
13) EMPs now go through walls (again)
14) EMP number lowered by one (3 without, 4 with bandolier) and cost raised by $100
15) You can only have 2 frag grens, 3 with bandolier now.
16) Hover boots will now eat cells if they get low on charge. In addition, the silly bug
where their charge wasn't restored when you die is fixed now.
17) EMPing a detpack now sets its timer to anywhere between 1 and 121 seconds from current time,
with a logarithmic probability of it being lower. (random() * random() * 120 + 1). Also, probably
more time the closer it is to the EMP.
18) Judo can now be blocked by people with close combat, knife or judo. Blocked judo means that the
attacker loses 3 seconds of attack.
19) Judo missing now makes them unable to fire.
20) Shortened judo range (back to normal if w/ close combat)
21) Attempted to rework the railgun. Seems to be okay now.
Probably still a lot of bugs in here, but since this is the devel version I thought I would commit
all my changes so people could start testing it. I'll commit fixes as soon as I find the bugs.
2003-11-26 08:53:44 +00:00
|
|
|
#endif
|
|
|
|
|
|
2004-01-21 16:05:58 +00:00
|
|
|
if (inflictor.martyr_enemy && (Teammate(attacker.team_no, targ.team_no) || Teammate(attacker.team_no,targ.real_owner.team_no)))
|
|
|
|
|
{
|
|
|
|
|
if (!Teammate(inflictor.martyr_enemy.team_no, targ.real_owner.team_no) && !Teammate(inflictor.martyr_enemy.team_no, targ.team_no))
|
|
|
|
|
{
|
|
|
|
|
attacker = inflictor.martyr_enemy;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
1) Attempted to give players positive frags whenever possible. You now
should get frags for blowing people up with others' dispensers/mines/expbody,
airfisting rockets, etc.
2) Redid Give_Frags_Out
3) Changed many uses of pointcontents and ugly hacks to use hullpointcontents
and checkmove, now a lot cleaner and less buggy
4) You can grapple builds again. This caused really odd bugs.
5) You can now damage your own buildings again (gasp). Any time a tesla or sentry
is damaged it turns on its attacker, friendly or otherwise. This is both a counter-TK
and counter-spy mechanism.
6) Teslas are now entirely inside their bounding box
7) Now check every frame for players startsolid and for outside of the map cube.
8) #define WALL_HURT to make it hurt when you hit a wall
9) Used some cool ideas (aka laws of physics) to make the airfist a little less annoying
10) You now only get 1 mirv per slot without bandolier. Demoman and hwguy gain bandolier.
demoman loses his extra mirv but gains an extra grenade and pair of detpacks. Hwguy
gets extra grenade.
11) New and improved EMP grenade now does damage based on range. no longer blows up shells.
Doesn't directly damage sentries anymore, but does significant damage to dispensers.
EMP someone who's setting a det and it blows up in their face.
12) Players now do radius damage from getting EMPed (again)
13) EMPs now go through walls (again)
14) EMP number lowered by one (3 without, 4 with bandolier) and cost raised by $100
15) You can only have 2 frag grens, 3 with bandolier now.
16) Hover boots will now eat cells if they get low on charge. In addition, the silly bug
where their charge wasn't restored when you die is fixed now.
17) EMPing a detpack now sets its timer to anywhere between 1 and 121 seconds from current time,
with a logarithmic probability of it being lower. (random() * random() * 120 + 1). Also, probably
more time the closer it is to the EMP.
18) Judo can now be blocked by people with close combat, knife or judo. Blocked judo means that the
attacker loses 3 seconds of attack.
19) Judo missing now makes them unable to fire.
20) Shortened judo range (back to normal if w/ close combat)
21) Attempted to rework the railgun. Seems to be okay now.
Probably still a lot of bugs in here, but since this is the devel version I thought I would commit
all my changes so people could start testing it. I'll commit fixes as soon as I find the bugs.
2003-11-26 08:53:44 +00:00
|
|
|
//Don't blame people for their airfisted rockets/grenades/detpacks if they hit a teammate
|
|
|
|
|
if ((inflictor.AIRG_Flags & 4) && inflictor != attacker && inflictor.AIRG_FlyTracker.classname == "player")
|
|
|
|
|
{
|
|
|
|
|
local entity targplayer = targ;
|
|
|
|
|
local float loopc = 0;
|
|
|
|
|
while (loopc < 5 && targplayer.classname != "player")
|
|
|
|
|
{
|
|
|
|
|
targplayer = targplayer.real_owner;
|
|
|
|
|
loopc++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (loopc < 5 && !Teammate(inflictor.AIRG_FlyTracker.team_no, targplayer.team_no) &&
|
|
|
|
|
Teammate(attacker.team_no, targplayer.team_no))
|
|
|
|
|
attacker = inflictor.AIRG_FlyTracker;
|
|
|
|
|
}
|
2001-07-17 05:58:10 +00:00
|
|
|
|
|
|
|
|
//BOOKKEEPING
|
|
|
|
|
//WK Store last person who shot martyr into .enemy
|
|
|
|
|
//(This conflicts with cameraman, but hey...)
|
|
|
|
|
//Remember last person who shot us, so we can give him a frag
|
2001-07-23 20:52:47 +00:00
|
|
|
if (targ.cutf_items & CUTF_EXPBODY && !targ.is_abouttodie)
|
2001-07-17 05:58:10 +00:00
|
|
|
{
|
2001-08-24 05:48:29 +00:00
|
|
|
//if (targ.classname == "player" && attacker.classname == "player" && !Teammate(targ.team_no, attacker.team_no))
|
2001-07-17 05:58:10 +00:00
|
|
|
targ.martyr_enemy = attacker;
|
1) Attempted to give players positive frags whenever possible. You now
should get frags for blowing people up with others' dispensers/mines/expbody,
airfisting rockets, etc.
2) Redid Give_Frags_Out
3) Changed many uses of pointcontents and ugly hacks to use hullpointcontents
and checkmove, now a lot cleaner and less buggy
4) You can grapple builds again. This caused really odd bugs.
5) You can now damage your own buildings again (gasp). Any time a tesla or sentry
is damaged it turns on its attacker, friendly or otherwise. This is both a counter-TK
and counter-spy mechanism.
6) Teslas are now entirely inside their bounding box
7) Now check every frame for players startsolid and for outside of the map cube.
8) #define WALL_HURT to make it hurt when you hit a wall
9) Used some cool ideas (aka laws of physics) to make the airfist a little less annoying
10) You now only get 1 mirv per slot without bandolier. Demoman and hwguy gain bandolier.
demoman loses his extra mirv but gains an extra grenade and pair of detpacks. Hwguy
gets extra grenade.
11) New and improved EMP grenade now does damage based on range. no longer blows up shells.
Doesn't directly damage sentries anymore, but does significant damage to dispensers.
EMP someone who's setting a det and it blows up in their face.
12) Players now do radius damage from getting EMPed (again)
13) EMPs now go through walls (again)
14) EMP number lowered by one (3 without, 4 with bandolier) and cost raised by $100
15) You can only have 2 frag grens, 3 with bandolier now.
16) Hover boots will now eat cells if they get low on charge. In addition, the silly bug
where their charge wasn't restored when you die is fixed now.
17) EMPing a detpack now sets its timer to anywhere between 1 and 121 seconds from current time,
with a logarithmic probability of it being lower. (random() * random() * 120 + 1). Also, probably
more time the closer it is to the EMP.
18) Judo can now be blocked by people with close combat, knife or judo. Blocked judo means that the
attacker loses 3 seconds of attack.
19) Judo missing now makes them unable to fire.
20) Shortened judo range (back to normal if w/ close combat)
21) Attempted to rework the railgun. Seems to be okay now.
Probably still a lot of bugs in here, but since this is the devel version I thought I would commit
all my changes so people could start testing it. I'll commit fixes as soon as I find the bugs.
2003-11-26 08:53:44 +00:00
|
|
|
targ.stored_deathmsg = deathmsg; //- OfN - UNUSED? GR yep, so is is_abouttodie pretty much
|
2001-07-17 05:58:10 +00:00
|
|
|
}
|
|
|
|
|
if (targ.classname == "player") //WK Time holding the last time we've been shot
|
|
|
|
|
targ.last_attacked_time = time; //WK For chaplan healing purposes
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//BUTTON TRIGGERING
|
|
|
|
|
if (attacker.classname == "player")
|
|
|
|
|
{
|
|
|
|
|
//if (targ.classname != "player" && !IsBuilding(targ) && targ.classname != "monster_demon1")
|
|
|
|
|
if (targ.classname != "player" && !IsBuilding(targ) && !IsMonster(targ))
|
|
|
|
|
{
|
|
|
|
|
if (!Activated(targ,attacker))
|
|
|
|
|
{
|
|
|
|
|
// If an else goal should be activated, activate it
|
|
|
|
|
if (targ.else_goal != 0)
|
|
|
|
|
{
|
|
|
|
|
te = Findgoal(targ.else_goal);
|
|
|
|
|
if (te)
|
2001-07-23 20:52:47 +00:00
|
|
|
DoResults(te, attacker, (targ.goal_result & TFGR_ADD_BONUSES));
|
2001-07-17 05:58:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// used by buttons and triggers to set activator for target firing
|
|
|
|
|
damage_attacker = attacker;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// INVINCIBILITY
|
2001-07-23 20:52:47 +00:00
|
|
|
if (targ.flags & FL_GODMODE)
|
2001-07-17 05:58:10 +00:00
|
|
|
return;
|
|
|
|
|
if (targ.invincible_finished >= time)
|
|
|
|
|
{
|
|
|
|
|
if (self.invincible_sound < time)
|
|
|
|
|
{
|
2001-07-23 20:52:47 +00:00
|
|
|
sound (targ, CHAN_ITEM, "items/protect3.wav", 1, ATTN_NORM);
|
2001-07-17 05:58:10 +00:00
|
|
|
self.invincible_sound = time + 2;
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//CHAPLAIN CALCULATIONS
|
|
|
|
|
// WK See if they're close enough to chap to get protection
|
2001-07-23 20:52:47 +00:00
|
|
|
if (attacker.classname == "player" && attacker.tfstate & TFSTATE_INSPIRED) {
|
2001-07-17 05:58:10 +00:00
|
|
|
dist = vlen(attacker.origin - attacker.inspirator.origin);
|
|
|
|
|
output = ftos(dist);
|
2001-07-23 20:52:47 +00:00
|
|
|
if (dist > CHAPLAN_RADIUS) { //We've strayed from the flock
|
|
|
|
|
sprint(attacker,PRINT_HIGH,"You have strayed from the flock\n");
|
|
|
|
|
attacker.tfstate = attacker.tfstate - TFSTATE_INSPIRED;
|
2001-07-17 05:58:10 +00:00
|
|
|
attacker.super_damage_finished = 0;
|
2001-08-10 10:03:36 +00:00
|
|
|
attacker.items = attacker.items & ~IT_QUAD;
|
2003-12-03 02:43:02 +00:00
|
|
|
attacker.effects &= ~EF_ANYGLOW;
|
2001-07-17 05:58:10 +00:00
|
|
|
}
|
|
|
|
|
}
|
2001-07-23 20:52:47 +00:00
|
|
|
if (targ.classname == "player" && targ.tfstate & TFSTATE_INSPIRED) {
|
2001-07-17 05:58:10 +00:00
|
|
|
dist = vlen(targ.origin - targ.inspirator.origin);
|
2001-07-23 20:52:47 +00:00
|
|
|
if (dist > CHAPLAN_RADIUS) { //We've strayed from the flock
|
|
|
|
|
sprint(targ,PRINT_HIGH,"You have strayed from the flock\n");
|
|
|
|
|
targ.tfstate = targ.tfstate - TFSTATE_INSPIRED;
|
2001-07-17 05:58:10 +00:00
|
|
|
targ.super_damage_finished = 0;
|
2001-08-10 10:03:36 +00:00
|
|
|
targ.items = targ.items & ~IT_QUAD;
|
2003-12-03 02:43:02 +00:00
|
|
|
targ.effects &= ~EF_ANYGLOW;
|
2001-07-17 05:58:10 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// QUAD DAMAGE
|
|
|
|
|
if (attacker.super_damage_finished > time) {
|
2001-07-23 20:52:47 +00:00
|
|
|
if (attacker.tfstate & TFSTATE_INSPIRED)
|
2001-07-17 05:58:10 +00:00
|
|
|
damage = damage * 1.5;
|
2001-07-23 20:52:47 +00:00
|
|
|
if (attacker.job & JOB_BERSERKER && attacker.job & JOB_ACTIVE)
|
2001-07-17 05:58:10 +00:00
|
|
|
damage = damage * 2;
|
|
|
|
|
else
|
|
|
|
|
damage = damage * 4;
|
|
|
|
|
}
|
|
|
|
|
|
2001-10-13 19:44:27 +00:00
|
|
|
if (attacker.aura == AURA_POWER)
|
2001-07-17 05:58:10 +00:00
|
|
|
damage = damage * 1.5;
|
|
|
|
|
|
2001-10-13 19:44:27 +00:00
|
|
|
if (targ.aura == AURA_RESISTANCE) {
|
2001-07-17 05:58:10 +00:00
|
|
|
damage = damage * 0.66;
|
2001-10-13 19:44:27 +00:00
|
|
|
if (self.invincible_sound < time) {
|
|
|
|
|
sound (targ, CHAN_ITEM, "auras/aura1.wav", 1, ATTN_NORM);
|
|
|
|
|
self.invincible_sound = time + 1.5;
|
|
|
|
|
}
|
|
|
|
|
}
|
2001-07-17 05:58:10 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
//DAMAGE ADJUSTMENT
|
2001-07-23 20:52:47 +00:00
|
|
|
//- OfN - if (deathmsg != DMSG_MARTYR && targ.classname != "monster_demon1" && targ.classname != "monster_shambler" && targ.classname != "monster_army")
|
<Grievre> lemme see... fixes: stuck shamblers, cheat teslas, camming and
sensing
<Grievre> give mirvs the right death message, make them a little weaker and
more spread out
<Grievre> increased damage done by exp body... fixes not being able to use
airfist if you have daedalus or lg with no cells
<Grievre> made it so missing judo = you can't fire for 1.5 seconds, also
judo doesn't always work, less chance of it working a) if they're facing
you b) if they have knife, judo, or close combat
<Grievre> you lose speed the more armor you have (so upgraded people can
buy cougar and cheetah now)
<Grievre> attempted to fix the respawn guard not telefragging bug (if it
was still there)
<Grievre> made it so you can tell a shambler to come, stop, or patrol even
if it is fighting someone, doesn't really work most of the time but can
"wake up" your shambler if it's being screwy
<Grievre> (works for all demons)
<Grievre> made it so a monster goes back to what it was doing before
(following you, patrolling etc) once it's done with its enemy
<Grievre> made the sniper rifle less cheap (or tried to), charging now =
more accuracy, rather than more damage. OTR now does slightly less damage
than regular, but isn't blocked by armor as much.
<Grievre> autorifle now has half the rate of fire but does same damage as
sniper rifle, but less accurate
<Grievre> headshots always ignore armor if target has green armor, legshots
always ignore armor except for red
<Grievre> added bshams and shambler kings (can be disabled with infokeys)
<Grievre> increased max knife blood to 32
<Grievre> made it so airfist bounces gymnasts twice as much, and bounces
everyone a little more (I think), may cause stuck bugs but I think it
won't. airfist does half damage to gymnasts and slightly more to hwguys
<Grievre> made shamblers a little smarter and more powerful in general
<Grievre> they now attack buildings (only bshams/kings) if they are
attacked by them first
<Grievre> bsham/king fireball now sets things on fire
<Grievre> shamblers will generally attack the person who last hit them
<Grievre> shortened judoka range (they have the old range if they get close
combat
<Grievre> shamblers will cycle the left-right slash or fireball longer than
they did (but they won't keep doing it if their enemy is not visible)
<Grievre> fixed shambler fireball so it doesn't miss and hurt itself so
much
<Grievre> #define OLD_AUTORIFLE
<Grievre> will go to the old behavior of the auto rifle
<Grievre> I think that's it
<Grievre> oh, I changed the intro message and version string a little, you
might want to change that
2003-11-12 04:58:19 +00:00
|
|
|
|
2001-07-23 20:52:47 +00:00
|
|
|
if (deathmsg != DMSG_MARTYR && !IsMonster(targ))
|
2001-07-17 05:58:10 +00:00
|
|
|
{
|
2001-07-23 20:52:47 +00:00
|
|
|
if (targ.tfstate & TFSTATE_INSPIRED) //Chaplan defense
|
2001-07-17 05:58:10 +00:00
|
|
|
damage = damage * 0.66;
|
|
|
|
|
//WK Ping fairness code. LPB is < 200 ping
|
<Grievre> lemme see... fixes: stuck shamblers, cheat teslas, camming and
sensing
<Grievre> give mirvs the right death message, make them a little weaker and
more spread out
<Grievre> increased damage done by exp body... fixes not being able to use
airfist if you have daedalus or lg with no cells
<Grievre> made it so missing judo = you can't fire for 1.5 seconds, also
judo doesn't always work, less chance of it working a) if they're facing
you b) if they have knife, judo, or close combat
<Grievre> you lose speed the more armor you have (so upgraded people can
buy cougar and cheetah now)
<Grievre> attempted to fix the respawn guard not telefragging bug (if it
was still there)
<Grievre> made it so you can tell a shambler to come, stop, or patrol even
if it is fighting someone, doesn't really work most of the time but can
"wake up" your shambler if it's being screwy
<Grievre> (works for all demons)
<Grievre> made it so a monster goes back to what it was doing before
(following you, patrolling etc) once it's done with its enemy
<Grievre> made the sniper rifle less cheap (or tried to), charging now =
more accuracy, rather than more damage. OTR now does slightly less damage
than regular, but isn't blocked by armor as much.
<Grievre> autorifle now has half the rate of fire but does same damage as
sniper rifle, but less accurate
<Grievre> headshots always ignore armor if target has green armor, legshots
always ignore armor except for red
<Grievre> added bshams and shambler kings (can be disabled with infokeys)
<Grievre> increased max knife blood to 32
<Grievre> made it so airfist bounces gymnasts twice as much, and bounces
everyone a little more (I think), may cause stuck bugs but I think it
won't. airfist does half damage to gymnasts and slightly more to hwguys
<Grievre> made shamblers a little smarter and more powerful in general
<Grievre> they now attack buildings (only bshams/kings) if they are
attacked by them first
<Grievre> bsham/king fireball now sets things on fire
<Grievre> shamblers will generally attack the person who last hit them
<Grievre> shortened judoka range (they have the old range if they get close
combat
<Grievre> shamblers will cycle the left-right slash or fireball longer than
they did (but they won't keep doing it if their enemy is not visible)
<Grievre> fixed shambler fireball so it doesn't miss and hurt itself so
much
<Grievre> #define OLD_AUTORIFLE
<Grievre> will go to the old behavior of the auto rifle
<Grievre> I think that's it
<Grievre> oh, I changed the intro message and version string a little, you
might want to change that
2003-11-12 04:58:19 +00:00
|
|
|
//haha, yeah right.
|
|
|
|
|
#if 0
|
2001-07-17 05:58:10 +00:00
|
|
|
if (attacker.classname == "player" && targ.classname == "player" && attacker != targ)
|
|
|
|
|
{
|
|
|
|
|
foo = infokey(attacker,"ping");
|
|
|
|
|
ping = 200;
|
2001-09-30 22:38:44 +00:00
|
|
|
if (foo)
|
2001-07-17 05:58:10 +00:00
|
|
|
ping = stof(foo);
|
|
|
|
|
ping = (ping + 1000) / 1200;
|
|
|
|
|
if (ping < 0.8) ping = 0.8;
|
|
|
|
|
if (ping > 1.2) ping = 1.2;
|
|
|
|
|
damage = damage * ping;
|
|
|
|
|
}
|
<Grievre> lemme see... fixes: stuck shamblers, cheat teslas, camming and
sensing
<Grievre> give mirvs the right death message, make them a little weaker and
more spread out
<Grievre> increased damage done by exp body... fixes not being able to use
airfist if you have daedalus or lg with no cells
<Grievre> made it so missing judo = you can't fire for 1.5 seconds, also
judo doesn't always work, less chance of it working a) if they're facing
you b) if they have knife, judo, or close combat
<Grievre> you lose speed the more armor you have (so upgraded people can
buy cougar and cheetah now)
<Grievre> attempted to fix the respawn guard not telefragging bug (if it
was still there)
<Grievre> made it so you can tell a shambler to come, stop, or patrol even
if it is fighting someone, doesn't really work most of the time but can
"wake up" your shambler if it's being screwy
<Grievre> (works for all demons)
<Grievre> made it so a monster goes back to what it was doing before
(following you, patrolling etc) once it's done with its enemy
<Grievre> made the sniper rifle less cheap (or tried to), charging now =
more accuracy, rather than more damage. OTR now does slightly less damage
than regular, but isn't blocked by armor as much.
<Grievre> autorifle now has half the rate of fire but does same damage as
sniper rifle, but less accurate
<Grievre> headshots always ignore armor if target has green armor, legshots
always ignore armor except for red
<Grievre> added bshams and shambler kings (can be disabled with infokeys)
<Grievre> increased max knife blood to 32
<Grievre> made it so airfist bounces gymnasts twice as much, and bounces
everyone a little more (I think), may cause stuck bugs but I think it
won't. airfist does half damage to gymnasts and slightly more to hwguys
<Grievre> made shamblers a little smarter and more powerful in general
<Grievre> they now attack buildings (only bshams/kings) if they are
attacked by them first
<Grievre> bsham/king fireball now sets things on fire
<Grievre> shamblers will generally attack the person who last hit them
<Grievre> shortened judoka range (they have the old range if they get close
combat
<Grievre> shamblers will cycle the left-right slash or fireball longer than
they did (but they won't keep doing it if their enemy is not visible)
<Grievre> fixed shambler fireball so it doesn't miss and hurt itself so
much
<Grievre> #define OLD_AUTORIFLE
<Grievre> will go to the old behavior of the auto rifle
<Grievre> I think that's it
<Grievre> oh, I changed the intro message and version string a little, you
might want to change that
2003-11-12 04:58:19 +00:00
|
|
|
#endif
|
2001-07-23 20:52:47 +00:00
|
|
|
if (teamplay & (TEAMPLAY_LESSSCOREHELP | TEAMPLAY_LESSPLAYERSHELP))
|
2001-07-17 05:58:10 +00:00
|
|
|
damage = TeamEqualiseDamage(targ, attacker, damage);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//MIRROR DAMAGE
|
|
|
|
|
//WK - Check to see if we hit a friend
|
|
|
|
|
if (Teammate(targ.team_no, attacker.team_no) && (targ != attacker) && attacker.classname == "player" && targ.classname == "player") {
|
|
|
|
|
//We just hit someone on our team!
|
2001-07-23 20:52:47 +00:00
|
|
|
if (T_flags & TF_TD_NOTTEAM)
|
2001-07-17 05:58:10 +00:00
|
|
|
{
|
|
|
|
|
//Direct damage
|
2001-07-23 20:52:47 +00:00
|
|
|
if (teamplay & TEAMPLAY_FULLMIRRORDIRECT)
|
2001-07-17 05:58:10 +00:00
|
|
|
mirror = mirror + damage;
|
2001-07-23 20:52:47 +00:00
|
|
|
if (teamplay & TEAMPLAY_HALFMIRRORDIRECT)
|
2001-07-17 05:58:10 +00:00
|
|
|
mirror = mirror + damage / 2;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
//Explosive damage
|
2001-07-23 20:52:47 +00:00
|
|
|
if (teamplay & TEAMPLAY_FULLMIRROREXPLOSIVE)
|
2001-07-17 05:58:10 +00:00
|
|
|
mirror = mirror + damage;
|
2001-07-23 20:52:47 +00:00
|
|
|
if (teamplay & TEAMPLAY_HALFMIRROREXPLOSIVE)
|
2001-07-17 05:58:10 +00:00
|
|
|
mirror = mirror + damage / 2;
|
|
|
|
|
}
|
|
|
|
|
//Don't inflict damage on a (teamkiller or spy)-hitter
|
|
|
|
|
if (mirror > 0 && !(targ.is_feigning || targ.is_undercover) && !(targ.penance_time > time)) //Hurt the jerk!
|
2001-07-23 20:52:47 +00:00
|
|
|
TF_T_Damage (attacker, attacker, attacker, mirror, 0, TF_TD_OTHER);
|
2001-07-17 05:58:10 +00:00
|
|
|
}
|
|
|
|
|
//WK Slight mirror demon protection
|
|
|
|
|
//Do 2 points of damage to a friendly teammate shooting a friendly demon
|
|
|
|
|
//SB 2 damage? no way, we're doing the full mirror damage
|
2001-11-02 17:00:52 +00:00
|
|
|
//- Ofn- if ((targ.classname == "monster_demon1" || targ.classname == "monster_army" || targ.classname == "monster_shambler") && targ.real_owner)
|
|
|
|
|
if (IsMonster(targ) && targ.real_owner) {
|
2001-07-17 05:58:10 +00:00
|
|
|
targ.armorvalue = 1;
|
2001-07-23 20:52:47 +00:00
|
|
|
if (T_flags & TF_TD_NOTTEAM)
|
2001-07-17 05:58:10 +00:00
|
|
|
{
|
|
|
|
|
//Direct damage
|
2001-07-23 20:52:47 +00:00
|
|
|
if (teamplay & TEAMPLAY_FULLMIRRORDIRECT)
|
2001-07-17 05:58:10 +00:00
|
|
|
mirror = mirror + damage;
|
2001-07-23 20:52:47 +00:00
|
|
|
if (teamplay & TEAMPLAY_HALFMIRRORDIRECT)
|
2001-07-17 05:58:10 +00:00
|
|
|
mirror = mirror + damage / 2;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
//Explosive damage
|
2001-07-23 20:52:47 +00:00
|
|
|
if (teamplay & TEAMPLAY_FULLMIRROREXPLOSIVE)
|
2001-07-17 05:58:10 +00:00
|
|
|
mirror = mirror + damage;
|
2001-07-23 20:52:47 +00:00
|
|
|
if (teamplay & TEAMPLAY_HALFMIRROREXPLOSIVE)
|
2001-07-17 05:58:10 +00:00
|
|
|
mirror = mirror + damage / 2;
|
|
|
|
|
}
|
|
|
|
|
if (Teammate(targ.real_owner.team_no,attacker.team_no) && (targ.real_owner != attacker) && attacker.classname == "player")
|
2001-07-23 20:52:47 +00:00
|
|
|
TF_T_Damage (attacker, attacker, attacker, mirror, 0, TF_TD_OTHER);
|
2001-07-17 05:58:10 +00:00
|
|
|
}
|
1) Attempted to give players positive frags whenever possible. You now
should get frags for blowing people up with others' dispensers/mines/expbody,
airfisting rockets, etc.
2) Redid Give_Frags_Out
3) Changed many uses of pointcontents and ugly hacks to use hullpointcontents
and checkmove, now a lot cleaner and less buggy
4) You can grapple builds again. This caused really odd bugs.
5) You can now damage your own buildings again (gasp). Any time a tesla or sentry
is damaged it turns on its attacker, friendly or otherwise. This is both a counter-TK
and counter-spy mechanism.
6) Teslas are now entirely inside their bounding box
7) Now check every frame for players startsolid and for outside of the map cube.
8) #define WALL_HURT to make it hurt when you hit a wall
9) Used some cool ideas (aka laws of physics) to make the airfist a little less annoying
10) You now only get 1 mirv per slot without bandolier. Demoman and hwguy gain bandolier.
demoman loses his extra mirv but gains an extra grenade and pair of detpacks. Hwguy
gets extra grenade.
11) New and improved EMP grenade now does damage based on range. no longer blows up shells.
Doesn't directly damage sentries anymore, but does significant damage to dispensers.
EMP someone who's setting a det and it blows up in their face.
12) Players now do radius damage from getting EMPed (again)
13) EMPs now go through walls (again)
14) EMP number lowered by one (3 without, 4 with bandolier) and cost raised by $100
15) You can only have 2 frag grens, 3 with bandolier now.
16) Hover boots will now eat cells if they get low on charge. In addition, the silly bug
where their charge wasn't restored when you die is fixed now.
17) EMPing a detpack now sets its timer to anywhere between 1 and 121 seconds from current time,
with a logarithmic probability of it being lower. (random() * random() * 120 + 1). Also, probably
more time the closer it is to the EMP.
18) Judo can now be blocked by people with close combat, knife or judo. Blocked judo means that the
attacker loses 3 seconds of attack.
19) Judo missing now makes them unable to fire.
20) Shortened judo range (back to normal if w/ close combat)
21) Attempted to rework the railgun. Seems to be okay now.
Probably still a lot of bugs in here, but since this is the devel version I thought I would commit
all my changes so people could start testing it. I'll commit fixes as soon as I find the bugs.
2003-11-26 08:53:44 +00:00
|
|
|
//WK Friendly Sentrygun protection - you can't hurt friendly sentries GR Why not?
|
|
|
|
|
|
|
|
|
|
if (IsBuilding(targ))
|
2001-07-17 05:58:10 +00:00
|
|
|
targ.armorvalue = 1; //CH so that the armors are counted
|
|
|
|
|
|
|
|
|
|
// SPECIAL ARMOR CALCULATIONS
|
|
|
|
|
if ((targ.armorclass != 0) && (T_AttackType != 0))
|
|
|
|
|
{
|
<Grievre> lemme see... fixes: stuck shamblers, cheat teslas, camming and
sensing
<Grievre> give mirvs the right death message, make them a little weaker and
more spread out
<Grievre> increased damage done by exp body... fixes not being able to use
airfist if you have daedalus or lg with no cells
<Grievre> made it so missing judo = you can't fire for 1.5 seconds, also
judo doesn't always work, less chance of it working a) if they're facing
you b) if they have knife, judo, or close combat
<Grievre> you lose speed the more armor you have (so upgraded people can
buy cougar and cheetah now)
<Grievre> attempted to fix the respawn guard not telefragging bug (if it
was still there)
<Grievre> made it so you can tell a shambler to come, stop, or patrol even
if it is fighting someone, doesn't really work most of the time but can
"wake up" your shambler if it's being screwy
<Grievre> (works for all demons)
<Grievre> made it so a monster goes back to what it was doing before
(following you, patrolling etc) once it's done with its enemy
<Grievre> made the sniper rifle less cheap (or tried to), charging now =
more accuracy, rather than more damage. OTR now does slightly less damage
than regular, but isn't blocked by armor as much.
<Grievre> autorifle now has half the rate of fire but does same damage as
sniper rifle, but less accurate
<Grievre> headshots always ignore armor if target has green armor, legshots
always ignore armor except for red
<Grievre> added bshams and shambler kings (can be disabled with infokeys)
<Grievre> increased max knife blood to 32
<Grievre> made it so airfist bounces gymnasts twice as much, and bounces
everyone a little more (I think), may cause stuck bugs but I think it
won't. airfist does half damage to gymnasts and slightly more to hwguys
<Grievre> made shamblers a little smarter and more powerful in general
<Grievre> they now attack buildings (only bshams/kings) if they are
attacked by them first
<Grievre> bsham/king fireball now sets things on fire
<Grievre> shamblers will generally attack the person who last hit them
<Grievre> shortened judoka range (they have the old range if they get close
combat
<Grievre> shamblers will cycle the left-right slash or fireball longer than
they did (but they won't keep doing it if their enemy is not visible)
<Grievre> fixed shambler fireball so it doesn't miss and hurt itself so
much
<Grievre> #define OLD_AUTORIFLE
<Grievre> will go to the old behavior of the auto rifle
<Grievre> I think that's it
<Grievre> oh, I changed the intro message and version string a little, you
might want to change that
2003-11-12 04:58:19 +00:00
|
|
|
// OTR changed, it now just does less damage but ignores armor.
|
2001-07-23 20:52:47 +00:00
|
|
|
if ((targ.armorclass & AT_SAVESHOT) && (T_AttackType == TF_TD_SHOT)) {
|
2001-07-17 05:58:10 +00:00
|
|
|
damage = floor(damage * 0.5);
|
|
|
|
|
//WK Cap max damage you can take with kevlar on, like in Real Life(tm)
|
|
|
|
|
//WK The purpose being to cut down on the power of snipers
|
|
|
|
|
if(targ.classname == "player") // SB kevlar fixed so it caps damage now, also spacing much nicer :)
|
|
|
|
|
{
|
|
|
|
|
|
<Grievre> lemme see... fixes: stuck shamblers, cheat teslas, camming and
sensing
<Grievre> give mirvs the right death message, make them a little weaker and
more spread out
<Grievre> increased damage done by exp body... fixes not being able to use
airfist if you have daedalus or lg with no cells
<Grievre> made it so missing judo = you can't fire for 1.5 seconds, also
judo doesn't always work, less chance of it working a) if they're facing
you b) if they have knife, judo, or close combat
<Grievre> you lose speed the more armor you have (so upgraded people can
buy cougar and cheetah now)
<Grievre> attempted to fix the respawn guard not telefragging bug (if it
was still there)
<Grievre> made it so you can tell a shambler to come, stop, or patrol even
if it is fighting someone, doesn't really work most of the time but can
"wake up" your shambler if it's being screwy
<Grievre> (works for all demons)
<Grievre> made it so a monster goes back to what it was doing before
(following you, patrolling etc) once it's done with its enemy
<Grievre> made the sniper rifle less cheap (or tried to), charging now =
more accuracy, rather than more damage. OTR now does slightly less damage
than regular, but isn't blocked by armor as much.
<Grievre> autorifle now has half the rate of fire but does same damage as
sniper rifle, but less accurate
<Grievre> headshots always ignore armor if target has green armor, legshots
always ignore armor except for red
<Grievre> added bshams and shambler kings (can be disabled with infokeys)
<Grievre> increased max knife blood to 32
<Grievre> made it so airfist bounces gymnasts twice as much, and bounces
everyone a little more (I think), may cause stuck bugs but I think it
won't. airfist does half damage to gymnasts and slightly more to hwguys
<Grievre> made shamblers a little smarter and more powerful in general
<Grievre> they now attack buildings (only bshams/kings) if they are
attacked by them first
<Grievre> bsham/king fireball now sets things on fire
<Grievre> shamblers will generally attack the person who last hit them
<Grievre> shortened judoka range (they have the old range if they get close
combat
<Grievre> shamblers will cycle the left-right slash or fireball longer than
they did (but they won't keep doing it if their enemy is not visible)
<Grievre> fixed shambler fireball so it doesn't miss and hurt itself so
much
<Grievre> #define OLD_AUTORIFLE
<Grievre> will go to the old behavior of the auto rifle
<Grievre> I think that's it
<Grievre> oh, I changed the intro message and version string a little, you
might want to change that
2003-11-12 04:58:19 +00:00
|
|
|
if (light_damage)
|
2001-07-17 05:58:10 +00:00
|
|
|
{
|
|
|
|
|
if (damage > 75)
|
|
|
|
|
damage = 75;
|
|
|
|
|
}
|
<Grievre> lemme see... fixes: stuck shamblers, cheat teslas, camming and
sensing
<Grievre> give mirvs the right death message, make them a little weaker and
more spread out
<Grievre> increased damage done by exp body... fixes not being able to use
airfist if you have daedalus or lg with no cells
<Grievre> made it so missing judo = you can't fire for 1.5 seconds, also
judo doesn't always work, less chance of it working a) if they're facing
you b) if they have knife, judo, or close combat
<Grievre> you lose speed the more armor you have (so upgraded people can
buy cougar and cheetah now)
<Grievre> attempted to fix the respawn guard not telefragging bug (if it
was still there)
<Grievre> made it so you can tell a shambler to come, stop, or patrol even
if it is fighting someone, doesn't really work most of the time but can
"wake up" your shambler if it's being screwy
<Grievre> (works for all demons)
<Grievre> made it so a monster goes back to what it was doing before
(following you, patrolling etc) once it's done with its enemy
<Grievre> made the sniper rifle less cheap (or tried to), charging now =
more accuracy, rather than more damage. OTR now does slightly less damage
than regular, but isn't blocked by armor as much.
<Grievre> autorifle now has half the rate of fire but does same damage as
sniper rifle, but less accurate
<Grievre> headshots always ignore armor if target has green armor, legshots
always ignore armor except for red
<Grievre> added bshams and shambler kings (can be disabled with infokeys)
<Grievre> increased max knife blood to 32
<Grievre> made it so airfist bounces gymnasts twice as much, and bounces
everyone a little more (I think), may cause stuck bugs but I think it
won't. airfist does half damage to gymnasts and slightly more to hwguys
<Grievre> made shamblers a little smarter and more powerful in general
<Grievre> they now attack buildings (only bshams/kings) if they are
attacked by them first
<Grievre> bsham/king fireball now sets things on fire
<Grievre> shamblers will generally attack the person who last hit them
<Grievre> shortened judoka range (they have the old range if they get close
combat
<Grievre> shamblers will cycle the left-right slash or fireball longer than
they did (but they won't keep doing it if their enemy is not visible)
<Grievre> fixed shambler fireball so it doesn't miss and hurt itself so
much
<Grievre> #define OLD_AUTORIFLE
<Grievre> will go to the old behavior of the auto rifle
<Grievre> I think that's it
<Grievre> oh, I changed the intro message and version string a little, you
might want to change that
2003-11-12 04:58:19 +00:00
|
|
|
else if (damage > 100) damage = 100;
|
2001-07-17 05:58:10 +00:00
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
2001-07-23 20:52:47 +00:00
|
|
|
else if ((targ.armorclass & AT_SAVEMELEE) && (deathmsg == DMSG_JUDOKA || deathmsg == DMSG_AXE || deathmsg == DMSG_BACKSTAB || deathmsg == DMSG_SPANNER))
|
2001-07-17 05:58:10 +00:00
|
|
|
{
|
<Grievre> lemme see... fixes: stuck shamblers, cheat teslas, camming and
sensing
<Grievre> give mirvs the right death message, make them a little weaker and
more spread out
<Grievre> increased damage done by exp body... fixes not being able to use
airfist if you have daedalus or lg with no cells
<Grievre> made it so missing judo = you can't fire for 1.5 seconds, also
judo doesn't always work, less chance of it working a) if they're facing
you b) if they have knife, judo, or close combat
<Grievre> you lose speed the more armor you have (so upgraded people can
buy cougar and cheetah now)
<Grievre> attempted to fix the respawn guard not telefragging bug (if it
was still there)
<Grievre> made it so you can tell a shambler to come, stop, or patrol even
if it is fighting someone, doesn't really work most of the time but can
"wake up" your shambler if it's being screwy
<Grievre> (works for all demons)
<Grievre> made it so a monster goes back to what it was doing before
(following you, patrolling etc) once it's done with its enemy
<Grievre> made the sniper rifle less cheap (or tried to), charging now =
more accuracy, rather than more damage. OTR now does slightly less damage
than regular, but isn't blocked by armor as much.
<Grievre> autorifle now has half the rate of fire but does same damage as
sniper rifle, but less accurate
<Grievre> headshots always ignore armor if target has green armor, legshots
always ignore armor except for red
<Grievre> added bshams and shambler kings (can be disabled with infokeys)
<Grievre> increased max knife blood to 32
<Grievre> made it so airfist bounces gymnasts twice as much, and bounces
everyone a little more (I think), may cause stuck bugs but I think it
won't. airfist does half damage to gymnasts and slightly more to hwguys
<Grievre> made shamblers a little smarter and more powerful in general
<Grievre> they now attack buildings (only bshams/kings) if they are
attacked by them first
<Grievre> bsham/king fireball now sets things on fire
<Grievre> shamblers will generally attack the person who last hit them
<Grievre> shortened judoka range (they have the old range if they get close
combat
<Grievre> shamblers will cycle the left-right slash or fireball longer than
they did (but they won't keep doing it if their enemy is not visible)
<Grievre> fixed shambler fireball so it doesn't miss and hurt itself so
much
<Grievre> #define OLD_AUTORIFLE
<Grievre> will go to the old behavior of the auto rifle
<Grievre> I think that's it
<Grievre> oh, I changed the intro message and version string a little, you
might want to change that
2003-11-12 04:58:19 +00:00
|
|
|
// This crap should all be in the weapon function. Stupid morons.
|
2001-07-17 05:58:10 +00:00
|
|
|
damage = floor(damage * 0.5);
|
|
|
|
|
if ((targ.velocity_x > 0 || targ.velocity_y > 0 || targ.velocity_z > 0) && random() > 0.6)
|
|
|
|
|
return;
|
<Grievre> lemme see... fixes: stuck shamblers, cheat teslas, camming and
sensing
<Grievre> give mirvs the right death message, make them a little weaker and
more spread out
<Grievre> increased damage done by exp body... fixes not being able to use
airfist if you have daedalus or lg with no cells
<Grievre> made it so missing judo = you can't fire for 1.5 seconds, also
judo doesn't always work, less chance of it working a) if they're facing
you b) if they have knife, judo, or close combat
<Grievre> you lose speed the more armor you have (so upgraded people can
buy cougar and cheetah now)
<Grievre> attempted to fix the respawn guard not telefragging bug (if it
was still there)
<Grievre> made it so you can tell a shambler to come, stop, or patrol even
if it is fighting someone, doesn't really work most of the time but can
"wake up" your shambler if it's being screwy
<Grievre> (works for all demons)
<Grievre> made it so a monster goes back to what it was doing before
(following you, patrolling etc) once it's done with its enemy
<Grievre> made the sniper rifle less cheap (or tried to), charging now =
more accuracy, rather than more damage. OTR now does slightly less damage
than regular, but isn't blocked by armor as much.
<Grievre> autorifle now has half the rate of fire but does same damage as
sniper rifle, but less accurate
<Grievre> headshots always ignore armor if target has green armor, legshots
always ignore armor except for red
<Grievre> added bshams and shambler kings (can be disabled with infokeys)
<Grievre> increased max knife blood to 32
<Grievre> made it so airfist bounces gymnasts twice as much, and bounces
everyone a little more (I think), may cause stuck bugs but I think it
won't. airfist does half damage to gymnasts and slightly more to hwguys
<Grievre> made shamblers a little smarter and more powerful in general
<Grievre> they now attack buildings (only bshams/kings) if they are
attacked by them first
<Grievre> bsham/king fireball now sets things on fire
<Grievre> shamblers will generally attack the person who last hit them
<Grievre> shortened judoka range (they have the old range if they get close
combat
<Grievre> shamblers will cycle the left-right slash or fireball longer than
they did (but they won't keep doing it if their enemy is not visible)
<Grievre> fixed shambler fireball so it doesn't miss and hurt itself so
much
<Grievre> #define OLD_AUTORIFLE
<Grievre> will go to the old behavior of the auto rifle
<Grievre> I think that's it
<Grievre> oh, I changed the intro message and version string a little, you
might want to change that
2003-11-12 04:58:19 +00:00
|
|
|
if (deathmsg == DMSG_BACKSTAB) // O_O, why is this here?
|
2001-07-23 20:52:47 +00:00
|
|
|
T_flags = T_flags - (T_flags & TF_TD_IGNOREARMOUR);
|
2001-07-17 05:58:10 +00:00
|
|
|
}
|
2001-07-23 20:52:47 +00:00
|
|
|
else if ((targ.armorclass & AT_SAVEEXPLOSION) && (T_AttackType == TF_TD_EXPLOSION))
|
2001-07-17 05:58:10 +00:00
|
|
|
damage = floor(damage * 0.5);
|
2001-07-23 20:52:47 +00:00
|
|
|
else if ((targ.armorclass & AT_SAVEELECTRICITY) && (T_AttackType == TF_TD_ELECTRICITY || T_AttackType == TF_TD_NAIL))
|
2001-07-17 05:58:10 +00:00
|
|
|
damage = floor(damage * 0.5);
|
2001-07-23 20:52:47 +00:00
|
|
|
else if ((targ.armorclass & AT_SAVEFIRE) && (T_AttackType == TF_TD_FIRE))
|
2001-07-17 05:58:10 +00:00
|
|
|
damage = floor(damage * 0.5);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//ARMOR PROTECTION CALCULATION
|
|
|
|
|
// save damage based on the target's armor level
|
2001-07-23 20:52:47 +00:00
|
|
|
if (T_flags & TF_TD_IGNOREARMOUR)
|
2001-07-17 05:58:10 +00:00
|
|
|
{
|
|
|
|
|
take = damage;
|
|
|
|
|
save = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
save = ceil(targ.armortype*damage);
|
|
|
|
|
if (save >= targ.armorvalue)
|
|
|
|
|
{
|
|
|
|
|
save = targ.armorvalue;
|
|
|
|
|
targ.armortype = 0; // lost all armor
|
|
|
|
|
targ.armorclass = 0; // lost special armor
|
2001-08-10 10:03:36 +00:00
|
|
|
targ.items = targ.items & ~(IT_ARMOR1 | IT_ARMOR2 | IT_ARMOR3);
|
2003-11-16 00:43:31 +00:00
|
|
|
if (targ.classname == "player")
|
|
|
|
|
TeamFortress_SetSpeed(targ);
|
2001-07-17 05:58:10 +00:00
|
|
|
}
|
|
|
|
|
//WK Flags prevent armor damage too
|
2001-07-23 20:52:47 +00:00
|
|
|
if (T_flags & TF_TD_NOTTEAM)
|
2001-07-17 05:58:10 +00:00
|
|
|
{
|
|
|
|
|
if (Teammate(targ.team_no,attacker.team_no) && (targ != attacker))
|
|
|
|
|
{
|
2001-07-23 20:52:47 +00:00
|
|
|
if (teamplay & TEAMPLAY_NOARMORDIRECT)
|
2001-07-17 05:58:10 +00:00
|
|
|
targ.armorvalue = targ.armorvalue;
|
2001-07-23 20:52:47 +00:00
|
|
|
else if (teamplay & TEAMPLAY_HALFARMORDIRECT)
|
2001-07-17 05:58:10 +00:00
|
|
|
targ.armorvalue = targ.armorvalue - save / 2;
|
|
|
|
|
else
|
|
|
|
|
targ.armorvalue = targ.armorvalue - save;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
targ.armorvalue = targ.armorvalue - save;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (Teammate(targ.team_no, attacker.team_no) && (targ != attacker))
|
|
|
|
|
{
|
2001-07-23 20:52:47 +00:00
|
|
|
if (teamplay & TEAMPLAY_NOARMOREXPLOSIVE)
|
2001-07-17 05:58:10 +00:00
|
|
|
targ.armorvalue = targ.armorvalue;
|
2001-07-23 20:52:47 +00:00
|
|
|
else if (teamplay & TEAMPLAY_HALFARMOREXPLOSIVE)
|
2001-07-17 05:58:10 +00:00
|
|
|
targ.armorvalue = targ.armorvalue - save / 2;
|
|
|
|
|
else
|
|
|
|
|
targ.armorvalue = targ.armorvalue - save;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
targ.armorvalue = targ.armorvalue - save;
|
|
|
|
|
}
|
|
|
|
|
// targ.armorvalue = targ.armorvalue - save;
|
|
|
|
|
take = ceil(damage-save);
|
2003-11-16 00:43:31 +00:00
|
|
|
if (targ.armorvalue > 0 && (targ.armorvalue + save > 100) && targ.classname == "player")
|
<Grievre> lemme see... fixes: stuck shamblers, cheat teslas, camming and
sensing
<Grievre> give mirvs the right death message, make them a little weaker and
more spread out
<Grievre> increased damage done by exp body... fixes not being able to use
airfist if you have daedalus or lg with no cells
<Grievre> made it so missing judo = you can't fire for 1.5 seconds, also
judo doesn't always work, less chance of it working a) if they're facing
you b) if they have knife, judo, or close combat
<Grievre> you lose speed the more armor you have (so upgraded people can
buy cougar and cheetah now)
<Grievre> attempted to fix the respawn guard not telefragging bug (if it
was still there)
<Grievre> made it so you can tell a shambler to come, stop, or patrol even
if it is fighting someone, doesn't really work most of the time but can
"wake up" your shambler if it's being screwy
<Grievre> (works for all demons)
<Grievre> made it so a monster goes back to what it was doing before
(following you, patrolling etc) once it's done with its enemy
<Grievre> made the sniper rifle less cheap (or tried to), charging now =
more accuracy, rather than more damage. OTR now does slightly less damage
than regular, but isn't blocked by armor as much.
<Grievre> autorifle now has half the rate of fire but does same damage as
sniper rifle, but less accurate
<Grievre> headshots always ignore armor if target has green armor, legshots
always ignore armor except for red
<Grievre> added bshams and shambler kings (can be disabled with infokeys)
<Grievre> increased max knife blood to 32
<Grievre> made it so airfist bounces gymnasts twice as much, and bounces
everyone a little more (I think), may cause stuck bugs but I think it
won't. airfist does half damage to gymnasts and slightly more to hwguys
<Grievre> made shamblers a little smarter and more powerful in general
<Grievre> they now attack buildings (only bshams/kings) if they are
attacked by them first
<Grievre> bsham/king fireball now sets things on fire
<Grievre> shamblers will generally attack the person who last hit them
<Grievre> shortened judoka range (they have the old range if they get close
combat
<Grievre> shamblers will cycle the left-right slash or fireball longer than
they did (but they won't keep doing it if their enemy is not visible)
<Grievre> fixed shambler fireball so it doesn't miss and hurt itself so
much
<Grievre> #define OLD_AUTORIFLE
<Grievre> will go to the old behavior of the auto rifle
<Grievre> I think that's it
<Grievre> oh, I changed the intro message and version string a little, you
might want to change that
2003-11-12 04:58:19 +00:00
|
|
|
TeamFortress_SetSpeed(targ); // speed up the less armor you have
|
2001-07-17 05:58:10 +00:00
|
|
|
}
|
|
|
|
|
// add to the damage total for clients, which will be sent as a single
|
|
|
|
|
// message at the end of the frame
|
|
|
|
|
// FIXME: remove after combining shotgun blasts?
|
2001-07-23 20:52:47 +00:00
|
|
|
if (targ.flags & FL_CLIENT)
|
2001-07-17 05:58:10 +00:00
|
|
|
{
|
|
|
|
|
targ.dmg_take = targ.dmg_take + take;
|
|
|
|
|
targ.dmg_save = targ.dmg_save + save;
|
|
|
|
|
targ.dmg_inflictor = inflictor;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// KNOCKATION CALCULATION
|
2001-11-02 17:00:52 +00:00
|
|
|
if ( (inflictor) && (targ.movetype == MOVETYPE_WALK) )
|
2001-07-17 05:58:10 +00:00
|
|
|
{
|
|
|
|
|
// Nail Gren doesn't knock ppl
|
|
|
|
|
//WK People with Aspect of HWGUY are immune to knockation
|
|
|
|
|
//WK Martyrs are immune to bullet damage, so AC's and Turrets
|
|
|
|
|
// can't be annoying and just simply stop them.
|
|
|
|
|
//SB That's annoying. They can now :)
|
|
|
|
|
knockem = 1;
|
2001-07-23 20:52:47 +00:00
|
|
|
if (targ.cutf_items & CUTF_HWGUY) knockem = 0;
|
|
|
|
|
//if (targ.job & JOB_MARTYR && targ.job & JOB_ACTIVE && T_AttackType != TF_TD_SHOT) knockem = 1;
|
|
|
|
|
if (deathmsg == DMSG_GREN_NAIL) knockem = 0;
|
2001-07-17 05:58:10 +00:00
|
|
|
if (knockem)
|
|
|
|
|
{
|
|
|
|
|
// give them some immunity to cheat check
|
|
|
|
|
//targ.immune_to_check = time + (damage / 20);
|
|
|
|
|
makeImmune(targ,time+(damage/20));
|
|
|
|
|
|
|
|
|
|
dir = targ.origin - (inflictor.absmin + inflictor.absmax) * 0.5;
|
|
|
|
|
dir = normalize(dir);
|
|
|
|
|
|
|
|
|
|
// Increase kickback for smaller weapons
|
|
|
|
|
if ( (damage < 60) & ((attacker.classname == "player") & (targ.classname == "player")) & ( attacker.netname != targ.netname))
|
|
|
|
|
targ.velocity = targ.velocity + dir * damage * 11;
|
|
|
|
|
else
|
|
|
|
|
targ.velocity = targ.velocity + dir*damage*8;
|
|
|
|
|
if ( (rj > 1) & ((attacker.classname == "player") & (targ.classname == "player")) & ( attacker.netname == targ.netname))
|
|
|
|
|
targ.velocity = targ.velocity + dir * damage * rj;
|
2001-07-23 20:52:47 +00:00
|
|
|
if (targ.classname == "player" && targ.cutf_items & CUTF_GYMNAST)
|
2001-07-17 05:58:10 +00:00
|
|
|
targ.velocity = targ.velocity + dir * damage * 8;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// TEAMPLAY FLAGS
|
|
|
|
|
if (attacker.classname == "player" && targ.classname == "player") {
|
2001-07-23 20:52:47 +00:00
|
|
|
if (T_flags & TF_TD_NOTTEAM) {
|
2001-07-17 05:58:10 +00:00
|
|
|
if (Teammate(targ.team_no, attacker.team_no) && (targ != attacker)) {
|
2001-07-23 20:52:47 +00:00
|
|
|
if (teamplay & TEAMPLAY_NODIRECT) return;
|
|
|
|
|
else if (teamplay & TEAMPLAY_HALFDIRECT) take = take / 2;
|
2001-07-17 05:58:10 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
if (Teammate(targ.team_no, attacker.team_no) && (targ != attacker)) {
|
2001-07-23 20:52:47 +00:00
|
|
|
if (teamplay & TEAMPLAY_NOEXPLOSIVE) return;
|
|
|
|
|
else if (teamplay & TEAMPLAY_HALFEXPLOSIVE) take = take / 2;
|
2001-07-17 05:58:10 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2001-07-23 20:52:47 +00:00
|
|
|
if (T_flags & TF_TD_NOTSELF) {
|
2001-07-17 05:58:10 +00:00
|
|
|
if (targ == attacker) return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// do the damage, min 1
|
|
|
|
|
if (take < 1) take = 1;
|
|
|
|
|
|
|
|
|
|
//Make thief visible when he's shot
|
2001-07-23 20:52:47 +00:00
|
|
|
if (take > 1 && targ != attacker && (targ.job & JOB_THIEF && (targ.job & JOB_ACTIVE || targ.job & JOB_FULL_HIDE)))
|
2001-07-17 05:58:10 +00:00
|
|
|
if (!Teammate(targ.team_no, attacker.team_no))
|
2001-07-23 20:52:47 +00:00
|
|
|
RevealThief(targ,TRUE);
|
2001-07-17 05:58:10 +00:00
|
|
|
|
|
|
|
|
targ.health = targ.health - take;
|
|
|
|
|
|
|
|
|
|
if (targ.armorvalue < 1) {
|
|
|
|
|
targ.armorclass = 0; // lost special armor
|
|
|
|
|
targ.armorvalue = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (targ.health < 1 && targ.health > 0) //WK Stop the scoreboard coming up
|
|
|
|
|
targ.health = 1;
|
|
|
|
|
|
|
|
|
|
if (targ.health <= 0) {
|
|
|
|
|
if (inflictor.classname == "detpack" && inflictor.weaponmode == 1 && inflictor.enemy == targ)
|
2001-07-23 20:52:47 +00:00
|
|
|
deathmsg = DMSG_DETPACK_DIS;
|
2001-07-17 05:58:10 +00:00
|
|
|
|
|
|
|
|
//WK Autotrigger martyr - OfN - Now exp.body
|
1) Attempted to give players positive frags whenever possible. You now
should get frags for blowing people up with others' dispensers/mines/expbody,
airfisting rockets, etc.
2) Redid Give_Frags_Out
3) Changed many uses of pointcontents and ugly hacks to use hullpointcontents
and checkmove, now a lot cleaner and less buggy
4) You can grapple builds again. This caused really odd bugs.
5) You can now damage your own buildings again (gasp). Any time a tesla or sentry
is damaged it turns on its attacker, friendly or otherwise. This is both a counter-TK
and counter-spy mechanism.
6) Teslas are now entirely inside their bounding box
7) Now check every frame for players startsolid and for outside of the map cube.
8) #define WALL_HURT to make it hurt when you hit a wall
9) Used some cool ideas (aka laws of physics) to make the airfist a little less annoying
10) You now only get 1 mirv per slot without bandolier. Demoman and hwguy gain bandolier.
demoman loses his extra mirv but gains an extra grenade and pair of detpacks. Hwguy
gets extra grenade.
11) New and improved EMP grenade now does damage based on range. no longer blows up shells.
Doesn't directly damage sentries anymore, but does significant damage to dispensers.
EMP someone who's setting a det and it blows up in their face.
12) Players now do radius damage from getting EMPed (again)
13) EMPs now go through walls (again)
14) EMP number lowered by one (3 without, 4 with bandolier) and cost raised by $100
15) You can only have 2 frag grens, 3 with bandolier now.
16) Hover boots will now eat cells if they get low on charge. In addition, the silly bug
where their charge wasn't restored when you die is fixed now.
17) EMPing a detpack now sets its timer to anywhere between 1 and 121 seconds from current time,
with a logarithmic probability of it being lower. (random() * random() * 120 + 1). Also, probably
more time the closer it is to the EMP.
18) Judo can now be blocked by people with close combat, knife or judo. Blocked judo means that the
attacker loses 3 seconds of attack.
19) Judo missing now makes them unable to fire.
20) Shortened judo range (back to normal if w/ close combat)
21) Attempted to rework the railgun. Seems to be okay now.
Probably still a lot of bugs in here, but since this is the devel version I thought I would commit
all my changes so people could start testing it. I'll commit fixes as soon as I find the bugs.
2003-11-26 08:53:44 +00:00
|
|
|
//BUG, berserk made exp body not work, fixed?
|
2001-11-02 17:00:52 +00:00
|
|
|
if ((targ.cutf_items & CUTF_EXPBODY) && attacker && targ.is_abouttodie == FALSE)
|
2001-07-17 05:58:10 +00:00
|
|
|
{
|
|
|
|
|
//oldself = self;
|
|
|
|
|
//self = targ;
|
|
|
|
|
targ.health = 1;
|
|
|
|
|
targ.martyr_enemy=attacker;
|
|
|
|
|
ExpBody(targ);
|
|
|
|
|
//self = oldself;
|
2001-07-23 20:52:47 +00:00
|
|
|
targ.is_abouttodie = TRUE;
|
2001-07-17 05:58:10 +00:00
|
|
|
return;
|
|
|
|
|
}// /////// OFTEN ///////////
|
|
|
|
|
|
2001-11-02 17:00:52 +00:00
|
|
|
//WK Make sure the NIL doesn't have a bastard level
|
2001-07-17 05:58:10 +00:00
|
|
|
if (attacker.classname != "player" || targ.classname != "player") {
|
2001-07-23 20:52:47 +00:00
|
|
|
//bprint(PRINT_MEDIUM,"Non player death or kill\n");
|
2001-07-17 05:58:10 +00:00
|
|
|
Killed(targ, attacker);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//WK Handle Total Bastard Checking
|
|
|
|
|
//If they kill more than a certain number of friends in a certain period, they are booted
|
|
|
|
|
if (Teammate(targ.team_no, attacker.team_no) && targ != attacker && !(targ.penance_time > time) && !(targ.is_undercover) && prematch < time)
|
|
|
|
|
{
|
|
|
|
|
//A teamkill
|
|
|
|
|
local string st;
|
|
|
|
|
local float threshold;
|
|
|
|
|
threshold = 0;
|
2001-11-02 17:00:52 +00:00
|
|
|
st = infokey(NIL, "curse");
|
2001-09-30 22:38:44 +00:00
|
|
|
if (st)
|
2001-07-17 05:58:10 +00:00
|
|
|
threshold = stof(st);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
attacker.ff_count = attacker.ff_count + 1; //Increase their bastard rating
|
|
|
|
|
if (threshold >= 1) {
|
|
|
|
|
if (attacker.ff_count >= threshold) createBastard(attacker,threshold);
|
|
|
|
|
if ((attacker.ff_count == threshold - 1) || (attacker.ff_count == threshold - 0.5)) {
|
2001-07-23 20:52:47 +00:00
|
|
|
sprint (attacker, PRINT_MEDIUM, "One more teamkill and you will be cursed.\n");
|
2001-07-17 05:58:10 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (!Teammate(targ.team_no, attacker.team_no) || targ.penance_time > time) {
|
|
|
|
|
attacker.ff_count = attacker.ff_count - 0.5;
|
|
|
|
|
if (attacker.ff_count < 0) attacker.ff_count = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (targ.penance_time > time) //A penitent loses frags
|
|
|
|
|
Killed(targ, targ);
|
|
|
|
|
else
|
|
|
|
|
Killed(targ, attacker);
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// react to the damage
|
|
|
|
|
oldself = self;
|
|
|
|
|
self = targ;
|
|
|
|
|
|
|
|
|
|
if (self.th_pain)
|
|
|
|
|
{
|
|
|
|
|
self.th_pain (attacker, take);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
self = oldself;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
============
|
|
|
|
|
T_RadiusDamage
|
|
|
|
|
============
|
|
|
|
|
*/
|
|
|
|
|
void(entity inflictor, entity attacker, float damage, entity ignore) T_RadiusDamage =
|
|
|
|
|
{
|
|
|
|
|
local float points;
|
|
|
|
|
local entity head, te;
|
|
|
|
|
local vector org;
|
|
|
|
|
|
|
|
|
|
head = findradius(inflictor.origin, damage+40);
|
|
|
|
|
|
|
|
|
|
while (head)
|
|
|
|
|
{
|
|
|
|
|
if (head != ignore)
|
|
|
|
|
{
|
|
|
|
|
//WK Set off all land mines in blast radius
|
|
|
|
|
if (head.classname == "grenade" && head.netname == "land_mine")
|
|
|
|
|
{
|
2001-07-23 20:52:47 +00:00
|
|
|
if (deathmsg != DMSG_LAND_MINE) {
|
2001-07-17 05:58:10 +00:00
|
|
|
//head.has_tesla = 2; //- ofn - ur mine explodes better than is destroyed
|
|
|
|
|
head.think = GuerillaExplode;
|
|
|
|
|
head.nextthink = time + 0.1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// Check for TeamFortress Goals that can be triggered by Detpacks
|
|
|
|
|
else if (head.classname == "info_tfgoal")
|
|
|
|
|
{
|
|
|
|
|
if (inflictor.classname == "detpack")
|
|
|
|
|
{
|
|
|
|
|
// Don't activate timer goals
|
2001-07-23 20:52:47 +00:00
|
|
|
if ((head.goal_activation & TFGA_TOUCH_DETPACK) && (head.search_time == 0))
|
2001-07-17 05:58:10 +00:00
|
|
|
{
|
2001-07-23 20:52:47 +00:00
|
|
|
traceline (inflictor.origin, head.origin, TRUE, inflictor);
|
2001-07-17 05:58:10 +00:00
|
|
|
|
|
|
|
|
if (trace_fraction == 1)
|
|
|
|
|
{
|
|
|
|
|
// Does the AP match the AP Criteria?
|
|
|
|
|
if (Activated(head,attacker))
|
|
|
|
|
{
|
2001-07-23 20:52:47 +00:00
|
|
|
DoResults(head, attacker, TRUE);
|
2001-07-17 05:58:10 +00:00
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
// If an else goal should be activated, activate it
|
|
|
|
|
if (head.else_goal != 0)
|
|
|
|
|
{
|
|
|
|
|
te = Findgoal(head.else_goal);
|
|
|
|
|
if (te)
|
2001-07-23 20:52:47 +00:00
|
|
|
DoResults(te, attacker, (head.goal_result & TFGR_ADD_BONUSES));
|
2001-07-17 05:58:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (head.takedamage)
|
|
|
|
|
{
|
|
|
|
|
org = head.origin + (head.mins + head.maxs)*0.5;
|
|
|
|
|
points = 0.5*vlen (inflictor.origin - org);
|
|
|
|
|
if (points < 0)
|
|
|
|
|
points = 0;
|
|
|
|
|
points = damage - points;
|
|
|
|
|
if (head == attacker)
|
|
|
|
|
points = rint(points * 0.75);
|
|
|
|
|
if (head.classname == "building_camera")
|
|
|
|
|
points = 10;
|
|
|
|
|
if (points > 0)
|
|
|
|
|
{
|
|
|
|
|
if (CanDamage (head, inflictor))
|
|
|
|
|
{
|
2001-07-23 20:52:47 +00:00
|
|
|
TF_T_Damage (head, inflictor, attacker, points, TF_TD_NOTTEAM, TF_TD_EXPLOSION);
|
2001-07-17 05:58:10 +00:00
|
|
|
}
|
|
|
|
|
//Turrets have fucked up bounding boxes due to their natures
|
|
|
|
|
//So we have to make them susceptible to blast damage here
|
|
|
|
|
//But only 50% damage, since they are turrets...
|
2001-07-23 20:52:47 +00:00
|
|
|
else if ((head.classname == "building_sentrygun" || head.classname == "building_tesla") && head.tf_items & NIT_TURRET) {
|
2001-07-17 05:58:10 +00:00
|
|
|
points = rint(points / 2);
|
2001-07-23 20:52:47 +00:00
|
|
|
TF_T_Damage (head, inflictor, attacker, points, TF_TD_NOTTEAM, TF_TD_EXPLOSION);
|
2001-07-17 05:58:10 +00:00
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
head = head.chain;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
============
|
|
|
|
|
T_BeamDamage // OfN - UNUSED so.. i coment it out
|
|
|
|
|
============
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/*void(entity attacker, float damage) T_BeamDamage =
|
|
|
|
|
{
|
|
|
|
|
local float points;
|
|
|
|
|
local entity head;
|
|
|
|
|
|
|
|
|
|
head = findradius(attacker.origin, damage+40);
|
|
|
|
|
|
|
|
|
|
while (head)
|
|
|
|
|
{
|
|
|
|
|
if (head.takedamage)
|
|
|
|
|
{
|
|
|
|
|
points = 0.5*vlen (attacker.origin - head.origin);
|
|
|
|
|
if (points < 0)
|
|
|
|
|
points = 0;
|
|
|
|
|
points = damage - points;
|
|
|
|
|
if (head == attacker)
|
|
|
|
|
points = points * 0.5;
|
|
|
|
|
if (points > 0)
|
|
|
|
|
{
|
|
|
|
|
if (CanDamage (head, attacker))
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
//if (head.classname == "monster_shambler")
|
|
|
|
|
// T_Damage (head, attacker, attacker, points*0.5);
|
|
|
|
|
//else
|
|
|
|
|
|
|
|
|
|
T_Damage (head, attacker, attacker, points);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
head = head.chain;
|
|
|
|
|
}
|
|
|
|
|
};*/
|
