summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE2
-rw-r--r--graphics/minimaps/018-6-0.pngbin0 -> 1642 bytes
-rw-r--r--graphics/tilesets/ruins.pngbin21545 -> 22881 bytes
-rw-r--r--maps.xml3
-rw-r--r--maps/018-6-0.tmx18
5 files changed, 14 insertions, 9 deletions
diff --git a/LICENSE b/LICENSE
index ad6294e1..cce3fca1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -972,6 +972,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
graphics/minimaps/018-5-2.png (Jesusalva) (GPLv3) (-)
graphics/minimaps/018-5-3.png (Jesusalva) (GPLv3) (-)
graphics/minimaps/018-5-boss.png (Jesusalva) (GPLv3) (-)
+ graphics/minimaps/018-6-0.png (Jesusalva) (GPLv3) (-)
graphics/minimaps/019-1.png (Jesusalva) (GPLv3) (-)
graphics/minimaps/019-1-1.png (Jesusalva) (CC BY SA 3.0) (-)
graphics/minimaps/019-2.png (Jesusalva) (GPLv3) (-)
@@ -2104,6 +2105,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
maps/018-5-2.tmx (Jesusalva) (GPLv2) (jesusalva)
maps/018-5-3.tmx (Jesusalva) (GPLv2) (jesusalva)
maps/018-5-boss.tmx (TMW-BR) (GPLv2) (jesusalva)
+ maps/018-6-0.tmx (Jesusalva) (GPLv2) (jesusalva)
maps/019-1.tmx (jesusalva) (GPLv2) (TMW Org., TMW/LOF)
maps/019-1-1.tmx (jesusalva) (GPLv2,CC BY-SA 3.0) (-)
maps/019-2.tmx (jesusalva) (GPLv2) (TMW Org.)
diff --git a/graphics/minimaps/018-6-0.png b/graphics/minimaps/018-6-0.png
new file mode 100644
index 00000000..86c8bc24
--- /dev/null
+++ b/graphics/minimaps/018-6-0.png
Binary files differ
diff --git a/graphics/tilesets/ruins.png b/graphics/tilesets/ruins.png
index d951bb0a..933c7edf 100644
--- a/graphics/tilesets/ruins.png
+++ b/graphics/tilesets/ruins.png
Binary files differ
diff --git a/maps.xml b/maps.xml
index e222178d..6814e572 100644
--- a/maps.xml
+++ b/maps.xml
@@ -419,6 +419,9 @@ Copyright (C) 2018 TMW2 -->
<map name="018-5-boss.tmx">
<atlas name="cave"/>
</map>
+ <map name="018-6-0.tmx">
+ <atlas name="cave-lof"/>
+ </map>
<map name="019-1.tmx">
<atlas name="snow"/>
</map>
diff --git a/maps/018-6-0.tmx b/maps/018-6-0.tmx
index 0444ef32..8c53c648 100644
--- a/maps/018-6-0.tmx
+++ b/maps/018-6-0.tmx
@@ -9,25 +9,25 @@
<property name="name" value="Sanctuary - Forgotten Chamber"/>
</properties>
<tileset firstgid="1" name="UkarColumns" tilewidth="32" tileheight="32" tilecount="24" columns="6">
- <image source="../../client-data/graphics/tilesets/ukarColumns.png" width="192" height="128"/>
+ <image source="../graphics/tilesets/ukarColumns.png" width="192" height="128"/>
</tileset>
<tileset firstgid="25" name="ukarWalls" tilewidth="32" tileheight="32" tilecount="256" columns="16">
- <image source="../../client-data/graphics/tilesets/ukarWalls.png" width="512" height="512"/>
+ <image source="../graphics/tilesets/ukarWalls.png" width="512" height="512"/>
</tileset>
<tileset firstgid="281" name="ukarWalls2" tilewidth="32" tileheight="32" tilecount="256" columns="16">
- <image source="../../client-data/graphics/tilesets/ukarWalls2.png" width="512" height="512"/>
+ <image source="../graphics/tilesets/ukarWalls2.png" width="512" height="512"/>
</tileset>
<tileset firstgid="537" name="footprints" tilewidth="32" tileheight="32" tilecount="9" columns="3">
- <image source="../../client-data/graphics/tilesets/footprints.png" width="96" height="96"/>
+ <image source="../graphics/tilesets/footprints.png" width="96" height="96"/>
</tileset>
<tileset firstgid="546" name="rails_x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
- <image source="../../client-data/graphics/tilesets/rails_x2.png" width="512" height="64"/>
+ <image source="../graphics/tilesets/rails_x2.png" width="512" height="64"/>
</tileset>
<tileset firstgid="562" name="rails" tilewidth="32" tileheight="32" tilecount="168" columns="12">
- <image source="../../client-data/graphics/tilesets/rails.png" width="384" height="448"/>
+ <image source="../graphics/tilesets/rails.png" width="384" height="448"/>
</tileset>
<tileset firstgid="730" name="ruins" tilewidth="32" tileheight="64" tilecount="40" columns="10">
- <image source="../../client-data/graphics/tilesets/ruins.png" width="320" height="266"/>
+ <image source="../graphics/tilesets/ruins.png" width="320" height="256"/>
</tileset>
<tileset firstgid="770" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
<image source="../graphics/tilesets/collision.png" width="96" height="96"/>
@@ -129,7 +129,7 @@
799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,849,847,848,783,783,783,814,815,815,815,815,816,783,783,783,783,783,783,783,783,783,783,789,790,790,855,806,854,790,790,791,783,783,783,783,783,783,783,783,783,783,814,815,815,815,815,816,783,783,783,846,847,851,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,
799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,800,783,783,783,783,783,830,831,831,831,831,832,783,783,783,783,783,783,783,783,783,783,805,806,806,806,806,806,806,806,807,783,783,783,783,783,783,783,783,783,783,830,831,831,831,831,832,783,783,783,783,783,798,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,
799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,800,783,783,783,846,847,847,847,847,848,783,783,783,783,783,783,783,783,783,783,821,822,822,839,806,838,822,822,823,783,783,783,783,783,783,783,783,783,783,846,847,847,847,847,848,783,783,783,798,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,
-799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,800,783,783,783,783,783,783,783,783,783,783,783,783,798,799,799,799,799,799,799,799,799,800,805,806,807,798,799,799,799,799,799,799,799,799,800,783,783,783,783,783,783,783,783,783,783,783,783,798,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,
+799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,800,783,783,783,783,783,899,783,783,783,783,783,783,798,799,799,799,799,799,799,799,799,800,805,806,807,798,799,799,799,799,799,799,799,799,800,783,783,783,783,783,783,783,783,783,783,783,783,798,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,
799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,800,783,783,783,783,783,783,783,783,783,783,783,783,798,799,799,799,799,799,799,799,799,800,805,806,807,798,799,799,799,799,799,799,799,799,800,783,783,783,783,783,783,783,783,783,783,783,783,798,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,
799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,800,783,783,783,783,783,783,783,783,783,783,783,783,798,799,799,799,799,799,799,799,799,800,821,822,823,798,799,799,799,799,799,799,799,799,800,783,783,783,783,783,783,783,783,783,783,783,783,798,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,
799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,800,783,783,783,798,799,799,799,799,799,799,799,799,799,799,799,799,800,783,783,783,798,799,799,799,799,799,799,799,799,799,799,799,799,799,800,783,783,783,798,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,799,
@@ -681,7 +681,7 @@
771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,0,0,0,771,771,771,771,771,771,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,771,771,771,771,771,771,0,0,0,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,
771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,0,0,0,0,0,771,771,771,771,771,771,0,0,0,0,0,0,0,0,0,771,0,0,0,0,0,0,0,0,0,771,0,0,0,0,0,0,0,0,0,771,771,771,771,771,771,0,0,0,0,0,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,
771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,0,0,0,771,771,771,771,771,771,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,771,771,771,771,771,771,0,0,0,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,
-771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,0,0,0,0,0,899,0,0,0,0,0,0,771,771,771,771,771,771,771,771,771,771,0,0,0,771,771,771,771,771,771,771,771,771,771,0,0,0,0,0,771,0,0,0,0,0,0,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,
+771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,0,0,0,0,0,0,0,0,0,0,0,0,771,771,771,771,771,771,771,771,771,771,0,0,0,771,771,771,771,771,771,771,771,771,771,0,0,0,0,0,771,0,0,0,0,0,0,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,
771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,0,0,0,0,0,0,0,0,0,0,0,0,771,771,771,771,771,771,771,771,771,771,0,0,0,771,771,771,771,771,771,771,771,771,771,0,0,0,0,0,0,0,0,0,0,0,0,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,
771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,0,0,0,0,0,0,0,0,0,0,0,0,771,771,771,771,771,771,771,771,771,771,0,0,0,771,771,771,771,771,771,771,771,771,771,0,0,0,0,0,0,0,0,0,0,0,0,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,
771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,0,0,0,771,771,771,771,771,771,771,771,771,771,771,771,771,771,0,771,0,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,0,0,0,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,771,