X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=c4eb965a7d95ec74070568adc3160a192edf89a9;hb=b5305432ceb07a7558c668ed4fef9a20d24f73ba;hp=a40e8144d6656904d11f7843bcc4d81e7b68431d;hpb=8c5cac294cfb0249c19985066b31e21f7ffa9a61;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index a40e8144d..c4eb965a7 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -1,25 +1,34 @@ - void CreatureFrame (void) { local entity oldself; local float dm; + + float damagerate; // where damagerate 5 means 5 hits per second (0.2 delay) + damagerate = (1 / bound(1, autocvar_g_balance_contents_damagerate, 100)); + oldself = self; - self = findfloat(world, iscreature, TRUE); - while (self) + for(self = world; (self = findfloat(self, damagedbycontents, TRUE)); ) { - if (self.movetype != MOVETYPE_NOCLIP) + if (self.movetype == MOVETYPE_NOCLIP) { continue; } + + float vehic = (self.vehicle_flags & VHF_ISVEHICLE); + float projectile = (self.projectiledeathtype); + + if (self.watertype <= CONTENT_WATER && self.waterlevel > 0) // workaround a retarded bug made by id software :P (yes, it's that old of a bug) { - if (self.waterlevel) + if (!(self.flags & FL_INWATER)) + { + self.flags |= FL_INWATER; + self.dmgtime = 0; + //te_customflash(self.origin, 200, 20, '50 0.1 0.1'); + } + + if(!vehic && !projectile) // vehicles and projectiles don't drown { - if (!(self.flags & FL_INWATER)) - { - self.flags |= FL_INWATER; - self.dmgtime = 0; - } if (self.waterlevel != WATERLEVEL_SUBMERGED) { if(self.air_finished < time + 9) - PlayerSound(playersound_gasp, CHAN_PLAYER, VOICETYPE_PLAYERSOUND); + PlayerSound(playersound_gasp, CH_PLAYER, VOICETYPE_PLAYERSOUND); self.air_finished = time + 12; self.dmg = 2; } @@ -28,44 +37,58 @@ void CreatureFrame (void) if (!self.deadflag) if (self.pain_finished < time) { - Damage (self, world, world, 5, DEATH_DROWN, self.origin, '0 0 0'); + Damage (self, world, world, autocvar_g_balance_contents_playerdamage_drowning * damagerate, DEATH_DROWN, self.origin, '0 0 0'); self.pain_finished = time + 0.5; } } - if (self.dmgtime < time) + } + + if (self.dmgtime < time) + { + self.dmgtime = time + damagerate; + + if (!projectile) { - self.dmgtime = time + 0.2; if (self.watertype == CONTENT_LAVA) { if (self.watersound_finished < time) { self.watersound_finished = time + 0.5; - sound (self, CHAN_PLAYER, "player/lava.wav", VOL_BASE, ATTN_NORM); + sound (self, CH_PLAYER, "player/lava.wav", VOL_BASE, ATTN_NORM); } - Damage (self, world, world, 6 * self.waterlevel, DEATH_LAVA, self.origin, '0 0 0'); + Damage (self, world, world, autocvar_g_balance_contents_playerdamage_lava * damagerate * self.waterlevel, DEATH_LAVA, self.origin, '0 0 0'); } else if (self.watertype == CONTENT_SLIME) { if (self.watersound_finished < time) { self.watersound_finished = time + 0.5; - sound (self, CHAN_PLAYER, "player/slime.wav", VOL_BASE, ATTN_NORM); + sound (self, CH_PLAYER, "player/slime.wav", VOL_BASE, ATTN_NORM); } - Damage (self, world, world, 2 * self.waterlevel, DEATH_SLIME, self.origin, '0 0 0'); + Damage (self, world, world, autocvar_g_balance_contents_playerdamage_slime * damagerate * self.waterlevel, DEATH_SLIME, self.origin, '0 0 0'); } } - } - else - { - if (self.flags & FL_INWATER) + else if ((self.watertype == CONTENT_LAVA) || (self.watertype == CONTENT_SLIME)) { - // play leave water sound - self.flags &~= FL_INWATER; - self.dmgtime = 0; + Damage (self, world, world, autocvar_g_balance_contents_projectiledamage * damagerate * self.waterlevel, DEATH_SLIME, self.origin, '0 0 0'); } - self.air_finished = time + 12; - self.dmg = 2; } + } + else + { + if (self.flags & FL_INWATER) + { + // play leave water sound + self.flags &~= FL_INWATER; + self.dmgtime = 0; + //te_customflash(self.origin, 200, 20, '0.1 0.1 50'); + } + self.air_finished = time + 12; + self.dmg = 2; + } + + if(!vehic && !projectile) // vehicles don't get falling damage + { // check for falling damage float velocity_len = vlen(self.velocity); if(!self.hook.state && !g_ca && !(g_cts && !autocvar_g_cts_selfdamage)) @@ -81,7 +104,6 @@ void CreatureFrame (void) if(autocvar_g_maxspeed > 0 && velocity_len > autocvar_g_maxspeed) Damage (self, world, world, 100000, DEATH_SHOOTING_STAR, self.origin, '0 0 0'); - // play stupid sounds if (g_footsteps) if (!gameover) @@ -104,15 +126,15 @@ void CreatureFrame (void) if not(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOSTEPS) { if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_METALSTEPS) - GlobalSound(globalsound_metalstep, CHAN_PLAYER, VOICETYPE_PLAYERSOUND); + GlobalSound(globalsound_metalstep, CH_PLAYER, VOICETYPE_PLAYERSOUND); else - GlobalSound(globalsound_step, CHAN_PLAYER, VOICETYPE_PLAYERSOUND); + GlobalSound(globalsound_step, CH_PLAYER, VOICETYPE_PLAYERSOUND); } } } - self.oldvelocity = self.velocity; } - self = findfloat(self, iscreature, TRUE); + + self.oldvelocity = self.velocity; } self = oldself; } @@ -232,10 +254,11 @@ void StartFrame (void) .float anglejitter; .string gametypefilter; .string cvarfilter; +float DoesQ3ARemoveThisEntity(); void SV_OnEntityPreSpawnFunction() { if(self.gametypefilter != "") - if not(isGametypeInFilter(game, teams_matter, have_team_spawns, self.gametypefilter)) + if not(isGametypeInFilter(game, teamplay, have_team_spawns, self.gametypefilter)) { remove(self); return; @@ -350,6 +373,12 @@ void SV_OnEntityPreSpawnFunction() } } + if(DoesQ3ARemoveThisEntity()) + { + remove(self); + return; + } + // support special -1 and -2 angle from radiant if (self.angles == '0 -1 0') self.angles = '-90 0 0'; @@ -377,3 +406,20 @@ void SV_OnEntityPreSpawnFunction() return; } } + +void WarpZone_PostInitialize_Callback(void) +{ + // create waypoint links for warpzones + entity e; + for(e = world; (e = find(e, classname, "trigger_warpzone")); ) + { + vector src, dst; + src = (e.absmin + e.absmax) * 0.5; + makevectors(e.warpzone_angles); + src = src + ((e.warpzone_origin - src) * v_forward) * v_forward + 16 * v_right; + dst = (e.enemy.absmin + e.enemy.absmax) * 0.5; + makevectors(e.enemy.warpzone_angles); + dst = dst + ((e.enemy.warpzone_origin - dst) * v_forward) * v_forward - 16 * v_right; + waypoint_spawnforteleporter_v(e, src, dst, 0); + } +}