X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fplayer.qc;h=26fc9e659204d7bf6305a5d2483bf1b2b4ba9819;hb=d865de7a9a17c5a1d9286aec40f68c3530697660;hp=2d7d99229c18726c5cee3c25a7ddd6f4a063cd0c;hpb=38ad97a27a38fe7e497d1cccefca9a8d26de7862;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc index 2d7d99229..26fc9e659 100644 --- a/qcsrc/server/player.qc +++ b/qcsrc/server/player.qc @@ -1,8 +1,10 @@ #include "player.qh" +#include #include "bot/api.qh" #include "cheats.qh" #include "g_damage.qh" +#include "handicap.qh" #include "g_subs.qh" #include "miscfunctions.qh" #include "portals.qh" @@ -21,7 +23,7 @@ #include "../common/minigames/sv_minigames.qh" #include "../common/physics/player.qh" -#include "../common/effects/qc/all.qh" +#include "../common/effects/qc/_mod.qh" #include "../common/mutators/mutator/waypoints/waypointsprites.qh" #include "../common/triggers/include.qh" #include "../common/wepent.qh" @@ -97,7 +99,6 @@ void CopyBody(entity this, float keepvelocity) clone.move_qcphysics = false; // don't run gamecode logic on clones, too many set_movetype(clone, this.move_movetype); clone.solid = this.solid; - clone.ballistics_density = this.ballistics_density; clone.takedamage = this.takedamage; setcefc(clone, getcefc(this)); clone.uncustomizeentityforclient = this.uncustomizeentityforclient; @@ -236,10 +237,10 @@ void calculate_player_respawn_time(entity this) float pcount = 1; // Include myself whether or not team is already set right and I'm a "player". if (teamplay) { - FOREACH_CLIENT(IS_PLAYER(it) && it != this, LAMBDA( + FOREACH_CLIENT(IS_PLAYER(it) && it != this, { if(it.team == this.team) ++pcount; - )); + }); if (sdelay_small_count == 0) sdelay_small_count = 1; if (sdelay_large_count == 0) @@ -247,9 +248,9 @@ void calculate_player_respawn_time(entity this) } else { - FOREACH_CLIENT(IS_PLAYER(it) && it != this, LAMBDA( + FOREACH_CLIENT(IS_PLAYER(it) && it != this, { ++pcount; - )); + }); if (sdelay_small_count == 0) { if (IS_INDEPENDENT_PLAYER(this)) @@ -317,9 +318,11 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, if(!DEATH_ISSPECIAL(deathtype)) { - damage *= bound(1.0, this.cvar_cl_handicap, 10.0); - if(this != attacker) - damage /= bound(1.0, attacker.cvar_cl_handicap, 10.0); + damage *= Handicap_GetTotalHandicap(this); + if (this != attacker && IS_PLAYER(attacker)) + { + damage /= Handicap_GetTotalHandicap(attacker); + } } if (time < this.spawnshieldtime && autocvar_g_spawnshield_blockdamage < 1) @@ -472,10 +475,10 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, if (this != attacker) { float realdmg = damage - excess; if (IS_PLAYER(attacker)) { - PlayerScore_Add(attacker, SP_DMG, realdmg); + GameRules_scoring_add(attacker, DMG, realdmg); } if (IS_PLAYER(this)) { - PlayerScore_Add(this, SP_DMGTAKEN, realdmg); + GameRules_scoring_add(this, DMGTAKEN, realdmg); } } @@ -514,7 +517,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, if(this.alivetime) { - PS_GR_P_ADDVAL(this, PLAYERSTATS_ALIVETIME, time - this.alivetime); + PlayerStats_GameReport_Event_Player(this, PLAYERSTATS_ALIVETIME, time - this.alivetime); this.alivetime = 0; } @@ -535,7 +538,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, { delete(this.killindicator); this.killindicator = NULL; - if(CS(this).killindicator_teamchange) + if(this.killindicator_teamchange) defer_ClientKill_Now_TeamChange = true; if(this.classname == "body") @@ -555,6 +558,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, if(w != WEP_Null && accuracy_isgooddamage(attacker, this)) CS(attacker).accuracy.(accuracy_frags[w.m_id-1]) += 1; + this.respawn_time = 0; MUTATOR_CALLHOOK(PlayerDies, inflictor, attacker, this, deathtype, damage); damage = M_ARGV(4, float); excess = max(0, damage - take - save); @@ -583,6 +587,9 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, if(this.health >= 1 || !(IS_PLAYER(this) || this.classname == "body")) return; + if (!this.respawn_time) // can be set in the mutator hook PlayerDies + calculate_player_respawn_time(this); + // when we get here, player actually dies Unfreeze(this); // remove any icy remains @@ -610,14 +617,13 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, set_movetype(this, MOVETYPE_TOSS); // shootable corpse this.solid = SOLID_CORPSE; - this.ballistics_density = autocvar_g_ballistics_density_corpse; + PS(this).ballistics_density = autocvar_g_ballistics_density_corpse; // don't stick to the floor UNSET_ONGROUND(this); // dying animation this.deadflag = DEAD_DYING; - // when to allow respawn - calculate_player_respawn_time(this); + STAT(MOVEVARS_SPECIALCOMMAND, this) = false; // sweet release this.death_time = time; if (random() < 0.5) @@ -666,15 +672,19 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage, } } -void MoveToTeam(entity client, int team_colour, int type) +bool MoveToTeam(entity client, int team_colour, int type) { int lockteams_backup = lockteams; // backup any team lock lockteams = 0; // disable locked teams TeamchangeFrags(client); // move the players frags - SetPlayerColors(client, team_colour - 1); // set the players colour + if (!SetPlayerTeamSimple(client, team_colour)) + { + return false; + } Damage(client, client, client, 100000, DEATH_AUTOTEAMCHANGE.m_id, client.origin, '0 0 0'); // kill the player lockteams = lockteams_backup; // restore the team lock LogTeamchange(client.playerid, client.team, type); + return true; } /** print(), but only print if the server is not local */ @@ -937,7 +947,7 @@ int Say(entity source, int teamsay, entity privatesay, string msgin, bool floodc } if(flood) - LOG_INFO("NOTE: ", playername(source, true), "^7 is flooding.\n"); + LOG_INFO("NOTE: ", playername(source, true), "^7 is flooding."); // build sourcemsgstr by cutting off a prefix and replacing it by the other one if(privatesay)