From 40b84704fe52e7b4d28224d0be9fb3f922071a14 Mon Sep 17 00:00:00 2001
From: David Dormagen <czapper@gmx.de>
Date: Mon, 4 Nov 2013 12:22:52 +0100
Subject: [PATCH] adapted Trajectory particle and occurences to new particle
 system

---
 .../Trajectory.ocd/Aimer.ocd/Graphics.png        | Bin 962 -> 0 bytes
 .../Trajectory.ocd/Aimer.ocd/Particle.txt        |  11 -----------
 .../Effects.ocd/Trajectory.ocd/Script.c          |  15 +++++++++++++--
 planet/System.ocg/Particles.c                    |   9 +++++++++
 4 files changed, 22 insertions(+), 13 deletions(-)
 delete mode 100644 planet/Objects.ocd/Effects.ocd/Trajectory.ocd/Aimer.ocd/Graphics.png
 delete mode 100644 planet/Objects.ocd/Effects.ocd/Trajectory.ocd/Aimer.ocd/Particle.txt

diff --git a/planet/Objects.ocd/Effects.ocd/Trajectory.ocd/Aimer.ocd/Graphics.png b/planet/Objects.ocd/Effects.ocd/Trajectory.ocd/Aimer.ocd/Graphics.png
deleted file mode 100644
index 51b19588a70372507b9944dbb2101677ba539753..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 962
zcmV;z13mnSP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01EH`01EH{Laa2H00007bV*G`2igV-
z0v{9A>>C3B00TlvL_t(o!_8M~bJ{=*T-oLgfrkG7f7tLgU~JS6T`@a~8#4LO#xt6;
z;e5MVNq4g0$>r`aGq}3}FaQ;RlB022M{7B{nc*{+eFQ9Xh5*JgR<r_u6ZA&A0yqO`
z0CdlY*c0#pfGL1E#|eNDiIhU%PVff61wakp$nk7u{uKff057x!fEj-aB?^*okw3hz
z0h|Er0qg)A&8&-X>Q(iC8$nmJC7)+PVjv*^!BzeP6^Qv8ci#ZGWfIk2z+VBZ2_8g(
zz?5MqdvYM;pUS)-Y5?9i?>zyLeMJJV0DjPx3`69?SgOG#0WXw3LN(wVa9#^wOTzCI
z7!qhH;Oj(UP8D=<mjpah`XMb!^-gO!?+~G==(*9uRRUiF_{lL6a!wDU6qUe<1XKYC
zfgAInF|#WGRNQ1n^lTwOOYwe9axV-)C>J>};uzs6>6DVw5}msH9|98lnV6DT36Y5`
zuJz<XNRzXb(9|iBk7jm@44u%XGGQT#Ecu&)n|K*A7mWQPmE}BzXTo{6igB7G5_7Q?
z#{e&+tRP9IN{mT5s$wQPY1r7^PmxFiGKw*_+o{MNprt$`C0QrWBL(C0NN@%K%1Yu^
z3YkhuX&`c!i9m!v!{IV_DC<?}{SrV?iKM!4kzRtx-=}~{65i!m*C@ovz$l7m?SKGS
zx;IgwNcQ1TuUC=c*QH&nlLYHq)O(&iZN0iqoSK1gFA{j1YOQP@O<LT0fIN|j9-)!-
zTETfZTL@?)<CSC0I&NjrKI@W#&JsM+E?n~}I5z-Y#hbHObTdbm;g)5zkT7`K3+^d=
z7d9h%u5%J+9;D0+6<;`~PNrs45j7lp!Bldm=#jjmmj@Exi!;YWqS3?XOyHBWQn7Ii
z<kV}qt7$2@cz@-)ZvZxI$95#7>(|j8#bI>i9|t+nhN*_5=Ud4C+7DdC(=7>XX*&tY
z2|yifS;ZT7_e0tyHNKH2r_>i_0ujQHe+%H3D6$3cW@gt%Ln3i($aL64pp}E=GcDO(
z2yBwo03MC$gMj41Rx(`ohO-cO)|4J-yYQOed+i6`b;V}p?!HgbhrC~D%MVF~+qe5L
k`JSI<|NZ0iUw)qd28KuJL|;Cr4FCWD07*qoM6N<$g0iZk>;M1&

diff --git a/planet/Objects.ocd/Effects.ocd/Trajectory.ocd/Aimer.ocd/Particle.txt b/planet/Objects.ocd/Effects.ocd/Trajectory.ocd/Aimer.ocd/Particle.txt
deleted file mode 100644
index 7ffb0e151..000000000
--- a/planet/Objects.ocd/Effects.ocd/Trajectory.ocd/Aimer.ocd/Particle.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-[Particle]
-Name=Trajectory
-MaxCount=1000
-InitFn=StdInit
-ExecFn=StdExec
-DrawFn=Std
-Face=0,0,32,32,-32,-32
-Delay=0
-Additive=1
-Attach=1
-RByV=2
\ No newline at end of file
diff --git a/planet/Objects.ocd/Effects.ocd/Trajectory.ocd/Script.c b/planet/Objects.ocd/Effects.ocd/Trajectory.ocd/Script.c
index 074024aa9..6d02a0a55 100644
--- a/planet/Objects.ocd/Effects.ocd/Trajectory.ocd/Script.c
+++ b/planet/Objects.ocd/Effects.ocd/Trajectory.ocd/Script.c
@@ -34,6 +34,18 @@ global func AddTrajectory(object pObj, int iX, int iY, int iXDir, int iYDir, int
 	iYDir *= 5; iXDir *= 5;
 	iY -= 4*iFaktor;
 	iXOld = iX; iYOld = iY;
+	if (!spacing) spacing = 10;
+	
+	// particle setup
+	var particles =
+	{
+		Prototype = Particles_Trajectory(),
+		R = (iColor >> 16) & 0xff,
+		G = (iColor >>  8) & 0xff,
+		B = (iColor >>  0) & 0xff,
+		Alpha = (iColor >> 24) & 0xff
+	};
+	
 	// Trajectory simulation
 	while(++i < 500)
 	{
@@ -41,10 +53,9 @@ global func AddTrajectory(object pObj, int iX, int iY, int iXDir, int iYDir, int
 		iX += iXDir;
 		iY += iYDir + GetGravity() * i / 22;
 		// If we are far enough away insert a new point
-	if(!spacing) spacing = 10;
 		if(Distance((iXOld - iX) / iFaktor, (iYOld - iY) / iFaktor) >= spacing)
 		{
-			CreateParticle("Trajectory", iX/iFaktor - pTrajectory->GetX(), iY/iFaktor - pTrajectory->GetY(), iXDir/500, iYDir/500, 15, iColor, pTrajectory);
+			pTrajectory->CreateParticleEx("Magic", iX/iFaktor - pTrajectory->GetX(), iY/iFaktor - pTrajectory->GetY(), 0, 0, 0, particles);
 			iXOld = iX; iYOld = iY;
 		}
 		// Or is it here already?
diff --git a/planet/System.ocg/Particles.c b/planet/System.ocg/Particles.c
index 369d9c766..faaf1d3c5 100644
--- a/planet/System.ocg/Particles.c
+++ b/planet/System.ocg/Particles.c
@@ -156,3 +156,12 @@ global func Particles_Material(int color)
 		B = (color >>  0) & 0xff
 	};
 }
+
+global func Particles_Trajectory()
+{
+	return
+	{
+		BlitMode = GFX_BLIT_Additive,
+		Attach = ATTACH_Front | ATTACH_MoveRelative
+	};
+}