From 65197aa75329976bbc6476a4d02adf257a6aa3cc Mon Sep 17 00:00:00 2001
From: thecelloman <silent.mike.hall@gmail.com>
Date: Tue, 2 Apr 2013 14:54:01 -0400
Subject: [PATCH] Moved teleporter related particle data out of the managed
 data file and into art/datablock/teleporter.cs.  I also corrected a bad
 filepath that would prevent mission loading.

---
 .../Full/game/art/datablocks/teleporter.cs    | 33 +++++++++++++++++++
 .../game/art/particles/managedParticleData.cs | 23 -------------
 .../particles/managedParticleEmitterData.cs   |  8 -----
 3 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/Templates/Full/game/art/datablocks/teleporter.cs b/Templates/Full/game/art/datablocks/teleporter.cs
index c5f29ebb2..168eea0b2 100644
--- a/Templates/Full/game/art/datablocks/teleporter.cs
+++ b/Templates/Full/game/art/datablocks/teleporter.cs
@@ -41,6 +41,39 @@ datablock SFXProfile(TeleportSound)
    preload = true;  
 };
 
+datablock ParticleData(TeleporterFlash : DefaultParticle)
+{
+   dragCoefficient = "30";
+   inheritedVelFactor = "0";
+   constantAcceleration = "0";
+   lifetimeMS = "500";
+   spinRandomMin = "-90";
+   spinRandomMax = "90";
+   textureName = "art/particles/flare.png";
+   animTexName = "art/particles/flare.png";
+   colors[0] = "0.678431 0.686275 0.913726 0.207";
+   colors[1] = "0 0.543307 1 0.759";
+   colors[2] = "0.0472441 0.181102 0.92126 0.838";
+   colors[3] = "0.141732 0.0393701 0.944882 0";
+   sizes[0] = "0";
+   sizes[1] = "0";
+   sizes[2] = "4";
+   sizes[3] = "0.1";
+   times[1] = "0.166667";
+   times[2] = "0.666667";
+   lifetimeVarianceMS = "0";
+   gravityCoefficient = "-9";
+};
+
+datablock ParticleEmitterData(TeleportFlash_Emitter : DefaultEmitter)
+{
+   ejectionVelocity = "0.1";
+   particles = "TeleporterFlash";
+   thetaMax = "180";
+   softnessDistance = "1";
+   ejectionOffset = "0.417";
+};
+
 // Particles to use for the emitter at the teleporter
 datablock ParticleData(TeleporterParticles)
 {
diff --git a/Templates/Full/game/art/particles/managedParticleData.cs b/Templates/Full/game/art/particles/managedParticleData.cs
index 5612bd98e..27c357ab8 100644
--- a/Templates/Full/game/art/particles/managedParticleData.cs
+++ b/Templates/Full/game/art/particles/managedParticleData.cs
@@ -23,26 +23,3 @@
 // This is the default save location for any Particle datablocks created in the
 // Particle Editor (this script is executed from onServerCreated())
 
-datablock ParticleData(TeleporterFlash : DefaultParticle)
-{
-   dragCoefficient = "30";
-   inheritedVelFactor = "0";
-   constantAcceleration = "0";
-   lifetimeMS = "500";
-   spinRandomMin = "-90";
-   spinRandomMax = "90";
-   textureName = "art/shapes/particles/flare.png";
-   animTexName = "art/shapes/particles/flare.png";
-   colors[0] = "0.678431 0.686275 0.913726 0.207";
-   colors[1] = "0 0.543307 1 0.759";
-   colors[2] = "0.0472441 0.181102 0.92126 0.838";
-   colors[3] = "0.141732 0.0393701 0.944882 0";
-   sizes[0] = "0";
-   sizes[1] = "0";
-   sizes[2] = "4";
-   sizes[3] = "0.1";
-   times[1] = "0.166667";
-   times[2] = "0.666667";
-   lifetimeVarianceMS = "0";
-   gravityCoefficient = "-9";
-};
diff --git a/Templates/Full/game/art/particles/managedParticleEmitterData.cs b/Templates/Full/game/art/particles/managedParticleEmitterData.cs
index 0c0fe5834..32de654c0 100644
--- a/Templates/Full/game/art/particles/managedParticleEmitterData.cs
+++ b/Templates/Full/game/art/particles/managedParticleEmitterData.cs
@@ -23,11 +23,3 @@
 // This is the default save location for any Particle Emitter datablocks created in the
 // Particle Editor (this script is executed from onServerCreated())
 
-datablock ParticleEmitterData(TeleportFlash_Emitter : DefaultEmitter)
-{
-   ejectionVelocity = "0.1";
-   particles = "TeleporterFlash";
-   thetaMax = "180";
-   softnessDistance = "1";
-   ejectionOffset = "0.417";
-};
\ No newline at end of file