summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjesusalva <cpntb1@ymail.com>2018-02-24 10:50:53 -0300
committerjesusalva <cpntb1@ymail.com>2018-02-24 10:50:53 -0300
commit7ddbf71bbd703f099e749512dc15782ed6e38593 (patch)
treed91baf13da79eb6d50f87405838facf305dcc036
parent2ed811660ceb5721c12592d0f1940079f90c0940 (diff)
downloadclientdata-7ddbf71bbd703f099e749512dc15782ed6e38593.tar.gz
clientdata-7ddbf71bbd703f099e749512dc15782ed6e38593.tar.bz2
clientdata-7ddbf71bbd703f099e749512dc15782ed6e38593.tar.xz
clientdata-7ddbf71bbd703f099e749512dc15782ed6e38593.zip
Fix poorly named file to prevent testxml bugs (and for consistency)
-rw-r--r--graphics/tilesets/cave2-base.tsx4
-rw-r--r--graphics/tilesets/cave2_base.png (renamed from graphics/tilesets/cave2-base.png)bin172002 -> 172002 bytes
-rw-r--r--graphics/tilesets/cave2_base.tsx4
-rw-r--r--maps/007-1.tmx2
4 files changed, 5 insertions, 5 deletions
diff --git a/graphics/tilesets/cave2-base.tsx b/graphics/tilesets/cave2-base.tsx
deleted file mode 100644
index 8d9e12c1..00000000
--- a/graphics/tilesets/cave2-base.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tileset name="cave2-base" tilewidth="32" tileheight="32" tilecount="128" columns="16">
- <image source="cave2-base.png" width="512" height="256"/>
-</tileset>
diff --git a/graphics/tilesets/cave2-base.png b/graphics/tilesets/cave2_base.png
index 4d52576c..4d52576c 100644
--- a/graphics/tilesets/cave2-base.png
+++ b/graphics/tilesets/cave2_base.png
Binary files differ
diff --git a/graphics/tilesets/cave2_base.tsx b/graphics/tilesets/cave2_base.tsx
new file mode 100644
index 00000000..7d736fc7
--- /dev/null
+++ b/graphics/tilesets/cave2_base.tsx
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset name="cave2_base" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+ <image source="cave2_base.png" width="512" height="256"/>
+</tileset>
diff --git a/maps/007-1.tmx b/maps/007-1.tmx
index fb3993a8..d57e11d2 100644
--- a/maps/007-1.tmx
+++ b/maps/007-1.tmx
@@ -22,7 +22,7 @@
<tileset firstgid="1242" source="../graphics/tilesets/barbarians_outdoor.tsx"/>
<tileset firstgid="1245" source="../graphics/tilesets/cave2_sewer_mine_x2.tsx"/>
<tileset firstgid="1325" source="../graphics/tilesets/cave_lava.tsx"/>
- <tileset firstgid="1341" source="../graphics/tilesets/cave2-base.tsx"/>
+ <tileset firstgid="1341" source="../graphics/tilesets/cave2_base.tsx"/>
<layer name="Ground1" width="200" height="200">
<data encoding="csv">
30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,1340,1340,1340,1340,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,1340,1340,1340,1340,1340,1340,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,1340,1340,1340,30,1340,1340,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,1340,1340,1340,1340,1340,1340,1340,1340,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,1340,1340,