X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;fp=qcsrc%2Fserver%2Fg_damage.qc;h=91b03454be1d3d162446274f58d350c57e07d80b;hb=306b95b7d03edfdada049ad3118809137bfe731d;hp=8473062c8bf03604d2ba31031ce020bb13b0af1a;hpb=d04af9953eae59faecae3aca2cc1182dd1adec1f;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 8473062c8..91b03454b 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -240,7 +240,7 @@ void Obituary_SpecialDeath( { if(DEATH_ISSPECIAL(deathtype)) { - entity deathent = deathtypes[(deathtype - DT_FIRST) - 1]; + entity deathent = deathtypes[(deathtype - DT_FIRST)]; if not(deathent) { backtrace("Obituary_SpecialDeath: Could not find deathtype entity!\n"); return; } if(murder) @@ -631,7 +631,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float damage_attacker = attacker; attacker_save = attacker; - if(targ.classname == "player") + if(IS_PLAYER(targ)) if(targ.hook) if(targ.hook.aiment) if(targ.hook.aiment == attacker) @@ -640,7 +640,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float // special rule: gravity bomb does not hit team mates (other than for disconnecting the hook) if(DEATH_ISWEAPON(deathtype, WEP_HOOK) || DEATH_ISWEAPON(deathtype, WEP_TUBA)) { - if(targ.classname == "player") + if(IS_PLAYER(targ)) if not(IsDifferentTeam(targ, attacker)) { self = oldself; @@ -665,20 +665,11 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float } else { - /* - skill based bot damage? gtfo. (tZork) - if (targ.classname == "player") - if (attacker.classname == "player") - if (!targ.isbot) - if (attacker.isbot) - damage = damage * bound(0.1, (skill + 5) * 0.1, 1); - */ - // nullify damage if teamplay is on if(deathtype != DEATH_TELEFRAG) - if(attacker.classname == "player") + if(IS_PLAYER(attacker)) { - if(targ.classname == "player" && targ != attacker && (IS_INDEPENDENT_PLAYER(attacker) || IS_INDEPENDENT_PLAYER(targ))) + if(IS_PLAYER(targ) && targ != attacker && (IS_INDEPENDENT_PLAYER(attacker) || IS_INDEPENDENT_PLAYER(targ))) { damage = 0; force = '0 0 0'; @@ -693,19 +684,14 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float damage = 0; else if(autocvar_teamplay_mode == 4) { - if(targ.classname == "player" && targ.deadflag == DEAD_NO) + if(IS_PLAYER(targ) && targ.deadflag == DEAD_NO) { attacker.dmg_team = attacker.dmg_team + damage; complainteamdamage = attacker.dmg_team - autocvar_g_teamdamage_threshold; if(complainteamdamage > 0 && !g_ca) // FIXME why is g_ca ruled out here? Why not just g_mirrordamage 0 on CA servers? mirrordamage = autocvar_g_mirrordamage * complainteamdamage; mirrorforce = autocvar_g_mirrordamage * vlen(force); - if(g_minstagib) - { - if(autocvar_g_friendlyfire == 0) - damage = 0; - } - else if(g_ca) + if(g_ca) damage = 0; else damage = autocvar_g_friendlyfire * damage; @@ -739,44 +725,6 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float } } - if(targ.classname == "player") - if (g_minstagib) - { - if ((deathtype == DEATH_FALL) || - (deathtype == DEATH_DROWN) || - (deathtype == DEATH_SLIME) || - (deathtype == DEATH_LAVA) || - (!DEATH_ISWEAPON(deathtype, WEP_LASER) && damage > 0 && damage < 100)) - { - self = oldself; - return; - } - if(damage > 0) - damage = 10000; - if (targ.armorvalue && (deathtype == WEP_MINSTANEX) && damage) - { - targ.armorvalue -= 1; - centerprint(targ, strcat("^3Remaining extra lives: ",ftos(targ.armorvalue))); - damage = 0; - targ.hitsound += 1; - attacker.hitsound += 1; // TODO change this to a future specific hitsound for armor hit - } - if (DEATH_ISWEAPON(deathtype, WEP_LASER)) - { - damage = 0; - mirrordamage = 0; - complainteamdamage = 0; - if (targ != attacker) - { - if ((targ.health >= 1) && (targ.classname == "player")) - centerprint(attacker, "Secondary fire inflicts no damage!"); - force = '0 0 0'; - // keep mirrorforce - attacker = targ; - } - } - } - if not(DEATH_ISSPECIAL(deathtype)) { damage *= g_weapondamagefactor; @@ -798,28 +746,33 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float frag_damage = damage; frag_force = force; frag_deathtype = deathtype; + frag_mirrordamage = mirrordamage; MUTATOR_CALLHOOK(PlayerDamage_Calculate); damage = frag_damage; + mirrordamage = frag_mirrordamage; force = frag_force; - // apply strength multiplier - if ((attacker.items & IT_STRENGTH) && !g_minstagib) + if not(g_minstagib) { - if(targ == attacker) + // apply strength multiplier + if (attacker.items & IT_STRENGTH) { - damage = damage * autocvar_g_balance_powerup_strength_selfdamage; - force = force * autocvar_g_balance_powerup_strength_selfforce; - } - else - { - damage = damage * autocvar_g_balance_powerup_strength_damage; - force = force * autocvar_g_balance_powerup_strength_force; + if(targ == attacker) + { + damage = damage * autocvar_g_balance_powerup_strength_selfdamage; + force = force * autocvar_g_balance_powerup_strength_selfforce; + } + else + { + damage = damage * autocvar_g_balance_powerup_strength_damage; + force = force * autocvar_g_balance_powerup_strength_force; + } } - } - // apply invincibility multiplier - if (targ.items & IT_INVINCIBLE && !g_minstagib) - damage = damage * autocvar_g_balance_powerup_invincible_takedamage; + // apply invincibility multiplier + if (targ.items & IT_INVINCIBLE) + damage = damage * autocvar_g_balance_powerup_invincible_takedamage; + } if (targ == attacker) { @@ -841,7 +794,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float else victim = targ; - if(victim.classname == "player" || victim.turrcaps_flags & TFL_TURRCAPS_ISTURRET || victim.flags & FL_MONSTER) + if(IS_PLAYER(victim) || victim.turrcaps_flags & TFL_TURRCAPS_ISTURRET || victim.flags & FL_MONSTER) { if(IsDifferentTeam(victim, attacker)) { @@ -860,14 +813,9 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float if not(DEATH_ISSPECIAL(deathtype)) { - if(targ.classname == "player") // don't do this for vehicles - if(!g_minstagib) + if(IS_PLAYER(targ)) // don't do this for vehicles if(IsFlying(victim)) yoda = 1; - - if(g_minstagib) - if(victim.items & IT_STRENGTH) - yoda = 1; } } } @@ -892,7 +840,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float // apply push if (self.damageforcescale) if (vlen(force)) - if (self.classname != "player" || time >= self.spawnshieldtime || g_midair) + if (!IS_PLAYER(self) || time >= self.spawnshieldtime || g_midair) { vector farce = damage_explosion_calcpush(self.damageforcescale * force, self.velocity, autocvar_g_balance_damagepush_speedfactor); if(self.movetype == MOVETYPE_PHYSICS) @@ -924,18 +872,6 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float if(mirrordamage > 0 || mirrorforce > 0) { attacker = attacker_save; - if(g_minstagib) - if(mirrordamage > 0) - { - // just lose extra LIVES, don't kill the player for mirror damage - if(attacker.armorvalue > 0) - { - attacker.armorvalue = attacker.armorvalue - 1; - centerprint(attacker, strcat("^3Remaining extra lives: ",ftos(attacker.armorvalue))); - attacker.hitsound += 1; - } - mirrordamage = 0; - } force = normalize(attacker.origin + attacker.view_ofs - hitloc) * mirrorforce; Damage(attacker, inflictor, attacker, mirrordamage, DEATH_MIRRORDAMAGE, attacker.origin, force); @@ -1057,7 +993,7 @@ float RadiusDamage (entity inflictor, entity attacker, float coredamage, float e if(autocvar_g_throughfloor_debug) print(sprintf(" steps=%f", total)); - if (targ.classname == "player") + if (IS_PLAYER(targ)) total = ceil(bound(autocvar_g_throughfloor_min_steps_player, total, autocvar_g_throughfloor_max_steps_player)); else total = ceil(bound(autocvar_g_throughfloor_min_steps_other, total, autocvar_g_throughfloor_max_steps_other)); @@ -1193,7 +1129,7 @@ float Fire_AddDamage(entity e, entity o, float d, float t, float dt) float dps; float maxtime, mintime, maxdamage, mindamage, maxdps, mindps, totaldamage, totaltime; - if(e.classname == "player") + if(IS_PLAYER(e)) { if(e.deadflag) return -1; @@ -1317,7 +1253,7 @@ void Fire_ApplyDamage(entity e) return; for(t = 0, o = e.owner; o.owner && t < 16; o = o.owner, ++t); - if(clienttype(o) == CLIENTTYPE_NOTACLIENT) + if(IS_NOT_A_CLIENT(o)) o = e.fire_owner; // water and slime stop fire @@ -1345,7 +1281,7 @@ void Fire_ApplyDamage(entity e) if not(IS_INDEPENDENT_PLAYER(e)) FOR_EACH_PLAYER(other) if(e != other) { - if(other.classname == "player") + if(IS_PLAYER(other)) if(other.deadflag == DEAD_NO) if not(IS_INDEPENDENT_PLAYER(other)) if(boxesoverlap(e.absmin, e.absmax, other.absmin, other.absmax))