diff --git a/engine/client/r_partset.c b/engine/client/r_partset.c index 7674a594c..c99b033ee 100644 --- a/engine/client/r_partset.c +++ b/engine/client/r_partset.c @@ -82,34 +82,113 @@ char *particle_set_spikeset = "assoc rockettail\n" "}\n" -//TeamFortress railgun (by model - this is also the effect used with the TE_LIGHTNING1 extension) -"r_part te_railtrail\n" +// te_railtrail, used with Quake 2 railgun and also used with +// TeamFortress engineer railgun +"r_part railtrailinner\n" "{\n" -"texture \"particles/b_rocket3\"\n" -"step 15\n" -"scale 10\n" +"step 30\n" +"scale 5\n" "die 1\n" +"alpha 0.5\n" "rgb 255 255 255\n" "blend add\n" "type beam\n" +"spawnvel 2 2\n" +"}\n" + +"r_part railtrail240\n" +"{\n" +"step 15\n" +"scale 3\n" +"die 1\n" +"alpha 0\n" +"rgb 32 32 255\n" +"rampmode delta\n" +"ramp -255 -255 0 -2.5 0\n" +"ramp 0 0 0 0.65 0\n" +"ramp 0 0 0 0.65 0\n" +"ramp 0 0 0 0.65 0\n" +"ramp 0 0 -128 0.65 10\n" +"blend add\n" +"type beam\n" "spawnmode spiral\n" -"spawnvel 100 0\n" -"cliptype te_railtrail\n" -"friction 0.7\n" +"spawnparam1 256\n" +"spawnparam2 240\n" +"spawnvel 12\n" +"assoc railtrailinner\n" +"}\n" + +"r_part railtrail120\n" +"{\n" +"step 15\n" +"scale 3\n" +"die 1\n" +"alpha 0\n" +"rgb 32 32 255\n" +"rampmode delta\n" +"ramp -255 -255 0 -2.5 0\n" +"ramp 0 0 0 0.65 0\n" +"ramp 0 0 0 0.65 0\n" +"ramp 0 0 0 0.65 0\n" +"ramp 0 0 -128 0.65 10\n" +"blend add\n" +"type beam\n" +"spawnmode spiral\n" +"spawnparam1 256\n" +"spawnparam2 120\n" +"spawnvel 12\n" +"assoc railtrail240\n" +"}\n" + +"r_part te_railtrail\n" +"{\n" +"step 15\n" +"scale 3\n" +"die 1\n" +"alpha 0\n" +"rgb 32 32 255\n" +"rampmode delta\n" +"ramp -255 -255 0 -2.5 0\n" +"ramp 0 0 0 0.65 0\n" +"ramp 0 0 0 0.65 0\n" +"ramp 0 0 0 0.65 0\n" +"ramp 0 0 -128 0.65 10\n" +"blend add\n" +"type beam\n" +"spawnmode spiral\n" +"spawnparam1 256\n" +"spawnvel 12\n" +"assoc railtrail120\n" +"}\n" + +"r_part shortfume\n" +"{\n" +"texture \"particles/smoke\"\n" +"scale 15\n" +"scaledelta 20\n" +"alpha 0.5\n" +"step 8\n" +"die 0.3\n" +"randomvel 12\n" +"scaledelta 0.81\n" +"rgb 150 150 150\n" "}\n" "r_part t_grenade\n" "{\n" -"texture \"particles/rtrail\"\n" -"step 10\n" -"scale 10\n" +"texture \"particles/smoke\"\n" +"step 24\n" +"scale 16\n" +"scaledelta 4\n" "alpha 0.3\n" -"die 10\n" -"randomvel 32\n" -"veladd 16\n" -"rgb 128 128 128\n" -"rgbdelta 0 0 0\n" -"gravity 100\n" +"die 4\n" +"randomvel 8\n" +"veladd 15\n" +"rgb 140 140 140\n" +"rgbdelta -55 -55 -55\n" +"gravity -50\n" +"scalefactor 0.0\n" +"assoc shortfume\n" "}\n" //cool's blood trails (cos they're cooler) @@ -123,6 +202,7 @@ char *particle_set_spikeset = "randomvel 64\n" "veladd 10\n" "rotationspeed 90\n" +"rotationstart 0 360\n" "rgb 128 0 0\n" "gravity 200\n" "scalefactor 0.8\n" @@ -140,6 +220,7 @@ char *particle_set_spikeset = "randomvel 64\n" "veladd 10\n" "rotationspeed 90\n" +"rotationstart 0 360\n" "rgb 32 0 0\n" "gravity 200\n" "scalefactor 0.8\n" @@ -224,6 +305,7 @@ char *particle_set_spikeset = "gravity 200\n" "stains 2\n" "scalefactor 0.9\n" +"rotationstart 0 360\n" "}\n" //nq blood @@ -240,6 +322,7 @@ char *particle_set_spikeset = "gravity 200\n" "stains 2\n" "scalefactor 0.9\n" +"rotationstart 0 360\n" "}\n" ///////////////////////////////////////////////// @@ -1145,6 +1228,18 @@ char *particle_set_highfps = "spawnorg 64\n" "}\n" +"r_part te_railtrail\n" +"{\n" +"step 1000000\n" +"scale 5\n" +"die 1.2\n" +"alpha 0.7\n" +"rgb 16 16 255\n" +"blend add\n" +"type beam\n" +"averageout\n" +"}\n" + //the blob tempent is used quite a bit with teamfortress emp grenades. "r_part te_blob\n" "{\n" diff --git a/engine/partcfgs/highfps.cfg b/engine/partcfgs/highfps.cfg index 111bb9db4..b65d87702 100644 --- a/engine/partcfgs/highfps.cfg +++ b/engine/partcfgs/highfps.cfg @@ -104,7 +104,7 @@ r_part explosioncore r_part te_explosion { texture "particles/explosion" - count 8 + count 8 scale 60 alpha 0.5 die 1 @@ -115,11 +115,23 @@ r_part te_explosion spawnorg 64 } +r_part te_railtrail +{ + step 1000000 + scale 5 + die 1.2 + alpha 0.7 + rgb 16 16 255 + blend add + type beam + averageout +} + //the blob tempent is used quite a bit with teamfortress emp grenades. r_part te_blob { texture "particles/blob" - count 64 + count 64 scale 30 scalefactor 1 die 1 @@ -133,7 +145,7 @@ r_part te_blob r_part te_gunshot { texture "particles/spark" - count 2 + count 2 scale 3 alpha 0.7 die 0.5 @@ -145,7 +157,7 @@ r_part te_gunshot r_part te_lavasplash { texture "particles/lava" - count 180 + count 180 scale 60 alpha 0.5 die 1.6 @@ -158,7 +170,7 @@ r_part te_lavasplash r_part te_teleportsplash { texture "particles/teleport" - count 48 + count 48 scale 30 scalefactor 1 die 0.5 diff --git a/engine/partcfgs/spikeset.cfg b/engine/partcfgs/spikeset.cfg index e16601eec..312f1932d 100644 --- a/engine/partcfgs/spikeset.cfg +++ b/engine/partcfgs/spikeset.cfg @@ -79,34 +79,113 @@ r_part t_altrocket assoc rockettail } -//TeamFortress railgun (by model - this is also the effect used with the TE_LIGHTNING1 extension) -r_part te_railtrail +// te_railtrail, used with Quake 2 railgun and also used with +// TeamFortress engineer railgun +r_part railtrailinner { - texture "particles/b_rocket3" - step 15 - scale 10 + step 30 + scale 5 die 1 + alpha 0.5 rgb 255 255 255 blend add type beam + spawnvel 2 2 +} + +r_part railtrail240 +{ + step 15 + scale 3 + die 1 + alpha 0 + rgb 32 32 255 + rampmode delta + ramp -255 -255 0 -2.5 0 + ramp 0 0 0 0.65 0 + ramp 0 0 0 0.65 0 + ramp 0 0 0 0.65 0 + ramp 0 0 -128 0.65 10 + blend add + type beam spawnmode spiral - spawnvel 100 0 - cliptype te_railtrail - friction 0.7 + spawnparam1 256 + spawnparam2 240 + spawnvel 12 + assoc railtrailinner +} + +r_part railtrail120 +{ + step 15 + scale 3 + die 1 + alpha 0 + rgb 32 32 255 + rampmode delta + ramp -255 -255 0 -2.5 0 + ramp 0 0 0 0.65 0 + ramp 0 0 0 0.65 0 + ramp 0 0 0 0.65 0 + ramp 0 0 -128 0.65 10 + blend add + type beam + spawnmode spiral + spawnparam1 256 + spawnparam2 120 + spawnvel 12 + assoc railtrail240 +} + +r_part te_railtrail +{ + step 15 + scale 3 + die 1 + alpha 0 + rgb 32 32 255 + rampmode delta + ramp -255 -255 0 -2.5 0 + ramp 0 0 0 0.65 0 + ramp 0 0 0 0.65 0 + ramp 0 0 0 0.65 0 + ramp 0 0 -128 0.65 10 + blend add + type beam + spawnmode spiral + spawnparam1 256 + spawnvel 12 + assoc railtrail120 +} + +r_part shortfume +{ + texture "particles/smoke" + scale 15 + scaledelta 20 + alpha 0.5 + step 8 + die 0.3 + randomvel 12 + scaledelta 0.81 + rgb 150 150 150 } r_part t_grenade { - texture "particles/rtrail" - step 10 - scale 10 + texture "particles/smoke" + step 24 + scale 16 + scaledelta 4 alpha 0.3 - die 10 - randomvel 32 - veladd 16 - rgb 128 128 128 - rgbdelta 0 0 0 - gravity 100 + die 4 + randomvel 8 + veladd 15 + rgb 140 140 140 + rgbdelta -55 -55 -55 + gravity -50 + scalefactor 0.0 + assoc shortfume } //cool's blood trails (cos they're cooler)