X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=994ee260baefb3384a4522de33f146b2d562bcdb;hb=23239f55697a9b18884b9857313c758dc95f4372;hp=29fc297d5ef8c92e6dbfe822d6fb4aa37f280102;hpb=2d77d65a6756e859bbf8f41f635966c38cb577d6;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 29fc297d5..994ee260b 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -41,8 +41,6 @@ void Damage_DamageInfo(vector org, float coredamage, float edgedamage, float rad Net_LinkEntity(e, FALSE, 0.2, Damage_DamageInfo_SendEntity); } -#define DAMAGE_CENTERPRINT_SPACER NEWLINES - float checkrules_firstblood; float yoda; @@ -61,7 +59,7 @@ float damage_headshotbonus; // bonus multiplier for head shots, set to 0 after u float IsDifferentTeam(entity a, entity b) { - if(teams_matter) + if(teamplay) { if(a.team == b.team) return 0; @@ -126,6 +124,8 @@ 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); } PlayerScore_Add(targ, SP_DEATHS, 1); @@ -267,8 +267,7 @@ void LogDeath(string mode, float deathtype, entity killer, entity killed) void Send_KillNotification (string s1, string s2, string s3, float msg, float type) { WriteByte(MSG_ALL, SVC_TEMPENTITY); - WriteByte(MSG_ALL, TE_CSQC_NOTIFY); - WriteByte(MSG_ALL, CSQC_KILLNOTIFY); + WriteByte(MSG_ALL, TE_CSQC_KILLNOTIFY); WriteString(MSG_ALL, s1); WriteString(MSG_ALL, s2); WriteString(MSG_ALL, s3); @@ -277,15 +276,14 @@ void Send_KillNotification (string s1, string s2, string s3, float msg, float ty } // Function is used to send a generic centerprint whose content CSQC gets to decide (gentle version or not in the below cases) -void Send_CSQC_Centerprint(entity e, string s1, string s2, float msg, float type) +void Send_CSQC_KillCenterprint(entity e, string s1, string s2, float msg, float type) { if (clienttype(e) == CLIENTTYPE_REAL) { msg_entity = e; WRITESPECTATABLE_MSG_ONE({ WriteByte(MSG_ONE, SVC_TEMPENTITY); - WriteByte(MSG_ONE, TE_CSQC_NOTIFY); - WriteByte(MSG_ONE, CSQC_CENTERPRINT); + WriteByte(MSG_ONE, TE_CSQC_KILLCENTERPRINT); WriteString(MSG_ONE, s1); WriteString(MSG_ONE, s2); WriteShort(MSG_ONE, msg); @@ -299,13 +297,9 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype) string s, a, msg; float w, type; - if (targ.classname == "player" || targ.classname == "corpse") + if (targ.classname == "player") { - if (targ.classname == "corpse") - s = "A corpse"; - else - s = targ.netname; - + s = targ.netname; a = attacker.netname; if (targ == attacker) // suicides @@ -313,7 +307,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype) if (deathtype == DEATH_TEAMCHANGE || deathtype == DEATH_AUTOTEAMCHANGE) msg = ColoredTeamName(targ.team); // TODO: check if needed? if(!g_cts) // no "killed your own dumb self" message in CTS - Send_CSQC_Centerprint(targ, msg, "", deathtype, MSG_SUICIDE); + Send_CSQC_KillCenterprint(targ, msg, "", deathtype, MSG_SUICIDE); if(deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_QUIET) { @@ -323,7 +317,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype) if (targ.killcount > 2) msg = ftos(targ.killcount); - if(teams_matter && deathtype == DEATH_MIRRORDAMAGE) + if(teamplay && deathtype == DEATH_MIRRORDAMAGE) { if(attacker.team == COLOR_TEAM1) deathtype = KILL_TEAM_RED; @@ -333,9 +327,9 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype) Send_KillNotification(s, msg, ftos(w), deathtype, MSG_SUICIDE); } - else if (attacker.classname == "player" || attacker.classname == "gib") + else if (attacker.classname == "player") { - if(teams_matter && attacker.team == targ.team) + if(teamplay && attacker.team == targ.team) { if(attacker.team == COLOR_TEAM1) type = KILL_TEAM_RED; @@ -344,7 +338,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype) GiveFrags(attacker, targ, -1, deathtype); - Send_CSQC_Centerprint(attacker, s, "", type, MSG_KILL); + Send_CSQC_KillCenterprint(attacker, s, "", type, MSG_KILL); if (targ.killcount > 2) { msg = ftos(targ.killcount); @@ -367,18 +361,18 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype) checkrules_firstblood = TRUE; Send_KillNotification(a, "", "", KILL_FIRST_BLOOD, MSG_KILL); // TODO: make these print a newline if they dont - Send_CSQC_Centerprint(attacker, "", "", KILL_FIRST_BLOOD, MSG_KILL); - Send_CSQC_Centerprint(targ, "", "", KILL_FIRST_VICTIM, MSG_KILL); + Send_CSQC_KillCenterprint(attacker, "", "", KILL_FIRST_BLOOD, MSG_KILL); + Send_CSQC_KillCenterprint(targ, "", "", KILL_FIRST_VICTIM, MSG_KILL); PlayerStats_Event(attacker, PLAYERSTATS_ACHIEVEMENT_FIRSTBLOOD, 1); PlayerStats_Event(targ, PLAYERSTATS_ACHIEVEMENT_FIRSTVICTIM, 1); } if((autocvar_sv_fragmessage_information_typefrag) && (targ.BUTTON_CHAT)) { - Send_CSQC_Centerprint(attacker, s, GetAdvancedDeathReports(targ), KILL_TYPEFRAG, MSG_KILL); - Send_CSQC_Centerprint(targ, a, GetAdvancedDeathReports(attacker), KILL_TYPEFRAGGED, MSG_KILL); + Send_CSQC_KillCenterprint(attacker, s, GetAdvancedDeathReports(targ), KILL_TYPEFRAG, MSG_KILL); + Send_CSQC_KillCenterprint(targ, a, GetAdvancedDeathReports(attacker), KILL_TYPEFRAGGED, MSG_KILL); } else { - Send_CSQC_Centerprint(attacker, s, GetAdvancedDeathReports(targ), KILL_FRAG, MSG_KILL); - Send_CSQC_Centerprint(targ, a, GetAdvancedDeathReports(attacker), KILL_FRAGGED, MSG_KILL); + Send_CSQC_KillCenterprint(attacker, s, GetAdvancedDeathReports(targ), KILL_FRAG, MSG_KILL); + Send_CSQC_KillCenterprint(targ, a, GetAdvancedDeathReports(attacker), KILL_FRAGGED, MSG_KILL); } attacker.taunt_soundtime = time + 1; @@ -459,7 +453,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype) } else { - Send_CSQC_Centerprint(targ, "", "", deathtype, MSG_KILL_ACTION); + Send_CSQC_KillCenterprint(targ, "", "", deathtype, MSG_KILL_ACTION); if (deathtype == DEATH_HURTTRIGGER && inflictor.message != "") msg = inflictor.message; else if (deathtype == DEATH_CUSTOM) @@ -549,12 +543,15 @@ 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") @@ -564,7 +561,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float damage = 0; force = '0 0 0'; } - else if(teams_matter && attacker.team == targ.team) + else if(teamplay && attacker.team == targ.team) { if(autocvar_teamplay_mode == 1) damage = 0; @@ -647,7 +644,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float if (targ.armorvalue && (deathtype == WEP_MINSTANEX) && damage) { targ.armorvalue -= 1; - centerprint(targ, strcat(DAMAGE_CENTERPRINT_SPACER, "^3Remaining extra lives: ",ftos(targ.armorvalue))); + 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 @@ -659,7 +656,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float if (targ != attacker) { if ((targ.health >= 1) && (targ.classname == "player")) - centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, "Secondary fire inflicts no damage!")); + centerprint(attacker, "Secondary fire inflicts no damage!"); force = '0 0 0'; // keep mirrorforce attacker = targ; @@ -782,15 +779,21 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float if(deathtype & HITTYPE_HEADSHOT) damage *= 1 + damage_headshotbonus; - if(targ.classname == "player") + entity victim; + if((targ.vehicle_flags & VHF_ISVEHICLE) && targ.owner) + victim = targ.owner; + else + victim = targ; + + if(victim.classname == "player" || victim.turrcaps_flags & TFL_TURRCAPS_ISTURRET) { - if(IsDifferentTeam(targ, attacker)) + if(IsDifferentTeam(victim, attacker)) { if(damage > 0) { if(deathtype != DEATH_FIRE) { - if(targ.BUTTON_CHAT) + if(victim.BUTTON_CHAT) attacker.typehitsound += 1; else attacker.hitsound += 1; @@ -801,12 +804,13 @@ 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(IsFlying(targ)) + if(IsFlying(victim)) yoda = 1; if(g_minstagib) - if(targ.items & IT_STRENGTH) + if(victim.items & IT_STRENGTH) yoda = 1; if(deathtype & HITTYPE_HEADSHOT) @@ -896,7 +900,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float if(attacker.armorvalue > 0) { attacker.armorvalue = attacker.armorvalue - 1; - centerprint(attacker, strcat(DAMAGE_CENTERPRINT_SPACER, "^3Remaining extra lives: ",ftos(attacker.armorvalue))); + centerprint(attacker, strcat("^3Remaining extra lives: ",ftos(attacker.armorvalue))); attacker.hitsound += 1; } mirrordamage = 0;