Merge remote-tracking branch 'micksha/spots' into HEADjesusalva/spotlight

6 files changed, 48 insertions, 54 deletions

diff --git a/maps/001-3-0.tmx b/maps/001-3-0.tmx
index 5ca06eb1..98f1e2a3 100644
--- a/maps/001-3-0.tmx
+++ b/maps/001-3-0.tmx
@@ -8,15 +8,13 @@
   <property name="name" value="Sewer"/>
   <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
   <property name="overlay0keepratio" value="true"/>
-  <property name="overlay3image" value="graphics/images/ambient/spot.png"/>
-  <property name="overlay3keepratio" value="true"/>
-  <property name="overlay3mask" value="2"/>
-  <property name="overlay3image" value="graphics/images/ambient/spot2.png"/>
-  <property name="overlay3keepratio" value="true"/>
-  <property name="overlay3mask" value="4"/>
-  <property name="overlay3image" value="graphics/images/ambient/spot3.png"/>
-  <property name="overlay3keepratio" value="true"/>
-  <property name="overlay3mask" value="8"/>
+  <property name="overlay0mask" value="2"/>
+  <property name="overlay1image" value="graphics/images/ambient/spot2.png"/>
+  <property name="overlay1keepratio" value="true"/>
+  <property name="overlay1mask" value="4"/>
+  <property name="overlay2image" value="graphics/images/ambient/spot3.png"/>
+  <property name="overlay2keepratio" value="true"/>
+  <property name="overlay2mask" value="8"/>
  </properties>
  <tileset firstgid="1" name="Sewer" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-sewer.png" width="512" height="512"/>
diff --git a/maps/001-3-1.tmx b/maps/001-3-1.tmx
index 71437ebf..358558b4 100644
--- a/maps/001-3-1.tmx
+++ b/maps/001-3-1.tmx
@@ -8,15 +8,13 @@
   <property name="name" value="Rivercave"/>
   <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
   <property name="overlay0keepratio" value="true"/>
-  <property name="overlay3image" value="graphics/images/ambient/spot.png"/>
-  <property name="overlay3keepratio" value="true"/>
-  <property name="overlay3mask" value="2"/>
-  <property name="overlay3image" value="graphics/images/ambient/spot2.png"/>
-  <property name="overlay3keepratio" value="true"/>
-  <property name="overlay3mask" value="4"/>
-  <property name="overlay3image" value="graphics/images/ambient/spot3.png"/>
-  <property name="overlay3keepratio" value="true"/>
-  <property name="overlay3mask" value="8"/>
+  <property name="overlay0mask" value="2"/>
+  <property name="overlay1image" value="graphics/images/ambient/spot2.png"/>
+  <property name="overlay1keepratio" value="true"/>
+  <property name="overlay1mask" value="4"/>
+  <property name="overlay2image" value="graphics/images/ambient/spot3.png"/>
+  <property name="overlay2keepratio" value="true"/>
+  <property name="overlay2mask" value="8"/>
  </properties>
  <tileset firstgid="1" name="Sewer" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-sewer.png" width="512" height="512"/>
diff --git a/maps/001-3-2.tmx b/maps/001-3-2.tmx
index 67f84dcc..7b16627a 100644
--- a/maps/001-3-2.tmx
+++ b/maps/001-3-2.tmx
@@ -6,15 +6,15 @@
   <property name="minimap" value=""/>
   <property name="music" value=""/>
   <property name="name" value="Hideout"/>
-  <property name="overlay3image" value="graphics/images/ambient/spot.png"/>
-  <property name="overlay3keepratio" value="true"/>
-  <property name="overlay3mask" value="2"/>
-  <property name="overlay3image" value="graphics/images/ambient/spot2.png"/>
-  <property name="overlay3keepratio" value="true"/>
-  <property name="overlay3mask" value="4"/>
-  <property name="overlay3image" value="graphics/images/ambient/spot3.png"/>
-  <property name="overlay3keepratio" value="true"/>
-  <property name="overlay3mask" value="8"/>
+  <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
+  <property name="overlay0keepratio" value="true"/>
+  <property name="overlay0mask" value="2"/>
+  <property name="overlay1image" value="graphics/images/ambient/spot2.png"/>
+  <property name="overlay1keepratio" value="true"/>
+  <property name="overlay1mask" value="4"/>
+  <property name="overlay2image" value="graphics/images/ambient/spot3.png"/>
+  <property name="overlay2keepratio" value="true"/>
+  <property name="overlay2mask" value="8"/>
  </properties>
  <tileset firstgid="1" name="artis-sewer" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/artis-sewer.png" width="512" height="512"/>
