diff --git a/game/engines/default/engine/Store.lua b/game/engines/default/engine/Store.lua
index 80f00ba5853db5cf224911d892e56e224a1a70ad..e1e3e5837d193f678625c40e516216b6cca84d1f 100644
--- a/game/engines/default/engine/Store.lua
+++ b/game/engines/default/engine/Store.lua
@@ -57,16 +57,23 @@ function _M:loadup(level, zone)
 		end
 	end
 
-	for i = 1, rng.range(s.min_fill, s.max_fill) - #inven do
+	local i = 1
+	while i <= rng.range(s.min_fill, s.max_fill) - #inven do
 		local filter = rng.table(s.filters)
 		local e
 		if not filter.defined then e = zone:makeEntity(level, "object", filter, nil, true)
 		else e = zone:makeEntityByName(level, "object", filter.defined) end
 		if e and not e.not_in_stores then
-			if filter.id then e:identify(filter.id) end
-			self:addObject(inven, e)
-			zone:addEntity(level, e, "object")
-			print("[STORE] stocking up: ", e.name)
+			if s.post_filter and not s.post_filter(e) then
+			else
+				if filter.id then e:identify(filter.id) end
+				self:addObject(inven, e)
+				zone:addEntity(level, e, "object")
+				print("[STORE] stocking up: ", e.name)
+				i = i + 1
+			end
+		elseif not e then
+			i = i + 1
 		end
 	end
 
