From: Rudolf Polzer Date: Sun, 28 Mar 2010 13:29:04 +0000 (+0200) Subject: s/TR_XONOTICPLASMA/TR_NEXUIZPLASMA/g done X-Git-Tag: xonotic-v0.1.0preview~675 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=57be30586d85e3c35696d6d57a36fc4f1c042f7a;p=xonotic%2Fxonotic-data.pk3dir.git s/TR_XONOTICPLASMA/TR_NEXUIZPLASMA/g done --- diff --git a/effectinfo.txt b/effectinfo.txt index 8ab688d8f..2885afb56 100644 --- a/effectinfo.txt +++ b/effectinfo.txt @@ -1348,8 +1348,8 @@ airfriction 12 // electro trail // glowing vapor trail -// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_XONOTICPLASMA"), from, to) -effect TR_XONOTICPLASMA +// used in qcsrc/client/projectile.qc: trailparticles(self, particleeffectnum("TR_NEXUIZPLASMA"), from, to) +effect TR_NEXUIZPLASMA trailspacing 1 type static color 0x283880 0x283880 @@ -1362,7 +1362,7 @@ lighttime 0 lightcolor 1.5 3 6 velocitymultiplier -0.1 // bright sparks -effect TR_XONOTICPLASMA +effect TR_NEXUIZPLASMA trailspacing 6 count 3 type snow diff --git a/qcsrc/client/projectile.qc b/qcsrc/client/projectile.qc index 97debdfac..2730a322d 100644 --- a/qcsrc/client/projectile.qc +++ b/qcsrc/client/projectile.qc @@ -249,14 +249,14 @@ void Ent_Projectile() self.traileffect = 0; switch(self.cnt) { - case PROJECTILE_ELECTRO: setmodel(self, "models/ebomb.mdl");self.traileffect = particleeffectnum("TR_XONOTICPLASMA"); break; + case PROJECTILE_ELECTRO: setmodel(self, "models/ebomb.mdl");self.traileffect = particleeffectnum("TR_NEXUIZPLASMA"); break; case PROJECTILE_ROCKET: setmodel(self, "models/rocket.md3");self.traileffect = particleeffectnum("TR_ROCKET"); self.scale = 2; break; case PROJECTILE_BULLET: setmodel(self, "models/tracer.mdl");self.traileffect = particleeffectnum("tr_bullet"); break; case PROJECTILE_BULLET_GLOWING: setmodel(self, "models/tracer.mdl");self.traileffect = particleeffectnum("tr_bullet"); break; case PROJECTILE_BULLET_GLOWING_TRACER: setmodel(self, "models/tracer.mdl");self.traileffect = particleeffectnum("tr_rifle"); break; case PROJECTILE_CRYLINK: setmodel(self, "models/plasmatrail.mdl");self.traileffect = particleeffectnum("TR_CRYLINKPLASMA"); break; case PROJECTILE_CRYLINK_BOUNCING: setmodel(self, "models/plasmatrail.mdl");self.traileffect = particleeffectnum("TR_CRYLINKPLASMA"); break; - case PROJECTILE_ELECTRO_BEAM: setmodel(self, "models/elaser.mdl");self.traileffect = particleeffectnum("TR_XONOTICPLASMA"); break; + case PROJECTILE_ELECTRO_BEAM: setmodel(self, "models/elaser.mdl");self.traileffect = particleeffectnum("TR_NEXUIZPLASMA"); break; case PROJECTILE_GRENADE: setmodel(self, "models/grenademodel.md3");self.traileffect = particleeffectnum("TR_GRENADE"); break; case PROJECTILE_GRENADE_BOUNCING: setmodel(self, "models/grenademodel.md3");self.traileffect = particleeffectnum("TR_GRENADE"); break; case PROJECTILE_LASER: setmodel(self, "models/laser.mdl");self.traileffect = particleeffectnum(""); break; diff --git a/qcsrc/server/gamecommand.qc b/qcsrc/server/gamecommand.qc index af03b8348..24558057c 100644 --- a/qcsrc/server/gamecommand.qc +++ b/qcsrc/server/gamecommand.qc @@ -588,7 +588,7 @@ void EffectIndexDump() db_put(d, "TR_KNIGHTSPIKE", "1"); print("effect TR_KNIGHTSPIKE is ", ftos(particleeffectnum("TR_KNIGHTSPIKE")), "\n"); db_put(d, "TR_VORESPIKE", "1"); print("effect TR_VORESPIKE is ", ftos(particleeffectnum("TR_VORESPIKE")), "\n"); db_put(d, "TR_NEHAHRASMOKE", "1"); print("effect TR_NEHAHRASMOKE is ", ftos(particleeffectnum("TR_NEHAHRASMOKE")), "\n"); - db_put(d, "TR_XONOTICPLASMA", "1"); print("effect TR_XONOTICPLASMA is ", ftos(particleeffectnum("TR_XONOTICPLASMA")), "\n"); + db_put(d, "TR_NEXUIZPLASMA", "1"); print("effect TR_NEXUIZPLASMA is ", ftos(particleeffectnum("TR_NEXUIZPLASMA")), "\n"); db_put(d, "TR_GLOWTRAIL", "1"); print("effect TR_GLOWTRAIL is ", ftos(particleeffectnum("TR_GLOWTRAIL")), "\n"); db_put(d, "SVC_PARTICLE", "1"); print("effect SVC_PARTICLE is ", ftos(particleeffectnum("SVC_PARTICLE")), "\n");