From 599e7f9fcb34999c8c6aed837af92ccdfb55cf62 Mon Sep 17 00:00:00 2001
From: Ali-G <gauvain.dauchy@free.fr>
Date: Mon, 20 Jun 2011 19:46:50 +0200
Subject: Added a new pentagram for the boss cave.

---
 .../particles/pentagram-blacklinedraw.particle.xml | 145 +++++++++++++++++++++
 graphics/particles/pentagram-linedraw.particle.xml | 145 ---------------------
 .../particles/pentagram-redlinedraw.particle.xml   | 145 +++++++++++++++++++++
 npcs.xml                                           |   3 +-
 4 files changed, 292 insertions(+), 146 deletions(-)
 create mode 100644 graphics/particles/pentagram-blacklinedraw.particle.xml
 delete mode 100644 graphics/particles/pentagram-linedraw.particle.xml
 create mode 100644 graphics/particles/pentagram-redlinedraw.particle.xml

diff --git a/graphics/particles/pentagram-blacklinedraw.particle.xml b/graphics/particles/pentagram-blacklinedraw.particle.xml
new file mode 100644
index 00000000..5018e14d
--- /dev/null
+++ b/graphics/particles/pentagram-blacklinedraw.particle.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0"?>
+
+<!--
+Pentagram on floor effect with flashes along the lines.
+Based on the one by fate with simplified structure and modified to be a permanent effect.
+Particle count fluctuates around 800-1000
+
+               (0, -76.0),
+
+(-57, -35),                      (57, -35),
+
+
+   (-35, 33)]                [(35, 33),
+-->
+
+
+<effect>
+	<particle
+		position-x = "0"
+		position-y = "0"
+		position-z = "0"
+		>
+		<emitter>
+			<property name="position-y" value="-16"/>
+			<property name="horizontal-angle" min="0" max="360"/>
+			<property name="vertical-angle" min="0" max="0"/>
+			<property name="power" value="60"/>
+			<property name="lifetime" value="1"/>
+			<property name="output" value="5"/>
+			<emitter>
+				<property name="image" value="graphics/particles/gloworb-small.png|W:#000000"/>
+				<property name="lifetime" value="77"/>
+				<property name="fade-in" value="57"/>
+				<property name="fade-out" value="20"/>
+				<property name="output" value="1"/>
+			</emitter>
+		</emitter>
+
+
+                <emitter>
+                  <property name="position-x" value="57" />
+                  <property name="position-y" value="-35" />
+		  <property name="output" min="-50" max="1"/>
+                  <property name="lifetime" value="1"/>
+                  <emitter>
+		    <property name="horizontal-angle" value="180"/>
+		    <property name="vertical-angle" min="0" max="0"/>
+		    <property name="power" value="2"/>
+                    <property name="lifetime" value="57"/>
+		    <property name="image" value="graphics/particles/gloworb-small.png|W:#000000"/>
+                    <emitter>
+		      <property name="image" value="graphics/particles/gloworb-small.png|W:#000000"/>
+		      <property name="lifetime" value="20"/>
+		      <property name="fade-out" value="20"/>
+		      <property name="output" value="1"/>
+                    </emitter>
+                  </emitter>
+                </emitter>
+
+
+                <emitter>
+                  <property name="position-x" value="-57" />
+                  <property name="position-y" value="-35" />
+		  <property name="output" min="-50" max="1"/>
+                  <property name="lifetime" value="1"/>
+                  <emitter>
+		    <property name="horizontal-angle" value="36"/>
+		    <property name="vertical-angle" min="0" max="0"/>
+		    <property name="power" value="2"/>
+                    <property name="lifetime" value="57"/>
+		    <property name="image" value="graphics/particles/gloworb-small.png|W:#000000"/>
+                    <emitter>
+		      <property name="image" value="graphics/particles/gloworb-small.png|W:#000000"/>
+		      <property name="lifetime" value="20"/>
+		      <property name="fade-out" value="20"/>
+		      <property name="output" value="1"/>
+                    </emitter>
+                  </emitter>
+                </emitter>
+
+
+                <emitter>
+                  <property name="position-x" value="35" />
+                  <property name="position-y" value="33" />
+		  <property name="output" min="-50" max="1"/>
+                  <property name="lifetime" value="1"/>
+                  <emitter>
+		    <property name="horizontal-angle" value="252"/>
+		    <property name="vertical-angle" min="0" max="0"/>
+		    <property name="power" value="2"/>
+                    <property name="lifetime" value="57"/>
+		    <property name="image" value="graphics/particles/gloworb-small.png|W:#000000"/>
+                    <emitter>
+		      <property name="image" value="graphics/particles/gloworb-small.png|W:#000000"/>
+		      <property name="lifetime" value="20"/>
+		      <property name="fade-out" value="20"/>
+		      <property name="output" value="1"/>
+                    </emitter>
+                  </emitter>
+                </emitter>
+
+                <emitter>
+                  <property name="position-y" value="-76" />
+                  <property name="position-x" value="0" />
+		  <property name="output" min="-50" max="1"/>
+                  <property name="lifetime" value="1"/>
+                  <emitter>
+		    <property name="horizontal-angle" value="108"/>
+		    <property name="vertical-angle" min="0" max="0"/>
+		    <property name="power" value="2"/>
+                    <property name="lifetime" value="57"/>
+		    <property name="image" value="graphics/particles/gloworb-small.png|W:#000000"/>
+                    <emitter>
+		      <property name="image" value="graphics/particles/gloworb-small.png|W:#000000"/>
+		      <property name="lifetime" value="20"/>
+		      <property name="fade-out" value="20"/>
+		      <property name="output" value="1"/>
+                    </emitter>
+                  </emitter>
+                </emitter>
+
+
+                <emitter>
+                  <property name="position-x" value="-35" />
+                  <property name="position-y" value="33" />
+		  <property name="output" min="-50" max="1"/>
+                  <property name="lifetime" value="1"/>
+                  <emitter>
+		    <property name="horizontal-angle" value="324"/>
+		    <property name="vertical-angle" min="0" max="0"/>
+		    <property name="power" value="2"/>
+                    <property name="lifetime" value="57"/>
+		    <property name="image" value="graphics/particles/gloworb-small.png|W:#000000"/>
+                    <emitter>
+		      <property name="image" value="graphics/particles/gloworb-small.png|W:#000000"/>
+		      <property name="lifetime" value="20"/>
+		      <property name="fade-out" value="20"/>
+		      <property name="output" value="1"/>
+                    </emitter>
+                  </emitter>
+                </emitter>
+
+	</particle>
+</effect>
+
diff --git a/graphics/particles/pentagram-linedraw.particle.xml b/graphics/particles/pentagram-linedraw.particle.xml
deleted file mode 100644
index 4316b047..00000000
--- a/graphics/particles/pentagram-linedraw.particle.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-Pentagram on floor effect with flashes along the lines.
-Based on the one by fate with simplified structure and modified to be a permanent effect.
-Particle count fluctuates around 800-1000
-
-               (0, -76.0),
-
-(-57, -35),                      (57, -35),
-
-
-   (-35, 33)]                [(35, 33),
--->
-
-
-<effect>
-	<particle
-		position-x = "0"
-		position-y = "0"
-		position-z = "0"
-		>
-		<emitter>
-			<property name="position-y" value="-16"/>
-			<property name="horizontal-angle" min="0" max="360"/>
-			<property name="vertical-angle" min="0" max="0"/>
-			<property name="power" value="60"/>
-			<property name="lifetime" value="1"/>
-			<property name="output" value="5"/>
-			<emitter>
-				<property name="image" value="graphics/particles/gloworb-small.png|W:#ffffff"/>
-				<property name="lifetime" value="77"/>
-				<property name="fade-in" value="57"/>
-				<property name="fade-out" value="20"/>
-				<property name="output" value="1"/>
-			</emitter>
-		</emitter>
-
-
-                <emitter>
-                  <property name="position-x" value="57" />
-                  <property name="position-y" value="-35" />
-		  <property name="output" min="-50" max="1"/>
-                  <property name="lifetime" value="1"/>
-                  <emitter>
-		    <property name="horizontal-angle" value="180"/>
-		    <property name="vertical-angle" min="0" max="0"/>
-		    <property name="power" value="2"/>
-                    <property name="lifetime" value="57"/>
-		    <property name="image" value="graphics/particles/gloworb-small.png|W:#ffffff"/>
-                    <emitter>
-		      <property name="image" value="graphics/particles/gloworb-small.png|W:#ffffff"/>
-		      <property name="lifetime" value="20"/>
-		      <property name="fade-out" value="20"/>
-		      <property name="output" value="1"/>
-                    </emitter>
-                  </emitter>
-                </emitter>
-
-
-                <emitter>
-                  <property name="position-x" value="-57" />
-                  <property name="position-y" value="-35" />
-		  <property name="output" min="-50" max="1"/>
-                  <property name="lifetime" value="1"/>
-                  <emitter>
-		    <property name="horizontal-angle" value="36"/>
-		    <property name="vertical-angle" min="0" max="0"/>
-		    <property name="power" value="2"/>
-                    <property name="lifetime" value="57"/>
-		    <property name="image" value="graphics/particles/gloworb-small.png|W:#ffffff"/>
-                    <emitter>
-		      <property name="image" value="graphics/particles/gloworb-small.png|W:#ffffff"/>
-		      <property name="lifetime" value="20"/>
-		      <property name="fade-out" value="20"/>
-		      <property name="output" value="1"/>
-                    </emitter>
-                  </emitter>
-                </emitter>
-
-
-                <emitter>
-                  <property name="position-x" value="35" />
-                  <property name="position-y" value="33" />
-		  <property name="output" min="-50" max="1"/>
-                  <property name="lifetime" value="1"/>
-                  <emitter>
-		    <property name="horizontal-angle" value="252"/>
-		    <property name="vertical-angle" min="0" max="0"/>
-		    <property name="power" value="2"/>
-                    <property name="lifetime" value="57"/>
-		    <property name="image" value="graphics/particles/gloworb-small.png|W:#ffffff"/>
-                    <emitter>
-		      <property name="image" value="graphics/particles/gloworb-small.png|W:#ffffff"/>
-		      <property name="lifetime" value="20"/>
-		      <property name="fade-out" value="20"/>
-		      <property name="output" value="1"/>
-                    </emitter>
-                  </emitter>
-                </emitter>
-
-                <emitter>
-                  <property name="position-y" value="-76" />
-                  <property name="position-x" value="0" />
-		  <property name="output" min="-50" max="1"/>
-                  <property name="lifetime" value="1"/>
-                  <emitter>
-		    <property name="horizontal-angle" value="108"/>
-		    <property name="vertical-angle" min="0" max="0"/>
-		    <property name="power" value="2"/>
-                    <property name="lifetime" value="57"/>
-		    <property name="image" value="graphics/particles/gloworb-small.png|W:#ffffff"/>
-                    <emitter>
-		      <property name="image" value="graphics/particles/gloworb-small.png|W:#ffffff"/>
-		      <property name="lifetime" value="20"/>
-		      <property name="fade-out" value="20"/>
-		      <property name="output" value="1"/>
-                    </emitter>
-                  </emitter>
-                </emitter>
-
-
-                <emitter>
-                  <property name="position-x" value="-35" />
-                  <property name="position-y" value="33" />
-		  <property name="output" min="-50" max="1"/>
-                  <property name="lifetime" value="1"/>
-                  <emitter>
-		    <property name="horizontal-angle" value="324"/>
-		    <property name="vertical-angle" min="0" max="0"/>
-		    <property name="power" value="2"/>
-                    <property name="lifetime" value="57"/>
-		    <property name="image" value="graphics/particles/gloworb-small.png|W:#ffffff"/>
-                    <emitter>
-		      <property name="image" value="graphics/particles/gloworb-small.png|W:#ffffff"/>
-		      <property name="lifetime" value="20"/>
-		      <property name="fade-out" value="20"/>
-		      <property name="output" value="1"/>
-                    </emitter>
-                  </emitter>
-                </emitter>
-
-	</particle>
-</effect>
-
diff --git a/graphics/particles/pentagram-redlinedraw.particle.xml b/graphics/particles/pentagram-redlinedraw.particle.xml
new file mode 100644
index 00000000..885fa2a0
--- /dev/null
+++ b/graphics/particles/pentagram-redlinedraw.particle.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0"?>
+
+<!--
+Pentagram on floor effect with flashes along the lines.
+Based on the one by fate with simplified structure and modified to be a permanent effect.
+Particle count fluctuates around 800-1000
+
+               (0, -76.0),
+
+(-57, -35),                      (57, -35),
+
+
+   (-35, 33)]                [(35, 33),
+-->
+
+
+<effect>
+	<particle
+		position-x = "0"
+		position-y = "0"
+		position-z = "0"
+		>
+		<emitter>
+			<property name="position-y" value="-16"/>
+			<property name="horizontal-angle" min="0" max="360"/>
+			<property name="vertical-angle" min="0" max="0"/>
+			<property name="power" value="60"/>
+			<property name="lifetime" value="1"/>
+			<property name="output" value="5"/>
+			<emitter>
+				<property name="image" value="graphics/particles/gloworb-small.png|W:#ff0000"/>
+				<property name="lifetime" value="77"/>
+				<property name="fade-in" value="57"/>
+				<property name="fade-out" value="20"/>
+				<property name="output" value="1"/>
+			</emitter>
+		</emitter>
+
+
+                <emitter>
+                  <property name="position-x" value="57" />
+                  <property name="position-y" value="-35" />
+		  <property name="output" min="-50" max="1"/>
+                  <property name="lifetime" value="1"/>
+                  <emitter>
+		    <property name="horizontal-angle" value="180"/>
+		    <property name="vertical-angle" min="0" max="0"/>
+		    <property name="power" value="2"/>
+                    <property name="lifetime" value="57"/>
+		    <property name="image" value="graphics/particles/gloworb-small.png|W:#ff0000"/>
+                    <emitter>
+		      <property name="image" value="graphics/particles/gloworb-small.png|W:#ff0000"/>
+		      <property name="lifetime" value="20"/>
+		      <property name="fade-out" value="20"/>
+		      <property name="output" value="1"/>
+                    </emitter>
+                  </emitter>
+                </emitter>
+
+
+                <emitter>
+                  <property name="position-x" value="-57" />
+                  <property name="position-y" value="-35" />
+		  <property name="output" min="-50" max="1"/>
+                  <property name="lifetime" value="1"/>
+                  <emitter>
+		    <property name="horizontal-angle" value="36"/>
+		    <property name="vertical-angle" min="0" max="0"/>
+		    <property name="power" value="2"/>
+                    <property name="lifetime" value="57"/>
+		    <property name="image" value="graphics/particles/gloworb-small.png|W:#ff0000"/>
+                    <emitter>
+		      <property name="image" value="graphics/particles/gloworb-small.png|W:#ff0000"/>
+		      <property name="lifetime" value="20"/>
+		      <property name="fade-out" value="20"/>
+		      <property name="output" value="1"/>
+                    </emitter>
+                  </emitter>
+                </emitter>
+
+
+                <emitter>
+                  <property name="position-x" value="35" />
+                  <property name="position-y" value="33" />
+		  <property name="output" min="-50" max="1"/>
+                  <property name="lifetime" value="1"/>
+                  <emitter>
+		    <property name="horizontal-angle" value="252"/>
+		    <property name="vertical-angle" min="0" max="0"/>
+		    <property name="power" value="2"/>
+                    <property name="lifetime" value="57"/>
+		    <property name="image" value="graphics/particles/gloworb-small.png|W:#ff0000"/>
+                    <emitter>
+		      <property name="image" value="graphics/particles/gloworb-small.png|W:#ff0000"/>
+		      <property name="lifetime" value="20"/>
+		      <property name="fade-out" value="20"/>
+		      <property name="output" value="1"/>
+                    </emitter>
+                  </emitter>
+                </emitter>
+
+                <emitter>
+                  <property name="position-y" value="-76" />
+                  <property name="position-x" value="0" />
+		  <property name="output" min="-50" max="1"/>
+                  <property name="lifetime" value="1"/>
+                  <emitter>
+		    <property name="horizontal-angle" value="108"/>
+		    <property name="vertical-angle" min="0" max="0"/>
+		    <property name="power" value="2"/>
+                    <property name="lifetime" value="57"/>
+		    <property name="image" value="graphics/particles/gloworb-small.png|W:#ff0000"/>
+                    <emitter>
+		      <property name="image" value="graphics/particles/gloworb-small.png|W:#ff0000"/>
+		      <property name="lifetime" value="20"/>
+		      <property name="fade-out" value="20"/>
+		      <property name="output" value="1"/>
+                    </emitter>
+                  </emitter>
+                </emitter>
+
+
+                <emitter>
+                  <property name="position-x" value="-35" />
+                  <property name="position-y" value="33" />
+		  <property name="output" min="-50" max="1"/>
+                  <property name="lifetime" value="1"/>
+                  <emitter>
+		    <property name="horizontal-angle" value="324"/>
+		    <property name="vertical-angle" min="0" max="0"/>
+		    <property name="power" value="2"/>
+                    <property name="lifetime" value="57"/>
+		    <property name="image" value="graphics/particles/gloworb-small.png|W:#ff0000"/>
+                    <emitter>
+		      <property name="image" value="graphics/particles/gloworb-small.png|W:#ff0000"/>
+		      <property name="lifetime" value="20"/>
+		      <property name="fade-out" value="20"/>
+		      <property name="output" value="1"/>
+                    </emitter>
+                  </emitter>
+                </emitter>
+
+	</particle>
+</effect>
+
diff --git a/npcs.xml b/npcs.xml
index 3cc18159..ff85a0a4 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -155,6 +155,7 @@
 <npc id="321"><sprite>npcs/npc-undeadbanker.xml</sprite></npc><!-- Undead banker -->
 <npc id="322"><sprite>npcs/npc-gate-closed.xml</sprite></npc><!-- Closed version of the crypt entrance gate -->
 <npc id="323"><sprite>npcs/npc-gate-open.xml</sprite></npc><!-- Open version of the crypt entrance gate -->
-<npc id="324"><particlefx>graphics/particles/pentagram-linedraw.particle.xml</particlefx></npc>
+<npc id="324"><particlefx>graphics/particles/pentagram-redlinedraw.particle.xml</particlefx></npc>
+<npc id="325"><particlefx>graphics/particles/pentagram-blacklinedraw.particle.xml</particlefx></npc>
 <!-- note: don't go above 999, because the 1000's are reserved for mob id -->
 </npcs>
-- 
cgit v1.2.3-70-g09d2