diff --git a/game/engines/default/engine/dialogs/ShowErrorStack.lua b/game/engines/default/engine/dialogs/ShowErrorStack.lua
new file mode 100644
index 0000000000000000000000000000000000000000..a8285bc7d6b55961132fe8b16e84253022822c57
--- /dev/null
+++ b/game/engines/default/engine/dialogs/ShowErrorStack.lua
@@ -0,0 +1,58 @@
+-- TE4 - T-Engine 4
+-- Copyright (C) 2009, 2010 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+require "engine.class"
+local Dialog = require "engine.ui.Dialog"
+local Button = require "engine.ui.Button"
+local Textzone = require "engine.ui.Textzone"
+local Textbox = require "engine.ui.Textbox"
+
+module(..., package.seeall, class.inherit(Dialog))
+
+function _M:init(errs)
+	self.errs = errs
+	Dialog.init(self, "Lua Error", 700, 500)
+
+	local errmsg = Textzone.new{text=[[#{bold}#Oh my! It seems there was an error!
+The game might still work but this is suspect, please type in your current situation and click on "Send" to send an error report to the game creator.
+If you are not currently connected to the internet, please report this bug when you can on the forums at http://forums.te4.org/
+
+If you already reported that error, you do not have to do it again (unless you feel the situation is different).
+#{normal}#]], width=690, auto_height=true}
+	local errzone = Textzone.new{text=table.concat(errs, "\n"), width=690, height=400}
+	self.what = Textbox.new{title="What happened?: ", text="", chars=60, max_len=1000, fct=function(text) self:send() end}
+	local ok = require("engine.ui.Button").new{text="Send", fct=function() self:send() end}
+	local cancel = require("engine.ui.Button").new{text="Close", fct=function() game:unregisterDialog(self) end}
+
+	self:loadUI{
+		{left=0, top=0, padding_h=10, ui=errmsg},
+		{left=0, top=errmsg.h + 10, padding_h=10, ui=errzone},
+		{left=0, bottom=ok.h, ui=self.what},
+		{left=0, bottom=0, ui=ok},
+		{right=0, bottom=0, ui=cancel},
+	}
+	self:setFocus(self.what)
+	self:setupUI(false, true)
+end
+
+function _M:send()
+	game:unregisterDialog(self)
+	profile:sendError(self.what.text, table.concat(self.errs, "\n"))
+	game.log("#YELLOW#Error report sent, thank you.")
+end
diff --git a/game/modules/tome/data/general/stores/basic.lua b/game/modules/tome/data/general/stores/basic.lua
index bf1bbc65e1be6e692fea28b31264390205e50e48..dbe26378bd2401798ede3ff1e5630ffa163376a0 100644
--- a/game/modules/tome/data/general/stores/basic.lua
+++ b/game/modules/tome/data/general/stores/basic.lua
@@ -197,3 +197,60 @@ newEntity{
 		},
 	},
 }
+
+-------------------------------------------------------------
+-- Last Hope
+-------------------------------------------------------------
+newEntity{
+	define_as = "ZIGUR_LIBRARY",
+	name = "library",
+	display = '*', color=colors.LIGHT_RED,
+	store = {
+		purse = 5,
+		restock_after = 1000,
+		empty_before_restock = true,
+		sell_percent = 100,
+		min_fill = 40,
+		max_fill = 40,
+		filters = {
+			{id=true, defined="ZIGUR_HISTORY"},
+		},
+	},
+}
+
+newEntity{
+	define_as = "ZIGUR_ARMOR",
+	name = "armour smith",
+	display = '2', color=colors.UMBER,
+	store = {
+		purse = 25,
+		restock_after = 1000,
+		empty_before_restock = true,
+		min_fill = 20,
+		max_fill = 30,
+		filters = {
+			{type="armor", id=true, ego_chance={ego_chance=1000, properties={"greater_ego"}}},
+		},
+		post_filter = function(e)
+			if e.power_source and e.power_source.arcane then return false end
+			return true
+		end,
+	},
+}
+
+newEntity{
+	define_as = "ZIGUR_WEAPON",
+	name = "weapon smith",
+	display = '3', color=colors.UMBER,
+	store = {
+		purse = 25,
+		restock_after = 1000,
+		empty_before_restock = true,
+		min_fill = 10,
+		max_fill = 20,
+		filters = {
+			{type="weapon", id=true},
+			{type="ammo", id=true},
+		},
+	},
+}
diff --git a/game/modules/tome/data/gfx/stone_store_library.png b/game/modules/tome/data/gfx/stone_store_library.png
new file mode 100644
index 0000000000000000000000000000000000000000..624f8948e495eb2920cd5923abe668e377ec6ace
Binary files /dev/null and b/game/modules/tome/data/gfx/stone_store_library.png differ
diff --git a/game/modules/tome/data/lore/zigur.lua b/game/modules/tome/data/lore/zigur.lua
index 1b7d6adc23268946508e8c0a24538cdb7f1ada24..74afeaea089456f72134f7a69120a51cc550cea3 100644
--- a/game/modules/tome/data/lore/zigur.lua
+++ b/game/modules/tome/data/lore/zigur.lua
@@ -36,3 +36,28 @@ newLore{
 
 These are the rules we live by, these are the rules by which we will save our world. All who fail in these rules will be purged with flame.]],
 }
