X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Fg_damage.qc;h=a604a2bade1ef61b8ac45bb1eeac7d068ed3b406;hb=9f3c9851a330279ee0ea7943970c3af484447bf2;hp=675b794ecdb902b73e018f3ccaad6356e4feeb42;hpb=3b67eac43c0d85efc59129587aa71d565c9e9aea;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 675b794ec..a604a2bad 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -1,15 +1,15 @@ #include "g_damage.qh" -#include "bot/bot.qh" +#include "bot/api.qh" #include "g_hook.qh" -#include "mutators/all.qh" +#include "mutators/_mod.qh" #include "scores.qh" #include "spawnpoints.qh" #include "../common/state.qh" #include "../common/physics/player.qh" #include "../common/t_items.qh" #include "../common/vehicles/all.qh" -#include "../common/items/all.qc" +#include "../common/items/_mod.qh" #include "../common/mutators/mutator/waypoints/waypointsprites.qh" #include "weapons/accuracy.qh" #include "weapons/csqcprojectile.qh" @@ -21,17 +21,17 @@ #include "../common/playerstats.qh" #include "../common/teams.qh" #include "../common/util.qh" -#include "../common/weapons/all.qh" +#include #include "../lib/csqcmodel/sv_model.qh" #include "../lib/warpzone/common.qh" -void UpdateFrags(entity player, float f) +void UpdateFrags(entity player, int f) { PlayerTeamScore_AddScore(player, f); } void GiveFrags (entity attacker, entity targ, float f, int deathtype) -{SELFPARAM(); +{ // TODO route through PlayerScores instead if(gameover) return; @@ -102,10 +102,8 @@ void GiveFrags (entity attacker, entity targ, float f, int deathtype) } // FIXME fix the mess this is (we have REAL points now!) - if(MUTATOR_CALLHOOK(GiveFragsForKill, self, attacker, targ, f)) - { - f = frag_score; - } + if(MUTATOR_CALLHOOK(GiveFragsForKill, attacker, targ, f)) + f = M_ARGV(2, float); attacker.totalfrags += f; @@ -113,6 +111,8 @@ void GiveFrags (entity attacker, entity targ, float f, int deathtype) UpdateFrags(attacker, f); } +.entity kh_next; + string AppendItemcodes(string s, entity player) { int w = PS(player).m_weapon.m_id; @@ -125,7 +125,7 @@ string AppendItemcodes(string s, entity player) s = strcat(s, "S"); if(time < player.invincible_finished) s = strcat(s, "I"); - if(player.flagcarried != world) + if(player.flagcarried != NULL) s = strcat(s, "F"); if(PHYS_INPUT_BUTTON_CHAT(player)) s = strcat(s, "T"); @@ -264,6 +264,18 @@ float Obituary_WeaponDeath( return false; } +bool frag_centermessage_override(entity attacker, entity targ, int deathtype, int kill_count_to_attacker, int kill_count_to_target) +{ + if(deathtype == DEATH_FIRE.m_id) + { + Send_Notification(NOTIF_ONE, attacker, MSG_CHOICE, CHOICE_FRAG_FIRE, targ.netname, kill_count_to_attacker, (IS_BOT_CLIENT(targ) ? -1 : targ.ping)); + Send_Notification(NOTIF_ONE, targ, MSG_CHOICE, CHOICE_FRAGGED_FIRE, attacker.netname, kill_count_to_target, attacker.health, attacker.armorvalue, (IS_BOT_CLIENT(attacker) ? -1 : attacker.ping)); + return true; + } + + return MUTATOR_CALLHOOK(FragCenterMessage, attacker, targ, deathtype, kill_count_to_attacker, kill_count_to_target); +} + .int buffs = _STAT(BUFFS); // TODO: remove entity buff_FirstFromFlags(int _buffs); void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) @@ -277,7 +289,6 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) // Set final information for the death targ.death_origin = targ.origin; - if(targ != attacker) { targ.killer_origin = attacker.origin; } string deathlocation = (autocvar_notification_server_allows_location ? NearestLocation(targ.death_origin) : ""); #ifdef NOTIFICATIONS_DEBUG @@ -346,7 +357,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) Send_Notification(NOTIF_ONE, attacker, MSG_CENTER, CENTER_DEATH_TEAMKILL_FRAG, targ.netname); Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_DEATH_TEAMKILL_FRAGGED, attacker.netname); - Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM(targ.team, INFO_DEATH_TEAMKILL), targ.netname, attacker.netname, deathlocation, targ.killcount); + Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(targ.team, INFO_DEATH_TEAMKILL), targ.netname, attacker.netname, deathlocation, targ.killcount); // In this case, the death message will ALWAYS be "foo was betrayed by bar" // No need for specific death/weapon messages... @@ -413,7 +424,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) (IS_BOT_CLIENT(attacker) ? -1 : attacker.ping) ); } - else + else if(!frag_centermessage_override(attacker, targ, deathtype, kill_count_to_attacker, kill_count_to_target)) { Send_Notification( NOTIF_ONE, @@ -501,19 +512,19 @@ void Obituary(entity attacker, entity inflictor, entity targ, int deathtype) if(targ.killcount) { targ.killcount = 0; } } -void Ice_Think() -{SELFPARAM(); - if(!STAT(FROZEN, self.owner) || self.owner.iceblock != self) +void Ice_Think(entity this) +{ + if(!STAT(FROZEN, this.owner) || this.owner.iceblock != this) { - remove(self); + delete(this); return; } - setorigin(self, self.owner.origin - '0 0 16'); - self.nextthink = time; + setorigin(this, this.owner.origin - '0 0 16'); + this.nextthink = time; } 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; @@ -526,12 +537,14 @@ 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; + if(targ.bot_attack) + IL_REMOVE(g_bot_targets, targ); + targ.bot_attack = false; entity ice = new(ice); ice.owner = targ; ice.scale = targ.scale; - ice.think = Ice_Think; + setthink(ice, Ice_Think); ice.nextthink = time; ice.frame = floor(random() * 21); // ice model has 20 different looking frames setmodel(ice, MDL_ICE); @@ -541,7 +554,7 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo targ.iceblock = ice; targ.revival_time = 0; - WITHSELF(ice, Ice_Think()); + Ice_Think(ice); RemoveGrapplingHook(targ); @@ -549,22 +562,26 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo // add waypoint if(show_waypoint) - WaypointSprite_Spawn(WP_Frozen, 0, 0, targ, '0 0 64', world, targ.team, targ, waypointsprite_attached, true, RADARICON_WAYPOINT); + WaypointSprite_Spawn(WP_Frozen, 0, 0, targ, '0 0 64', NULL, targ.team, targ, waypointsprite_attached, true, RADARICON_WAYPOINT); } void Unfreeze (entity targ) { - SELFPARAM(); if(!STAT(FROZEN, targ)) return; if(STAT(FROZEN, targ) && STAT(FROZEN, targ) != 3) // only reset health if target was frozen + { targ.health = ((IS_PLAYER(targ)) ? start_health : targ.max_health); + targ.pauseregen_finished = time + autocvar_g_balance_pause_health_regen; + } STAT(FROZEN, targ) = 0; targ.revive_progress = 0; targ.revival_time = time; - self.bot_attack = true; + if(!targ.bot_attack) + IL_PUSH(g_bot_targets, targ); + targ.bot_attack = true; WaypointSprite_Kill(targ.waypointsprite_attached); @@ -572,12 +589,12 @@ void Unfreeze (entity targ) // remove the ice block if(targ.iceblock) - remove(targ.iceblock); - targ.iceblock = world; + delete(targ.iceblock); + targ.iceblock = NULL; } void Damage (entity targ, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force) -{SELFPARAM(); +{ float mirrordamage; float mirrorforce; float complainteamdamage = 0; @@ -588,11 +605,10 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d if (gameover || targ.killcount == FRAGS_SPECTATOR) return; - setself(targ); - damage_targ = targ; - damage_inflictor = inflictor; - damage_attacker = attacker; - attacker_save = attacker; + damage_targ = targ; + damage_inflictor = inflictor; + damage_attacker = attacker; + attacker_save = attacker; if(IS_PLAYER(targ)) if(targ.hook) @@ -603,19 +619,17 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d // 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(IS_PLAYER(targ)) - if(SAME_TEAM(targ, attacker)) - { - setself(this); - return; - } + if(IS_PLAYER(targ) && SAME_TEAM(targ, attacker)) + { + return; + } } if(deathtype == DEATH_KILL.m_id || deathtype == DEATH_TEAMCHANGE.m_id || deathtype == DEATH_AUTOTEAMCHANGE.m_id) { // exit the vehicle before killing (fixes a crash) if(IS_PLAYER(targ) && targ.vehicle) - vehicles_exit(VHEF_RELEASE); + vehicles_exit(targ.vehicle, VHEF_RELEASE); // These are ALWAYS lethal // No damage modification here @@ -700,9 +714,9 @@ 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, inflictor, attacker, targ, deathtype, damage, mirrordamage, force); - damage = frag_damage; - mirrordamage = frag_mirrordamage; - force = frag_force; + damage = M_ARGV(4, float); + mirrordamage = M_ARGV(5, float); + force = M_ARGV(6, vector); if(STAT(FROZEN, targ)) if(deathtype != DEATH_HURTTRIGGER.m_id && deathtype != DEATH_TEAMCHANGE.m_id && deathtype != DEATH_AUTOTEAMCHANGE.m_id) @@ -714,7 +728,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d Unfreeze(targ); targ.health = autocvar_g_frozen_revive_falldamage_health; 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_ALL, NULL, MSG_INFO, INFO_FREEZETAG_REVIVED_FALL, targ.netname); Send_Notification(NOTIF_ONE, targ, MSG_CENTER, CENTER_FREEZETAG_REVIVE_SELF); } @@ -726,37 +740,34 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d { Send_Effect(EFFECT_TELEPORT, targ.origin, '0 0 0', 1); - setself(targ); - entity spot = SelectSpawnPoint (false); + entity spot = SelectSpawnPoint (targ, false); if(spot) { damage = 0; - self.deadflag = DEAD_NO; + targ.deadflag = DEAD_NO; - self.angles = spot.angles; + targ.angles = spot.angles; - self.effects = 0; - self.effects |= EF_TELEPORT_BIT; + targ.effects = 0; + targ.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.velocity = '0 0 0'; - self.avelocity = '0 0 0'; - self.punchangle = '0 0 0'; - self.punchvector = '0 0 0'; - self.oldvelocity = self.velocity; + targ.angles_z = 0; // never spawn tilted even if the spot says to + targ.fixangle = true; // turn this way immediately + targ.velocity = '0 0 0'; + targ.avelocity = '0 0 0'; + targ.punchangle = '0 0 0'; + targ.punchvector = '0 0 0'; + targ.oldvelocity = targ.velocity; - self.spawnorigin = spot.origin; - setorigin (self, spot.origin + '0 0 1' * (1 - self.mins.z - 24)); + targ.spawnorigin = spot.origin; + setorigin(targ, spot.origin + '0 0 1' * (1 - targ.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; + targ.oldorigin = targ.origin; + targ.prevorigin = targ.origin; - Send_Effect(EFFECT_TELEPORT, self.origin, '0 0 0', 1); + Send_Effect(EFFECT_TELEPORT, targ.origin, '0 0 0', 1); } - - setself(this); } if(!g_instagib) @@ -797,7 +808,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d else victim = targ; - if(IS_PLAYER(victim) || (IS_TURRET(victim) && victim.active == ACTIVE_ACTIVE) || 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, attacker)) { if(DIFF_TEAM(victim, attacker) && !STAT(FROZEN, victim)) { @@ -841,37 +852,34 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d } // apply push - if (self.damageforcescale) - if (vlen(force)) - if (!IS_PLAYER(self) || time >= self.spawnshieldtime || self == attacker) + if (targ.damageforcescale) + if (force) + if (!IS_PLAYER(targ) || time >= targ.spawnshieldtime || targ == attacker) { - vector farce = damage_explosion_calcpush(self.damageforcescale * force, self.velocity, autocvar_g_balance_damagepush_speedfactor); - if(self.movetype == MOVETYPE_PHYSICS) + vector farce = damage_explosion_calcpush(targ.damageforcescale * force, targ.velocity, autocvar_g_balance_damagepush_speedfactor); + if(targ.move_movetype == MOVETYPE_PHYSICS) { entity farcent = new(farce); - farcent.enemy = self; + farcent.enemy = targ; farcent.movedir = farce * 10; - if(self.mass) - farcent.movedir = farcent.movedir * self.mass; + if(targ.mass) + farcent.movedir = farcent.movedir * targ.mass; farcent.origin = hitloc; farcent.forcetype = FORCETYPE_FORCEATPOS; farcent.nextthink = time + 0.1; - farcent.think = SUB_Remove_self; + setthink(farcent, SUB_Remove); } else { - self.velocity = self.velocity + farce; - self.move_velocity = self.velocity; + targ.velocity = targ.velocity + farce; } - UNSET_ONGROUND(self); - self.move_flags &= ~FL_ONGROUND; - UpdateCSQCProjectile(self); + UNSET_ONGROUND(targ); + UpdateCSQCProjectile(targ); } // apply damage - if (damage != 0 || (self.damageforcescale && vlen(force))) - if (self.event_damage) - self.event_damage (self, inflictor, attacker, damage, deathtype, hitloc, force); - setself(this); + if (damage != 0 || (targ.damageforcescale && force)) + if (targ.event_damage) + targ.event_damage (targ, inflictor, attacker, damage, deathtype, hitloc, force); // apply mirror damage if any if(!autocvar_g_mirrordamage_onlyweapons || DEATH_WEAPONOF(deathtype) != WEP_Null) @@ -913,7 +921,7 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in if(DEATH_WEAPONOF(deathtype) != WEP_TUBA) // do not send tuba damage (bandwidth hog) { force = inflictorvelocity; - if(vlen(force) == 0) + if(force == '0 0 0') force = '0 0 -1'; else force = normalize(force); @@ -1044,7 +1052,7 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in // print(" finaldmg ", ftos(finaldmg), " force ", vtos(force)); // print(" (", ftos(a), ")\n"); //} - if(finaldmg || vlen(force)) + if(finaldmg || force) { if(targ.iscreature) { @@ -1099,7 +1107,7 @@ float Fire_AddDamage(entity e, entity o, float d, float t, float dt) { // print("adding a fire burner to ", e.classname, "\n"); e.fire_burner = new(fireburner); - e.fire_burner.think = fireburner_think; + setthink(e.fire_burner, fireburner_think); e.fire_burner.nextthink = time; e.fire_burner.owner = e; } @@ -1258,21 +1266,21 @@ void Fire_ApplyEffect(entity e) e.effects &= ~EF_FLAME; } -void fireburner_think() -{SELFPARAM(); +void fireburner_think(entity this) +{ // for players, this is done in the regular loop - if(wasfreed(self.owner)) + if(wasfreed(this.owner)) { - remove(self); + delete(this); return; } - Fire_ApplyEffect(self.owner); - if(!Fire_IsBurning(self.owner)) + Fire_ApplyEffect(this.owner); + if(!Fire_IsBurning(this.owner)) { - self.owner.fire_burner = world; - remove(self); + this.owner.fire_burner = NULL; + delete(this); return; } - Fire_ApplyDamage(self.owner); - self.nextthink = time; + Fire_ApplyDamage(this.owner); + this.nextthink = time; }