summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2018-06-09 10:27:59 -0300
committerJesusaves <cpntb1@ymail.com>2018-06-09 10:27:59 -0300
commitc06dcd27045a5acc67ba375da8eb194c00be2ef8 (patch)
tree041784cdba7715630e3601f219992868e17aa0a0
parent4da8972174fcffdd036f5af92dc0acdd5832563a (diff)
downloadclientdata-c06dcd27045a5acc67ba375da8eb194c00be2ef8.tar.gz
clientdata-c06dcd27045a5acc67ba375da8eb194c00be2ef8.tar.bz2
clientdata-c06dcd27045a5acc67ba375da8eb194c00be2ef8.tar.xz
clientdata-c06dcd27045a5acc67ba375da8eb194c00be2ef8.zip
Fix some stuff at La Marine
-rw-r--r--graphics/minimaps/016-6.pngbin0 -> 1538 bytes
-rw-r--r--maps.xml4
-rw-r--r--maps/016-6.tmx40
3 files changed, 26 insertions, 18 deletions
diff --git a/graphics/minimaps/016-6.png b/graphics/minimaps/016-6.png
new file mode 100644
index 00000000..d05077b6
--- /dev/null
+++ b/graphics/minimaps/016-6.png
Binary files differ
diff --git a/maps.xml b/maps.xml
index 623e8cd6..363ab207 100644
--- a/maps.xml
+++ b/maps.xml
@@ -229,6 +229,9 @@ Copyright (C) 2018 TMW2 -->
<map name="015-1.tmx">
<atlas name="woodcave"/>
</map>
+ <map name="016-6.tmx">
+ <atlas name="ocean"/>
+ </map>
<map name="botcheck.tmx">
<atlas name="botcheck"/>
</map>
@@ -257,6 +260,7 @@ Copyright (C) 2018 TMW2 -->
<atlas name="ocean">
<file name="graphics/tilesets/box.png"/>
<file name="graphics/tilesets/box-x1x2.png"/>
+ <file name="graphics/tilesets/desert_city.png"/>
<file name="graphics/tilesets/ground.png"/>
<file name="graphics/tilesets/sail.png"/>
<file name="graphics/tilesets/ship-base.png"/>
diff --git a/maps/016-6.tmx b/maps/016-6.tmx
index 47544e07..9045f071 100644
--- a/maps/016-6.tmx
+++ b/maps/016-6.tmx
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.5" orientation="orthogonal" renderorder="right-down" width="80" height="62" tilewidth="32" tileheight="32" infinite="0" nextobjectid="4">
+<map version="1.0" tiledversion="1.0.3" orientation="orthogonal" renderorder="right-down" width="80" height="62" tilewidth="32" tileheight="32" nextobjectid="4">
<properties>
+ <property name="author" value="Saulc"/>
<property name="license" value="CC BY-SA 3.0"/>
<property name="manaplus version" value="1"/>
- <property name="minimap" value="graphics/minimaps/000-0.png"/>
+ <property name="minimap" value="graphics/minimaps/016-6.png"/>
<property name="music" value="water_prelude.ogg"/>
<property name="name" value="Ocean"/>
<property name="overlay0image" value="graphics/images/ambient/light_fog.png"/>
@@ -11,26 +12,29 @@
<property name="overlay0scrollX" value="0.2"/>
<property name="overlay0scrollY" value="0.1"/>
</properties>
- <tileset firstgid="1" source="../Program Files (x86)/clientdata/graphics/tilesets/water-raging.tsx"/>
+ <tileset firstgid="1" source="../graphics/tilesets/water-raging.tsx"/>
<tileset firstgid="241" name="Mast" tilewidth="32" tileheight="32" tilecount="256" columns="16">
- <image source="../Program Files (x86)/clientdata/graphics/tilesets/ship-mast.png" width="512" height="512"/>
+ <image source="../graphics/tilesets/ship-mast.png" width="512" height="512"/>
</tileset>
<tileset firstgid="497" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
- <image source="../Program Files (x86)/clientdata/graphics/tilesets/collision.png" width="96" height="96"/>
+ <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
</tileset>
<tileset firstgid="506" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
- <image source="../Program Files (x86)/clientdata/graphics/tilesets/ground.png" width="512" height="512"/>
+ <image source="../graphics/tilesets/ground.png" width="512" height="512"/>
</tileset>
<tileset firstgid="762" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
- <image source="../Program Files (x86)/clientdata/graphics/tilesets/box.png" width="192" height="192"/>
+ <image source="../graphics/tilesets/box.png" width="192" height="192"/>
</tileset>
<tileset firstgid="798" name="sail" tilewidth="32" tileheight="32" tilecount="272" columns="16">
- <image source="../Program Files (x86)/clientdata/graphics/tilesets/sail.png" width="512" height="544"/>
+ <image source="../graphics/tilesets/sail.png" width="512" height="544"/>
</tileset>
<tileset firstgid="1070" name="Base" tilewidth="32" tileheight="32" tilecount="220" columns="22">
- <image source="../Program Files (x86)/clientdata/graphics/tilesets/ship-base.png" width="704" height="320"/>
+ <image source="../graphics/tilesets/ship-base.png" width="704" height="320"/>
+ </tileset>
+ <tileset firstgid="1290" source="../graphics/tilesets/desert_city.tsx"/>
+ <tileset firstgid="1546" name="Heights" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+ <image source="../../../../../../../../../../home/jesusalva/projetos/tmw/tmw2/client-data/graphics/tilesets/level-number.png" width="512" height="32"/>
</tileset>
- <tileset firstgid="1290" source="../Program Files (x86)/clientdata/graphics/tilesets/desert_city.tsx"/>
<layer name="Ground" width="80" height="62">
<data encoding="csv">
658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,
@@ -427,7 +431,7 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</data>
</layer>
- <layer name="Collision" width="80" height="62" visible="0">
+ <layer name="Collision" width="80" height="62">
<data encoding="csv">
498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,
498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,
@@ -524,13 +528,13 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1546,1546,1546,1546,1546,1546,1546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1546,1546,1546,0,0,0,1546,1546,1546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1546,0,0,1546,0,1546,1546,1546,1546,1546,0,1546,1546,1546,1546,1546,0,0,0,0,1546,1546,0,0,0,1546,1546,1546,1546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1546,1546,1546,1546,1546,1546,1546,1546,1546,1546,1546,1546,1546,1546,1546,1546,1546,1546,1546,0,1546,1546,1546,1546,1546,1546,1546,1546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1546,1546,0,1546,1546,1546,1546,1546,1546,1546,1546,0,0,1546,1546,1546,0,1546,1546,1546,1546,1546,1546,1546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1546,0,0,1546,1546,1546,1546,1546,1546,1546,1546,1546,1546,1546,1546,1546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1546,1546,0,1546,1546,1546,1546,1546,1546,1546,1546,1546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,