From 0c1c198184bed808eed434915d5649a82a79f92a Mon Sep 17 00:00:00 2001
From: Reid <reidyaro@gmail.com>
Date: Mon, 30 Apr 2012 17:21:43 +0200
Subject: Change savepoints particle effects, Add fake collision on 000-2-1
 map, Comment WIP NPC on npcs.xml .

---
 graphics/particles/savepoint-32x32.xml           | 32 ----------------------
 graphics/particles/savepoint-32x64.xml           | 32 ----------------------
 graphics/particles/savepoint-64x32.xml           | 32 ----------------------
 graphics/particles/savepoint-64x64.xml           | 32 ----------------------
 graphics/particles/savepoint/savepoint-32x32.xml | 34 ++++++++++++++++++++++++
 graphics/particles/savepoint/savepoint-32x64.xml | 32 ++++++++++++++++++++++
 graphics/particles/savepoint/savepoint-64x32.xml | 32 ++++++++++++++++++++++
 graphics/particles/savepoint/savepoint-64x64.xml | 32 ++++++++++++++++++++++
 maps/000-2-1.tmx                                 |  2 +-
 npcs.xml                                         | 26 +++++++++---------
 10 files changed, 144 insertions(+), 142 deletions(-)
 delete mode 100644 graphics/particles/savepoint-32x32.xml
 delete mode 100644 graphics/particles/savepoint-32x64.xml
 delete mode 100644 graphics/particles/savepoint-64x32.xml
 delete mode 100644 graphics/particles/savepoint-64x64.xml
 create mode 100644 graphics/particles/savepoint/savepoint-32x32.xml
 create mode 100644 graphics/particles/savepoint/savepoint-32x64.xml
 create mode 100644 graphics/particles/savepoint/savepoint-64x32.xml
 create mode 100644 graphics/particles/savepoint/savepoint-64x64.xml