+
+newLore{
+	id = "zigur-history",
+	category = "zigur",
+	name = "The Great Evil",
+	lore = [[We live in a world of wonders. All around us are natural energies and wild powers that are a marvel to see and experience. Soaring birds, mighty bears and ice-breathing dragons all abound in towering mountains, deep oceans and luscious forests. And we are part of this glorious environment, with our thoughts and strengths and all our wondrous capabilities. Truly we live in a fantastic world, and we should be glad to have a place amongst the wonders of Maj'Eyal.
+
+But some are not content. Some seek to pervert the wonders of the world with unnatural powers. With arcane forces they rip the threads of nature apart and sew it back however they see fit, uncaring of the damage they cause. Sometimes it is out of curiosity or a misplaced desire to do good, but normally it is out of greed and malice and a perverse obsession with power. Even those who enter into the banes of magic with good intentions inevitably end up doing harm and becoming themselves corrupted by the gross forces they tamper in.
+
+History teaches us well the dangers of these forces. First were the Sher'Tul, of which we know little, but we do know that they manipulated magic to strengths beyond the dreams of current mages. And they led themselves to their own utter destruction. Alas that the lesson was not learnt by the younger races. The first recorded war in our history is between the humans and halflings for control of Sher'Tul ruins. Magic was used in those wars and the battles only stopped after two thousand years of slaughter left both sides too crippled to carry on fighting. It was in this time that our order was formed, and we tried to stop the insanity and the bloodshed. Alas that we failed.
+
+The weakening of our peoples by the magic-fuelled fighting left us then open to attacks by the orcs, whose surging numbers nearly overwhelmed us. But instead of relying on our own strengths and our natural defences, the foolish elves decided that only the arcane forces could save us. How very wrong they were... Their insidious mages tapped the vile powers of the Sher'Tul ruins and unleashed catastrophic waves of energy that burned half the world to a cinder. Mountains crumbled, lakes were boiled, and raging fires stripped the land of all life. The devastation can truly never be fully stated. But it is unforgettable and utterly unforgiveable. The Shaloren try to deny responsibility, but the blood of millions is on their hands.
+
+The suffering that followed the unfortunate survivors lasted centuries, as the unnatural forces created black plagues that wiped out kingdoms and made huge swathes of land uninhabitable. Dread warlocks and necromancers took advantage of the chaos to raise armies and gain power. Kor'Pul was the deadliest of these, and our order fought long and hard to kill him time and time again. We fought viciously to protect the people of Maj'Eyal from all the terrible pains of this time.
+
+But our efforts could not prevent the ultimate tragedy that followed. The plagues were mere echoes of the Spellblaze as its horrible effects rebounded across the land. One dark and terrible day those echoes rose in resonance, and a cataclysmic force tore through the heart of our world. The land was rent in two, earthquakes spouted forth magma from the ground, and the eastern edge of our land was torn away and sunk into the deepest oceans. It was a tragedy beyond comparison.
+
+As our civilisations slowly recovered the orcs began to increase in numbers, and it became clear then that they too had learned the dark arts. For centuries we suffered their attacks, and only by a unification of the races did we manage to finally contain them and wipe them out. Our order was vital in suppressing their pyromancers and blood mages, and many of our people bravely gave up their lives to protect the western armies and towns from destruction.
+
+But we are not clear of danger yet. Magic still exists, though oft it lies secret and hidden. Memories of the dark days have waned, and one can even see alchemists and enchanters walking openly in the streets, unheeding of the pain their ilk have brought to our world. But worse exists... Secret societies hide themselves in unknown places, plotting and scheming to bring further destruction on Maj'Eyal. Dark cults exist in quiet isolation, kidnapping innocents and performing vile ceremonies. We try our best to hunt these monsters down, to root them out from their fell dens and bring an end to their depraved plans. Yet we must try harder, for our world is in mortal peril if these fiends are allowed to act unhindered.
+
+We must never forget the terrors of the Great Evil, and the suffering brought upon us by those who choose to corrupt nature with arcane powers. Be wary in your travels, and be thorough in your duties. Our fight is difficult, but it is just and true, and not until all Maj'Eyal is cleansed of the impurities of magic can we ever know peace. We are the protectors of the world, and by our strength and our union with nature we shall be its saviours.
+
+-- Protector Myssil]],
+}
diff --git a/game/modules/tome/data/maps/towns/zigur.lua b/game/modules/tome/data/maps/towns/zigur.lua
index c783067d31e7d7dd838dd8a5ce9417a668503788..9a725b292ee1394e868cbe05b7e190d44db3d952 100644
--- a/game/modules/tome/data/maps/towns/zigur.lua
+++ b/game/modules/tome/data/maps/towns/zigur.lua
@@ -19,27 +19,27 @@
 
 setStatusAll{no_teleport=true}
 
-quickEntity('^', {show_tooltip=true, name='mountains', display='^', color=colors.LIGHT_BLUE, image="terrain/mountain.png", block_move=true, block_sight=true})
-quickEntity('<', {show_tooltip=true, name='portal back', display='<', color=colors.WHITE, change_level=1, change_zone=game.player.last_wilderness, image="terrain/sand.png", add_displays = {mod.class.Grid.new{image="terrain/worldmap.png"}}}, nil, {type="portal", subtype="back"})
+defineTile('<', "GRASS_UP_WILDERNESS")
 defineTile('t', {"TREE","TREE2","TREE3","TREE4","TREE5","TREE6","TREE7","TREE8","TREE9","TREE10","TREE11","TREE12","TREE13","TREE14","TREE15","TREE16","TREE17","TREE18","TREE19","TREE20"})
