fn/valve
fn/valve
3
0
Fork 0
Code Issues 12 Pull requests Projects Releases Packages Wiki Activity

Use Base its damage.qc instead of FreeHL its. Go over the BloodFX to limit

Browse source 
the amount of decals one blood drop spawns. Make it so that Snarks can be
shot.
This commit is contained in:
Marco Cawthorne 2021-05-10 11:35:48 +02:00
parent f43ad5d661
commit dc378c688b
5 changed files with 17 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

162
src/server/damage.qc
View file

@ -1,162 +0,0 @@
/*
* Copyright (c) 2016-2020 Marco Hladik <marco@icculus.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* generic function that applies damage, pain and suffering */
void
Damage_Apply(entity t, entity c, float dmg, int w, damageType_t type)
{
base_player tp = (base_player)t;
CGameRules rules = (CGameRules)g_grMode;
/* player god mode */
if (t.flags & FL_CLIENT && t.flags & FL_GODMODE)
return;
/* already dead, please avoid recursion */
if (t.health <= 0)
return;
/* skip armor */
if not (type & DMG_SKIP_ARMOR)
if (tp.armor && dmg > 0) {
float flArmor;
float flNewDamage;
flNewDamage = dmg * 0.2;
flArmor = (dmg - flNewDamage) * 0.5;
if (flArmor > tp.armor) {
flArmor = tp.armor;
flArmor *= (1/0.5);
flNewDamage = dmg - flArmor;
tp.armor = 0;
} else {
tp.armor -= flArmor;
}
dmg = flNewDamage;
}
dmg = rint(dmg);
t.health -= dmg;
/* the globals... */
g_dmg_eAttacker = c;
g_dmg_eTarget = t;
g_dmg_iDamage = dmg;
g_dmg_iHitBody = trace_surface_id;
g_dmg_iFlags = type;
g_dmg_iWeapon = w;
if (dmg > 0) {
t.dmg_take = dmg;
t.dmg_inflictor = c;
} else if (t.max_health && t.health > t.max_health) {
t.health = t.max_health;
}
/* set this global in case we need it later */
g_eAttacker = c;
CBaseEntity s = (CBaseEntity)t;
if (s.health <= 0) {
if (s.flags & FL_CLIENT) {
rules.PlayerDeath((player)s);
} else {
s.Death();
}
} else {
if (s.flags & FL_CLIENT) {
rules.PlayerPain((player)s);
} else {
s.Pain();
}
}
}
/* physical check of whether or not we can trace important parts of an ent */
float
Damage_CheckTrace(entity t, vector vecHitPos)
{
/* We're lazy. Who cares */
if (t.solid == SOLID_BSP) {
return (1);
}
traceline(vecHitPos, t.origin, 1, self);
if (trace_fraction == 1) {
return (1);
}
traceline(vecHitPos, t.origin + [15,15,0], 1, self);
if (trace_fraction == 1) {
return (1);
}
traceline(vecHitPos, t.origin + [-15,-15,0], 1, self);
if (trace_fraction == 1) {
return (1);
}
traceline(vecHitPos, t.origin + [-15,15,0], 1, self);
if (trace_fraction == 1) {
return (1);
}
traceline(vecHitPos, t.origin + [15,-15,0], 1, self);
if (trace_fraction == 1) {
return (1);
}
return (0);
}
/* even more pain and suffering, mostly used for explosives */
void
Damage_Radius(vector org, entity attacker, float dmg, float r, int check, int w)
{
float new_dmg;
float dist;
float diff;
vector pos;
for (entity e = world; (e = findfloat(e, ::takedamage, DAMAGE_YES));) {
pos[0] = e.absmin[0] + (0.5 * (e.absmax[0] - e.absmin[0]));
pos[1] = e.absmin[1] + (0.5 * (e.absmax[1] - e.absmin[1]));
pos[2] = e.absmin[2] + (0.5 * (e.absmax[2] - e.absmin[2]));
/* don't bother if it's not anywhere near us */
dist = vlen(org - pos);
if (dist > r)
continue;
/* can we physically hit this thing? */
if (check == TRUE)
if (Damage_CheckTrace(e, org) == FALSE)
continue;
/* calculate new damage values */
diff = (r - dist) / r;
new_dmg = rint(dmg * diff);
if (diff > 0) {
Damage_Apply(e, attacker, new_dmg, w, DMG_EXPLODE);
/* approximate, feel free to tweak */
if (e.movetype == MOVETYPE_WALK) {
makevectors(vectoangles(e.origin - org));
e.velocity += v_forward * (new_dmg * 5);
}
}
}
}

2
src/server/progs.src
View file

@ -77,7 +77,7 @@ gamerules_singleplayer.qc
gamerules_multiplayer.qc
client.qc
server.qc
damage.qc
../../../base/src/server/damage.qc
rules.qc
flashlight.qc
../../../base/src/server/modelevent.qc

1
src/shared/fx_blood.qc
View file

@ -51,6 +51,7 @@ FX_Blood(vector pos, vector color)
decal_pickwall(self, self.origin);
pointparticles(DECAL_BLOOD, g_tracedDecal.endpos, g_tracedDecal.normal, 1);
}
remove(self);
}
if (cvar("violence_hblood") <= 0) {

15
src/shared/w_snark.qc
View file

@ -42,6 +42,7 @@ class monster_snark:CBaseMonster
void(void) monster_snark;
virtual void(void) customphysics;
virtual void(void) Pain;
virtual void(void) Death;
virtual void(void) Respawn;
};
@ -99,6 +100,16 @@ monster_snark::customphysics(void)
runstandardplayerphysics(this);
}
void
monster_snark::Pain(void)
{
/* anything else will kill us immediately */
if (g_dmg_eAttacker != world) {
health = 0;
Death();
}
}
void
monster_snark::Death(void)
{
@ -117,14 +128,16 @@ monster_snark::Respawn(void)
netname = "Snark";
SetModel("models/w_squeak.mdl");
flags |= FL_MONSTER;
SetSolid(SOLID_BBOX);
SetSolid(SOLID_CORPSE);
SetMovetype(MOVETYPE_WALK);
SetSize([-8,-8,0], [8,8,16]);
SetFrame(3); /* running like crazy. */
angles = goalentity.angles;
health = 20;
takedamage = DAMAGE_YES;
m_eTarget = __NULL__;
m_flJump = 1.0f;
owner = __NULL__;
}
void

2
src/shared/w_tripmine.qc
View file

@ -74,7 +74,7 @@ monster_tripmine::Trip(int walkthrough)
{
float dmg;
if (!walkthrough) {
real_owner = g_eAttacker;
real_owner = g_dmg_eAttacker;
}
/* This is to prevent infinite loops in Damage_Radius */