X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=aab2f9ced5567164b401596cfe34a70d4972491f;hp=93bb5799f157625b55fc2de211a494d4a8ffa7af;hb=82dbcadfd0556053b74638f2e3ae2e57103ddf26;hpb=29885aa67f14a0fd7d7bc66b134eb7a2e5dfcba4 diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 93bb5799f1..aab2f9ced5 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -1,21 +1,46 @@ -.float dmg; -.float dmg_edge; -.float dmg_force; -.float dmg_radius; +#include "g_damage.qh" + +#if defined(CSQC) +#elif defined(MENUQC) +#elif defined(SVQC) + #include "../warpzonelib/common.qh" + #include "../common/constants.qh" + #include "../common/teams.qh" + #include "../common/util.qh" + #include "../common/weapons/weapons.qh" + #include "weapons/accuracy.qh" + #include "weapons/csqcprojectile.qh" + #include "weapons/selection.qh" + #include "t_items.qh" + #include "autocvars.qh" + #include "constants.qh" + #include "defs.qh" + #include "../common/notifications.qh" + #include "../common/deathtypes.qh" + #include "mutators/mutators_include.qh" + #include "../common/turrets/turrets.qh" + #include "../common/turrets/sv_turrets.qh" + #include "vehicles/vehicles_def.qh" + #include "../csqcmodellib/sv_model.qh" + #include "../common/playerstats.qh" + #include "g_hook.qh" + #include "scores.qh" + #include "spawnpoints.qh" +#endif float Damage_DamageInfo_SendEntity(entity to, float sf) { WriteByte(MSG_ENTITY, ENT_CLIENT_DAMAGEINFO); WriteShort(MSG_ENTITY, self.projectiledeathtype); - WriteCoord(MSG_ENTITY, floor(self.origin_x)); - WriteCoord(MSG_ENTITY, floor(self.origin_y)); - WriteCoord(MSG_ENTITY, floor(self.origin_z)); + WriteCoord(MSG_ENTITY, floor(self.origin.x)); + WriteCoord(MSG_ENTITY, floor(self.origin.y)); + WriteCoord(MSG_ENTITY, floor(self.origin.z)); WriteByte(MSG_ENTITY, bound(1, self.dmg, 255)); WriteByte(MSG_ENTITY, bound(0, self.dmg_radius, 255)); WriteByte(MSG_ENTITY, bound(1, self.dmg_edge, 255)); - WriteShort(MSG_ENTITY, self.oldorigin_x); + WriteShort(MSG_ENTITY, self.oldorigin.x); WriteByte(MSG_ENTITY, self.species); - return TRUE; + return true; } void Damage_DamageInfo(vector org, float coredamage, float edgedamage, float rad, vector force, float deathtype, float bloodtype, entity dmgowner) @@ -39,23 +64,9 @@ void Damage_DamageInfo(vector org, float coredamage, float edgedamage, float rad e.oldorigin_x = compressShortVector(e.velocity); e.species = bloodtype; - Net_LinkEntity(e, FALSE, 0.2, Damage_DamageInfo_SendEntity); + Net_LinkEntity(e, false, 0.2, Damage_DamageInfo_SendEntity); } -float checkrules_firstblood; - -float yoda; -float damage_goodhits; -float damage_gooddamage; - -.float dmg_team; -.float teamkill_complain; -.float teamkill_soundtime; -.entity teamkill_soundsource; -.entity pusher; -.float istypefrag; -.float taunt_soundtime; - float IsFlying(entity a) { if(a.flags & FL_ONGROUND) @@ -73,9 +84,6 @@ void UpdateFrags(entity player, float f) PlayerTeamScore_AddScore(player, f); } -// NOTE: f=0 means still count as a (positive) kill, but count no frags for it -void W_SwitchWeapon_Force(entity e, float w); -entity GiveFrags_randomweapons; void GiveFrags (entity attacker, entity targ, float f, float deathtype) { // TODO route through PlayerScores instead @@ -99,7 +107,7 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype) // regular frag PlayerScore_Add(attacker, SP_KILLS, 1); if(targ.playerid) - PlayerStats_Event(attacker, sprintf("kills-%d", targ.playerid), 1); + PS_GR_P_ADDVAL(attacker, sprintf("kills-%d", targ.playerid), 1); } PlayerScore_Add(targ, SP_DEATHS, 1); @@ -115,7 +123,7 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype) else if(!(attacker.weapons & WepSet_FromWeapon(culprit))) culprit = attacker.weapon; - if(g_weaponarena_random_with_laser && culprit == WEP_BLASTER) // WEAPONTODO: Shouldn't this be in a mutator? + if(g_weaponarena_random_with_blaster && culprit == WEP_BLASTER) // WEAPONTODO: Shouldn't this be in a mutator? { // no exchange } @@ -275,7 +283,6 @@ void Obituary_SpecialDeath( else { backtrace("Obituary_SpecialDeath called without a special deathtype?\n"); return; } } -float w_deathtype; float Obituary_WeaponDeath( entity notif_target, float murder, @@ -288,7 +295,7 @@ float Obituary_WeaponDeath( { w_deathtype = deathtype; float death_message = WEP_ACTION(death_weapon, ((murder) ? WR_KILLMESSAGE : WR_SUICIDEMESSAGE)); - w_deathtype = FALSE; + w_deathtype = false; if(death_message) { @@ -318,9 +325,9 @@ float Obituary_WeaponDeath( ); } - return TRUE; + return true; } - return FALSE; + return false; } void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) @@ -329,7 +336,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) if (!IS_PLAYER(targ)) { backtrace("Obituary called on non-player?!\n"); return; } // Declarations - float notif_firstblood = FALSE; + float notif_firstblood = false; float kill_count_to_attacker, kill_count_to_target; // Set final information for the death @@ -359,7 +366,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) { if(deathtype == DEATH_TEAMCHANGE || deathtype == DEATH_AUTOTEAMCHANGE) { - Obituary_SpecialDeath(targ, FALSE, deathtype, targ.netname, deathlocation, "", targ.team, 0, 0); + Obituary_SpecialDeath(targ, false, deathtype, targ.netname, deathlocation, "", targ.team, 0, 0); } else { @@ -367,19 +374,19 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) { case DEATH_MIRRORDAMAGE: { - Obituary_SpecialDeath(targ, FALSE, deathtype, targ.netname, deathlocation, "", targ.killcount, 0, 0); + Obituary_SpecialDeath(targ, false, deathtype, targ.netname, deathlocation, "", targ.killcount, 0, 0); break; } default: { - Obituary_SpecialDeath(targ, FALSE, deathtype, targ.netname, deathlocation, "", targ.killcount, 0, 0); + Obituary_SpecialDeath(targ, false, deathtype, targ.netname, deathlocation, "", targ.killcount, 0, 0); break; } } } } - else if (!Obituary_WeaponDeath(targ, FALSE, deathtype, targ.netname, deathlocation, "", targ.killcount, 0)) + else if (!Obituary_WeaponDeath(targ, false, deathtype, targ.netname, deathlocation, "", targ.killcount, 0)) { backtrace("SUICIDE: what the hell happened here?\n"); return; @@ -419,7 +426,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) case counta: \ { \ Send_Notification(NOTIF_ONE, attacker, MSG_ANNCE, ANNCE_KILLSTREAK_##countb); \ - PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_##counta, 1); \ + PS_GR_P_ADDVAL(attacker, PLAYERSTATS_ACHIEVEMENT_KILL_SPREE_##counta, 1); \ break; \ } switch(attacker.killcount) @@ -431,10 +438,10 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) if(!checkrules_firstblood) { - checkrules_firstblood = TRUE; - notif_firstblood = TRUE; // modify the current messages so that they too show firstblood information - PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_FIRSTBLOOD, 1); - PlayerStats_Event(targ, PLAYERSTATS_ACHIEVEMENT_FIRSTVICTIM, 1); + checkrules_firstblood = true; + notif_firstblood = true; // modify the current messages so that they too show firstblood information + PS_GR_P_ADDVAL(attacker, PLAYERSTATS_ACHIEVEMENT_FIRSTBLOOD, 1); + PS_GR_P_ADDVAL(targ, PLAYERSTATS_ACHIEVEMENT_FIRSTVICTIM, 1); // tell spree_inf and spree_cen that this is a first-blood and first-victim event kill_count_to_attacker = -1; @@ -493,8 +500,8 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) ); } - if (!Obituary_WeaponDeath(targ, TRUE, deathtype, targ.netname, attacker.netname, deathlocation, targ.killcount, kill_count_to_attacker)) - Obituary_SpecialDeath(targ, TRUE, deathtype, targ.netname, attacker.netname, deathlocation, targ.killcount, kill_count_to_attacker, 0); + if (!Obituary_WeaponDeath(targ, true, deathtype, targ.netname, attacker.netname, deathlocation, targ.killcount, kill_count_to_attacker)) + Obituary_SpecialDeath(targ, true, deathtype, targ.netname, attacker.netname, deathlocation, targ.killcount, kill_count_to_attacker, 0); } } @@ -518,7 +525,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) case DEATH_CUSTOM: { - Obituary_SpecialDeath(targ, FALSE, deathtype, + Obituary_SpecialDeath(targ, false, deathtype, targ.netname, ((strstrofs(deathmessage, "%", 0) < 0) ? strcat("%s ", deathmessage) : deathmessage), deathlocation, @@ -530,7 +537,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) default: { - Obituary_SpecialDeath(targ, FALSE, deathtype, targ.netname, deathlocation, "", targ.killcount, 0, 0); + Obituary_SpecialDeath(targ, false, deathtype, targ.netname, deathlocation, "", targ.killcount, 0, 0); break; } } @@ -541,7 +548,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) if(PlayerScore_Add(targ, SP_SCORE, 0) == -5) { Send_Notification(NOTIF_ONE, targ, MSG_ANNCE, ANNCE_ACHIEVEMENT_BOTLIKE); - PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_BOTLIKE, 1); + PS_GR_P_ADDVAL(attacker, PLAYERSTATS_ACHIEVEMENT_BOTLIKE, 1); } } @@ -603,8 +610,8 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo RemoveGrapplingHook(head); // add waypoint - if(show_waypoint) - WaypointSprite_Spawn("frozen", 0, 0, targ, '0 0 64', world, targ.team, targ, waypointsprite_attached, TRUE, RADARICON_WAYPOINT, '0.25 0.90 1'); + if(show_waypoint) + WaypointSprite_Spawn("frozen", 0, 0, targ, '0 0 64', world, targ.team, targ, waypointsprite_attached, true, RADARICON_WAYPOINT, '0.25 0.90 1'); } void Unfreeze (entity targ) @@ -616,9 +623,9 @@ void Unfreeze (entity targ) targ.frozen = 0; targ.revive_progress = 0; targ.revival_time = time; - + WaypointSprite_Kill(targ.waypointsprite_attached); - + FOR_EACH_PLAYER(head) if(head.hook.aiment == targ) RemoveGrapplingHook(head); @@ -629,11 +636,6 @@ void Unfreeze (entity targ) targ.iceblock = world; } -// these are updated by each Damage call for use in button triggering and such -entity damage_targ; -entity damage_inflictor; -entity damage_attacker; - void Damage (entity targ, entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force) { float mirrordamage; @@ -724,18 +726,18 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float if(autocvar_g_mirrordamage_virtual) { vector v = healtharmor_applydamage(attacker.armorvalue, autocvar_g_balance_armor_blockpercent, deathtype, mirrordamage); - attacker.dmg_take += v_x; - attacker.dmg_save += v_y; + attacker.dmg_take += v.x; + attacker.dmg_save += v.y; attacker.dmg_inflictor = inflictor; - mirrordamage = v_z; // = 0, to make fteqcc stfu + mirrordamage = v.z; mirrorforce = 0; } if(autocvar_g_friendlyfire_virtual) { vector v = healtharmor_applydamage(targ.armorvalue, autocvar_g_balance_armor_blockpercent, deathtype, damage); - targ.dmg_take += v_x; - targ.dmg_save += v_y; + targ.dmg_take += v.x; + targ.dmg_save += v.y; targ.dmg_inflictor = inflictor; damage = 0; if(!autocvar_g_friendlyfire_virtual_force) @@ -787,42 +789,42 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float damage = 0; force *= autocvar_g_freezetag_frozen_force; } - + if(targ.frozen && deathtype == DEATH_HURTTRIGGER && !autocvar_g_freezetag_frozen_damage_trigger) { pointparticles(particleeffectnum("teleport"), targ.origin, '0 0 0', 1); - + entity oldself = self; self = targ; - entity spot = SelectSpawnPoint (FALSE); - + entity spot = SelectSpawnPoint (false); + if(spot) { damage = 0; self.deadflag = DEAD_NO; self.angles = spot.angles; - + self.effects = 0; self.effects |= EF_TELEPORT_BIT; self.angles_z = 0; // never spawn tilted even if the spot says to - self.fixangle = TRUE; // turn this way immediately + self.fixangle = true; // turn this way immediately self.velocity = '0 0 0'; self.avelocity = '0 0 0'; self.punchangle = '0 0 0'; self.punchvector = '0 0 0'; self.oldvelocity = self.velocity; - + self.spawnorigin = spot.origin; - setorigin (self, spot.origin + '0 0 1' * (1 - self.mins_z - 24)); + setorigin (self, spot.origin + '0 0 1' * (1 - self.mins.z - 24)); // don't reset back to last position, even if new position is stuck in solid self.oldorigin = self.origin; self.prevorigin = self.origin; - + pointparticles(particleeffectnum("teleport"), self.origin, '0 0 0', 1); } - + self = oldself; } @@ -854,6 +856,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float // count the damage if(attacker) if(!targ.deadflag) + if(deathtype != DEATH_BUFF_VENGEANCE) if(targ.takedamage == DAMAGE_AIM) if(targ != attacker) { @@ -863,9 +866,9 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float else victim = targ; - if(IS_PLAYER(victim) || victim.turrcaps_flags & TFL_TURRCAPS_ISTURRET || victim.flags & FL_MONSTER) + if(IS_PLAYER(victim) || ((victim.turret_flags & TUR_FLAG_ISTURRET) && victim.active == ACTIVE_ACTIVE) || (victim.flags & FL_MONSTER)) { - if(DIFF_TEAM(victim, attacker)) + if(DIFF_TEAM(victim, attacker) && !victim.frozen) { if(damage > 0) { @@ -874,7 +877,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float if(victim.BUTTON_CHAT) attacker.typehitsound += 1; else - attacker.hitsound += 1; + attacker.damage_dealt += damage; } damage_goodhits += 1; @@ -909,7 +912,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float // apply push if (self.damageforcescale) if (vlen(force)) - if (!IS_PLAYER(self) || time >= self.spawnshieldtime) + if (!IS_PLAYER(self) || time >= self.spawnshieldtime || self == attacker) { vector farce = damage_explosion_calcpush(self.damageforcescale * force, self.velocity, autocvar_g_balance_damagepush_speedfactor); if(self.movetype == MOVETYPE_PHYSICS) @@ -947,7 +950,6 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float } } -float RadiusDamage_running; float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector inflictorvelocity, entity attacker, float coredamage, float edgedamage, float rad, entity cantbe, entity mustbe, float inflictorselfdamage, float forceintensity, float deathtype, entity directhitentity) // Returns total damage applies to creatures { @@ -989,7 +991,7 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in stat_damagedone = 0; - targ = WarpZone_FindRadius (inflictororigin, rad + MAX_DAMAGEEXTRARADIUS, FALSE); + targ = WarpZone_FindRadius (inflictororigin, rad + MAX_DAMAGEEXTRARADIUS, false); while (targ) { next = targ.chain; @@ -1086,9 +1088,9 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in else hitloc = nearest; } - nearest_x = targ.origin_x + targ.mins_x + random() * targ.size_x; - nearest_y = targ.origin_y + targ.mins_y + random() * targ.size_y; - nearest_z = targ.origin_z + targ.mins_z + random() * targ.size_z; + nearest.x = targ.origin.x + targ.mins.x + random() * targ.size.x; + nearest.y = targ.origin.y + targ.mins.y + random() * targ.size.y; + nearest.z = targ.origin.z + targ.mins.z + random() * targ.size.z; } nearest = hitloc * (1 / max(1, hits)); @@ -1139,18 +1141,9 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in float RadiusDamage (entity inflictor, entity attacker, float coredamage, float edgedamage, float rad, entity cantbe, entity mustbe, float forceintensity, float deathtype, entity directhitentity) { - return RadiusDamageForSource (inflictor, (inflictor.origin + (inflictor.mins + inflictor.maxs) * 0.5), inflictor.velocity, attacker, coredamage, edgedamage, rad, cantbe, mustbe, FALSE, forceintensity, deathtype, directhitentity); + return RadiusDamageForSource (inflictor, (inflictor.origin + (inflictor.mins + inflictor.maxs) * 0.5), inflictor.velocity, attacker, coredamage, edgedamage, rad, cantbe, mustbe, false, forceintensity, deathtype, directhitentity); } -.float fire_damagepersec; -.float fire_endtime; -.float fire_deathtype; -.entity fire_owner; -.float fire_hitsound; -.entity fire_burner; - -void fireburner_think(); - float Fire_IsBurning(entity e) { return (time < e.fire_endtime); @@ -1253,7 +1246,7 @@ float Fire_AddDamage(entity e, entity o, float d, float t, float dt) if(e.fire_owner != o) { e.fire_owner = o; - e.fire_hitsound = FALSE; + e.fire_hitsound = false; } } if(accuracy_isgooddamage(o, e)) @@ -1269,7 +1262,7 @@ float Fire_AddDamage(entity e, entity o, float d, float t, float dt) e.fire_endtime = time + t; e.fire_deathtype = dt; e.fire_owner = o; - e.fire_hitsound = FALSE; + e.fire_hitsound = false; if(accuracy_isgooddamage(o, e)) accuracy_add(o, DEATH_WEAPONOFWEAPONDEATH(dt), 0, d); return d; @@ -1300,15 +1293,15 @@ void Fire_ApplyDamage(entity e) t = min(frametime, e.fire_endtime - time); d = e.fire_damagepersec * t; - hi = e.fire_owner.hitsound; + hi = e.fire_owner.damage_dealt; ty = e.fire_owner.typehitsound; Damage(e, e, e.fire_owner, d, e.fire_deathtype, e.origin, '0 0 0'); if(e.fire_hitsound && e.fire_owner) { - e.fire_owner.hitsound = hi; + e.fire_owner.damage_dealt = hi; e.fire_owner.typehitsound = ty; } - e.fire_hitsound = TRUE; + e.fire_hitsound = true; if (!IS_INDEPENDENT_PLAYER(e)) if(!e.frozen)