-quickEntity('~', {show_tooltip=true, name='lake', display='~', color=colors.BLUE, block_move=true, image="terrain/river.png", shader = "water", textures = { function() return _3DNoise, true end }})
-quickEntity('.', {show_tooltip=true, name='grass', display='.', color=colors.LIGHT_GREEN, image="terrain/grass.png"})
-quickEntity('-', {show_tooltip=true, name='cultivated fields', display=';', color=colors.GREEN, back_color=colors.DARK_GREEN, image="terrain/cultivation.png", equilibrium_level=-10})
-quickEntity('_', {show_tooltip=true, name='cobblestone road', display='.', color=colors.WHITE, image="terrain/stone_road1.png"})
-quickEntity(',', {show_tooltip=true, name='sand', display='.', color={r=203,g=189,b=72}, back_color={r=163,g=149,b=42}, image="terrain/sand.png", can_encounter="desert", equilibrium_level=-10}, {no_teleport=true})
-quickEntity('!', {show_tooltip=true, name='giant rock', display='#', color_r=255, color_g=255, color_b=255, back_color=colors.DARK_GREY, always_remember = true, does_block_move = true, block_sight = true, air_level = -20, image="terrain/maze_rock.png"})
-quickEntity('#', {show_tooltip=true, name='wall', display='#', color_r=255, color_g=255, color_b=255, back_color=colors.DARK_GREY, always_remember = true, does_block_move = true, block_sight = true, air_level = -20, image="terrain/bigwall.png"})
-quickEntity('+', {show_tooltip=true, name='closed door', display='+', color_r=255, color_g=255, color_b=255, back_color=colors.DARK_GREY, always_remember = true, does_block_move = true, block_sight = true, air_level = -20, image="terrain/stone_store_closed.png"})
-quickEntity('=', {show_tooltip=true, name='lava pit', display='~', color=colors.LIGHT_RED, back_color=colors.RED, always_remember = true, does_block_move = true, image="terrain/lava_floor.png"})
+defineTile('~', "DEEP_OCEAN_WATER")
+defineTile('.', "GRASS")
+defineTile('-', "FIELDS")
+defineTile('_', "COBBLESTONE")
+defineTile(',', "SAND")
+defineTile('!', "ROCK")
+defineTile('#', "HARDWALL")
+defineTile('+', "DOOR")
+defineTile('=', "LAVA")
 defineTile("?", "OLD_FLOOR")
 defineTile(":", "FLOOR")
 defineTile("&", "POST")
 defineTile("@", "FLOOR", nil, "PROTECTOR_MYSSIL")
-quickEntity("'", {show_tooltip=true, name="Open gates", display="'", color=colors.UMBER, image="terrain/stone_store_open.png"})
+defineTile("'", "DOOR")
 
-quickEntity('1', {show_tooltip=true, name="Trainer", display='1', color=colors.UMBER, chat_faction="zigur", resolvers.chatfeature("zigur-trainer", "zigur"), image="terrain/stone_store_training.png"})
-quickEntity('2', {show_tooltip=true, name="Armour Smith", display='2', color=colors.UMBER, store_faction="zigur", resolvers.store("ARMOR", "zigur"), image="terrain/stone_store_armor.png"})
-quickEntity('3', {show_tooltip=true, name="Weapon Smith", display='3', color=colors.UMBER, store_faction="zigur", resolvers.store("WEAPON", "zigur"), image="terrain/stone_store_weapon.png"})
+defineTile('1', "HARDWALL", nil, nil, "TRAINER")
+defineTile('2', "HARDWALL", nil, nil, "WEAPON_STORE")
+defineTile('3', "HARDWALL", nil, nil, "ARMOR_STORE")
+defineTile('9', "HARDWALL", nil, nil, "LIBRARY")
 
 startx = 24
 starty = 49
