X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=47443e6d70f34acfdc175d3a16efb71a6823ef18;hb=90efb5467fe733b53d89c0b32da3dca8252e7f19;hp=f3516c274145ac3c495fb073f8639d88cf3cf1d4;hpb=c150edd2f1cd7f4667d9596a0a52295a993291a8;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index f3516c274..47443e6d7 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -128,7 +128,7 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype) } if(warmup_stage) - GiveFrags_randomweapons.weapons = warmup_start_weapons; + GiveFrags_randomweapons.weapons = WARMUP_START_WEAPONS; else GiveFrags_randomweapons.weapons = start_weapons; @@ -147,7 +147,7 @@ void GiveFrags (entity attacker, entity targ, float f, float deathtype) } // after a frag, choose another random weapon set - if not(attacker.weapons & WepSet_FromWeapon(attacker.weapon)) + if (!(attacker.weapons & WepSet_FromWeapon(attacker.weapon))) W_SwitchWeapon_Force(attacker, w_getbestweapon(attacker)); } @@ -225,7 +225,7 @@ void Obituary_SpecialDeath( if(DEATH_ISSPECIAL(deathtype)) { entity deathent = deathtypes[(deathtype - DT_FIRST)]; - if not(deathent) { backtrace("Obituary_SpecialDeath: Could not find deathtype entity!\n"); return; } + if (!deathent) { backtrace("Obituary_SpecialDeath: Could not find deathtype entity!\n"); return; } if(murder) { @@ -311,11 +311,11 @@ float Obituary_WeaponDeath( } else { - dprint(sprintf( + dprintf( "Obituary_WeaponDeath(): ^1Deathtype ^7(%d)^1 has no notification for weapon %d!\n", deathtype, death_weapon - )); + ); } return TRUE; @@ -326,7 +326,7 @@ float Obituary_WeaponDeath( void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) { // Sanity check - if not(IS_PLAYER(targ)) { backtrace("Obituary called on non-player?!\n"); return; } + if (!IS_PLAYER(targ)) { backtrace("Obituary called on non-player?!\n"); return; } // Declarations float notif_firstblood = FALSE; @@ -349,7 +349,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) ) ); #endif - + // ======= // SUICIDE // ======= @@ -370,7 +370,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) 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); @@ -379,7 +379,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) } } } - else if not(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; @@ -399,7 +399,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) GiveFrags(attacker, targ, -1, deathtype); attacker.killcount = 0; - + 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_4(targ.team, INFO_DEATH_TEAMKILL_), targ.netname, attacker.netname, deathlocation, targ.killcount); @@ -493,7 +493,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) ); } - if not(Obituary_WeaponDeath(targ, TRUE, deathtype, targ.netname, attacker.netname, deathlocation, targ.killcount, kill_count_to_attacker)) + 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); } } @@ -527,7 +527,7 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) 0); break; } - + default: { Obituary_SpecialDeath(targ, FALSE, deathtype, targ.netname, deathlocation, "", targ.killcount, 0, 0); @@ -551,6 +551,11 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype) void Ice_Think() { + if(!self.owner.frozen || self.owner.iceblock != self) + { + remove(self); + return; + } setorigin(self, self.owner.origin - '0 0 16'); self.nextthink = time; } @@ -559,13 +564,15 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo { if(!IS_PLAYER(targ) && !(targ.flags & FL_MONSTER)) // only specified entities can be freezed return; - + if(targ.frozen) return; - + + float targ_maxhealth = ((targ.flags & FL_MONSTER) ? targ.max_health : start_health); + targ.frozen = frozen_type; - targ.revive_progress = 0; - targ.health = 1; + targ.revive_progress = ((frozen_type == 3) ? 1 : 0); + targ.health = ((frozen_type == 3) ? targ_maxhealth : 1); targ.revive_speed = freeze_time; entity ice, head; @@ -581,6 +588,7 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo ice.colormod = Team_ColorRGB(targ.team); ice.glowmod = ice.colormod; targ.iceblock = ice; + targ.revival_time = 0; entity oldself; oldself = self; @@ -589,11 +597,11 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo self = oldself; RemoveGrapplingHook(targ); - + FOR_EACH_PLAYER(head) if(head.hook.aiment == targ) 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'); @@ -601,12 +609,13 @@ void Freeze (entity targ, float freeze_time, float frozen_type, float show_waypo void Unfreeze (entity targ) { - if(targ.frozen) // only reset health if target was frozen - targ.health = ((IS_PLAYER(targ)) ? autocvar_g_balance_health_start : targ.max_health); + if(targ.frozen && targ.frozen != 3) // only reset health if target was frozen + targ.health = ((IS_PLAYER(targ)) ? start_health : targ.max_health); entity head; targ.frozen = 0; targ.revive_progress = 0; + targ.revival_time = time; WaypointSprite_Kill(targ.waypointsprite_attached); @@ -629,7 +638,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float { float mirrordamage; float mirrorforce; - float complainteamdamage = 0; + float complainteamdamage = 0; entity attacker_save; mirrordamage = 0; mirrorforce = 0; @@ -667,7 +676,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float // exit the vehicle before killing (fixes a crash) if(IS_PLAYER(targ) && targ.vehicle) vehicles_exit(VHEF_RELESE); - + // These are ALWAYS lethal // No damage modification here // Instead, prepare the victim for his death... @@ -740,7 +749,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float } } - if not(DEATH_ISSPECIAL(deathtype)) + if (!DEATH_ISSPECIAL(deathtype)) { damage *= g_weapondamagefactor; mirrordamage *= g_weapondamagefactor; @@ -748,13 +757,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float force = force * g_weaponforcefactor; mirrorforce *= g_weaponforcefactor; } - - if(((targ.frozen == 2 && attacker.monsterid != MON_SPIDER) || (targ.frozen == 1)) && deathtype != DEATH_HURTTRIGGER) - { - damage = 0; - force *= 0.2; - } - + // should this be changed at all? If so, in what way? frag_attacker = attacker; frag_target = targ; @@ -766,8 +769,64 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float damage = frag_damage; mirrordamage = frag_mirrordamage; force = frag_force; + + if(targ.frozen) + if(deathtype != DEATH_HURTTRIGGER && deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_AUTOTEAMCHANGE) + { + if(autocvar_g_freezetag_revive_falldamage > 0) + if(deathtype == DEATH_FALL) + if(damage >= autocvar_g_freezetag_revive_falldamage) + { + Unfreeze(targ); + targ.health = autocvar_g_freezetag_revive_falldamage_health; + pointparticles(particleeffectnum("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); + } + + 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); - if not(g_minstagib) + entity oldself = self; + self = targ; + 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.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)); + // 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; + } + + if(!g_minstagib) { // apply strength multiplier if (attacker.items & IT_STRENGTH) @@ -790,12 +849,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float } if (targ == attacker) - { - if(g_cts && !autocvar_g_cts_selfdamage) - damage = 0; - else - damage = damage * autocvar_g_balance_selfdamagepercent; // Partial damage if the attacker hits himself - } + damage = damage * autocvar_g_balance_selfdamagepercent; // Partial damage if the attacker hits himself // count the damage if(attacker) @@ -826,7 +880,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float damage_goodhits += 1; damage_gooddamage += damage; - if not(DEATH_ISSPECIAL(deathtype)) + if (!DEATH_ISSPECIAL(deathtype)) { if(IS_PLAYER(targ)) // don't do this for vehicles if(IsFlying(victim)) @@ -1001,12 +1055,12 @@ float RadiusDamage (entity inflictor, entity attacker, float coredamage, float e mininv_f = (vlen(force) * (1-tfloorforce)) / autocvar_g_throughfloor_force_max_stddev; if(autocvar_g_throughfloor_debug) - print(sprintf("THROUGHFLOOR: D=%f F=%f max(dD)=1/%f max(dF)=1/%f", finaldmg, vlen(force), mininv_d, mininv_f)); + printf("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) - print(sprintf(" steps=%f", total)); + printf(" steps=%f", total); if (IS_PLAYER(targ)) total = ceil(bound(autocvar_g_throughfloor_min_steps_player, total, autocvar_g_throughfloor_max_steps_player)); @@ -1014,7 +1068,7 @@ float RadiusDamage (entity inflictor, entity attacker, float coredamage, float e total = ceil(bound(autocvar_g_throughfloor_min_steps_other, total, autocvar_g_throughfloor_max_steps_other)); if(autocvar_g_throughfloor_debug) - print(sprintf(" steps=%f dD=%f dF=%f", total, finaldmg * (1-tfloordmg) / (2 * sqrt(total)), vlen(force) * (1-tfloorforce) / (2 * sqrt(total)))); + printf(" 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) { @@ -1041,7 +1095,7 @@ float RadiusDamage (entity inflictor, entity attacker, float coredamage, float e force = force * a; if(autocvar_g_throughfloor_debug) - print(sprintf(" D=%f F=%f\n", finaldmg, vlen(force))); + printf(" D=%f F=%f\n", finaldmg, vlen(force)); } // laser force adjustments :P @@ -1175,7 +1229,7 @@ float Fire_AddDamage(entity e, entity o, float d, float t, float dt) if(maxtime > mintime || maxdps > mindps) { // Constraints: - + // damage we have right now mindamage = mindps * mintime; @@ -1264,7 +1318,7 @@ void Fire_ApplyDamage(entity e) float t, d, hi, ty; entity o; - if not(Fire_IsBurning(e)) + if (!Fire_IsBurning(e)) return; for(t = 0, o = e.owner; o.owner && t < 16; o = o.owner, ++t); @@ -1293,12 +1347,13 @@ void Fire_ApplyDamage(entity e) } e.fire_hitsound = TRUE; - if not(IS_INDEPENDENT_PLAYER(e)) + if (!IS_INDEPENDENT_PLAYER(e)) + if(!e.frozen) FOR_EACH_PLAYER(other) if(e != other) { if(IS_PLAYER(other)) if(other.deadflag == DEAD_NO) - if not(IS_INDEPENDENT_PLAYER(other)) + if (!IS_INDEPENDENT_PLAYER(other)) if(boxesoverlap(e.absmin, e.absmax, other.absmin, other.absmax)) { t = autocvar_g_balance_firetransfer_time * (e.fire_endtime - time);