summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-04-27 23:22:00 +0000
committerJesusaves <cpntb1@ymail.com>2019-04-27 23:22:00 +0000
commit270817c42200877d34a87579deb6f38ad49a5f6d (patch)
treebe4011f1a1bbec10c682e85c4fdf9ac39cb7565e
parenta0e8bacd794b9f0527ad4c20ea88c757c6c24d81 (diff)
parent70cc078c28eba05debcaef640fa706d56fb182dd (diff)
downloadclientdata-s20190819.tar.gz
clientdata-s20190819.tar.bz2
clientdata-s20190819.tar.xz
clientdata-s20190819.zip
Merge branch 'spots' into 'master's20190819s20190626s20190513
Add 3 spotlight variations See merge request evol/clientdata!119
-rw-r--r--LICENSE2
-rw-r--r--graphics/images/ambient/spot2.pngbin0 -> 44253 bytes
-rw-r--r--graphics/images/ambient/spot3.pngbin0 -> 46172 bytes
-rw-r--r--maps/001-3-0.tmx7
-rw-r--r--maps/001-3-1.tmx7
-rw-r--r--maps/001-3-2.tmx9
-rw-r--r--maps/008-3-0.tmx9
-rw-r--r--maps/008-3-1.tmx7
-rw-r--r--maps/008-4-1.tmx9
9 files changed, 50 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index 89eb922b..c9f50405 100644
--- a/LICENSE
+++ b/LICENSE
@@ -40,6 +40,8 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/images/ambient/fog.png (Crush) (CC BY-SA 3.0) (-)
graphics/images/ambient/cloud.png (Len) (CC BY-SA 3.0) (Reid)
graphics/images/ambient/spot.png (Micksha) (CC BY-SA 3.0) (-)
+ graphics/images/ambient/spot2.png (Micksha) (CC BY-SA 3.0) (-)
+ graphics/images/ambient/spot3.png (Micksha) (CC BY-SA 3.0) (-)
# Item Icons
## Equipments
diff --git a/graphics/images/ambient/spot2.png b/graphics/images/ambient/spot2.png
new file mode 100644
index 00000000..24c0f6f3
--- /dev/null
+++ b/graphics/images/ambient/spot2.png
Binary files differ
diff --git a/graphics/images/ambient/spot3.png b/graphics/images/ambient/spot3.png
new file mode 100644
index 00000000..b6a9fe38
--- /dev/null
+++ b/graphics/images/ambient/spot3.png
Binary files differ
diff --git a/maps/001-3-0.tmx b/maps/001-3-0.tmx
index 6a702e0c..35b5106e 100644
--- a/maps/001-3-0.tmx
+++ b/maps/001-3-0.tmx
@@ -8,6 +8,13 @@
<property name="name" value="Sewer"/>
<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="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 705461c2..28b6fb6c 100644
--- a/maps/001-3-1.tmx
+++ b/maps/001-3-1.tmx
@@ -8,6 +8,13 @@
<property name="name" value="Rivercave"/>
<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="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 38b2ea89..5c12964b 100644
--- a/maps/001-3-2.tmx
+++ b/maps/001-3-2.tmx
@@ -6,6 +6,15 @@
<property name="minimap" value=""/>
<property name="music" value=""/>
<property name="name" value="Hideout"/>
+ <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 276083f8..05bd16ef 100644
--- a/maps/008-3-0.tmx
+++ b/maps/008-3-0.tmx
@@ -6,6 +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="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 53b8df8e..7632b06b 100644
--- a/maps/008-3-1.tmx
+++ b/maps/008-3-1.tmx
@@ -7,6 +7,13 @@
<property name="name" value="Bat Cave"/>
<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-4-1.tmx b/maps/008-4-1.tmx
index e8956dda..9e8b97a4 100644
--- a/maps/008-4-1.tmx
+++ b/maps/008-4-1.tmx
@@ -9,6 +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="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"/>