From d89b1bcbb4158104b49bb39ddd39b01ebd2989ff Mon Sep 17 00:00:00 2001
From: Saulc <lucashelaine14@gmail.com>
Date: Sat, 20 Jan 2018 18:04:57 +0100
Subject: fix maps + add candor + add items

---
 graphics/tilesets/collision.tsx           | 4 ++--
 graphics/tilesets/water_overflow.tsx      | 4 ++--
 graphics/tilesets/waterflow.tsx           | 4 ++--
 graphics/tilesets/woodland_ground.tsx     | 4 ++--
 graphics/tilesets/woodland_village.tsx    | 4 ++--
 graphics/tilesets/woodland_village_x2.tsx | 4 ++--
 graphics/tilesets/woodland_village_x3.tsx | 6 +++---
 graphics/tilesets/woodland_x2.tsx         | 4 ++--
 8 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'graphics/tilesets')

diff --git a/graphics/tilesets/collision.tsx b/graphics/tilesets/collision.tsx
index fce8f1b5..8457e2a8 100644
--- a/graphics/tilesets/collision.tsx
+++ b/graphics/tilesets/collision.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset name="collision" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/collision.png" width="64" height="32"/>
+<tileset name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <image source="collision.png" width="96" height="96"/>
 </tileset>
diff --git a/graphics/tilesets/water_overflow.tsx b/graphics/tilesets/water_overflow.tsx
index d69d50fb..c99740ad 100644
--- a/graphics/tilesets/water_overflow.tsx
+++ b/graphics/tilesets/water_overflow.tsx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset name="water_overflow" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/water_overflow.png" width="288" height="256"/>
+<tileset name="water_overflow" tilewidth="32" tileheight="32" tilecount="72" columns="9">
+ <image source="water_overflow.png" width="288" height="256"/>
  <tile id="8">
   <properties>
    <property name="animation-delay0" value="35"/>
diff --git a/graphics/tilesets/waterflow.tsx b/graphics/tilesets/waterflow.tsx
index 1ea21a9c..0fefeedc 100644
--- a/graphics/tilesets/waterflow.tsx
+++ b/graphics/tilesets/waterflow.tsx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset name="waterflow" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/waterflow.png" width="288" height="256"/>
+<tileset name="waterflow" tilewidth="32" tileheight="32" tilecount="72" columns="9">
+ <image source="waterflow.png" width="288" height="256"/>
  <tile id="8">
   <properties>
    <property name="animation-delay0" value="35"/>
diff --git a/graphics/tilesets/woodland_ground.tsx b/graphics/tilesets/woodland_ground.tsx
index 978b7cf2..27ab3f37 100644
--- a/graphics/tilesets/woodland_ground.tsx
+++ b/graphics/tilesets/woodland_ground.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset name="woodland_ground" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/woodland_ground.png" width="512" height="512"/>
+<tileset name="woodland_ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="woodland_ground.png" width="512" height="512"/>
 </tileset>
diff --git a/graphics/tilesets/woodland_village.tsx b/graphics/tilesets/woodland_village.tsx
index 8593e564..5ce1464f 100644
--- a/graphics/tilesets/woodland_village.tsx
+++ b/graphics/tilesets/woodland_village.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset name="woodland_village" tilewidth="32" tileheight="32">
- <image source="../graphics/tiles/woodland_village.png" width="512" height="512"/>
+<tileset name="woodland_village" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="woodland_village.png" width="512" height="512"/>
 </tileset>
diff --git a/graphics/tilesets/woodland_village_x2.tsx b/graphics/tilesets/woodland_village_x2.tsx
index 4c30e9ad..8721e1e5 100644
--- a/graphics/tilesets/woodland_village_x2.tsx
+++ b/graphics/tilesets/woodland_village_x2.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset name="woodland_village_x2" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/woodland_village_x2.png" width="512" height="64"/>
+<tileset name="woodland_village_x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+ <image source="woodland_village_x2.png" width="512" height="64"/>
 </tileset>
diff --git a/graphics/tilesets/woodland_village_x3.tsx b/graphics/tilesets/woodland_village_x3.tsx
index 942a2736..efe99640 100644
--- a/graphics/tilesets/woodland_village_x3.tsx
+++ b/graphics/tilesets/woodland_village_x3.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset name="woodland_village_x3" tilewidth="32" tileheight="96">
- <image source="../graphics/tiles/woodland_village_x3.png" width="704" height="288"/>
-</tileset>
\ No newline at end of file
+<tileset name="woodland_village_x3" tilewidth="32" tileheight="96" tilecount="66" columns="22">
+ <image source="woodland_village_x3.png" width="704" height="288"/>
+</tileset>
diff --git a/graphics/tilesets/woodland_x2.tsx b/graphics/tilesets/woodland_x2.tsx
index 31446d23..41f4b444 100644
--- a/graphics/tilesets/woodland_x2.tsx
+++ b/graphics/tilesets/woodland_x2.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset name="woodland_x2" tilewidth="32" tileheight="64">
- <image source="../graphics/tiles/woodland_x2.png" width="512" height="128"/>
+<tileset name="woodland_x2" tilewidth="32" tileheight="64" tilecount="32" columns="16">
+ <image source="woodland_x2.png" width="512" height="128"/>
 </tileset>
-- 
cgit v1.2.3-60-g2f50