diff --git a/graphics/particles/savepoint-32x32.xml b/graphics/particles/savepoint-32x32.xml
deleted file mode 100644
index 9c6880c5..00000000
--- a/graphics/particles/savepoint-32x32.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<effect>
-	<particle position-x="0" position-y="0" position-z="24">
-		<emitter>
-			<property name="position-x" min="0" max="32"/>
-			<property name="position-y" min="0" max="32"/>
-			<property name="image" value="graphics/particles/orb-medium.png|W:#ff0000"/>
-			<property name="gravity" value="-0.003"/>
-			<property name="lifetime" value="100"/>
-			<property name="output" min="0" max="1"/>
-			<property name="output-pause" min="0" max="10"/>
-			<property name="fade-in" value="15"/>
-			<property name="fade-out" value="20"/>
-		</emitter>
-	</particle>
-	<particle position-x="16" position-y="0" position-z="16">
-		<emitter>
-			<property name="position-x" min="0" max="16"/>
-			<property name="position-y" min="0" max="16"/>
-			<property name="image" value="graphics/particles/orb-medium.png|W:#0000ff"/>
-			<property name="horizontal-angle" min="0" max="360"/>
-			<property name="vertical-angle" min="0" max="360"/>
-			<property name="power" min="0.4" max="0.8"/>
-			<property name="lifetime" value="100"/>
-			<property name="fade-in" value="15"/>
-			<property name="fade-out" value="20"/>
-			<property name="output" min="-20" max="1"/>
-			<property name="acceleration" value="0.03"/>
-			<property name="alpha" value="0.5"/>
-		</emitter>
-	</particle>
-</effect>
\ No newline at end of file
diff --git a/graphics/particles/savepoint-32x64.xml b/graphics/particles/savepoint-32x64.xml
deleted file mode 100644
index 61b768b0..00000000
--- a/graphics/particles/savepoint-32x64.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<effect>
-	<particle position-x="0" position-y="0" position-z="56">
-		<emitter>
-			<property name="position-x" min="0" max="32"/>
-			<property name="position-y" min="0" max="64"/>
-			<property name="image" value="graphics/particles/orb-medium.png|W:#ff0000"/>
-			<property name="gravity" value="-0.003"/>
-			<property name="lifetime" value="100"/>
-			<property name="output" min="0" max="1"/>
-			<property name="output-pause" min="0" max="10"/>
-			<property name="fade-in" value="15"/>
-			<property name="fade-out" value="20"/>
-		</emitter>
-	</particle>
-	<particle position-x="16" position-y="0" position-z="32">
-		<emitter>
-			<property name="position-x" min="0" max="16"/>
-			<property name="position-y" min="0" max="32"/>
-			<property name="image" value="graphics/particles/orb-medium.png|W:#0000ff"/>
-			<property name="horizontal-angle" min="0" max="360"/>
-			<property name="vertical-angle" min="0" max="360"/>
-			<property name="power" min="0.4" max="0.8"/>
-			<property name="lifetime" value="100"/>
-			<property name="fade-in" value="15"/>
-			<property name="fade-out" value="20"/>
-			<property name="output" min="-20" max="1"/>
-			<property name="acceleration" value="0.03"/>
-			<property name="alpha" value="0.5"/>
-		</emitter>
-	</particle>
-</effect>
\ No newline at end of file
diff --git a/graphics/particles/savepoint-64x32.xml b/graphics/particles/savepoint-64x32.xml
deleted file mode 100644
index 14443882..00000000
--- a/graphics/particles/savepoint-64x32.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<effect>
-	<particle position-x="0" position-y="0" position-z="24">
-		<emitter>
-			<property name="position-x" min="0" max="64"/>
-			<property name="position-y" min="0" max="32"/>
-			<property name="image" value="graphics/particles/orb-medium.png|W:#ff0000"/>
-			<property name="gravity" value="-0.003"/>
-			<property name="lifetime" value="100"/>
-			<property name="output" min="0" max="1"/>
-			<property name="output-pause" min="0" max="10"/>
-			<property name="fade-in" value="15"/>
-			<property name="fade-out" value="20"/>
-		</emitter>
-	</particle>
-	<particle position-x="32" position-y="0" position-z="16">
-		<emitter>
-			<property name="position-x" min="0" max="32"/>
-			<property name="position-y" min="0" max="16"/>
-			<property name="image" value="graphics/particles/orb-medium.png|W:#0000ff"/>
-			<property name="horizontal-angle" min="0" max="360"/>
-			<property name="vertical-angle" min="0" max="360"/>
-			<property name="power" min="0.4" max="0.8"/>
-			<property name="lifetime" value="100"/>
-			<property name="fade-in" value="15"/>
-			<property name="fade-out" value="20"/>
-			<property name="output" min="-20" max="1"/>
-			<property name="acceleration" value="0.03"/>
-			<property name="alpha" value="0.5"/>
-		</emitter>
-	</particle>
-</effect>
\ No newline at end of file
diff --git a/graphics/particles/savepoint-64x64.xml b/graphics/particles/savepoint-64x64.xml
deleted file mode 100644
index 0140064b..00000000
--- a/graphics/particles/savepoint-64x64.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<effect>
-	<particle position-x="0" position-y="0" position-z="56">
-		<emitter>
-			<property name="position-x" min="0" max="64"/>
-			<property name="position-y" min="0" max="64"/>
-			<property name="image" value="graphics/particles/orb-medium.png|W:#ff0000"/>
-			<property name="gravity" value="-0.003"/>
-			<property name="lifetime" value="100"/>
-			<property name="output" min="0" max="1"/>
-			<property name="output-pause" min="0" max="10"/>
-			<property name="fade-in" value="15"/>
-			<property name="fade-out" value="20"/>
-		</emitter>
-	</particle>
-	<particle position-x="32" position-y="0" position-z="32">
-		<emitter>
-			<property name="position-x" min="0" max="32"/>
-			<property name="position-y" min="0" max="32"/>
-			<property name="image" value="graphics/particles/orb-medium.png|W:#0000ff"/>
-			<property name="horizontal-angle" min="0" max="360"/>
-			<property name="vertical-angle" min="0" max="360"/>
-			<property name="power" min="0.4" max="0.8"/>
-			<property name="lifetime" value="100"/>
-			<property name="fade-in" value="15"/>
-			<property name="fade-out" value="20"/>
-			<property name="output" min="-20" max="1"/>
-			<property name="acceleration" value="0.03"/>
-			<property name="alpha" value="0.5"/>
-		</emitter>
-	</particle>
-</effect>
\ No newline at end of file
diff --git a/graphics/particles/savepoint/savepoint-32x32.xml b/graphics/particles/savepoint/savepoint-32x32.xml
new file mode 100644
index 00000000..de08b4a5
--- /dev/null
+++ b/graphics/particles/savepoint/savepoint-32x32.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<effect>
+	<particle
+		position-x = "0"
+		position-y = "0"
+		position-z = "0"
+		>
+		<emitter>
+			<property name="position-z" value="16" />
+			<property name="vertical-angle" min="0" max="90"/>
+			<property name="horizontal-angle" min="0" max="360"/>
+			<property name="power" min="20" max="24"/>
+			<property name="lifetime" value="1"/>
+			<property name="output" value="1"/>
+			<emitter>
+				<property name="image" value="graphics/particles/orb-small.png|W:#fffebe"/>
+				<property name="gravity" value="-0.003"/>
+				<property name="lifetime" value="100"/>
+				<property name="output" min="0" max="1"/>
+				<property name="output-pause" min="0" max="10"/>
+				<property name="fade-in" value="15"/>
+				<property name="fade-out" value="20"/>
+			</emitter>
+			<emitter>
+				<property name="image" value="graphics/particles/star-small.png|W:#f3ffbe,f3ffe3"/>
+				<property name="lifetime" value="160"/>
+				<property name="output" min="-20" max="1"/>
+				<property name="fade-in" value="40" />
+				<property name="fade-out" value="40" />
+				<property name="gravity" value="-0.003"/>
+			</emitter>
+		</emitter>
+	</particle>
+</effect>
\ No newline at end of file
diff --git a/graphics/particles/savepoint/savepoint-32x64.xml b/graphics/particles/savepoint/savepoint-32x64.xml
new file mode 100644
index 00000000..61b768b0
--- /dev/null
+++ b/graphics/particles/savepoint/savepoint-32x64.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<effect>
+	<particle position-x="0" position-y="0" position-z="56">
+		<emitter>
+			<property name="position-x" min="0" max="32"/>
+			<property name="position-y" min="0" max="64"/>
+			<property name="image" value="graphics/particles/orb-medium.png|W:#ff0000"/>
+			<property name="gravity" value="-0.003"/>
+			<property name="lifetime" value="100"/>
+			<property name="output" min="0" max="1"/>
+			<property name="output-pause" min="0" max="10"/>
+			<property name="fade-in" value="15"/>
+			<property name="fade-out" value="20"/>
+		</emitter>
+	</particle>
+	<particle position-x="16" position-y="0" position-z="32">
+		<emitter>
+			<property name="position-x" min="0" max="16"/>
+			<property name="position-y" min="0" max="32"/>
+			<property name="image" value="graphics/particles/orb-medium.png|W:#0000ff"/>
+			<property name="horizontal-angle" min="0" max="360"/>
+			<property name="vertical-angle" min="0" max="360"/>
+			<property name="power" min="0.4" max="0.8"/>
+			<property name="lifetime" value="100"/>
+			<property name="fade-in" value="15"/>
+			<property name="fade-out" value="20"/>
+			<property name="output" min="-20" max="1"/>
+			<property name="acceleration" value="0.03"/>
+			<property name="alpha" value="0.5"/>
+		</emitter>
+	</particle>
+</effect>
\ No newline at end of file
diff --git a/graphics/particles/savepoint/savepoint-64x32.xml b/graphics/particles/savepoint/savepoint-64x32.xml
new file mode 100644
index 00000000..14443882
--- /dev/null
+++ b/graphics/particles/savepoint/savepoint-64x32.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<effect>
+	<particle position-x="0" position-y="0" position-z="24">
+		<emitter>
+			<property name="position-x" min="0" max="64"/>
+			<property name="position-y" min="0" max="32"/>
+			<property name="image" value="graphics/particles/orb-medium.png|W:#ff0000"/>
+			<property name="gravity" value="-0.003"/>
+			<property name="lifetime" value="100"/>
+			<property name="output" min="0" max="1"/>
+			<property name="output-pause" min="0" max="10"/>
+			<property name="fade-in" value="15"/>
+			<property name="fade-out" value="20"/>
+		</emitter>
+	</particle>
+	<particle position-x="32" position-y="0" position-z="16">
+		<emitter>
+			<property name="position-x" min="0" max="32"/>
+			<property name="position-y" min="0" max="16"/>
+			<property name="image" value="graphics/particles/orb-medium.png|W:#0000ff"/>
+			<property name="horizontal-angle" min="0" max="360"/>
+			<property name="vertical-angle" min="0" max="360"/>
+			<property name="power" min="0.4" max="0.8"/>
+			<property name="lifetime" value="100"/>
+			<property name="fade-in" value="15"/>
+			<property name="fade-out" value="20"/>
+			<property name="output" min="-20" max="1"/>
+			<property name="acceleration" value="0.03"/>
+			<property name="alpha" value="0.5"/>
+		</emitter>
+	</particle>
+</effect>
\ No newline at end of file
diff --git a/graphics/particles/savepoint/savepoint-64x64.xml b/graphics/particles/savepoint/savepoint-64x64.xml
new file mode 100644
index 00000000..0140064b
--- /dev/null
+++ b/graphics/particles/savepoint/savepoint-64x64.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<effect>
+	<particle position-x="0" position-y="0" position-z="56">
+		<emitter>
+			<property name="position-x" min="0" max="64"/>
+			<property name="position-y" min="0" max="64"/>
+			<property name="image" value="graphics/particles/orb-medium.png|W:#ff0000"/>
+			<property name="gravity" value="-0.003"/>
+			<property name="lifetime" value="100"/>
+			<property name="output" min="0" max="1"/>
+			<property name="output-pause" min="0" max="10"/>
+			<property name="fade-in" value="15"/>
+			<property name="fade-out" value="20"/>
+		</emitter>
+	</particle>
+	<particle position-x="32" position-y="0" position-z="32">
+		<emitter>
+			<property name="position-x" min="0" max="32"/>
+			<property name="position-y" min="0" max="32"/>
+			<property name="image" value="graphics/particles/orb-medium.png|W:#0000ff"/>
+			<property name="horizontal-angle" min="0" max="360"/>
+			<property name="vertical-angle" min="0" max="360"/>
+			<property name="power" min="0.4" max="0.8"/>
+			<property name="lifetime" value="100"/>
+			<property name="fade-in" value="15"/>
+			<property name="fade-out" value="20"/>
+			<property name="output" min="-20" max="1"/>
+			<property name="acceleration" value="0.03"/>
+			<property name="alpha" value="0.5"/>
+		</emitter>
+	</particle>
+</effect>
\ No newline at end of file
diff --git a/maps/000-2-1.tmx b/maps/000-2-1.tmx
index f1fffe19..560f9c10 100644
--- a/maps/000-2-1.tmx
+++ b/maps/000-2-1.tmx
@@ -140,7 +140,7 @@
  </layer>
  <layer name="Collision" width="83" height="59">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3SQQ6DIBBA0fb+V/GQTRfdGEVGoCP6SF5iTIvOl+X9ei0AAAAAAAAAEPBd2e9wF6WWT+r8W7X3R7ecuf3R+tce632yu7S0LF3P9D2yXaHDXVquZ4mey9KePb7nzC1bZjj7/71nz9ax5lzszTdyZTcZ2TEyf8+9ZtNj7t4ru0mPliO6nFnZTXqfx63ft+4RfY/sRtGWkev1vVLjUd/0impmqJlxa+Zoy9Kzsjv1PpeR1nt9ncvjGVs7aKllz95P6pDdWksAAAAAgJgPSi7FroRMAAA=