diff --git a/maps/008-3-0.tmx b/maps/008-3-0.tmx
index fd5c5aa7..75a67a31 100644
--- a/maps/008-3-0.tmx
+++ b/maps/008-3-0.tmx
@@ -6,15 +6,15 @@
   <property name="minimap" value="graphics/minimaps/008-3-0.png"/>
   <property name="music" value="night-is-calling.ogg"/>
   <property name="name" value="Rossy Cave"/>
-  <property name="overlay3image" value="graphics/images/ambient/spot.png"/>
-  <property name="overlay3keepratio" value="true"/>
-  <property name="overlay3mask" value="2"/>
-  <property name="overlay3image" value="graphics/images/ambient/spot2.png"/>
-  <property name="overlay3keepratio" value="true"/>
-  <property name="overlay3mask" value="4"/>
-  <property name="overlay3image" value="graphics/images/ambient/spot3.png"/>
-  <property name="overlay3keepratio" value="true"/>
-  <property name="overlay3mask" value="8"/>
+  <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
+  <property name="overlay0keepratio" value="true"/>
+  <property name="overlay0mask" value="2"/>
+  <property name="overlay1image" value="graphics/images/ambient/spot2.png"/>
+  <property name="overlay1keepratio" value="true"/>
+  <property name="overlay1mask" value="4"/>
+  <property name="overlay2image" value="graphics/images/ambient/spot3.png"/>
+  <property name="overlay2keepratio" value="true"/>
+  <property name="overlay2mask" value="8"/>
  </properties>
  <tileset firstgid="1" name="hurns-cave" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/hurns-cave.png" width="512" height="512"/>
diff --git a/maps/008-3-1.tmx b/maps/008-3-1.tmx
index 9e8f1998..55f4b529 100644
--- a/maps/008-3-1.tmx
+++ b/maps/008-3-1.tmx
@@ -7,15 +7,13 @@
   <property name="name" value="Bat Cave"/>
   <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
   <property name="overlay0keepratio" value="true"/>
-  <property name="overlay3image" value="graphics/images/ambient/spot.png"/>
-  <property name="overlay3keepratio" value="true"/>
-  <property name="overlay3mask" value="2"/>
-  <property name="overlay3image" value="graphics/images/ambient/spot2.png"/>
-  <property name="overlay3keepratio" value="true"/>
-  <property name="overlay3mask" value="4"/>
-  <property name="overlay3image" value="graphics/images/ambient/spot3.png"/>
-  <property name="overlay3keepratio" value="true"/>
-  <property name="overlay3mask" value="8"/>
+  <property name="overlay0mask" value="2"/>
+  <property name="overlay1image" value="graphics/images/ambient/spot2.png"/>
+  <property name="overlay1keepratio" value="true"/>
+  <property name="overlay1mask" value="4"/>
+  <property name="overlay2image" value="graphics/images/ambient/spot3.png"/>
+  <property name="overlay2keepratio" value="true"/>
+  <property name="overlay2mask" value="8"/>
  </properties>
  <tileset firstgid="1" name="hurns-cave" tilewidth="32" tileheight="32" tilecount="256" columns="16">
   <image source="../graphics/tilesets/hurns-cave.png" width="512" height="512"/>
diff --git a/maps/008-4-1.tmx b/maps/008-4-1.tmx
index 243d8cd1..22be974e 100644
--- a/maps/008-4-1.tmx
+++ b/maps/008-4-1.tmx
@@ -9,15 +9,15 @@
   <property name="minimap" value="graphics/minimaps/008-4-1.png"/>
   <property name="music" value="Unforgiving_Lands.ogg"/>
   <property name="name" value="Cave Of Trials"/>
-  <property name="overlay3image" value="graphics/images/ambient/spot.png"/>
-  <property name="overlay3keepratio" value="true"/>
-  <property name="overlay3mask" value="2"/>
-  <property name="overlay3image" value="graphics/images/ambient/spot2.png"/>
-  <property name="overlay3keepratio" value="true"/>
-  <property name="overlay3mask" value="4"/>
-  <property name="overlay3image" value="graphics/images/ambient/spot3.png"/>
-  <property name="overlay3keepratio" value="true"/>
-  <property name="overlay3mask" value="8"/>
+  <property name="overlay0image" value="graphics/images/ambient/spot.png"/>
+  <property name="overlay0keepratio" value="true"/>
+  <property name="overlay0mask" value="2"/>
+  <property name="overlay1image" value="graphics/images/ambient/spot2.png"/>
+  <property name="overlay1keepratio" value="true"/>
+  <property name="overlay1mask" value="4"/>
+  <property name="overlay2image" value="graphics/images/ambient/spot3.png"/>
+  <property name="overlay2keepratio" value="true"/>
+  <property name="overlay2mask" value="8"/>
  </properties>
  <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>