From: Martin Taibr <taibr.martin@gmail.com>
Date: Tue, 3 Jul 2018 01:35:20 +0000 (+0200)
Subject: copy effects from one dumb format into another
X-Git-Tag: xonotic-v0.8.5~1797^2~1^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a5fd389dcc93903fa9c597b87fab5b9634fc4908;p=xonotic%2Fxonotic-data.pk3dir.git

copy effects from one dumb format into another
---

diff --git a/qcsrc/common/effects/effectinfo.inc b/qcsrc/common/effects/effectinfo.inc
index c8273ecb2..1e4cdca05 100644
--- a/qcsrc/common/effects/effectinfo.inc
+++ b/qcsrc/common/effects/effectinfo.inc
@@ -4416,19 +4416,31 @@ SUB(flac_explode) {
 // bullet trail (somewhat like a tracer)
 DEF(tr_bullet);
 SUB(tr_bullet) {
-	MY(alpha_min) = 256;
-	MY(alpha_max) = 256;
-	MY(alpha_fade) = 2560;
-	MY(color_min) = "0xff8960";
-	MY(color_max) = "0xff8533";
-	MY(size_min) = 4;
-	MY(size_max) = 4;
-	MY(stretchfactor) = 0.200000;
-	MY(tex_min) = 70;
-	MY(tex_max) = 70;
-	MY(trailspacing) = 750;
-	MY(type) = "spark";
-	MY(velocitymultiplier) = 3;
+	MY(alpha) = '500 600 10000';
+	MY(color_min) = "0xf03000";
+	MY(color_max) = "0xff6010";
+	MY(countabsolute) = 1;
+	MY(sizeincrease) = -3;
+	MY(size_min) = 0.6;
+	MY(size_max) = 0.8;
+	my(tex_min) = 200;
+	my(tex_max) = 200;
+	MY(type) = "beam";
+}
+SUB(tr_bullet) {
+	MY(airfriction) = -4;
+	MY(alpha) = '256 256 350';
+	MY(color_min) = "0x202020";
+	MY(color_max) = "0x404040";
+	MY(notunderwater) = true;
+	MY(sizeincrease) = 0.4;
+	MY(size_min) = 1;
+	MY(size_max) = 2;
+	MY(tex_min) = 0;
+	MY(tex_max) = 8;
+	MY(trailspacing) = 16;
+	MY(type) = "smoke";
+	MY(velocityjitter) = '4 4 4';
 }
 
 // smoke emitter for small pipes