X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=5cae69239ddfb084153e706e5867a8f91d460565;hb=13719cec41a5a1b20d0fff3fe1b6df449bc2a884;hp=1f10217a16a5836bd885cd9cbd368787e10c5e08;hpb=adb2d69f779ab14c316ca8337894c29adcbeb272;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 1f10217a1..5cae69239 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -4,15 +4,13 @@ #include "g_hook.qh" #include "mutators/mutators_include.qh" #include "scores.qh" -#include "waypointsprites.qh" #include "spawnpoints.qh" -#include "tturrets/include/turrets_early.qh" #include "t_items.qh" -#include "../common/vehicles/sv_vehicles.qh" +#include "../common/vehicles/all.qh" #include "weapons/accuracy.qh" #include "weapons/csqcprojectile.qh" #include "weapons/selection.qh" -#include "../common/buffs.qh" +#include "../common/buffs/all.qh" #include "../common/constants.qh" #include "../common/deathtypes.qh" #include "../common/notifications.qh" @@ -24,7 +22,7 @@ #include "../csqcmodellib/sv_model.qh" #include "../warpzonelib/common.qh" -float Damage_DamageInfo_SendEntity(entity to, int sf) +bool Damage_DamageInfo_SendEntity(entity this, entity to, int sf) { WriteByte(MSG_ENTITY, ENT_CLIENT_DAMAGEINFO); WriteShort(MSG_ENTITY, self.projectiledeathtype); @@ -69,7 +67,7 @@ void UpdateFrags(entity player, float f) } void GiveFrags (entity attacker, entity targ, float f, int deathtype) -{ +{SELFPARAM(); // TODO route through PlayerScores instead if(gameover) return; @@ -144,17 +142,9 @@ void GiveFrags (entity attacker, entity targ, float f, int deathtype) } // FIXME fix the mess this is (we have REAL points now!) - entity oldself; - oldself = self; - self = attacker; - if(MUTATOR_CALLHOOK(GiveFragsForKill, attacker, targ, f)) + if(MUTATOR_CALLHOOK(GiveFragsForKill, self, attacker, targ, f)) { f = frag_score; - self = oldself; - } - else - { - self = oldself; } attacker.totalfrags += f; @@ -275,7 +265,8 @@ float Obituary_WeaponDeath( if(death_weapon) { w_deathtype = deathtype; - int death_message = WEP_ACTION(death_weapon, ((murder) ? WR_KILLMESSAGE : WR_SUICIDEMESSAGE)); + Weapon w = get_weaponinfo(death_weapon); + int death_message = ((murder) ? w.wr_killmessage : w.wr_suicidemessage)(w); w_deathtype = false; if (death_message) @@ -299,7 +290,7 @@ float Obituary_WeaponDeath( } else { - dprintf( + LOG_TRACEF( "Obituary_WeaponDeath(): ^1Deathtype ^7(%d)^1 has no notification for weapon %d!\n", deathtype, death_weapon @@ -500,13 +491,17 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) // For now, we're just forcing HURTTRIGGER to behave as "DEATH_VOID" and giving it no special options... // Later on you will only be able to make custom messages using DEATH_CUSTOM, // and there will be a REAL DEATH_VOID implementation which mappers will use. - /*case DEATH_HURTTRIGGER: + case DEATH_HURTTRIGGER: { - s1 = targ.netname; - s2 = inflictor.message; - if(strstrofs(s2, "%", 0) < 0) { s2 = strcat("%s ", s2); } + Obituary_SpecialDeath(targ, false, deathtype, + targ.netname, + inflictor.message, + deathlocation, + targ.killcount, + 0, + 0); break; - }*/ + } case DEATH_CUSTOM: { @@ -542,7 +537,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) } void Ice_Think() -{ +{SELFPARAM(); if(!self.owner.frozen || self.owner.iceblock != self) { remove(self); @@ -553,7 +548,7 @@ void Ice_Think() } void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypoint) -{ +{SELFPARAM(); if(!IS_PLAYER(targ) && !IS_MONSTER(targ)) // only specified entities can be freezed return; @@ -566,6 +561,7 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo targ.revive_progress = ((frozen_type == 3) ? 1 : 0); targ.health = ((frozen_type == 3) ? targ_maxhealth : 1); targ.revive_speed = freeze_time; + self.bot_attack = false; entity ice, head; ice = spawn(); @@ -575,18 +571,14 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo ice.think = Ice_Think; ice.nextthink = time; ice.frame = floor(random() * 21); // ice model has 20 different looking frames - setmodel(ice, "models/ice/ice.md3"); + setmodel(ice, MDL_ICE); ice.alpha = 1; ice.colormod = Team_ColorRGB(targ.team); ice.glowmod = ice.colormod; targ.iceblock = ice; targ.revival_time = 0; - entity oldself; - oldself = self; - self = ice; - Ice_Think(); - self = oldself; + WITH(entity, self, ice, Ice_Think()); RemoveGrapplingHook(targ); @@ -596,11 +588,14 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo // 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'); + WaypointSprite_Spawn(WP_Frozen, 0, 0, targ, '0 0 64', world, targ.team, targ, waypointsprite_attached, true, RADARICON_WAYPOINT); } void Unfreeze (entity targ) { + if(!targ.frozen) + return; + if(targ.frozen && targ.frozen != 3) // only reset health if target was frozen targ.health = ((IS_PLAYER(targ)) ? start_health : targ.max_health); @@ -608,6 +603,7 @@ void Unfreeze (entity targ) targ.frozen = 0; targ.revive_progress = 0; targ.revival_time = time; + self.bot_attack = true; WaypointSprite_Kill(targ.waypointsprite_attached); @@ -622,7 +618,7 @@ void Unfreeze (entity targ) } void Damage (entity targ, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force) -{ +{SELFPARAM(); float mirrordamage; float mirrorforce; float complainteamdamage = 0; @@ -633,9 +629,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d if (gameover || targ.killcount == -666) return; - entity oldself; - oldself = self; - self = targ; + setself(targ); damage_targ = targ; damage_inflictor = inflictor; damage_attacker = attacker; @@ -653,7 +647,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d if(IS_PLAYER(targ)) if(SAME_TEAM(targ, attacker)) { - self = oldself; + setself(this); return; } } @@ -746,7 +740,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d } // should this be changed at all? If so, in what way? - MUTATOR_CALLHOOK(PlayerDamage_Calculate, attacker, targ, deathtype, damage, mirrordamage, force); + MUTATOR_CALLHOOK(PlayerDamage_Calculate, inflictor, attacker, targ, deathtype, damage, mirrordamage, force); damage = frag_damage; mirrordamage = frag_mirrordamage; force = frag_force; @@ -760,7 +754,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d { Unfreeze(targ); targ.health = autocvar_g_freezetag_revive_falldamage_health; - Send_Effect("iceorglass", targ.origin, '0 0 0', 3); + Send_Effect(EFFECT_ICEORGLASS, targ.origin, '0 0 0', 3); Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_FREEZETAG_REVIVED_FALL, targ.netname); Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_FREEZETAG_REVIVE_SELF); } @@ -771,10 +765,9 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d if(targ.frozen && deathtype == DEATH_HURTTRIGGER && !autocvar_g_freezetag_frozen_damage_trigger) { - Send_Effect("teleport", targ.origin, '0 0 0', 1); + Send_Effect(EFFECT_TELEPORT, targ.origin, '0 0 0', 1); - entity oldself = self; - self = targ; + setself(targ); entity spot = SelectSpawnPoint (false); if(spot) @@ -801,10 +794,10 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d self.oldorigin = self.origin; self.prevorigin = self.origin; - Send_Effect("teleport", self.origin, '0 0 0', 1); + Send_Effect(EFFECT_TELEPORT, self.origin, '0 0 0', 1); } - self = oldself; + setself(this); } if(!g_instagib) @@ -845,7 +838,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d else victim = targ; - if(IS_PLAYER(victim) || IS_TURRET(victim) || IS_MONSTER(victim) || MUTATOR_CALLHOOK(PlayHitsound, victim)) + if(IS_PLAYER(victim) || (IS_TURRET(victim) && victim.active == ACTIVE_ACTIVE) || IS_MONSTER(victim) || MUTATOR_CALLHOOK(PlayHitsound, victim)) { if(DIFF_TEAM(victim, attacker) && !victim.frozen) { @@ -921,7 +914,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d if (damage != 0 || (self.damageforcescale && vlen(force))) if (self.event_damage) self.event_damage (inflictor, attacker, damage, deathtype, hitloc, force); - self = oldself; + setself(this); // apply mirror damage if any if(mirrordamage > 0 || mirrorforce > 0) @@ -1042,13 +1035,13 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in mininv_f = (vlen(force) * (1-tfloorforce)) / autocvar_g_throughfloor_force_max_stddev; if(autocvar_g_throughfloor_debug) - printf("THROUGHFLOOR: D=%f F=%f max(dD)=1/%f max(dF)=1/%f", finaldmg, vlen(force), mininv_d, mininv_f); + LOG_INFOF("THROUGHFLOOR: D=%f F=%f max(dD)=1/%f max(dF)=1/%f", finaldmg, vlen(force), mininv_d, mininv_f); total = 0.25 * pow(max(mininv_f, mininv_d), 2); if(autocvar_g_throughfloor_debug) - printf(" steps=%f", total); + LOG_INFOF(" steps=%f", total); if (IS_PLAYER(targ)) @@ -1057,7 +1050,7 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in total = ceil(bound(autocvar_g_throughfloor_min_steps_other, total, autocvar_g_throughfloor_max_steps_other)); if(autocvar_g_throughfloor_debug) - printf(" steps=%f dD=%f dF=%f", total, finaldmg * (1-tfloordmg) / (2 * sqrt(total)), vlen(force) * (1-tfloorforce) / (2 * sqrt(total))); + LOG_INFOF(" steps=%f dD=%f dF=%f", total, finaldmg * (1-tfloordmg) / (2 * sqrt(total)), vlen(force) * (1-tfloorforce) / (2 * sqrt(total))); for(c = 0; c < total; ++c) { @@ -1084,7 +1077,7 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in force = force * a; if(autocvar_g_throughfloor_debug) - printf(" D=%f F=%f\n", finaldmg, vlen(force)); + LOG_INFOF(" D=%f F=%f\n", finaldmg, vlen(force)); } //if (targ == attacker) @@ -1311,7 +1304,7 @@ void Fire_ApplyEffect(entity e) } void fireburner_think() -{ +{SELFPARAM(); // for players, this is done in the regular loop if(wasfreed(self.owner)) {