@@ -125,7 +125,7 @@ return [[
 ~~~~~~~~.......#:::::::#...#1#.==??????==....##ttt
 ~~~~~~~tt......#:##'##:#......==????????==...##ttt
 ~~~~~~ttt......#:#._.#:#......=??!!??????=...###tt
-~~~~~tttt......###._.###.....==??????????==..####t
+~~~~~tttt......###._.###.....==??????????==..###tt
 ~~~~~ttt..........._.........=????????????=..###tt
 ~~~~tttt........._____.......=????????????==.+#ttt
 ~~~tttt.........._ttt_....___=??????????!??=...ttt
@@ -134,19 +134,19 @@ return [[
 ~~..............._ttt_........=???????????=.....tt
 ~~~.............._ttt_........===???????===.....tt
 ~~~~~............_____..........=========.......tt
-~~~.............................................tt
+~~~~~...........................................tt
 ~~~..........................######............ttt
 ~~~..........................######............ttt
-~~~~,........................##3###...........tttt
+~~~~.........................##3#9#...........tttt
 ~~~~,,,.....................................tttttt
 ~~~~,,,,..................................tttttttt
-~~~~~~,,,,...............................ttttttttt
-~~~~~~~~,,,.............tt###2##....tt..tttttttttt
-~~~~~~~~~,,............ttt######.....t.ttttttttttt
-~~~~~~~~~,,,............ttt#####.......ttttttttttt
-~~~~~~~~~,,,,...........tttt####........tttttttttt
-~~~~~~~~~~,,,.............ttt...........tttttttttt
-~~~~~~~~~~,,,,..............t...........tttttttttt
+~~~~~~,,,,..............t................ttttttttt
+~~~~~~~~,,,............ttt..####....tt..tttttttttt
+~~~~~~~~~,,...........ttttt.####.....t.ttttttttttt
+~~~~~~~~~,,,..........ttttt.##2#.......ttttttttttt
+~~~~~~~~~,,,,...........tt..............tttttttttt
+~~~~~~~~~~,,,...........................tttttttttt
+~~~~~~~~~~,,,,..........................tttttttttt
 ~~~~~~~~~~,,,,..........................tttttttttt
 ~~~~~~~~~~,,,,,..........................ttttttttt
 ~~~~~~~~~~~,,,,,...........................ttttttt
@@ -156,13 +156,13 @@ return [[
 ~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,,,..........------tt
 ~~~~~~~~~~~~~~~~~~,,,,,,,,,,,,,,,.........------.t
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,,........------.t
-~~~~~~~~~~~~~~~~~~~~~~~,,,~~~~~~~,&.......------.t
-~~~~~~~~~~~~~~~~~~~~~~,,t,,~~~~~~,t.......------.t
-~~~~~~~~~~~~~~~~~~~~~~,ttt,,~~~~~,tt......------tt
-~~~~~~~~~~~~~~~~~~~~~~,tttt,,,~,,,ttt.....------tt
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~,&.......------.t
+~~~~~~~~~~~~~~~~~~~~~~~,,,,~~~~~~,t.......------.t
+~~~~~~~~~~~~~~~~~~~~~~,,tt,,~~~~~,tt......------tt
+~~~~~~~~~~~~~~~~~~~~~~,tttt,,,,,,,ttt.....------tt
 ~~~~~~~~~~~~~~~~~~~~~~,tttttt,,,tttttttt..------tt
 ~~~~~~~~~~~~~~~~~~~~~~,,tttttttttttttttttt-----ttt
 ~~~~~~~~~~~~~~~~~~~~~~~,,tttttttttttttttttttt..ttt
 ~~~~~~~~~~~~~~~~~~~~~~~~,ttttttttttttttttttttttttt
 ~~~~~~~~~~~~~~~~~~~~~~~~,ttttttttttttttttttttttttt
-~~~~~~~~~~~~~~~~~~~~~~~~<ttttttttttttttttttttttttt]]
+~~~~~~~~~~~~~~~~~~~~~~~~<ttttttttttttttttttttttttt]]
\ No newline at end of file
diff --git a/game/modules/tome/data/zones/town-zigur/grids.lua b/game/modules/tome/data/zones/town-zigur/grids.lua
index 52a7d00037b581c8ed45b99f835a7e0ae53c0ec0..069b6492013e173b7c9d981bad5984cd01717b1d 100644
--- a/game/modules/tome/data/zones/town-zigur/grids.lua
+++ b/game/modules/tome/data/zones/town-zigur/grids.lua
@@ -18,6 +18,8 @@
 -- darkgod@te4.org
 
 load("/data/general/grids/basic.lua")
+load("/data/general/grids/water.lua")
+load("/data/general/grids/sand.lua")
 load("/data/general/grids/forest.lua")
 
 newEntity{
@@ -32,3 +34,26 @@ newEntity{
 		if who.player then who:learnLore(self.lore) end
 	end,
 }
+
+newEntity{ define_as = "LAVA",
+	name='lava pit',
+	display='~', color=colors.LIGHT_RED, back_color=colors.RED,
+	always_remember = true, does_block_move = true,
+	image="terrain/lava_floor.png",
+}
+
+newEntity{ base = "GRASS", define_as = "FIELDS",
+	name="cultivated fields",
+	display=';', image="terrain/cultivation.png"
+}
+
+newEntity{ base = "FLOOR", define_as = "COBBLESTONE",
+	name="cobblestone road",
+	display='.', image="terrain/stone_road1.png"
+}
+
+newEntity{ base = "HARDWALL", define_as = "ROCK",
+	name="giant rock",
+	image="terrain/oldstone_floor.png", add_displays = {class.new{image="terrain/maze_rock.png"}},
+	nice_tiler = false,
+}
diff --git a/game/modules/tome/data/zones/town-zigur/objects.lua b/game/modules/tome/data/zones/town-zigur/objects.lua
index 4e7b8c6c6405bb629806f2279b08ee9e45700cf7..e9230da14d50959ef87d86f5cfb3dd591c8b2cbe 100644
--- a/game/modules/tome/data/zones/town-zigur/objects.lua
+++ b/game/modules/tome/data/zones/town-zigur/objects.lua
@@ -18,3 +18,13 @@
 -- darkgod@te4.org
 
 load("/data/general/objects/objects.lua")
+
+newEntity{ base = "BASE_LORE",
+	define_as = "ZIGUR_HISTORY",
+	subtype = "the great evil", unique=true, no_unique_lore=true, not_in_stores=false,
+	name = "The Great Evil", lore="zigur-history",
+	desc = [[History of the horrors of magic.]],
+	rarity = false,
+	encumberance = 0,
+	cost = 2,
+}
diff --git a/game/modules/tome/resolvers.lua b/game/modules/tome/resolvers.lua
index 81942c77376ef9246f4aac37b4311b49c09a8f72..ddaafacc1aff3e93dde833fc234d4bffe08fbbd7 100644
--- a/game/modules/tome/resolvers.lua
+++ b/game/modules/tome/resolvers.lua
@@ -182,12 +182,13 @@ function resolvers.calc.store(t, e)
 	e.store_faction = t[2]
 	t = t[1]
 
-	e.on_move = function(self, x, y, who)
-		if who.player then
+	e.block_move = function(self, x, y, who, act, couldpass)
+		if who and who.player and act then
 			if self.store_faction and who:reactionToward({faction=self.store_faction}) < 0 then return end
 			self.store:loadup(game.level, game.zone)
 			self.store:interact(who)
 		end
+		return true
 	end
 	e.store = game:getStore(t)
 	print("[STORE] created for entity", t, e, e.name)
@@ -205,13 +206,14 @@ function resolvers.calc.chatfeature(t, e)
 	e.chat_faction = t[2]
 	t = t[1]
 
-	e.on_move = function(self, x, y, who)
-		if who.player then
+	e.block_move = function(self, x, y, who, act, couldpass)
+		if who and who.player and act then
 			if self.chat_faction and who:reactionToward({faction=self.chat_faction}) < 0 then return end
 			local Chat = require("engine.Chat")
 			local chat = Chat.new(self.chat, self, who)
 			chat:invoke()
 		end
+		return true
 	end
 	e.chat = t
 
diff --git a/tiled-maps/zigur.tmx b/tiled-maps/zigur.tmx
index e3ee1dc0ec4b5aa3784e34b257226403f8df5042..953de5b95436f449a320b842503ff81419742239 100644
--- a/tiled-maps/zigur.tmx
+++ b/tiled-maps/zigur.tmx
@@ -118,6 +118,11 @@
     <property name="display" value="1"/>
    </properties>
   </tile>
+  <tile id="24">
+   <properties>
+    <property name="display" value="9"/>
+   </properties>
+  </tile>
   <tile id="30">
    <properties>
     <property name="display" value="+"/>
@@ -131,7 +136,7 @@
  </tileset>
  <layer name="Terrain" width="50" height="50">
   <data encoding="base64" compression="zlib">
-   eJzt2E1qAzEMBWB3G5hVDhDoJea63fYAvUuzaNe5QekuDMQghH6eRrbHhAQetKkz9Te2FCfnUsq5c9YB6W2IOk6PjHCcwHDHlQS9BurqMX9tDhmHZ8kYrkC08dl7EnVY19zm82YEcbw7QS2jHTfyfJ2r9tAs9V6gDt5DNEe97j/5WXLQeAbLEnFIvdBybL9flOc1R318PmJZtP1pObSebtU5d1j1jK4FdVAL7yWII9JLLuC4iIFaIuuBrgWfP08PR7X8Fbs+9hiqg75OclBjxEHrhtcJ6oish+aQ1gh18NpHHNrf9+4ra49JdW71q2qIOqJB9lW2Rrz39hbnwL0OpP+iZ5QW59pov9I8kTNWj/U4Mkc6kDN+xPCsji3LQMdPwuF9/lhIRq1PZv6IYybL3u8ZZvJ4BuRzbdYifVfyW/Sa4OchxIA4qCVzHyM9ahVe39LRw5LdT3sdUQv/f9H3jJaOlnWCfhYY4cj0r2dxZNaxh2M2C+o42uJ5so5ZPBHHzJaow7P0Mn0IyToinlZeyUEtGUcrU8ZR91grR9Y/s4Pec2/c96SOOv8VsNRxszpoP7EsdOzRde45qGUhYxZh7OwOyeOdm2ZwIPNEYxlG9atWFr5Goxze/mqZlwPL1yDHHa7hRCc=
+   eJzt2DtOA0EMBuCljUSVA0TiElw3LQfgLqSAmpYKpUOR1pJlje3f43kFiGQBYVj5W48nXo7bth07x/OA6G2IOg57jHAcwJCOCwv0GqirR/5aDhmHZ8kYLkBo67P3JOqwrnnL58EIxPHkBGoZ7fhk71Ou2kuz0L1AHfIM0Rx03Sv7vuTg4RksS8RROgstx+3nk/K+5qDXyx6WRduflkM7060+lw6rn9FacAe31DgiZ8kJXBcxcEvEgdZC5i+jh4Ms35vdHzUGcvC/Kzm4MeLgfSP7BHVE6qE5SjVCHbL3EYf2+9p9Ze2xUp9b5xUZoo5oIPsq2yPeZ3uLObDWgZy/6IzSYq6NnleaJzJj9XDMjJb7KhrIjB8x/FbHKAvl/b5//apweM8fjyxG1SeTP+JYyVL7f4ZWnujMXGNAnmszltJ84/W2XI8YEAe3ZO8h4uA1RA1RR8TiOT4MR7QWNY7auvTsDdQx8zzu6Rhp+XdgjtUsqGO2xfNkHat4Io6VLVGHZ+llOhci64h4WnlLDm7JOFqZMg7aY60cWf+9O8jytrBD7h9rnTdLznJQ7tSHloWvm93nVm7SUgr5nLKyo+Tx5qYVHEieaFiGUX3eyiJrdO+OFnPiX3W8DnL8AHvdPBE=
   </data>
  </layer>
  <objectgroup name="addSpot" width="50" height="50">