+   H4sIAAAAAAAAA+3SUa7CIBBAUd3/VrpI44c/jaVQBqfgITlJ0/h4zC3b8/HYAAAAAAAAAKDBe2WfYRWllv/U+bNq349uOXP7s/WrPfb7ZHfpaVl6nul7ZLtDh1Va7mdpvZelPSO+58wte2a4+vdH/3u2jjX34mi+kSu7yciOLfNH7jWbiLmjV3aTiJYjulxZ2U2i7+O33/fu0XqO7EatLVue9+9KjUd90zuqneFsvqN3LeconSe7U/S9PJqx5tm9rGtZ+xst+1pGnmMFPa1X6pDdWksAAAAAgDYvK2ATCoRMAAA=
   </data>
  </layer>
  <objectgroup name="Object" width="83" height="59" visible="0">
diff --git a/npcs.xml b/npcs.xml
index 816cfd10..009160a5 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -80,20 +80,20 @@ IDs 990-999 = Special
 <!-- Special NPCs -->
     <npc id="900">
 		  <!-- Savepoint, 32x32. -->
-        <particlefx>graphics/particles/savepoint-32x32.xml</particlefx>
-	 </npc>
-    <npc id="901">
-		  <!-- Savepoint, 32x64. -->
-        <particlefx>graphics/particles/savepoint-32x64.xml</particlefx>
-	 </npc>
-    <npc id="902">
-		  <!-- Savepoint, 64x32. -->
-        <particlefx>graphics/particles/savepoint-64x32.xml</particlefx>
-	 </npc>
-    <npc id="903">
-		  <!-- Savepoint, 64x64. -->
-        <particlefx>graphics/particles/savepoint-64x64.xml</particlefx>
+        <particlefx>graphics/particles/savepoint/savepoint-32x32.xml</particlefx>
 	 </npc>
+<!-- WIP     <npc id="901">
+		  Savepoint, 32x64.
+        <particlefx>graphics/particles/savepoint/savepoint-32x64.xml</particlefx>
+	 </npc>-->
+<!-- WIP     <npc id="902">
+		  Savepoint, 64x32.
+        <particlefx>graphics/particles/savepoint/savepoint-64x32.xml</particlefx>
+	 </npc>-->
+<!-- WIP     <npc id="903">
+		  Savepoint, 64x64. 
+        <particlefx>graphics/particles/savepoint/savepoint-64x64.xml</particlefx>
+	 </npc> -->
     <npc id="999">
         <!-- blank NPC -->
     </npc>
-- 
cgit v1.2.3-60-g2f50