nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2025-02-16 17:10:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

SERVER: More accurate explosive damage and crawler triggering

Browse source
This commit is contained in:
cypress 2023-09-11 23:21:46 -04:00
parent bf4afd4ae3
commit e7a704e03d
3 changed files with 61 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
source/server/damage.qc
View file

@ -446,26 +446,29 @@ void(entity victim,entity attacker, float damage, float d_style) DamageHandler =
victim.health = victim.health - damage;
if (d_style == S_EXPLOSIVE) {
if (victim.health < z_health*0.5)
{
if (victim.crawling != TRUE && !(victim.health <= 0) && crawler_num < 5 && victim.classname != "ai_dog")
{
makeCrawler(victim);
GiveAchievement(3, attacker);
}
else
{
if (attacker.classname == "player" && (victim.health - damage) > 0)
addmoney(attacker, 10, 1);
}
if (d_style == S_EXPLOSIVE && damage != 0) {
if (victim.health > 0 && victim.crawling == 2) {
makeCrawler(victim);
GiveAchievement(3, attacker);
}
// MOTO - explosives seem to work fine without, but with will cause counter and QC errors..
//else
// victim.th_die();
// if (victim.health < z_health*0.5)
// {
// if (victim.crawling != TRUE && !(victim.health <= 0) && crawler_num < 5 && victim.classname != "ai_dog")
// {
// makeCrawler(victim);
// GiveAchievement(3, attacker);
// }
// else
// {
// if (attacker.classname == "player" && (victim.health - damage) > 0)
// addmoney(attacker, 10, 1);
// }
// }
if (victim.health <= 0)
addmoney(attacker, 60, 1);
else
addmoney(attacker, 10, 1);
}
if (victim.health <= 0 || instakill_finished) {
@ -684,29 +687,50 @@ void(entity inflictor, entity attacker, float damage2, float mindamage, float ra
}
}
r = rounds;
multi = 1.07;
while(r > 0)
{
multi *= 1.05;
r --;
// cypress -- accurate explosive damage
// cod likes to override the damage to ai with
// explosives (yay!).
if (inflictor.classname == "grenade") {
// grenades follow the logic of (rounds + (rand 150-500))
// rounds is basically meaningless though.. wtf?
final_damage = rounds + rint(random() * 350) + 150;
} else if (inflictor.classname == "projectile_grenade") {
// projectile-based grenades (mustang & sally) seem to do
// more damage than standard grenades.
// (rounds + (rand 1200-5000))
final_damage = rounds + rint(random() * 3800) + 1200;
} else if (inflictor.classname == "rocket") {
// rockets were kinda tricky to figure out, this is as close
// as i can get and i'm not super confident..
// (rounds * (rand 0-100) * weapon_damage/500).
final_damage = (rounds * rint(random() * 100)) * damage2/500;
} else {
r = rounds;
multi = 1.07;
while(r > 0)
{
multi *= 1.05;
r --;
}
if (mindamage == 75)
{
final_damage = (200 * multi) + 185;
}
else
{
final_damage = (mindamage + damage2)/2;
}
}
// to decide if this should make a crawler, check if we've done 10% or more damage
if (final_damage / ent.health > 0.10 && ent.crawling != true && ent.classname != "ai_dog") {
ent.crawling = 2;
}
if (mindamage == 75)
{
final_damage = (200 * multi) + 185;
}
else
{
final_damage = (mindamage + damage2)/2;
}
if (final_damage > 0)
{
/* ndaekill = true; */
if (final_damage > 0) {
if (CanDamage (ent, inflictor))
DamageHandler (ent, attacker, final_damage, S_EXPLOSIVE);
/* kill = false; */
}
}
ent = ent.chain;

2
source/server/weapons/grenade_launcher.qc
View file

@ -39,7 +39,7 @@ void(float side) W_FireGrenade =
nade.owner = self;
nade.movetype = MOVETYPE_BOUNCE;
nade.solid = SOLID_BBOX;
nade.classname = "explosiveNade";
nade.classname = "projectile_grenade";
makevectors (self.v_angle);

1
source/server/weapons/rocket_launcher.qc
View file

@ -96,6 +96,7 @@ void() W_FireRocket =
rocket.movetype = MOVETYPE_FLY;
rocket.weapon = self.weapon;
rocket.classname = "rocket";
rocket.solid = SOLID_BBOX;
// Start initial velocity projection.