summaryrefslogtreecommitdiff
path: root/maps
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-16 17:31:35 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-16 17:31:35 +0000
commit94d5f752a3fbda4fe0b6d684804ec26d5f461a3e (patch)
tree116615b027ab538c25817d1402c5262a36a52851 /maps
parentf895e397e64c468aaf27abe0f892c511fca1d616 (diff)
downloadclientdata-94d5f752a3fbda4fe0b6d684804ec26d5f461a3e.tar.gz
clientdata-94d5f752a3fbda4fe0b6d684804ec26d5f461a3e.tar.bz2
clientdata-94d5f752a3fbda4fe0b6d684804ec26d5f461a3e.tar.xz
clientdata-94d5f752a3fbda4fe0b6d684804ec26d5f461a3e.zip
Merged in the differences with the client trunk data, in preparation of client
trunk data removal (please don't modify stuff there anymore, do it here).
Diffstat (limited to 'maps')
-rw-r--r--maps/new_10-1.tmx14
-rw-r--r--maps/new_11-1.tmx14
2 files changed, 28 insertions, 0 deletions
diff --git a/maps/new_10-1.tmx b/maps/new_10-1.tmx
index cba0fc7e..62c353d7 100644
--- a/maps/new_10-1.tmx
+++ b/maps/new_10-1.tmx
@@ -52,5 +52,19 @@
</property>
</properties>
</object>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="592"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="592"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="624"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="624"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2064" y="624"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2096" y="624"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="656"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="656"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2064" y="656"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2096" y="656"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="1968" y="688"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="688"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="688"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2064" y="688"/>
</objectgroup>
</map>
diff --git a/maps/new_11-1.tmx b/maps/new_11-1.tmx
index 6d4bca5b..15d53d14 100644
--- a/maps/new_11-1.tmx
+++ b/maps/new_11-1.tmx
@@ -130,5 +130,19 @@
</property>
</properties>
</object>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="4016"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="4016"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="4048"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="4048"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2064" y="4048"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2096" y="4048"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="4080"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="4080"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2064" y="4080"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2096" y="4080"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="1968" y="4112"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2000" y="4112"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2032" y="4112"/>
+ <object name="graphics/particles/whirlpool.particle.xml" type="PARTICLE_EFFECT" x="2064" y="4112"/>
</objectgroup>
</map>