From: Mario Date: Sun, 16 Jun 2013 03:56:05 +0000 (+1000) Subject: Remove poison (needs a proper implementation) X-Git-Tag: xonotic-v0.8.0~241^2^2~184 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aaf31405fde10cac0fd891998c1a282a342c873d;p=xonotic%2Fxonotic-data.pk3dir.git Remove poison (needs a proper implementation) --- diff --git a/effectinfo.txt b/effectinfo.txt index e24defbc3..05e881c5d 100644 --- a/effectinfo.txt +++ b/effectinfo.txt @@ -8017,39 +8017,3 @@ size 1 1 alpha 256 256 64 color 0xFF0FFF 0xFF0FFF sizeincrease 1 - -//EF_POISON -//poison -// used nowhere in code -effect EF_POISON -count 100 -type smoke -tex 48 55 -size 5 21 -alpha 200 356 512 -gravity -0.5 -color 0x00ff00 0x00ff00 -bounce 2 -sizeincrease -1 -originoffset 0 0 10 -originjitter 12 12 34 -velocityjitter 22 22 50 -// smoke -effect EF_POISON -type alphastatic -count 50 -tex 0 8 -size 11 15 -sizeincrease 6 -alpha 200 256 200 -color 0x00ff00 0x00ff00 -gravity -0.3 -originoffset 0 0 10 -originjitter 12 12 34 -velocityjitter 11 11 50 -bounce 2 -effect EF_POISON -count 0.5 -lightradius 200 -lightradiusfade 10000 -lightcolor 0.9 0.9 0.2 diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index c08883b10..e24c306ca 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -904,7 +904,7 @@ void CSQC_UpdateView(float w, float h) } } - if(autocvar_hud_damage && !getstati(STAT_FROZEN) && !getstati(STAT_POISONED)) + if(autocvar_hud_damage && !getstati(STAT_FROZEN)) { splash_size_x = max(vid_conwidth, vid_conheight); splash_size_y = max(vid_conwidth, vid_conheight); @@ -990,21 +990,6 @@ void CSQC_UpdateView(float w, float h) } } - if(getstati(STAT_POISONED)) - { - if(cvar("v_idlescale") != 50) - { - old_v_idlescale = cvar("v_idlescale"); - cvar_set("v_idlescale", "50"); - } - } - else - { - if(cvar("v_idlescale") == 50) - cvar_set("v_idlescale", ftos(old_v_idlescale)); - } - - float e1 = (autocvar_hud_postprocessing_maxbluralpha != 0); float e2 = (autocvar_hud_powerup != 0); if(autocvar_hud_postprocessing && (e1 || e2)) // TODO: Remove this code and re-do the postprocess handling in the engine, where it properly belongs. @@ -1103,9 +1088,6 @@ void CSQC_UpdateView(float w, float h) DrawCircleClippedPic(eX * 0.5 * vid_conwidth + eY * 0.6 * vid_conheight, 0.1 * vid_conheight, "gfx/crosshair_ring.tga", getstatf(STAT_REVIVE_PROGRESS), '0.25 0.90 1', autocvar_hud_colorflash_alpha, DRAWFLAG_ADDITIVE); drawstring_aspect(eY * 0.64 * vid_conheight, _("Revival progress"), eX * vid_conwidth + eY * 0.025 * vid_conheight, '1 1 1', 1, DRAWFLAG_NORMAL); } - - if(getstati(STAT_POISONED)) - drawfill('0 0 0', eX * vid_conwidth + eY * vid_conheight, '0.25 0.90 0.25', autocvar_hud_colorflash_alpha, DRAWFLAG_ADDITIVE); if(autocvar_r_letterbox == 0) if(autocvar_viewsize < 120) diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc index 17f7f1224..264f4797e 100644 --- a/qcsrc/client/csqcmodel_hooks.qc +++ b/qcsrc/client/csqcmodel_hooks.qc @@ -513,12 +513,7 @@ void CSQCModel_Effects_Apply(void) if(eff & EF_FULLBRIGHT) self.renderflags |= RF_FULLBRIGHT; if(eff & EF_FLAME) - { - if(getstati(STAT_POISONED)) - pointparticles(particleeffectnum("EF_POISON"), self.origin, '0 0 0', bound(0, frametime, 0.1)); - else - pointparticles(particleeffectnum("EF_FLAME"), self.origin, '0 0 0', bound(0, frametime, 0.1)); - } + pointparticles(particleeffectnum("EF_FLAME"), self.origin, '0 0 0', bound(0, frametime, 0.1)); if(eff & EF_STARDUST) pointparticles(particleeffectnum("EF_STARDUST"), self.origin, '0 0 0', bound(0, frametime, 0.1)); if(eff & EF_NOSHADOW) diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh index 8bc7a20f1..7b403ddd1 100644 --- a/qcsrc/common/constants.qh +++ b/qcsrc/common/constants.qh @@ -188,8 +188,6 @@ const float STAT_TOTALWAVES = 74; const float STAT_MONSTERS_TOTAL = 75; const float STAT_MONSTERS_KILLED = 76; -const float STAT_POISONED = 77; - // mod stats (1xx) const float STAT_REDALIVE = 100; const float STAT_BLUEALIVE = 101; diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index 7172948c8..41f8f9117 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -2256,9 +2256,6 @@ void PlayerPreThink (void) if(self.revive_progress >= 1) Unfreeze(self); } - - if(!Fire_IsBurning(self)) - self.poisoned = FALSE; MUTATOR_CALLHOOK(PlayerPreThink); diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index b46b4a1b2..43755d942 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -587,8 +587,6 @@ float serverflags; .float revive_speed; // NOTE: multiplier (anything above 1 is instaheal) .entity iceblock; -.float poisoned; - .entity muzzle_flash; .float misc_bulletcounter; // replaces uzi & hlac bullet counter. diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 5a1403f48..7ca31cecb 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -1127,12 +1127,10 @@ float Fire_IsBurning(entity e) return (time < e.fire_endtime); } -float Fire_AddDamage(entity e, entity o, float d, float t, float dt, float ispoison) +float Fire_AddDamage(entity e, entity o, float d, float t, float dt) { float dps; float maxtime, mintime, maxdamage, mindamage, maxdps, mindps, totaldamage, totaltime; - - e.poisoned = ispoison; if(IS_PLAYER(e)) { @@ -1262,7 +1260,6 @@ void Fire_ApplyDamage(entity e) o = e.fire_owner; // water and slime stop fire - if(!e.poisoned) if(e.waterlevel) if(e.watertype != CONTENT_LAVA) e.fire_endtime = 0; @@ -1294,7 +1291,7 @@ void Fire_ApplyDamage(entity e) { t = autocvar_g_balance_firetransfer_time * (e.fire_endtime - time); d = autocvar_g_balance_firetransfer_damage * e.fire_damagepersec * t; - Fire_AddDamage(other, o, d, t, DEATH_FIRE, FALSE); + Fire_AddDamage(other, o, d, t, DEATH_FIRE); } } } @@ -1318,7 +1315,6 @@ void fireburner_think() Fire_ApplyEffect(self.owner); if(!Fire_IsBurning(self.owner)) { - self.owner.poisoned = FALSE; self.owner.fire_burner = world; remove(self); return; diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index d28ef613c..cf2d12612 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -821,7 +821,6 @@ void spawnfunc_worldspawn (void) // misc addstat(STAT_RESPAWN_TIME, AS_FLOAT, stat_respawn_time); - addstat(STAT_POISONED, AS_INT, poisoned); next_pingtime = time + 5; diff --git a/qcsrc/server/monsters/monster/knight.qc b/qcsrc/server/monsters/monster/knight.qc index a35bba2bd..816ac600f 100644 --- a/qcsrc/server/monsters/monster/knight.qc +++ b/qcsrc/server/monsters/monster/knight.qc @@ -64,7 +64,7 @@ void knight_inferno() sound(self.enemy, CHAN_AUTO, "player/lava.wav", 1, ATTN_NORM); if(vlen(self.enemy.origin - self.origin) <= 2000) - Fire_AddDamage(self.enemy, self, autocvar_g_monster_knight_inferno_damage * monster_skill, autocvar_g_monster_knight_inferno_damagetime, DEATH_MONSTER_KNIGHT_INFERNO, FALSE); + Fire_AddDamage(self.enemy, self, autocvar_g_monster_knight_inferno_damage * monster_skill, autocvar_g_monster_knight_inferno_damagetime, DEATH_MONSTER_KNIGHT_INFERNO); } void knight_fireball_explode() @@ -77,7 +77,7 @@ void knight_fireball_explode() RadiusDamage(self, self.realowner, autocvar_g_monster_knight_fireball_damage, autocvar_g_monster_knight_fireball_edgedamage, autocvar_g_monster_knight_fireball_force, world, autocvar_g_monster_knight_fireball_radius, self.projectiledeathtype, world); for(e = world; (e = findfloat(e, takedamage, DAMAGE_AIM)); ) if(vlen(e.origin - self.origin) <= autocvar_g_monster_knight_fireball_radius) - Fire_AddDamage(e, self, 5 * monster_skill, autocvar_g_monster_knight_inferno_damagetime, self.projectiledeathtype, FALSE); + Fire_AddDamage(e, self, 5 * monster_skill, autocvar_g_monster_knight_inferno_damagetime, self.projectiledeathtype); remove(self); } diff --git a/qcsrc/server/monsters/monster/spider.qc b/qcsrc/server/monsters/monster/spider.qc index 4b6eda73f..cdae2f429 100644 --- a/qcsrc/server/monsters/monster/spider.qc +++ b/qcsrc/server/monsters/monster/spider.qc @@ -62,7 +62,7 @@ void spider_web_explode() Freeze(e, 0.3, 2, FALSE); break; case SPIDER_TYPE_FIRE: - Fire_AddDamage(e, self.realowner, 5 * monster_skill, autocvar_g_monster_spider_attack_fire_time, DEATH_MONSTER_SPIDER_FIRE, FALSE); + Fire_AddDamage(e, self.realowner, 5 * monster_skill, autocvar_g_monster_spider_attack_fire_time, DEATH_MONSTER_SPIDER_FIRE); break; } } diff --git a/qcsrc/server/monsters/monster/stingray.qc b/qcsrc/server/monsters/monster/stingray.qc index 7408fa897..61dccfbd6 100644 --- a/qcsrc/server/monsters/monster/stingray.qc +++ b/qcsrc/server/monsters/monster/stingray.qc @@ -31,9 +31,7 @@ float stingray_attack(float attack_type) { monsters_setframe(stingray_anim_attack); self.attack_finished_single = time + 0.5; - if(monster_melee(self.enemy, autocvar_g_monster_stingray_damage, 0.1, DEATH_MONSTER_STINGRAY, FALSE)) - if(random() < 0.2) - Fire_AddDamage(self.enemy, self, 30, 10, DEATH_MONSTER_STINGRAY, TRUE); + monster_melee(self.enemy, autocvar_g_monster_stingray_damage, 0.1, DEATH_MONSTER_STINGRAY, FALSE); return TRUE; } diff --git a/qcsrc/server/monsters/monster/wyvern.qc b/qcsrc/server/monsters/monster/wyvern.qc index 40128660b..e9eda6d6a 100644 --- a/qcsrc/server/monsters/monster/wyvern.qc +++ b/qcsrc/server/monsters/monster/wyvern.qc @@ -39,7 +39,7 @@ void wyvern_fireball_explode() RadiusDamage(self, self.realowner, autocvar_g_monster_wyvern_fireball_damage, autocvar_g_monster_wyvern_fireball_edgedamage, autocvar_g_monster_wyvern_fireball_force, world, autocvar_g_monster_wyvern_fireball_radius, self.projectiledeathtype, world); for(e = world; (e = findfloat(e, takedamage, DAMAGE_AIM)); ) if(vlen(e.origin - self.origin) <= autocvar_g_monster_wyvern_fireball_radius) - Fire_AddDamage(e, self, 5 * monster_skill, autocvar_g_monster_wyvern_fireball_damagetime, self.projectiledeathtype, FALSE); + Fire_AddDamage(e, self, 5 * monster_skill, autocvar_g_monster_wyvern_fireball_damagetime, self.projectiledeathtype); remove(self); } diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc index 520a53e4e..7bccac949 100644 --- a/qcsrc/server/w_fireball.qc +++ b/qcsrc/server/w_fireball.qc @@ -100,7 +100,7 @@ void W_Fireball_LaserPlay(float dt, float dist, float damage, float edgedamage, { d = vlen(WarpZone_UnTransformOrigin(RandomSelection_chosen_ent, self.origin) - RandomSelection_chosen_ent.fireball_impactvec); d = damage + (edgedamage - damage) * (d / dist); - Fire_AddDamage(RandomSelection_chosen_ent, self.realowner, d * burntime, burntime, self.projectiledeathtype | HITTYPE_BOUNCE, FALSE); + Fire_AddDamage(RandomSelection_chosen_ent, self.realowner, d * burntime, burntime, self.projectiledeathtype | HITTYPE_BOUNCE); //trailparticles(self, particleeffectnum("fireball_laser"), self.origin, RandomSelection_chosen_ent.fireball_impactvec); pointparticles(particleeffectnum("fireball_laser"), self.origin, RandomSelection_chosen_ent.fireball_impactvec - self.origin, 1); } @@ -244,7 +244,7 @@ void W_Firemine_Touch (void) { PROJECTILE_TOUCH; if (other.takedamage == DAMAGE_AIM) - if(Fire_AddDamage(other, self.realowner, autocvar_g_balance_fireball_secondary_damage, autocvar_g_balance_fireball_secondary_damagetime, self.projectiledeathtype, FALSE) >= 0) + if(Fire_AddDamage(other, self.realowner, autocvar_g_balance_fireball_secondary_damage, autocvar_g_balance_fireball_secondary_damagetime, self.projectiledeathtype) >= 0) { remove(self); return;