Renamed the waterfall particle effects on map 26 so that they are easier to reuse.

7 files changed, 15 insertions, 45 deletions

diff --git a/graphics/particles/hillwaterfall4.particle.xml b/graphics/particles/waterfall-1x2.particle.xml
index ffb35397..ffb35397 100644
--- a/graphics/particles/hillwaterfall4.particle.xml
+++ b/graphics/particles/waterfall-1x2.particle.xml
diff --git a/graphics/particles/hillwaterfall2.particle.xml b/graphics/particles/waterfall-1x3.particle.xml
index b040489a..b040489a 100644
--- a/graphics/particles/hillwaterfall2.particle.xml
+++ b/graphics/particles/waterfall-1x3.particle.xml
diff --git a/graphics/particles/hillwaterfall6.particle.xml b/graphics/particles/waterfall-2x1.particle.xml
index 3ed44d1e..3ed44d1e 100644
--- a/graphics/particles/hillwaterfall6.particle.xml
+++ b/graphics/particles/waterfall-2x1.particle.xml
diff --git a/graphics/particles/hillwaterfall3.particle.xml b/graphics/particles/waterfall-2x2.particle.xml
index 6d4e52f8..6d4e52f8 100644
--- a/graphics/particles/hillwaterfall3.particle.xml
+++ b/graphics/particles/waterfall-2x2.particle.xml
diff --git a/graphics/particles/hillwaterfall1.particle.xml b/graphics/particles/waterfall-2x3.particle.xml
index d22c9299..d22c9299 100644
--- a/graphics/particles/hillwaterfall1.particle.xml
+++ b/graphics/particles/waterfall-2x3.particle.xml
diff --git a/graphics/particles/hillwaterfall5.particle.xml b/graphics/particles/waterfall-2x4.particle.xml
index ea44e770..ea44e770 100644
--- a/graphics/particles/hillwaterfall5.particle.xml
+++ b/graphics/particles/waterfall-2x4.particle.xml
diff --git a/maps/new_26-1.tmx b/maps/new_26-1.tmx
index 6fd01491..974011ba 100644
--- a/maps/new_26-1.tmx
+++ b/maps/new_26-1.tmx
@@ -52,50 +52,20 @@
   <tileproperties/>
  </layer>
  <objectgroup name="Object Group 1" width="0" height="0">
-  <object name="graphics/particles/hillwaterfall1.particle.xml" type="PARTICLE_EFFECT" x="2589" y="3435" width="0" height="0">
-   <properties/>
-  </object>
-  <object name="graphics/particles/hillwaterfall1.particle.xml" type="PARTICLE_EFFECT" x="3805" y="3310" width="0" height="0">
-   <properties/>
-  </object>
-  <object name="graphics/particles/hillwaterfall1.particle.xml" type="PARTICLE_EFFECT" x="4285" y="3278" width="0" height="0">
-   <properties/>
-  </object>
-  <object name="graphics/particles/hillwaterfall2.particle.xml" type="PARTICLE_EFFECT" x="3980" y="3310" width="0" height="0">
-   <properties/>
-  </object>
-  <object name="graphics/particles/hillwaterfall2.particle.xml" type="PARTICLE_EFFECT" x="4268" y="3053" width="0" height="0">
-   <properties/>
-  </object>
-  <object name="graphics/particles/hillwaterfall2.particle.xml" type="PARTICLE_EFFECT" x="2445" y="3215" width="0" height="0">
-   <properties/>
-  </object>
-  <object name="graphics/particles/hillwaterfall3.particle.xml" type="PARTICLE_EFFECT" x="3805" y="3090" width="0" height="0">
-   <properties/>
-  </object>
-  <object name="graphics/particles/hillwaterfall3.particle.xml" type="PARTICLE_EFFECT" x="4188" y="2835" width="0" height="0">
-   <properties/>
-  </object>
-  <object name="graphics/particles/hillwaterfall3.particle.xml" type="PARTICLE_EFFECT" x="2300" y="5135" width="0" height="0">
-   <properties/>
-  </object>
-  <object name="graphics/particles/hillwaterfall4.particle.xml" type="PARTICLE_EFFECT" x="3980" y="3090" width="0" height="0">
-   <properties/>
-  </object>
-  <object name="graphics/particles/hillwaterfall5.particle.xml" type="PARTICLE_EFFECT" x="1917" y="2665" width="0" height="0">
-   <properties/>
-  </object>
-  <object name="graphics/particles/hillwaterfall6.particle.xml" type="PARTICLE_EFFECT" x="958" y="4492" width="0" height="0">
-   <properties/>
-  </object>
-  <object name="graphics/particles/hillwaterfall6.particle.xml" type="PARTICLE_EFFECT" x="1180" y="4749" width="0" height="0">
-   <properties/>
-  </object>
-  <object name="graphics/particles/hillunderfall.particle.xml" type="PARTICLE_EFFECT" x="1545" y="5000" width="0" height="0">
-   <properties/>
-  </object>
-  <object name="graphics/particles/apple.particle.xml" type="PARTICLE_EFFECT" x="2717" y="3315" width="0" height="0">
-   <properties/>
-  </object>
+  <object name="graphics/particles/waterfall-2x3.particle.xml" type="PARTICLE_EFFECT" x="2589" y="3435" width="0" height="0"/>
+  <object name="graphics/particles/waterfall-2x3.particle.xml" type="PARTICLE_EFFECT" x="3805" y="3310" width="0" height="0"/>
+  <object name="graphics/particles/waterfall-2x3.particle.xml" type="PARTICLE_EFFECT" x="4285" y="3278" width="0" height="0"/>
+  <object name="graphics/particles/waterfall-1x3.particle.xml" type="PARTICLE_EFFECT" x="3980" y="3310" width="0" height="0"/>
+  <object name="graphics/particles/waterfall-1x3.particle.xml" type="PARTICLE_EFFECT" x="4268" y="3053" width="0" height="0"/>
+  <object name="graphics/particles/waterfall-1x3.particle.xml" type="PARTICLE_EFFECT" x="2445" y="3215" width="0" height="0"/>
+  <object name="graphics/particles/waterfall-2x2.particle.xml" type="PARTICLE_EFFECT" x="3805" y="3090" width="0" height="0"/>
+  <object name="graphics/particles/waterfall-2x2.particle.xml" type="PARTICLE_EFFECT" x="4188" y="2835" width="0" height="0"/>
+  <object name="graphics/particles/waterfall-2x2.particle.xml" type="PARTICLE_EFFECT" x="2300" y="5135" width="0" height="0"/>
+  <object name="graphics/particles/waterfall-1x2.particle.xml" type="PARTICLE_EFFECT" x="3980" y="3090" width="0" height="0"/>
+  <object name="graphics/particles/waterfall-2x4.particle.xml" type="PARTICLE_EFFECT" x="1917" y="2665" width="0" height="0"/>
+  <object name="graphics/particles/waterfall-2x1.particle.xml" type="PARTICLE_EFFECT" x="958" y="4492" width="0" height="0"/>
+  <object name="graphics/particles/waterfall-2x1.particle.xml" type="PARTICLE_EFFECT" x="1180" y="4749" width="0" height="0"/>
+  <object name="graphics/particles/hillunderfall.particle.xml" type="PARTICLE_EFFECT" x="1545" y="5000" width="0" height="0"/>
+  <object name="graphics/particles/apple.particle.xml" type="PARTICLE_EFFECT" x="2717" y="3315" width="0" height="0"/>
  </objectgroup>
 </map>