From 0ee2a807152ec82356c5c9da160076f6f55690e9 Mon Sep 17 00:00:00 2001
From: Llywelwyn <lewiiswynne@gmail.com>
Date: Sat, 7 Oct 2023 10:36:36 +0100
Subject: [PATCH] tile variants, and applying colour offsets again

---
 Cargo.toml           |   2 +-
 resources/atlas.json | 972 +++++++++++++++++++++++--------------------
 resources/atlas.png  | Bin 4781 -> 4977 bytes
 src/map/themes.rs    |   2 +-
 src/map/tiletype.rs  |  15 +-
 5 files changed, 532 insertions(+), 459 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 377c80a..1981e05 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 notan = { version = "0.10.0", features = ["text", "audio"] }
 bracket-lib = { git = "https://github.com/amethyst/bracket-lib.git", rev = "851f6f08675444fb6fa088b9e67bee9fd75554c6", features = ["serde"] }
 regex = "1.3.6"
-specs = { version = "0.16.1", features = ["serde"] }
+specs = { version = "0.20.0", features = ["serde"] }
 specs-derive = "0.4.1"
 serde = { version = "1.0.93", features = ["derive"]}
 serde_json = "1.0.39"
diff --git a/resources/atlas.json b/resources/atlas.json
index 07e2052..dd8efd7 100644
--- a/resources/atlas.json
+++ b/resources/atlas.json
@@ -185,7 +185,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "beartrap",
+	"filename": "bars",
 	"frame": {"x":352,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -193,7 +193,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "bed",
+	"filename": "beartrap",
 	"frame": {"x":368,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -201,7 +201,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood-7",
+	"filename": "bed",
 	"frame": {"x":384,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -209,7 +209,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood-8",
+	"filename": "blood-7",
 	"frame": {"x":400,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -217,7 +217,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood-9",
+	"filename": "blood-8",
 	"frame": {"x":416,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -225,7 +225,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood-10",
+	"filename": "blood-9",
 	"frame": {"x":432,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -233,7 +233,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood-11",
+	"filename": "blood-10",
 	"frame": {"x":448,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -241,7 +241,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood-12",
+	"filename": "blood-11",
 	"frame": {"x":464,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -249,7 +249,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood-13",
+	"filename": "blood-12",
 	"frame": {"x":480,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -257,7 +257,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood1",
+	"filename": "blood-13",
 	"frame": {"x":496,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -265,7 +265,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood2",
+	"filename": "blood1",
 	"frame": {"x":512,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -273,7 +273,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood3",
+	"filename": "blood2",
 	"frame": {"x":528,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -281,7 +281,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood4",
+	"filename": "blood3",
 	"frame": {"x":544,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -289,7 +289,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood5",
+	"filename": "blood4",
 	"frame": {"x":560,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -297,7 +297,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood6",
+	"filename": "blood5",
 	"frame": {"x":576,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -305,7 +305,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "blood7",
+	"filename": "blood6",
 	"frame": {"x":592,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -313,7 +313,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "body (1)",
+	"filename": "blood7",
 	"frame": {"x":608,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -321,7 +321,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "body (3)",
+	"filename": "body (1)",
 	"frame": {"x":624,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -329,7 +329,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "body (4)",
+	"filename": "body (3)",
 	"frame": {"x":640,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -337,7 +337,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "body (5)",
+	"filename": "body (4)",
 	"frame": {"x":656,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -345,7 +345,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "body (6)",
+	"filename": "body (5)",
 	"frame": {"x":672,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -353,7 +353,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "body (7)",
+	"filename": "body (6)",
 	"frame": {"x":688,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -361,7 +361,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "body (8)",
+	"filename": "body (7)",
 	"frame": {"x":704,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -369,7 +369,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "body (9)",
+	"filename": "body (8)",
 	"frame": {"x":720,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -377,7 +377,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "body (10)",
+	"filename": "body (9)",
 	"frame": {"x":736,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -385,7 +385,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "body_leather",
+	"filename": "body (10)",
 	"frame": {"x":752,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -393,7 +393,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "candelabra",
+	"filename": "body_leather",
 	"frame": {"x":768,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -401,7 +401,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "cat",
+	"filename": "candelabra",
 	"frame": {"x":784,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -409,7 +409,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "cat_large",
+	"filename": "cat",
 	"frame": {"x":800,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -417,7 +417,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "caterpillar",
+	"filename": "cat_large",
 	"frame": {"x":816,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -425,7 +425,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "chair_r",
+	"filename": "caterpillar",
 	"frame": {"x":832,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -433,7 +433,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "cracked",
+	"filename": "chair_r",
 	"frame": {"x":848,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -441,7 +441,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "dagger",
+	"filename": "cracked",
 	"frame": {"x":864,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -449,7 +449,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "dog",
+	"filename": "dagger",
 	"frame": {"x":880,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -457,7 +457,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "door",
+	"filename": "dog",
 	"frame": {"x":896,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -465,7 +465,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "door_open",
+	"filename": "door",
 	"frame": {"x":912,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -473,7 +473,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "dot",
+	"filename": "door_open",
 	"frame": {"x":928,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -481,7 +481,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "dwarf",
+	"filename": "dot",
 	"frame": {"x":944,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -489,7 +489,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "feet (1)",
+	"filename": "dwarf",
 	"frame": {"x":960,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -497,7 +497,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "feet (2)",
+	"filename": "feet (1)",
 	"frame": {"x":976,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -505,7 +505,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "feet (3)",
+	"filename": "feet (2)",
 	"frame": {"x":992,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -513,7 +513,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "feet (4)",
+	"filename": "feet (3)",
 	"frame": {"x":1008,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -521,7 +521,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "feet (5)",
+	"filename": "feet (4)",
 	"frame": {"x":1024,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -529,7 +529,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "feet (6)",
+	"filename": "feet (5)",
 	"frame": {"x":1040,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -537,7 +537,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "feet (7)",
+	"filename": "feet (6)",
 	"frame": {"x":1056,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -545,7 +545,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "fence",
+	"filename": "feet (7)",
 	"frame": {"x":1072,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -553,7 +553,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "fluff",
+	"filename": "fence",
 	"frame": {"x":1088,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -561,7 +561,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "fluff2",
+	"filename": "fluff",
 	"frame": {"x":1104,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -569,7 +569,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-0",
+	"filename": "fluff2",
 	"frame": {"x":1120,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -577,7 +577,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-1",
+	"filename": "general-0",
 	"frame": {"x":1136,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -585,7 +585,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-3",
+	"filename": "general-1",
 	"frame": {"x":1152,"y":0,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -593,295 +593,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-4",
-	"frame": {"x":1168,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-5",
-	"frame": {"x":928,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-6",
-	"frame": {"x":1184,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-7",
-	"frame": {"x":1200,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-8",
-	"frame": {"x":928,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-9",
-	"frame": {"x":1216,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-10",
-	"frame": {"x":1232,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-11",
-	"frame": {"x":928,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-12",
-	"frame": {"x":1248,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-13",
-	"frame": {"x":1264,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-14",
-	"frame": {"x":1280,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-18",
-	"frame": {"x":1296,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-19",
-	"frame": {"x":1312,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-20",
-	"frame": {"x":1328,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-21",
-	"frame": {"x":1344,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-22",
-	"frame": {"x":1360,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-23",
-	"frame": {"x":1376,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-24",
-	"frame": {"x":1392,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-25",
-	"frame": {"x":1408,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-26",
-	"frame": {"x":1424,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-27",
-	"frame": {"x":1440,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-28",
-	"frame": {"x":1456,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-29",
-	"frame": {"x":1472,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-30",
-	"frame": {"x":1488,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-31",
-	"frame": {"x":1504,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-32",
-	"frame": {"x":1520,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-33",
-	"frame": {"x":1536,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-34",
-	"frame": {"x":1552,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-35",
-	"frame": {"x":1568,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-36",
-	"frame": {"x":1584,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-37",
-	"frame": {"x":1600,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-38",
-	"frame": {"x":1616,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-39",
-	"frame": {"x":1632,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-40",
-	"frame": {"x":1648,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-41",
-	"frame": {"x":1664,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-42",
-	"frame": {"x":1680,"y":0,"w":16,"h":24},
-	"rotated": false,
-	"trimmed": false,
-	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
-	"sourceSize": {"w":16,"h":24}
-},
-{
-	"filename": "general-43",
+	"filename": "general-3",
 	"frame": {"x":0,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -889,7 +601,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-44",
+	"filename": "general-4",
 	"frame": {"x":16,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -897,7 +609,15 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-45",
+	"filename": "general-5",
+	"frame": {"x":944,"y":0,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "general-6",
 	"frame": {"x":32,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -905,7 +625,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-46",
+	"filename": "general-7",
 	"frame": {"x":48,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -913,7 +633,15 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-47",
+	"filename": "general-8",
+	"frame": {"x":944,"y":0,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "general-9",
 	"frame": {"x":64,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -921,7 +649,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-48",
+	"filename": "general-10",
 	"frame": {"x":80,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -929,7 +657,15 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-49",
+	"filename": "general-11",
+	"frame": {"x":944,"y":0,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "general-12",
 	"frame": {"x":96,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -937,7 +673,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-50",
+	"filename": "general-13",
 	"frame": {"x":112,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -945,7 +681,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-51",
+	"filename": "general-14",
 	"frame": {"x":128,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -953,7 +689,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-52",
+	"filename": "general-18",
 	"frame": {"x":144,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -961,7 +697,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-53",
+	"filename": "general-19",
 	"frame": {"x":160,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -969,7 +705,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-54",
+	"filename": "general-20",
 	"frame": {"x":176,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -977,7 +713,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "general-55",
+	"filename": "general-21",
 	"frame": {"x":192,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -985,7 +721,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "gnome",
+	"filename": "general-22",
 	"frame": {"x":208,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -993,7 +729,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "goblin",
+	"filename": "general-23",
 	"frame": {"x":224,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1001,7 +737,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "goblin_c",
+	"filename": "general-24",
 	"frame": {"x":240,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1009,7 +745,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "grass",
+	"filename": "general-25",
 	"frame": {"x":256,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1017,7 +753,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "grass_flower",
+	"filename": "general-26",
 	"frame": {"x":272,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1025,7 +761,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "grass_small",
+	"filename": "general-27",
 	"frame": {"x":288,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1033,7 +769,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "handaxe",
+	"filename": "general-28",
 	"frame": {"x":304,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1041,7 +777,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "head (1)",
+	"filename": "general-29",
 	"frame": {"x":320,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1049,7 +785,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "head (2)",
+	"filename": "general-30",
 	"frame": {"x":336,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1057,7 +793,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "head (3)",
+	"filename": "general-31",
 	"frame": {"x":352,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1065,7 +801,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "head (4)",
+	"filename": "general-32",
 	"frame": {"x":368,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1073,7 +809,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "head (5)",
+	"filename": "general-33",
 	"frame": {"x":384,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1081,7 +817,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "head (6)",
+	"filename": "general-34",
 	"frame": {"x":400,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1089,7 +825,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "head (7)",
+	"filename": "general-35",
 	"frame": {"x":416,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1097,7 +833,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "head (8)",
+	"filename": "general-36",
 	"frame": {"x":432,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1105,7 +841,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "head (9)",
+	"filename": "general-37",
 	"frame": {"x":448,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1113,7 +849,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "head (10)",
+	"filename": "general-38",
 	"frame": {"x":464,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1121,7 +857,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "horse",
+	"filename": "general-39",
 	"frame": {"x":480,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1129,7 +865,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "kobold",
+	"filename": "general-40",
 	"frame": {"x":496,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1137,7 +873,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "kobold_captain",
+	"filename": "general-41",
 	"frame": {"x":512,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1145,7 +881,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "kobold_large",
+	"filename": "general-42",
 	"frame": {"x":528,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1153,7 +889,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "legs (1)",
+	"filename": "general-43",
 	"frame": {"x":544,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1161,7 +897,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "legs (2)",
+	"filename": "general-44",
 	"frame": {"x":560,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1169,7 +905,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "legs (3)",
+	"filename": "general-45",
 	"frame": {"x":576,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1177,7 +913,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "legs (4)",
+	"filename": "general-46",
 	"frame": {"x":592,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1185,7 +921,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "legs (5)",
+	"filename": "general-47",
 	"frame": {"x":608,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1193,7 +929,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "magic_trap",
+	"filename": "general-48",
 	"frame": {"x":624,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1201,7 +937,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "meat",
+	"filename": "general-49",
 	"frame": {"x":640,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1209,7 +945,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "minimine",
+	"filename": "general-50",
 	"frame": {"x":656,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1217,7 +953,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "neck",
+	"filename": "general-51",
 	"frame": {"x":672,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1225,7 +961,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "ogre",
+	"filename": "general-52",
 	"frame": {"x":688,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1233,7 +969,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "orc",
+	"filename": "general-53",
 	"frame": {"x":704,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1241,7 +977,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "planks",
+	"filename": "general-54",
 	"frame": {"x":720,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1249,7 +985,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "planks_missing",
+	"filename": "general-55",
 	"frame": {"x":736,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1257,7 +993,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "planks_missing2",
+	"filename": "gnome",
 	"frame": {"x":752,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1265,7 +1001,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "plants",
+	"filename": "goblin",
 	"frame": {"x":768,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1273,7 +1009,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "potion",
+	"filename": "goblin_c",
 	"frame": {"x":784,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1281,7 +1017,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "potion_beaker",
+	"filename": "grass",
 	"frame": {"x":800,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1289,7 +1025,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "potion_conical",
+	"filename": "grass_flower",
 	"frame": {"x":816,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1297,7 +1033,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "potion_large",
+	"filename": "grass_small",
 	"frame": {"x":832,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1305,7 +1041,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-0",
+	"filename": "handaxe",
 	"frame": {"x":848,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1313,7 +1049,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-1",
+	"filename": "head (1)",
 	"frame": {"x":864,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1321,7 +1057,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-2",
+	"filename": "head (2)",
 	"frame": {"x":880,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1329,7 +1065,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-3",
+	"filename": "head (3)",
 	"frame": {"x":896,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1337,7 +1073,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-4",
+	"filename": "head (4)",
 	"frame": {"x":912,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1345,7 +1081,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-5",
+	"filename": "head (5)",
 	"frame": {"x":928,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1353,7 +1089,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-6",
+	"filename": "head (6)",
 	"frame": {"x":944,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1361,7 +1097,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-7",
+	"filename": "head (7)",
 	"frame": {"x":960,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1369,7 +1105,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-8",
+	"filename": "head (8)",
 	"frame": {"x":976,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1377,7 +1113,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-9",
+	"filename": "head (9)",
 	"frame": {"x":992,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1385,7 +1121,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-10",
+	"filename": "head (10)",
 	"frame": {"x":1008,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1393,7 +1129,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-11",
+	"filename": "horse",
 	"frame": {"x":1024,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1401,7 +1137,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-12",
+	"filename": "kobold",
 	"frame": {"x":1040,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1409,7 +1145,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-13",
+	"filename": "kobold_captain",
 	"frame": {"x":1056,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1417,7 +1153,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-14",
+	"filename": "kobold_large",
 	"frame": {"x":1072,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1425,7 +1161,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-15",
+	"filename": "legs (1)",
 	"frame": {"x":1088,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1433,7 +1169,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-16",
+	"filename": "legs (2)",
 	"frame": {"x":1104,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1441,7 +1177,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-17",
+	"filename": "legs (3)",
 	"frame": {"x":1120,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1449,7 +1185,7 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-18",
+	"filename": "legs (4)",
 	"frame": {"x":1136,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
@@ -1457,16 +1193,288 @@
 	"sourceSize": {"w":16,"h":24}
 },
 {
-	"filename": "projectiles-19",
+	"filename": "legs (5)",
 	"frame": {"x":1152,"y":24,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
 	"sourceSize": {"w":16,"h":24}
 },
+{
+	"filename": "magic_trap",
+	"frame": {"x":0,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "meat",
+	"frame": {"x":16,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "minimine",
+	"frame": {"x":32,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "neck",
+	"frame": {"x":48,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "ogre",
+	"frame": {"x":64,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "orc",
+	"frame": {"x":80,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "planks",
+	"frame": {"x":96,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "planks_missing",
+	"frame": {"x":112,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "planks_missing2",
+	"frame": {"x":128,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "plants",
+	"frame": {"x":144,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "potion",
+	"frame": {"x":160,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "potion_beaker",
+	"frame": {"x":176,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "potion_conical",
+	"frame": {"x":192,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "potion_large",
+	"frame": {"x":208,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-0",
+	"frame": {"x":224,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-1",
+	"frame": {"x":240,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-2",
+	"frame": {"x":256,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-3",
+	"frame": {"x":272,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-4",
+	"frame": {"x":288,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-5",
+	"frame": {"x":304,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-6",
+	"frame": {"x":320,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-7",
+	"frame": {"x":336,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-8",
+	"frame": {"x":352,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-9",
+	"frame": {"x":368,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-10",
+	"frame": {"x":384,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-11",
+	"frame": {"x":400,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-12",
+	"frame": {"x":416,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-13",
+	"frame": {"x":432,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-14",
+	"frame": {"x":448,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-15",
+	"frame": {"x":464,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-16",
+	"frame": {"x":480,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-17",
+	"frame": {"x":496,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-18",
+	"frame": {"x":512,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "projectiles-19",
+	"frame": {"x":528,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
 {
 	"filename": "projectiles-20",
-	"frame": {"x":1168,"y":24,"w":16,"h":24},
+	"frame": {"x":544,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1474,7 +1482,7 @@
 },
 {
 	"filename": "projectiles-21",
-	"frame": {"x":1168,"y":24,"w":16,"h":24},
+	"frame": {"x":544,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1482,7 +1490,7 @@
 },
 {
 	"filename": "projectiles-22",
-	"frame": {"x":1168,"y":24,"w":16,"h":24},
+	"frame": {"x":544,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1490,7 +1498,7 @@
 },
 {
 	"filename": "projectiles-23",
-	"frame": {"x":1168,"y":24,"w":16,"h":24},
+	"frame": {"x":544,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1498,7 +1506,7 @@
 },
 {
 	"filename": "projectiles-24",
-	"frame": {"x":1168,"y":24,"w":16,"h":24},
+	"frame": {"x":544,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1506,7 +1514,7 @@
 },
 {
 	"filename": "projectiles-25",
-	"frame": {"x":1184,"y":24,"w":16,"h":24},
+	"frame": {"x":560,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1514,7 +1522,7 @@
 },
 {
 	"filename": "projectiles-26",
-	"frame": {"x":1184,"y":24,"w":16,"h":24},
+	"frame": {"x":560,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1522,7 +1530,7 @@
 },
 {
 	"filename": "projectiles-27",
-	"frame": {"x":1184,"y":24,"w":16,"h":24},
+	"frame": {"x":560,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1530,7 +1538,7 @@
 },
 {
 	"filename": "projectiles-28",
-	"frame": {"x":1184,"y":24,"w":16,"h":24},
+	"frame": {"x":560,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1538,7 +1546,7 @@
 },
 {
 	"filename": "projectiles-29",
-	"frame": {"x":1184,"y":24,"w":16,"h":24},
+	"frame": {"x":560,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1546,7 +1554,7 @@
 },
 {
 	"filename": "rat",
-	"frame": {"x":1200,"y":24,"w":16,"h":24},
+	"frame": {"x":576,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1554,7 +1562,7 @@
 },
 {
 	"filename": "rat_large",
-	"frame": {"x":1216,"y":24,"w":16,"h":24},
+	"frame": {"x":592,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1562,7 +1570,7 @@
 },
 {
 	"filename": "scimitar",
-	"frame": {"x":1232,"y":24,"w":16,"h":24},
+	"frame": {"x":608,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1570,7 +1578,7 @@
 },
 {
 	"filename": "scroll",
-	"frame": {"x":1248,"y":24,"w":16,"h":24},
+	"frame": {"x":624,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1578,7 +1586,7 @@
 },
 {
 	"filename": "scroll_writing",
-	"frame": {"x":1264,"y":24,"w":16,"h":24},
+	"frame": {"x":640,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1586,7 +1594,7 @@
 },
 {
 	"filename": "shield_large",
-	"frame": {"x":1280,"y":24,"w":16,"h":24},
+	"frame": {"x":656,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1594,7 +1602,7 @@
 },
 {
 	"filename": "shield_round",
-	"frame": {"x":1296,"y":24,"w":16,"h":24},
+	"frame": {"x":672,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1602,7 +1610,7 @@
 },
 {
 	"filename": "shield_small",
-	"frame": {"x":1312,"y":24,"w":16,"h":24},
+	"frame": {"x":688,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1610,7 +1618,7 @@
 },
 {
 	"filename": "shortsword",
-	"frame": {"x":1328,"y":24,"w":16,"h":24},
+	"frame": {"x":704,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1618,7 +1626,7 @@
 },
 {
 	"filename": "slash1",
-	"frame": {"x":1344,"y":24,"w":16,"h":24},
+	"frame": {"x":720,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1626,7 +1634,7 @@
 },
 {
 	"filename": "slash2",
-	"frame": {"x":1360,"y":24,"w":16,"h":24},
+	"frame": {"x":736,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1634,7 +1642,7 @@
 },
 {
 	"filename": "slash3",
-	"frame": {"x":1376,"y":24,"w":16,"h":24},
+	"frame": {"x":752,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1642,7 +1650,7 @@
 },
 {
 	"filename": "spider",
-	"frame": {"x":1392,"y":24,"w":16,"h":24},
+	"frame": {"x":768,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1650,7 +1658,7 @@
 },
 {
 	"filename": "spider_large",
-	"frame": {"x":1408,"y":24,"w":16,"h":24},
+	"frame": {"x":784,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1658,7 +1666,7 @@
 },
 {
 	"filename": "statue",
-	"frame": {"x":1424,"y":24,"w":16,"h":24},
+	"frame": {"x":800,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1666,7 +1674,7 @@
 },
 {
 	"filename": "stones",
-	"frame": {"x":1440,"y":24,"w":16,"h":24},
+	"frame": {"x":816,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1674,7 +1682,7 @@
 },
 {
 	"filename": "table",
-	"frame": {"x":1456,"y":24,"w":16,"h":24},
+	"frame": {"x":832,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1682,7 +1690,7 @@
 },
 {
 	"filename": "table_l_chair",
-	"frame": {"x":1472,"y":24,"w":16,"h":24},
+	"frame": {"x":848,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1690,7 +1698,7 @@
 },
 {
 	"filename": "table_r",
-	"frame": {"x":1488,"y":24,"w":16,"h":24},
+	"frame": {"x":864,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1698,7 +1706,7 @@
 },
 {
 	"filename": "tiles",
-	"frame": {"x":1504,"y":24,"w":16,"h":24},
+	"frame": {"x":880,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1706,7 +1714,7 @@
 },
 {
 	"filename": "tiles2",
-	"frame": {"x":1520,"y":24,"w":16,"h":24},
+	"frame": {"x":896,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1714,7 +1722,63 @@
 },
 {
 	"filename": "tiles3",
-	"frame": {"x":1536,"y":24,"w":16,"h":24},
+	"frame": {"x":912,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "tiles4",
+	"frame": {"x":928,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "tiles_missing",
+	"frame": {"x":944,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "tiles_missing2",
+	"frame": {"x":960,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "tiles_missing3",
+	"frame": {"x":976,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "tiles_missing4",
+	"frame": {"x":992,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "tiles_missing5",
+	"frame": {"x":1008,"y":48,"w":16,"h":24},
+	"rotated": false,
+	"trimmed": false,
+	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
+	"sourceSize": {"w":16,"h":24}
+},
+{
+	"filename": "tiles_missing6",
+	"frame": {"x":1024,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1722,7 +1786,7 @@
 },
 {
 	"filename": "trapdoor",
-	"frame": {"x":1552,"y":24,"w":16,"h":24},
+	"frame": {"x":1040,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1730,7 +1794,7 @@
 },
 {
 	"filename": "trapdoor_open",
-	"frame": {"x":1568,"y":24,"w":16,"h":24},
+	"frame": {"x":1056,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1738,7 +1802,7 @@
 },
 {
 	"filename": "trident",
-	"frame": {"x":1584,"y":24,"w":16,"h":24},
+	"frame": {"x":1072,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1746,7 +1810,7 @@
 },
 {
 	"filename": "wall",
-	"frame": {"x":1600,"y":24,"w":16,"h":24},
+	"frame": {"x":1088,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1754,7 +1818,7 @@
 },
 {
 	"filename": "wall_b",
-	"frame": {"x":1616,"y":24,"w":16,"h":24},
+	"frame": {"x":1104,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1762,7 +1826,7 @@
 },
 {
 	"filename": "wall_b_cracked",
-	"frame": {"x":1632,"y":24,"w":16,"h":24},
+	"frame": {"x":1120,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1770,7 +1834,7 @@
 },
 {
 	"filename": "water",
-	"frame": {"x":1648,"y":24,"w":16,"h":24},
+	"frame": {"x":1136,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1778,7 +1842,7 @@
 },
 {
 	"filename": "water2",
-	"frame": {"x":1664,"y":24,"w":16,"h":24},
+	"frame": {"x":1152,"y":48,"w":16,"h":24},
 	"rotated": false,
 	"trimmed": false,
 	"spriteSourceSize": {"x":0,"y":0,"w":16,"h":24},
@@ -1789,8 +1853,8 @@
 	"version": "1.0",
 	"image": "atlas.png",
 	"format": "RGBA8888",
-	"size": {"w":1696,"h":48},
+	"size": {"w":1168,"h":72},
 	"scale": "1",
-	"smartupdate": "$TexturePacker:SmartUpdate:e80637f80ce36daf70881837d579d889:415603bd51025bb7baa2d3213ac8015d:cbce6b53f0f49e0bf15173c25c41f876$"
+	"smartupdate": "$TexturePacker:SmartUpdate:b0e758ec509f6276e43ca3eb96af6b5a:b0ecaa10300e440b4ca12ec209a0969c:cbce6b53f0f49e0bf15173c25c41f876$"
 }
 }
diff --git a/resources/atlas.png b/resources/atlas.png
index af1dfb5a159c1848308c7dabf8a49257c2db782c..595ca023866104cbf0b3ba9e124535bede6e11b4 100644
GIT binary patch
delta 4963
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

delta 4765
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
ak9E(LiRLozeOEAmhMZjeT-G@yGywo@dhbjC

diff --git a/src/map/themes.rs b/src/map/themes.rs
index ff51738..c118f47 100644
--- a/src/map/themes.rs
+++ b/src/map/themes.rs
@@ -41,7 +41,7 @@ pub fn get_sprite_for_id(idx: usize, map: &Map, other_pos: Option<Point>) -> (&s
         }
     };
     // Apply our offsets to our base colour.
-    colour = apply_colour_offset(colour, map, idx, offset, false);
+    colour = apply_colour_offset(colour, map, idx, offset, true);
     // Apply our visibility modifier
     colour = colour.mul(visibility);
     // Convert to a notan colour.
diff --git a/src/map/tiletype.rs b/src/map/tiletype.rs
index 20958d0..063c3bd 100644
--- a/src/map/tiletype.rs
+++ b/src/map/tiletype.rs
@@ -49,12 +49,21 @@ impl TileType {
             TileType::ImpassableMountain => vec!["wall_b"],
             TileType::Wall => vec!["wall"],
             TileType::DeepWater => vec!["water", "water2"],
-            TileType::Fence => vec!["fence"],
+            TileType::Fence => vec!["tiles4"],
             TileType::Bars => vec!["wall_b"],
-            TileType::Floor => vec!["dot", "fluff", "fluff2"],
+            TileType::Floor => vec!["dot"],
             TileType::WoodFloor => vec!["planks", "planks_missing", "planks_missing2"],
             TileType::Gravel => vec!["fluff", "fluff2"],
-            TileType::Road => vec!["tiles"],
+            TileType::Road =>
+                vec![
+                    "tiles",
+                    "tiles_missing",
+                    "tiles_missing2",
+                    "tiles_missing3",
+                    "tiles_missing4",
+                    "tiles_missing5",
+                    "tiles_missing6"
+                ],
             TileType::Grass => vec!["fluff", "fluff2"],
             TileType::Foliage => vec!["grass_small", "grass"],
             TileType::HeavyFoliage => vec!["grass_flower"],