diff --git a/CREDITS b/CREDITS
index 5e1a1167ace61cb348ccb4af3d2f3f6127e3676b..bc043e992f9b5024b77fa3a0b8c75cdaba87ea91 100644
--- a/CREDITS
+++ b/CREDITS
@@ -16,15 +16,17 @@ General:
 - Benli for classes, zones, ...
 - Hetdegon for Arena and other such nice things
 - Tiger Eye for auto-explore and FOV code
-- PureQuestion for npcs and artifact work
+- PureQuestion for npcs and artifacts
 - Hachem Muche for many patches and scaling issues
 - Dekar for artifacts, debug help (slave? ;> ), icons, ...
 - Shibari for artifacts and talents balancing
+- Sage Acrin
 
 Lore:
 - Darren Grey
 - Burb Lulls
 - Gwai
+- Ron Billingsley
 
 Graphics:
 - Shockbolt (Raymond Gaustadnes) http://shockbolt.deviantart.com
diff --git a/bootstrap/boot.lua b/bootstrap/boot.lua
index 0f9981021d48318be0842fe40bff7a8938f3577a..df040fb7882159fe3e8d7d1883df0560c519b790 100644
--- a/bootstrap/boot.lua
+++ b/bootstrap/boot.lua
@@ -22,6 +22,7 @@ if __SELFEXE then
 	fs.mount(dir..fs.getPathSeparator().."game"..fs.getPathSeparator().."thirdparty", "/", true)
 	fs.mount(dir..fs.getPathSeparator().."game", "/", true)
 else
+	print("No SelfExe, using basic path")
 	fs.mount("game"..fs.getPathSeparator().."thirdparty", "/", true)
 	fs.mount("game", "/", true)
 end
diff --git a/build/options.lua b/build/options.lua
index d8f399a8241005be78ef839958cc36debd3fb683..781be94701fd43a798fbb07927f1619f08cc0dcc 100644
--- a/build/options.lua
+++ b/build/options.lua
@@ -36,6 +36,10 @@ newoption {
 newoption {
 	trigger     = "relpath",
 	description = "Links libraries relative to the application path for redistribution",
+	allowed = {
+		{ "32",	"32 bits location" },
+		{ "64",	"64 bits location" },
+	}
 }
 newoption {
 	trigger     = "luaassert",
@@ -61,4 +65,19 @@ newoption {
 	description = "Steam integration"
 }
 
+newoption {
+	trigger	    = "web-awesomium",
+	description = "Use awesomium embedded browser as the webcore"
+}
+
+newoption {
+	trigger	    = "web-cef3",
+	description = "Use CEF3 embedded browser as the webcore"
+}
+
+newoption {
+	trigger	    = "wincross",
+	description = "Enables cross-compilation for windows (from linux)"
+}
+
 _OPTIONS.lua = _OPTIONS.lua or "jit2"
diff --git a/build/te4core.lua b/build/te4core.lua
index d3e529c67b6e98cea7307124b5d4cd50b4ba81f4..c3554d3aa495326333f8cc6ee720fae3096f6dd6 100644
--- a/build/te4core.lua
+++ b/build/te4core.lua
@@ -42,6 +42,12 @@ project "TEngine"
 	defines { [[TENGINE_HOME_PATH='".t-engine"']], "TE4CORE_VERSION="..TE4CORE_VERSION }
 	buildoptions { "-O3" }
 
+	if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib "} end
+	if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib64 "} end
+
+	if _OPTIONS.relpath == "32" then defines{"TE4_RELPATH32"} end
+	if _OPTIONS.relpath == "64" then defines{"TE4_RELPATH64"} end
+
 	links { "m" }
 
 	if _OPTIONS.no_rwops_size then defines{"NO_RWOPS_SIZE"} end
@@ -50,6 +56,10 @@ project "TEngine"
 		dofile("../steamworks/build/steam-build.lua")
 	end
 
+	if _OPTIONS.wincross then
+		prelinkcommands { "i686-pc-mingw32-ranlib ../bin/Debug/*.a" }
+	end
+
 	configuration "macosx"
 		files { "../src/mac/SDL*" }
 		includedirs {
@@ -83,6 +93,7 @@ project "TEngine"
 			"-framework libpng",
 			"-framework ogg",
 			"-framework vorbis",
+			"-Wl,-rpath,'@loader_path/../Frameworks'",
 		}
 		if _OPTIONS.lua == "jit2" then
 			linkoptions {
@@ -95,9 +106,13 @@ project "TEngine"
 		links { "IOKit" }
 
 	configuration "windows"
-		links { "mingw32", "SDL2main", "SDL2", "SDL2_ttf", "SDL2_image", "openal32", "vorbisfile", "OPENGL32", "GLU32", "wsock32", "png" }
+		links { "mingw32", "SDL2main", "SDL2", "SDL2_ttf", "SDL2_image", "OpenAL32", "vorbisfile", "opengl32", "glu32", "wsock32", "png" }
 		defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS'  }
-		prebuildcommands { "windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" }
+		if _OPTIONS.wincross then
+			prebuildcommands { "/usr/bin/i686-pc-mingw32-windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" }
+		else
+			prebuildcommands { "windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" }
+		end
 		linkoptions { "../src/windows/icon.res" }
 		linkoptions { "-mwindows" }
 		defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' }
@@ -114,7 +129,11 @@ project "TEngine"
 		defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' }
 
 	configuration {"Debug"}
-		postbuildcommands { "cp ../bin/Debug/t-engine ../", }
+		if _OPTIONS.wincross then
+			postbuildcommands { "cp ../bin/Debug/t-engine.exe ../", }
+		else
+			postbuildcommands { "cp ../bin/Debug/t-engine ../", }
+		end
 	configuration {"Release"}
 		postbuildcommands { "cp ../bin/Release/t-engine ../", }
 
@@ -157,10 +176,18 @@ elseif _OPTIONS.lua == "jit2" then
 		language "C"
 		targetname "minilua"
 		links { "m" }
+		if _OPTIONS.wincross then
+			links {"mingw32"}
+		end
 
 		files { "../src/luajit2/src/host/minilua.c" }
 
-		local arch_test = os.capture("gcc -E ../src/luajit2/src/lj_arch.h -dM", true)
+		local arch_test
+		if _OPTIONS.wincross then
+			arch_test = os.capture("i686-pc-mingw32-gcc -E ../src/luajit2/src/lj_arch.h -dM", true)
+		else
+			arch_test = os.capture("gcc -E ../src/luajit2/src/lj_arch.h -dM", true)
+		end
 
 		if string.find(arch_test, "LJ_TARGET_X64") then
 			target_arch = "x64"
@@ -191,8 +218,20 @@ elseif _OPTIONS.lua == "jit2" then
 		end
 
 		configuration {"Debug"}
+			if _OPTIONS.wincross then
+				postbuildcommands {
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/minilua/minilua.cross.o" -c "../src/luajit2/src/host/minilua.c"',
+					'gcc -o ../bin/Debug/minilua ../obj/Debug/minilua/minilua.cross.o  -m32 -L/usr/lib32 -L/Test/xcompile/local/lib   -lm',
+				}
+			end
 			postbuildcommands { "cp ../bin/Debug/minilua ../src/luajit2/src/host/", }
 		configuration {"Release"}
+			if _OPTIONS.wincross then
+				postbuildcommands {
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/minilua/minilua.cross.o" -c "../src/luajit2/src/host/minilua.c"',
+					'gcc -o ../bin/Release/minilua ../obj/Release/minilua/minilua.cross.o  -m32 -L/usr/lib32 -L/Test/xcompile/local/lib   -lm',
+				}
+			end
 			postbuildcommands { "cp ../bin/Release/minilua ../src/luajit2/src/host/", }
 
 	project "buildvm"
@@ -202,7 +241,12 @@ elseif _OPTIONS.lua == "jit2" then
 		links { "minilua" }
 
 		local dasm_flags = ""
-		local arch_test = os.capture("gcc -E ../src/luajit2/src/lj_arch.h -dM", true)
+		local arch_test
+		if _OPTIONS.wincross then
+			arch_test = os.capture("i686-pc-mingw32-gcc -E ../src/luajit2/src/lj_arch.h -dM", true)
+		else
+			arch_test = os.capture("gcc -E ../src/luajit2/src/lj_arch.h -dM", true)
+		end
 
 		if string.find(arch_test, "LJ_TARGET_X64") then
 			target_arch = "x64"
@@ -276,8 +320,28 @@ elseif _OPTIONS.lua == "jit2" then
 		files { "../src/luajit2/src/host/buildvm*.c" }
 
 		configuration {"Debug"}
+			if _OPTIONS.wincross then
+				postbuildcommands {
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm_lib.cross.o" -c "../src/luajit2/src/host/buildvm_lib.c"',
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm_asm.cross.o" -c "../src/luajit2/src/host/buildvm_asm.c"',
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm_peobj.cross.o" -c "../src/luajit2/src/host/buildvm_peobj.c"',
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm_fold.cross.o" -c "../src/luajit2/src/host/buildvm_fold.c"',
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm.cross.o" -c "../src/luajit2/src/host/buildvm.c"',
+					'gcc -o ../bin/Debug/buildvm ../obj/Debug/buildvm/buildvm_lib.cross.o ../obj/Debug/buildvm/buildvm_asm.cross.o ../obj/Debug/buildvm/buildvm_peobj.cross.o ../obj/Debug/buildvm/buildvm_fold.cross.o ../obj/Debug/buildvm/buildvm.cross.o  -m32 -L/usr/lib32 -L/Test/xcompile/local/lib',
+				}
+			end
 			postbuildcommands { "cp ../bin/Debug/buildvm ../src/luajit2/src/", }
 		configuration {"Release"}
+			if _OPTIONS.wincross then
+				postbuildcommands {
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm_lib.cross.o" -c "../src/luajit2/src/host/buildvm_lib.c"',
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm_asm.cross.o" -c "../src/luajit2/src/host/buildvm_asm.c"',
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm_peobj.cross.o" -c "../src/luajit2/src/host/buildvm_peobj.c"',
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm_fold.cross.o" -c "../src/luajit2/src/host/buildvm_fold.c"',
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm.cross.o" -c "../src/luajit2/src/host/buildvm.c"',
+					'gcc -o ../bin/Release/buildvm ../obj/Release/buildvm/buildvm_lib.cross.o ../obj/Release/buildvm/buildvm_asm.cross.o ../obj/Release/buildvm/buildvm_peobj.cross.o ../obj/Release/buildvm/buildvm_fold.cross.o ../obj/Release/buildvm/buildvm.cross.o  -m32 -L/usr/lib32 -L/Test/xcompile/local/lib',
+				}
+			end
 			postbuildcommands { "cp ../bin/Release/buildvm ../src/luajit2/src/", }
 
 	project "luajit2"
@@ -454,6 +518,43 @@ project "te4-bzip"
 
 	files { "../src/bzip2/*.c", }
 
+if _OPTIONS['web-awesomium'] and not _OPTIONS.wincross then
+project "te4-web"
+	kind "SharedLib"
+	language "C++"
+	targetname "te4-web"
+
+	libdirs {"/opt/awesomium/bin/"}
+	includedirs {"/opt/awesomium/include/"}
+	links { "awesomium-1-7" }
+	
+	files { "../src/web-awesomium/*.cpp", }
+end
+
+if _OPTIONS['web-cef3'] and not _OPTIONS.wincross then
+project "te4-web"
+	kind "SharedLib"
+	language "C++"
+	targetname "te4-web"
+
+	if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN "} end
+	if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN "} end
+
+	buildoptions{"-Wall -pthread -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm"}
+	libdirs {"/opt/cef3/1547/out/Release/obj.target/", "/opt/cef3/1547/Release/"}
+	includedirs {"/opt/cef3/1547/include/", "/opt/cef3/1547/"}
+	links { "cef", "cef_dll_wrapper" }
+	
+	files { "../src/web-cef3/*.cpp", }
+
+	configuration "macosx"
+		defines { 'SELFEXE_MACOSX' }
+	configuration "windows"
+		defines { 'SELFEXE_WINDOWS' }
+	configuration "linux"
+		defines { 'SELFEXE_LINUX' }
+end
+
 if _OPTIONS.steam then
 	dofile("../steamworks/build/steam-code.lua")
 end
diff --git a/game/engines/default/data/gfx/flame_credits.png b/game/engines/default/data/gfx/flame_credits.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c5d617a3baa1c1a2a66fb8c91af5a4ee79247c6
Binary files /dev/null and b/game/engines/default/data/gfx/flame_credits.png differ
diff --git a/game/engines/default/data/gfx/invisible-ui/dialogframe_1.png b/game/engines/default/data/gfx/invisible-ui/dialogframe_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..355732be15657ca510ad3c0fdd59fc0322bfd253
Binary files /dev/null and b/game/engines/default/data/gfx/invisible-ui/dialogframe_1.png differ
diff --git a/game/engines/default/data/gfx/invisible-ui/dialogframe_2.png b/game/engines/default/data/gfx/invisible-ui/dialogframe_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..355732be15657ca510ad3c0fdd59fc0322bfd253
Binary files /dev/null and b/game/engines/default/data/gfx/invisible-ui/dialogframe_2.png differ
diff --git a/game/engines/default/data/gfx/invisible-ui/dialogframe_3.png b/game/engines/default/data/gfx/invisible-ui/dialogframe_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..355732be15657ca510ad3c0fdd59fc0322bfd253
Binary files /dev/null and b/game/engines/default/data/gfx/invisible-ui/dialogframe_3.png differ
diff --git a/game/engines/default/data/gfx/invisible-ui/dialogframe_4.png b/game/engines/default/data/gfx/invisible-ui/dialogframe_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..355732be15657ca510ad3c0fdd59fc0322bfd253
Binary files /dev/null and b/game/engines/default/data/gfx/invisible-ui/dialogframe_4.png differ
diff --git a/game/engines/default/data/gfx/invisible-ui/dialogframe_5.png b/game/engines/default/data/gfx/invisible-ui/dialogframe_5.png
new file mode 100644
index 0000000000000000000000000000000000000000..355732be15657ca510ad3c0fdd59fc0322bfd253
Binary files /dev/null and b/game/engines/default/data/gfx/invisible-ui/dialogframe_5.png differ
diff --git a/game/engines/default/data/gfx/invisible-ui/dialogframe_6.png b/game/engines/default/data/gfx/invisible-ui/dialogframe_6.png
new file mode 100644
index 0000000000000000000000000000000000000000..355732be15657ca510ad3c0fdd59fc0322bfd253
Binary files /dev/null and b/game/engines/default/data/gfx/invisible-ui/dialogframe_6.png differ
diff --git a/game/engines/default/data/gfx/invisible-ui/dialogframe_7.png b/game/engines/default/data/gfx/invisible-ui/dialogframe_7.png
new file mode 100644
index 0000000000000000000000000000000000000000..355732be15657ca510ad3c0fdd59fc0322bfd253
Binary files /dev/null and b/game/engines/default/data/gfx/invisible-ui/dialogframe_7.png differ
diff --git a/game/engines/default/data/gfx/invisible-ui/dialogframe_8.png b/game/engines/default/data/gfx/invisible-ui/dialogframe_8.png
new file mode 100644
index 0000000000000000000000000000000000000000..355732be15657ca510ad3c0fdd59fc0322bfd253
Binary files /dev/null and b/game/engines/default/data/gfx/invisible-ui/dialogframe_8.png differ
diff --git a/game/engines/default/data/gfx/invisible-ui/dialogframe_9.png b/game/engines/default/data/gfx/invisible-ui/dialogframe_9.png
new file mode 100644
index 0000000000000000000000000000000000000000..355732be15657ca510ad3c0fdd59fc0322bfd253
Binary files /dev/null and b/game/engines/default/data/gfx/invisible-ui/dialogframe_9.png differ
diff --git a/game/engines/default/data/gfx/waiter/bar.png b/game/engines/default/data/gfx/metal-ui/waiter/bar.png
similarity index 100%
rename from game/engines/default/data/gfx/waiter/bar.png
rename to game/engines/default/data/gfx/metal-ui/waiter/bar.png
diff --git a/game/engines/default/data/gfx/waiter/left.png b/game/engines/default/data/gfx/metal-ui/waiter/left.png
similarity index 100%
rename from game/engines/default/data/gfx/waiter/left.png
rename to game/engines/default/data/gfx/metal-ui/waiter/left.png
diff --git a/game/engines/default/data/gfx/waiter/left_basic.png b/game/engines/default/data/gfx/metal-ui/waiter/left_basic.png
similarity index 100%
rename from game/engines/default/data/gfx/waiter/left_basic.png
rename to game/engines/default/data/gfx/metal-ui/waiter/left_basic.png
diff --git a/game/engines/default/data/gfx/metal-ui/waiter/loading.png b/game/engines/default/data/gfx/metal-ui/waiter/loading.png
new file mode 100644
index 0000000000000000000000000000000000000000..f80cd60265968c84517e3fcacee952a688d877c5
Binary files /dev/null and b/game/engines/default/data/gfx/metal-ui/waiter/loading.png differ
diff --git a/game/engines/default/data/gfx/waiter/middle.png b/game/engines/default/data/gfx/metal-ui/waiter/middle.png
similarity index 100%
rename from game/engines/default/data/gfx/waiter/middle.png
rename to game/engines/default/data/gfx/metal-ui/waiter/middle.png
diff --git a/game/engines/default/data/gfx/waiter/right.png b/game/engines/default/data/gfx/metal-ui/waiter/right.png
similarity index 100%
rename from game/engines/default/data/gfx/waiter/right.png
rename to game/engines/default/data/gfx/metal-ui/waiter/right.png
diff --git a/game/engines/default/data/gfx/waiter/right_basic.png b/game/engines/default/data/gfx/metal-ui/waiter/right_basic.png
similarity index 100%
rename from game/engines/default/data/gfx/waiter/right_basic.png
rename to game/engines/default/data/gfx/metal-ui/waiter/right_basic.png
diff --git a/game/engines/default/data/gfx/spikes_credits.png b/game/engines/default/data/gfx/spikes_credits.png
new file mode 100644
index 0000000000000000000000000000000000000000..048e6c2574dc8df6b0699feebc6ebcdc165a65c8
Binary files /dev/null and b/game/engines/default/data/gfx/spikes_credits.png differ
diff --git a/game/engines/default/data/gfx/ui/definitions/default.lua b/game/engines/default/data/gfx/ui/definitions/default.lua
index 48da28c5f40b7273ed87952c11350abe08c7d48d..b66584bc1d11b343453347664e5f257f99e10394 100644
--- a/game/engines/default/data/gfx/ui/definitions/default.lua
+++ b/game/engines/default/data/gfx/ui/definitions/default.lua
@@ -68,3 +68,10 @@ tombstone = {
 	frame_oy1 = -16,
 	frame_oy2 = 16,
 }
+
+invisible = {
+	frame_ox1 = 0,
+	frame_ox2 = 0,
+	frame_oy1 = 0,
+	frame_oy2 = 0,
+}
diff --git a/game/engines/default/data/html/jquery-1.10.2.min.js b/game/engines/default/data/html/jquery-1.10.2.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..da4170647dd102aa92a57cb4936ff6dfa58d78c2
--- /dev/null
+++ b/game/engines/default/data/html/jquery-1.10.2.min.js
@@ -0,0 +1,6 @@
+/*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
+//@ sourceMappingURL=jquery-1.10.2.min.map
+*/
+(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.2",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=st(),k=st(),E=st(),S=!1,A=function(e,t){return e===t?(S=!0,0):0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=mt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+yt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,n,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function lt(e){return e[b]=!0,e}function ut(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function ct(e,t){var n=e.split("|"),r=e.length;while(r--)o.attrHandle[n[r]]=t}function pt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function dt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return lt(function(t){return t=+t,lt(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w,i=n.defaultView;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),i&&i.attachEvent&&i!==i.top&&i.attachEvent("onbeforeunload",function(){p()}),r.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),r.getElementsByTagName=ut(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ut(function(e){return e.innerHTML="<div class='a'></div><div class='a i'></div>",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ut(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=K.test(n.querySelectorAll))&&(ut(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ut(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=K.test(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ut(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=K.test(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return pt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?pt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:lt,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=mt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?lt(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:lt(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?lt(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:lt(function(e){return function(t){return at(e,t).length>0}}),contains:lt(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:lt(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},o.pseudos.nth=o.pseudos.eq;for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=ft(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=dt(n);function gt(){}gt.prototype=o.filters=o.pseudos,o.setFilters=new gt;function mt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function yt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function vt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function bt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xt(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function wt(e,t,n,r,i,o){return r&&!r[b]&&(r=wt(r)),i&&!i[b]&&(i=wt(i,o)),lt(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||Nt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:xt(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=xt(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=xt(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function Tt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=vt(function(e){return e===t},s,!0),p=vt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[vt(bt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return wt(l>1&&bt(f),l>1&&yt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&Tt(e.slice(l,r)),i>r&&Tt(e=e.slice(r)),i>r&&yt(e))}f.push(n)}return bt(f)}function Ct(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=xt(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?lt(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=mt(e)),n=t.length;while(n--)o=Tt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Ct(i,r))}return o};function Nt(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function kt(e,t,n,i){var a,s,u,c,p,f=mt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&yt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}r.sortStable=b.split("").sort(A).join("")===b,r.detectDuplicates=S,p(),r.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(f.createElement("div"))}),ut(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||ct("type|href|height|width",function(e,n,r){return r?t:e.getAttribute(n,"type"===n.toLowerCase()?1:2)}),r.attributes&&ut(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||ct("value",function(e,n,r){return r||"input"!==e.nodeName.toLowerCase()?t:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||ct(B,function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&i.specified?i.value:e[n]===!0?n.toLowerCase():null}),x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!l||i&&!u||(t=t||[],t=[e,t.slice?t.slice():t],n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav></:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null)}),n=s=l=u=r=o=null,t
+}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,r=0,o=x(this),a=e.match(T)||[];while(t=a[r++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Ct=/^(?:checkbox|radio)$/i,Nt=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle);
+u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){nn(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=un(e,t),Pt.detach()),Gt[e]=n),n}function un(e,t){var n=x(t.createElement(e)).appendTo(t.body),r=x.css(n[0],"display");return n.remove(),r}x.each(["height","width"],function(e,n){x.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(x.css(e,"display"))?x.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,i),i):0)}}}),x.support.opacity||(x.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=x.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===x.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),x(function(){x.support.reliableMarginRight||(x.cssHooks.marginRight={get:function(e,n){return n?x.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!x.support.pixelPosition&&x.fn.position&&x.each(["top","left"],function(e,n){x.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?x(e).position()[n]+"px":r):t}}})}),x.expr&&x.expr.filters&&(x.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!x.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||x.css(e,"display"))},x.expr.filters.visible=function(e){return!x.expr.filters.hidden(e)}),x.each({margin:"",padding:"",border:"Width"},function(e,t){x.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(x.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;x.fn.extend({serialize:function(){return x.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=x.prop(this,"elements");return e?x.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!x(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Ct.test(e))}).map(function(e,t){var n=x(this).val();return null==n?null:x.isArray(n)?x.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),x.param=function(e,n){var r,i=[],o=function(e,t){t=x.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=x.ajaxSettings&&x.ajaxSettings.traditional),x.isArray(e)||e.jquery&&!x.isPlainObject(e))x.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(x.isArray(t))x.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==x.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}x.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){x.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),x.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}});var mn,yn,vn=x.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Cn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Nn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=x.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=o.href}catch(Ln){yn=a.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(T)||[];if(x.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(l){var u;return o[l]=!0,x.each(e[l]||[],function(e,l){var c=l(n,r,i);return"string"!=typeof c||a||o[c]?a?!(u=c):t:(n.dataTypes.unshift(c),s(c),!1)}),u}return s(n.dataTypes[0])||!o["*"]&&s("*")}function _n(e,n){var r,i,o=x.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&x.extend(!0,e,r),e}x.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,l=e.indexOf(" ");return l>=0&&(i=e.slice(l,e.length),e=e.slice(0,l)),x.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&x.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?x("<div>").append(x.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},x.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){x.fn[t]=function(e){return this.on(t,e)}}),x.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Cn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":x.parseJSON,"text xml":x.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?_n(_n(e,x.ajaxSettings),t):_n(x.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,l,u,c,p=x.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?x(f):x.event,h=x.Deferred(),g=x.Callbacks("once memory"),m=p.statusCode||{},y={},v={},b=0,w="canceled",C={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return b||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>b)for(t in e)m[t]=[m[t],e[t]];else C.always(e[C.status]);return this},abort:function(e){var t=e||w;return u&&u.abort(t),k(0,t),this}};if(h.promise(C).complete=g.add,C.success=C.done,C.error=C.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=x.trim(p.dataType||"*").toLowerCase().match(T)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?"80":"443"))===(mn[3]||("http:"===mn[1]?"80":"443")))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=x.param(p.data,p.traditional)),qn(An,p,n,C),2===b)return C;l=p.global,l&&0===x.active++&&x.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Nn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(x.lastModified[o]&&C.setRequestHeader("If-Modified-Since",x.lastModified[o]),x.etag[o]&&C.setRequestHeader("If-None-Match",x.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&C.setRequestHeader("Content-Type",p.contentType),C.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)C.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,C,p)===!1||2===b))return C.abort();w="abort";for(i in{success:1,error:1,complete:1})C[i](p[i]);if(u=qn(jn,p,n,C)){C.readyState=1,l&&d.trigger("ajaxSend",[C,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){C.abort("timeout")},p.timeout));try{b=1,u.send(y,k)}catch(N){if(!(2>b))throw N;k(-1,N)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,N=n;2!==b&&(b=2,s&&clearTimeout(s),u=t,a=i||"",C.readyState=e>0?4:0,c=e>=200&&300>e||304===e,r&&(w=Mn(p,C,r)),w=On(p,w,C,c),c?(p.ifModified&&(T=C.getResponseHeader("Last-Modified"),T&&(x.lastModified[o]=T),T=C.getResponseHeader("etag"),T&&(x.etag[o]=T)),204===e||"HEAD"===p.type?N="nocontent":304===e?N="notmodified":(N=w.state,y=w.data,v=w.error,c=!v)):(v=N,(e||!N)&&(N="error",0>e&&(e=0))),C.status=e,C.statusText=(n||N)+"",c?h.resolveWith(f,[y,N,C]):h.rejectWith(f,[C,N,v]),C.statusCode(m),m=t,l&&d.trigger(c?"ajaxSuccess":"ajaxError",[C,p,c?y:v]),g.fireWith(f,[C,N]),l&&(d.trigger("ajaxComplete",[C,p]),--x.active||x.event.trigger("ajaxStop")))}return C},getJSON:function(e,t,n){return x.get(e,t,n,"json")},getScript:function(e,n){return x.get(e,t,n,"script")}}),x.each(["get","post"],function(e,n){x[n]=function(e,r,i,o){return x.isFunction(r)&&(o=o||i,i=r,r=t),x.ajax({url:e,type:n,dataType:o,data:r,success:i})}});function Mn(e,n,r){var i,o,a,s,l=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in l)if(l[s]&&l[s].test(o)){u.unshift(s);break}if(u[0]in r)a=u[0];else{for(s in r){if(!u[0]||e.converters[s+" "+u[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==u[0]&&u.unshift(a),r[a]):t}function On(e,t,n,r){var i,o,a,s,l,u={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)u[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!l&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),l=o,o=c.shift())if("*"===o)o=l;else if("*"!==l&&l!==o){if(a=u[l+" "+o]||u["* "+o],!a)for(i in u)if(s=i.split(" "),s[1]===o&&(a=u[l+" "+s[0]]||u["* "+s[0]])){a===!0?a=u[i]:u[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(p){return{state:"parsererror",error:a?p:"No conversion from "+l+" to "+o}}}return{state:"success",data:t}}x.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return x.globalEval(e),e}}}),x.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),x.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=a.head||x("head")[0]||a.documentElement;return{send:function(t,i){n=a.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var Fn=[],Bn=/(=)\?(?=&|$)|\?\?/;x.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Fn.pop()||x.expando+"_"+vn++;return this[e]=!0,e}}),x.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,l=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return l||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=x.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,l?n[l]=n[l].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||x.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,Fn.push(o)),s&&x.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}x.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=x.ajaxSettings.xhr(),x.support.cors=!!Rn&&"withCredentials"in Rn,Rn=x.support.ajax=!!Rn,Rn&&x.ajaxTransport(function(n){if(!n.crossDomain||x.support.cors){var r;return{send:function(i,o){var a,s,l=n.xhr();if(n.username?l.open(n.type,n.url,n.async,n.username,n.password):l.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)l[s]=n.xhrFields[s];n.mimeType&&l.overrideMimeType&&l.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)l.setRequestHeader(s,i[s])}catch(u){}l.send(n.hasContent&&n.data||null),r=function(e,i){var s,u,c,p;try{if(r&&(i||4===l.readyState))if(r=t,a&&(l.onreadystatechange=x.noop,$n&&delete Pn[a]),i)4!==l.readyState&&l.abort();else{p={},s=l.status,u=l.getAllResponseHeaders(),"string"==typeof l.responseText&&(p.text=l.responseText);try{c=l.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,u)},n.async?4===l.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},x(e).unload($n)),Pn[a]=r),l.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+w+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Yn.exec(t),o=i&&i[3]||(x.cssNumber[e]?"":"px"),a=(x.cssNumber[e]||"px"!==o&&+r)&&Yn.exec(x.css(n.elem,e)),s=1,l=20;if(a&&a[3]!==o){o=o||a[3],i=i||[],a=+r||1;do s=s||".5",a/=s,x.style(n.elem,e,a+o);while(s!==(s=n.cur()/r)&&1!==s&&--l)}return i&&(a=n.start=+a||+r||0,n.unit=o,n.end=i[1]?a+(i[1]+1)*i[2]:+i[2]),n}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=x.now()}function Zn(e,t,n){var r,i=(Qn[t]||[]).concat(Qn["*"]),o=0,a=i.length;for(;a>o;o++)if(r=i[o].call(n,t,e))return r}function er(e,t,n){var r,i,o=0,a=Gn.length,s=x.Deferred().always(function(){delete l.elem}),l=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,u.startTime+u.duration-t),r=n/u.duration||0,o=1-r,a=0,l=u.tweens.length;for(;l>a;a++)u.tweens[a].run(o);return s.notifyWith(e,[u,o,n]),1>o&&l?n:(s.resolveWith(e,[u]),!1)},u=s.promise({elem:e,props:x.extend({},t),opts:x.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=x.Tween(e,u.opts,t,n,u.opts.specialEasing[t]||u.opts.easing);return u.tweens.push(r),r},stop:function(t){var n=0,r=t?u.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)u.tweens[n].run(1);return t?s.resolveWith(e,[u,t]):s.rejectWith(e,[u,t]),this}}),c=u.props;for(tr(c,u.opts.specialEasing);a>o;o++)if(r=Gn[o].call(u,e,c,u.opts))return r;return x.map(c,Zn,u),x.isFunction(u.opts.start)&&u.opts.start.call(e,u),x.fx.timer(x.extend(l,{elem:e,anim:u,queue:u.opts.queue})),u.progress(u.opts.progress).done(u.opts.done,u.opts.complete).fail(u.opts.fail).always(u.opts.always)}function tr(e,t){var n,r,i,o,a;for(n in e)if(r=x.camelCase(n),i=t[r],o=e[n],x.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=x.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}x.Animation=x.extend(er,{tweener:function(e,t){x.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,l,u=this,c={},p=e.style,f=e.nodeType&&nn(e),d=x._data(e,"fxshow");n.queue||(s=x._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,l=s.empty.fire,s.empty.fire=function(){s.unqueued||l()}),s.unqueued++,u.always(function(){u.always(function(){s.unqueued--,x.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],"inline"===x.css(e,"display")&&"none"===x.css(e,"float")&&(x.support.inlineBlockNeedsLayout&&"inline"!==ln(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",x.support.shrinkWrapBlocks||u.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],Vn.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(f?"hide":"show"))continue;c[r]=d&&d[r]||x.style(e,r)}if(!x.isEmptyObject(c)){d?"hidden"in d&&(f=d.hidden):d=x._data(e,"fxshow",{}),o&&(d.hidden=!f),f?x(e).show():u.done(function(){x(e).hide()}),u.done(function(){var t;x._removeData(e,"fxshow");for(t in c)x.style(e,t,c[t])});for(r in c)a=Zn(f?d[r]:0,r,u),r in d||(d[r]=a.start,f&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}x.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(x.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?x.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=x.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){x.fx.step[e.prop]?x.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[x.cssProps[e.prop]]||x.cssHooks[e.prop])?x.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},x.each(["toggle","show","hide"],function(e,t){var n=x.fn[t];x.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),x.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=x.isEmptyObject(e),o=x.speed(t,n,r),a=function(){var t=er(this,x.extend({},e),o);(i||x._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=x.timers,a=x._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&x.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=x._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=x.timers,a=r?r.length:0;for(n.finish=!0,x.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}x.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){x.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),x.speed=function(e,t,n){var r=e&&"object"==typeof e?x.extend({},e):{complete:n||!n&&t||x.isFunction(e)&&e,duration:e,easing:n&&t||t&&!x.isFunction(t)&&t};return r.duration=x.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in x.fx.speeds?x.fx.speeds[r.duration]:x.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){x.isFunction(r.old)&&r.old.call(this),r.queue&&x.dequeue(this,r.queue)},r},x.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},x.timers=[],x.fx=rr.prototype.init,x.fx.tick=function(){var e,n=x.timers,r=0;for(Xn=x.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||x.fx.stop(),Xn=t},x.fx.timer=function(e){e()&&x.timers.push(e)&&x.fx.start()},x.fx.interval=13,x.fx.start=function(){Un||(Un=setInterval(x.fx.tick,x.fx.interval))},x.fx.stop=function(){clearInterval(Un),Un=null},x.fx.speeds={slow:600,fast:200,_default:400},x.fx.step={},x.expr&&x.expr.filters&&(x.expr.filters.animated=function(e){return x.grep(x.timers,function(t){return e===t.elem}).length}),x.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){x.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,x.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},x.offset={setOffset:function(e,t,n){var r=x.css(e,"position");"static"===r&&(e.style.position="relative");var i=x(e),o=i.offset(),a=x.css(e,"top"),s=x.css(e,"left"),l=("absolute"===r||"fixed"===r)&&x.inArray("auto",[a,s])>-1,u={},c={},p,f;l?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),x.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(u.top=t.top-o.top+p),null!=t.left&&(u.left=t.left-o.left+f),"using"in t?t.using.call(e,u):i.css(u)}},x.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===x.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),x.nodeName(e[0],"html")||(n=e.offset()),n.top+=x.css(e[0],"borderTopWidth",!0),n.left+=x.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-x.css(r,"marginTop",!0),left:t.left-n.left-x.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||s;while(e&&!x.nodeName(e,"html")&&"static"===x.css(e,"position"))e=e.offsetParent;return e||s})}}),x.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);x.fn[e]=function(i){return x.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?x(a).scrollLeft():o,r?o:x(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return x.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}x.each({Height:"height",Width:"width"},function(e,n){x.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){x.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return x.access(this,function(n,r,i){var o;return x.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?x.css(n,r,s):x.style(n,r,i,s)},n,a?i:t,a,null)}})}),x.fn.size=function(){return this.length},x.fn.andSelf=x.fn.addBack,"object"==typeof module&&module&&"object"==typeof module.exports?module.exports=x:(e.jQuery=e.$=x,"function"==typeof define&&define.amd&&define("jquery",[],function(){return x}))})(window);
diff --git a/game/engines/default/data/html/test.html b/game/engines/default/data/html/test.html
new file mode 100644
index 0000000000000000000000000000000000000000..590e11bb1fea274f814be161f70fc6efb4f69401
--- /dev/null
+++ b/game/engines/default/data/html/test.html
@@ -0,0 +1,15 @@
+<script type="text/javascript" src='asset://te4/html/jquery-1.10.2.min.js'></script>
+
+<p><strong>lol</strong> lolll</p>
+
+<script type="text/javascript" src='asset://te4/html/test.js'></script>
+
+<script type="text/javascript">
+
+te4.lua("print('plop')");
+console.log("=====ret: " + te4.lolzor(1, "plop"));
+
+$('strong').css("color", "red");
+
+</script>
+
diff --git a/game/engines/default/data/html/test.js b/game/engines/default/data/html/test.js
new file mode 100644
index 0000000000000000000000000000000000000000..2fd232a70325fee2aab578ef3e58ae553edb73cb
--- /dev/null
+++ b/game/engines/default/data/html/test.js
@@ -0,0 +1,3 @@
+$('strong').click(function() {
+	$(this).html("CLICKED");
+});
\ No newline at end of file
diff --git a/game/engines/default/engine/DamageType.lua b/game/engines/default/engine/DamageType.lua
index a458e72576c83ac35fc0f34c4cf557e36fd68ba3..e5c5a6e7b1bf1e1bb5a203823c770281506d868a 100644
--- a/game/engines/default/engine/DamageType.lua
+++ b/game/engines/default/engine/DamageType.lua
@@ -62,8 +62,8 @@ function _M:newDamageType(t)
 		end
 	end
 
-	table.insert(self.dam_def, t)
-	self[t.type] = #self.dam_def
+	self.dam_def[t.type] = t
+	self[t.type] = t.type
 end
 
 function _M:get(id)
diff --git a/game/engines/default/engine/Entity.lua b/game/engines/default/engine/Entity.lua
index e257eb7f257626130a1a60dd2d0c731dd5b48a34..24f3a1521bddff30e017250fbef60a95f9533fc6 100644
--- a/game/engines/default/engine/Entity.lua
+++ b/game/engines/default/engine/Entity.lua
@@ -258,6 +258,12 @@ function _M:makeMapObject(tiles, idx)
 		if self._mo and self._mo:isValid() then return self._mo, self.z, self._last_mo end
 	end
 
+	-- Texture
+	local ok, btex, btexx, btexy, w, h = pcall(tiles.get, tiles, self.display, self.color_r, self.color_g, self.color_b, self.color_br, self.color_bg, self.color_bb, self.image, self._noalpha and 255, self.ascii_outline, true)
+
+	local dy, dh = 0, 0
+	if ok and self.auto_tall and h > w then dy = -1 dh = 1 end
+
 	-- Create the map object with 1 + additional textures
 	self._mo = core.map.newObject(self.uid,
 		1 + (tiles.use_images and self.textures and #self.textures or 0),
@@ -265,9 +271,9 @@ function _M:makeMapObject(tiles, idx)
 		self:check("display_on_remember"),
 		self:check("display_on_unknown"),
 		self:check("display_x") or 0,
-		self:check("display_y") or 0,
+		(self:check("display_y") or 0) + dy,
 		self:check("display_w") or 1,
-		self:check("display_h") or 1,
+		(self:check("display_h") or 1) + dh,
 		self:check("display_scale") or 1
 	)
 
@@ -278,7 +284,6 @@ function _M:makeMapObject(tiles, idx)
 
 	-- Texture 0 is always the normal image/ascii tile
 	-- we pcall it because some weird cases can not find a tile
-	local ok, btex, btexx, btexy = pcall(tiles.get, tiles, self.display, self.color_r, self.color_g, self.color_b, self.color_br, self.color_bg, self.color_bb, self.image, self._noalpha and 255, self.ascii_outline, true)
 	if ok then
 		if self.anim then
 			self._mo:texture(0, btex, false, btexx / self.anim.max, btexy, nil, nil)
diff --git a/game/engines/default/engine/Game.lua b/game/engines/default/engine/Game.lua
index 434d5b233a51dccd38efed39c7d09825bc0830cf..82f207eb1eb4132fbf8407e407d5c0537d76e2b0 100644
--- a/game/engines/default/engine/Game.lua
+++ b/game/engines/default/engine/Game.lua
@@ -155,8 +155,10 @@ function _M:display(nb_keyframes)
 		self.flyers:display(nb_keyframes)
 	end
 
-	if not self.suppressDialogs then
-		for i, d in ipairs(self.dialogs) do
+	if not self.suppressDialogs and #self.dialogs then
+		local last = self.dialogs[#self.dialogs]
+		for i = last and last.__show_only and #self.dialogs or 1, #self.dialogs do
+			local d = self.dialogs[i]
 			d:display()
 			d:toScreen(d.display_x, d.display_y, nb_keyframes)
 		end
diff --git a/game/engines/default/engine/Key.lua b/game/engines/default/engine/Key.lua
index 6688ff6ca3b9a220b9cd29f9f2c5a61d4245abaf..4d0231aed14c8b2d28668e6868f5ffa82cf0d7b9 100644
--- a/game/engines/default/engine/Key.lua
+++ b/game/engines/default/engine/Key.lua
@@ -37,10 +37,13 @@ end
 -- @param isup true if the key was released, false if pressed
 -- @param key the unicode representation of the key pressed (without accounting for modifiers)
 function _M:receiveKey(sym, ctrl, shift, alt, meta, unicode, isup, key)
-	print(sym, ctrl, shift, alt, meta, unicode, isup)
 	self:handleStatus(sym, ctrl, shift, alt, meta, unicode, isup)
 end
 
+--- Called when a key is pressed, gives raw codes
+function _M:receiveKeyRaw(isup, scancode, sym, unicode, ctrl, shift, alt, meta)
+end
+
 --- Maintain the self.status table, which can be used to know if a key is currently pressed
 function _M:handleStatus(sym, ctrl, shift, alt, meta, unicode, isup)
 	self.status[sym] = not isup
diff --git a/game/engines/default/engine/Module.lua b/game/engines/default/engine/Module.lua
index b7fdc969f65ce821b8d4395107618d392d2117bb..205370c33fb36bfea11751b3e2bc136ed83346cd 100644
--- a/game/engines/default/engine/Module.lua
+++ b/game/engines/default/engine/Module.lua
@@ -539,10 +539,10 @@ function _M:loadScreen(mod)
 
 		local logo = {(core.display.loadImage("/data/gfx/background/"..backname.."-logo.png") or core.display.loadImage("/data/gfx/background/tome-logo.png")):glTexture()}
 
-		local left = {core.display.loadImage("/data/gfx/waiter/left.png"):glTexture()}
-		local right = {core.display.loadImage("/data/gfx/waiter/right.png"):glTexture()}
-		local middle = {core.display.loadImage("/data/gfx/waiter/middle.png"):glTexture()}
-		local bar = {core.display.loadImage("/data/gfx/waiter/bar.png"):glTexture()}
+		local left = {core.display.loadImage("/data/gfx/metal-ui/waiter/left.png"):glTexture()}
+		local right = {core.display.loadImage("/data/gfx/metal-ui/waiter/right.png"):glTexture()}
+		local middle = {core.display.loadImage("/data/gfx/metal-ui/waiter/middle.png"):glTexture()}
+		local bar = {core.display.loadImage("/data/gfx/metal-ui/waiter/bar.png"):glTexture()}
 
 		local font = core.display.newFont("/data/font/DroidSans.ttf", 12)
 		local bfont = core.display.newFont("/data/font/DroidSans.ttf", 16)
diff --git a/game/engines/default/engine/Mouse.lua b/game/engines/default/engine/Mouse.lua
index d27bf9ff858b3be74ad07bd76ebec1056d33cd32..94491ada4915d478d8412453494f1bed1efbe9cb 100644
--- a/game/engines/default/engine/Mouse.lua
+++ b/game/engines/default/engine/Mouse.lua
@@ -30,6 +30,10 @@ function _M:init()
 	self.last_pos = { x = 0, y = 0 }
 end
 
+function _M:allowDownEvent(v)
+	self.allow_down = v
+end
+
 --- Called when a mouse is pressed
 -- @param button
 -- @param x coordinate of the click
@@ -39,7 +43,7 @@ end
 function _M:receiveMouse(button, x, y, isup, force_name, extra)
 	self.last_pos = { x = x, y = y }
 	self.status[button] = not isup
-	if not isup then return end
+	if not self.allow_down and not isup then return end
 
 	if _M.drag then
 		if _M.drag.prestart then _M.drag = nil
@@ -49,7 +53,7 @@ function _M:receiveMouse(button, x, y, isup, force_name, extra)
 	for i  = 1, #self.areas do
 		local m = self.areas[i]
 		if (not m.mode or m.mode.button) and (x >= m.x1 and x < m.x2 and y >= m.y1 and y < m.y2) and (not force_name or force_name == m.name) then
-			m.fct(button, x, y, nil, nil, (x-m.x1) / m.scale, (y-m.y1) / m.scale, "button", extra)
+			m.fct(button, x, y, nil, nil, (x-m.x1) / m.scale, (y-m.y1) / m.scale, isup and "button" or "button-down", extra)
 			break
 		end
 	end
@@ -88,6 +92,7 @@ function _M:delegate(button, mx, my, xrel, yrel, bx, by, event, name, extra)
 	my = my - oy
 
 	if event == "button" then self:receiveMouse(button, mx, my, true, name, extra)
+	elseif event == "button-down" then self:receiveMouse(button, mx, my, false, name, extra)
 	elseif event == "motion" then self:receiveMouseMotion(button, mx, my, xrel, yrel, name, extra)
 	end
 end
diff --git a/game/engines/default/engine/Shader.lua b/game/engines/default/engine/Shader.lua
index 8755d53f8bc3ea4cdf4823bc381196a70bdc9660..3d9ff0499a8a14146846d68b64413272e1f8389e 100644
--- a/game/engines/default/engine/Shader.lua
+++ b/game/engines/default/engine/Shader.lua
@@ -150,10 +150,10 @@ end
 
 function _M:loaded()
 	if _M.progsperm[self.totalname] then
-		print("[SHADER] using permcached shader "..self.totalname)
+		-- print("[SHADER] using permcached shader "..self.totalname)
 		self.shad = _M.progsperm[self.totalname]
 	elseif _M.progs[self.totalname] and not _M.progsreset[self.totalname] then
-		print("[SHADER] using cached shader "..self.totalname)
+		-- print("[SHADER] using cached shader "..self.totalname)
 		self.shad = _M.progs[self.totalname].shad
 		_M.progs[self.totalname].dieat = os.time() + 60
 	else
diff --git a/game/engines/default/engine/UserChat.lua b/game/engines/default/engine/UserChat.lua
index d53489d83c7bddd49a6c5892a6487fac412a8b15..5b4ff5db8136cf90c1663a277bdbd376b2f41ba0 100644
--- a/game/engines/default/engine/UserChat.lua
+++ b/game/engines/default/engine/UserChat.lua
@@ -231,8 +231,33 @@ function _M:event(e)
 		elseif e.donator == "recurring" then color = colors.ROYAL_BLUE end
 		e.color_name = color
 
+		local data = zlib.decompress(e.msg)
+		if not data then return end
+		data = data:unserialize()
+		if not data then return end
+
 		self.channels[e.channel] = self.channels[e.channel] or {users={}, log={}}
-		if self.uc_ext then
+
+		if data.kind == "donator-update" and data.donated > 0 then
+			if world then
+				if data.donated <= 5 then world:gainAchievement("BRONZE_DONATOR", game:getPlayer(true))
+				elseif data.donated <= 15 then world:gainAchievement("SILVER_DONATOR", game:getPlayer(true))
+				elseif data.donated <= 30 then world:gainAchievement("GOLD_DONATOR", game:getPlayer(true))
+				elseif data.donated <= 60 then world:gainAchievement("STRALITE_DONATOR", game:getPlayer(true))
+				else world:gainAchievement("VORATUN_DONATOR", game:getPlayer(true))
+				end
+			end
+
+			local text = ([[#{bold}#Thank you#{normal}# for you donation, your support means a lot for the continued survival of this game.
+
+Your current donation total is #LIGHT_GREEN#%0.2f euro#WHITE# which equals to #ROYAL_BLUE#%d voratun coins to use on te4.org.
+Your Item's Vault has #TEAL#%d slots#WHITE#.
+
+Again, thank you, and enjoy Eyal!
+
+#{italic}#Your malevolent local god of darkness, #GOLD#DarkGod#{normal}#]]):format(data.donated, data.donated * 10, data.items_vault_slots)
+			Dialog:simpleLongPopup("Thank you!", text, 600)
+		elseif self.uc_ext then
 			self.uc_ext:event(e)
 		end
 	elseif e.se == "SelfJoin" then
diff --git a/game/engines/default/engine/init.lua b/game/engines/default/engine/init.lua
index 07807a24e41ae3b5356c90beaf974275f7eda457..a3b3afb8ec9e1cd455b63a390596c4b16df0f65d 100644
--- a/game/engines/default/engine/init.lua
+++ b/game/engines/default/engine/init.lua
@@ -139,6 +139,9 @@ core.display.setGamma(config.settings.gamma_correction / 100)
 if not config.settings.fbo_active then core.display.disableFBO() print("Disabling FBO") end
 if not config.settings.shaders_active then core.shader.disable() print("Disabling Shaders") end
 
+-- Webcore local request resolver
+dofile("/engine/webcore.lua")
+
 -- Load profile configs
 core.profile.createThread()
 profile = engine.PlayerProfile.new()
diff --git a/game/engines/default/engine/ui/Dialog.lua b/game/engines/default/engine/ui/Dialog.lua
index 5ee9a60bc5013c7be4272a96631780339efa944b..19a6f4b04cedeaab9b860c20f407ffa797bff34f 100644
--- a/game/engines/default/engine/ui/Dialog.lua
+++ b/game/engines/default/engine/ui/Dialog.lua
@@ -191,6 +191,17 @@ function _M:yesnocancelLongPopup(title, text, w, fct, yes_text, no_text, cancel_
 	return d
 end
 
+function _M:webPopup(url)
+	local d = new(url, game.w * 0.9, game.h * 0.9)
+	local w = require("engine.ui.WebView").new{width=d.iw, height=d.ih, url=url, allow_downloads={addons=true, modules=true}}
+	w.on_title = function(title) d:updateTitle(title) end
+	d:loadUI{{left=0, top=0, ui=w}}
+	d:setupUI()
+	d.key:addBind("EXIT", function() game:unregisterDialog(d) end)
+	game:registerDialog(d)
+	return d
+end
+
 
 title_shadow = true
 
@@ -306,6 +317,7 @@ function _M:generate()
 
 	self:updateTitle(self.title)
 
+	self.mouse:allowDownEvent(true)
 	if self.absolute then
 		self.mouse:registerZone(0, 0, gamew, gameh, function(button, x, y, xrel, yrel, bx, by, event) self:mouseEvent(button, x, y, xrel, yrel, bx - self.display_x, by - self.display_y, event) end)
 	else
@@ -543,7 +555,6 @@ function _M:keyEvent(...)
 		KeyBind.receiveKey(self.key, ...)
 	end
 end
-
 function _M:display() end
 
 --- This does nothing and can be changed by other classes
@@ -553,6 +564,10 @@ end
 --- This provides required cleanups, do not touch
 function _M:cleanup()
 	for p, _ in pairs(self.particles) do p:dieDisplay() end
+
+	for i = 1, #self.uis do
+		if self.uis[i].ui and self.uis[i].ui.on_dialog_cleanup then self.uis[i].ui:on_dialog_cleanup() end
+	end
 end
 
 function _M:drawFrame(x, y, r, g, b, a)
diff --git a/game/engines/default/engine/ui/Waitbar.lua b/game/engines/default/engine/ui/Waitbar.lua
new file mode 100644
index 0000000000000000000000000000000000000000..d5b2fbd289d64c86729f8ef672814d3ba0ca4292
--- /dev/null
+++ b/game/engines/default/engine/ui/Waitbar.lua
@@ -0,0 +1,65 @@
+-- TE4 - T-Engine 4
+-- Copyright (C) 2009, 2010, 2011, 2012, 2013 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 Base = require "engine.ui.Base"
+
+--- A generic waiter bar
+module(..., package.seeall, class.inherit(Base))
+
+function _M:init(t)
+	self.size = assert(t.size, "no waiter size")
+	self.text = assert(t.text, "no waiter text")
+	self.fill = t.fill or 0
+	self.maxfill = t.maxfill or 100
+
+	Base.init(self, t)
+end
+
+function _M:updateFill(v, max, text)
+	self.fill = v
+	if max then self.maxfill = max end
+	if text then
+		self.text = text
+		self.text_gen = self.font_bold:draw(self.text, self.text:toTString():maxWidth(self.font_bold), 255, 255, 255)[1]
+	end
+end
+
+function _M:generate()
+	self.t_left = self:getUITexture("ui/waiter/left_basic.png")
+	self.t_right = self:getUITexture("ui/waiter/right_basic.png")
+	self.t_middle = self:getUITexture("ui/waiter/middle.png")
+	self.t_bar = self:getUITexture("ui/waiter/bar.png")
+
+	self.w, self.h = self.size + self.t_left.w + self.t_right.w, self.t_left.h
+end
+
+function _M:display(x, y)
+	self.t_middle.t:toScreenFull(x + self.t_left.w, y + (self.t_left.h - self.t_middle.h) / 2, self.size, self.t_middle.h, self.t_middle.tw, self.t_middle.th)
+	self.t_left.t:toScreenFull(x, y, self.t_left.w, self.t_left.h, self.t_left.tw, self.t_left.th)
+	self.t_right.t:toScreenFull(x + self.w - self.t_right.w, y, self.t_right.w, self.t_right.h, self.t_right.tw, self.t_right.th)
+	if self.fill > 0 then
+		self.t_bar.t:toScreenFull(x + self.t_left.w, y + (self.t_left.h - self.t_bar.h) / 2, self.size * self.fill / self.maxfill, self.t_bar.h, self.t_bar.tw, self.t_bar.th)
+	end
+	if self.text_gen then
+		local item = self.text_gen
+		item._tex:toScreenFull(2+x + (self.w - item.w) / 2, 2+y + (self.h - item.h) / 2, item.w, item.h, item._tex_w, item._tex_h, 0, 0, 0, 0.7)
+		item._tex:toScreenFull(x + (self.w - item.w) / 2, y + (self.h - item.h) / 2, item.w, item.h, item._tex_w, item._tex_h, 1, 1, 1, 1)
+	end
+end
diff --git a/game/engines/default/engine/ui/Waiter.lua b/game/engines/default/engine/ui/Waiter.lua
index bdf3a3027f53202db64812eb6fba9538e6f16ed4..82a9c2612b14ef9215fbd0e3304360575adf83c5 100644
--- a/game/engines/default/engine/ui/Waiter.lua
+++ b/game/engines/default/engine/ui/Waiter.lua
@@ -40,8 +40,8 @@ function _M:manualStep(nb)
 end
 
 function _M:generate()
-	local left = core.display.loadImage("/data/gfx/waiter/left_basic.png")
-	local right = core.display.loadImage("/data/gfx/waiter/right_basic.png")
+	local left = core.display.loadImage("/data/gfx/metal-ui/waiter/left_basic.png")
+	local right = core.display.loadImage("/data/gfx/metal-ui/waiter/right_basic.png")
 	local lw, lh = left:getSize()
 	local rw, rh = right:getSize()
 	self.w, self.h = self.size + lw + lw, lh
@@ -74,10 +74,10 @@ function _M:getWaitDisplay(d)
 		if has_max then core.wait.addMaxTicks(has_max) end
 		local i, max, dir = 0, has_max or 20, 1
 
-		local left = {core.display.loadImage("/data/gfx/waiter/left_basic.png"):glTexture()}
-		local right = {core.display.loadImage("/data/gfx/waiter/right_basic.png"):glTexture()}
-		local middle = {core.display.loadImage("/data/gfx/waiter/middle.png"):glTexture()}
-		local bar = {core.display.loadImage("/data/gfx/waiter/bar.png"):glTexture()}
+		local left = {core.display.loadImage("/data/gfx/metal-ui/waiter/left_basic.png"):glTexture()}
+		local right = {core.display.loadImage("/data/gfx/metal-ui/waiter/right_basic.png"):glTexture()}
+		local middle = {core.display.loadImage("/data/gfx/metal-ui/waiter/middle.png"):glTexture()}
+		local bar = {core.display.loadImage("/data/gfx/metal-ui/waiter/bar.png"):glTexture()}
 
 		return function()
 			-- Background
diff --git a/game/engines/default/engine/ui/WebView.lua b/game/engines/default/engine/ui/WebView.lua
new file mode 100644
index 0000000000000000000000000000000000000000..e4517f15d8d06e284b5f362f4ad6964d950fc08c
--- /dev/null
+++ b/game/engines/default/engine/ui/WebView.lua
@@ -0,0 +1,762 @@
+-- TE4 - T-Engine 4
+-- Copyright (C) 2009, 2010, 2011 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 Base = require "engine.ui.Base"
+local Focusable = require "engine.ui.Focusable"
+
+--- A web browser
+module(..., package.seeall, class.inherit(Base, Focusable))
+
+function _M:init(t)
+	self.w = assert(t.width, "no webview width")
+	self.h = assert(t.height, "no webview height")
+	self.url = assert(t.url, "no webview url")
+	self.on_title = t.on_title
+	self.allow_downloads = t.allow_downloads or {}
+	self.has_frame = t.has_frame
+	self.never_clean = t.never_clean
+	self.allow_popup = t.allow_popup
+	self.allow_login = t.allow_login
+	self.custom_calls = t.custom_calls or {}
+	if self.allow_login == nil then self.allow_login = true end
+
+	if self.allow_login and self.url:find("^http://te4%.org/") and profile.auth then
+		local param = "_te4ah="..profile.auth.hash.."&_te4ad="..profile.auth.drupid
+
+		local first = self.url:find("?", 1, 1)
+		if first then self.url = self.url.."&"..param
+		else self.url = self.url.."?"..param end
+	end
+
+	if self.url:find("^http://te4%.org/")  then
+		local param = "_te4"
+
+		local first = self.url:find("?", 1, 1)
+		if first then self.url = self.url.."&"..param
+		else self.url = self.url.."?"..param end
+	end
+
+	Base.init(self, t)
+end
+
+function _M:generate()
+	self.mouse:reset()
+	self.key:reset()
+
+	local handlers = {
+		on_title = function(title) if self.on_title then self.on_title(title) end end,
+		on_popup = function(url, w, h) if self.allow_popup then
+			local Dialog = require "engine.ui.Dialog"
+			Dialog:webPopup(url, w, h)
+		end end,
+		on_loading = function(url, status)
+			self.loading = status
+		end,
+	}
+	if self.allow_downloads then self:onDownload(handlers) end
+	self.view = core.webview.new(self.w, self.h, handlers)
+
+	self.custom_calls.lolzor = function(nb, str)
+		print("call from js got: ", nb, str)
+		return "PLAP"
+	end
+
+	self.custom_calls._nextDownloadName = function(name)
+		if name then self._next_download_name = {name=name, time=os.time()}
+		else self._next_download_name = nil
+		end
+	end
+
+	for name, fct in pairs(self.custom_calls) do 
+		handlers[name] = fct
+		self.view:setMethod(name)
+	end
+	self.view:loadURL(self.url)
+	self.loading = 0
+	self.loading_rotation = 0
+	self.scroll_inertia = 0
+
+	if self.has_frame then
+		self.frame = Base:makeFrame("ui/tooltip/", self.w + 8, self.h + 8)
+	end
+	self.loading_icon = self:getUITexture("ui/waiter/loading.png")
+
+	self.mouse:allowDownEvent(true)
+	self.mouse:registerZone(0, 0, self.w, self.h, function(button, x, y, xrel, yrel, bx, by, event)
+		if not self.view then return end
+		if event == "button" then
+			if button == "wheelup" then self.scroll_inertia = math.min(self.scroll_inertia, 0) - 5
+			elseif button == "wheeldown" then self.scroll_inertia = math.max(self.scroll_inertia, 0) + 5
+			elseif button == "left" then self.view:injectMouseButton(true, 1)
+			elseif button == "middle" then self.view:injectMouseButton(true, 2)
+			elseif button == "right" then self.view:injectMouseButton(true, 3)
+			end				
+		elseif event == "button-down" then
+			if button == "wheelup" then self.scroll_inertia = math.min(self.scroll_inertia, 0) - 5
+			elseif button == "wheeldown" then self.scroll_inertia = math.max(self.scroll_inertia, 0) + 5
+			elseif button == "left" then self.view:injectMouseButton(false, 1)
+			elseif button == "middle" then self.view:injectMouseButton(false, 2)
+			elseif button == "right" then self.view:injectMouseButton(false, 3)
+			end				
+		else
+			self.view:injectMouseMove(bx, by)
+		end
+	end)
+	
+	if core.webview.kind == "awesomium" then
+		function self.key.receiveKey(_, sym, ctrl, shift, alt, meta, unicode, isup, key, ismouse, keysym)
+			if not self.view then return end
+			local symb = self.key.sym_to_name[sym]
+			if not symb then return end
+			local asymb = self.awesomiumMapKey[symb]
+			if not asymb then return end
+			self.view:injectKey(isup, symb, asymb, unicode)
+		end
+	elseif core.webview.kind == "cef3" then
+		function self.key.receiveKey(_, sym, ctrl, shift, alt, meta, unicode, isup, key, ismouse, keysym)
+			if not self.view then return end
+			if unicode then
+				keysym = unicode:sub(1):byte()
+				self.view:injectKey(true, keysym, 0, unicode)
+				return
+			end
+			self.view:injectKey(isup, keysym, 0, "")
+		end
+	end
+end
+
+function _M:on_focus(v)
+	game:onTickEnd(function() self.key:unicodeInput(v) end)
+	if self.view then self.view:focus(v) end
+end
+
+function _M:makeDownloadbox(downid, file)
+	local Dialog = require "engine.ui.Dialog"
+	local Waitbar = require "engine.ui.Waitbar"
+	local Button = require "engine.ui.Button"
+
+	local d = Dialog.new("Download: "..file, 600, 100)
+	local b = Button.new{text="Cancel", fct=function() self.view:downloadAction(downid, false) game:unregisterDialog(d) end}
+	local w = Waitbar.new{size=600, text=file}
+	d:loadUI{
+		{left=0, top=0, ui=w},
+		{right=0, bottom=0, ui=b},
+	}
+	d:setupUI(true, true)
+	function d:updateFill(...) w:updateFill(...) end
+	return d
+end
+
+function _M:on_dialog_cleanup()
+	if not self.never_clean then
+		self.downloader = nil
+		self.view = nil
+	end
+end
+
+function _M:onDownload(handlers)
+	local Dialog = require "engine.ui.Dialog"
+
+	handlers.on_download_request = function(downid, url, file, mime)
+		if mime == "application/t-engine-addon" and self.allow_downloads.addons and url:find("^http://te4%.org/") then
+			local path = fs.getRealPath("/addons/")
+			if path then
+				local name = file
+				if self._next_download_name and os.time() - self._next_download_name.time <= 3 then name = self._next_download_name.name self._next_download_name = nil end
+				Dialog:yesnoPopup("Confirm addon install/update", "Are you sure you want to install this addon: #LIGHT_GREEN##{bold}#"..name.."#{normal}##LAST# ?", function(ret)
+					if ret then
+						print("Accepting addon download to:", path..file)
+						self.download_dialog = self:makeDownloadbox(downid, file)
+						self.download_dialog.install_kind = "Addon"
+						game:registerDialog(self.download_dialog)
+						self.view:downloadAction(downid, path..file)
+					else
+						self.view:downloadAction(downid, false)
+					end
+				end)
+				return
+			end
+		elseif mime == "application/t-engine-module" and self.allow_downloads.modules and url:find("^http://te4%.org/") then
+			local path = fs.getRealPath("/modules/")
+			if path then
+				local name = file
+				if self._next_download_name and os.time() - self._next_download_name.time <= 3 then name = self._next_download_name.name self._next_download_name = nil end
+				Dialog:yesnoPopup("Confirm module install/update", "Are you sure you want to install this module: #LIGHT_GREEN##{bold}#"..name.."#{normal}##LAST# ?", function(ret)
+					if ret then
+						print("Accepting module download to:", path..file)
+						self.download_dialog = self:makeDownloadbox(downid, file)
+						self.download_dialog.install_kind = "Game Module"
+						game:registerDialog(self.download_dialog)
+						self.view:downloadAction(downid, path..file)
+					else
+						self.view:downloadAction(downid, false)
+					end
+				end)
+				return
+			end
+		end
+		self.view:downloadAction(downid, false)
+	end
+
+	handlers.on_download_update = function(downid, cur_size, total_size, percent, speed)
+		if not self.download_dialog then return end
+		self.download_dialog:updateFill(cur_size, total_size, ("%d%% - %d KB/s"):format(cur_size * 100 / total_size, speed / 1024))
+	end
+
+	handlers.on_download_finish = function(downid)
+		if not self.download_dialog then return end
+		game:unregisterDialog(self.download_dialog)
+		if self.download_dialog.install_kind == "Addon" then
+			Dialog:simplePopup("Addon installed!", "Addon installation successful. New addons are only active for new characters.")
+		elseif self.download_dialog.install_kind == "Game Module" then
+			Dialog:simplePopup("Game installed!", "Game installation successful. Have fun!")
+		end
+		self.download_dialog = nil
+	end
+end
+
+function _M:display(x, y, nb_keyframes, screen_x, screen_y, offset_x, offset_y, local_x, local_y)
+	if self.scroll_inertia > 0 then self.scroll_inertia = math.max(self.scroll_inertia - 1, 0)
+	elseif self.scroll_inertia < 0 then self.scroll_inertia = math.min(self.scroll_inertia + 1, 0)
+	end
+
+	if self.frame then
+		self:drawFrame(self.frame, x - 4, y - 4, 0, 0, 0, 0.3, self.w, self.h) -- shadow
+		self:drawFrame(self.frame, x - 4, y - 4, 1, 1, 1, 0.75) -- unlocked frame
+	end
+
+	if self.view then
+		if self.scroll_inertia ~= 0 then self.view:injectMouseWheel(0, self.scroll_inertia) end
+		self.view:toScreen(x, y)
+	end
+
+	if self.loading < 1 then
+		self.loading_rotation = self.loading_rotation + nb_keyframes * 8
+		core.display.glMatrix(true)
+		core.display.glTranslate(x + self.loading_icon.w / 2, y + self.loading_icon.h / 2, 0)
+		core.display.glRotate(self.loading_rotation, 0, 0, 1)
+		self.loading_icon.t:toScreenFull(-self.loading_icon.w / 2, -self.loading_icon.h / 2, self.loading_icon.w, self.loading_icon.h, self.loading_icon.tw, self.loading_icon.th)
+		core.display.glMatrix(false)
+	end
+end
+
+
+_M.awesomiumMapKey = {
+	-- _BACK (08) BACKSPACE key
+	_BACKSPACE = 0x08,
+
+	-- _TAB (09) TAB key
+	_TAB = 0x09,
+
+	-- _CLEAR (0C) CLEAR key
+	_CLEAR = 0x0C,
+
+	-- _RETURN (0D)
+	_RETURN = 0x0D,
+
+	-- _SHIFT (10) SHIFT key
+	_SHIFT = 0x10,
+
+	-- _CONTROL (11) CTRL key
+	_CONTROL = 0x11,
+
+	-- _MENU (12) ALT key
+	_MENU = 0x12,
+
+	-- _PAUSE (13) PAUSE key
+	_PAUSE = 0x13,
+
+	-- _CAPITAL (14) CAPS LOCK key
+	_CAPITAL = 0x14,
+
+	-- _KANA (15) Input Method Editor (IME) Kana mode
+	_KANA = 0x15,
+
+	-- _HANGUEL (15) IME Hanguel mode (maintained for compatibility; use _HANGUL)
+	-- _HANGUL (15) IME Hangul mode
+	_HANGUL = 0x15,
+
+	-- _JUNJA (17) IME Junja mode
+	_JUNJA = 0x17,
+
+	-- _FINAL (18) IME final mode
+	_FINAL = 0x18,
+    
+	-- _HANJA (19) IME Hanja mode
+	_HANJA = 0x19,
+    
+	-- _KANJI (19) IME Kanji mode
+	_KANJI = 0x19,
+    
+	-- _ESCAPE (1B) ESC key
+	_ESCAPE = 0x1B,
+    
+	-- _CONVERT (1C) IME convert
+	_CONVERT = 0x1C,
+    
+	-- _NONCONVERT (1D) IME nonconvert
+	_NONCONVERT = 0x1D,
+    
+	-- _ACCEPT (1E) IME accept
+	_ACCEPT = 0x1E,
+    
+	-- _MODECHANGE (1F) IME mode change request
+	_MODECHANGE = 0x1F,
+    
+	-- _SPACE (20) SPACEBAR
+	_SPACE = 0x20,
+    
+	-- _PRIOR (21) PAGE UP key
+	_PRIOR = 0x21,
+    
+	-- _NEXT (22) PAGE DOWN key
+	_NEXT = 0x22,
+    
+	-- _END (23) END key
+	_END = 0x23,
+    
+	-- _HOME (24) HOME key
+	_HOME = 0x24,
+    
+	-- _LEFT (25) LEFT ARROW key
+	_LEFT = 0x25,
+    
+	-- _UP (26) UP ARROW key
+	_UP = 0x26,
+    
+	-- _RIGHT (27) RIGHT ARROW key
+	_RIGHT = 0x27,
+    
+	-- _DOWN (28) DOWN ARROW key
+	_DOWN = 0x28,
+    
+	-- _SELECT (29) SELECT key
+	_SELECT = 0x29,
+    
+	-- _PRINT (2A) PRINT key
+	_PRINT = 0x2A,
+    
+	-- _EXECUTE (2B) EXECUTE key
+	_EXECUTE = 0x2B,
+    
+	-- _SNAPSHOT (2C) PRINT SCREEN key
+	_SNAPSHOT = 0x2C,
+    
+	-- _INSERT (2D) INS key
+	_INSERT = 0x2D,
+    
+	-- _DELETE (2E) DEL key
+	_DELETE = 0x2E,
+    
+	-- _HELP (2F) HELP key
+	_HELP = 0x2F,
+    
+	-- (30) 0 key
+	_0 = 0x30,
+    
+	-- (31) 1 key
+	_1 = 0x31,
+    
+	-- (32) 2 key
+	_2 = 0x32,
+    
+	-- (33) 3 key
+	_3 = 0x33,
+    
+	-- (34) 4 key
+	_4 = 0x34,
+    
+	-- (35) 5 key;
+	_5 = 0x35,
+    
+	-- (36) 6 key
+	_6 = 0x36,
+    
+	-- (37) 7 key
+	_7 = 0x37,
+    
+	-- (38) 8 key
+	_8 = 0x38,
+    
+	-- (39) 9 key
+	_9 = 0x39,
+    
+	-- (41) A key
+	_a = 0x41,
+    
+	-- (42) b key
+	_b = 0x42,
+    
+	-- (43) c key
+	_c = 0x43,
+    
+	-- (44) d key
+	_d = 0x44,
+    
+	-- (45) e key
+	_e = 0x45,
+    
+	-- (46) f key
+	_f = 0x46,
+    
+	-- (47) g key
+	_g = 0x47,
+    
+	-- (48) h key
+	_h = 0x48,
+    
+	-- (49) i key
+	_i = 0x49,
+    
+	-- (4a) j key
+	_j = 0x4a,
+    
+	-- (4b) k key
+	_k = 0x4b,
+    
+	-- (4c) l key
+	_l = 0x4c,
+    
+	-- (4d) m key
+	_m = 0x4d,
+    
+	-- (4e) n key
+	_n = 0x4e,
+    
+	-- (4f) o key
+	_o = 0x4f,
+    
+	-- (50) p key
+	_p = 0x50,
+    
+	-- (51) q key
+	_q = 0x51,
+    
+	-- (52) r key
+	_r = 0x52,
+    
+	-- (53) s key
+	_s = 0x53,
+    
+	-- (54) t key
+	_t = 0x54,
+    
+	-- (55) u key
+	_u = 0x55,
+    
+	-- (56) v key
+	_v = 0x56,
+    
+	-- (57) w key
+	_w = 0x57,
+    
+	-- (58) x key
+	_x = 0x58,
+    
+	-- (59) y key
+	_y = 0x59,
+    
+	-- (5a) z key
+	_z = 0x5a,
+    
+	-- _LWIN (5B) Left Windows key (Microsoft Natural keyboard)
+	_LWIN = 0x5B,
+    
+	-- _RWIN (5C) Right Windows key (Natural keyboard)
+	_RWIN = 0x5C,
+    
+	-- _APPS (5D) Applications key (Natural keyboard)
+	_APPS = 0x5D,
+    
+	-- _SLEEP (5F) Computer Sleep key
+	_SLEEP = 0x5F,
+    
+	-- _NUMPAD0 (60) Numeric keypad 0 key
+	_NUMPAD0 = 0x60,
+    
+	-- _NUMPAD1 (61) Numeric keypad 1 key
+	_NUMPAD1 = 0x61,
+    
+	-- _NUMPAD2 (62) Numeric keypad 2 key
+	_NUMPAD2 = 0x62,
+    
+	-- _NUMPAD3 (63) Numeric keypad 3 key
+	_NUMPAD3 = 0x63,
+    
+	-- _NUMPAD4 (64) Numeric keypad 4 key
+	_NUMPAD4 = 0x64,
+    
+	-- _NUMPAD5 (65) Numeric keypad 5 key
+	_NUMPAD5 = 0x65,
+    
+	-- _NUMPAD6 (66) Numeric keypad 6 key
+	_NUMPAD6 = 0x66,
+    
+	-- _NUMPAD7 (67) Numeric keypad 7 key
+	_NUMPAD7 = 0x67,
+    
+	-- _NUMPAD8 (68) Numeric keypad 8 key
+	_NUMPAD8 = 0x68,
+    
+	-- _NUMPAD9 (69) Numeric keypad 9 key
+	_NUMPAD9 = 0x69,
+    
+	-- _MULTIPLY (6A) Multiply key
+	_MULTIPLY = 0x6A,
+    
+	-- _ADD (6B) Add key
+	_ADD = 0x6B,
+    
+	-- _SEPARATOR (6C) Separator key
+	_SEPARATOR = 0x6C,
+    
+	-- _SUBTRACT (6D) Subtract key
+	_SUBTRACT = 0x6D,
+    
+	-- _DECIMAL (6E) Decimal key
+	_DECIMAL = 0x6E,
+    
+	-- _DIVIDE (6F) Divide key
+	_DIVIDE = 0x6F,
+    
+	-- _F1 (70) F1 key
+	_F1 = 0x70,
+    
+	-- _F2 (71) F2 key
+	_F2 = 0x71,
+    
+	-- _F3 (72) F3 key
+	_F3 = 0x72,
+    
+	-- _F4 (73) F4 key
+	_F4 = 0x73,
+    
+	-- _F5 (74) F5 key
+	_F5 = 0x74,
+    
+	-- _F6 (75) F6 key
+	_F6 = 0x75,
+    
+	-- _F7 (76) F7 key
+	_F7 = 0x76,
+    
+	-- _F8 (77) F8 key
+	_F8 = 0x77,
+    
+	-- _F9 (78) F9 key
+	_F9 = 0x78,
+    
+	-- _F10 (79) F10 key
+	_F10 = 0x79,
+    
+	-- _F11 (7A) F11 key
+	_F11 = 0x7A,
+    
+	-- _F12 (7B) F12 key
+	_F12 = 0x7B,
+    
+	-- _F13 (7C) F13 key
+	_F13 = 0x7C,
+    
+	-- _F14 (7D) F14 key
+	_F14 = 0x7D,
+    
+	-- _F15 (7E) F15 key
+	_F15 = 0x7E,
+    
+	-- _F16 (7F) F16 key
+	_F16 = 0x7F,
+    
+	-- _F17 (80H) F17 key
+	_F17 = 0x80,
+    
+	-- _F18 (81H) F18 key
+	_F18 = 0x81,
+    
+	-- _F19 (82H) F19 key
+	_F19 = 0x82,
+    
+	-- _F20 (83H) F20 key
+	_F20 = 0x83,
+    
+	-- _F21 (84H) F21 key
+	_F21 = 0x84,
+    
+	-- _F22 (85H) F22 key
+	_F22 = 0x85,
+    
+	-- _F23 (86H) F23 key
+	_F23 = 0x86,
+    
+	-- _F24 (87H) F24 key
+	_F24 = 0x87,
+    
+	-- _NUMLOCK (90) NUM LOCK key
+	_NUMLOCK = 0x90,
+    
+	-- _SCROLL (91) SCROLL LOCK key
+	_SCROLL = 0x91,
+    
+	-- _LSHIFT (A0) Left SHIFT key
+	_LSHIFT = 0xA0,
+    
+	-- _RSHIFT (A1) Right SHIFT key
+	_RSHIFT = 0xA1,
+    
+	-- _LCONTROL (A2) Left CONTROL key
+	_LCONTROL = 0xA2,
+    
+	-- _RCONTROL (A3) Right CONTROL key
+	_RCONTROL = 0xA3,
+    
+	-- _LMENU (A4) Left MENU key
+	_LMENU = 0xA4,
+    
+	-- _RMENU (A5) Right MENU key
+	_RMENU = 0xA5,
+    
+	-- _BROWSER_BACK (A6) Windows 2000/XP: Browser Back key
+	_BROWSER_BACK = 0xA6,
+    
+	-- _BROWSER_FORWARD (A7) Windows 2000/XP: Browser Forward key
+	_BROWSER_FORWARD = 0xA7,
+    
+	-- _BROWSER_REFRESH (A8) Windows 2000/XP: Browser Refresh key
+	_BROWSER_REFRESH = 0xA8,
+    
+	-- _BROWSER_STOP (A9) Windows 2000/XP: Browser Stop key
+	_BROWSER_STOP = 0xA9,
+    
+	-- _BROWSER_SEARCH (AA) Windows 2000/XP: Browser Search key
+	_BROWSER_SEARCH = 0xAA,
+    
+	-- _BROWSER_FAVORITES (AB) Windows 2000/XP: Browser Favorites key
+	_BROWSER_FAVORITES = 0xAB,
+    
+	-- _BROWSER_HOME (AC) Windows 2000/XP: Browser Start and Home key
+	_BROWSER_HOME = 0xAC,
+    
+	-- _VOLUME_MUTE (AD) Windows 2000/XP: Volume Mute key
+	_VOLUME_MUTE = 0xAD,
+    
+	-- _VOLUME_DOWN (AE) Windows 2000/XP: Volume Down key
+	_VOLUME_DOWN = 0xAE,
+    
+	-- _VOLUME_UP (AF) Windows 2000/XP: Volume Up key
+	_VOLUME_UP = 0xAF,
+    
+	-- _MEDIA_NEXT_TRACK (B0) Windows 2000/XP: Next Track key
+	_MEDIA_NEXT_TRACK = 0xB0,
+    
+	-- _MEDIA_PREV_TRACK (B1) Windows 2000/XP: Previous Track key
+	_MEDIA_PREV_TRACK = 0xB1,
+    
+	-- _MEDIA_STOP (B2) Windows 2000/XP: Stop Media key
+	_MEDIA_STOP = 0xB2,
+    
+	-- _MEDIA_PLAY_PAUSE (B3) Windows 2000/XP: Play/Pause Media key
+	_MEDIA_PLAY_PAUSE = 0xB3,
+    
+	-- _LAUNCH_MAIL (B4) Windows 2000/XP: Start Mail key
+	_MEDIA_LAUNCH_MAIL = 0xB4,
+    
+	-- _LAUNCH_MEDIA_SELECT (B5) Windows 2000/XP: Select Media key
+	_MEDIA_LAUNCH_MEDIA_SELECT = 0xB5,
+    
+	-- _LAUNCH_APP1 (B6) Windows 2000/XP: Start Application 1 key
+	_MEDIA_LAUNCH_APP1 = 0xB6,
+    
+	-- _LAUNCH_APP2 (B7) Windows 2000/XP: Start Application 2 key
+	_MEDIA_LAUNCH_APP2 = 0xB7,
+    
+	-- _OEM_1 (BA) Used for miscellaneous characters; it can vary by keyboard. Windows 2000/XP: For the US standard keyboard, the ';:' key
+	_OEM_1 = 0xBA,
+    
+	-- _OEM_PLUS (BB) Windows 2000/XP: For any country/region, the '+' key
+	_OEM_PLUS = 0xBB,
+    
+	-- _OEM_COMMA (BC) Windows 2000/XP: For any country/region, the ',' key
+	_OEM_COMMA = 0xBC,
+    
+	-- _OEM_MINUS (BD) Windows 2000/XP: For any country/region, the '-' key
+	_OEM_MINUS = 0xBD,
+    
+	-- _OEM_PERIOD (BE) Windows 2000/XP: For any country/region, the '.' key
+	_OEM_PERIOD = 0xBE,
+    
+	-- _OEM_2 (BF) Used for miscellaneous characters; it can vary by keyboard. Windows 2000/XP: For the US standard keyboard, the '/?' key
+	_OEM_2 = 0xBF,
+    
+	-- _OEM_3 (C0) Used for miscellaneous characters; it can vary by keyboard. Windows 2000/XP: For the US standard keyboard, the '`~' key
+	_OEM_3 = 0xC0,
+    
+	-- _OEM_4 (DB) Used for miscellaneous characters; it can vary by keyboard. Windows 2000/XP: For the US standard keyboard, the '[{' key
+	_OEM_4 = 0xDB,
+    
+	-- _OEM_5 (DC) Used for miscellaneous characters; it can vary by keyboard. Windows 2000/XP: For the US standard keyboard, the '\|' key
+	_OEM_5 = 0xDC,
+    
+	-- _OEM_6 (DD) Used for miscellaneous characters; it can vary by keyboard. Windows 2000/XP: For the US standard keyboard, the ']}' key
+	_OEM_6 = 0xDD,
+    
+	-- _OEM_7 (DE) Used for miscellaneous characters; it can vary by keyboard. Windows 2000/XP: For the US standard keyboard, the 'single-quote/double-quote' key
+	_OEM_7 = 0xDE,
+    
+	-- _OEM_8 (DF) Used for miscellaneous characters; it can vary by keyboard.
+	_OEM_8 = 0xDF,
+    
+	-- _OEM_102 (E2) Windows 2000/XP: Either the angle bracket key or the backslash key on the RT 102-key keyboard
+	_OEM_102 = 0xE2,
+    
+	-- _PROCESSKEY (E5) Windows 95/98/Me, Windows NT 4.0, Windows 2000/XP: IME PROCESS key
+	_PROCESSKEY = 0xE5,
+    
+	-- _PACKET (E7) Windows 2000/XP: Used to pass Unicode characters as if they were keystrokes. The _PACKET key is the low word of a 32-bit Virtual Key value used for non-keyboard input methods. For more information, see Remark in KEYBDINPUT,SendInput, WM_KEYDOWN, and WM_KEYUP
+	_PACKET = 0xE7,
+    
+	-- _ATTN (F6) Attn key
+	_ATTN = 0xF6,
+    
+	-- _CRSEL (F7) CrSel key
+	_CRSEL = 0xF7,
+    
+	-- _EXSEL (F8) ExSel key
+	_EXSEL = 0xF8,
+    
+	-- _EREOF (F9) Erase EOF key
+	_EREOF = 0xF9,
+    
+	-- _PLAY (FA) Play key
+	_PLAY = 0xFA,
+    
+	-- _ZOOM (FB) Zoom key
+	_ZOOM = 0xFB,
+
+	-- _NONAME (FC) Reserved for future use
+	_NONAME = 0xFC,
+    
+	-- _PA1 (FD) PA1 key
+	_PA1 = 0xFD,
+    
+	-- _OEM_CLEAR (FE) Clear key
+	_OEM_CLEAR = 0xFE,
+    
+	_UNKNOWN = 0,
+}
\ No newline at end of file
diff --git a/game/engines/default/engine/utils.lua b/game/engines/default/engine/utils.lua
index bdbd691c76f14c60fa13804f58a6a60220c4f806..4b633ab4cb99da86ebfb646947b765c38a463e99 100644
--- a/game/engines/default/engine/utils.lua
+++ b/game/engines/default/engine/utils.lua
@@ -34,6 +34,13 @@ function math.round(v, mult, num)
 	return v >= 0 and math.floor((v + mult/2)/mult) * mult/num or math.ceil((v - mult/2)/mult) * mult/num
 end
 
+function math.scale(i, imin, imax, dmin, dmax)
+	local bi = i - imin
+	local bm = imax - imin
+	local dm = dmax - dmin
+	return bi * dm / bm + dmin
+end
+
 function lpeg.anywhere (p)
 	return lpeg.P{ p + 1 * lpeg.V(1) }
 end
@@ -1963,8 +1970,12 @@ function util.uuid()
 	return uuid
 end
 
-function util.browserOpenUrl(url)
-	if core.steam and core.steam.openOverlayUrl(url) then return true end
+function util.browserOpenUrl(url, forbid_methods)
+	forbid_methods = forbid_methods or {}
+	if core.webview and not forbid_methods.webview then local d = require("engine.ui.Dialog"):webPopup(url) return "webview", d end
+	if core.steam and not forbid_methods.steam and core.steam.openOverlayUrl(url) then return "steam", true end
+
+	if forbid_methods.native then return false end
 
 	local tries = {
 		"rundll32 url.dll,FileProtocolHandler %s",	-- Windows
@@ -1981,7 +1992,7 @@ function util.browserOpenUrl(url)
 		local urlbase = table.remove(tries, 1)
 		urlbase = urlbase:format(url)
 		print("Trying to run URL with command: ", urlbase)
-		if os.execute(urlbase) == 0 then return true end
+		if os.execute(urlbase) == 0 then return "native", true end
 	end
 	return false
 end
diff --git a/game/engines/default/engine/version.lua b/game/engines/default/engine/version.lua
index 98ecb498276f1d909ef2d5175fe85517eca141f5..ea605b02a9374ef9d8aba0359f373a1afc591f33 100644
--- a/game/engines/default/engine/version.lua
+++ b/game/engines/default/engine/version.lua
@@ -18,7 +18,7 @@
 -- darkgod@te4.org
 
 -- Engine Version
-engine.version = {1,1,6,"te4",17}
+engine.version = {1,2,0,"te4",17}
 engine.require_c_core = engine.version[5]
 engine.version_id = ("%s-%d_%d.%d.%d"):format(engine.version[4], engine.require_c_core, engine.version[1], engine.version[2], engine.version[3])
 
diff --git a/game/engines/default/engine/webcore.lua b/game/engines/default/engine/webcore.lua
new file mode 100644
index 0000000000000000000000000000000000000000..6dcb8fc9a3e1c7025e83f9486d10777e7b43bc8c
--- /dev/null
+++ b/game/engines/default/engine/webcore.lua
@@ -0,0 +1,62 @@
+-- TE4 - T-Engine 4
+-- Copyright (C) 2009 - 2014 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
+
+if not core.webview then return end
+
+local class = require "class"
+
+core.webview.paths = {}
+
+function core.webview.responder(id, path)
+	path = "/"..path
+	print("[WEBCORE] path request: ", path)
+
+	-- Let hook do their stuff
+	local reply = {}
+	if class:triggerHook{"Web:request", path=path, reply=reply} and reply.data then
+		core.webview.localReplyData(id, reply.mime, reply.data)
+		return
+	end
+
+	-- No hooks, perhaps we have a registered path matching
+	for mpath, fct in pairs(core.webview.paths) do
+		local r = {path:find("^"..mpath)}
+		if r[1] then
+			table.remove(r, 1) table.remove(r, 1)
+			local mime, data = fct(path, unpack(r))
+			if mime and data then
+				core.webview.localReplyData(id, mime, data)
+				return
+			end
+		end
+	end
+
+	-- Default, check for a file in /data/
+	local mime = "application/octet-stream"
+	if path:find("%.html$") then mime = "text/html"
+	elseif path:find("%.js$") then mime = "text/javascript"
+	elseif path:find("%.css$") then mime = "text/css"
+	elseif path:find("%.png$") then mime = "image/png"
+	end
+	core.webview.localReplyFile(id, mime, "/data"..path)
+end
+
+core.webview.paths["/example/(.*)"] = function(path, sub)
+	return "text/html", "example sub url was: "..sub
+end
diff --git a/game/engines/default/modules/boot/class/Game.lua b/game/engines/default/modules/boot/class/Game.lua
index ca4b3944d677fdaf39495820afab02c273358557..aec2e27645994621f2c79302a431d98703c0078a 100644
--- a/game/engines/default/modules/boot/class/Game.lua
+++ b/game/engines/default/modules/boot/class/Game.lua
@@ -64,7 +64,7 @@ function _M:init()
 		self.background, self.background_tw, self.background_th = self.background:glTexture()
 	end
 
-	self.tooltip = Tooltip.new(nil, 14, nil, colors.DARK_GREY, 380)
+	if not core.webview then self.tooltip = Tooltip.new(nil, 14, nil, colors.DARK_GREY, 380) end
 
 --	self.refuse_threads = true
 	self.normal_key = self.key
@@ -89,6 +89,13 @@ end
 function _M:run()
 	self:triggerHook{"Boot:run"}
 
+	-- Web Tooltip?
+	if core.webview then
+		self.webtooltip = require("engine.ui.WebView").new{width=380, height=500, has_frame=true, never_clean=true, allow_popup=true,
+			url = ("http://te4.org/tooltip-ingame?steam=%d&vM=%d&vm=%d&vp=%d"):format(core.steam and 1 or 0, engine.version[1], engine.version[2], engine.version[3])
+		}
+	end
+
 	self.flyers = FlyingText.new()
 	self:setFlyingText(self.flyers)
 	self.log = function(style, ...) end
@@ -126,8 +133,10 @@ Remember that in most roguelikes death is usually permanent so be careful!
 Now go and have some fun!]]
 		}
 
-		self:serverNews()
-		self:updateNews()
+		if self.tooltip then
+			self:serverNews()
+			self:updateNews()
+		end
 	end
 
 --	self:installNewEngine()
@@ -316,6 +325,8 @@ function _M:getPlayer()
 end
 
 function _M:updateNews()
+	if not self.tooltip then return end
+
 	if self.news.link then
 		self.tooltip:set("#AQUAMARINE#%s#WHITE#\n---\n%s\n---\n#LIGHT_BLUE##{underline}#%s#LAST##{normal}#", self.news.title, self.news.text, self.news.link)
 	else
@@ -372,8 +383,12 @@ function _M:display(nb_keyframes)
 			end
 			self.background:toScreenFull(x, y, w, h, w * self.background_tw / self.background_w, h * self.background_th / self.background_h)
 		end
-		self.tooltip:display()
-		self.tooltip:toScreen(5, 5)
+		if self.tooltip then
+			if #self.dialogs == 0 or not self.dialogs[#self.dialogs].__show_only then
+				self.tooltip:display()
+				self.tooltip:toScreen(5, 5)
+			end
+		end
 		self.logdisplay:toScreen()
 		engine.GameEnergyBased.display(self, nb_keyframes)
 		if self.full_fbo then self.full_fbo:use(false) self.full_fbo:toScreen(0, 0, self.w, self.h, self.full_fbo_shader.shad) end
@@ -410,8 +425,12 @@ function _M:display(nb_keyframes)
 --		core.display.drawQuad(0, 0, game.w, game.h, 128, 128, 128, 128)
 	end
 
-	self.tooltip:display()
-	self.tooltip:toScreen(5, 5)
+	if self.tooltip then
+		if #self.dialogs == 0 or not self.dialogs[#self.dialogs].__show_only then
+			self.tooltip:display()
+			self.tooltip:toScreen(5, 5)
+		end
+	end
 
 	self.logdisplay:toScreen()
 
diff --git a/game/engines/default/modules/boot/data/gfx/shaders/awesomeaura.frag b/game/engines/default/modules/boot/data/gfx/shaders/awesomeaura.frag
new file mode 100644
index 0000000000000000000000000000000000000000..44d550a41fdfefda651bce8b0a3a5b08198e56d4
--- /dev/null
+++ b/game/engines/default/modules/boot/data/gfx/shaders/awesomeaura.frag
@@ -0,0 +1,177 @@
+uniform sampler2D tex;
+uniform sampler2D flames;
+
+uniform float alpha;
+uniform float tick;
+uniform float time_factor;
+uniform float flameScale;
+uniform vec2 quadSize;
+uniform vec2 texSize;
+
+vec4 permute( vec4 x ) {
+
+	return mod( ( ( x * 34.0 ) + 1.0 ) * x, 289.0 );
+
+} 
+
+vec4 taylorInvSqrt( vec4 r ) {
+
+	return 1.79284291400159 - 0.85373472095314 * r;
+
+}
+
+float snoise( vec3 v ) {
+
+	const vec2 C = vec2( 1.0 / 6.0, 1.0 / 3.0 );
+	const vec4 D = vec4( 0.0, 0.5, 1.0, 2.0 );
+
+	// First corner
+
+	vec3 i  = floor( v + dot( v, C.yyy ) );
+	vec3 x0 = v - i + dot( i, C.xxx );
+
+	// Other corners
+
+	vec3 g = step( x0.yzx, x0.xyz );
+	vec3 l = 1.0 - g;
+	vec3 i1 = min( g.xyz, l.zxy );
+	vec3 i2 = max( g.xyz, l.zxy );
+
+	vec3 x1 = x0 - i1 + 1.0 * C.xxx;
+	vec3 x2 = x0 - i2 + 2.0 * C.xxx;
+	vec3 x3 = x0 - 1. + 3.0 * C.xxx;
+
+	// Permutations
+
+	i = mod( i, 289.0 );
+	vec4 p = permute( permute( permute(
+		i.z + vec4( 0.0, i1.z, i2.z, 1.0 ) )
+		+ i.y + vec4( 0.0, i1.y, i2.y, 1.0 ) )
+		+ i.x + vec4( 0.0, i1.x, i2.x, 1.0 ) );
+
+	// Gradients
+	// ( N*N points uniformly over a square, mapped onto an octahedron.)
+
+	float n_ = 1.0 / 7.0; // N=7
+
+	vec3 ns = n_ * D.wyz - D.xzx;
+
+	vec4 j = p - 49.0 * floor( p * ns.z *ns.z );  //  mod(p,N*N)
+
+	vec4 x_ = floor( j * ns.z );
+	vec4 y_ = floor( j - 7.0 * x_ );    // mod(j,N)
+
+	vec4 x = x_ *ns.x + ns.yyyy;
+	vec4 y = y_ *ns.x + ns.yyyy;
+	vec4 h = 1.0 - abs( x ) - abs( y );
+
+	vec4 b0 = vec4( x.xy, y.xy );
+	vec4 b1 = vec4( x.zw, y.zw );
+
+
+	vec4 s0 = floor( b0 ) * 2.0 + 1.0;
+	vec4 s1 = floor( b1 ) * 2.0 + 1.0;
+	vec4 sh = -step( h, vec4( 0.0 ) );
+
+	vec4 a0 = b0.xzyw + s0.xzyw * sh.xxyy;
+	vec4 a1 = b1.xzyw + s1.xzyw * sh.zzww;
+
+	vec3 p0 = vec3( a0.xy, h.x );
+	vec3 p1 = vec3( a0.zw, h.y );
+	vec3 p2 = vec3( a1.xy, h.z );
+	vec3 p3 = vec3( a1.zw, h.w );
+
+	// Normalise gradients
+
+	vec4 norm = taylorInvSqrt( vec4( dot( p0, p0 ), dot( p1, p1 ), dot( p2, p2 ), dot( p3, p3 ) ) );
+	p0 *= norm.x;
+	p1 *= norm.y;
+	p2 *= norm.z;
+	p3 *= norm.w;
+
+	// Mix final noise value
+
+	vec4 m = max( 0.6 - vec4( dot( x0, x0 ), dot( x1, x1 ), dot( x2, x2 ), dot( x3, x3 ) ), 0.0 );
+	m = m * m;
+	return 42.0 * dot( m*m, vec4( dot( p0, x0 ), dot( p1, x1 ),
+		dot( p2, x2 ), dot( p3, x3 ) ) );
+
+}  
+
+vec2 snoise2(vec3 pos)
+{
+	return vec2(snoise(pos), snoise(pos + vec3(0.0, 0.0, 1.0)));
+}
+
+float GetFireDelta(float currTime, vec2 pos, float freqMult, float stretchMult, float scrollSpeed, float evolutionSpeed)
+{
+	//firewall
+	float delta = 0.0;
+//	pos.y += (1.0 - pos.y) * 0.5;
+	//pos.y += 0.5;
+	pos.y /= stretchMult;
+	pos *= freqMult;
+	pos.y -= currTime * scrollSpeed;
+//	pos.y -= currTime * 3.0;
+
+	
+	delta += snoise(vec3(pos * 1.0, currTime * 1.0 * evolutionSpeed)) * 1.5;
+	delta += snoise(vec3(pos * 2.0, currTime * 2.0 * evolutionSpeed)) * 1.5;
+	delta += snoise(vec3(pos * 4.0, currTime * 4.0 * evolutionSpeed)) * 1.5;	
+	delta += snoise(vec3(pos * 8.0, currTime * 8.0 * evolutionSpeed)) * 1.5;
+	delta += snoise(vec3(pos * 16.0, currTime * 16.0 * evolutionSpeed)) * 0.5;
+
+	return delta;
+}
+
+vec4 GetFireAuraColor(float currTime, vec2 planarPos, float freqMult, float stretchMult, float ampMult, float power, float scrollSpeed, float paletteCoord)
+{		
+	float delta =  
+		GetFireDelta(currTime, planarPos + vec2(currTime * scrollSpeed * 0.0, 0.0), freqMult, stretchMult, 2.5, 0.5) * (1.0 - planarPos.x)	+ 
+		GetFireDelta(currTime, vec2(planarPos.x + currTime * scrollSpeed * 0.0 - 1.0, planarPos.y), freqMult, stretchMult, 2.5, 0.5) * planarPos.x;
+		
+	delta *= min(1.0, max(0.0, 1.0 * (1.0 - planarPos.y)));
+	delta *= min(1.0, max(0.0, 1.0 * (0.0 + planarPos.y)));
+
+	float verticalPos = 1.0 - planarPos.y + delta * ampMult;	
+	verticalPos = min(0.99, verticalPos);
+	verticalPos = max(0.01, verticalPos);
+	
+	return texture2D(flames, vec2(paletteCoord, verticalPos));
+}
+
+
+vec4 Uberblend(vec4 col0, vec4 col1)
+{
+//	return vec4((1.0 - col0.a) * (col1.rgb) + col0.a * (col1.rgb * col1.a + col0.rgb * (1.0 - col1.a)), min(1.0, col0.a + col1.a));
+//	return vec4((1.0 - col1.a) * (col0.rgb) + col1.a * (col1.rgb * col1.a + col0.rgb * (1.0 - col1.a)), min(1.0, col0.a + col1.a));
+	return vec4(
+		(1.0 - col0.a) * (1.0 - col1.a) * (col0.rgb * col0.a + col1.rgb * col1.a) / (col0.a + col1.a + 1e-1) +
+		(1.0 - col0.a) * (0.0 + col1.a) * (col1.rgb) +
+		(0.0 + col0.a) * (1.0 - col1.a) * (col0.rgb * (1.0 - col1.a) + col1.rgb * col1.a) +
+		(0.0 + col0.a) * (0.0 + col1.a) * (col1.rgb),
+		min(1.0, col0.a + col1.a));
+}
+
+
+void main(void)
+{
+	vec2 radius = gl_TexCoord[0].xy - vec2(0.5, 0.5);
+	float innerRadius = 0.25;
+	float outerRadius = 0.5;
+	
+	vec2 planarPos;
+	vec4 displacement = texture2D(tex, gl_TexCoord[0].xy);
+	vec2 quadCoords = gl_TexCoord[0].xy / quadSize.xy;
+	float mult = pow(quadCoords.x * (1.0 - quadCoords.x) * 4.0, 0.5);//
+	mult *= pow(min(0.5, abs(1.0 - gl_TexCoord[0].y / quadSize.y)) * 2.0, 2.0);
+
+	planarPos.x = gl_TexCoord[0].x * texSize.x * 0.004;
+	planarPos.y = displacement.a * 0.05 * sqrt(texSize.x * texSize.x + texSize.y * texSize.y) / (1e-2 + mult);// * 3.0 * (1.0 + 10.0 * pow((planarPos.x) * (1.0 - planarPos.x) * 4.0, 1.0)) / max(flameScale, 1e-3);
+	vec4 resultColor = vec4(0.0, 0.0, 0.0, 0.0);
+		
+	resultColor = GetFireAuraColor(tick / time_factor, planarPos, 6.0, 15.0 * max(flameScale, 1e-3), 1.0, 1.0, 1.0, 0.75);//texture2D(tex, gl_TexCoord[0].xy) * texture2D(flames, gl_TexCoord[0].xy) + 0.2;
+	
+	gl_FragColor = resultColor;
+	gl_FragColor.a *= alpha;
+}
\ No newline at end of file
diff --git a/game/modules/gruesome/data/rooms/pilar.lua b/game/engines/default/modules/boot/data/gfx/shaders/awesomeaura.lua
similarity index 76%
rename from game/modules/gruesome/data/rooms/pilar.lua
rename to game/engines/default/modules/boot/data/gfx/shaders/awesomeaura.lua
index f3cbf6b5a1ab612ae3b158ed16ba4228b32f42aa..ccb3495e48eaed8249688364c6f425b2dc47447c 100644
--- a/game/modules/gruesome/data/rooms/pilar.lua
+++ b/game/engines/default/modules/boot/data/gfx/shaders/awesomeaura.lua
@@ -1,4 +1,4 @@
--- ToME - Tales of Middle-Earth
+-- ToME - Tales of Maj'Eyal
 -- Copyright (C) 2009 - 2014 Nicolas Casalini
 --
 -- This program is free software: you can redistribute it and/or modify
@@ -18,9 +18,14 @@
 -- darkgod@te4.org
 
 return {
-[[#!!!!!!!!#]],
-[[!........!]],
-[[!...##...!]],
-[[!........!]],
-[[#!!!!!!!!#]],
+	frag = "awesomeaura",
+	vert = nil,
+	args = {
+		tex = { texture = 0 },
+		flames = { texture = 1 },
+		alpha = alpha or 1,
+		time_factor = time_factor or 4000,
+		flameScale = flame_scale or 1,
+	},
+	clone = false,
 }
diff --git a/game/engines/default/modules/boot/data/gfx/shaders/crystalineaura.frag b/game/engines/default/modules/boot/data/gfx/shaders/crystalineaura.frag
new file mode 100644
index 0000000000000000000000000000000000000000..55da2198d763666961bfdbc5c0b2199ab531823a
--- /dev/null
+++ b/game/engines/default/modules/boot/data/gfx/shaders/crystalineaura.frag
@@ -0,0 +1,66 @@
+uniform sampler2D displMapTex;
+uniform sampler2D normalMapTex;
+
+uniform float spikeLength;
+uniform float spikeWidth;
+uniform float spikeOffset;
+
+uniform float growthSpeed;
+
+uniform float tick;
+uniform float tick_start;
+uniform float time_factor;
+
+uniform vec3 color;
+
+uniform vec2 quadSize;
+uniform vec2 texSize;
+
+void main(void)
+{
+	vec2 radius = gl_TexCoord[0].xy - vec2(0.5, 0.5);
+	float innerRadius = 0.25;
+	float outerRadius = 0.5;
+	
+	vec4 displacement = texture2D(displMapTex, gl_TexCoord[0].xy);
+	vec2 quadCoords = gl_TexCoord[0].xy / quadSize.xy;
+	float mult = pow(quadCoords.x * (1.0 - quadCoords.x) * 4.0, 0.5);//
+	mult *= pow(min(0.5, abs(1.0 - gl_TexCoord[0].y / quadSize.y)) * 2.0, 2.0);
+
+
+	vec2 point = gl_TexCoord[0].xy;
+	float eps = 0.05;
+	vec2 basisY = vec2(0.0, 1.0);
+	vec2 basisX = vec2(1.0, 0.0);
+
+	vec2 planarPos;
+	planarPos.x = gl_TexCoord[0].x * texSize.x * 0.02 / spikeWidth + spikeOffset;
+	planarPos.y = displacement.a * 0.05 * sqrt(texSize.x * texSize.x + texSize.y * texSize.y) / (1e-2 + mult) / (spikeLength * clamp((tick - tick_start) / time_factor * growthSpeed, 0.0, 1.0) + 0.001);
+
+	vec4 normalMap = texture2D(normalMapTex, vec2(planarPos.x, clamp(1.0 - planarPos.y, 0.01, 0.99)));
+	vec3 localNormal = normalMap.rgb;
+	localNormal -= vec3(0.5, 0.5, 0.5);
+	localNormal.x = -localNormal.x;
+	localNormal.z = -localNormal.z;
+	localNormal /= length(localNormal);
+
+	vec3 globalNormal;
+	globalNormal.xy  = basisX * localNormal.x + basisY * localNormal.y;
+	globalNormal.z = localNormal.z;
+
+	vec2 lightDir2 = vec2(cos(tick / time_factor), sin(tick / time_factor));
+	float ang = 3.1415 * 0.2;
+	vec3 lightDir3 = vec3(lightDir2 * sin(ang), cos(ang));
+
+	float diffuse = clamp(-dot(lightDir3, globalNormal), 0.0, 1.0);
+	float specular = 0.0;
+	if(dot(lightDir3, globalNormal) < 0.0)
+	{
+		vec3 reflectedLight = lightDir3 - globalNormal * dot(lightDir3, globalNormal) * 2.0;
+		specular += pow(clamp(-dot(reflectedLight, vec3(0.0, 0.0, 1.0)), 0.0, 1.0), 30.0);
+	}
+	//vec3(0.624, 0.820, 0.933);
+	vec4 resultColor = vec4(color * diffuse + vec3(1.0, 1.0, 1.0) * specular, normalMap.a * gl_Color.a);
+	
+	gl_FragColor = resultColor;///
+}
\ No newline at end of file
diff --git a/game/engines/default/modules/boot/data/gfx/shaders/crystalineaura.lua b/game/engines/default/modules/boot/data/gfx/shaders/crystalineaura.lua
new file mode 100644
index 0000000000000000000000000000000000000000..38dad9c7c1d3581f9bd1bc97cb6fb8b60cb9fcfb
--- /dev/null
+++ b/game/engines/default/modules/boot/data/gfx/shaders/crystalineaura.lua
@@ -0,0 +1,41 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011, 2012, 2013 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
+
+return {
+	frag = "crystalineaura",
+	vert = nil,
+	args = {
+		displMapTex = { texture = 0 },
+		normalMapTex = { texture = 1 },
+
+		spikeLength = spikeLength or 1.0, -- 1.0 means normal length, 0.5 is half-sized spikes, 2.0 is double-sized, etc
+		spikeWidth = spikeWidth or 1.0, -- use different values for different effects. 1.0 is normal width
+		spikeOffset = spikeOffset or 0.0, -- use different values for different effects. such as offset = 0.0 for ice spikes and 0.123123 for rock spikes
+
+		growthSpeed = growthSpeed or 1.0, -- 1.0 is normal growth speed
+
+		time_factor = time_factor or 500,
+
+		color = color or {0.624, 0.820, 0.933},
+	},
+	resetargs = {
+		tick_start = function() return core.game.getTime() end,
+	},		
+	clone = false,
+}
diff --git a/game/engines/default/modules/boot/data/gfx/shaders/textoutline.frag b/game/engines/default/modules/boot/data/gfx/shaders/textoutline.frag
new file mode 100644
index 0000000000000000000000000000000000000000..fd6330c9a9635579183e7481db1b4edcd3f969d4
--- /dev/null
+++ b/game/engines/default/modules/boot/data/gfx/shaders/textoutline.frag
@@ -0,0 +1,34 @@
+uniform sampler2D tex;
+uniform vec2 textSize;
+uniform float intensity; 
+uniform vec2 outlineSize;
+uniform vec4 outlineColor;
+
+void main(void)
+{
+	float xOffset = outlineSize.x / textSize.x;
+	float yOffset = outlineSize.y / textSize.y;
+
+	gl_FragColor = texture2D(tex, gl_TexCoord[0].xy); //default text color
+
+	//sobel distance to glyph base line approximation
+	vec4 col02 = texture2D(tex, gl_TexCoord[0].xy + vec2(xOffset,  -yOffset));
+	vec4 col12 = texture2D(tex, gl_TexCoord[0].xy + vec2(xOffset,   0.0     ));
+	vec4 col22 = texture2D(tex, gl_TexCoord[0].xy + vec2(xOffset,   yOffset));
+	vec4 col01 = texture2D(tex, gl_TexCoord[0].xy + vec2(0.0,        -yOffset));
+	vec4 col21 = texture2D(tex, gl_TexCoord[0].xy + vec2(0.0,         yOffset));
+	vec4 col00 = texture2D(tex, gl_TexCoord[0].xy + vec2(-xOffset, -yOffset));
+	vec4 col10 = texture2D(tex, gl_TexCoord[0].xy + vec2(-xOffset,  0.0     ));
+	vec4 col20 = texture2D(tex, gl_TexCoord[0].xy + vec2(-xOffset,  yOffset));
+	
+	
+	float xDist = 0.0 - col00.a - col01.a * 2.0 - col02.a + col20.a + col21.a * 2.0 + col22.a;
+	float yDist = 0.0 - col00.a + col02.a - col10.a * 2.0 + col12.a * 2.0 - col20.a + col22.a;
+	
+	//transperency of current outline pixel
+	float alpha = min(1.0, sqrt(xDist * xDist + yDist * yDist) * intensity); 
+	
+	//outlineColor = vec4(0, 0, 0, 1);
+	//blending character glyph over its outline
+	gl_FragColor = (gl_FragColor * gl_FragColor.a + outlineColor * alpha * (1.0 - gl_FragColor.a)) * gl_Color;
+}
diff --git a/game/modules/gruesome/data/zones/dungeon/grids.lua b/game/engines/default/modules/boot/data/gfx/shaders/textoutline.lua
similarity index 71%
rename from game/modules/gruesome/data/zones/dungeon/grids.lua
rename to game/engines/default/modules/boot/data/gfx/shaders/textoutline.lua
index ed7f229c8b9c87db63984899d470cde108839594..dd0ec94f6e4e185e82a32a242caca247d4e07448 100644
--- a/game/modules/gruesome/data/zones/dungeon/grids.lua
+++ b/game/engines/default/modules/boot/data/gfx/shaders/textoutline.lua
@@ -1,4 +1,4 @@
--- ToME - Tales of Middle-Earth
+-- ToME - Tales of Maj'Eyal
 -- Copyright (C) 2009 - 2014 Nicolas Casalini
 --
 -- This program is free software: you can redistribute it and/or modify
@@ -17,4 +17,16 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
-load("/data/general/grids/basic.lua")
+return {
+	frag = "textoutline",
+	vert = nil,
+	args = {
+		tex = { texture = 0 },
+		textSize = textSize or {1, 1},
+		intensity = intensity or 0.5,
+		outlineSize = outlineSize or {1, 1},
+		outlineColor = outlineColor or {0, 0, 0, 1},
+	},
+	clone = false,
+	permanent = true,
+}
diff --git a/game/engines/default/modules/boot/data/gfx/twitter.png b/game/engines/default/modules/boot/data/gfx/twitter.png
index ad364c674ad358d4b41e78fd87a487c7ad87e07f..bfd27992e4e647d6eecde0bad9d91fe418116158 100644
Binary files a/game/engines/default/modules/boot/data/gfx/twitter.png and b/game/engines/default/modules/boot/data/gfx/twitter.png differ
diff --git a/game/engines/default/modules/boot/dialogs/Addons.lua b/game/engines/default/modules/boot/dialogs/Addons.lua
index 548efff18d5120cc4b44614a518446fd1259eadb..e42185a64756564e5cf0eaf5d389a3d938c028e5 100644
--- a/game/engines/default/modules/boot/dialogs/Addons.lua
+++ b/game/engines/default/modules/boot/dialogs/Addons.lua
@@ -34,8 +34,11 @@ function _M:init()
 	local url1 = Textzone.new{text="You can get new addons at #LIGHT_BLUE##{underline}#http://te4.org/addons/tome#{normal}#", auto_height=true, auto_width=true, fct=function() util.browserOpenUrl("http://te4.org/addons/tome") end}
 	local url2 = Textzone.new{text=" ", auto_height=true, auto_width=true, fct=function()end}
 	if core.steam then
-		url1 = Textzone.new{text="You can get new addons at #LIGHT_BLUE##{underline}#Steam Workshop#{normal}#", auto_height=true, auto_width=true, fct=function() util.browserOpenUrl("http://steamcommunity.com/app/"..core.steam.appid().."/workshop/ ") end}
-		url2 = Textzone.new{text=" or at #LIGHT_BLUE##{underline}#http://te4.org/addons/tome#{normal}#", auto_height=true, auto_width=true, fct=function() util.browserOpenUrl("http://te4.org/addons/tome") end}
+		url1 = Textzone.new{text="You can get new addons at #LIGHT_BLUE##{underline}#Steam Workshop#{normal}#", auto_height=true, auto_width=true, fct=function() util.browserOpenUrl("http://steamcommunity.com/app/"..core.steam.appid().."/workshop/", {webview=true}) end}
+		url2 = Textzone.new{text=" or at #LIGHT_BLUE##{underline}#http://te4.org/addons/tome#{normal}#", auto_height=true, auto_width=true, fct=function()
+			local method, d = util.browserOpenUrl("http://te4.org/addons/tome", {steam=true})
+			if method == "webview" and d then d.unload = function() self:regen() end end
+		end}
 	end
 
 	self.c_compat = Checkbox.new{default=false, width=math.floor(self.iw / 3 - 40), title="Show incompatible", on_change=function() self:switch() end}
@@ -82,6 +85,13 @@ function _M:init()
 	}
 end
 
+function _M:regen()
+	local d = new()
+	d.__showup = false
+	game:replaceDialog(self, d)
+	self.next_dialog = d
+end
+
 function _M:select(item)
 	if item and item.adds and self.c_adds then
 		self.c_adds:setList(item.adds)
diff --git a/game/engines/default/modules/boot/dialogs/Credits.lua b/game/engines/default/modules/boot/dialogs/Credits.lua
new file mode 100644
index 0000000000000000000000000000000000000000..c53a32def67aee219108aedcccd43e6b3d50a8fe
--- /dev/null
+++ b/game/engines/default/modules/boot/dialogs/Credits.lua
@@ -0,0 +1,279 @@
+-- TE4 - T-Engine 4
+-- Copyright (C) 2009 - 2014 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 Shader = require "engine.Shader"
+
+module(..., package.seeall, class.inherit(Dialog))
+
+__show_only = true
+
+local title_font = core.display.newFont("/data/font/DroidSans-Bold.ttf", 32)
+local aura = {
+	Shader.new("awesomeaura", {flameScale=0.6, time_factor=8000}),
+	Shader.new("awesomeaura", {flameScale=0.6, time_factor=8000}),
+--	Shader.new("crystalineaura", {time_factor=8000}),
+}
+local aura_texture = {
+	core.display.loadImage("/data/gfx/flame_credits.png"):glTexture(),
+	core.display.loadImage("/data/gfx/spikes_credits.png"):glTexture(),
+}
+local fallback_colors = {
+	colors.GOLD,
+	colors.FIREBRICK,
+}
+local outline = Shader.new("textoutline", {})
+
+local credits = {
+	{img="/data/gfx/background/tome-logo.png"},
+	false,
+	{"Project Lead", title=1},
+	{"Nicolas 'DarkGod' Casalini"},
+	false,
+	false,
+
+	{"Lead Coder", title=2},
+	{"Nicolas 'DarkGod' Casalini"},
+	false,
+	false,
+
+	{"World Builders", title=1},
+	{"Aaron 'Sage Acrin' Vandegrift"},
+	{"Chris 'Shibari' Davidson"},
+	{"Em 'Susramanian' Jay"},
+	{"Eric 'Edge2054' Wykoff"},
+	{"Evan 'Fortescue' Williams"},
+	{"Hetdegon"},
+	{"John 'Benli' Truchard"},
+	{"Shoob"},
+	{"Taylor 'PureQuestion' Miller"},
+	{"Thomas 'Tomisgo' Cretan"},
+	false,
+	false,
+
+	{"Graphic Artists", title=2},
+	{"Assen 'Rexorcorum' Kanev"},
+	{"Raymond 'Shockbolt' Gaustadnes"},
+	{"Ross 'Daftigod' Raphael"},
+	false,
+	false,
+
+	{"Expert Shaders Design", title=1},
+	{"Alex 'Suslik' Sannikov"},
+	false,
+	false,
+
+	{"Soundtracks", title=2},
+	{"Anne van Schothorst"},
+	{"Carlos Saura"},
+	{"Matti Paalanen - 'Celestial Aeon Project'"},
+	false,
+	false,
+
+	{"Sound Designer", title=1},
+	{"Kenneth 'Elvisman2001' Toomey"},
+	{"Ryan Sim"},
+	false,
+	false,
+
+	{"Lore Creation and Writing", title=2},
+	{"Burb Lulls"},
+	{"Darren Grey"},
+	{"Gwai"},
+	{"Nicolas 'DarkGod' Casalini"},
+	{"Ron Billingsley"},
+	false,
+	false,
+
+	{"Code Helpers", title=1},
+	{"Antagonist"},
+	{"Graziel"},
+	{"Hachem Muche"},
+	{"Jules 'Quicksilver' Bean"},
+	{"Madmonk"},
+	{"Neil Stevens"},
+	{"Shani"},
+	{"Shibari"},
+	{"Tiger Eye"},
+	{"Yufra"},
+	false,
+	false,
+
+	{"Community Managers", title=2},
+	{"Aura of the Dawn"},
+	{"Faeryan"},
+	{"Lord Xandor"},
+	{"Michael 'Dekar' Olscher"},
+	{"Reenen 'Canderel' Laurie"},
+	{"The Revanchist"},
+	{"Yottle"},
+	false,
+	false,
+
+	{"Text Editors", title=1},
+	{"Brian Jeffears"},
+	{"Greg Wooledge"},
+	{"Ralph Versteegen"},
+	false,
+	false,
+
+	{"The Community", title=2},
+	{"A huge global thank to all members"},
+	{"of the community, for being supportive,"},
+	{"fun and full of great ideas."},
+	{"You rock gals and guys!"},
+	false,
+	false,
+
+	{"Others", title=1},
+	{"J.R.R Tolkien - making the world an interesting place"},
+	false,
+	{"Lua Creators - making the world a better place"},
+	{"Lua - http://lua.org/"},
+	{"LibSDL - http://libsdl.org/"},
+	{"OpenGL - http://www.opengl.org/"},
+	{"OpenAL - http://kcat.strangesoft.net/openal.html"},
+	{"zlib - http://www.zlib.net/"},
+	{"LuaJIT - http://luajit.org/"},
+	{"lpeg - http://www.inf.puc-rio.br/~roberto/lpeg/"},
+	{"LuaSocket - http://w3.impa.br/~diego/software/luasocket/"},
+	{"Physfs - https://icculus.org/physfs/"},
+	{"Awesomium - http://awesomium.com/"},
+	{"Font: Droid - http://www.droidfonts.com/"},
+	{"Font: Vera - http://www.gnome.org/fonts/"},
+	{"Font: INSULA, USENET: http://www.dafont.com/fr/apostrophic-labs.d128"},
+	{"Font: SVBasicManual: http://www.dafont.com/fr/johan-winge.d757"},
+	{"Font FSEX300: http://www.fixedsysexcelsior.com/"},
+	{"Font: square: http://strlen.com/square"},
+}
+
+function _M:init()
+	Dialog.init(self, "", game.w, game.h, nil, nil, nil, nil, false, "invisible")
+
+	self:loadUI{}
+	self:setupUI(false, false)
+
+	self.key:addBinds{
+		EXIT = function() game:unregisterDialog(self) end,
+	}
+
+	self.list = { self:makeEntry(credits[1]) }
+	self.next_credit = 2
+end
+
+function _M:makeLogo(img)
+	local txt = {y=game.h}
+	local i, w, h = core.display.loadImage(img)
+	txt._tex, txt._tex_w, txt._tex_h = i:glTexture()
+	txt.w, txt.h = w, h
+	txt.step_h = h
+	txt.offset_y = 0
+	txt.img = true
+	return txt
+end
+
+function _M:makeEntry(credit)
+	if not credit then return {none=true, y=game.h, h=32, step_h=32, offset_y=0} end
+
+	if credit.img then return self:makeLogo(credit.img) end
+
+	local txt
+	if credit.title then
+		local w, h = title_font:size(credit[1]) + 20, 32 * 2
+		local s = core.display.newSurface(w, h)
+		s:alpha(0)
+		s:drawStringBlended(title_font, credit[1], 10, 16, 255, 255, 255, false)
+		txt = {title=credit.title}
+		txt.w, txt.h = w, h
+		txt._tex, txt._tex_w, txt._tex_h = s:glTexture()
+		txt._texf = txt._tex:generateSDM(false)
+		txt.step_h = txt.h
+		txt.offset_y = 0
+	else
+		local w, h = title_font:size(credit[1]) + 20, 36
+		local s = core.display.newSurface(w, h)
+		s:alpha(0)
+		s:drawStringBlended(title_font, credit[1], 10, 0, 255, 255, 255, false)
+		txt = {}
+		txt.w, txt.h = w, h
+		txt._tex, txt._tex_w, txt._tex_h = s:glTexture()
+		txt.step_h = 32
+		txt.offset_y = 0
+	end
+	txt.y = game.h
+	return txt
+end
+
+function _M:displayCredit(txt, x, y)
+	if txt.none then return end
+	local x, y = x + (game.w - txt.w) / 2, y + txt.y - txt.offset_y
+	if aura[1].shad and aura[2].shad then
+		if txt.title then
+			aura_texture[txt.title]:bind(1)
+			aura[txt.title].shad:use(true)
+			if aura[txt.title].shad.uniQuadSize then aura[txt.title].shad:uniQuadSize(txt.w/txt._tex_w, txt.h/txt._tex_h) end
+			if aura[txt.title].shad.uniTexSize then aura[txt.title].shad:uniTexSize(txt._tex_w, txt._tex_h) end
+			txt._texf:toScreenPrecise(x, y, txt.w, txt.h, 0, txt.w/txt._tex_w, 0, txt.h/txt._tex_h)
+			aura[txt.title].shad:use(false)
+
+			outline.shad:use(true)
+			outline.shad:uniOutlineSize(0.7, 0.7)
+			outline.shad:uniTextSize(txt._tex_w, txt._tex_h)
+			txt._tex:toScreenFull(x, y, txt.w, txt.h, txt._tex_w, txt._tex_h)
+			outline.shad:use(false)
+		else
+			outline.shad:use(true)
+			outline.shad:uniOutlineSize(0.7, 0.7)
+			outline.shad:uniTextSize(txt._tex_w, txt._tex_h)
+			txt._tex:toScreenFull(x, y, txt.w, txt.h, txt._tex_w, txt._tex_h)
+			outline.shad:use(false)
+		end
+	else
+		if not txt.img then txt._tex:toScreenFull(x + 3, y + 3, txt.w, txt.h, txt._tex_w, txt._tex_h, 0, 0, 0, 1) end
+		if txt.title and not txt.img then
+			local c = fallback_colors[txt.title]
+			txt._tex:toScreenFull(x, y, txt.w, txt.h, txt._tex_w, txt._tex_h, c.r/255, c.g/255, c.b/255, 1)
+		else
+			txt._tex:toScreenFull(x, y, txt.w, txt.h, txt._tex_w, txt._tex_h)
+		end
+	end
+end
+
+function _M:innerDisplay(x, y, nb_keyframes)
+	for i = #self.list, 1, -1 do
+		local txt = self.list[i]
+		self:displayCredit(txt, x, y)
+
+		txt.y = txt.y - nb_keyframes * 1.5
+		if i == #self.list and txt.y < game.h then
+			if credits[self.next_credit] ~= nil then
+				local t = self:makeEntry(credits[self.next_credit])
+				self.next_credit = self.next_credit + 1
+				t.y = txt.y + txt.step_h
+				table.insert(self.list, t)
+			end
+			if #self.list == 1 and credits[self.next_credit] == nil then
+				game:unregisterDialog(self)
+			end
+		elseif i == 1 and txt.y + txt.h < 0 then
+			table.remove(self.list, 1)
+		end
+	end
+end
diff --git a/game/engines/default/modules/boot/dialogs/MainMenu.lua b/game/engines/default/modules/boot/dialogs/MainMenu.lua
index de2e954200a5f1bd4bcb6b2c343c463fe41168db..a7750e24d8d81087e8c19befa2f4c63d5437af4d 100644
--- a/game/engines/default/modules/boot/dialogs/MainMenu.lua
+++ b/game/engines/default/modules/boot/dialogs/MainMenu.lua
@@ -54,8 +54,11 @@ function _M:init()
 		local menu = require("engine.dialogs.GameMenu").new(list)
 		game:registerDialog(menu)
 	end}
+	l[#l+1] = {name="Credits", fct=function() game:registerDialog(require("mod.dialogs.Credits").new()) end}
 	l[#l+1] = {name="Exit", fct=function() game:onQuit() end}
 	if config.settings.cheat then l[#l+1] = {name="Reboot", fct=function() util.showMainMenu() end} end
+	if config.settings.cheat then l[#l+1] = {name="webtest", fct=function() util.browserOpenUrl("http://google.com/") end} end
+--	if config.settings.cheat then l[#l+1] = {name="webtest", fct=function() util.browserOpenUrl("asset://te4/html/test.html") end} end
 
 	self.c_background = Button.new{text=game.stopped and "Enable background" or "Disable background", fct=function() self:switchBackground() end}
 	self.c_version = Textzone.new{auto_width=true, auto_height=true, text=("#{bold}##B9E100#T-Engine4 version: %d.%d.%d"):format(engine.version[1], engine.version[2], engine.version[3])}
@@ -75,6 +78,12 @@ function _M:init()
 		{right=0, bottom=0, absolute=true, ui=self.c_twitter},
 	}
 
+	if core.webview and game.webtooltip then
+		self.c_tooltip = game.webtooltip
+		self.base_uis[#self.base_uis+1] = {left=9, top=9, absolute=true, ui=self.c_tooltip}
+
+	end
+
 	self:updateUI()	
 end
 
diff --git a/game/engines/default/modules/boot/dialogs/NewGame.lua b/game/engines/default/modules/boot/dialogs/NewGame.lua
index ea57973b372484b3a03d8695b9177eb0a33e5c97..ac35a0bac98b9c5c2fda73066a4761130627c582 100644
--- a/game/engines/default/modules/boot/dialogs/NewGame.lua
+++ b/game/engines/default/modules/boot/dialogs/NewGame.lua
@@ -36,9 +36,11 @@ function _M:init()
 	self.c_switch = Checkbox.new{default=false, width=math.floor(self.iw / 3 - 40), title="Show all versions", on_change=function() self:switch() end}
 	self.c_compat = Checkbox.new{default=false, width=math.floor(self.iw / 3 - 40), title="Show incompatible", on_change=function() self:switch() end}
 
+	local url = Textzone.new{text="You can get new games at #LIGHT_BLUE##{underline}#http://te4.org/games#{normal}#", auto_height=true, auto_width=true, fct=function() util.browserOpenUrl("http://te4.org/games") end}
+
 	self:generateList()
 
-	self.c_list = ListColumns.new{width=math.floor(self.iw / 3 - 10), height=self.ih - 10 - self.c_switch.h - self.c_compat.h, scrollbar=true, columns={
+	self.c_list = ListColumns.new{width=math.floor(self.iw / 3 - 10), height=self.ih - 10 - self.c_switch.h - self.c_compat.h - url.h, scrollbar=true, columns={
 		{name="Game Module", width=80, display_prop="name"},
 		{name="Version", width=20, display_prop="version_txt"},
 	}, list=self.list, fct=function(item) end, select=function(item, sel) self:select(item) end}
@@ -47,8 +49,9 @@ function _M:init()
 	self:loadUI{
 		{left=0, top=0, ui=self.c_list},
 		{left=self.c_list.w+sep.w, top=0, ui=self.c_desc},
-		{left=0, bottom=self.c_compat.h, ui=self.c_switch},
-		{left=0, bottom=0, ui=self.c_compat},
+		{left=0, bottom=url.h+self.c_compat.h, ui=self.c_switch},
+		{left=0, bottom=url.h, ui=self.c_compat},
+		{left=0, bottom=0, ui=url},
 		{left=self.c_list.w + 5, top=5, ui=sep},
 	}
 	self:setFocus(self.c_list)
@@ -62,7 +65,17 @@ function _M:init()
 end
 
 function _M:on_register()
-	if #self.list == 1 and not self.has_incompatible then
+	if
+		#self.list == 1 and
+		not self.has_incompatible and
+		(
+			not profile or
+			not profile.generic or
+			not profile.generic.modules_played or
+			not profile.generic.modules_played.tome or
+			profile.generic.modules_played.tome < 5 * 60 * 60
+		)
+	then
 		game:unregisterDialog(self)
 		self.list[1]:fct()
 	end
diff --git a/game/modules/gruesome/ai/adventurer.lua b/game/modules/gruesome/ai/adventurer.lua
deleted file mode 100644
index 8f1b9e09fd6cb0436c1a43a4f08977fdb431af0d..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/ai/adventurer.lua
+++ /dev/null
@@ -1,44 +0,0 @@
--- ToME - Tales of Maj'Eyal
--- Copyright (C) 2009 - 2014 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
-
-local dirs = {
-	[1] = {2},
-	[2] = {3},
-	[3] = {6},
-	[4] = {1},
-	[6] = {9},
-	[7] = {4},
-	[8] = {7},
-	[9] = {8},
-}
-
-newAI("adventurer", function(self)
-	-- Creature will randomly either spin or move.  Chance of each can
-	-- be varied.  Currently set based on light range, so that enemies
-	-- with longer ranges are more likely to turn, whilst short-sighted
-	-- enemies move around more.
-	if rng.chance(self.lite) then
-		self:moveDir(rng.table{1,2,3,4,6,7,8,9})
-	else
-		self.dir = rng.table(dirs[self.dir])
-		game.level.map.changed = true
-		self:useEnergy()
-	end
-	return true
-end)
diff --git a/game/modules/gruesome/class/Actor.lua b/game/modules/gruesome/class/Actor.lua
deleted file mode 100644
index 8fc8f9dfddbadd93a4502fe0966c9cb735442c29..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/class/Actor.lua
+++ /dev/null
@@ -1,234 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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"
-require "engine.Actor"
-require "engine.Autolevel"
-require "engine.interface.ActorTemporaryEffects"
-require "engine.interface.ActorLife"
-require "engine.interface.ActorProject"
-require "engine.interface.ActorTalents"
-require "engine.interface.ActorResource"
-require "engine.interface.ActorFOV"
-require "mod.class.interface.Combat"
-local Map = require "engine.Map"
-
-module(..., package.seeall, class.inherit(
-	engine.Actor,
-	engine.interface.ActorTemporaryEffects,
-	engine.interface.ActorLife,
-	engine.interface.ActorProject,
-	engine.interface.ActorTalents,
-	engine.interface.ActorResource,
-	engine.interface.ActorFOV,
-	mod.class.interface.Combat
-))
-
-function _M:init(t, no_default)
-	-- Default regen
-	t.max_shadow = 2
-	t.max_lurk = 2
-
-	engine.Actor.init(self, t, no_default)
-	engine.interface.ActorTemporaryEffects.init(self, t)
-	engine.interface.ActorLife.init(self, t)
-	engine.interface.ActorProject.init(self, t)
-	engine.interface.ActorTalents.init(self, t)
-	engine.interface.ActorResource.init(self, t)
-	engine.interface.ActorFOV.init(self, t)
-
-	self:incShadow(1000)
-	self:incLurk(1000)
-end
-
-function _M:act()
-	if not engine.Actor.act(self) then return end
-
-	self.changed = true
-
-	-- Cooldown talents
-	self:cooldownTalents()
-	-- Regen resources
-	self:regenLife()
-	self:regenResources()
-	-- Compute timed effects
-	self:timedEffects()
-
-	-- Still enough energy to act ?
-	if self.energy.value < game.energy_to_act then return false end
-
-	return true
-end
-
-function _M:move(x, y, force)
-	local moved = false
-	if force or self:enoughEnergy() then
-		moved = engine.Actor.move(self, x, y, force)
-		if not force and moved and not self.did_energy then self:useEnergy() end
-	end
-	self.did_energy = nil
-	return moved
-end
-
-function _M:tooltip()
-	return ([[%s%s]]):format(
-	self:getDisplayString(),
-	self.name
-	)
-end
-
-function _M:onTakeHit(value, src)
-	return value
-end
-
-function _M:die(src)
-	engine.interface.ActorLife.die(self, src)
-
-	game.level.map:particleEmitter(self.x, self.y, 1, "blood")
-	if src.player then
-		src.kills = src.kills + 1
-		if not self:attr("blind") then src.lurkkills = src.lurkkills + 1 end
-
-		src.max_shadow = math.floor((src.kills + src.lurkkills * 2) / 8) + 3
-		src.max_lurk = math.floor((src.kills + src.lurkkills * 2) / 10) + 2
-		if src.kills > 59 then src.max_lurk = src.max_lurk - 1 end
-		if src.kills + src.lurkkills * 2 > 50 then src.sight = 9 end
-		src:incShadow(2 + (self:attr("blind") and 0 or 2))
-		src.changed = true
-	end
-
-	return true
-end
-
-function _M:attack(target)
-	self:bumpInto(target)
-end
-
-
---- Called before a talent is used
--- Check the actor can cast it
--- @param ab the talent (not the id, the table)
--- @return true to continue, false to stop
-function _M:preUseTalent(ab, silent)
-	if not self:enoughEnergy() then print("fail energy") return false end
-
-	if ab.mode == "sustained" then
-		if ab.sustain_shadow and self.max_shadow < ab.sustain_shadow and not self:isTalentActive(ab.id) then
-			game.logPlayer(self, "You do not have enough shadow to activate %s.", ab.name)
-			return false
-		end
-	else
-		if ab.shadow and self:getShadow() < ab.shadow then
-			game.logPlayer(self, "You do not have enough shadow to cast %s.", ab.name)
-			return false
-		end
-	end
-
-	if not silent then
-		-- Allow for silent talents
-		if ab.message ~= nil then
-			if ab.message then
-				game.logSeen(self, "%s", self:useTalentMessage(ab))
-			end
-		elseif ab.mode == "sustained" and not self:isTalentActive(ab.id) then
-			game.logSeen(self, "%s activates %s.", self.name:capitalize(), ab.name)
-		elseif ab.mode == "sustained" and self:isTalentActive(ab.id) then
-			game.logSeen(self, "%s deactivates %s.", self.name:capitalize(), ab.name)
-		else
-			game.logSeen(self, "%s uses %s.", self.name:capitalize(), ab.name)
-		end
-	end
-	return true
-end
-
---- Called before a talent is used
--- Check if it must use a turn, mana, stamina, ...
--- @param ab the talent (not the id, the table)
--- @param ret the return of the talent action
--- @return true to continue, false to stop
-function _M:postUseTalent(ab, ret)
-	if not ret then return end
-
-	self:useEnergy()
-
-	if ab.mode == "sustained" then
-		if not self:isTalentActive(ab.id) then
-			if ab.sustain_shadow then
-				self.max_shadow = self.max_shadow - ab.sustain_shadow
-			end
-		else
-			if ab.sustain_shadow then
-				self.max_shadow = self.max_shadow + ab.sustain_shadow
-			end
-		end
-	else
-		if ab.shadow then
-			self:incShadow(-ab.shadow)
-		end
-	end
-
-	return true
-end
-
---- Return the full description of a talent
--- You may overload it to add more data (like shadow usage, ...)
-function _M:getTalentFullDescription(t)
-	local d = {}
-
-	if t.mode == "passive" then d[#d+1] = "#6fff83#Use mode: #00FF00#Passive"
-	elseif t.mode == "sustained" then d[#d+1] = "#6fff83#Use mode: #00FF00#Sustained"
-	else d[#d+1] = "#6fff83#Use mode: #00FF00#Activated"
-	end
-
-	if t.shadow or t.sustain_shadow then d[#d+1] = "#6fff83#Shadow Power cost: #7fffd4#"..(t.shadow or t.sustain_shadow) end
-	if self:getTalentRange(t) > 1 then d[#d+1] = "#6fff83#Range: #FFFFFF#"..self:getTalentRange(t)
-	else d[#d+1] = "#6fff83#Range: #FFFFFF#melee/personal"
-	end
-	if t.cooldown then d[#d+1] = "#6fff83#Cooldown: #FFFFFF#"..t.cooldown end
-
-	return table.concat(d, "\n").."\n#6fff83#Description: #FFFFFF#"..t.info(self, t)
-end
-
---- Can the actor see the target actor
--- This does not check LOS or such, only the actual ability to see it.<br/>
--- Check for telepathy, invisibility, stealth, ...
-function _M:canSee(actor, def, def_pct)
-	if not actor then return false, 0 end
-
-	-- Check for stealth. Checks against the target cunning and level
-	if actor:attr("stealth") and actor ~= self then
-		local def = self.level / 2 + self:getCun(25)
-		local hit, chance = self:checkHit(def, actor:attr("stealth") + (actor:attr("inc_stealth") or 0), 0, 100)
-		if not hit then
-			return false, chance
-		end
-	end
-
-	if def ~= nil then
-		return def, def_pct
-	else
-		return true, 100
-	end
-end
-
---- Can the target be applied some effects
--- @param what a string describing what is being tried
-function _M:canBe(what)
-	return true
-end
diff --git a/game/modules/gruesome/class/Game.lua b/game/modules/gruesome/class/Game.lua
deleted file mode 100644
index c05f5001a6f39803b38b096424be2e7d109652ea..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/class/Game.lua
+++ /dev/null
@@ -1,363 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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"
-require "engine.GameTurnBased"
-require "engine.interface.GameTargeting"
-require "engine.KeyBind"
-local Savefile = require "engine.Savefile"
-local DamageType = require "engine.DamageType"
-local Zone = require "engine.Zone"
-local Map = require "engine.Map"
-local Level = require "engine.Level"
-local Birther = require "engine.Birther"
-
-local PlayerDisplay = require "mod.class.PlayerDisplay"
-local Grid = require "mod.class.Grid"
-local Actor = require "mod.class.Actor"
-local Player = require "mod.class.Player"
-local NPC = require "mod.class.NPC"
-
-local LogFlasher = require "engine.LogFlasher"
-local DebugConsole = require "engine.DebugConsole"
-local FlyingText = require "engine.FlyingText"
-local Tooltip = require "engine.Tooltip"
-local MapMenu = require "mod.dialogs.MapMenu"
-
-local QuitDialog = require "mod.dialogs.Quit"
-
-module(..., package.seeall, class.inherit(engine.GameTurnBased, engine.interface.GameTargeting))
-
-function _M:init()
-	engine.GameTurnBased.init(self, engine.KeyBind.new(), 1000, 100)
-
-	-- Pause at birth
-	self.paused = true
-
-	-- Same init as when loaded from a savefile
-	self:loaded()
-end
-
-function _M:run()
-	self.flash = LogFlasher.new(0, 0, self.w, 20, nil, nil, nil, {255,255,255}, {0,0,0})
-	self.player_display = PlayerDisplay.new()
-	self.tooltip = Tooltip.new(nil, nil, {255,255,255}, {30,30,30})
-	self.flyers = FlyingText.new()
-	self:setFlyingText(self.flyers)
-
-	self.log = function(style, ...) if type(style) == "number" then self.flash(style, ...) else self.flash(self.flash.NEUTRAL, style, ...) end end
-	self.logSeen = function(e, style, ...) if e and self.level.map.seens(e.x, e.y) then self.log(style, ...) end end
-	self.logPlayer = function(e, style, ...) if e == self.player then self.log(style, ...) end end
-
-	self.log(self.flash.GOOD, "Welcome to #GREY##{bold}#Gruesome!#{normal}#")
-
-	-- Setup inputs
-	self:setupCommands()
-	self:setupMouse()
-
-	-- Starting from here we create a new game
-	if not self.player then self:newGame() end
-
-	-- Setup the targetting system
-	engine.interface.GameTargeting.init(self)
-
-	-- Ok everything is good to go, activate the game in the engine!
-	self:setCurrent()
-
-	if self.level then self:setupDisplayMode() self:onTurn() end
-end
-
-function _M:newGame()
-	self.player = Player.new{name=self.player_name, game_ender=true}
-	Map:setViewerActor(self.player)
-	self:setupDisplayMode()
-
-	self.creating_player = true
-	local birth = Birther.new(nil, self.player, {"base"}, function()
-		self:changeLevel(20, "dungeon")
-		print("[PLAYER BIRTH] resolve...")
-		self.player:resolve()
-		self.player:resolve(nil, true)
-		self.player.energy.value = self.energy_to_act
-		self.paused = true
-		self.creating_player = false
-		self:onTurn()
-		print("[PLAYER BIRTH] resolved!")
-	end)
-	self:registerDialog(birth)
-end
-
-function _M:loaded()
-	engine.GameTurnBased.loaded(self)
-	Zone:setup{npc_class="mod.class.NPC", grid_class="mod.class.Grid", }
-	Map:setViewerActor(self.player)
-	Map:setViewPort(0, 20, self.w, math.floor(self.h * 0.80) - 20, 12, 16, "/data/font/FSEX300.ttf", 16, true)
-	self.key = engine.KeyBind.new()
-end
-
-function _M:setupDisplayMode()
-	Map:setViewPort(0, 20, self.w, math.floor(self.h * 0.80) - 20, 12, 16, "/data/font/FSEX300.ttf", 16, true)
-	Map:resetTiles()
-	Map.tiles.use_images = false
-
-	if self.level then
-		self.level.map:recreate()
-		engine.interface.GameTargeting.init(self)
-		self.level.map:moveViewSurround(self.player.x, self.player.y, 8, 8)
-	end
-end
-
-function _M:save()
-	return class.save(self, self:defaultSavedFields{}, true)
-end
-
-function _M:getSaveDescription()
-	return {
-		name = self.player.name,
-		description = ([[Exploring level %d of %s.]]):format(self.level.level, self.zone.name),
-	}
-end
-
-function _M:leaveLevel(level, lev, old_lev)
-	if level:hasEntity(self.player) then
-		level.exited = level.exited or {}
-		if lev > old_lev then
-			level.exited.down = {x=self.player.x, y=self.player.y}
-		else
-			level.exited.up = {x=self.player.x, y=self.player.y}
-		end
-		level.last_turn = game.turn
-		level:removeEntity(self.player)
-	end
-end
-
-function _M:changeLevel(lev, zone)
-	local old_lev = (self.level and not zone) and self.level.level or -1000
-	if zone then
-		if self.zone then
-			self.zone:leaveLevel(false, lev, old_lev)
-			self.zone:leave()
-		end
-		if type(zone) == "string" then
-			self.zone = Zone.new(zone)
-		else
-			self.zone = zone
-		end
-	end
-	self.zone:getLevel(self, lev, old_lev)
-
-	if lev > old_lev then
-		self.player:move(self.level.default_up.x, self.level.default_up.y, true)
-	else
-		self.player:move(self.level.default_down.x, self.level.default_down.y, true)
-	end
-	self.level:addEntity(self.player)
-end
-
-function _M:getPlayer()
-	return self.player
-end
-
-function _M:tick()
-	if self.level then
-		self:targetOnTick()
-
-		engine.GameTurnBased.tick(self)
-		-- Fun stuff: this can make the game realtime, although calling it in display() will make it work better
-		-- (since display is on a set FPS while tick() ticks as much as possible
-		-- engine.GameEnergyBased.tick(self)
-	end
-	-- When paused (waiting for player input) we return true: this means we wont be called again until an event wakes us
-	if self.paused and not savefile_pipe.saving then return true end
-end
-
---- Called every game turns
--- Does nothing, you can override it
-function _M:onTurn()
-	-- The following happens only every 10 game turns (once for every turn of 1 mod speed actors)
-	if self.turn % 10 ~= 0 then return end
-
-	-- Process overlay effects
-	self.level.map:processEffects()
-end
-
-function _M:display(nb_keyframe)
-	-- If switching resolution, blank everything but the dialog
-	if self.change_res_dialog then engine.GameTurnBased.display(self, nb_keyframe) return end
-
-	-- Now the map, if any
-	if self.level and self.level.map and self.level.map.finished then
-		if self.level.map.changed then
-			-- Clean FOV before computing it
-			self.level.map:cleanFOV()
-			self.player:playerFOV()
-			for uid, a in pairs(game.level.entities) do
-				if a ~= self.player and not a:attr("blind") then
-					-- Compute both the normal and the lite FOV, using cache
-					a:computeFOVBeam(a.lite, a.dir, a.angle, "block_sight", function(x, y, dx, dy, sqdist)
-						if self.level.map.seens(x, y) then
-							self.level.map:applyLite(x, y, 1)
-							if self.level.map(x, y, Map.ACTOR) == self.player then
-								self.player:takeHit(1, a)
-							end
-						end
-					end, true, false, true)
-				end
-			end
-		end
-
-		self.level.map:display(nil, nil, nb_keyframe)
-
-		-- Display the targetting system if active
-		self.target:display()
-	end
-
-	-- We display the player's interface
-	self.flash:toScreen(nb_keyframe)
-	self.player_display:toScreen()
-	if self.player then self.player.changed = false end
-
-	-- Tooltip is displayed over all else
-	self:targetDisplayTooltip(self.w, self.h)
-
-	engine.GameTurnBased.display(self, nb_keyframe)
-end
-
---- Setup the keybinds
-function _M:setupCommands()
-	-- Make targeting work
-	self.normal_key = self.key
-	self:targetSetupKey()
-
-	-- One key handled for normal function
-	self.key:addBinds
-	{
-		-- Movements
-		MOVE_LEFT = function() self.player:moveDir(4) end,
-		MOVE_RIGHT = function() self.player:moveDir(6) end,
-		MOVE_UP = function() self.player:moveDir(8) end,
-		MOVE_DOWN = function() self.player:moveDir(2) end,
-		MOVE_LEFT_UP = function() self.player:moveDir(7) end,
-		MOVE_LEFT_DOWN = function() self.player:moveDir(1) end,
-		MOVE_RIGHT_UP = function() self.player:moveDir(9) end,
-		MOVE_RIGHT_DOWN = function() self.player:moveDir(3) end,
-		MOVE_STAY = function() self.player:useEnergy() end,
-
-		RUN_LEFT = function() self.player:runInit(4) end,
-		RUN_RIGHT = function() self.player:runInit(6) end,
-		RUN_UP = function() self.player:runInit(8) end,
-		RUN_DOWN = function() self.player:runInit(2) end,
-		RUN_LEFT_UP = function() self.player:runInit(7) end,
-		RUN_LEFT_DOWN = function() self.player:runInit(1) end,
-		RUN_RIGHT_UP = function() self.player:runInit(9) end,
-		RUN_RIGHT_DOWN = function() self.player:runInit(3) end,
-
-		-- Hotkeys
-		HOTKEY_1 = function() self.player:activateHotkey(1) end,
-		HOTKEY_2 = function() self.player:activateHotkey(2) end,
-		HOTKEY_3 = function() self.player:activateHotkey(3) end,
-
-		-- Actions
-		CHANGE_LEVEL = function()
-			local e = self.level.map(self.player.x, self.player.y, Map.TERRAIN)
-			if self.player:enoughEnergy() and e.change_level then
-				self:changeLevel(e.change_zone and e.change_level or self.level.level + e.change_level, e.change_zone)
-			else
-				self.log("There is no way out of this level here.")
-			end
-		end,
-
-		USE_TALENTS = function()
-			self.player:useTalents()
-		end,
-
-		SAVE_GAME = function()
-			self:saveGame()
-		end,
-
-		-- Exit the game
-		QUIT_GAME = function()
-			self:onQuit()
-		end,
-
-		EXIT = function()
-			local menu menu = require("engine.dialogs.GameMenu").new{
-				"resume",
-				"keybinds",
-				"video",
-				"save",
-				"quit"
-			}
-			self:registerDialog(menu)
-		end,
-
-		-- Lua console, you probably want to disable it for releases
-		LUA_CONSOLE = function()
-			self:registerDialog(DebugConsole.new())
-		end,
-
-		LOOK_AROUND = function()
-			self.flash:empty(true)
-			self.flash(self.flash.GOOD, "Looking around... (direction keys to select interesting things, shift+direction keys to move freely)")
-			local co = coroutine.create(function() self.player:getTarget{type="hit", no_restrict=true, range=2000} end)
-			local ok, err = coroutine.resume(co)
-			if not ok and err then print(debug.traceback(co)) error(err) end
-		end,
-	}
-	self.key:setCurrent()
-end
-
-function _M:setupMouse(reset)
-	if reset then self.mouse:reset() end
-	self.mouse:registerZone(Map.display_x, Map.display_y, Map.viewport.width, Map.viewport.height, function(button, mx, my, xrel, yrel, bx, by, event)
-		-- Handle targeting
-		if self:targetMouse(button, mx, my, xrel, yrel, event) then return end
-
-		-- Handle Use menu
-		if button == "right" and not xrel and not yrel and event == "button" then self:mouseRightClick(mx, my) return end
-
-		-- Handle the mouse movement/scrolling
-		self.player:mouseHandleDefault(self.key, self.key == self.normal_key, button, mx, my, xrel, yrel, event)
-	end)
-	self.mouse:setCurrent()
-end
-
---- Right mouse click on the map
-function _M:mouseRightClick(mx, my)
-	local tmx, tmy = self.level.map:getMouseTile(mx, my)
-	self:registerDialog(MapMenu.new(mx, my, tmx, tmy))
-end
-
-
---- Ask if we really want to close, if so, save the game first
-function _M:onQuit()
-	self.player:restStop()
-
-	if not self.quit_dialog then
-		self.quit_dialog = QuitDialog.new()
-		self:registerDialog(self.quit_dialog)
-	end
-end
-
---- Requests the game to save
-function _M:saveGame()
-	-- savefile_pipe is created as a global by the engine
-	savefile_pipe:push(self.save_name, "game", self)
-	self.log("Saving game...")
-end
diff --git a/game/modules/gruesome/class/Grid.lua b/game/modules/gruesome/class/Grid.lua
deleted file mode 100644
index ac6caaac833cfe8626928310259e8dd7b16bce8b..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/class/Grid.lua
+++ /dev/null
@@ -1,68 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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"
-require "engine.Grid"
-local DamageType = require "engine.DamageType"
-
-module(..., package.seeall, class.inherit(engine.Grid))
-
-function _M:init(t, no_default)
-	engine.Grid.init(self, t, no_default)
-end
-
-function _M:block_move(x, y, e, act, couldpass)
-	-- Open doors
-	if self.door_opened and act then
-		game.level.map(x, y, engine.Map.TERRAIN, game.zone.grid_list.DOOR_OPEN)
-		return true
-	elseif self.door_opened and not couldpass then
-		return true
-	end
-
-	-- Pass walls
-	if e and self.can_pass and e.can_pass then
-		for what, check in pairs(e.can_pass) do
-			if self.can_pass[what] and self.can_pass[what] <= check then return false end
-		end
-	end
-
-	return self.does_block_move
-end
-
-function _M:on_move(x, y, who, forced)
-	if forced then return end
-	if who.move_project and next(who.move_project) then
-		for typ, dam in pairs(who.move_project) do
-			DamageType:get(typ).projector(who, x, y, typ, dam)
-		end
-	end
-end
-function _M:tooltip()
-	if self.show_tooltip then
-		local name = ((self.show_tooltip == true) and self.name or self.show_tooltip)
-		if self.desc then
-			return self:getDisplayString()..name.."\n"..self.desc
-		else
-			return self:getDisplayString()..name
-		end
-	else
-		return self:getDisplayString()..self.name
-	end
-end
diff --git a/game/modules/gruesome/class/NPC.lua b/game/modules/gruesome/class/NPC.lua
deleted file mode 100644
index d4012e544bbe4227962ab237d9ffa4ca5209d07c..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/class/NPC.lua
+++ /dev/null
@@ -1,65 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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 ActorAI = require "engine.interface.ActorAI"
-local Faction = require "engine.Faction"
-require "mod.class.Actor"
-
-module(..., package.seeall, class.inherit(mod.class.Actor, engine.interface.ActorAI))
-
-function _M:init(t, no_default)
-	mod.class.Actor.init(self, t, no_default)
-	ActorAI.init(self, t)
-
-	self.dir = rng.table{1,2,3,4,6,7,8,9}
-end
-
-function _M:act()
-	-- Do basic actor stuff
-	if not mod.class.Actor.act(self) then return end
-
-	-- Compute FOV, if needed
---	self:computeFOV(self.sight or 20)
-
-	-- Let the AI think .... beware of Shub !
-	-- If AI did nothing, use energy anyway
-	self:doAI()
-	if not self.energy.used then self:useEnergy() end
-end
-
---- Called by ActorLife interface
--- We use it to pass aggression values to the AIs
-function _M:onTakeHit(value, src)
-	if not self.ai_target.actor and src.targetable then
-		self.ai_target.actor = src
-	end
-
-	return mod.class.Actor.onTakeHit(self, value, src)
-end
-
-function _M:tooltip()
-	local str = mod.class.Actor.tooltip(self)
-	return str..([[
-
-Target: %s
-UID: %d]]):format(
-	self.ai_target.actor and self.ai_target.actor.name or "none",
-	self.uid)
-end
diff --git a/game/modules/gruesome/class/Player.lua b/game/modules/gruesome/class/Player.lua
deleted file mode 100644
index f2b9b8ffa50b3b356996e826a2f3ab271420e01e..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/class/Player.lua
+++ /dev/null
@@ -1,182 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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"
-require "mod.class.Actor"
-require "engine.interface.PlayerRun"
-require "engine.interface.PlayerMouse"
-require "engine.interface.PlayerHotkeys"
-local Map = require "engine.Map"
-local Dialog = require "engine.Dialog"
-local ActorTalents = require "engine.interface.ActorTalents"
-local DeathDialog = require "mod.dialogs.DeathDialog"
-local Astar = require"engine.Astar"
-local DirectPath = require"engine.DirectPath"
-
---- Defines the player
--- It is a normal actor, with some redefined methods to handle user interaction.<br/>
--- It is also able to run and use hotkeys
-module(..., package.seeall, class.inherit(
-	mod.class.Actor,
-	engine.interface.PlayerRun,
-	engine.interface.PlayerMouse,
-	engine.interface.PlayerHotkeys
-))
-
-function _M:init(t, no_default)
-	t.player = true
-	t.type = t.type or "humanoid"
-	t.subtype = t.subtype or "player"
-	t.faction = t.faction or "players"
-
-	t.sight = 8
-	t.kills = 0
-	t.lurkkills = 0
-
-	mod.class.Actor.init(self, t, no_default)
-	engine.interface.PlayerHotkeys.init(self, t)
-
-	self.descriptor = {}
-end
-
-function _M:move(x, y, force)
-	if not forced then game.flash:empty() end
-
-	if not force and game.level.map.seens(x, y) == 1 then
-		game.logPlayer(self, "Hsss!  You refuse to step near the hateful light...")
-		return false
-	end
-	if not force and game.level.map:checkEntity(x, y, Map.TERRAIN, "block_move") then
-		game.logPlayer(self, "You snarl at the wall.%s", self.kills > 19 and " The wall looks scared!" or "")
-		return false
-	end
-	local moved = mod.class.Actor.move(self, x, y, force)
-	if moved then
-		game.level.map:moveViewSurround(self.x, self.y, 8, 8)
-	end
-	return moved
-end
-
-function _M:act()
-	if not mod.class.Actor.act(self) then return end
-
-	-- Clean log flasher
-	game.flash:empty()
-
-	-- Running ? Otherwise pause
-	if not self:runStep() and self.player then
-		game.paused = true
-	end
-end
-
-function _M:playerFOV()
-	-- Compute both the normal and the lite FOV, using cache
-	self:computeFOV(self.sight or 8, "block_sight", function(x, y, dx, dy, sqdist)
-		game.level.map:applyLite(x, y, 0.5)
-	end, true, false, true)
-end
-
---- Called before taking a hit, overload mod.class.Actor:onTakeHit() to stop running
-function _M:onTakeHit(value, src)
-	self:runStop("taken damage")
-	local ret = mod.class.Actor.onTakeHit(self, value, src)
-	if self.life < self.max_life * 0.3 then
-		local sx, sy = game.level.map:getTileToScreen(self.x, self.y)
-		game.flyers:add(sx, sy, 30, (rng.range(0,2)-1) * 0.5, 2, "LOW HEALTH!", {255,0,0}, true)
-	end
-	return ret
-end
-
-function _M:die(src)
-	if self.game_ender then
-		engine.interface.ActorLife.die(self, src)
-		game.paused = true
-		self.energy.value = game.energy_to_act
-		game:registerDialog(DeathDialog.new(self))
-	else
-		mod.class.Actor.die(self, src)
-	end
-end
-
-function _M:setName(name)
-	self.name = name
-	game.save_name = name
-end
-
---- Notify the player of available cooldowns
-function _M:onTalentCooledDown(tid)
-	local t = self:getTalentFromId(tid)
-
-	local x, y = game.level.map:getTileToScreen(self.x, self.y)
-	game.flyers:add(x, y, 30, -0.3, -3.5, ("%s available"):format(t.name:capitalize()), {0,255,00})
-	game.log("#00ff00#Talent %s is ready to use.", t.name)
-end
-
-function _M:levelup()
-	mod.class.Actor.levelup(self)
-
-	local x, y = game.level.map:getTileToScreen(self.x, self.y)
-	game.flyers:add(x, y, 80, 0.5, -2, "LEVEL UP!", {0,255,255})
-	game.log("#00ffff#Welcome to level %d.", self.level)
-end
-
---- Tries to get a target from the user
-function _M:getTarget(typ)
-	return game:targetGetForPlayer(typ)
-end
-
---- Sets the current target
-function _M:setTarget(target)
-	return game:targetSetForPlayer(target)
-end
-
-local function spotHostiles(self)
-	local seen = false
-	-- Check for visible monsters, only see LOS actors, so telepathy wont prevent resting
-	core.fov.calc_circle(self.x, self.y, game.level.map.w, game.level.map.h, 20, function(_, x, y) return game.level.map:opaque(x, y) end, function(_, x, y)
-		local actor = game.level.map(x, y, game.level.map.ACTOR)
-		if actor and self:reactionToward(actor) < 0 and self:canSee(actor) and game.level.map.seens(x, y) then seen = true end
-	end, nil)
-	return seen
-end
-
---- Can we continue running?
--- We can run if no hostiles are in sight, and if we no interesting terrains are next to us
-function _M:runCheck()
-	if spotHostiles(self) then return false, "hostile spotted" end
-
-	-- Notice any noticeable terrain
-	local noticed = false
-	self:runScan(function(x, y)
-		-- Only notice interesting terrains
-		local grid = game.level.map(x, y, Map.TERRAIN)
-		if grid and grid.notice then noticed = "interesting terrain" end
-	end)
-	if noticed then return false, noticed end
-
-	self:playerFOV()
-
-	return engine.interface.PlayerRun.runCheck(self)
-end
-
---- Move with the mouse
--- We just feed our spotHostile to the interface mouseMove
-function _M:mouseMove(tmx, tmy)
-	return engine.interface.PlayerMouse.mouseMove(self, tmx, tmy, spotHostiles)
-end
diff --git a/game/modules/gruesome/class/PlayerDisplay.lua b/game/modules/gruesome/class/PlayerDisplay.lua
deleted file mode 100644
index ec3db28096d2e958c56d69d24e2a29cce8783ba1..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/class/PlayerDisplay.lua
+++ /dev/null
@@ -1,102 +0,0 @@
--- ToME - Tales of Maj'Eyal
--- Copyright (C) 2009 - 2014 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 Mouse = require "engine.Mouse"
-
-module(..., package.seeall, class.make)
-
-function _M:init()
-	self.font = core.display.newFont("/data/font/FSEX300.ttf", 16)
-	self.font_h = self.font:lineSkip()
-
-	self.mouse = Mouse.new()
-
-	local gw, gh = core.display.size()
-	self:resize(0, gh - self.font_h, gw, self.font_h)
-end
-
---- Resize the display area
-function _M:resize(x, y, w, h)
-	self.display_x, self.display_y = x, y
-	self.mouse.delegate_offset_x = x
-	self.mouse.delegate_offset_y = y
-	self.w, self.h = w, h
-	self.font_w = self.font:size(" ")
-	self.bars_x = self.font_w * 9
-	self.bars_w = self.w - self.bars_x - 5
-	self.surface = core.display.newSurface(w, h)
-	self.texture, self.texture_w, self.texture_h = self.surface:glTexture()
-
-	self.items = {}
-end
-
-function _M:mouseTooltip(text, w, h, x, y, click)
---	self.mouse:registerZone(x, y, w, h, function(button, mx, my, xrel, yrel, bx, by, event)
---		game.tooltip_x, game.tooltip_y = 1, 1; game.tooltip:displayAtMap(nil, nil, game.w, game.h, text)
---		if click and event == "button" and button == "left" then
---			click()
---		end
---	end)
-	return w, h
-end
-
-function _M:makeTexture(text, x, y, r, g, b, max_w)
-	local s = self.surface
-	s:drawColorStringBlended(self.font, text, x, y, r, g, b, true, max_w)
-	return self.font:size(text)
-end
-
--- Displays the stats
-function _M:display()
-	local player = game.player
-	if not player or not player.changed or not game.level then return end
-
-	self.mouse:reset()
-	self.items = {}
-
-	local s = self.surface
-	s:erase(0, 0, 0, 0)
-
-	local w = 0
-
-	w = w + self:makeTexture(("%-20s"):format(player.name), w, 0, 255, 255, 255)
-
-	w = w + self:mouseTooltip("#GOLD##{bold}#Lurk Power\n#WHITE##{normal}#Your lurking power. You can gain lurk power by standing still in the shadows.",
-		self:makeTexture(("LP: #GREY#%d/%d   "):format(player:getLurk(), player.max_lurk), w, 0, 255, 255, 255))
-
-	w = w + self:mouseTooltip("#GOLD##{bold}#Shadow Power\n#WHITE##{normal}#Your shadow power. You can gain shadow power by eating adventurers.",
-		self:makeTexture(("SP: #GREY#%d/%d   "):format(player:getShadow(), player.max_shadow), w, 0, 255, 255, 255))
-
-	w = w + self:mouseTooltip("#GOLD##{bold}#Meals\n#WHITE##{normal}#The total number of adventurers you ate.",
-		self:makeTexture(("Meals: %-4d  "):format(player.kills + player.lurkkills), w, 0, 255, 255, 255))
-
-	w = w + self:mouseTooltip("#GOLD##{bold}#Turns\n#WHITE##{normal}#The total number of turns elapsed since starting.",
-		self:makeTexture(("Turns: %-6d  "):format(game.turn / 10), w, 0, 255, 255, 255))
-
-	w = w + self:mouseTooltip("#GOLD##{bold}#Dungeon level\n#WHITE##{normal}#The current dungeon level. Reach level 1 to win!",
-		self:makeTexture(("Level: %d"):format(game.level.level), w, 0, 255, 255, 255))
-
-	s:updateTexture(self.texture)
-end
-
-function _M:toScreen()
-	self:display()
-	self.texture:toScreenFull(self.display_x, self.display_y, self.w, self.h, self.texture_w, self.texture_h)
-end
diff --git a/game/modules/gruesome/class/interface/Combat.lua b/game/modules/gruesome/class/interface/Combat.lua
deleted file mode 100644
index 635acfed464cacde00e76d90b294e0ebc3e20387..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/class/interface/Combat.lua
+++ /dev/null
@@ -1,59 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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 DamageType = require "engine.DamageType"
-local Map = require "engine.Map"
-local Target = require "engine.Target"
-local Talents = require "engine.interface.ActorTalents"
-
---- Interface to add ToME combat system
-module(..., package.seeall, class.make)
-
---- Checks what to do with the target
--- Talk ? attack ? displace ?
-function _M:bumpInto(target)
-	local reaction = self:reactionToward(target)
-	if reaction < 0 then
-		return self:attackTarget(target)
-	elseif reaction >= 0 then
-		if self.move_others then
-			-- Displace
-			game.level.map:remove(self.x, self.y, Map.ACTOR)
-			game.level.map:remove(target.x, target.y, Map.ACTOR)
-			game.level.map(self.x, self.y, Map.ACTOR, target)
-			game.level.map(target.x, target.y, Map.ACTOR, self)
-			self.x, self.y, target.x, target.y = target.x, target.y, self.x, self.y
-		end
-	end
-end
-
---- Makes the death happen!
-function _M:attackTarget(target, mult)
-	if self.player then
-		game.logPlayer(self, "You pounce on the blind, stumbling adventurer and devour %s instantly. Yum!", target.sex)
-		target:die(self)
-	elseif target.player then
-		game.logPlayer(target, "The adventurer stumbles into your slavering fangs. %s", self.sex == "him" and "Gruevy..." or "Saucy...")
-		self:die(target)
-	end
-
-	-- We use up our own energy
-	self:useEnergy(game.energy_to_act)
-end
diff --git a/game/modules/gruesome/data/birth/descriptors.lua b/game/modules/gruesome/data/birth/descriptors.lua
deleted file mode 100644
index 6057a4a5725944ab837d25af29a22750fd841b05..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/data/birth/descriptors.lua
+++ /dev/null
@@ -1,37 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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
-
-newBirthDescriptor{
-	type = "base",
-	name = "base",
-	desc = {
-	},
-
-	copy = {
-		type = "grue", subtype = "grue",
-		display = "G", color = {r=0,g=0,b=0},
-		max_life = 2,
-		max_power = 2,
-	},
-	talents = {
-		[ActorTalents.T_SHADOW_BALL] = 1,
-		[ActorTalents.T_SHADOW_WALK] = 1,
-		[ActorTalents.T_DARK_EYES] = 1,
-	},
-}
diff --git a/game/modules/gruesome/data/damage_types.lua b/game/modules/gruesome/data/damage_types.lua
deleted file mode 100644
index 6f95bb9ed126a74a568dc19af462357cd50176ff..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/data/damage_types.lua
+++ /dev/null
@@ -1,34 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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
-
--- The basic stuff used to damage a grid
-setDefaultProjector(function(src, x, y, type, dam)
-	return 0
-end)
-
-newDamageType{
-	name = "darkness", type = "DARKNESS", text_color = "#GREY#",
-	projector = function(src, x, y, typ, dam)
-		local target = game.level.map(x, y, Map.ACTOR)
-		if target and not target.player then
-			target:attr("blind", 1)
-			game.logPlayer(src, "The adventurer screams in fright as %s %s is extinguished.", target.sex, target.angle < 35 and "lantern" or "torch")
-		end
-	end,
-}
diff --git a/game/modules/gruesome/data/general/grids/basic.lua b/game/modules/gruesome/data/general/grids/basic.lua
deleted file mode 100644
index b5d640a0029f01dc74050e25cfd84751826eb24a..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/data/general/grids/basic.lua
+++ /dev/null
@@ -1,52 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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
-
-newEntity{
-	define_as = "UP",
-	name = "previous level",
-	display = '<', color_r=255, color_g=255, color_b=0, back_color=colors.DARK_GREY,
-	notice = true,
-	always_remember = true,
-	change_level = -1,
-}
-
-newEntity{
-	define_as = "DOWN",
-	name = "next level",
-	display = '>', color_r=255, color_g=255, color_b=0, back_color=colors.DARK_GREY,
-	notice = true,
-	always_remember = true,
-	change_level = 1,
-}
-
-newEntity{
-	define_as = "FLOOR",
-	name = "floor", image = "terrain/marble_floor.png",
-	display = ' ', color_r=255, color_g=255, color_b=255, back_color=colors.DARK_GREY,
-	always_remember = true,
-}
-
-newEntity{
-	define_as = "WALL",
-	name = "wall", image = "terrain/granite_wall1.png",
-	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,
-}
diff --git a/game/modules/gruesome/data/general/npcs/adventurer.lua b/game/modules/gruesome/data/general/npcs/adventurer.lua
deleted file mode 100644
index 24f178873264582be2bea2eb756a4d8597c4ad28..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/data/general/npcs/adventurer.lua
+++ /dev/null
@@ -1,109 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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
-
-local Talents = require("engine.interface.ActorTalents")
-
-newEntity{
-	define_as = "BASE_NPC_ADVENTURER",
-	type = "humanoid", subtype = "adventurer",
-	display = "@", color=colors.WHITE,
-	desc = [[Tasty adventurer! Yummy!]],
-	name = "adventurer",
-
-	rarity = 1,
-	ai = "adventurer",
-	sex = "him",
-}
-
-newEntity{ base = "BASE_NPC_ADVENTURER",
-	level_range = {1, nil},
-	color=colors.DARK_BLUE,
-	lite = 2, angle = 25,
-}
-newEntity{ base = "BASE_NPC_ADVENTURER",
-	level_range = {1, nil},
-	color=colors.DARK_GREEN,
-	lite = 2, angle = 40,
-}
-newEntity{ base = "BASE_NPC_ADVENTURER",
-	level_range = {1, nil},
-	color=colors.TEAL,
-	lite = 2, angle = 60,
-}
-
-newEntity{ base = "BASE_NPC_ADVENTURER",
-	level_range = {1, nil},
-	color=colors.RED,
-	lite = 3, angle = 25,
-}
-newEntity{ base = "BASE_NPC_ADVENTURER",
-	level_range = {1, nil},
-	color=colors.SALMON,
-	lite = 3, angle = 75,
-	sex = "her",
-}
-newEntity{ base = "BASE_NPC_ADVENTURER",
-	level_range = {1, nil},
-	color=colors.DARK_UMBER,
-	lite = 3, angle = 50,
-}
-
-newEntity{ base = "BASE_NPC_ADVENTURER",
-	level_range = {1, nil},
-	color=colors.LIGHT_GREY,
-	lite = 4, angle = 25,
-}
-newEntity{ base = "BASE_NPC_ADVENTURER",
-	level_range = {1, nil},
-	color=colors.DARk_GREY,
-	lite = 4, angle = 40,
-}
-newEntity{ base = "BASE_NPC_ADVENTURER",
-	level_range = {1, nil},
-	color=colors.LIGHT_BLUE,
-	lite = 4, angle = 55,
-}
-newEntity{ base = "BASE_NPC_ADVENTURER",
-	level_range = {1, nil},
-	color=colors.LIGHT_GREEN,
-	lite = 4, angle = 70,
-}
-
-newEntity{ base = "BASE_NPC_ADVENTURER",
-	level_range = {13, nil},
-	color=colors.AQUAMARINE,
-	lite = 5, angle = 25,
-}
-newEntity{ base = "BASE_NPC_ADVENTURER",
-	level_range = {13, nil},
-	color=colors.LIGHT_RED,
-	lite = 5, angle = 35,
-	sex = "her",
-}
-newEntity{ base = "BASE_NPC_ADVENTURER",
-	level_range = {13, nil},
-	color=colors.YELLOW,
-	lite = 5, angle = 50,
-	sex = "her",
-}
-newEntity{ base = "BASE_NPC_ADVENTURER",
-	level_range = {13, nil},
-	color=colors.WHITE,
-	lite = 5, angle = 65,
-}
diff --git a/game/modules/gruesome/data/gfx/particles/ball_shadow.lua b/game/modules/gruesome/data/gfx/particles/ball_shadow.lua
deleted file mode 100644
index 3156b86288808095e4862048fb14ec7c0d9d807b..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/data/gfx/particles/ball_shadow.lua
+++ /dev/null
@@ -1,59 +0,0 @@
--- ToME - Tales of Maj'Eyal
--- Copyright (C) 2009 - 2014 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
-
-local nb = 12
-local dir
-local radius = radius or 6
-
-return { generator = function()
-	local sradius = (radius + 0.5) * (engine.Map.tile_w + engine.Map.tile_h) / 2
-	local ad = rng.float(0, 360)
-	local a = math.rad(ad)
-	local r = 0
-	local x = r * math.cos(a)
-	local y = r * math.sin(a)
-	local static = rng.percent(40)
-	local vel = sradius * ((24 - nb * 1.4) / 24) / 12
-
-	return {
-		trail = 1,
-		life = 12,
-		size = 12 - (12 - nb) * 0.7, sizev = 0, sizea = 0,
-
-		x = x, xv = 0, xa = 0,
-		y = y, yv = 0, ya = 0,
-		dir = a, dirv = 0, dira = 0,
-		vel = rng.float(vel * 0.6, vel * 1.2), velv = 0, vela = 0,
-
-		r = rng.range(0, 40)/255,   rv = 0, ra = 0,
-		g = rng.range(0, 40)/255,   gv = 0.005, ga = 0.0005,
-		b = rng.range(0, 40)/255,      bv = 0, ba = 0,
-		a = rng.range(255, 255)/255,    av = static and -0.034 or 0, aa = 0.005,
-	}
-end, },
-function(self)
-	if nb > 0 then
-		local i = math.min(nb, 6)
-		i = (i * i) * radius
-		self.ps:emit(i)
-		nb = nb - 1
-	end
-end,
-30*radius*7*12,
-"particle_cloud"
diff --git a/game/modules/gruesome/data/gfx/particles/blood.lua b/game/modules/gruesome/data/gfx/particles/blood.lua
deleted file mode 100644
index cd7107ee0a7ee95002278c22a07854a5156974ac..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/data/gfx/particles/blood.lua
+++ /dev/null
@@ -1,38 +0,0 @@
--- Gruesome - T-Engine 4 Module
--- Copyright (C) 2010 Mikolai Fajer
---
--- 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
-
-return {
-	base = 1000,
-
-	angle = { 0, 360 }, anglev = { 2000, 4000 }, anglea = { 200, 600 },
-
-	life = { 5, 10 },
-	size = { 2, 5 }, sizev = {0, 0}, sizea = {0, 0},
-
-	r = {80, 200}, rv = {0, 10}, ra = {0, 0},
-	g = {0, 0}, gv = {0, 0}, ga = {0, 0},
-	b = {0, 0}, bv = {0, 0}, ba = {0, 0},
-	a = {255, 255}, av = {0, 0}, aa = {0, 0},
-
-}, function(self)
-	self.nb = (self.nb or 0) + 1
-	if self.nb < 4 then
-		self.ps:emit(100)
-	end
-end
diff --git a/game/modules/gruesome/data/rooms/simple.lua b/game/modules/gruesome/data/rooms/simple.lua
deleted file mode 100644
index 2b132a10793675208c5d9791d6884762bbb57c68..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/data/rooms/simple.lua
+++ /dev/null
@@ -1,37 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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
-
-return function(gen, id)
-	local w = rng.range(5, 12)
-	local h = rng.range(5, 12)
-	return { name="simple"..w.."x"..h, w=w, h=h, generator = function(self, x, y, is_lit)
-		for i = 1, self.w do
-			for j = 1, self.h do
-				if i == 1 or i == self.w or j == 1 or j == self.h then
-					gen.map.room_map[i-1+x][j-1+y].can_open = true
-					gen.map(i-1+x, j-1+y, Map.TERRAIN, gen.grid_list[gen:resolve('#')])
-				else
-					gen.map.room_map[i-1+x][j-1+y].room = id
-					gen.map(i-1+x, j-1+y, Map.TERRAIN, gen.grid_list[gen:resolve('.')])
-				end
-				if is_lit then gen.map.lites(i-1+x, j-1+y, true) end
-			end
-		end
-	end}
-end
diff --git a/game/modules/gruesome/data/talents.lua b/game/modules/gruesome/data/talents.lua
deleted file mode 100644
index b8752f8c5cf0f88166cf5d84ed1fb3a694157106..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/data/talents.lua
+++ /dev/null
@@ -1,77 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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
-
-newTalentType{ type="grue/grue", name = "grue", description = "Gruesome!" }
-
-newTalent{
-	name = "Shadow Ball",
-	type = {"grue/grue", 1},
-	points = 1,
-	shadow = 2,
-	range = function(self, t)
-		local k = self.kills + self.lurkkills
-		if k <= 9 then return 1
-		elseif k <= 24 then return 2
-		elseif k <= 49 then return 3
-		elseif k <= 99 then return 4
-		else return 5
-		end
-	end,
-	message = "You unleash a mighty ball of shadow.",
-	action = function(self, t)
-		local tg = {type="ball", radius=self:getTalentRange(t)}
-		self:project(tg, self.x, self.y, DamageType.DARKNESS, 1)
-		game.level.map:particleEmitter(self.x, self.y, tg.radius, "ball_shadow", {radius=tg.radius})
-		return true
-	end,
-	info = function(self, t)
-		return "Unleash a ball of darkness to extinguish adventurer's lites.\nThe more your eat the bigger the radius."
-	end,
-}
-
-newTalent{
-	name = "Dark Eyes",
-	type = {"grue/grue", 1},
-	points = 1,
-	shadow = 1,
-	range = function(self, t) return 2 end,
-	action = function(self, t)
-		local tg = {type="ball", range=self:getTalentRange(t)}
-		self:project(tg, x, y, DamageType.DARKNESS, 1)
-		return true
-	end,
-	info = function(self, t)
-		return "Unleash a ball of darkness to extinguish adventurer's lites."
-	end,
-}
-
-newTalent{
-	name = "Shadow Walk",
-	type = {"grue/grue", 1},
-	points = 1,
-	range = function(self, t) return 2 end,
-	action = function(self, t)
-		local tg = {type="ball", range=self:getTalentRange(t)}
-		self:project(tg, x, y, DamageType.DARKNESS, 1)
-		return true
-	end,
-	info = function(self, t)
-		return "Unleash a ball of darkness to extinguish adventurer's lites."
-	end,
-}
diff --git a/game/modules/gruesome/data/timed_effects.lua b/game/modules/gruesome/data/timed_effects.lua
deleted file mode 100644
index b567512bb5f91b14946573888017d1c6285a3b3f..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/data/timed_effects.lua
+++ /dev/null
@@ -1,33 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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
-
-local Stats = require "engine.interface.ActorStats"
-
-newEffect{
-	name = "ACIDBURN",
-	desc = "Burning from acid",
-	type = "physical",
-	status = "detrimental",
-	parameters = { power=1 },
-	on_gain = function(self, err) return "#Target# is covered in acid!", "+Acid" end,
-	on_lose = function(self, err) return "#Target# is free from the acid.", "-Acid" end,
-	on_timeout = function(self, eff)
-		DamageType:get(DamageType.ACID).projector(eff.src or self, self.x, self.y, DamageType.ACID, eff.power)
-	end,
-}
diff --git a/game/modules/gruesome/data/zones/dungeon/npcs.lua b/game/modules/gruesome/data/zones/dungeon/npcs.lua
deleted file mode 100644
index 50fe2f3ee690dd6631dc238376f43b9ebf8ecc5c..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/data/zones/dungeon/npcs.lua
+++ /dev/null
@@ -1,20 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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
-
-load("/data/general/npcs/adventurer.lua")
diff --git a/game/modules/gruesome/data/zones/dungeon/objects.lua b/game/modules/gruesome/data/zones/dungeon/objects.lua
deleted file mode 100644
index b3648a10c1f33d215c42d06f26d38b937851f457..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/data/zones/dungeon/objects.lua
+++ /dev/null
@@ -1,18 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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
diff --git a/game/modules/gruesome/data/zones/dungeon/traps.lua b/game/modules/gruesome/data/zones/dungeon/traps.lua
deleted file mode 100644
index b3648a10c1f33d215c42d06f26d38b937851f457..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/data/zones/dungeon/traps.lua
+++ /dev/null
@@ -1,18 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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
diff --git a/game/modules/gruesome/data/zones/dungeon/zone.lua b/game/modules/gruesome/data/zones/dungeon/zone.lua
deleted file mode 100644
index 1f12aa86df68406fab2c77cd52294af43f0d7218..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/data/zones/dungeon/zone.lua
+++ /dev/null
@@ -1,67 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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
-
-return {
-	name = "Dark ruins",
-	level_range = {1, 1},
-	max_level = 20,
-	level_adjust_level = function(zone, level) return zone.base_level + zone.max_level - level.level end,
-	width = 80, height = 23,
-	persistent = "zone",
---	all_remembered = true,
-	color_shown = {1, 1, 1, 1},
-	color_obscure = {1*0.4, 1*0.4, 1*0.4, 1},
-	generator =  {
-		map = {
-			class = "engine.generator.map.Forest",
-			zoom = 6,
-			sqrt_percent = 40,
-			floor = "FLOOR",
-			wall = "WALL",
-			up = "UP",
-			down = "DOWN",
-		},
-		actor = {
-			class = "engine.generator.actor.Random",
-		},
-	},
-	levels =
-	{
-		[20] = {generator={actor={ nb_npc = {2, 2}, down = "DOWN", force_last_stair = true }}},
-		[19] = {generator={actor={ nb_npc = {3, 6} }}},
-		[18] = {generator={actor={ nb_npc = {3, 6} }}},
-		[17] = {generator={actor={ nb_npc = {3, 6} }}},
-		[16] = {generator={actor={ nb_npc = {7, 10} }}},
-		[15] = {generator={actor={ nb_npc = {7, 10} }}},
-		[14] = {generator={actor={ nb_npc = {7, 10} }}},
-		[13] = {generator={actor={ nb_npc = {7, 10} }}},
-		[12] = {generator={actor={ nb_npc = {7, 10} }}},
-		[11] = {generator={actor={ nb_npc = {7, 10} }}},
-		[10] = {generator={actor={ nb_npc = {7, 10} }}},
-		[9]  = {generator={actor={ nb_npc = {7, 10} }}},
-		[8]  = {generator={actor={ nb_npc = {7, 10} }}},
-		[7]  = {generator={actor={ nb_npc = {7, 10} }}},
-		[6]  = {generator={actor={ nb_npc = {7, 10} }}},
-		[5]  = {generator={actor={ nb_npc = {7, 14} }}},
-		[4]  = {generator={actor={ nb_npc = {7, 14} }}},
-		[3]  = {generator={actor={ nb_npc = {7, 14} }}},
-		[2]  = {generator={actor={ nb_npc = {7, 14} }}},
-		[1]  = {generator={actor={ nb_npc = {7, 14} }}},
-	},
-}
diff --git a/game/modules/gruesome/dialogs/DeathDialog.lua b/game/modules/gruesome/dialogs/DeathDialog.lua
deleted file mode 100644
index 0d931a30cb093202c79c757cdf405793057db089..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/dialogs/DeathDialog.lua
+++ /dev/null
@@ -1,133 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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 Textzone = require "engine.ui.Textzone"
-local Separator = require "engine.ui.Separator"
-local List = require "engine.ui.List"
-local Savefile = require "engine.Savefile"
-local Map = require "engine.Map"
-
-module(..., package.seeall, class.inherit(Dialog))
-
-function _M:init(actor)
-	self.actor = actor
-	Dialog.init(self, "Death!", 500, 300)
-
-	self:generateList()
-
-	self.c_desc = Textzone.new{width=self.iw, auto_height=true, text=[[You have #LIGHT_RED#died#LAST#!
-Death in Example is usually permanent, but if you have a means of resurrection it will be proposed in the menu below.
-You can dump your character data to a file to remember her/him forever, or you can exit and try once again to survive in the wilds!
-]]}
-	self.c_list = List.new{width=self.iw, nb_items=#self.list, list=self.list, fct=function(item) self:use(item) end}
-
-	self:loadUI{
-		{left=0, top=0, ui=self.c_desc},
-		{left=5, top=self.c_desc.h, padding_h=10, ui=Separator.new{dir="vertical", size=self.iw - 10}},
-		{left=0, bottom=0, ui=self.c_list},
-	}
-	self:setFocus(self.c_list)
-	self:setupUI(false, true)
-end
-
---- Clean the actor from debuffs/buffs
-function _M:cleanActor()
-	local effs = {}
-
-	-- Go through all spell effects
-	for eff_id, p in pairs(self.actor.tmp) do
-
-		local e = self.actor.tempeffect_def[eff_id]
-		effs[#effs+1] = {"effect", eff_id}
-	end
-
-	-- Go through all sustained spells
-	for tid, act in pairs(self.actor.sustain_talents) do
-		if act then
-			effs[#effs+1] = {"talent", tid}
-		end
-	end
-
-	while #effs > 0 do
-		local eff = rng.tableRemove(effs)
-
-		if eff[1] == "effect" then
-			self.actor:removeEffect(eff[2])
-		else
-			local old = self.actor.energy.value
-			self.actor:useTalent(eff[2])
-			-- Prevent using energy
-			self.actor.energy.value = old
-		end
-	end
-end
-
---- Restore resources
-function _M:restoreResources()
-	self.actor.life = self.actor.max_life
-	self.actor.power = self.actor.max_power
-
-	self.actor.energy.value = game.energy_to_act
-end
-
---- Basic resurrection
-function _M:resurrectBasic()
-	self.actor.dead = false
-	self.actor.died = (self.actor.died or 0) + 1
-
-	local x, y = util.findFreeGrid(self.actor.x, self.actor.y, 20, true, {[Map.ACTOR]=true})
-	if not x then x, y = self.actor.x, self.actor.y end
-	self.actor.x, self.actor.y = nil, nil
-
-	self.actor:move(x, y, true)
-	game.level:addEntity(self.actor)
-	game:unregisterDialog(self)
-	game.level.map:redisplay()
-end
-
-function _M:use(item)
-	if not item then return end
-	local act = item.action
-
-	if act == "exit" then
-		local save = Savefile.new(game.save_name)
-		save:delete()
-		save:close()
-		util.showMainMenu()
-	elseif act == "cheat" then
-		game.logPlayer(self.actor, "#LIGHT_BLUE#You resurrect! CHEATER !")
-
-		self:cleanActor()
-		self:restoreResources()
-		self:resurrectBasic()
-	end
-end
-
-function _M:generateList()
-	local list = {}
-
-	if config.settings.cheat then list[#list+1] = {name="Resurrect by cheating", action="cheat"} end
-
-	list[#list+1] = {name="Character dump", action="dump"}
-	list[#list+1] = {name="Exit to main menu", action="exit"}
-
-	self.list = list
-end
diff --git a/game/modules/gruesome/dialogs/MapMenu.lua b/game/modules/gruesome/dialogs/MapMenu.lua
deleted file mode 100644
index db258d138aafaa65345571de032c3f95261610f2..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/dialogs/MapMenu.lua
+++ /dev/null
@@ -1,125 +0,0 @@
--- ToME - Tales of Maj'Eyal
--- Copyright (C) 2009 - 2014 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"
-require "engine.ui.Dialog"
-local List = require "engine.ui.List"
-local Map = require "engine.Map"
-
-module(..., package.seeall, class.inherit(engine.ui.Dialog))
-
-function _M:init(mx, my, tmx, tmy)
-	self.tmx, self.tmy = util.bound(tmx, 0, game.level.map.w - 1), util.bound(tmy, 0, game.level.map.h - 1)
-	if tmx == game.player.x and tmy == game.player.y then self.on_player = true end
-
-	self:generateList()
-	self.__showup = false
-
-	local name = "Actions"
-	local w = self.font_bold:size(name)
-	engine.ui.Dialog.init(self, name, 1, 100, mx, my)
-
-	local list = List.new{width=math.max(w, self.max) + 10, nb_items=#self.list, list=self.list, fct=function(item) self:use(item) end}
-
-	self:loadUI{
-		{left=0, top=0, ui=list},
-	}
-
-	self:setupUI(true, true, function(w, h)
-		self.force_x = mx - w / 2
-		self.force_y = my - (self.h - self.ih + list.fh / 3)
-	end)
-
-	self.mouse:reset()
-	self.mouse:registerZone(0, 0, game.w, game.h, function(button, x, y, xrel, yrel, bx, by, event) if (button == "left" or button == "right") and event == "button" then self.key:triggerVirtual("EXIT") end end)
-	self.mouse:registerZone(self.display_x, self.display_y, self.w, self.h, function(button, x, y, xrel, yrel, bx, by, event) if button == "right" and event == "button" then self.key:triggerVirtual("EXIT") else self:mouseEvent(button, x, y, xrel, yrel, bx, by, event) end end)
-	self.key:addBinds{ EXIT = function() game:unregisterDialog(self) end, }
-end
-
-function _M:use(item)
-	if not item then return end
-	game:unregisterDialog(self)
-
-	local act = item.action
-
-	if act == "move_to" then game.player:mouseMove(self.tmx, self.tmy)
-	elseif act == "change_level" then game.key:triggerVirtual("CHANGE_LEVEL")
-	elseif act == "talent" then
-		local d = item
-		if d.set_target then
-			local a = game.level.map(self.tmx, self.tmy, Map.ACTOR)
-			if not a then a = {x=self.tmx, y=self.tmy, __no_self=true} end
-			game.player:useTalent(d.talent.id, nil, nil, nil, a)
-		else
-			game.player:useTalent(d.talent.id)
-		end
-	end
-end
-
-function _M:generateList()
-	local list = {}
-	local player = game.player
-
-	local g = game.level.map(self.tmx, self.tmy, Map.TERRAIN)
-	local t = game.level.map(self.tmx, self.tmy, Map.TRAP)
-	local o = game.level.map(self.tmx, self.tmy, Map.OBJECT)
-	local a = game.level.map(self.tmx, self.tmy, Map.ACTOR)
-
-	-- Generic actions
-	if g and g.change_level and self.on_player then list[#list+1] = {name="Change level", action="change_level", color=colors.simple(colors.VIOLET)} end
-	if g and not self.on_player then list[#list+1] = {name="Move to", action="move_to", color=colors.simple(colors.ANTIQUE_WHITE)} end
-
-	-- Talents
-	if game.zone and not game.zone.wilderness then
-		local tals = {}
-		for tid, _ in pairs(player.talents) do
-			local t = player:getTalentFromId(tid)
-			if t.mode ~= "passive" and player:preUseTalent(t, true, true) and not player:isTalentCoolingDown(t) then
-				local rt = util.getval(t.requires_target, player, t)
-				if self.on_player and not rt then
-					tals[#tals+1] = {name=t.name, talent=t, action="talent", color=colors.simple(colors.GOLD)}
-				elseif not self.on_player and rt then
-					tals[#tals+1] = {name=t.name, talent=t, action="talent", set_target=true, color=colors.simple(colors.GOLD)}
-				end
-			end
-		end
-		table.sort(tals, function(a, b)
-			local ha, hb
-			for i = 1, 36 do if player.hotkey[i] and player.hotkey[i][1] == "talent" and player.hotkey[i][2] == a.talent.id then ha = i end end
-			for i = 1, 36 do if player.hotkey[i] and player.hotkey[i][1] == "talent" and player.hotkey[i][2] == b.talent.id then hb = i end end
-
-			if ha and hb then return ha < hb
-			elseif ha and not hb then return ha < 999999
-			elseif hb and not ha then return hb > 999999
-			else return a.talent.name < b.talent.name
-			end
-		end)
-		for i = 1, #tals do list[#list+1] = tals[i] end
-	end
-
-	self.max = 0
-	self.maxh = 0
-	for i, v in ipairs(list) do
-		local w, h = self.font:size(v.name)
-		self.max = math.max(self.max, w)
-		self.maxh = self.maxh + h
-	end
-
-	self.list = list
-end
diff --git a/game/modules/gruesome/dialogs/Quit.lua b/game/modules/gruesome/dialogs/Quit.lua
deleted file mode 100644
index 37dada0dbda14499a38f0588153c43ba9ffd248b..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/dialogs/Quit.lua
+++ /dev/null
@@ -1,44 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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"
-require "engine.Dialog"
-local Savefile = require "engine.Savefile"
-
-module(..., package.seeall, class.inherit(engine.Dialog))
-
-function _M:init()
-	engine.Dialog.init(self, "Really exit Example Module?", 300, 100)
-	self:keyCommands({
-		__DEFAULT = function()
-			game:unregisterDialog(self)
-			game.quit_dialog = false
-		end,
-	}, {
-		ACCEPT = function()
-			-- savefile_pipe is created as a global by the engine
-			savefile_pipe:push(game.save_name, "game", game)
-			util.showMainMenu()
-		end,
-	})
-end
-
-function _M:drawDialog(s, w, h)
-	s:drawColorStringCentered(self.font, "Press enter to quit, any other keys to stay", 2, 2, self.iw - 2, self.ih - 2)
-end
diff --git a/game/modules/gruesome/init.lua b/game/modules/gruesome/init.lua
deleted file mode 100644
index 3b85800c95abe841ac865ac606d5abfc95788f6c..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/init.lua
+++ /dev/null
@@ -1,37 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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
-
-name = "Gruesome/TE4"
-long_name = "Gruesome for T-Engine4"
-short_name = "gruesome"
-author = { "Darren Grey", "darrenjohngrey@hotmail.com" }
-homepage = "http://gruesomegames.com/"
-version = {1,0,0}
-engine = {0,9,44,"te4"}
-description = [[
-"It is pitch black.  You are likely to eat someone..."
-
-In Gruesome you play the grue, lurking in shadows and eating adventurers.
-Explore randomly generated caverns populated with wandering adventurers,
-trying to avoid the light of their torches and grabbing a bite to eat when
-possible.  You can't directly move into adventurers - either hang around
-hoping they'll stumble into you, or snuff out their torches with a shadow
-ball spell.
-]]
-starter = "mod.load"
diff --git a/game/modules/gruesome/load.lua b/game/modules/gruesome/load.lua
deleted file mode 100644
index 07e20e2d80d1849f04756a1429f225cc58899e97..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/load.lua
+++ /dev/null
@@ -1,55 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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
-
-dofile("/mod/map_config.lua")
-
--- This file loads the game module, and loads data
-local KeyBind = require "engine.KeyBind"
-local DamageType = require "engine.DamageType"
-local ActorResource = require "engine.interface.ActorResource"
-local ActorTalents = require "engine.interface.ActorTalents"
-local ActorAI = require "engine.interface.ActorAI"
-local ActorLevel = require "engine.interface.ActorLevel"
-local ActorTemporaryEffects = require "engine.interface.ActorTemporaryEffects"
-local Birther = require "engine.Birther"
-
--- Useful keybinds
-KeyBind:load("move,hotkeys,inventory,actions,interface,debug")
-
--- Damage types
-DamageType:loadDefinition("/data/damage_types.lua")
-
--- Talents
-ActorTalents:loadDefinition("/data/talents.lua")
-
--- Timed Effects
-ActorTemporaryEffects:loadDefinition("/data/timed_effects.lua")
-
--- Actor resources
-ActorResource:defineResource("Shadow", "shadow", nil, "shadow_regen", "Power represent your ability to use special talents.")
-ActorResource:defineResource("Lurk", "lurk", nil, "lurk_regen", "Power represent your ability to use special talents.")
-
--- Actor AIs
-ActorAI:loadDefinition("/engine/ai/")
-ActorAI:loadDefinition("/mod/ai/")
-
--- Birther descriptor
-Birther:loadDefinition("/data/birth/descriptors.lua")
-
-return {require "mod.class.Game" }
diff --git a/game/modules/gruesome/map_config.lua b/game/modules/gruesome/map_config.lua
deleted file mode 100644
index ae7c55ff9b3f89264cb62fde027c5bf039a1f028..0000000000000000000000000000000000000000
--- a/game/modules/gruesome/map_config.lua
+++ /dev/null
@@ -1,60 +0,0 @@
--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009 - 2014 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
-
-local Map = require "engine.Map"
-
-Map.zdepth = 4
-
--- Setup the map to only display one entity
-Map.updateMapDisplay = function(self, x, y, mos)
-	local g = self(x, y, Map.TERRAIN)
-	local o = self(x, y, Map.OBJECT)
-	local a = self(x, y, Map.ACTOR)
-	local t = self(x, y, Map.TRAP)
-
-	if g then
-		-- Update path caches from path strings
-		for i = 1, #self.path_strings do
-			local ps = self.path_strings[i]
-			self._fovcache.path_caches[ps]:set(x, y, g:check("block_move", x, y, ps, false, true))
-		end
-
-		g:getMapObjects(self.tiles, mos, 1)
-	end
-	if t then
-		-- Handles trap being known
-		if not self.actor_player or t:knownBy(self.actor_player) then
-			t:getMapObjects(self.tiles, mos, 2)
-		end
-	end
-	if o then
-		o:getMapObjects(self.tiles, mos, 3)
-		if self.object_stack_count then
-			local mo = o:getMapStackMO(self, x, y)
-			if mo then mos[2] = mo end
-		end
-	end
-	if a then
-		-- Handles invisibility and telepathy and other such things
-		if not self.actor_player or self.actor_player:canSee(a) then
-			local r = self.actor_player:reactionToward(a)
-			a:getMapObjects(self.tiles, mos, 4)
-		end
-	end
-end
diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index 7c65ca8d46e2a34a03e772b4945b17ebdf46e11a..d066e80db075ad591ba24b67f9ef94440b18d74f 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -431,6 +431,13 @@ function _M:actBase()
 		t.do_regenLife(self, t)
 	end
 
+	if self.resting and self.reload then
+		local reloaded = self:reload()
+		if not reloaded and self.reloadQS then
+			self:reloadQS()
+		end
+	end
+
 	-- update hate regen based on calculated decay rate
 	if self:knowTalent(self.T_HATE_POOL) then
 		local t = self:getTalentFromId(self.T_HATE_POOL)
@@ -1044,7 +1051,16 @@ function _M:move(x, y, force)
 					for i, e in ipairs(game.level.map.effects) do if e.damtype == DamageType.SUN_PATH and e.grids[x] and e.grids[x][y] then use_energy = false break end end
 				end
 
-				if use_energy then self:useEnergy(game.energy_to_act * speed) end
+				if use_energy then
+					self:useEnergy(game.energy_to_act * speed)
+
+					if self.reload then
+						local reloaded = self:reload()
+						if not reloaded and self.reloadQS then
+							self:reloadQS()
+						end
+					end
+				end
 
 				if speed <= 0.125 and self:knowTalent(self.T_FAST_AS_LIGHTNING) then
 					local t = self:getTalentFromId(self.T_FAST_AS_LIGHTNING)
@@ -1124,6 +1140,18 @@ function _M:move(x, y, force)
 	return moved
 end
 
+--- Just wait a turn
+function _M:waitTurn()
+	if self.reload then
+		local reloaded = self:reload()
+		if not reloaded and self.reloadQS then
+			self:reloadQS()
+		end
+	end
+
+	self:useEnergy()
+end
+
 --- Knock back the actor
 -- Overloaded to add move anim
 function _M:knockback(srcx, srcy, dist, recursive, on_terrain)
@@ -1540,7 +1568,6 @@ function _M:regenAmmo()
 		ammo.combat.reload_counter = 0
 		ammo.combat.shots_left = util.bound(ammo.combat.shots_left + 1, 0, ammo.combat.capacity)
 	end
-
 end
 
 --- Called before healing
@@ -3092,9 +3119,9 @@ function _M:updateModdableTile()
 	i = self.inven[self.INVEN_CLOAK]; if i and i[1] and i[1].moddable_tile then add[#add+1] = {image = base..(i[1].moddable_tile):format("shoulder")..".png", auto_tall=1} end
 	i = self.inven[self.INVEN_FEET]; if i and i[1] and i[1].moddable_tile then add[#add+1] = {image = base..(i[1].moddable_tile)..".png", auto_tall=1} end
 	i = self.inven[self.INVEN_BODY]; if i and i[1] and i[1].moddable_tile2 then add[#add+1] = {image = base..(i[1].moddable_tile2)..".png", auto_tall=1}
-	elseif not self.moddable_tile_nude then add[#add+1] = {image = base.."lower_body_01.png"} end
+	elseif not self:attr("moddable_tile_nude") then add[#add+1] = {image = base.."lower_body_01.png"} end
 	i = self.inven[self.INVEN_BODY]; if i and i[1] and i[1].moddable_tile then add[#add+1] = {image = base..(i[1].moddable_tile)..".png", auto_tall=1}
-	elseif not self.moddable_tile_nude then add[#add+1] = {image = base.."upper_body_01.png"} end
+	elseif not self:attr("moddable_tile_nude") then add[#add+1] = {image = base.."upper_body_01.png"} end
 	i = self.inven[self.INVEN_HEAD]; if i and i[1] and i[1].moddable_tile then add[#add+1] = {image = base..(i[1].moddable_tile)..".png", auto_tall=1} end
 	i = self.inven[self.INVEN_HANDS]; if i and i[1] and i[1].moddable_tile then add[#add+1] = {image = base..(i[1].moddable_tile)..".png", auto_tall=1} end
 	i = self.inven[self.INVEN_CLOAK]; if i and i[1] and i[1].moddable_tile_hood then add[#add+1] = {image = base..(i[1].moddable_tile):format("hood")..".png", auto_tall=1} end
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index c6e2337a501e99aac6cf60ef672a3b7d1d8acfd8..7202d3ac0811c91338b3bc3afb574b6669d745c0 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -344,8 +344,8 @@ function _M:loaded()
 				elseif self.difficulty == self.DIFFICULTY_INSANE then
 					zone.base_level_range = table.clone(zone.level_range, true)
 					zone.specific_base_level.object = -10 -zone.level_range[1]
-					zone.level_range[1] = zone.level_range[1] * 2.2 + 5
-					zone.level_range[2] = zone.level_range[2] * 2.2 + 5
+					zone.level_range[1] = zone.level_range[1] * 1.7 + 5
+					zone.level_range[2] = zone.level_range[2] * 1.7 + 5
 				elseif self.difficulty == self.DIFFICULTY_MADNESS then
 					zone.base_level_range = table.clone(zone.level_range, true)
 					zone.specific_base_level.object = -10 -zone.level_range[1]
@@ -1527,7 +1527,7 @@ function _M:setupCommands()
 			local add = g.add_displays
 			if add then for i, e in ipairs(add) do
 				print(" -", e.image, e.z or "+"..i)
-				for i, a in ipairs(e.add_mos or {}) do print("   => ", a.image) end
+				for i, a in ipairs(e.add_mos or {}) do print("   => ", a.image, (a.display_x or 0).."x"..(a.display_y or 0)) end
 			end end
 			print("---")
 			local mos = {}
@@ -1585,7 +1585,7 @@ do return end
 		MOVE_LEFT_DOWN = function() if core.key.modState("caps") and self.level then self.level.map:scrollDir(1) else self.player:moveDir(1) end end,
 		MOVE_RIGHT_UP = function() if core.key.modState("caps") and self.level then self.level.map:scrollDir(9) else self.player:moveDir(9) end end,
 		MOVE_RIGHT_DOWN = function() if core.key.modState("caps") and self.level then self.level.map:scrollDir(3) else self.player:moveDir(3) end end,
-		MOVE_STAY = function() if core.key.modState("caps") and self.level then self.level.map:centerViewAround(self.player.x, self.player.y) else if self.player:enoughEnergy() then self.player:describeFloor(self.player.x, self.player.y) self.player:useEnergy() end end end,
+		MOVE_STAY = function() if core.key.modState("caps") and self.level then self.level.map:centerViewAround(self.player.x, self.player.y) else if self.player:enoughEnergy() then self.player:describeFloor(self.player.x, self.player.y) self.player:waitTurn() end end end,
 
 		RUN = function()
 			self.log("Run in which direction?")
diff --git a/game/modules/tome/class/Grid.lua b/game/modules/tome/class/Grid.lua
index 0ca8c7798c30d8a0ec89e663c305f068d27c3d68..df34e80b017b665f620bb8f6722a43f8056a028a 100644
--- a/game/modules/tome/class/Grid.lua
+++ b/game/modules/tome/class/Grid.lua
@@ -186,7 +186,82 @@ function _M:tooltip(x, y)
 end
 
 --- Generate sub entities to make nice trees
-function _M:makeTrees(base, max, bigheight_limit, tint)
+function _M:makeNewTrees(g, kindsdefs, max_trees, basedir)
+	basedir = basedir or "terrain/trees/"
+	max_trees = max_trees or 3
+	g.add_displays = g.add_displays or {}
+	g.add_mos = g.add_mos or {}
+	local basemos = g.add_mos
+	local add = g.add_displays
+	add[#add+1] = engine.Entity.new{image="invis.png", z=3, display_on_seen = true, display_on_remember = true, add_mos={}}
+	local mos = add[#add].add_mos
+	local function getname(n)
+		if type(n) == "string" then return n end
+		return n[1]:format(rng.range(n[2], n[3]))
+	end
+	local function makeTree(nb, z)
+		local inb = 4 - nb
+		local treedef = rng.table(kindsdefs)
+		local treeid = treedef[1]
+		local parts = treedef[2]
+		if not parts.tall then parts.tall = 0 end
+
+		local scale = rng.float(0.5 + inb / 6, 1)
+		local x = rng.float(-1 / 3 * nb / 3, 1 / 3 * nb / 3)
+		local y = rng.float(-1 / 5 * nb / 3, 1 / 4 * nb / 3)
+
+		for i = 1, #parts - 1 do
+			mos[#mos+1] = {image=basedir..treeid.."_"..getname(parts[i])..".png", display_x=x, display_y=y, display_w=scale, display_h=scale}
+		end
+		if parts.base then
+			basemos[#basemos+1] = {image=basedir..treeid.."_"..getname(parts.base)..".png", display_x=x, display_y=y, display_w=scale, display_h=scale}
+		end
+		if parts.adds then
+			local name = parts.adds[1]
+			local t = {
+				z = z,
+				display_x = x,
+				display_y = y,
+				display_w = scale,
+				display_h = scale,
+				display_on_seen = true,
+				display_on_remember = true,
+				image = basedir..treeid.."_"..getname(name)..".png",
+			}
+			table.merge(t, parts.adds)
+			add[#add+1] = engine.Entity.new(t)
+		end
+		add[#add+1] = engine.Entity.new{
+			z = z,
+			_st = y,
+			display_x = x,
+			display_y = y + scale * parts.tall,
+			display_w = scale,
+			display_h = scale * (1 - parts.tall),
+			display_on_seen = true,
+			display_on_remember = true,
+			image = basedir..treeid.."_"..getname(parts[#parts])..".png",
+			shader = "tree", shader_args = parts.shader_args,
+		}
+		return add[#add]
+	end
+
+	local v = rng.range(0, 100)
+	local tbl
+	if v < 33 and max_trees >= 3 then
+		tbl = { makeTree(3, 16), makeTree(3, 17), makeTree(3, 18), }
+	elseif v < 66 and max_trees >= 2 then
+		tbl = { makeTree(2, 16), makeTree(2, 17), }
+	else
+		tbl = { makeTree(1, 16), }
+	end
+	table.sort(tbl, function(a,b) return a._st < b._st end)
+	for i = 1, #tbl do tbl[i].z = 16 + i - 1 end
+	return g
+end
+
+--- Generate sub entities to make nice trees
+function _M:makeTrees(base, max, bigheight_limit, tint, attenuation)
 	local function makeTree(nb, z)
 		local inb = 4 - nb
 		local treeid = rng.range(1, max or 5)
@@ -201,7 +276,7 @@ function _M:makeTrees(base, max, bigheight_limit, tint)
 			display_h = treeid < (bigheight_limit or 9) and 1 or 2,
 			image = (base or "terrain/tree_alpha")..treeid..".png",
 			tint = tint,
-			shader = "tree",
+			shader = "tree", shader_args={attenuation=attenuation},
 		}
 	end
 
diff --git a/game/modules/tome/class/NPC.lua b/game/modules/tome/class/NPC.lua
index ce9c9b563c5e3a1395752031efb73683132773f7..3edbc0fe77510e065aaef4c61c8fb2983851d6ca 100644
--- a/game/modules/tome/class/NPC.lua
+++ b/game/modules/tome/class/NPC.lua
@@ -433,8 +433,9 @@ function _M:addedToLevel(level, x, y)
 		elseif game.difficulty == game.DIFFICULTY_INSANE and not game.party:hasMember(self) then
 			-- Increase talent level
 			for tid, lev in pairs(self.talents) do
-				self:learnTalent(tid, true, lev)
+				self:learnTalent(tid, true, lev / 2)
 			end
+			-- Give unrand bosses extra classes
 			if not self.randboss and self.rank >= 3.5 then
 				local data = {}
 				if self.rank == 3.5 then data = {nb_classes=1}
@@ -446,6 +447,12 @@ function _M:addedToLevel(level, x, y)
 				data.forbid_equip = true
 				game.state:applyRandomClass(self, data, true)
 			end
+			-- Increase life
+			local lifeadd = self.max_life * 0.2
+			self.max_life = self.max_life + lifeadd
+			self.life = self.life + lifeadd
+			-- print("Insane increasing " .. self.name .. " life by " .. lifeadd)
+
 			self:attr("difficulty_boosted", 1)
 		elseif game.difficulty == game.DIFFICULTY_MADNESS and not game.party:hasMember(self) then
 			-- Increase talent level
@@ -463,9 +470,11 @@ function _M:addedToLevel(level, x, y)
 				data.forbid_equip = true
 				game.state:applyRandomClass(self, data, true)
 			end
+			-- Increase life
 			local lifeadd = self.max_life * self:getRankLifeAdjust(1) * self.level / 65 / 1.5
 			self.max_life = self.max_life + lifeadd
 			self.life = self.life + lifeadd
+			
 			self:attr("difficulty_boosted", 1)
 		end
 	end
diff --git a/game/modules/tome/class/NicerTiles.lua b/game/modules/tome/class/NicerTiles.lua
index 224d6e23a7bb5ea413ef872a08e6b7d8708fa50e..0f6c9b31958285122ffa9242d9c54da7392460e5 100644
--- a/game/modules/tome/class/NicerTiles.lua
+++ b/game/modules/tome/class/NicerTiles.lua
@@ -22,7 +22,7 @@ local Map = require "engine.Map"
 
 module(..., package.seeall, class.make)
 
-local NB_VARIATIONS = 20
+local NB_VARIATIONS = 30
 
 function _M:init()
 	self.repo = {}
@@ -140,7 +140,7 @@ function _M:replaceAll(level)
 					local mos = gd.add_mos
 					for i = 1, #e.add_mos do
 						mos[#mos+1] = table.clone(e.add_mos[i])
-						mos[#mos].image = mos[#mos].image:format(rng.range(e.min, e.max))
+						mos[#mos].image = mos[#mos].image:format(rng.range(e.min or 1, e.max or 1))
 					end
 					if e.add_mos_shader then gd.shader = e.add_mos_shader end
 					gd._mo = nil
@@ -150,10 +150,10 @@ function _M:replaceAll(level)
 					g.add_displays = g.add_displays or {}
 					for i = 1, #e.add_displays do
 						 g.add_displays[#g.add_displays+1] = require(g.__CLASSNAME).new(e.add_displays[i])
-						g.add_displays[#g.add_displays].image = g.add_displays[#g.add_displays].image:format(rng.range(e.min, e.max))
+						g.add_displays[#g.add_displays].image = g.add_displays[#g.add_displays].image:format(rng.range(e.min or 1, e.max or 1))
 					end
 				end
-				if e.image then g.image = e.image:format(rng.range(e.min, e.max)) end
+				if e.image then g.image = e.image:format(rng.range(e.min or 1, e.max or 1)) end
 			end
 
 			level.map(i, j, Map.TERRAIN, g)
@@ -168,6 +168,7 @@ function _M:postProcessLevelTiles(level)
 	if not Map.tiles.nicer_tiles then return end
 
 	self.edit_entity_store = {}
+	self.repo = {}
 
 	for i = 0, level.map.w - 1 do for j = 0, level.map.h - 1 do
 		self:handle(level, i, j)
@@ -182,6 +183,7 @@ function _M:updateAround(level, x, y)
 	if not Map.tiles.nicer_tiles then return end
 
 	self.edit_entity_store = nil
+	self.repo = {}
 
 	for i = x-1, x+1 do for j = y-1, y+1 do
 		self:handle(level, i, j)
@@ -394,21 +396,98 @@ grass = { method="borders", type="grass", forbid={lava=true, rock=true},
 	water7i={add_mos={{image="terrain/grass/grass_inner_7_%02d.png", display_x=-1, display_y=-1}}, min=1, max=1},
 	water9i={add_mos={{image="terrain/grass/grass_inner_9_%02d.png", display_x=1, display_y=-1}}, min=1, max=1},
 },
-grass_wm = { method="borders", type="grass", forbid={lava=true, rock=true},
-	default8={add_mos={{image="terrain/grass_worldmap/grass_2_%02d.png", display_y=-1}}, min=1, max=2},
-	default2={add_mos={{image="terrain/grass_worldmap/grass_8_%02d.png", display_y=1}}, min=1, max=2},
-	default4={add_mos={{image="terrain/grass_worldmap/grass_6_%02d.png", display_x=-1}}, min=1, max=2},
-	default6={add_mos={{image="terrain/grass_worldmap/grass_4_%02d.png", display_x=1}}, min=1, max=2},
-
-	default1={z=3,add_mos={{image="terrain/grass_worldmap/grass_9_%02d.png", display_x=-1, display_y=1}}, min=1, max=1},
-	default3={z=3,add_mos={{image="terrain/grass_worldmap/grass_7_%02d.png", display_x=1, display_y=1}}, min=1, max=1},
-	default7={z=3,add_mos={{image="terrain/grass_worldmap/grass_3_%02d.png", display_x=-1, display_y=-1}}, min=1, max=1},
-	default9={z=3,add_mos={{image="terrain/grass_worldmap/grass_1_%02d.png", display_x=1, display_y=-1}}, min=1, max=1},
-
-	default1i={add_mos={{image="terrain/grass_worldmap/grass_inner_1_%02d.png", display_x=-1, display_y=1}}, min=1, max=2},
-	default3i={add_mos={{image="terrain/grass_worldmap/grass_inner_3_%02d.png", display_x=1, display_y=1}}, min=1, max=2},
-	default7i={add_mos={{image="terrain/grass_worldmap/grass_inner_7_%02d.png", display_x=-1, display_y=-1}}, min=1, max=2},
-	default9i={add_mos={{image="terrain/grass_worldmap/grass_inner_9_%02d.png", display_x=1, display_y=-1}}, min=1, max=2},
+autumn_grass = { method="borders", type="autumn_grass", forbid={grass=true, lava=true, rock=true},
+	default8={add_mos={{image="terrain/grass/autumn_grass_2_%02d.png", display_y=-1}}, min=1, max=2},
+	default2={add_mos={{image="terrain/grass/autumn_grass_8_%02d.png", display_y=1}}, min=1, max=2},
+	default4={add_mos={{image="terrain/grass/autumn_grass_6_%02d.png", display_x=-1}}, min=1, max=2},
+	default6={add_mos={{image="terrain/grass/autumn_grass_4_%02d.png", display_x=1}}, min=1, max=2},
+
+	default1={add_mos={{image="terrain/grass/autumn_grass_9_%02d.png", display_x=-1, display_y=1}}, min=1, max=1},
+	default3={add_mos={{image="terrain/grass/autumn_grass_7_%02d.png", display_x=1, display_y=1}}, min=1, max=1},
+	default7={add_mos={{image="terrain/grass/autumn_grass_3_%02d.png", display_x=-1, display_y=-1}}, min=1, max=1},
+	default9={add_mos={{image="terrain/grass/autumn_grass_1_%02d.png", display_x=1, display_y=-1}}, min=1, max=1},
+
+	default1i={add_mos={{image="terrain/grass/autumn_grass_inner_1_%02d.png", display_x=-1, display_y=1}}, min=1, max=2},
+	default3i={add_mos={{image="terrain/grass/autumn_grass_inner_3_%02d.png", display_x=1, display_y=1}}, min=1, max=2},
+	default7i={add_mos={{image="terrain/grass/autumn_grass_inner_7_%02d.png", display_x=-1, display_y=-1}}, min=1, max=2},
+	default9i={add_mos={{image="terrain/grass/autumn_grass_inner_9_%02d.png", display_x=1, display_y=-1}}, min=1, max=2},
+
+	water8={add_mos={{image="terrain/grass/autumn_grass_2_%02d.png", display_y=-1}}, min=1, max=1},
+	water2={add_mos={{image="terrain/grass/autumn_grass_8_%02d.png", display_y=1}}, min=1, max=1},
+	water4={add_mos={{image="terrain/grass/autumn_grass_6_%02d.png", display_x=-1}}, min=1, max=1},
+	water6={add_mos={{image="terrain/grass/autumn_grass_4_%02d.png", display_x=1}}, min=1, max=1},
+
+	water1={add_mos={{image="terrain/grass/autumn_grass_9_%02d.png", display_x=-1, display_y=1}}, min=1, max=1},
+	water3={add_mos={{image="terrain/grass/autumn_grass_7_%02d.png", display_x=1, display_y=1}}, min=1, max=1},
+	water7={add_mos={{image="terrain/grass/autumn_grass_3_%02d.png", display_x=-1, display_y=-1}}, min=1, max=1},
+	water9={add_mos={{image="terrain/grass/autumn_grass_1_%02d.png", display_x=1, display_y=-1}}, min=1, max=1},
+
+	water1i={add_mos={{image="terrain/grass/autumn_grass_inner_1_%02d.png", display_x=-1, display_y=1}}, min=1, max=1},
+	water3i={add_mos={{image="terrain/grass/autumn_grass_inner_3_%02d.png", display_x=1, display_y=1}}, min=1, max=1},
+	water7i={add_mos={{image="terrain/grass/autumn_grass_inner_7_%02d.png", display_x=-1, display_y=-1}}, min=1, max=1},
+	water9i={add_mos={{image="terrain/grass/autumn_grass_inner_9_%02d.png", display_x=1, display_y=-1}}, min=1, max=1},
+},
+snowy_grass = { method="borders", type="snowy_grass", forbid={grass=true, lava=true, rock=true},
+	default8={add_mos={{image="terrain/grass/snowy_grass_2_%02d.png", display_y=-1}}, min=1, max=2},
+	default2={add_mos={{image="terrain/grass/snowy_grass_8_%02d.png", display_y=1}}, min=1, max=2},
+	default4={add_mos={{image="terrain/grass/snowy_grass_6_%02d.png", display_x=-1}}, min=1, max=2},
+	default6={add_mos={{image="terrain/grass/snowy_grass_4_%02d.png", display_x=1}}, min=1, max=2},
+
+	default1={add_mos={{image="terrain/grass/snowy_grass_9_%02d.png", display_x=-1, display_y=1}}, min=1, max=1},
+	default3={add_mos={{image="terrain/grass/snowy_grass_7_%02d.png", display_x=1, display_y=1}}, min=1, max=1},
+	default7={add_mos={{image="terrain/grass/snowy_grass_3_%02d.png", display_x=-1, display_y=-1}}, min=1, max=1},
+	default9={add_mos={{image="terrain/grass/snowy_grass_1_%02d.png", display_x=1, display_y=-1}}, min=1, max=1},
+
+	default1i={add_mos={{image="terrain/grass/snowy_grass_inner_1_%02d.png", display_x=-1, display_y=1}}, min=1, max=2},
+	default3i={add_mos={{image="terrain/grass/snowy_grass_inner_3_%02d.png", display_x=1, display_y=1}}, min=1, max=2},
+	default7i={add_mos={{image="terrain/grass/snowy_grass_inner_7_%02d.png", display_x=-1, display_y=-1}}, min=1, max=2},
+	default9i={add_mos={{image="terrain/grass/snowy_grass_inner_9_%02d.png", display_x=1, display_y=-1}}, min=1, max=2},
+
+	water8={add_mos={{image="terrain/grass/snowy_grass_2_%02d.png", display_y=-1}}, min=1, max=1},
+	water2={add_mos={{image="terrain/grass/snowy_grass_8_%02d.png", display_y=1}}, min=1, max=1},
+	water4={add_mos={{image="terrain/grass/snowy_grass_6_%02d.png", display_x=-1}}, min=1, max=1},
+	water6={add_mos={{image="terrain/grass/snowy_grass_4_%02d.png", display_x=1}}, min=1, max=1},
+
+	water1={add_mos={{image="terrain/grass/snowy_grass_9_%02d.png", display_x=-1, display_y=1}}, min=1, max=1},
+	water3={add_mos={{image="terrain/grass/snowy_grass_7_%02d.png", display_x=1, display_y=1}}, min=1, max=1},
+	water7={add_mos={{image="terrain/grass/snowy_grass_3_%02d.png", display_x=-1, display_y=-1}}, min=1, max=1},
+	water9={add_mos={{image="terrain/grass/snowy_grass_1_%02d.png", display_x=1, display_y=-1}}, min=1, max=1},
+
+	water1i={add_mos={{image="terrain/grass/snowy_grass_inner_1_%02d.png", display_x=-1, display_y=1}}, min=1, max=1},
+	water3i={add_mos={{image="terrain/grass/snowy_grass_inner_3_%02d.png", display_x=1, display_y=1}}, min=1, max=1},
+	water7i={add_mos={{image="terrain/grass/snowy_grass_inner_7_%02d.png", display_x=-1, display_y=-1}}, min=1, max=1},
+	water9i={add_mos={{image="terrain/grass/snowy_grass_inner_9_%02d.png", display_x=1, display_y=-1}}, min=1, max=1},
+},
+dark_grass = { method="borders", type="dark_grass", forbid={grass=true, lava=true, rock=true},
+	default8={add_mos={{image="terrain/grass/dark_grass_2_%02d.png", display_y=-1}}, min=1, max=2},
+	default2={add_mos={{image="terrain/grass/dark_grass_8_%02d.png", display_y=1}}, min=1, max=2},
+	default4={add_mos={{image="terrain/grass/dark_grass_6_%02d.png", display_x=-1}}, min=1, max=2},
+	default6={add_mos={{image="terrain/grass/dark_grass_4_%02d.png", display_x=1}}, min=1, max=2},
+
+	default1={add_mos={{image="terrain/grass/dark_grass_9_%02d.png", display_x=-1, display_y=1}}, min=1, max=1},
+	default3={add_mos={{image="terrain/grass/dark_grass_7_%02d.png", display_x=1, display_y=1}}, min=1, max=1},
+	default7={add_mos={{image="terrain/grass/dark_grass_3_%02d.png", display_x=-1, display_y=-1}}, min=1, max=1},
+	default9={add_mos={{image="terrain/grass/dark_grass_1_%02d.png", display_x=1, display_y=-1}}, min=1, max=1},
+
+	default1i={add_mos={{image="terrain/grass/dark_grass_inner_1_%02d.png", display_x=-1, display_y=1}}, min=1, max=2},
+	default3i={add_mos={{image="terrain/grass/dark_grass_inner_3_%02d.png", display_x=1, display_y=1}}, min=1, max=2},
+	default7i={add_mos={{image="terrain/grass/dark_grass_inner_7_%02d.png", display_x=-1, display_y=-1}}, min=1, max=2},
+	default9i={add_mos={{image="terrain/grass/dark_grass_inner_9_%02d.png", display_x=1, display_y=-1}}, min=1, max=2},
+
+	water8={add_mos={{image="terrain/grass/dark_grass_2_%02d.png", display_y=-1}}, min=1, max=1},
+	water2={add_mos={{image="terrain/grass/dark_grass_8_%02d.png", display_y=1}}, min=1, max=1},
+	water4={add_mos={{image="terrain/grass/dark_grass_6_%02d.png", display_x=-1}}, min=1, max=1},
+	water6={add_mos={{image="terrain/grass/dark_grass_4_%02d.png", display_x=1}}, min=1, max=1},
+
+	water1={add_mos={{image="terrain/grass/dark_grass_9_%02d.png", display_x=-1, display_y=1}}, min=1, max=1},
+	water3={add_mos={{image="terrain/grass/dark_grass_7_%02d.png", display_x=1, display_y=1}}, min=1, max=1},
+	water7={add_mos={{image="terrain/grass/dark_grass_3_%02d.png", display_x=-1, display_y=-1}}, min=1, max=1},
+	water9={add_mos={{image="terrain/grass/dark_grass_1_%02d.png", display_x=1, display_y=-1}}, min=1, max=1},
+
+	water1i={add_mos={{image="terrain/grass/dark_grass_inner_1_%02d.png", display_x=-1, display_y=1}}, min=1, max=1},
+	water3i={add_mos={{image="terrain/grass/dark_grass_inner_3_%02d.png", display_x=1, display_y=1}}, min=1, max=1},
+	water7i={add_mos={{image="terrain/grass/dark_grass_inner_7_%02d.png", display_x=-1, display_y=-1}}, min=1, max=1},
+	water9i={add_mos={{image="terrain/grass/dark_grass_inner_9_%02d.png", display_x=1, display_y=-1}}, min=1, max=1},
 },
 jungle_grass = { method="borders", type="jungle_grass", forbid={lava=true, rock=true, grass=true},
 	default8={add_mos={{image="terrain/jungle/jungle_grass_2_%02d.png", display_y=-1}}, min=1, max=5},
@@ -708,13 +787,34 @@ rift = { method="walls", type="riftwall", forbid={}, use_type=true, extended=tru
 	default4={add_displays={{image="terrain/rift/rift_ver_edge_left_01.png", display_x=-1}}, min=1, max=1},
 	default6={add_displays={{image="terrain/rift/rift_ver_edge_right_01.png", display_x=1}}, min=1, max=1},
 },
+
+grass_wm = { method="borders", type="grass", forbid={lava=true, rock=true},
+	default8={add_mos={{image="terrain/grass_worldmap/grass_2_%02d.png", display_y=-1}}, min=1, max=2},
+	default2={add_mos={{image="terrain/grass_worldmap/grass_8_%02d.png", display_y=1}}, min=1, max=2},
+	default4={add_mos={{image="terrain/grass_worldmap/grass_6_%02d.png", display_x=-1}}, min=1, max=2},
+	default6={add_mos={{image="terrain/grass_worldmap/grass_4_%02d.png", display_x=1}}, min=1, max=2},
+
+	default1={z=3,add_mos={{image="terrain/grass_worldmap/grass_9_%02d.png", display_x=-1, display_y=1}}, min=1, max=1},
+	default3={z=3,add_mos={{image="terrain/grass_worldmap/grass_7_%02d.png", display_x=1, display_y=1}}, min=1, max=1},
+	default7={z=3,add_mos={{image="terrain/grass_worldmap/grass_3_%02d.png", display_x=-1, display_y=-1}}, min=1, max=1},
+	default9={z=3,add_mos={{image="terrain/grass_worldmap/grass_1_%02d.png", display_x=1, display_y=-1}}, min=1, max=1},
+
+	default1i={add_mos={{image="terrain/grass_worldmap/grass_inner_1_%02d.png", display_x=-1, display_y=1}}, min=1, max=2},
+	default3i={add_mos={{image="terrain/grass_worldmap/grass_inner_3_%02d.png", display_x=1, display_y=1}}, min=1, max=2},
+	default7i={add_mos={{image="terrain/grass_worldmap/grass_inner_7_%02d.png", display_x=-1, display_y=-1}}, min=1, max=2},
+	default9i={add_mos={{image="terrain/grass_worldmap/grass_inner_9_%02d.png", display_x=1, display_y=-1}}, min=1, max=2},
+},
 }
 _M.generic_borders_defs = defs
 
 
 --- Make water have nice transition to other stuff
+local gtype = type
 function _M:editTileGenericBorders(level, i, j, g, nt, type)
-	local kind = nt.use_type and "type" or "subtype"
+	local kind
+	if gtype(nt.use_type) == "string" then kind = nt.use_type
+	else kind = nt.use_type and "type" or "subtype"
+	end
 	local g5 = level.map:checkEntity(i, j,   Map.TERRAIN, kind) or type
 	local g8 = level.map:checkEntity(i, j-1, Map.TERRAIN, kind) or type
 	local g2 = level.map:checkEntity(i, j+1, Map.TERRAIN, kind) or type
diff --git a/game/modules/tome/class/Object.lua b/game/modules/tome/class/Object.lua
index ae0585c88968010bfef71e0289a275e89318fbd0..ea4fc1d5889fb265b239deac4766bfec4edaa15f 100644
--- a/game/modules/tome/class/Object.lua
+++ b/game/modules/tome/class/Object.lua
@@ -332,7 +332,7 @@ function _M:descAccuracyBonus(desc, weapon, use_actor)
 	elseif kind == "mace" then
 		desc:add("Accuracy bonus: ", {"color","LIGHT_GREEN"}, showpct(0.1, m), {"color","LAST"}, " dam / acc", true)
 	elseif kind == "staff" then
-		desc:add("Accuracy bonus: ", {"color","LIGHT_GREEN"}, showpct(4, m), {"color","LAST"}, " procs dam / acc", true)
+		desc:add("Accuracy bonus: ", {"color","LIGHT_GREEN"}, showpct(2.5, m), {"color","LAST"}, " procs dam / acc", true)
 	elseif kind == "knife" then
 		desc:add("Accuracy bonus: ", {"color","LIGHT_GREEN"}, showpct(0.5, m), {"color","LAST"}, " APR / acc", true)
 	end
diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua
index f23c5ad657f5d91f916dee925f0b432e6e40c417..3bc3a237ba24c2651f40ca76426dcc02c335568b 100644
--- a/game/modules/tome/class/Player.lua
+++ b/game/modules/tome/class/Player.lua
@@ -94,6 +94,26 @@ function _M:init(t, no_default)
 	self.talent_kind_log = self.talent_kind_log or {}
 end
 
+function _M:registerOnBirthForceWear(data)
+	self._on_birth = self._on_birth or {}
+	self._on_birth[#self._on_birth+1] = function()
+		local o = game.zone:makeEntityByName(game.level, "object", data, true)
+		o:identify(true)
+		local ro = self:wearObject(o, true, true)
+		if ro then
+			if type(ro) == "table" then self:addObject(self:getInven(self.INVEN_INVEN), ro) end
+		elseif not ro then
+			self:addObject(self:getInven(self.INVEN_INVEN), o)
+		end
+
+	end
+end
+
+function _M:registerOnBirth(f)
+	self._on_birth = self._on_birth or {}
+	self._on_birth[#self._on_birth+1] = f
+end
+
 function _M:onBirth(birther)
 	-- Make a list of random escort levels
 	local race_def = birther.birth_descriptor_def.race[self.descriptor.race]
@@ -110,6 +130,9 @@ function _M:onBirth(birther)
 			self.random_escort_levels[z[1]][z[2]] = true
 		end
 	end
+
+	for i, f in ipairs(self._on_birth or {}) do f(self, birther) end
+	self._on_birth = nil
 end
 
 function _M:onEnterLevel(zone, level)
@@ -567,14 +590,16 @@ function _M:playerFOV()
 		self:computeFOV(self.sight or 10, "block_sight", function(x, y, dx, dy, sqdist)
 			game.level.map:apply(x, y, fovdist[sqdist])
 		end, true, false, true)
+		local lradius = self.lite
+		if self.radiance_aura and lradius < self.radiance_aura then lradius = self.radiance_aura end
 		if self.lite <= 0 then game.level.map:applyLite(self.x, self.y)
-		else self:computeFOV(self.lite + bonus, "block_sight", function(x, y, dx, dy, sqdist) game.level.map:applyLite(x, y) end, true, true, true) end
+		else self:computeFOV(lradius + bonus, "block_sight", function(x, y, dx, dy, sqdist) game.level.map:applyLite(x, y) end, true, true, true) end
 
 		-- For each entity, generate lite
 		local uid, e = next(game.level.entities)
 		while uid do
-			if e ~= self and e.lite and e.lite > 0 and e.computeFOV then
-				e:computeFOV(e.lite, "block_sight", function(x, y, dx, dy, sqdist) game.level.map:applyExtraLite(x, y, fovdist[sqdist]) end, true, true)
+			if e ~= self and ((e.lite and e.lite > 0) or (e.radiance_aura and e.radiance_aura > 0)) and e.computeFOV then
+				e:computeFOV(math.max(e.lite or 0, e.radiance_aura or 0), "block_sight", function(x, y, dx, dy, sqdist) game.level.map:applyExtraLite(x, y, fovdist[sqdist]) end, true, true)
 			end
 			uid, e = next(game.level.entities, uid)
 		end
@@ -871,9 +896,7 @@ function _M:restCheck()
 
 	-- Reload
 	local ammo = self:hasAmmo()
-	if self.resting.cnt == 0 and ammo and ammo.combat.shots_left < ammo.combat.capacity and not self:hasEffect(self.EFF_RELOADING) and self:knowTalent(self.T_RELOAD) then
-		self:forceUseTalent(self.T_RELOAD, {ignore_energy=true})
-	end
+	if ammo and ammo.combat.shots_left < ammo.combat.capacity then return true end
 
 	-- Check resources, make sure they CAN go up, otherwise we will never stop
 	if not self.resting.rest_turns then
diff --git a/game/modules/tome/class/UserChatExtension.lua b/game/modules/tome/class/UserChatExtension.lua
index 1667afc37be02604ba4283804f2351b6fe8300ee..152a4db45b7657b24bef33ba526df51bc47f3566 100644
--- a/game/modules/tome/class/UserChatExtension.lua
+++ b/game/modules/tome/class/UserChatExtension.lua
@@ -75,23 +75,6 @@ function _M:event(e)
 			self.chat:addMessage("link", e.channel, e.login, {e.name, color}, "#ANTIQUE_WHITE#has linked a creature: #WHITE# "..data.name, {mode="tooltip", tooltip=data.desc})
 		elseif data.kind == "killer-link" then
 			self.chat:addMessage("death", e.channel, e.login, {e.name, color}, "#CRIMSON#"..data.msg.."#WHITE#", data.desc and {mode="tooltip", tooltip=data.desc} or nil)
-		elseif data.kind == "donator-update" and data.donated > 0 then
-			if data.donated <= 5 then world:gainAchievement("BRONZE_DONATOR", game:getPlayer(true))
-			elseif data.donated <= 15 then world:gainAchievement("SILVER_DONATOR", game:getPlayer(true))
-			elseif data.donated <= 30 then world:gainAchievement("GOLD_DONATOR", game:getPlayer(true))
-			elseif data.donated <= 60 then world:gainAchievement("STRALITE_DONATOR", game:getPlayer(true))
-			else world:gainAchievement("VORATUN_DONATOR", game:getPlayer(true))
-			end
-
-			local text = ([[#{bold}#Thank you#{normal}# for you donation, your support means a lot for the continued survival of this game.
-
-Your current donation total is #LIGHT_GREEN#%0.2f euro#WHITE# which equals to #ROYAL_BLUE#%d voratun coins to use on te4.org.
-Your Item's Vault has #TEAL#%d slots#WHITE#.
-
-Again, thank you, and enjoy Eyal!
-
-#{italic}#Your malevolent local god of darkness, #GOLD#DarkGod#{normal}#]]):format(data.donated, data.donated * 10, data.items_vault_slots)
-			Dialog:simpleLongPopup("Thank you", text, 600)
 		end
 	end
 end
diff --git a/game/modules/tome/class/interface/Archery.lua b/game/modules/tome/class/interface/Archery.lua
index 7b217813d7d71c612e59e2ebe41163e8c3c70ea8..f9c21c2ed6b1b408ec1163d6a3fc3d16ebeef44a 100644
--- a/game/modules/tome/class/interface/Archery.lua
+++ b/game/modules/tome/class/interface/Archery.lua
@@ -182,7 +182,7 @@ local function archery_projectile(tx, ty, tg, self, tmp)
 	self.turn_procs.weapon_type = {kind=weapon and weapon.talented or "unknown", mode="archery"}
 
 	-- Does the blow connect? yes .. complex :/
-	if tg.archery.use_psi_archery then self.use_psi_combat = true end
+	if tg.archery.use_psi_archery then self:attr("use_psi_combat", 1) end
 	local atk, def = self:combatAttackRanged(weapon, ammo), target:combatDefenseRanged()
 	local dam, apr, armor = self:combatDamage(ammo), self:combatAPR(ammo) + (weapon and weapon.apr or 0), target:combatArmor()
 	atk = atk + (tg.archery.atk or 0)
@@ -429,7 +429,7 @@ local function archery_projectile(tx, ty, tg, self, tmp)
 	end
 
 	-- Conduit (Psi)
-	if hitted and not target.dead and self:knowTalent(self.T_CONDUIT) and self:isTalentActive(self.T_CONDUIT) and self.use_psi_combat then
+	if hitted and not target.dead and self:knowTalent(self.T_CONDUIT) and self:isTalentActive(self.T_CONDUIT) and self:attr("use_psi_combat") then
 		local t =  self:getTalentFromId(self.T_CONDUIT)
 		--t.do_combat(self, t, target)
 		local mult = 1 + 0.2*(self:getTalentLevel(t))
@@ -494,7 +494,7 @@ local function archery_projectile(tx, ty, tg, self, tmp)
 	end
 
 	self.turn_procs.weapon_type = nil
-	self.use_psi_combat = false
+	if tg.archery.use_psi_archery then self:attr("use_psi_combat", -1) end
 end
 -- Store it for addons
 _M.archery_projectile = archery_projectile
@@ -613,3 +613,55 @@ function _M:hasAmmo(type)
 	if type and ammo.archery_ammo ~= type then return nil, "bad type" end
 	return ammo
 end
+
+--- Get the ammo in the quick slot.
+function _M:hasAmmoQS(type)
+	if not self:getInven("QS_QUIVER") then return nil, "no ammo" end
+	local ammo = self:getInven("QS_QUIVER")[1]
+
+	if not ammo then return nil, "no ammo" end
+	if not ammo.archery_ammo then return nil, "bad ammo" end
+	if not ammo.combat then return nil, "bad ammo" end
+	if not ammo.combat.capacity then return nil, "bad ammo" end
+	if type and ammo.archery_ammo ~= type then return nil, "bad type" end
+	return ammo
+end
+
+-- Get the current reload rate.
+function _M:reloadRate()
+	return 1 + (self.ammo_reload_speed or 0) + (self.ammo_mastery_reload or 0)
+end
+
+-- Get the current reload rate for the quick slot ammo.
+function _M:reloadRateQS()
+	local ammo_main = self:hasAmmo()
+	local ammo_qs = self:hasAmmoQS()
+	local add = 0
+	if ammo_main and ammo_main.wielder and ammo_main.wielder.ammo_reload_speed then
+		add = add - ammo_main.wielder.ammo_reload_speed
+	end
+	if ammo_qs and ammo_qs.wielder and ammo_qs.wielder.ammo_reload_speed then
+		add = add + ammo_qs.wielder.ammo_reload_speed
+	end
+	return self:reloadRate() + add
+end
+
+-- Increase ammo by reload amount. Returns true if actually reloaded.
+function _M:reload()
+	local ammo, err = self:hasAmmo()
+	if not ammo then return end
+	if ammo.combat.shots_left >= ammo.combat.capacity then return end
+	local reloads = self:reloadRateQS()
+	ammo.combat.shots_left = math.min(ammo.combat.capacity, ammo.combat.shots_left + reloads)
+	return true
+end
+
+-- Increase qs ammo by reload amount. Returns true if actually reloaded.
+function _M:reloadQS()
+	local ammo, err = self:hasAmmoQS()
+	if not ammo then return end
+	if ammo.combat.shots_left >= ammo.combat.capacity then return end
+	local reloads = self:reloadRateQS()
+	ammo.combat.shots_left = math.min(ammo.combat.capacity, ammo.combat.shots_left + reloads)
+	return true
+end
diff --git a/game/modules/tome/class/interface/Combat.lua b/game/modules/tome/class/interface/Combat.lua
index 7d7526eac244d651383dc72cd015566137c4da1a..ca69b2c2cc2ef3426b5034845b29a0a70149f2f5 100644
--- a/game/modules/tome/class/interface/Combat.lua
+++ b/game/modules/tome/class/interface/Combat.lua
@@ -318,6 +318,7 @@ end
 --- Try to totally evade an attack
 function _M:checkEvasion(target)
 	if not target:attr("evasion") or self == target then return end
+	if target:attr("no_evasion") then return end
 
 	local evasion = target:attr("evasion")
 	print("checkEvasion", evasion, target.level, self.level)
@@ -400,7 +401,7 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
 	elseif self:checkEvasion(target) then
 		evaded = true
 		self:logCombat(target, "#Target# evades #Source#.")
-	elseif self.turn_procs.auto_melee_hit or (self:checkHit(atk, def) and (self:canSee(target) or self:attr("blind_fight") or rng.chance(3))) then
+	elseif self.turn_procs.auto_melee_hit or (self:checkHit(atk, def) and (self:canSee(target) or self:attr("blind_fight") or target:attr("blind_fighted") or rng.chance(3))) then
 		local pres = util.bound(target:combatArmorHardiness() / 100, 0, 1)
 		if target.knowTalent and target:hasEffect(target.EFF_DUAL_WEAPON_DEFENSE) then
 			local deflect = math.min(dam, target:callTalent(target.T_DUAL_WEAPON_DEFENSE, "doDeflect"))
@@ -508,12 +509,12 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
 			dam = dam + total_conversion
 		end
 
-		target:fireTalentCheck("callbackOnMeleeHit", self)
+		target:fireTalentCheck("callbackOnMeleeHit", self, dam)
 
 		hitted = true
 	else
 		self:logCombat(target, "#Source# misses #Target#.")
-		target:fireTalentCheck("callbackOnMeleeMiss", self)
+		target:fireTalentCheck("callbackOnMeleeMiss", self, dam)
 	end
 
 	-- cross-tier effect for accuracy vs. defense
@@ -533,7 +534,7 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
 ]]
 
 	if self:isAccuracyEffect(weapon, "staff") then
-		local bonus = 1 + self:getAccuracyEffect(weapon, atk, def, 0.04, 2)
+		local bonus = 1 + self:getAccuracyEffect(weapon, atk, def, 0.025, 2)
 		print("[ATTACK] staff accuracy bonus", atk, def, "=", bonus)
 		self.__global_accuracy_damage_bonus = bonus
 	end
@@ -642,7 +643,7 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
 		target.invulnerable = 1 -- Target already hit, don't damage it twice
 		self:project({type="ball", radius=1, selffire=false}, target.x, target.y, DamageType.PHYSICAL, dam)
 		target.invulnerable = invuln
-		self:incStamina(-15)
+		self:incStamina(-8)
 		self.shattering_impact_last_turn = game.turn
 	end
 	
@@ -731,7 +732,7 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
 	end
 
 	-- Conduit (Psi)
-	if hitted and not target.dead and self:knowTalent(self.T_CONDUIT) and self:isTalentActive(self.T_CONDUIT) and self.use_psi_combat then
+	if hitted and not target.dead and self:knowTalent(self.T_CONDUIT) and self:isTalentActive(self.T_CONDUIT) and self:attr("use_psi_combat") then
 		local t = self:getTalentFromId(self.T_CONDUIT)
 		t.do_combat(self, t, target)
 	end
@@ -1124,7 +1125,7 @@ function _M:combatAttackBase(weapon, ammo)
 end
 function _M:combatAttack(weapon, ammo)
 	local stats
-	if self.use_psi_combat then stats = self:getCun(100, true) - 10
+	if self:attr("use_psi_combat") then stats = self:getCun(100, true) - 10
 	elseif weapon and weapon.wil_attack then stats = self:getWil(100, true) - 10
 	else stats = self:getDex(100, true) - 10
 	end
@@ -1135,7 +1136,7 @@ end
 
 function _M:combatAttackRanged(weapon, ammo)
 	local stats
-	if self.use_psi_combat then stats = self:getCun(100, true) - 10
+	if self:attr("use_psi_combat") then stats = self:getCun(100, true) - 10
 	elseif weapon and weapon.wil_attack then stats = self:getWil(100, true) - 10
 	else stats = self:getDex(100, true) - 10
 	end
@@ -1381,8 +1382,8 @@ function _M:combatDamage(weapon, adddammod)
 	local dammod = weapon.dammod or {str=0.6}
 	for stat, mod in pairs(dammod) do
 		if sub_cun_to_str and stat == "str" then stat = "cun" end
-		if self.use_psi_combat and stat == "str" then stat = "wil" end
-		if self.use_psi_combat and stat == "dex" then stat = "cun" end
+		if self:attr("use_psi_combat") and stat == "str" then stat = "wil" end
+		if self:attr("use_psi_combat") and stat == "dex" then stat = "cun" end
 		totstat = totstat + self:getStat(stat) * mod
 	end
 	if adddammod then
@@ -1390,14 +1391,6 @@ function _M:combatDamage(weapon, adddammod)
 			totstat = totstat + self:getStat(stat) * mod
 		end
 	end
-	if self.use_psi_combat then
-		if self:knowTalent(self.T_GREATER_TELEKINETIC_GRASP) then
-			local g = self:getTalentFromId(self.T_GREATER_TELEKINETIC_GRASP)
-			totstat = totstat * g.stat_sub(self, g)
-		else
-			totstat = totstat * 0.6
-		end
-	end
 
 	if self:knowTalent(self.T_SUPERPOWER) then
 		totstat = totstat + self:getStat("wil") * 0.3
@@ -1641,7 +1634,7 @@ function _M:physicalCrit(dam, weapon, target, atk, def, add_chance, crit_power_a
 
 		if self:knowTalent(self.T_EYE_OF_THE_TIGER) then self:triggerTalent(self.T_EYE_OF_THE_TIGER, nil, "physical") end
 
-		self:fireTalentCheck("callbackOnCrit", "physical", dam, chance)
+		self:fireTalentCheck("callbackOnCrit", "physical", dam, chance, target)
 	end
 	return dam, crit
 end
@@ -2251,26 +2244,36 @@ end
 -- Starts the grapple
 function _M:startGrapple(target)
 	-- pulls boosted grapple effect from the clinch talent if known
+	local grappledParam = {src = self, apply_power = 1, silence = 0, power = 1, slow = 0, reduction = 0}
+	local grappleParam = {sharePct = 0, drain = 0, trgt = target }
+	local duration = 5
 	if self:knowTalent(self.T_CLINCH) then
 		local t = self:getTalentFromId(self.T_CLINCH)
-		power = t.getPower(self, t)
+		if self:knowTalent(self.T_CRUSHING_HOLD) then
+			local t2 = self:getTalentFromId(self.T_CRUSHING_HOLD)
+			grappledParam = t2.getBonusEffects(self, t2) -- get the 4 bonus parameters first
+		end
+		local power = self:physicalCrit(t.getPower(self, t), nil, target, self:combatAttack(), target:combatDefense())
+		grappledParam["power"] = power -- damage/turn set by Clinch
 		duration = t.getDuration(self, t)
-		hitbonus = self:getTalentLevel(t)/2
-	else
-		power = 5
-		duration = 4
-		hitbonus = 0
+
+		grappleParam["drain"] = t.getDrain(self, t) -- stamina/turn set by Clinch
+		grappleParam["sharePct"] = t.getSharePct(self, t) -- damage shared with grappled set by Clinch
+
 	end
+	-- oh for the love of god why didn't I rewrite this entire structure
+	grappledParam["src"] = self
+	grappledParam["apply_power"] = self:combatPhysicalpower()
 	-- Breaks the grapple before reapplying
 	if self:hasEffect(self.EFF_GRAPPLING) then
 		self:removeEffect(self.EFF_GRAPPLING, true)
-		target:setEffect(target.EFF_GRAPPLED, duration, {src=self, power=power}, true)
-		self:setEffect(self.EFF_GRAPPLING, duration, {trgt=target}, true)
+		target:setEffect(target.EFF_GRAPPLED, duration, grappledParam, true)
+		self:setEffect(self.EFF_GRAPPLING, duration, grappleParam, true)
 		return true
 	elseif target:canBe("pin") then
-		target:setEffect(target.EFF_GRAPPLED, duration, {src=self, power=power, apply_power=self:combatPhysicalpower()})
+		target:setEffect(target.EFF_GRAPPLED, duration, grappledParam)
 		target:crossTierEffect(target.EFF_GRAPPLED, self:combatPhysicalpower())
-		self:setEffect(self.EFF_GRAPPLING, duration, {trgt=target})
+		self:setEffect(self.EFF_GRAPPLING, duration, grappleParam)
 		return true
 	else
 		game.logSeen(target, "%s resists the grapple!", target.name:capitalize())
diff --git a/game/modules/tome/data/achievements/quests.lua b/game/modules/tome/data/achievements/quests.lua
index 10e4fa33a975305629ee4815fc54c5de999fd6bb..879023594e654515e5689c9bb342f3072cfce1ec 100644
--- a/game/modules/tome/data/achievements/quests.lua
+++ b/game/modules/tome/data/achievements/quests.lua
@@ -146,6 +146,16 @@ newAchievement{
 	show = "full", huge=true,
 	desc = [[Win the game without ever setting foot on Maj'Eyal.]],
 }
+newAchievement{
+	name = "Bikining along!", id = "WIN_BIKINI",
+	show = "full", huge=true,
+	desc = [[Won the game without ever taking off her bikini.]],
+}
+newAchievement{
+	name = "Mankining it happen!", id = "WIN_MANKINI",
+	show = "full", huge=true,
+	desc = [[Won the game without ever taking off his mankini.]],
+}
 
 -------------- Other quests
 newAchievement{
diff --git a/game/modules/tome/data/birth/classes/celestial.lua b/game/modules/tome/data/birth/classes/celestial.lua
index d5f8a6b3b705a742d1e41b7ffb3e8e924a9aa812..4658924699fca4fcc500d2ec55c9c41986481cfb 100644
--- a/game/modules/tome/data/birth/classes/celestial.lua
+++ b/game/modules/tome/data/birth/classes/celestial.lua
@@ -78,6 +78,8 @@ newBirthDescriptor{
 		["celestial/combat"]={true, 0.3},
 		["celestial/light"]={true, 0.3},
 		["celestial/guardian"]={false, 0.3},
+		["celestial/radiance"]={false, 0.3},
+		["celestial/crusader"]={true, 0.3},
 	},
 	birth_example_particles = "golden_shield",
 	talents = {
diff --git a/game/modules/tome/data/birth/classes/warrior.lua b/game/modules/tome/data/birth/classes/warrior.lua
index e4367675f418ffb8265d0b7e4fff1467f1e3b527..b299a928fc87b5cfb66bab5df4d889d93c70e448 100644
--- a/game/modules/tome/data/birth/classes/warrior.lua
+++ b/game/modules/tome/data/birth/classes/warrior.lua
@@ -59,8 +59,8 @@ newBirthDescriptor{
 	talents_types = {
 		["technique/archery-training"]={false, 0.1},
 		["technique/shield-defense"]={false, -0.1},
-		["technique/2hweapon-offense"]={true, 0.3},
-		["technique/2hweapon-cripple"]={true, 0.3},
+		["technique/2hweapon-assault"]={true, 0.3},
+		["technique/strength-of-the-berserker"]={true, 0.3},
 		["technique/combat-techniques-active"]={true, 0.3},
 		["technique/combat-techniques-passive"]={true, 0.3},
 		["technique/combat-training"]={true, 0.3},
@@ -73,8 +73,8 @@ newBirthDescriptor{
 		["cunning/dirty"]={false, 0},
 	},
 	talents = {
-		[ActorTalents.T_DEATH_DANCE] = 1,
-		[ActorTalents.T_STUNNING_BLOW] = 1,
+		[ActorTalents.T_WARSHOUT_BERSERKER] = 1,
+		[ActorTalents.T_STUNNING_BLOW_ASSAULT] = 1,
 		[ActorTalents.T_WEAPON_COMBAT] = 1,
 		[ActorTalents.T_ARMOUR_TRAINING] = 1,
 	},
diff --git a/game/modules/tome/data/birth/descriptors.lua b/game/modules/tome/data/birth/descriptors.lua
index 23e92c392b31a84f44f4080cf9214e9597382694..1467261ca1ac27f772ccc51af3ba91a2f6a560e3 100644
--- a/game/modules/tome/data/birth/descriptors.lua
+++ b/game/modules/tome/data/birth/descriptors.lua
@@ -227,6 +227,10 @@ newBirthDescriptor{
 		__game_difficulty = 4,
 		rank = 2,
 	},
+	game_state = {
+		default_random_rare_chance = 3,
+		default_random_boss_chance = 20,
+	},
 }
 newBirthDescriptor{
 	type = "difficulty",
diff --git a/game/modules/tome/data/birth/races/construct.lua b/game/modules/tome/data/birth/races/construct.lua
index 5ac96e753630418c8b423d9426133a341b1ec38e..935093d896cb04d7ad65f1921bfab0f56c96cbb2 100644
--- a/game/modules/tome/data/birth/races/construct.lua
+++ b/game/modules/tome/data/birth/races/construct.lua
@@ -108,7 +108,20 @@ newBirthDescriptor
 		construct = 1,
 
 		moddable_tile = "runic_golem",
-		moddable_tile_nude = true,
+		moddable_tile_nude = 1,
 	},
 	experience = 1.5,
+
+	cosmetic_unlock = {
+		cosmetic_bikini =  {
+			{name="Bikini [donator only]", donator=true, on_actor=function(actor, birther, last)
+				if not last then local o = birther.obj_list_by_name.Bikini if not o then print("No bikini found!") return end actor:getInven(actor.INVEN_BODY)[1] = o:cloneFull()
+				else actor:registerOnBirthForceWear("FUN_BIKINI") end
+			end, check=function(birth) return birth.descriptors_by_type.sex == "Female" end},
+			{name="Mankini [donator only]", donator=true, on_actor=function(actor, birther, last)
+				if not last then local o = birther.obj_list_by_name.Mankini if not o then print("No mankini found!") return end actor:getInven(actor.INVEN_BODY)[1] = o:cloneFull()
+				else actor:registerOnBirthForceWear("FUN_MANKINI") end
+			end, check=function(birth) return birth.descriptors_by_type.sex == "Male" end},
+		},
+	},
 }
diff --git a/game/modules/tome/data/birth/races/dwarf.lua b/game/modules/tome/data/birth/races/dwarf.lua
index c0966273f9a75fc83970e739ddcc1e3cf0e56b66..8352e107334a134d88958753a8c7cc79e9aa10eb 100644
--- a/game/modules/tome/data/birth/races/dwarf.lua
+++ b/game/modules/tome/data/birth/races/dwarf.lua
@@ -63,6 +63,16 @@ newBirthDescriptor{
 			{priority=1, name="Redhead [donator only]", donator=true, on_actor=function(actor) if actor.moddable_tile then actor.is_redhead = true actor.moddable_tile_base = "base_redhead_01.png" actor.moddable_tile_ornament2={male="beard_redhead_02"} end end, check=function(birth) return birth.descriptors_by_type.sex == "Male" end},
 			{priority=1, name="Redhead [donator only]", donator=true, on_actor=function(actor) if actor.moddable_tile then actor.is_redhead = true actor.is_redhead = true actor.moddable_tile_base = "base_redhead_01.png" actor.moddable_tile_ornament2={female="braid_redhead_01"} end end, check=function(birth) return birth.descriptors_by_type.sex == "Female" end},
 		},
+		cosmetic_bikini =  {
+			{name="Bikini [donator only]", donator=true, on_actor=function(actor, birther, last)
+				if not last then local o = birther.obj_list_by_name.Bikini if not o then print("No bikini found!") return end actor:getInven(actor.INVEN_BODY)[1] = o:cloneFull()
+				else actor:registerOnBirthForceWear("FUN_BIKINI") end
+			end, check=function(birth) return birth.descriptors_by_type.sex == "Female" end},
+			{name="Mankini [donator only]", donator=true, on_actor=function(actor, birther, last)
+				if not last then local o = birther.obj_list_by_name.Mankini if not o then print("No mankini found!") return end actor:getInven(actor.INVEN_BODY)[1] = o:cloneFull()
+				else actor:registerOnBirthForceWear("FUN_MANKINI") end
+			end, check=function(birth) return birth.descriptors_by_type.sex == "Male" end},
+		},
 	},
 }
 
diff --git a/game/modules/tome/data/birth/races/elf.lua b/game/modules/tome/data/birth/races/elf.lua
index aedebe9deb16c788ef01fb84f50eb12e84408d1c..f3fec61f3f751235daf503e6e3d0c01fd56f918f 100644
--- a/game/modules/tome/data/birth/races/elf.lua
+++ b/game/modules/tome/data/birth/races/elf.lua
@@ -59,6 +59,16 @@ newBirthDescriptor{
 			{name="Redhead [donator only]", donator=true, on_actor=function(actor) if actor.moddable_tile then actor.moddable_tile_base = "base_redhead_01.png" end end, check=function(birth) return birth.descriptors_by_type.sex == "Male" end},
 			{name="Redhead [donator only]", donator=true, on_actor=function(actor) if actor.moddable_tile then actor.moddable_tile_base = "base_redhead_01.png" actor.moddable_tile_ornament={female="braid_redhead_02"} end end, check=function(birth) return birth.descriptors_by_type.sex == "Female" end},
 		},
+		cosmetic_bikini =  {
+			{name="Bikini [donator only]", donator=true, on_actor=function(actor, birther, last)
+				if not last then local o = birther.obj_list_by_name.Bikini if not o then print("No bikini found!") return end actor:getInven(actor.INVEN_BODY)[1] = o:cloneFull()
+				else actor:registerOnBirthForceWear("FUN_BIKINI") end
+			end, check=function(birth) return birth.descriptors_by_type.sex == "Female" end},
+			{name="Mankini [donator only]", donator=true, on_actor=function(actor, birther, last)
+				if not last then local o = birther.obj_list_by_name.Mankini if not o then print("No mankini found!") return end actor:getInven(actor.INVEN_BODY)[1] = o:cloneFull()
+				else actor:registerOnBirthForceWear("FUN_MANKINI") end
+			end, check=function(birth) return birth.descriptors_by_type.sex == "Male" end},
+		},
 	},
 }
 
diff --git a/game/modules/tome/data/birth/races/halfling.lua b/game/modules/tome/data/birth/races/halfling.lua
index 402460c40f3148aa90c4fa54815879e9de1f5f13..d56efbe499481769504e147d715c1c3d6d7fe43d 100644
--- a/game/modules/tome/data/birth/races/halfling.lua
+++ b/game/modules/tome/data/birth/races/halfling.lua
@@ -60,6 +60,16 @@ newBirthDescriptor{
 		cosmetic_race_human_redhead = {
 			{name="Redhead [donator only]", donator=true, on_actor=function(actor) if actor.moddable_tile then actor.moddable_tile_base = "base_redhead_01.png" end end},
 		},
+		cosmetic_bikini =  {
+			{name="Bikini [donator only]", donator=true, on_actor=function(actor, birther, last)
+				if not last then local o = birther.obj_list_by_name.Bikini if not o then print("No bikini found!") return end actor:getInven(actor.INVEN_BODY)[1] = o:cloneFull()
+				else actor:registerOnBirthForceWear("FUN_BIKINI") end
+			end, check=function(birth) return birth.descriptors_by_type.sex == "Female" end},
+			{name="Mankini [donator only]", donator=true, on_actor=function(actor, birther, last)
+				if not last then local o = birther.obj_list_by_name.Mankini if not o then print("No mankini found!") return end actor:getInven(actor.INVEN_BODY)[1] = o:cloneFull()
+				else actor:registerOnBirthForceWear("FUN_MANKINI") end
+			end, check=function(birth) return birth.descriptors_by_type.sex == "Male" end},
+		},
 	},
 }
 
diff --git a/game/modules/tome/data/birth/races/human.lua b/game/modules/tome/data/birth/races/human.lua
index 5620526762308fe4e28bbab9d34aa6e74112b7e1..c3e4c724069065ea16db72a9d0b325d36a4be3cb 100644
--- a/game/modules/tome/data/birth/races/human.lua
+++ b/game/modules/tome/data/birth/races/human.lua
@@ -62,6 +62,16 @@ newBirthDescriptor{
 			{name="Redhead [donator only]", donator=true, on_actor=function(actor) if actor.moddable_tile then actor.moddable_tile_base = "base_redhead_01.png" end end},
 			{name="Red braids [donator only]", donator=true, on_actor=function(actor) if actor.moddable_tile then actor.moddable_tile_ornament = {female="braid_redhead_01"} end end, check=function(birth) return birth.descriptors_by_type.sex == "Female" end},
 		},
+		cosmetic_bikini =  {
+			{name="Bikini [donator only]", donator=true, on_actor=function(actor, birther, last)
+				if not last then local o = birther.obj_list_by_name.Bikini if not o then print("No bikini found!") return end actor:getInven(actor.INVEN_BODY)[1] = o:cloneFull()
+				else actor:registerOnBirthForceWear("FUN_BIKINI") end
+			end, check=function(birth) return birth.descriptors_by_type.sex == "Female" end},
+			{name="Mankini [donator only]", donator=true, on_actor=function(actor, birther, last)
+				if not last then local o = birther.obj_list_by_name.Mankini if not o then print("No mankini found!") return end actor:getInven(actor.INVEN_BODY)[1] = o:cloneFull()
+				else actor:registerOnBirthForceWear("FUN_MANKINI") end
+			end, check=function(birth) return birth.descriptors_by_type.sex == "Male" end},
+		},
 	},
 }
 
diff --git a/game/modules/tome/data/birth/races/undead.lua b/game/modules/tome/data/birth/races/undead.lua
index ef8193cf68f8780a9162fc9a6cb4a22f508057a6..d3900df63cfb100c635d2a1f9944e4da991d5002 100644
--- a/game/modules/tome/data/birth/races/undead.lua
+++ b/game/modules/tome/data/birth/races/undead.lua
@@ -69,6 +69,18 @@ newBirthDescriptor{
 			{type="scroll", subtype="rune", name="phase door rune", ego_chance=-1000, ego_chance=-1000}}), -- keep this in inventory incase people actually want it, can't add it baseline because some classes start with 3 inscribed
 	},
 
+	cosmetic_unlock = {
+		cosmetic_bikini =  {
+			{name="Bikini [donator only]", donator=true, on_actor=function(actor, birther, last)
+				if not last then local o = birther.obj_list_by_name.Bikini if not o then print("No bikini found!") return end actor:getInven(actor.INVEN_BODY)[1] = o:cloneFull()
+				else actor:registerOnBirthForceWear("FUN_BIKINI") end
+			end, check=function(birth) return birth.descriptors_by_type.sex == "Female" end},
+			{name="Mankini [donator only]", donator=true, on_actor=function(actor, birther, last)
+				if not last then local o = birther.obj_list_by_name.Mankini if not o then print("No mankini found!") return end actor:getInven(actor.INVEN_BODY)[1] = o:cloneFull()
+				else actor:registerOnBirthForceWear("FUN_MANKINI") end
+			end, check=function(birth) return birth.descriptors_by_type.sex == "Male" end},
+		},
+	},
 	
 	random_escort_possibilities = { {"tier1.1", 1, 2}, {"tier1.2", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
 }
@@ -122,7 +134,7 @@ newBirthDescriptor
 		fear_immune = 1,
 		global_speed_base = 0.8,
 		moddable_tile = "ghoul",
-		moddable_tile_nude = true,
+		moddable_tile_nude = 1,
 	},
 	experience = 1.25,
 }
@@ -174,7 +186,7 @@ newBirthDescriptor
 		no_breath = 1,
 		blood_color = colors.GREY,
 		moddable_tile = "skeleton",
-		moddable_tile_nude = true,
+		moddable_tile_nude = 1,
 	},
 	experience = 1.4,
 }
diff --git a/game/modules/tome/data/birth/races/yeek.lua b/game/modules/tome/data/birth/races/yeek.lua
index 69072b2a140849281435c667d7f16abd1a94f8f4..063357e1f23e6df6f35086f12a064f9439da2e80 100644
--- a/game/modules/tome/data/birth/races/yeek.lua
+++ b/game/modules/tome/data/birth/races/yeek.lua
@@ -56,6 +56,19 @@ newBirthDescriptor{
 	},
 	random_escort_possibilities = { {"tier1.1", 1, 2}, {"tier1.2", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
 	moddable_attachement_spots = "race_yeek", moddable_attachement_spots_sexless=true,
+
+	cosmetic_unlock = {
+		cosmetic_bikini =  {
+			{name="Bikini [donator only]", donator=true, on_actor=function(actor, birther, last)
+				if not last then local o = birther.obj_list_by_name.Bikini if not o then print("No bikini found!") return end actor:getInven(actor.INVEN_BODY)[1] = o:cloneFull()
+				else actor:registerOnBirthForceWear("FUN_BIKINI") end
+			end, check=function(birth) return birth.descriptors_by_type.sex == "Female" end},
+			{name="Mankini [donator only]", donator=true, on_actor=function(actor, birther, last)
+				if not last then local o = birther.obj_list_by_name.Mankini if not o then print("No mankini found!") return end actor:getInven(actor.INVEN_BODY)[1] = o:cloneFull()
+				else actor:registerOnBirthForceWear("FUN_MANKINI") end
+			end, check=function(birth) return birth.descriptors_by_type.sex == "Male" end},
+		},
+	},
 }
 
 ---------------------------------------------------------
diff --git a/game/modules/tome/data/chats/melinda-fortress.lua b/game/modules/tome/data/chats/melinda-fortress.lua
index 3a9c45d742c347cd54c677a2d7f132687fddff2e..240e6ad23c752f97cffc24d8f767a7df6011989d 100644
--- a/game/modules/tome/data/chats/melinda-fortress.lua
+++ b/game/modules/tome/data/chats/melinda-fortress.lua
@@ -77,6 +77,7 @@ Now my sweet one, where were we the last time?]],
 		{"My memory fails me, care to help me remember? #LIGHT_GREEN#[smile playfully at her]", action=function(npc, player)
 			player:setQuestStatus("love-melinda", engine.Quest.COMPLETED, "portal-done")
 			world:gainAchievement("MELINDA_LUCKY", player)
+			game:setAllowedBuild("cosmetic_bikini", true)
 		end},
 	}
 }
diff --git a/game/modules/tome/data/damage_types.lua b/game/modules/tome/data/damage_types.lua
index 6e3ca7497e0c362779cb6f79dd599e33eec82179..6b5dff5d6030db97a5761894f1547dfe063ae097 100644
--- a/game/modules/tome/data/damage_types.lua
+++ b/game/modules/tome/data/damage_types.lua
@@ -583,6 +583,13 @@ local function tryDestroy(who, inven, dam, destroy_prop, proof_prop, msg)
 	end
 end
 
+newDamageType{
+	name = "cosmetic", type = "COSMETIC", text_color = "#WHITE#",
+	projector = function(src, x, y, type, dam)
+	end,
+	death_message = {"cosmeticed"},
+}
+
 newDamageType{
 	name = "physical", type = "PHYSICAL",
 	death_message = {"battered", "bludgeoned", "sliced", "maimed", "raked", "bled", "impaled", "dissected", "disembowelled", "decapitated", "stabbed", "pierced", "torn limb from limb", "crushed", "shattered", "smashed", "cleaved", "swiped", "struck", "mutilated", "tortured", "skewered", "squished", "mauled", "chopped into tiny pieces", "splattered", "ground", "minced", "punctured", "hacked apart", "eviscerated"},
@@ -1636,7 +1643,7 @@ newDamageType{
 		local target = game.level.map(x, y, Map.ACTOR)
 		if target and rng.percent(dam.dam) then
 			if target:canBe("blind") then
-				target:setEffect(target.EFF_BLINDED, 4, {apply_power=(dam.power_check or src.combatSpellpower)(src), no_ct_effect=true})
+				target:setEffect(target.EFF_BLINDED, 4, {apply_power=(dam.power_check or math.max(src:combatSpellpower(), src:combatPhysicalpower())), no_ct_effect=true})
 			else
 				game.logSeen(target, "%s resists!", target.name:capitalize())
 			end
diff --git a/game/modules/tome/data/general/grids/autumn_forest.lua b/game/modules/tome/data/general/grids/autumn_forest.lua
new file mode 100644
index 0000000000000000000000000000000000000000..e67d46c93104aa2bf2ea362f0b5592d542107fa7
--- /dev/null
+++ b/game/modules/tome/data/general/grids/autumn_forest.lua
@@ -0,0 +1,191 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009 - 2014 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
+
+local autumn_grass_editer = { method="borders_def", def="autumn_grass"}
+
+newEntity{
+	define_as = "AUTUMN_GRASS",
+	type = "floor", subtype = "autumn_grass",
+	name = "autumn grass", image = "terrain/grass/autumn_grass_main_01.png",
+	display = '.', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+	grow = "AUTUMN_TREE",
+	nice_tiler = { method="replace", base={"AUTUMN_GRASS_PATCH", 100, 1, 14}},
+	nice_editer = autumn_grass_editer,
+}
+for i = 1, 14 do newEntity{ base = "AUTUMN_GRASS", define_as = "AUTUMN_GRASS_PATCH"..i, image = ("terrain/grass/autumn_grass_main_%02d.png"):format(i) } end
+
+local autumn_treesdef = {
+	{"small_elm", {"shadow", "trunk", "foliage_autumn"}},
+	{"elm", {tall=-1, "shadow", "trunk", "foliage_autumn"}},
+}
+
+newEntity{
+	define_as = "AUTUMN_TREE",
+	type = "wall", subtype = "autumn_grass",
+	name = "autumn tree",
+	image = "terrain/autumn_tree.png",
+	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+	always_remember = true,
+	can_pass = {pass_tree=1},
+	does_block_move = true,
+	block_sight = true,
+	dig = "AUTUMN_GRASS",
+	nice_tiler = { method="replace", base={"AUTUMN_TREE", 100, 1, 30}},
+	nice_editer = autumn_grass_editer,
+}
+for i = 1, 30 do
+	newEntity(class:makeNewTrees({base="AUTUMN_TREE", define_as = "AUTUMN_TREE"..i, image = "terrain/grass/autumn_grass_main_01.png"}, autumn_treesdef))
+end
+
+newEntity{
+	define_as = "HARDAUTUMN_TREE",
+	type = "wall", subtype = "autumn_grass",
+	name = "tall thick tree",
+	image = "terrain/autumn_tree.png",
+	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+	always_remember = true,
+	does_block_move = true,
+	block_sight = true,
+	block_sense = true,
+	block_esp = true,
+	nice_tiler = { method="replace", base={"HARDAUTUMN_TREE", 100, 1, 30}},
+	nice_editer = autumn_grass_editer,
+}
+for i = 1, 30 do
+	newEntity(class:makeNewTrees({base="HARDAUTUMN_TREE", define_as = "HARDAUTUMN_TREE"..i, image = "terrain/grass/autumn_grass_main_01.png"}, autumn_treesdef))
+end
+
+-----------------------------------------
+-- Forest road
+-----------------------------------------
+newEntity{
+	define_as = "AUTUMN_GRASS_ROAD_STONE",
+	type = "floor", subtype = "autumn_grass", road="oldstone",
+	name = "old road", image = "terrain/grass/autumn_grass_main_01.png",
+	display = '=', color=colors.DARK_GREY,
+	always_remember = true,
+	nice_editer = autumn_grass_editer,
+	nice_editer2 = { method="roads_def", def="oldstone" },
+}
+newEntity{
+	define_as = "AUTUMN_GRASS_ROAD_DIRT",
+	type = "floor", subtype = "autumn_grass", road="dirt",
+	name = "old road", image = "terrain/grass/autumn_grass_main_01.png",
+	display = '=', color=colors.DARK_GREY,
+	always_remember = true,
+	nice_editer = autumn_grass_editer,
+	nice_editer2 = { method="roads_def", def="dirt" },
+}
+
+-----------------------------------------
+-- Autumn_grassy exits
+-----------------------------------------
+newEntity{
+	define_as = "AUTUMN_GRASS_UP_WILDERNESS",
+	type = "floor", subtype = "autumn_grass",
+	name = "exit to the worldmap", image = "terrain/grass/autumn_grass_main_01.png", add_mos = {{image="terrain/worldmap.png"}},
+	display = '<', color_r=255, color_g=0, color_b=255,
+	always_remember = true,
+	notice = true,
+	change_level = 1,
+	change_zone = "wilderness",
+	nice_editer = autumn_grass_editer,
+}
+
+newEntity{
+	define_as = "AUTUMN_GRASS_UP8",
+	type = "floor", subtype = "autumn_grass",
+	name = "way to the previous level", image = "terrain/grass/autumn_grass_main_01.png", add_mos = {{image="terrain/way_next_8.png"}},
+	display = '<', color_r=255, color_g=255, color_b=0,
+	notice = true,
+	always_remember = true,
+	change_level = -1,
+	nice_editer = autumn_grass_editer,
+}
+newEntity{
+	define_as = "AUTUMN_GRASS_UP2",
+	type = "floor", subtype = "autumn_grass",
+	name = "way to the previous level", image = "terrain/grass/autumn_grass_main_01.png", add_mos = {{image="terrain/way_next_2.png"}},
+	display = '<', color_r=255, color_g=255, color_b=0,
+	notice = true,
+	always_remember = true,
+	change_level = -1,
+	nice_editer = autumn_grass_editer,
+}
+newEntity{
+	define_as = "AUTUMN_GRASS_UP4",
+	type = "floor", subtype = "autumn_grass",
+	name = "way to the previous level", image = "terrain/grass/autumn_grass_main_01.png", add_mos = {{image="terrain/way_next_4.png"}},
+	display = '<', color_r=255, color_g=255, color_b=0,
+	notice = true,
+	always_remember = true,
+	change_level = -1,
+	nice_editer = autumn_grass_editer,
+}
+newEntity{
+	define_as = "AUTUMN_GRASS_UP6",
+	type = "floor", subtype = "autumn_grass",
+	name = "way to the previous level", image = "terrain/grass/autumn_grass_main_01.png", add_mos = {{image="terrain/way_next_6.png"}},
+	display = '<', color_r=255, color_g=255, color_b=0,
+	notice = true,
+	always_remember = true,
+	change_level = -1,
+	nice_editer = autumn_grass_editer,
+}
+
+newEntity{
+	define_as = "AUTUMN_GRASS_DOWN8",
+	type = "floor", subtype = "autumn_grass",
+	name = "way to the next level", image = "terrain/grass/autumn_grass_main_01.png", add_mos = {{image="terrain/way_next_8.png"}},
+	display = '>', color_r=255, color_g=255, color_b=0,
+	notice = true,
+	always_remember = true,
+	change_level = 1,
+	nice_editer = autumn_grass_editer,
+}
+newEntity{
+	define_as = "AUTUMN_GRASS_DOWN2",
+	type = "floor", subtype = "autumn_grass",
+	name = "way to the next level", image = "terrain/grass/autumn_grass_main_01.png", add_mos = {{image="terrain/way_next_2.png"}},
+	display = '>', color_r=255, color_g=255, color_b=0,
+	notice = true,
+	always_remember = true,
+	change_level = 1,
+	nice_editer = autumn_grass_editer,
+}
+newEntity{
+	define_as = "AUTUMN_GRASS_DOWN4",
+	type = "floor", subtype = "autumn_grass",
+	name = "way to the next level", image = "terrain/grass/autumn_grass_main_01.png", add_mos = {{image="terrain/way_next_4.png"}},
+	display = '>', color_r=255, color_g=255, color_b=0,
+	notice = true,
+	always_remember = true,
+	change_level = 1,
+	nice_editer = autumn_grass_editer,
+}
+newEntity{
+	define_as = "AUTUMN_GRASS_DOWN6",
+	type = "floor", subtype = "autumn_grass",
+	name = "way to the next level", image = "terrain/grass/autumn_grass_main_01.png", add_mos = {{image="terrain/way_next_6.png"}},
+	display = '>', color_r=255, color_g=255, color_b=0,
+	notice = true,
+	always_remember = true,
+	change_level = 1,
+	nice_editer = autumn_grass_editer,
+}
diff --git a/game/modules/tome/data/general/grids/burntland.lua b/game/modules/tome/data/general/grids/burntland.lua
index 92b50b888d3a6023c9e4b77e44ac65863d96061d..514312782431cd7e53c0255cdbcefd40c3e7b4c3 100644
--- a/game/modules/tome/data/general/grids/burntland.lua
+++ b/game/modules/tome/data/general/grids/burntland.lua
@@ -17,20 +17,40 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
-for i = 1, 20 do
 newEntity{
-	define_as = "BURNT_TREE"..i,
+	define_as = "BURNT_TREE",
 	type = "wall", subtype = "burnt",
 	name = "burnt tree",
 	image = "terrain/grass_burnt1.png",
-	add_displays = class:makeTrees("terrain/burnttree_alpha", 8, 0),
 	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
 	always_remember = true,
 	can_pass = {pass_tree=1},
 	does_block_move = true,
 	block_sight = true,
 	dig = "BURNT_GROUND1",
+	nice_tiler = { method="replace", base={"BURNT_TREE", 100, 1, 20} },
 }
+for i = 1, 20 do
+	newEntity(class:makeNewTrees({base="BURNT_TREE", define_as = "BURNT_TREE"..i, image = "terrain/grass_burnt1.png", nice_tiler = false}, {
+		-- {"gnarled_tree", {"shadow", "trunk", "foliage_bare"}},
+		-- {"small_elm", {"shadow", "trunk", "foliage_bare"}},
+		-- {"elm", {tall=-1, "shadow", "trunk", "foliage_bare"}},
+		{"burned_tree_01", {tall=-1, "shadow", "trunk", "foliage"}},
+		{"burned_tree_01", {tall=-1, "shadow", "trunk", {"foliage_ash_%02d",1,2}}},
+		{"burned_tree_02", {tall=-1, "shadow", "trunk", "foliage"}},
+		{"burned_tree_02", {tall=-1, "shadow", "trunk", {"foliage_ash_%02d",1,2}}},
+		{"small_burned_tree_01", {"shadow", "trunk"}},
+		{"small_burned_tree_01", {"shadow", {"trunk_ash_%02d",1,2}}},
+		{"small_burned_tree_02", {"shadow", "trunk", "foliage"}},
+		{"small_burned_tree_02", {"shadow", "trunk", {"foliage_ash_%02d",1,2}}},
+		{"small_burned_tree_03", {"shadow", "trunk", "foliage"}},
+		{"small_burned_tree_03", {"shadow", "trunk", {"foliage_ash_%02d",1,2}}},
+		-- {"burned_tree_01", {tall=-1, "shadow", "trunk", "foliage_winter"}},
+		-- {"burned_tree_02", {tall=-1, "shadow", "trunk", "foliage_winter"}},
+		-- {"small_burned_tree_01", {"shadow", "trunk_winter"}},
+		-- {"small_burned_tree_02", {"shadow", "trunk", "foliage_winter"}},
+		-- {"small_burned_tree_03", {"shadow", "trunk", "foliage_winter"}},
+	}))
 end
 
 newEntity{ define_as = "BURNT_GROUND",
diff --git a/game/modules/tome/data/general/grids/elven_forest.lua b/game/modules/tome/data/general/grids/elven_forest.lua
new file mode 100644
index 0000000000000000000000000000000000000000..f0ed786816bafc9c78f48f6ade47c476e0bc1bed
--- /dev/null
+++ b/game/modules/tome/data/general/grids/elven_forest.lua
@@ -0,0 +1,114 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009 - 2014 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
+
+local grass_editer = { method="borders_def", def="grass"}
+local autumn_grass_editer = { method="borders_def", def="autumn_grass"}
+local snowy_grass_editer = { method="borders_def", def="snowy_grass"}
+
+local treesdef = {
+	{"elventree", {tall=-1, "shadow", "trunk", "foliage_summer"}},
+	{"elventree_03", {tall=-1, "shadow", "trunk", "foliage_summer"}},
+	{"fat_elventree", {tall=-1, "shadow", "trunk", {"foliage_summer_%02d",1,2}}},
+	{"oak", {tall=-1, "shadow", {"trunk_%02d",1,2}, {"foliage_summer_%02d",1,4}}},
+}
+
+newEntity{
+	define_as = "ELVEN_TREE",
+	type = "wall", subtype = "grass",
+	name = "tree",
+	image = "terrain/tree.png",
+	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+	always_remember = true,
+	can_pass = {pass_tree=1},
+	does_block_move = true,
+	block_sight = true,
+	dig = "GRASS",
+	nice_tiler = { method="replace", base={"ELVEN_TREE", 100, 1, 30}},
+	nice_editer = grass_editer,
+}
+for i = 1, 30 do
+	newEntity(class:makeNewTrees({base="ELVEN_TREE", define_as = "ELVEN_TREE"..i, image = "terrain/grass/grass_main_01.png"}, treesdef))
+end
+
+newEntity{
+	define_as = "HARDELVEN_TREE",
+	type = "wall", subtype = "grass",
+	name = "tall thick tree",
+	image = "terrain/tree.png",
+	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+	always_remember = true,
+	does_block_move = true,
+	block_sight = true,
+	block_sense = true,
+	block_esp = true,
+	nice_tiler = { method="replace", base={"HARDELVEN_TREE", 100, 1, 30}},
+	nice_editer = grass_editer,
+}
+for i = 1, 30 do
+	newEntity(class:makeNewTrees({base="HARDELVEN_TREE", define_as = "HARDELVEN_TREE"..i, image = "terrain/grass/grass_main_01.png"}, treesdef))
+end
+
+
+local snow_treesdef = {
+	{"elventree", {tall=-1, "shadow", "trunk", "foliage_winter"}},
+	{"fat_elventree", {tall=-1, "shadow", "trunk", "foliage_winter"}},
+	{"oak", {tall=-1, "shadow", {"trunk_%02d",1,2}, {"foliage_winter_%02d",1,2}}},
+}
+
+newEntity{
+	define_as = "SNOW_ELVEN_TREE",
+	type = "wall", subtype = "snowy_grass",
+	name = "tree",
+	image = "terrain/tree.png",
+	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+	always_remember = true,
+	can_pass = {pass_tree=1},
+	does_block_move = true,
+	block_sight = true,
+	dig = "GRASS",
+	nice_tiler = { method="replace", base={"SNOW_ELVEN_TREE", 100, 1, 30}},
+	nice_editer = snowy_grass_editer,
+}
+for i = 1, 30 do
+	newEntity(class:makeNewTrees({base="SNOW_ELVEN_TREE", define_as = "SNOW_ELVEN_TREE"..i, image = "terrain/grass/snowy_grass_main_01.png"}, snow_treesdef))
+end
+
+local autumn_treesdef = {
+	{"elventree", {tall=-1, "shadow", "trunk", "foliage_autumn"}},
+	{"fat_elventree", {tall=-1, "shadow", "trunk", {"foliage_autumn_%02d",1,2}}},
+	{"oak", {tall=-1, "shadow", {"trunk_%02d",1,2}, {"foliage_autumn_%02d",1,4}}},
+}
+
+newEntity{
+	define_as = "AUTUMN_ELVEN_TREE",
+	type = "wall", subtype = "autumn_grass",
+	name = "tree",
+	image = "terrain/tree.png",
+	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+	always_remember = true,
+	can_pass = {pass_tree=1},
+	does_block_move = true,
+	block_sight = true,
+	dig = "AUTUMN_GRASS",
+	nice_tiler = { method="replace", base={"AUTUMN_ELVEN_TREE", 100, 1, 30}},
+	nice_editer = autumn_grass_editer,
+}
+for i = 1, 30 do
+	newEntity(class:makeNewTrees({base="AUTUMN_ELVEN_TREE", define_as = "AUTUMN_ELVEN_TREE"..i, image = "terrain/grass/autumn_grass_main_01.png"}, autumn_treesdef))
+end
diff --git a/game/modules/tome/data/general/grids/forest.lua b/game/modules/tome/data/general/grids/forest.lua
index 4aa3aa801015fe3d128e9ac091211964b24fc64d..5f19b4cb65d0bdda68e8e68829d874a60b002775 100644
--- a/game/modules/tome/data/general/grids/forest.lua
+++ b/game/modules/tome/data/general/grids/forest.lua
@@ -41,6 +41,22 @@ newEntity{
 	nice_editer = grasswm_editer,
 }
 
+local treesdef = {
+	{"small_elm", {"shadow", "trunk", "foliage_summer"}},
+	{"small_elm", {"shadow", "trunk", "foliage_summer"}},
+	{"elm", {tall=-1, "shadow", "trunk", "foliage_summer"}},
+	{"elm", {tall=-1, "shadow", "trunk", "foliage_summer"}},
+	{"light_pine", {tall=-1, "shadow", "trunk", {"foliage_%02d",1,4}}},
+	{"light_small_wider_pine", {"shadow", "trunk", {"foliage_%02d",1,4}}},
+	{"light_small_narrow_pine", {"shadow", "trunk", {"foliage_%02d",1,4}}},
+	{"cypress", {tall=-1, "shadow", "trunk", {"foliage_%02d",1,4}}},
+	{"small_cypress", {tall=-1, "shadow", "trunk", {"foliage_%02d",1,4}}},
+	{"tiny_cypress", {"shadow", "trunk", {"foliage_%02d",1,4}}},
+	{"oak", {tall=-1, "shadow", "trunk_01", {"foliage_summer_%02d",1,2}}},
+	{"oak", {tall=-1, "shadow", "trunk_02", {"foliage_summer_%02d",3,4}}},
+	{"small_oak", {"shadow", "trunk_01", {"foliage_summer_%02d",1,2}}},
+	{"small_oak", {"shadow", "trunk_02", {"foliage_summer_%02d",3,4}}},
+}
 
 newEntity{
 	define_as = "TREE",
@@ -56,7 +72,9 @@ newEntity{
 	nice_tiler = { method="replace", base={"TREE", 100, 1, 30}},
 	nice_editer = grass_editer,
 }
-for i = 1, 30 do newEntity{ base="TREE", define_as = "TREE"..i, image = "terrain/grass.png", add_displays = class:makeTrees("terrain/tree_alpha", 14, 9)} end
+for i = 1, 30 do
+	newEntity(class:makeNewTrees({base="TREE", define_as = "TREE"..i, image = "terrain/grass.png"}, treesdef))
+end
 
 newEntity{
 	define_as = "HARDTREE",
@@ -72,7 +90,9 @@ newEntity{
 	nice_tiler = { method="replace", base={"HARDTREE", 100, 1, 30}},
 	nice_editer = grass_editer,
 }
-for i = 1, 30 do newEntity{ base="HARDTREE", define_as = "HARDTREE"..i, image = "terrain/grass.png", add_displays = class:makeTrees("terrain/tree_alpha", 14, 9) } end
+for i = 1, 30 do
+	newEntity(class:makeNewTrees({base="HARDTREE", define_as = "HARDTREE"..i, image = "terrain/grass.png"}, treesdef))
+end
 
 newEntity{
 	define_as = "FLOWER",
@@ -136,7 +156,6 @@ newEntity{
 	change_level = 1,
 	change_zone = "wilderness",
 	nice_editer = grass_editer,
-	shader = "tree",
 }
 
 newEntity{
diff --git a/game/modules/tome/data/general/grids/mountain.lua b/game/modules/tome/data/general/grids/mountain.lua
index 1908780f9cd0078706691b799a84ffa91a6a50d4..6b89d1554be2d8c67bfcb7375020e5f93e02207f 100644
--- a/game/modules/tome/data/general/grids/mountain.lua
+++ b/game/modules/tome/data/general/grids/mountain.lua
@@ -56,12 +56,17 @@ newEntity{
 	nice_tiler = { method="replace", base={"ROCKY_SNOWY_TREE", 100, 1, 30} },
 }
 for i = 1, 30 do
-newEntity{ base="ROCKY_SNOWY_TREE",
-	define_as = "ROCKY_SNOWY_TREE"..i,
-	image = "terrain/rocky_ground.png",
-	add_displays = class:makeTrees("terrain/tree_dark_snow", 13, 10),
-	nice_tiler = false,
-}
+	newEntity(class:makeNewTrees({base="ROCKY_SNOWY_TREE", define_as = "ROCKY_SNOWY_TREE"..i, image = "terrain/rocky_ground.png", nice_tiler = false}, {
+		{"small_elm", {"shadow", "trunk", "foliage_winter"}},
+		{"elm", {tall=-1, "shadow", "trunk", "foliage_winter"}},
+		{"pine", {tall=-1, "shadow", "trunk", {"foliage_winter_%02d", 1, 2}, shader_args={attenuation=14}}},
+		{"small_narrow_pine", {"shadow", "trunk", {"foliage_winter_%02d", 1, 2}, shader_args={attenuation=14}}},
+		{"small_wider_pine", {"shadow", "trunk", {"foliage_winter_%02d", 1, 2}, shader_args={attenuation=14}}},
+		{"cypress", {tall=-1, "shadow", "trunk", {"foliage_winter_%02d",1,2}}},
+		{"small_cypress", {tall=-1, "shadow", "trunk", {"foliage_winter_%02d",1,2}}},
+		{"tiny_cypress", {"shadow", "trunk", {"foliage_winter_%02d",1,2}}},
+		{"oak", {tall=-1, "shadow", {"trunk_%02d",1,2}, {"foliage_winter_%02d",1,2}}},
+	}))
 end
 
 newEntity{
diff --git a/game/modules/tome/data/general/grids/sand.lua b/game/modules/tome/data/general/grids/sand.lua
index fab39ac1f899455e3c1c0e1baab7dd9d937ee1b2..edbc1e663520757a888ac414f2af55b2a3a0765c 100644
--- a/game/modules/tome/data/general/grids/sand.lua
+++ b/game/modules/tome/data/general/grids/sand.lua
@@ -122,7 +122,7 @@ newEntity{
 	nice_tiler = { method="replace", base={"PALMTREE", 100, 1, 20}},
 	nice_editer = sand_editer,
 }
-for i = 1, 20 do newEntity{ base="PALMTREE", define_as = "PALMTREE"..i, image = "terrain/sandfloor.png", add_displays = class:makeTrees("terrain/palmtree_alpha", 8, 5) } end
+for i = 1, 20 do newEntity{ base="PALMTREE", define_as = "PALMTREE"..i, image = "terrain/sandfloor.png", add_displays = class:makeTrees("terrain/palmtree_alpha", 8, 5, nil, 25) } end
 
 -----------------------------------------
 -- Sandy exits
diff --git a/game/modules/tome/data/general/grids/snowy_forest.lua b/game/modules/tome/data/general/grids/snowy_forest.lua
new file mode 100644
index 0000000000000000000000000000000000000000..4479c6916c598b2723186fbc78644066ca769046
--- /dev/null
+++ b/game/modules/tome/data/general/grids/snowy_forest.lua
@@ -0,0 +1,191 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009 - 2014 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
+
+local snowy_grass_editer = { method="borders_def", def="snowy_grass"}
+
+newEntity{
+	define_as = "SNOWY_GRASS",
+	type = "floor", subtype = "snowy_grass",
+	name = "snowy grass", image = "terrain/grass/snowy_grass_main_01.png",
+	display = '.', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+	grow = "SNOWY_TREE",
+	nice_tiler = { method="replace", base={"SNOWY_PATCH", 100, 1, 14}},
+	nice_editer = snowy_editer,
+}
+for i = 1, 14 do newEntity{ base = "SNOWY_GRASS", define_as = "SNOWY_PATCH"..i, image = ("terrain/grass/snowy_grass_main_%02d.png"):format(i) } end
+
+local snowy_treesdef = {
+	{"small_elm", {"shadow", "trunk", "foliage_winter"}},
+	{"elm", {tall=-1, "shadow", "trunk", "foliage_winter"}},
+}
+
+newEntity{
+	define_as = "SNOWY_TREE",
+	type = "wall", subtype = "snowy_grass",
+	name = "winter tree",
+	image = "terrain/snowy_tree.png",
+	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+	always_remember = true,
+	can_pass = {pass_tree=1},
+	does_block_move = true,
+	block_sight = true,
+	dig = "snowy",
+	nice_tiler = { method="replace", base={"SNOWY_TREE", 100, 1, 30}},
+	nice_editer = snowy_editer,
+}
+for i = 1, 30 do
+	newEntity(class:makeNewTrees({base="SNOWY_TREE", define_as = "SNOWY_TREE"..i, image = "terrain/grass/snowy_grass_main_01.png"}, snowy_treesdef))
+end
+
+newEntity{
+	define_as = "HARDSNOWY_TREE",
+	type = "wall", subtype = "snowy_grass",
+	name = "tall thick tree",
+	image = "terrain/snowy_tree.png",
+	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+	always_remember = true,
+	does_block_move = true,
+	block_sight = true,
+	block_sense = true,
+	block_esp = true,
+	nice_tiler = { method="replace", base={"HARDSNOWY_TREE", 100, 1, 30}},
+	nice_editer = snowy_editer,
+}
+for i = 1, 30 do
+	newEntity(class:makeNewTrees({base="HARDSNOWY_TREE", define_as = "HARDSNOWY_TREE"..i, image = "terrain/grass/snowy_grass_main_01.png"}, snowy_treesdef))
+end
+
+-----------------------------------------
+-- Forest road
+-----------------------------------------
+newEntity{
+	define_as = "snowy_ROAD_STONE",
+	type = "floor", subtype = "snowy_grass", road="oldstone",
+	name = "old road", image = "terrain/grass/snowy_grass_main_01.png",
+	display = '=', color=colors.DARK_GREY,
+	always_remember = true,
+	nice_editer = snowy_editer,
+	nice_editer2 = { method="roads_def", def="oldstone" },
+}
+newEntity{
+	define_as = "snowy_ROAD_DIRT",
+	type = "floor", subtype = "snowy_grass", road="dirt",
+	name = "old road", image = "terrain/grass/snowy_grass_main_01.png",
+	display = '=', color=colors.DARK_GREY,
+	always_remember = true,
+	nice_editer = snowy_editer,
+	nice_editer2 = { method="roads_def", def="dirt" },
+}
+
+-----------------------------------------
+-- snowyy exits
+-----------------------------------------
+newEntity{
+	define_as = "snowy_UP_WILDERNESS",
+	type = "floor", subtype = "snowy_grass",
+	name = "exit to the worldmap", image = "terrain/grass/snowy_grass_main_01.png", add_mos = {{image="terrain/worldmap.png"}},
+	display = '<', color_r=255, color_g=0, color_b=255,
+	always_remember = true,
+	notice = true,
+	change_level = 1,
+	change_zone = "wilderness",
+	nice_editer = snowy_editer,
+}
+
+newEntity{
+	define_as = "snowy_UP8",
+	type = "floor", subtype = "snowy_grass",
+	name = "way to the previous level", image = "terrain/grass/snowy_grass_main_01.png", add_mos = {{image="terrain/way_next_8.png"}},
+	display = '<', color_r=255, color_g=255, color_b=0,
+	notice = true,
+	always_remember = true,
+	change_level = -1,
+	nice_editer = snowy_editer,
+}
+newEntity{
+	define_as = "snowy_UP2",
+	type = "floor", subtype = "snowy_grass",
+	name = "way to the previous level", image = "terrain/grass/snowy_grass_main_01.png", add_mos = {{image="terrain/way_next_2.png"}},
+	display = '<', color_r=255, color_g=255, color_b=0,
+	notice = true,
+	always_remember = true,
+	change_level = -1,
+	nice_editer = snowy_editer,
+}
+newEntity{
+	define_as = "snowy_UP4",
+	type = "floor", subtype = "snowy_grass",
+	name = "way to the previous level", image = "terrain/grass/snowy_grass_main_01.png", add_mos = {{image="terrain/way_next_4.png"}},
+	display = '<', color_r=255, color_g=255, color_b=0,
+	notice = true,
+	always_remember = true,
+	change_level = -1,
+	nice_editer = snowy_editer,
+}
+newEntity{
+	define_as = "snowy_UP6",
+	type = "floor", subtype = "snowy_grass",
+	name = "way to the previous level", image = "terrain/grass/snowy_grass_main_01.png", add_mos = {{image="terrain/way_next_6.png"}},
+	display = '<', color_r=255, color_g=255, color_b=0,
+	notice = true,
+	always_remember = true,
+	change_level = -1,
+	nice_editer = snowy_editer,
+}
+
+newEntity{
+	define_as = "snowy_DOWN8",
+	type = "floor", subtype = "snowy_grass",
+	name = "way to the next level", image = "terrain/grass/snowy_grass_main_01.png", add_mos = {{image="terrain/way_next_8.png"}},
+	display = '>', color_r=255, color_g=255, color_b=0,
+	notice = true,
+	always_remember = true,
+	change_level = 1,
+	nice_editer = snowy_editer,
+}
+newEntity{
+	define_as = "snowy_DOWN2",
+	type = "floor", subtype = "snowy_grass",
+	name = "way to the next level", image = "terrain/grass/snowy_grass_main_01.png", add_mos = {{image="terrain/way_next_2.png"}},
+	display = '>', color_r=255, color_g=255, color_b=0,
+	notice = true,
+	always_remember = true,
+	change_level = 1,
+	nice_editer = snowy_editer,
+}
+newEntity{
+	define_as = "snowy_DOWN4",
+	type = "floor", subtype = "snowy_grass",
+	name = "way to the next level", image = "terrain/grass/snowy_grass_main_01.png", add_mos = {{image="terrain/way_next_4.png"}},
+	display = '>', color_r=255, color_g=255, color_b=0,
+	notice = true,
+	always_remember = true,
+	change_level = 1,
+	nice_editer = snowy_editer,
+}
+newEntity{
+	define_as = "snowy_DOWN6",
+	type = "floor", subtype = "snowy_grass",
+	name = "way to the next level", image = "terrain/grass/snowy_grass_main_01.png", add_mos = {{image="terrain/way_next_6.png"}},
+	display = '>', color_r=255, color_g=255, color_b=0,
+	notice = true,
+	always_remember = true,
+	change_level = 1,
+	nice_editer = snowy_editer,
+}
diff --git a/game/modules/tome/data/general/objects/boss-artifacts-maj-eyal.lua b/game/modules/tome/data/general/objects/boss-artifacts-maj-eyal.lua
index 341a63d520ff7c99be3cb7a4e0eefbf806e1645a..6a9a8310369a8459bc77979368e7489bd9412750 100644
--- a/game/modules/tome/data/general/objects/boss-artifacts-maj-eyal.lua
+++ b/game/modules/tome/data/general/objects/boss-artifacts-maj-eyal.lua
@@ -762,7 +762,7 @@ newEntity{ base = "BASE_GREATMAUL",
 	wielder = {
 	},
 	max_power = 20, power_regen = 1,
-	use_talent = { id = Talents.T_SUNDER_ARMOUR, level = 2, power = 20 },
+	use_talent = { id = Talents.T_SHATTERING_BLOW, level = 2, power = 20 },
 }
 
 
diff --git a/game/modules/tome/data/general/objects/egos/ammo.lua b/game/modules/tome/data/general/objects/egos/ammo.lua
index b0027c59770c8602dfca6cf67242887e9cb59b8e..f7f04659d362650c33f9c1532061ec8b1eb976c5 100644
--- a/game/modules/tome/data/general/objects/egos/ammo.lua
+++ b/game/modules/tome/data/general/objects/egos/ammo.lua
@@ -420,19 +420,6 @@ newEntity{
 	},
 }
 
-newEntity{
-	power_source = {nature=true},
-	name = "huntsman's ", prefix=true, instant_resolve=true,
-	keywords = {hunt=true},
-	level_range = {1, 50},
-	rarity = 10,
-	cost = 20,
-	combat = {
-		ranged_project={[DamageType.NATURE] = resolvers.mbonus_material(15, 5)},
-		inc_damage_type = {animal=resolvers.mbonus_material(25, 5)},
-	},
-}
-
 newEntity{
 	power_source = {nature=true},
 	name = "insidious ", prefix=true, instant_resolve=true,
@@ -710,6 +697,7 @@ newEntity{
 	combat = {
 		ranged_project={[DamageType.DARKNESS] = resolvers.mbonus_material(15, 5)},
 		inc_damage_type = {humanoid=resolvers.mbonus_material(25, 5)},
+		inc_damage_type = {animal=resolvers.mbonus_material(25, 5)},
 	},
 }
 
diff --git a/game/modules/tome/data/general/objects/egos/gloves.lua b/game/modules/tome/data/general/objects/egos/gloves.lua
index 972b990af871eaba76ef9cd7b724b5ef9eb1d562..e2492b76254b14fad27663443e5588b8c4c533d5 100644
--- a/game/modules/tome/data/general/objects/egos/gloves.lua
+++ b/game/modules/tome/data/general/objects/egos/gloves.lua
@@ -85,8 +85,7 @@ newEntity{
 		resists = { [DamageType.COLD] = resolvers.mbonus_material(5, 5), },
 		melee_project= { [DamageType.COLD] = resolvers.mbonus_material(10, 5) },
 		combat = {
-			burst_on_crit= { [DamageType.COLD] = resolvers.mbonus_material(10, 5) },
-			convert_damage = { [DamageType.COLD] = resolvers.mbonus_material(25, 25) },
+			burst_on_crit= { [DamageType.ICE] = resolvers.mbonus_material(10, 5) },
 			talent_on_hit = { [Talents.T_ICE_BREATH] = {level=resolvers.genericlast(function(e) return e.material_level end), chance=10} },
 		},
 	},
@@ -159,7 +158,6 @@ newEntity{
 		melee_project= { [DamageType.BLIGHT] = resolvers.mbonus_material(10, 5) },
 		combat = {
 			burst_on_crit= { [DamageType.BLIGHT] = resolvers.mbonus_material(10, 5) },
-			convert_damage = { [DamageType.BLIGHT] = resolvers.mbonus_material(25, 25) },
 			talent_on_hit = { [Talents.T_SOUL_ROT] = {level=resolvers.genericlast(function(e) return e.material_level end), chance=20} },
 		},
 	},
@@ -340,7 +338,7 @@ newEntity{
 		},
 		disarm_bonus = resolvers.mbonus_material(25, 5),
 		combat = {
-			talent_on_hit = { [Talents.T_MAIM] = {level=resolvers.genericlast(function(e) return e.material_level end), chance=20} },
+			talent_on_hit = { [Talents.T_DISARM] = {level=resolvers.genericlast(function(e) return e.material_level end), chance=10} },
 		},
 	},
 }
@@ -498,10 +496,10 @@ newEntity{
 		},
 		infravision = resolvers.mbonus_material(1, 1),
 		combat = {
-			talent_on_hit = { [Talents.T_CIRCLE_OF_BLAZING_LIGHT] = {level=resolvers.genericlast(function(e) return e.material_level end), chance=10} },
-			melee_project={
-				[DamageType.LIGHT] = resolvers.mbonus_material(10, 2),
-				[DamageType.DARKNESS] = resolvers.mbonus_material(10, 2),
+			burst_on_crit={
+				-- still an AoE effect, but not a weak one with poor stat scaling that wastes the proc registry
+				[DamageType.LIGHT] = resolvers.mbonus_material(40, 10),
+				[DamageType.DARKNESS] = resolvers.mbonus_material(40, 10),
 			},
 		},
 	},
diff --git a/game/modules/tome/data/general/objects/egos/helm.lua b/game/modules/tome/data/general/objects/egos/helm.lua
index abe4dd10cc70d99253919da550f18e1e6aab4d54..084f7f4162ec81d785b3215f09f2356f33a6dab0 100644
--- a/game/modules/tome/data/general/objects/egos/helm.lua
+++ b/game/modules/tome/data/general/objects/egos/helm.lua
@@ -348,6 +348,7 @@ newEntity{
 			[DamageType.MIND] = resolvers.mbonus_material(15, 10),
 		},
 		combat_mentalresist = resolvers.mbonus_material(20, 10),
+		confusion_immune = resolvers.mbonus_material(30, 20, function(e, v) v=v/100 return 0, v end),
 	},
 }
 
diff --git a/game/modules/tome/data/general/objects/egos/light-armor.lua b/game/modules/tome/data/general/objects/egos/light-armor.lua
index df797062e050f75e341b3485bb97f63dca0d5fc0..529a85d68325b11ece6367a2a5cac96e32fe6f3a 100644
--- a/game/modules/tome/data/general/objects/egos/light-armor.lua
+++ b/game/modules/tome/data/general/objects/egos/light-armor.lua
@@ -32,6 +32,7 @@ newEntity{
 	rarity = 12,
 	cost = 14,
 	wielder = {
+		healing_factor = resolvers.mbonus_material(20, 10, function(e, v) v=v/100 return 0, v end), -- copied from robe.lua
 		life_regen = resolvers.mbonus_material(120, 30, function(e, v) v=v/10 return 0, v end),
 	},
 }
@@ -45,12 +46,13 @@ newEntity{
 	rarity = 22,
 	cost = 35,
 	wielder = {
-		combat_def = resolvers.mbonus_material(8, 2),
-		combat_def_ranged = resolvers.mbonus_material(8, 2),
-		movement_speed = 0.1,
+		combat_def = resolvers.mbonus_material(14, 2),
+		combat_def_ranged = resolvers.mbonus_material(14, 2),
+		movement_speed = 0.2,
 		inc_stats = { [Stats.STAT_DEX] = resolvers.mbonus_material(3, 2), },
 	},
 }
+
 newEntity{
 	power_source = {technique=true},
 	name = "marauder's ", prefix=true, instant_resolve=true,
@@ -109,15 +111,13 @@ newEntity{
 	power_source = {technique=true},
 	name = " of the wind", suffix=true, instant_resolve=true,
 	keywords = {wind=true},
-	level_range = {40, 50},
+	level_range = {30, 50},
 	greater_ego = 1,
 	rarity = 30,
 	cost = 80,
 	resolvers.charmt(Talents.T_SECOND_WIND, {3,4,5}, 35),
 	wielder = {
-		max_life = resolvers.mbonus_material(60, 40, function(e, v) return 0, -v end),
-		combat_armor = resolvers.mbonus_material(7, 3, function(e, v) return 0, -v end),
-
+		cancel_damage_chance = resolvers.mbonus_material(8, 2),
 		combat_physcrit = resolvers.mbonus_material(7, 3),
 		combat_apr = resolvers.mbonus_material(15, 5),
 		combat_def = resolvers.mbonus_material(10, 5),
@@ -168,3 +168,37 @@ newEntity{
 	},
 }
 
+newEntity{
+	power_source = {technique=true},
+	name = " of alacrity", suffix=true, instant_resolve=true,
+	keywords = {alacrity=true},
+	level_range = {40, 50},
+	greater_ego = 1,
+	rarity = 30,
+	cost = 80,
+	wielder = {
+		combat_physspeed = 0.15,
+		combat_mindspeed = 0.15,
+		combat_spellspeed = 0.15,
+	},
+}
+
+-- you are so going to veto this ^^;
+newEntity{
+	power_source = {technique=true, arcane=true, nature=true},
+	name = " of the hero ", suffix=true, instant_resolve=true,
+	keywords = {hero=true},
+	level_range = {25, 50},
+	greater_ego = 1,
+	rarity = 30,
+	cost = 35,
+	wielder = {
+		inc_stats = {
+			[Stats.STAT_STR] = resolvers.mbonus_material(4, 3),
+			[Stats.STAT_DEX] = resolvers.mbonus_material(4, 3),
+			[Stats.STAT_WIL] = resolvers.mbonus_material(4, 3),
+			[Stats.STAT_CUN] = resolvers.mbonus_material(4, 3),
+			[Stats.STAT_MAG] = resolvers.mbonus_material(4, 3),
+		},
+	},
+}
diff --git a/game/modules/tome/data/general/objects/egos/rings.lua b/game/modules/tome/data/general/objects/egos/rings.lua
index f2198c8c04540e0db19ca4d9285e1ad015572039..b240dc35f44e9c4335b920d281f4e9bfff92061b 100644
--- a/game/modules/tome/data/general/objects/egos/rings.lua
+++ b/game/modules/tome/data/general/objects/egos/rings.lua
@@ -552,22 +552,6 @@ newEntity{
 	},
 }
 
-newEntity{
-	power_source = {technique=true},
-	name = " of focus", suffix=true, instant_resolve=true,
-	keywords = {focus=true},
-	level_range = {40, 50},
-	greater_ego = 1,
-	rarity = 30,
-	cost = 100,
-	resolvers.charmt(Talents.T_GREATER_WEAPON_FOCUS, {2,3,4}, 20),
-	wielder = {
-		resists_pen = {
-			[DamageType.PHYSICAL] = resolvers.mbonus_material(10, 5),
-		},
-	},
-}
-
 newEntity{
 	power_source = {technique=true},
 	name = " of pilfering", suffix=true, instant_resolve=true,
diff --git a/game/modules/tome/data/general/objects/quest-artifacts.lua b/game/modules/tome/data/general/objects/quest-artifacts.lua
index f1cf60363123c7a97fa6dd6cbb9acc458c0f9a37..f1a9c284663e7184919230f5a7c9cc9ba0c280c3 100644
--- a/game/modules/tome/data/general/objects/quest-artifacts.lua
+++ b/game/modules/tome/data/general/objects/quest-artifacts.lua
@@ -434,3 +434,53 @@ Items in the chest will not encumber you.]], 500)
 		end
 	end,
 }
+
+newEntity{ base = "BASE_CLOTH_ARMOR", define_as = "FUN_BIKINI",
+	unique = true,
+	name = "Bikini", color = colors.RED, image = "object/artifact/bikini.png",
+	unided_name = "tiny piece of cloth",
+	desc = [[Revealing, pink, fun.
+#{bold}#If you never take it off and win you will gain a neat achievement and bragging rights!#{normal}#]],
+	level_range = {1, 1},
+	rarity = false,
+	cost = 1,
+	material_level = 1,
+	moddable_tile = "special/bikini_01",
+	moddable_tile_big = true,
+	special_desc = function(self) return "You have never taken it off." end,
+	on_win = function(self)
+		world:gainAchievement("WIN_BIKINI", game.player)
+	end,
+	on_takeoff = function(self)
+		self.special_desc = nil
+		self.on_win = nil
+	end,
+	wielder = {
+		moddable_tile_nude = 1,
+	},
+}
+
+newEntity{ base = "BASE_CLOTH_ARMOR", define_as = "FUN_MANKINI",
+	unique = true,
+	name = "Mankini", color = colors.RED, image = "object/artifact/bikini.png",
+	unided_name = "tiny piece of cloth",
+	desc = [[Revealing, green, fun.
+#{bold}#If you never take it off and win you will gain a neat achievement and bragging rights!#{normal}#]],
+	level_range = {1, 1},
+	rarity = false,
+	cost = 1,
+	material_level = 1,
+	moddable_tile = "special/mankini_01",
+	moddable_tile_big = true,
+	special_desc = function(self) return "You have never taken it off." end,
+	on_win = function(self)
+		world:gainAchievement("WIN_MANKINI", game.player)
+	end,
+	on_takeoff = function(self)
+		self.special_desc = nil
+		self.on_win = nil
+	end,
+	wielder = {
+		moddable_tile_nude = 1,
+	},
+}
diff --git a/game/modules/tome/data/general/objects/world-artifacts.lua b/game/modules/tome/data/general/objects/world-artifacts.lua
index 1b65ba3c756993ba0c568862b2f21b0ca7edb16e..7ac5c41d549917b55c621e70018fdbd79978b5cc 100644
--- a/game/modules/tome/data/general/objects/world-artifacts.lua
+++ b/game/modules/tome/data/general/objects/world-artifacts.lua
@@ -41,9 +41,9 @@ newEntity{ base = "BASE_GEM",
 	identified = false,
 	material_level = 4,
 	wielder = {
-		inc_stats = {[Stats.STAT_DEX] = 10, [Stats.STAT_CUN] = 10 },
+		inc_stats = {[Stats.STAT_DEX] = 8, [Stats.STAT_CUN] = 8 },
 		inc_damage = {[DamageType.LIGHTNING] = 20 },
-		cancel_damage_chance = 10, -- add to tooltip
+		cancel_damage_chance = 8, -- add to tooltip
 		damage_affinity={
 			[DamageType.LIGHTNING] = 20,
 		},
diff --git a/game/modules/tome/data/gfx/achievements/exploration_win_bikini.png b/game/modules/tome/data/gfx/achievements/exploration_win_bikini.png
new file mode 100644
index 0000000000000000000000000000000000000000..e889cb44044a0fe353900a49bf232d91dc1e1483
Binary files /dev/null and b/game/modules/tome/data/gfx/achievements/exploration_win_bikini.png differ
diff --git a/game/modules/tome/data/gfx/achievements/insane_adventure_win_bikini.png b/game/modules/tome/data/gfx/achievements/insane_adventure_win_bikini.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d3c91de2ee09de9fafbd5c2b4c8e83fa99fc357
Binary files /dev/null and b/game/modules/tome/data/gfx/achievements/insane_adventure_win_bikini.png differ
diff --git a/game/modules/tome/data/gfx/achievements/insane_win_bikini.png b/game/modules/tome/data/gfx/achievements/insane_win_bikini.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3d940677a5da306699b7f297d34da1a857ae14a
Binary files /dev/null and b/game/modules/tome/data/gfx/achievements/insane_win_bikini.png differ
diff --git a/game/modules/tome/data/gfx/achievements/madness_adventure_win_bikini.png b/game/modules/tome/data/gfx/achievements/madness_adventure_win_bikini.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bbb02daea3589eab3c9e64ce9c9e187aff1032f
Binary files /dev/null and b/game/modules/tome/data/gfx/achievements/madness_adventure_win_bikini.png differ
diff --git a/game/modules/tome/data/gfx/achievements/madness_win_bikini.png b/game/modules/tome/data/gfx/achievements/madness_win_bikini.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0761fb69eb857cde2f2d3562f70c037201f1be8
Binary files /dev/null and b/game/modules/tome/data/gfx/achievements/madness_win_bikini.png differ
diff --git a/game/modules/tome/data/gfx/achievements/nightmare_adventure_win_bikini.png b/game/modules/tome/data/gfx/achievements/nightmare_adventure_win_bikini.png
new file mode 100644
index 0000000000000000000000000000000000000000..f220cd68836b179e976f4b4499da9d55c3935772
Binary files /dev/null and b/game/modules/tome/data/gfx/achievements/nightmare_adventure_win_bikini.png differ
diff --git a/game/modules/tome/data/gfx/achievements/nightmare_win_bikini.png b/game/modules/tome/data/gfx/achievements/nightmare_win_bikini.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f56ea8b06c2e6dead03c63a7bf75aba4391ed30
Binary files /dev/null and b/game/modules/tome/data/gfx/achievements/nightmare_win_bikini.png differ
diff --git a/game/modules/tome/data/gfx/achievements/normal_roguelike_win_bikini.png b/game/modules/tome/data/gfx/achievements/normal_roguelike_win_bikini.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee7dec1ab556f0c60a413a2da8cfcab39bebee23
Binary files /dev/null and b/game/modules/tome/data/gfx/achievements/normal_roguelike_win_bikini.png differ
diff --git a/game/modules/tome/data/gfx/achievements/win_bikini.png b/game/modules/tome/data/gfx/achievements/win_bikini.png
new file mode 100644
index 0000000000000000000000000000000000000000..405c4059f48ba72f3af1a0245300b3d7ffb89e97
Binary files /dev/null and b/game/modules/tome/data/gfx/achievements/win_bikini.png differ
diff --git a/game/modules/tome/data/gfx/effects/light_burst_speed.png b/game/modules/tome/data/gfx/effects/light_burst_speed.png
new file mode 100644
index 0000000000000000000000000000000000000000..691ab7f0de6f207874ad056beaff8c04ff31633d
Binary files /dev/null and b/game/modules/tome/data/gfx/effects/light_burst_speed.png differ
diff --git a/game/modules/tome/data/gfx/particles/gravity_breath.lua b/game/modules/tome/data/gfx/particles/gravity_breath.lua
index 94173e354298923331d95e337d30c1979a94f001..a35c5efaf9654187dcc43d186966b89000683259 100644
--- a/game/modules/tome/data/gfx/particles/gravity_breath.lua
+++ b/game/modules/tome/data/gfx/particles/gravity_breath.lua
@@ -31,7 +31,6 @@ if core.shader.allow("distort") and allow then
 use_shader = {type="distort", power=0.06, power_time=1000000, blacken=30} alterscreen = true
 base_size = 64
 local nb = 0
-
 local life=16
 local sizev=2*64*radius / life
 
diff --git a/game/modules/tome/data/gfx/particles_images/spinningwinds_yellow.png b/game/modules/tome/data/gfx/particles_images/spinningwinds_yellow.png
new file mode 100644
index 0000000000000000000000000000000000000000..11d3ed21eb7ea17df734f74f4a92efd474142c4b
Binary files /dev/null and b/game/modules/tome/data/gfx/particles_images/spinningwinds_yellow.png differ
diff --git a/game/modules/tome/data/gfx/shaders/tree.frag b/game/modules/tome/data/gfx/shaders/tree.frag
index bf8f5e35c5a7e1eea44bff965329fead2f3a9de6..fdb44aa1539f9049cda631dbe0bd78126514dcf2 100644
--- a/game/modules/tome/data/gfx/shaders/tree.frag
+++ b/game/modules/tome/data/gfx/shaders/tree.frag
@@ -1,11 +1,14 @@
 uniform sampler2D tex;
 uniform float tick;
 uniform vec2 mapCoord;
+uniform float attenuation;
 
 void main(void)
 {
 	float time = tick / 1000.0;
 	vec2 xy = gl_TexCoord[0].xy;
-	if (xy.y <= 0.5) xy.x = xy.x + (0.5-xy.y) * sin(time + mapCoord.x / 40 + mapCoord.y) / 14.0;
+//	if (xy.y <= 0.5) xy.x = xy.x + (0.5-xy.y) * sin(time + mapCoord.x / 40 + mapCoord.y) / 14.0;
+	if (xy.y <= 0.75) xy.x = xy.x + (0.75-xy.y) * sin(time + mapCoord.x / 40 + mapCoord.y) / attenuation;
+//	xy.x = xy.x + (1.0-xy.y) * sin(time + mapCoord.x / 40 + mapCoord.y) / attenuation;
 	gl_FragColor = texture2D(tex, xy) * gl_Color;
 }
diff --git a/game/modules/tome/data/gfx/shaders/tree.lua b/game/modules/tome/data/gfx/shaders/tree.lua
index 9e7b7a251e9d86d22a3ea1b8af5faa81d33b7f8e..d0601a45fabe8382c31d163f1345c4b6d5610a7e 100644
--- a/game/modules/tome/data/gfx/shaders/tree.lua
+++ b/game/modules/tome/data/gfx/shaders/tree.lua
@@ -21,6 +21,7 @@ return {
 	frag = "tree",
 	vert = nil,
 	args = {
+		attenuation = attenuation or 35,
 	},
 	clone = false,
 }
diff --git a/game/modules/tome/data/gfx/shockbolt/attachements.lua b/game/modules/tome/data/gfx/shockbolt/attachements.lua
index 4e2461b68f1a8dd61820a779cd38e10370d0f168..c7af7fe28d57cae0284f3ac56357f54a702494f5 100644
--- a/game/modules/tome/data/gfx/shockbolt/attachements.lua
+++ b/game/modules/tome/data/gfx/shockbolt/attachements.lua
@@ -2,95 +2,95 @@ tiles={} dolls={}
 
 tiles["npc/humanoid_shalore_elven_guard.png"] = { base=64,
 	feet = {x=33, y=61},
+	back = {x=32, y=15},
 	belly = {x=32, y=28},
 	hand1 = {x=13, y=31},
-	back = {x=32, y=15},
 	head = {x=31, y=5},
 }
-tiles["npc/humanoid_player_default.png"] = { base=64,
-	feet = {x=33, y=60},
-	hand1 = {x=21, y=35},
-	hand2 = {x=44, y=36},
-	back = {x=32, y=14},
-	belly = {x=33, y=28},
-	head = {x=32, y=5},
+tiles["npc/humanoid_human_gladiator.png"] = { base=64,
+	feet = {x=35, y=58},
+	hand1 = {x=13, y=35},
+	hand2 = {x=53, y=36},
+	back = {x=34, y=19},
+	belly = {x=35, y=31},
+	head = {x=32, y=7},
 }
 tiles["npc/humanoid_human_high_gladiator.png"] = { base=64,
 	feet = {x=30, y=61},
 	hand1 = {x=8, y=13},
 	hand2 = {x=55, y=33},
-	belly = {x=33, y=30},
 	back = {x=34, y=17},
+	belly = {x=33, y=30},
 	head = {x=30, y=7},
 }
 tiles["npc/humanoid_shalore_elvala_guard.png"] = { base=64,
 	feet = {x=32, y=61},
+	back = {x=31, y=15},
 	belly = {x=31, y=27},
 	hand1 = {x=13, y=30},
-	back = {x=31, y=15},
 	head = {x=31, y=5},
 }
 tiles["npc/humanoid_naga_slasul.png"] = { base=64,
 	feet = {x=32, y=61},
 	hand1 = {x=11, y=30},
 	hand2 = {x=46, y=-2},
-	back = {x=23, y=3},
 	belly = {x=23, y=14},
+	back = {x=23, y=3},
 	head = {x=24, y=-12},
 }
 tiles["npc/humanoid_human_human_citizen.png"] = { base=64,
 	feet = {x=35, y=59},
 	hand1 = {x=11, y=13},
 	hand2 = {x=47, y=30},
-	belly = {x=36, y=28},
 	back = {x=36, y=16},
+	belly = {x=36, y=28},
 	head = {x=36, y=5},
 }
 tiles["npc/humanoid_yeek_yeek_psionic.png"] = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=31, y=38},
 	hand2 = {x=33, y=38},
-	back = {x=32, y=23},
 	belly = {x=32, y=34},
+	back = {x=32, y=23},
 	head = {x=32, y=12},
 }
 tiles["npc/humanoid_orc_vor__grand_geomancer_of_the_pride.png"] = { base=64,
 	feet = {x=32, y=60},
 	hand1 = {x=4, y=34},
 	hand2 = {x=58, y=39},
-	back = {x=33, y=20},
 	belly = {x=32, y=35},
+	back = {x=33, y=20},
 	head = {x=34, y=9},
 }
 tiles["npc/humanoid_human_ziguranth_wyrmic.png"] = { base=64,
 	feet = {x=32, y=59},
 	hand1 = {x=12, y=32},
 	hand2 = {x=51, y=34},
-	back = {x=32, y=16},
 	belly = {x=33, y=30},
+	back = {x=32, y=16},
 	head = {x=32, y=4},
 }
 tiles["npc/humanoid_shalore_elven_warrior.png"] = { base=64,
 	feet = {x=32, y=61},
+	back = {x=31, y=14},
 	belly = {x=31, y=26},
 	hand1 = {x=13, y=31},
-	back = {x=31, y=14},
 	head = {x=31, y=5},
 }
 tiles["npc/humanoid_shalore_elandar.png"] = { base=64,
 	feet = {x=34, y=59},
 	hand1 = {x=13, y=26},
 	hand2 = {x=50, y=-12},
-	back = {x=30, y=8},
 	belly = {x=33, y=22},
+	back = {x=30, y=8},
 	head = {x=29, y=-2},
 }
 tiles["npc/humanoid_human_high_sun_paladin_rodmour.png"] = { base=64,
 	feet = {x=32, y=59},
 	hand1 = {x=12, y=35},
 	hand2 = {x=48, y=36},
-	belly = {x=32, y=29},
 	back = {x=32, y=15},
+	belly = {x=32, y=29},
 	head = {x=32, y=3},
 }
 dolls.race_runic_golem = dolls.race_runic_golem or {}
@@ -98,32 +98,32 @@ dolls.race_runic_golem.all = { base=64,
 	feet = {x=54, y=43},
 	hand1 = {x=29, y=18},
 	hand2 = {x=22, y=28},
-	back = {x=28, y=48},
 	belly = {x=43, y=49},
+	back = {x=28, y=48},
 	head = {x=39, y=29},
 }
 tiles["npc/humanoid_human_assassin_lord.png"] = { base=64,
 	feet = {x=35, y=61},
 	hand1 = {x=10, y=10},
 	hand2 = {x=56, y=34},
-	belly = {x=32, y=28},
 	back = {x=31, y=16},
+	belly = {x=32, y=28},
 	head = {x=32, y=5},
 }
 tiles["npc/humanoid_human_rogue.png"] = { base=64,
 	feet = {x=36, y=58},
 	hand1 = {x=8, y=36},
 	hand2 = {x=55, y=29},
-	back = {x=30, y=21},
 	belly = {x=30, y=31},
+	back = {x=30, y=21},
 	head = {x=27, y=7},
 }
 tiles["npc/humanoid_dwarf_norgan.png"] = { base=64,
 	feet = {x=41, y=57},
 	hand1 = {x=15, y=40},
 	hand2 = {x=47, y=19},
-	belly = {x=35, y=37},
 	back = {x=32, y=23},
+	belly = {x=35, y=37},
 	head = {x=27, y=8},
 }
 dolls.race_human = dolls.race_human or {}
@@ -131,64 +131,64 @@ dolls.race_human.male = { base=64,
 	feet = {x=32, y=60},
 	hand1 = {x=15, y=32},
 	hand2 = {x=48, y=34},
-	back = {x=32, y=15},
 	belly = {x=32, y=28},
+	back = {x=32, y=15},
 	head = {x=30, y=3},
 }
 tiles["npc/humanoid_yaech_murgol__the_yaech_lord.png"] = { base=64,
 	feet = {x=56, y=58},
 	hand1 = {x=7, y=28},
 	hand2 = {x=20, y=32},
-	back = {x=38, y=31},
 	belly = {x=38, y=39},
+	back = {x=38, y=31},
 	head = {x=32, y=16},
 }
-tiles["npc/humanoid_human_the_possessed.png"] = { base=64,
-	feet = {x=30, y=62},
-	hand1 = {x=9, y=17},
-	hand2 = {x=47, y=37},
-	back = {x=33, y=17},
-	belly = {x=33, y=35},
-	head = {x=33, y=4},
+tiles["npc/humanoid_halfling_protector_myssil.png"] = { base=64,
+	feet = {x=32, y=60},
+	hand1 = {x=16, y=43},
+	hand2 = {x=45, y=39},
+	back = {x=30, y=22},
+	belly = {x=31, y=34},
+	head = {x=30, y=7},
 }
-tiles["npc/humanoid_halfling_master_slinger.png"] = { base=64,
-	feet = {x=39, y=59},
-	hand1 = {x=15, y=42},
-	hand2 = {x=47, y=10},
-	belly = {x=32, y=38},
-	back = {x=31, y=27},
-	head = {x=28, y=14},
+tiles["npc/humanoid_halfling_halfling_guard.png"] = { base=64,
+	feet = {x=38, y=59},
+	hand1 = {x=8, y=28},
+	hand2 = {x=54, y=43},
+	back = {x=33, y=24},
+	belly = {x=36, y=36},
+	head = {x=30, y=10},
 }
 tiles["npc/humanoid_thalore_mindworm.png"] = { base=64,
 	feet = {x=32, y=62},
 	hand1 = {x=21, y=36},
 	hand2 = {x=44, y=35},
-	back = {x=31, y=13},
 	belly = {x=32, y=30},
+	back = {x=31, y=13},
 	head = {x=31, y=6},
 }
 tiles["npc/humanoid_shalore_grand_corruptor.png"] = { base=64,
 	feet = {x=25, y=61},
 	hand1 = {x=11, y=34},
 	hand2 = {x=53, y=17},
-	back = {x=28, y=19},
 	belly = {x=28, y=31},
+	back = {x=28, y=19},
 	head = {x=28, y=10},
 }
-tiles["npc/humanoid_human_harno__herald_of_last_hope.png"] = { base=64,
-	feet = {x=32, y=61},
-	hand1 = {x=16, y=37},
-	hand2 = {x=45, y=36},
-	belly = {x=31, y=31},
-	back = {x=30, y=15},
-	head = {x=29, y=4},
+tiles["npc/humanoid_shalore_elven_blood_mage.png"] = { base=64,
+	feet = {x=32, y=59},
+	hand1 = {x=15, y=36},
+	hand2 = {x=46, y=36},
+	belly = {x=30, y=33},
+	back = {x=30, y=17},
+	head = {x=30, y=7},
 }
 tiles["npc/humanoid_human_slave_combatant.png"] = { base=64,
 	feet = {x=33, y=60},
 	hand1 = {x=18, y=37},
 	hand2 = {x=47, y=32},
-	back = {x=30, y=17},
 	belly = {x=31, y=29},
+	back = {x=30, y=17},
 	head = {x=29, y=6},
 }
 dolls.race_elf = dolls.race_elf or {}
@@ -196,62 +196,62 @@ dolls.race_elf.male = { base=64,
 	feet = {x=32, y=61},
 	hand1 = {x=19, y=32},
 	hand2 = {x=44, y=34},
-	back = {x=32, y=15},
 	belly = {x=33, y=27},
+	back = {x=32, y=15},
 	head = {x=30, y=4},
 }
 tiles["npc/humanoid_male_sluttymaid.png"] = { base=64,
 	feet = {x=30, y=60},
 	hand1 = {x=24, y=30},
 	hand2 = {x=41, y=21},
-	back = {x=35, y=11},
 	belly = {x=35, y=24},
+	back = {x=35, y=11},
 	head = {x=35, y=0},
 }
 tiles["npc/humanoid_elf_limmir_the_jeweler.png"] = { base=64,
 	feet = {x=31, y=60},
 	hand1 = {x=11, y=37},
 	hand2 = {x=49, y=9},
-	belly = {x=31, y=30},
 	back = {x=31, y=19},
+	belly = {x=31, y=30},
 	head = {x=32, y=4},
 }
 tiles["npc/canine_warg.png"] = { base=64,
 	feet = {x=15, y=18},
 	hand1 = {x=48, y=22},
 	hand2 = {x=46, y=48},
-	back = {x=26, y=51},
 	belly = {x=12, y=32},
+	back = {x=26, y=51},
 	head = {x=33, y=13},
 }
 tiles["npc/humanoid_human_cryomancer.png"] = { base=64,
 	feet = {x=37, y=59},
 	hand1 = {x=22, y=6},
 	hand2 = {x=44, y=32},
-	belly = {x=36, y=28},
 	back = {x=35, y=16},
+	belly = {x=36, y=28},
 	head = {x=34, y=5},
 }
 tiles["npc/acid_ant.png"] = { base=64,
 	feet = {x=36, y=57},
 	back = {x=45, y=37},
 	hand2 = {x=51, y=17},
-	belly = {x=11, y=33},
 	hand1 = {x=32, y=22},
+	belly = {x=11, y=33},
 	head = {x=15, y=13},
 }
 tiles["npc/humanoid_shalore_elven_corruptor.png"] = { base=64,
 	feet = {x=34, y=60},
 	hand1 = {x=12, y=17},
 	hand2 = {x=48, y=34},
-	back = {x=31, y=20},
 	belly = {x=31, y=33},
+	back = {x=31, y=20},
 	head = {x=31, y=10},
 }
 tiles["npc/humanoid_human_townsfolk_village_idiot01_64.png"] = { base=64,
-	belly = {x=37, y=34},
-	feet = {x=35, y=58},
 	back = {x=33, y=24},
+	feet = {x=35, y=58},
+	belly = {x=37, y=34},
 	head = {x=32, y=8},
 }
 dolls.race_halfling = dolls.race_halfling or {}
@@ -259,16 +259,16 @@ dolls.race_halfling.female = { base=64,
 	feet = {x=34, y=62},
 	hand1 = {x=12, y=38},
 	hand2 = {x=50, y=40},
-	belly = {x=34, y=36},
 	back = {x=32, y=24},
+	belly = {x=34, y=36},
 	head = {x=32, y=12},
 }
 tiles["npc/humanoid_elf_elven_sun_mage.png"] = { base=64,
 	feet = {x=35, y=62},
 	hand1 = {x=13, y=28},
 	hand2 = {x=50, y=37},
-	belly = {x=34, y=35},
 	back = {x=32, y=16},
+	belly = {x=34, y=35},
 	head = {x=31, y=4},
 }
 dolls.race_halfling = dolls.race_halfling or {}
@@ -276,25 +276,25 @@ dolls.race_halfling.male = { base=64,
 	feet = {x=34, y=61},
 	hand1 = {x=14, y=39},
 	hand2 = {x=50, y=39},
-	belly = {x=33, y=36},
 	back = {x=32, y=25},
+	belly = {x=33, y=36},
 	head = {x=32, y=14},
 }
-tiles["npc/humanoid_human_storm_wyrmic.png"] = { base=64,
-	feet = {x=34, y=60},
-	hand1 = {x=15, y=32},
-	hand2 = {x=53, y=37},
-	back = {x=31, y=21},
-	belly = {x=31, y=31},
-	head = {x=27, y=9},
+tiles["npc/humanoid_human_townsfolk_battlescarred_veteran01_64.png"] = { base=64,
+	feet = {x=35, y=57},
+	hand1 = {x=16, y=39},
+	hand2 = {x=52, y=39},
+	belly = {x=33, y=30},
+	back = {x=33, y=19},
+	head = {x=32, y=7},
 }
 dolls.race_ghoul = dolls.race_ghoul or {}
 dolls.race_ghoul.all = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=20, y=37},
 	hand2 = {x=48, y=38},
-	back = {x=34, y=20},
 	belly = {x=33, y=38},
+	back = {x=34, y=20},
 	head = {x=33, y=8},
 }
 tiles["npc/animal_feline_snow_cat.png"] = { base=64,
@@ -304,47 +304,47 @@ tiles["npc/humanoid_human_master_alchemist.png"] = { base=64,
 	feet = {x=35, y=59},
 	hand1 = {x=7, y=18},
 	hand2 = {x=57, y=35},
-	back = {x=34, y=18},
 	belly = {x=37, y=28},
+	back = {x=34, y=18},
 	head = {x=29, y=8},
 }
-tiles["npc/humanoid_human_riala_shalarak.png"] = { base=64,
-	feet = {x=33, y=59},
-	hand1 = {x=17, y=7},
-	hand2 = {x=58, y=30},
-	back = {x=35, y=17},
-	belly = {x=34, y=27},
-	head = {x=33, y=5},
+tiles["npc/humanoid_human_human_farmer.png"] = { base=64,
+	feet = {x=32, y=60},
+	hand1 = {x=11, y=20},
+	hand2 = {x=44, y=38},
+	back = {x=29, y=18},
+	belly = {x=31, y=31},
+	head = {x=29, y=5},
 }
-tiles["npc/humanoid_human_fire_wyrmic.png"] = { base=64,
-	feet = {x=31, y=60},
-	hand1 = {x=12, y=30},
-	hand2 = {x=49, y=36},
-	belly = {x=28, y=28},
-	back = {x=28, y=19},
-	head = {x=24, y=9},
+tiles["npc/humanoid_human_lumberjack.png"] = { base=64,
+	feet = {x=33, y=61},
+	hand1 = {x=17, y=37},
+	hand2 = {x=44, y=37},
+	belly = {x=33, y=31},
+	back = {x=32, y=17},
+	head = {x=32, y=4},
 }
 tiles["npc/humanoid_shalore_elven_elite_warrior.png"] = { base=64,
 	feet = {x=33, y=62},
+	back = {x=31, y=15},
 	belly = {x=31, y=27},
 	hand1 = {x=13, y=32},
-	back = {x=31, y=15},
 	head = {x=32, y=6},
 }
-tiles["npc/humanoid_orc_orc_assassin.png"] = { base=64,
-	feet = {x=36, y=60},
-	hand1 = {x=4, y=30},
-	hand2 = {x=40, y=3},
-	back = {x=33, y=20},
-	belly = {x=42, y=29},
-	head = {x=24, y=11},
+tiles["npc/humanoid_human_riala_shalarak.png"] = { base=64,
+	feet = {x=33, y=59},
+	hand1 = {x=17, y=7},
+	hand2 = {x=58, y=30},
+	belly = {x=34, y=27},
+	back = {x=35, y=17},
+	head = {x=33, y=5},
 }
 tiles["npc/humanoid_yaech_slaver.png"] = { base=64,
 	feet = {x=46, y=58},
 	hand1 = {x=16, y=28},
 	hand2 = {x=51, y=10},
-	back = {x=37, y=25},
 	belly = {x=38, y=34},
+	back = {x=37, y=25},
 	head = {x=28, y=17},
 }
 dolls.race_human = dolls.race_human or {}
@@ -352,33 +352,33 @@ dolls.race_human.female = { base=64,
 	feet = {x=33, y=60},
 	hand1 = {x=20, y=33},
 	hand2 = {x=46, y=33},
-	belly = {x=34, y=28},
 	back = {x=33, y=16},
+	belly = {x=34, y=28},
 	head = {x=32, y=3},
 }
-tiles["npc/humanoid_orc_orc_mage_hunter.png"] = { base=64,
-	feet = {x=32, y=61},
-	hand1 = {x=6, y=34},
-	hand2 = {x=57, y=31},
-	back = {x=28, y=20},
-	belly = {x=29, y=32},
-	head = {x=27, y=8},
+tiles["npc/humanoid_orc_orc_greatmother.png"] = { base=64,
+	feet = {x=35, y=59},
+	hand1 = {x=4, y=-4},
+	hand2 = {x=58, y=2},
+	belly = {x=30, y=-3},
+	back = {x=32, y=-40},
+	head = {x=33, y=-55},
 }
-tiles["npc/humanoid_yeek_yeek_commoner_03.png"] = { base=64,
-	feet = {x=32, y=59},
-	hand1 = {x=17, y=42},
-	hand2 = {x=50, y=44},
-	back = {x=32, y=24},
-	belly = {x=33, y=36},
-	head = {x=31, y=12},
+tiles["npc/humanoid_yeek_yeek_commoner_02.png"] = { base=64,
+	feet = {x=31, y=59},
+	hand1 = {x=10, y=20},
+	hand2 = {x=23, y=35},
+	belly = {x=32, y=35},
+	back = {x=30, y=21},
+	head = {x=31, y=11},
 }
 dolls.race_dwarf = dolls.race_dwarf or {}
 dolls.race_dwarf.male = { base=64,
 	feet = {x=34, y=61},
 	back = {x=32, y=25},
 	hand2 = {x=55, y=39},
-	belly = {x=34, y=34},
 	hand1 = {x=10, y=39},
+	belly = {x=34, y=34},
 	head = {x=32, y=10},
 }
 dolls.race_dwarf = dolls.race_dwarf or {}
@@ -386,8 +386,8 @@ dolls.race_dwarf.female = { base=64,
 	feet = {x=33, y=59},
 	back = {x=33, y=25},
 	hand2 = {x=55, y=39},
-	belly = {x=33, y=37},
 	hand1 = {x=9, y=39},
+	belly = {x=33, y=37},
 	head = {x=33, y=9},
 }
 dolls.race_skeleton = dolls.race_skeleton or {}
@@ -395,8 +395,8 @@ dolls.race_skeleton.all = { base=64,
 	feet = {x=32, y=62},
 	hand1 = {x=15, y=33},
 	hand2 = {x=47, y=34},
-	belly = {x=32, y=26},
 	back = {x=31, y=16},
+	belly = {x=32, y=26},
 	head = {x=30, y=4},
 }
 dolls.race_yeek = dolls.race_yeek or {}
@@ -404,1240 +404,1240 @@ dolls.race_yeek.all = { base=64,
 	feet = {x=32, y=62},
 	hand1 = {x=16, y=39},
 	hand2 = {x=46, y=40},
-	belly = {x=32, y=36},
 	back = {x=31, y=26},
+	belly = {x=32, y=36},
 	head = {x=31, y=12},
 }
-tiles["npc/humanoid_orc_orc_cryomancer.png"] = { base=64,
-	feet = {x=35, y=60},
-	hand1 = {x=5, y=14},
-	hand2 = {x=57, y=30},
-	back = {x=29, y=17},
-	belly = {x=36, y=31},
-	head = {x=23, y=7},
+tiles["npc/humanoid_orc_orc_blood_mage.png"] = { base=64,
+	feet = {x=34, y=59},
+	hand1 = {x=11, y=36},
+	hand2 = {x=57, y=37},
+	belly = {x=34, y=32},
+	back = {x=33, y=17},
+	head = {x=32, y=5},
 }
 tiles["npc/humanoid_human_aluin_the_fallen.png"] = { base=64,
 	feet = {x=31, y=60},
 	hand1 = {x=18, y=36},
 	hand2 = {x=41, y=38},
-	belly = {x=29, y=29},
 	back = {x=29, y=18},
+	belly = {x=29, y=29},
 	head = {x=28, y=5},
 }
-tiles["npc/humanoid_human_tempest.png"] = { base=64,
-	feet = {x=26, y=59},
-	hand1 = {x=19, y=31},
-	hand2 = {x=41, y=6},
-	back = {x=27, y=16},
-	belly = {x=26, y=30},
-	head = {x=28, y=4},
+tiles["npc/humanoid_yeek_yeek_commoner_06.png"] = { base=64,
+	feet = {x=30, y=61},
+	hand1 = {x=10, y=22},
+	hand2 = {x=23, y=36},
+	belly = {x=31, y=36},
+	back = {x=31, y=22},
+	head = {x=30, y=13},
 }
-tiles["npc/humanoid_orc_orc_soldier.png"] = { base=64,
-	feet = {x=36, y=62},
-	hand1 = {x=9, y=39},
-	hand2 = {x=58, y=36},
-	back = {x=29, y=21},
-	belly = {x=34, y=34},
-	head = {x=25, y=9},
+tiles["npc/humanoid_orc_orc_fighter.png"] = { base=64,
+	feet = {x=30, y=60},
+	hand1 = {x=7, y=8},
+	hand2 = {x=57, y=39},
+	belly = {x=31, y=34},
+	back = {x=35, y=20},
+	head = {x=39, y=10},
 }
 tiles["npc/humanoid_human_linaniil_supreme_archmage.png"] = { base=64,
 	feet = {x=38, y=60},
 	hand1 = {x=10, y=7},
 	hand2 = {x=49, y=29},
-	belly = {x=37, y=19},
 	back = {x=35, y=1},
+	belly = {x=37, y=19},
 	head = {x=31, y=-13},
 }
 tiles["npc/humanoid_elf_elven_archer.png"] = { base=64,
 	feet = {x=32, y=61},
 	hand1 = {x=13, y=32},
 	hand2 = {x=51, y=32},
-	belly = {x=32, y=28},
 	back = {x=32, y=15},
+	belly = {x=32, y=28},
 	head = {x=32, y=5},
 }
-tiles["npc/humanoid_human_trickster.png"] = { base=64,
-	feet = {x=36, y=60},
-	back = {x=35, y=17},
-	hand2 = {x=5, y=32},
-	belly = {x=37, y=29},
-	head = {x=30, y=6},
-}
-tiles["npc/humanoid_orc_orc_master_assassin.png"] = { base=64,
-	feet = {x=31, y=60},
-	hand1 = {x=4, y=39},
-	hand2 = {x=59, y=32},
-	back = {x=29, y=18},
-	belly = {x=30, y=30},
-	head = {x=28, y=8},
-}
-tiles["npc/humanoid_human_derth_guard.png"] = { base=64,
-	feet = {x=37, y=59},
-	hand1 = {x=10, y=18},
-	hand2 = {x=48, y=33},
-	belly = {x=36, y=29},
-	back = {x=34, y=17},
-	head = {x=34, y=5},
+tiles["npc/humanoid_halfling_halfling_citizen.png"] = { base=64,
+	feet = {x=31, y=58},
+	hand1 = {x=13, y=38},
+	hand2 = {x=48, y=41},
+	back = {x=30, y=22},
+	belly = {x=31, y=33},
+	head = {x=30, y=8},
 }
-tiles["npc/humanoid_shalore_elven_cultist.png"] = { base=64,
+tiles["npc/humanoid_human_sand_wyrmic.png"] = { base=64,
 	feet = {x=29, y=60},
-	hand1 = {x=8, y=9},
-	hand2 = {x=52, y=9},
+	hand1 = {x=10, y=38},
+	hand2 = {x=58, y=17},
+	belly = {x=31, y=30},
+	back = {x=32, y=19},
+	head = {x=37, y=8},
+}
+tiles["npc/humanoid_human_spectator02.png"] = { base=64,
+	feet = {x=30, y=59},
+	hand1 = {x=18, y=37},
+	hand2 = {x=41, y=37},
+	belly = {x=31, y=30},
 	back = {x=30, y=16},
-	belly = {x=31, y=28},
-	head = {x=31, y=6},
+	head = {x=30, y=5},
 }
-tiles["npc/humanoid_human_spectator03.png"] = { base=64,
-	feet = {x=32, y=61},
-	hand1 = {x=16, y=38},
-	hand2 = {x=44, y=38},
-	back = {x=30, y=19},
-	belly = {x=30, y=30},
-	head = {x=30, y=4},
+tiles["npc/humanoid_human_arcane_blade.png"] = { base=64,
+	feet = {x=26, y=61},
+	hand1 = {x=17, y=3},
+	hand2 = {x=38, y=35},
+	back = {x=27, y=22},
+	belly = {x=27, y=29},
+	head = {x=29, y=13},
 }
-tiles["npc/humanoid_orc_orc_archer.png"] = { base=64,
-	feet = {x=30, y=60},
-	hand1 = {x=20, y=29},
-	hand2 = {x=56, y=30},
-	back = {x=30, y=20},
-	belly = {x=31, y=34},
-	head = {x=31, y=10},
+tiles["npc/humanoid_human_necromancer.png"] = { base=64,
+	feet = {x=27, y=61},
+	hand1 = {x=18, y=16},
+	hand2 = {x=40, y=41},
+	belly = {x=32, y=32},
+	back = {x=34, y=17},
+	head = {x=36, y=3},
 }
-tiles["npc/humanoid_yeek_yeek_commoner_06.png"] = { base=64,
-	feet = {x=30, y=61},
-	hand1 = {x=10, y=22},
-	hand2 = {x=23, y=36},
-	back = {x=31, y=22},
-	belly = {x=31, y=36},
-	head = {x=30, y=13},
+tiles["npc/humanoid_orc_orc_mother.png"] = { base=64,
+	feet = {x=33, y=59},
+	hand1 = {x=10, y=37},
+	hand2 = {x=53, y=35},
+	belly = {x=30, y=31},
+	back = {x=30, y=9},
+	head = {x=28, y=-6},
+}
+tiles["npc/humanoid_human_townsfolk_squinteyed_rogue01_64.png"] = { base=64,
+	feet = {x=33, y=57},
+	hand1 = {x=11, y=28},
+	hand2 = {x=53, y=38},
+	belly = {x=33, y=33},
+	back = {x=33, y=20},
+	head = {x=30, y=7},
 }
 tiles["npc/humanoid_halfling_sm_halfling.png"] = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=10, y=14},
 	hand2 = {x=52, y=11},
-	belly = {x=30, y=35},
 	back = {x=30, y=23},
+	belly = {x=30, y=35},
 	head = {x=31, y=7},
 }
-tiles["npc/humanoid_orc_orc_master_wyrmic.png"] = { base=64,
-	feet = {x=39, y=60},
-	hand1 = {x=16, y=40},
-	hand2 = {x=58, y=36},
-	back = {x=33, y=21},
-	belly = {x=36, y=32},
-	head = {x=30, y=13},
+tiles["npc/humanoid_orc_orc_elite_fighter.png"] = { base=64,
+	feet = {x=31, y=60},
+	hand1 = {x=11, y=37},
+	hand2 = {x=53, y=29},
+	belly = {x=31, y=33},
+	back = {x=29, y=16},
+	head = {x=29, y=4},
 }
-tiles["npc/humanoid_human_reaver.png"] = { base=64,
-	feet = {x=34, y=59},
-	hand1 = {x=8, y=37},
-	hand2 = {x=52, y=31},
-	back = {x=29, y=17},
-	belly = {x=29, y=29},
-	head = {x=28, y=6},
+tiles["npc/humanoid_human_bandit.png"] = { base=64,
+	feet = {x=39, y=56},
+	hand1 = {x=8, y=40},
+	hand2 = {x=51, y=26},
+	back = {x=30, y=16},
+	belly = {x=33, y=28},
+	head = {x=29, y=5},
 }
 tiles["npc/humanoid_elf_star_crusader.png"] = { base=64,
 	feet = {x=34, y=60},
 	hand1 = {x=11, y=30},
 	hand2 = {x=51, y=33},
-	belly = {x=34, y=30},
 	back = {x=34, y=17},
+	belly = {x=34, y=30},
 	head = {x=34, y=4},
 }
 tiles["npc/humanoid_elf_high_chronomancer_zemekkys.png"] = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=11, y=36},
 	hand2 = {x=51, y=38},
-	belly = {x=32, y=29},
 	back = {x=32, y=19},
+	belly = {x=32, y=29},
 	head = {x=30, y=6},
 }
 tiles["npc/humanoid_yaech_yaech_psion.png"] = { base=64,
 	feet = {x=5, y=58},
 	hand1 = {x=55, y=27},
 	hand2 = {x=42, y=32},
-	back = {x=23, y=31},
 	belly = {x=25, y=40},
+	back = {x=23, y=31},
 	head = {x=33, y=15},
 }
 tiles["npc/humanoid_orc_orc_corruptor.png"] = { base=64,
 	feet = {x=35, y=61},
 	hand1 = {x=15, y=39},
 	hand2 = {x=51, y=37},
-	back = {x=31, y=17},
 	belly = {x=34, y=36},
+	back = {x=31, y=17},
 	head = {x=28, y=6},
 }
 tiles["npc/humanoid_halfling_halfling_gardener.png"] = { base=64,
 	feet = {x=33, y=58},
 	hand1 = {x=17, y=36},
 	hand2 = {x=48, y=38},
-	belly = {x=31, y=32},
 	back = {x=31, y=22},
+	belly = {x=31, y=32},
 	head = {x=29, y=8},
 }
-tiles["npc/humanoid_human_cutpurse.png"] = { base=64,
-	feet = {x=36, y=59},
-	hand1 = {x=9, y=34},
-	hand2 = {x=46, y=34},
-	belly = {x=30, y=29},
-	back = {x=29, y=18},
-	head = {x=28, y=7},
+tiles["npc/humanoid_human_argoniel.png"] = { base=64,
+	feet = {x=30, y=59},
+	hand1 = {x=9, y=2},
+	hand2 = {x=57, y=9},
+	back = {x=32, y=10},
+	belly = {x=32, y=22},
+	head = {x=32, y=-3},
 }
 tiles["npc/humanoid_orc_fiery_orc_wyrmic.png"] = { base=64,
 	feet = {x=33, y=60},
 	hand1 = {x=20, y=20},
 	hand2 = {x=57, y=36},
-	back = {x=30, y=21},
 	belly = {x=32, y=31},
+	back = {x=30, y=21},
 	head = {x=25, y=9},
 }
 tiles["npc/humanoid_orc_ukruk_the_fierce.png"] = { base=64,
 	feet = {x=34, y=60},
+	back = {x=28, y=17},
 	belly = {x=29, y=33},
 	hand1 = {x=10, y=38},
-	back = {x=28, y=17},
 	head = {x=25, y=8},
 }
-tiles["npc/humanoid_human_rej_arkatis.png"] = { base=64,
-	feet = {x=34, y=59},
-	hand1 = {x=24, y=17},
-	hand2 = {x=38, y=19},
-	back = {x=33, y=15},
-	belly = {x=33, y=26},
-	head = {x=32, y=4},
-}
-tiles["npc/humanoid_orc_young_orc.png"] = { base=64,
-	feet = {x=35, y=60},
-	hand1 = {x=14, y=10},
-	hand2 = {x=52, y=40},
-	back = {x=32, y=19},
-	belly = {x=35, y=32},
-	head = {x=30, y=8},
+tiles["npc/humanoid_orc_orc_warrior.png"] = { base=64,
+	feet = {x=35, y=61},
+	hand1 = {x=8, y=38},
+	hand2 = {x=57, y=35},
+	belly = {x=34, y=34},
+	back = {x=29, y=20},
+	head = {x=25, y=9},
 }
-tiles["npc/humanoid_elenulach_thief.png"] = { base=64,
-	feet = {x=30, y=60},
-	hand1 = {x=18, y=37},
-	hand2 = {x=42, y=37},
+tiles["npc/humanoid_orc_orc_child.png"] = { base=64,
+	feet = {x=31, y=55},
+	hand1 = {x=8, y=36},
+	hand2 = {x=48, y=35},
 	belly = {x=30, y=32},
-	back = {x=30, y=17},
-	head = {x=30, y=6},
+	back = {x=29, y=24},
+	head = {x=25, y=12},
 }
-tiles["npc/humanoid_human_lumberjack.png"] = { base=64,
-	feet = {x=33, y=61},
-	hand1 = {x=17, y=37},
-	hand2 = {x=44, y=37},
-	back = {x=32, y=17},
-	belly = {x=33, y=31},
-	head = {x=32, y=4},
+tiles["npc/humanoid_orc_brotoq_the_reaver.png"] = { base=64,
+	feet = {x=38, y=59},
+	hand1 = {x=14, y=31},
+	hand2 = {x=58, y=33},
+	belly = {x=38, y=26},
+	back = {x=38, y=15},
+	head = {x=35, y=3},
 }
-tiles["npc/humanoid_human_pyromancer.png"] = { base=64,
-	feet = {x=35, y=59},
-	hand1 = {x=19, y=7},
-	hand2 = {x=41, y=32},
+tiles["npc/humanoid_human_spectator.png"] = { base=64,
+	feet = {x=37, y=59},
+	back = {x=35, y=17},
+	belly = {x=36, y=29},
+	hand1 = {x=50, y=37},
+	head = {x=34, y=5},
+}
+tiles["npc/humanoid_human_shady_cornac_man.png"] = { base=64,
+	feet = {x=35, y=60},
+	hand1 = {x=19, y=35},
+	hand2 = {x=49, y=35},
+	belly = {x=33, y=29},
 	back = {x=32, y=17},
-	belly = {x=34, y=29},
-	head = {x=32, y=4},
+	head = {x=29, y=4},
 }
 tiles["npc/humanoid_dwarf_dwarven_guard.png"] = { base=64,
 	feet = {x=30, y=59},
 	hand1 = {x=13, y=40},
 	hand2 = {x=40, y=22},
-	back = {x=29, y=23},
 	belly = {x=29, y=36},
+	back = {x=29, y=23},
 	head = {x=28, y=6},
 }
-tiles["npc/humanoid_human_ice_wyrmic.png"] = { base=64,
-	feet = {x=30, y=61},
-	back = {x=32, y=19},
-	hand2 = {x=58, y=17},
-	belly = {x=32, y=33},
-	hand1 = {x=9, y=36},
-	head = {x=36, y=11},
+tiles["npc/humanoid_human_human_guard.png"] = { base=64,
+	feet = {x=33, y=60},
+	hand1 = {x=19, y=29},
+	hand2 = {x=46, y=25},
+	back = {x=30, y=17},
+	belly = {x=31, y=30},
+	head = {x=28, y=5},
 }
 tiles["npc/humanoid_yaech_yaech_mindslayer.png"] = { base=64,
 	feet = {x=58, y=58},
 	hand1 = {x=7, y=28},
 	hand2 = {x=21, y=32},
-	back = {x=37, y=31},
 	belly = {x=39, y=40},
+	back = {x=37, y=31},
 	head = {x=28, y=19},
 }
 tiles["npc/humanoid_human_townsfolk_meanlooking_mercenary01_64.png"] = { base=64,
 	feet = {x=35, y=58},
+	back = {x=36, y=19},
 	belly = {x=36, y=30},
 	hand1 = {x=8, y=29},
-	back = {x=36, y=19},
 	head = {x=33, y=6},
 }
-tiles["npc/humanoid_orc_brotoq_the_reaver.png"] = { base=64,
-	feet = {x=38, y=59},
-	hand1 = {x=14, y=31},
-	hand2 = {x=58, y=33},
-	back = {x=38, y=15},
-	belly = {x=38, y=26},
-	head = {x=35, y=3},
+tiles["npc/humanoid_orc_orc_master_assassin.png"] = { base=64,
+	feet = {x=31, y=60},
+	hand1 = {x=4, y=39},
+	hand2 = {x=59, y=32},
+	belly = {x=30, y=30},
+	back = {x=29, y=18},
+	head = {x=28, y=8},
 }
-tiles["npc/humanoid_yeek_yeek_commoner_05.png"] = { base=64,
-	feet = {x=31, y=61},
-	hand1 = {x=12, y=22},
-	hand2 = {x=24, y=35},
-	back = {x=30, y=21},
-	belly = {x=32, y=34},
-	head = {x=30, y=12},
+tiles["npc/humanoid_human_storm_wyrmic.png"] = { base=64,
+	feet = {x=34, y=60},
+	hand1 = {x=15, y=32},
+	hand2 = {x=53, y=37},
+	belly = {x=31, y=31},
+	back = {x=31, y=21},
+	head = {x=27, y=9},
 }
 tiles["npc/humanoid_shalore_shalore_rune_master.png"] = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=17, y=34},
 	hand2 = {x=48, y=34},
-	back = {x=32, y=14},
 	belly = {x=33, y=30},
+	back = {x=32, y=14},
 	head = {x=32, y=4},
 }
-tiles["npc/humanoid_thalore_thalore_hunter.png"] = { base=64,
-	feet = {x=31, y=59},
-	hand1 = {x=18, y=38},
-	hand2 = {x=52, y=31},
-	back = {x=33, y=18},
-	belly = {x=33, y=30},
-	head = {x=32, y=8},
+tiles["npc/humanoid_thalore_thalore_wilder.png"] = { base=64,
+	feet = {x=27, y=59},
+	hand1 = {x=11, y=31},
+	hand2 = {x=44, y=30},
+	belly = {x=28, y=23},
+	back = {x=29, y=11},
+	head = {x=29, y=-1},
 }
 tiles["npc/humanoid_orc_rak_shor_cultist.png"] = { base=64,
 	feet = {x=32, y=61},
 	hand1 = {x=5, y=39},
 	hand2 = {x=58, y=34},
-	back = {x=29, y=19},
 	belly = {x=30, y=35},
+	back = {x=29, y=19},
 	head = {x=29, y=8},
 }
 tiles["npc/humanoid_halfling_halfling_slinger.png"] = { base=64,
 	feet = {x=27, y=57},
 	hand1 = {x=16, y=15},
 	hand2 = {x=55, y=30},
-	belly = {x=31, y=42},
 	back = {x=33, y=32},
+	belly = {x=31, y=42},
 	head = {x=36, y=19},
 }
-tiles["npc/humanoid_human_slinger.png"] = { base=64,
-	feet = {x=38, y=59},
-	hand1 = {x=10, y=18},
-	hand2 = {x=50, y=36},
-	back = {x=34, y=17},
-	belly = {x=37, y=27},
-	head = {x=34, y=5},
+tiles["npc/humanoid_human_melnela.png"] = { base=64,
+	feet = {x=33, y=59},
+	hand1 = {x=17, y=8},
+	hand2 = {x=58, y=30},
+	belly = {x=35, y=31},
+	back = {x=35, y=19},
+	head = {x=33, y=6},
 }
-tiles["npc/humanoid_human_human_guard.png"] = { base=64,
-	feet = {x=33, y=60},
-	hand1 = {x=19, y=29},
-	hand2 = {x=46, y=25},
-	belly = {x=31, y=30},
-	back = {x=30, y=17},
-	head = {x=28, y=5},
+tiles["npc/humanoid_human_tempest.png"] = { base=64,
+	feet = {x=26, y=59},
+	hand1 = {x=19, y=31},
+	hand2 = {x=41, y=6},
+	belly = {x=26, y=30},
+	back = {x=27, y=16},
+	head = {x=28, y=4},
 }
 tiles["npc/humanoid_elf_fillarel_aldaren.png"] = { base=64,
 	feet = {x=25, y=59},
 	hand1 = {x=10, y=28},
 	hand2 = {x=49, y=7},
-	belly = {x=24, y=15},
 	back = {x=24, y=3},
+	belly = {x=24, y=15},
 	head = {x=23, y=-12},
 }
 tiles["npc/humanoid_orc_grushnak__battlemaster_of_the_pride.png"] = { base=64,
 	feet = {x=30, y=61},
 	hand1 = {x=10, y=40},
 	hand2 = {x=56, y=36},
-	back = {x=30, y=18},
 	belly = {x=30, y=32},
+	back = {x=30, y=18},
 	head = {x=30, y=11},
 }
-tiles["npc/humanoid_yaech_yaech_hunter.png"] = { base=64,
-	feet = {x=6, y=7},
-	hand1 = {x=33, y=50},
-	hand2 = {x=59, y=37},
-	back = {x=34, y=29},
-	belly = {x=23, y=29},
-	head = {x=46, y=19},
+tiles["npc/humanoid_orc_orc_master_wyrmic.png"] = { base=64,
+	feet = {x=39, y=60},
+	hand1 = {x=16, y=40},
+	hand2 = {x=58, y=36},
+	belly = {x=36, y=32},
+	back = {x=33, y=21},
+	head = {x=30, y=13},
 }
-tiles["npc/humanoid_human_melnela.png"] = { base=64,
-	feet = {x=33, y=59},
-	hand1 = {x=17, y=8},
-	hand2 = {x=58, y=30},
-	back = {x=35, y=19},
-	belly = {x=35, y=31},
-	head = {x=33, y=6},
+tiles["npc/humanoid_orc_orc_mage_hunter.png"] = { base=64,
+	feet = {x=32, y=61},
+	hand1 = {x=6, y=34},
+	hand2 = {x=57, y=31},
+	belly = {x=29, y=32},
+	back = {x=28, y=20},
+	head = {x=27, y=8},
 }
-tiles["npc/humanoid_yeek_yeek_commoner_01.png"] = { base=64,
-	feet = {x=33, y=61},
-	hand1 = {x=14, y=39},
-	hand2 = {x=48, y=38},
-	back = {x=30, y=19},
-	belly = {x=33, y=32},
-	head = {x=30, y=10},
+tiles["npc/humanoid_yeek_yeek_commoner_03.png"] = { base=64,
+	feet = {x=32, y=59},
+	hand1 = {x=17, y=42},
+	hand2 = {x=50, y=44},
+	belly = {x=33, y=36},
+	back = {x=32, y=24},
+	head = {x=31, y=12},
 }
-tiles["npc/humanoid_human_spectator.png"] = { base=64,
-	feet = {x=37, y=59},
-	belly = {x=36, y=29},
-	hand1 = {x=50, y=37},
-	back = {x=35, y=17},
-	head = {x=34, y=5},
+tiles["npc/humanoid_yeek_yeek_commoner_05.png"] = { base=64,
+	feet = {x=31, y=61},
+	hand1 = {x=12, y=22},
+	hand2 = {x=24, y=35},
+	belly = {x=32, y=34},
+	back = {x=30, y=21},
+	head = {x=30, y=12},
 }
-tiles["npc/humanoid_naga_naga_tidecaller.png"] = { base=64,
-	feet = {x=33, y=61},
-	hand1 = {x=12, y=15},
-	hand2 = {x=47, y=-14},
-	back = {x=27, y=-6},
-	belly = {x=30, y=7},
-	head = {x=26, y=-17},
+tiles["npc/humanoid_naga_naga_tidewarden.png"] = { base=64,
+	feet = {x=32, y=61},
+	back = {x=32, y=-3},
+	belly = {x=32, y=9},
+	hand1 = {x=31, y=12},
+	head = {x=34, y=-15},
 }
 tiles["npc/humanoid_yeek_yeek_summoner.png"] = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=14, y=38},
 	hand2 = {x=48, y=37},
-	back = {x=31, y=23},
 	belly = {x=32, y=36},
+	back = {x=31, y=23},
 	head = {x=30, y=10},
 }
 tiles["npc/humanoid_thalore_ziguranth_summoner.png"] = { base=64,
 	feet = {x=35, y=61},
 	hand1 = {x=12, y=17},
 	hand2 = {x=49, y=39},
-	back = {x=34, y=15},
 	belly = {x=33, y=26},
+	back = {x=34, y=15},
 	head = {x=32, y=4},
 }
-tiles["npc/humanoid_orc_orc_warrior.png"] = { base=64,
-	feet = {x=35, y=61},
-	hand1 = {x=8, y=38},
-	hand2 = {x=57, y=35},
-	back = {x=29, y=20},
-	belly = {x=34, y=34},
-	head = {x=25, y=9},
+tiles["npc/humanoid_human_townsfolk_mangy_looking_leper01_64.png"] = { base=64,
+	feet = {x=36, y=57},
+	hand1 = {x=17, y=23},
+	hand2 = {x=18, y=35},
+	belly = {x=36, y=31},
+	back = {x=32, y=18},
+	head = {x=28, y=5},
 }
-tiles["npc/humanoid_thalore_thalore_wilder.png"] = { base=64,
-	feet = {x=27, y=59},
-	hand1 = {x=11, y=31},
-	hand2 = {x=44, y=30},
-	back = {x=29, y=11},
-	belly = {x=28, y=23},
-	head = {x=29, y=-1},
+tiles["npc/humanoid_human_ice_wyrmic.png"] = { base=64,
+	feet = {x=30, y=61},
+	back = {x=32, y=19},
+	hand2 = {x=58, y=17},
+	hand1 = {x=9, y=36},
+	belly = {x=32, y=33},
+	head = {x=36, y=11},
 }
-tiles["npc/humanoid_orc_orc_pyromancer.png"] = { base=64,
-	feet = {x=28, y=61},
-	hand1 = {x=6, y=30},
-	hand2 = {x=59, y=15},
-	back = {x=30, y=17},
-	belly = {x=28, y=30},
-	head = {x=40, y=5},
+tiles["npc/humanoid_orc_orc_cryomancer.png"] = { base=64,
+	feet = {x=35, y=60},
+	hand1 = {x=5, y=14},
+	hand2 = {x=57, y=30},
+	belly = {x=36, y=31},
+	back = {x=29, y=17},
+	head = {x=23, y=7},
 }
-tiles["npc/humanoid_orc_orc_fighter.png"] = { base=64,
-	feet = {x=30, y=60},
-	hand1 = {x=7, y=8},
-	hand2 = {x=57, y=39},
-	back = {x=35, y=20},
-	belly = {x=31, y=34},
-	head = {x=39, y=10},
+tiles["npc/humanoid_human_pyromancer.png"] = { base=64,
+	feet = {x=35, y=59},
+	hand1 = {x=19, y=7},
+	hand2 = {x=41, y=32},
+	belly = {x=34, y=29},
+	back = {x=32, y=17},
+	head = {x=32, y=4},
 }
 tiles["npc/humanoid_naga_lady_zoisla_the_tidebringer.png"] = { base=64,
 	feet = {x=36, y=61},
 	hand1 = {x=9, y=-28},
 	hand2 = {x=49, y=-20},
-	back = {x=30, y=-19},
 	belly = {x=30, y=-6},
+	back = {x=30, y=-19},
 	head = {x=30, y=-33},
 }
 tiles["npc/humanoid_yeek_yeek_mindslayer.png"] = { base=64,
 	feet = {x=31, y=60},
 	hand1 = {x=23, y=34},
 	hand2 = {x=24, y=41},
-	back = {x=31, y=22},
 	belly = {x=30, y=37},
+	back = {x=31, y=22},
 	head = {x=31, y=11},
 }
 tiles["npc/humanoid_human_great_gladiator.png"] = { base=64,
 	feet = {x=30, y=60},
 	hand1 = {x=17, y=35},
 	hand2 = {x=47, y=32},
-	belly = {x=31, y=25},
 	back = {x=29, y=11},
+	belly = {x=31, y=25},
 	head = {x=29, y=0},
 }
 tiles["npc/humanoid_orc_gorbat__supreme_wyrmic_of_the_pride.png"] = { base=64,
 	feet = {x=38, y=60},
 	hand1 = {x=18, y=14},
 	hand2 = {x=53, y=45},
-	back = {x=34, y=25},
 	belly = {x=36, y=38},
+	back = {x=34, y=25},
 	head = {x=33, y=12},
 }
 tiles["npc/humanoid_human_townsfolk_singing_happy_drunk01_64.png"] = { base=64,
 	feet = {x=36, y=58},
 	hand1 = {x=9, y=40},
 	hand2 = {x=52, y=16},
-	back = {x=27, y=21},
 	belly = {x=30, y=31},
+	back = {x=27, y=21},
 	head = {x=23, y=10},
 }
-tiles["npc/humanoid_human_human_farmer.png"] = { base=64,
-	feet = {x=32, y=60},
-	hand1 = {x=11, y=20},
-	hand2 = {x=44, y=38},
-	belly = {x=31, y=31},
-	back = {x=29, y=18},
-	head = {x=29, y=5},
+tiles["npc/humanoid_orc_orc_soldier.png"] = { base=64,
+	feet = {x=36, y=62},
+	hand1 = {x=9, y=39},
+	hand2 = {x=58, y=36},
+	belly = {x=34, y=34},
+	back = {x=29, y=21},
+	head = {x=25, y=9},
 }
-tiles["npc/humanoid_human_lost_merchant.png"] = { base=64,
-	feet = {x=35, y=59},
-	belly = {x=35, y=36},
-	hand1 = {x=16, y=47},
-	back = {x=32, y=24},
-	head = {x=30, y=5},
+tiles["npc/humanoid_human_townsfolk_farmer_maggot01_64.png"] = { base=64,
+	feet = {x=36, y=60},
+	hand1 = {x=11, y=31},
+	hand2 = {x=51, y=25},
+	belly = {x=36, y=37},
+	back = {x=35, y=25},
+	head = {x=34, y=11},
 }
 dolls.race_orc = dolls.race_orc or {}
 dolls.race_orc.all = { base=64,
 	feet = {x=34, y=62},
 	hand1 = {x=13, y=37},
 	hand2 = {x=52, y=38},
-	belly = {x=33, y=34},
 	back = {x=32, y=23},
+	belly = {x=33, y=34},
 	head = {x=32, y=9},
 }
 tiles["npc/humanoid_orc_krogar.png"] = { base=64,
 	feet = {x=32, y=59},
 	hand1 = {x=14, y=0},
 	hand2 = {x=53, y=13},
-	back = {x=29, y=25},
 	belly = {x=29, y=35},
+	back = {x=29, y=25},
 	head = {x=30, y=11},
 }
-tiles["npc/humanoid_halfling_halfling_citizen.png"] = { base=64,
-	feet = {x=31, y=58},
-	hand1 = {x=13, y=38},
-	hand2 = {x=48, y=41},
-	belly = {x=31, y=33},
-	back = {x=30, y=22},
-	head = {x=30, y=8},
+tiles["npc/humanoid_yeek_yeek_commoner_01.png"] = { base=64,
+	feet = {x=33, y=61},
+	hand1 = {x=14, y=39},
+	hand2 = {x=48, y=38},
+	belly = {x=33, y=32},
+	back = {x=30, y=19},
+	head = {x=30, y=10},
 }
-tiles["npc/humanoid_naga_naga_tidewarden.png"] = { base=64,
-	feet = {x=32, y=61},
-	belly = {x=32, y=9},
-	hand1 = {x=31, y=12},
-	back = {x=32, y=-3},
-	head = {x=34, y=-15},
+tiles["npc/humanoid_human_fire_wyrmic.png"] = { base=64,
+	feet = {x=31, y=60},
+	hand1 = {x=12, y=30},
+	hand2 = {x=49, y=36},
+	back = {x=28, y=19},
+	belly = {x=28, y=28},
+	head = {x=24, y=9},
 }
-tiles["npc/humanoid_orc_orc_greatmother.png"] = { base=64,
-	feet = {x=35, y=59},
-	hand1 = {x=4, y=-4},
-	hand2 = {x=58, y=2},
-	back = {x=32, y=-40},
-	belly = {x=30, y=-3},
-	head = {x=33, y=-55},
+tiles["npc/humanoid_human_enthralled_slave.png"] = { base=64,
+	feet = {x=33, y=58},
+	hand1 = {x=16, y=35},
+	hand2 = {x=47, y=36},
+	back = {x=32, y=18},
+	belly = {x=32, y=29},
+	head = {x=31, y=5},
 }
-tiles["npc/humanoid_human_arcane_blade.png"] = { base=64,
-	feet = {x=26, y=61},
-	hand1 = {x=17, y=3},
-	hand2 = {x=38, y=35},
-	belly = {x=27, y=29},
-	back = {x=27, y=22},
-	head = {x=29, y=13},
+tiles["npc/humanoid_human_rej_arkatis.png"] = { base=64,
+	feet = {x=34, y=59},
+	hand1 = {x=24, y=17},
+	hand2 = {x=38, y=19},
+	belly = {x=33, y=26},
+	back = {x=33, y=15},
+	head = {x=32, y=4},
 }
 tiles["npc/humanoid_shalore_rhaloren_inquisitor.png"] = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=9, y=17},
 	hand2 = {x=56, y=22},
-	back = {x=30, y=14},
 	belly = {x=31, y=26},
+	back = {x=30, y=14},
 	head = {x=28, y=6},
 }
 tiles["npc/humanoid_human_multihued_wyrmic.png"] = { base=64,
 	feet = {x=33, y=59},
 	hand1 = {x=13, y=39},
 	hand2 = {x=49, y=38},
-	back = {x=30, y=17},
 	belly = {x=31, y=30},
+	back = {x=30, y=17},
 	head = {x=30, y=8},
 }
 tiles["npc/humanoid_human_agrimley_the_hermit.png"] = { base=64,
 	feet = {x=35, y=60},
 	hand1 = {x=23, y=36},
 	hand2 = {x=54, y=22},
-	belly = {x=35, y=30},
 	back = {x=35, y=17},
+	belly = {x=35, y=30},
 	head = {x=35, y=5},
 }
 tiles["npc/humanoid_human_meranas__herald_of_angolwen.png"] = { base=64,
 	feet = {x=34, y=60},
 	hand1 = {x=16, y=40},
 	hand2 = {x=52, y=39},
-	back = {x=34, y=21},
 	belly = {x=35, y=31},
+	back = {x=34, y=21},
 	head = {x=31, y=4},
 }
-tiles["npc/humanoid_orc_orc_elite_fighter.png"] = { base=64,
-	feet = {x=31, y=60},
-	hand1 = {x=11, y=37},
-	hand2 = {x=53, y=29},
-	back = {x=29, y=16},
-	belly = {x=31, y=33},
-	head = {x=29, y=4},
+tiles["npc/humanoid_yaech_yaech_hunter.png"] = { base=64,
+	feet = {x=6, y=7},
+	hand1 = {x=33, y=50},
+	hand2 = {x=59, y=37},
+	belly = {x=23, y=29},
+	back = {x=34, y=29},
+	head = {x=46, y=19},
 }
 tiles["npc/humanoid_orc_kra_tor_the_gluttonous.png"] = { base=64,
 	feet = {x=38, y=57},
 	hand1 = {x=20, y=18},
 	hand2 = {x=38, y=-2},
-	back = {x=27, y=14},
 	belly = {x=29, y=27},
+	back = {x=27, y=14},
 	head = {x=23, y=1},
 }
-tiles["npc/humanoid_halfling_halfling_guard.png"] = { base=64,
-	feet = {x=38, y=59},
-	hand1 = {x=8, y=28},
-	hand2 = {x=54, y=43},
-	belly = {x=36, y=36},
-	back = {x=33, y=24},
-	head = {x=30, y=10},
+tiles["npc/humanoid_human_cutpurse.png"] = { base=64,
+	feet = {x=36, y=59},
+	hand1 = {x=9, y=34},
+	hand2 = {x=46, y=34},
+	back = {x=29, y=18},
+	belly = {x=30, y=29},
+	head = {x=28, y=7},
 }
-tiles["npc/humanoid_human_necromancer.png"] = { base=64,
-	feet = {x=27, y=61},
-	hand1 = {x=18, y=16},
-	hand2 = {x=40, y=41},
-	back = {x=34, y=17},
-	belly = {x=32, y=32},
-	head = {x=36, y=3},
+tiles["npc/humanoid_human_the_possessed.png"] = { base=64,
+	feet = {x=30, y=62},
+	hand1 = {x=9, y=17},
+	hand2 = {x=47, y=37},
+	belly = {x=33, y=35},
+	back = {x=33, y=17},
+	head = {x=33, y=4},
 }
 tiles["npc/humanoid_human_townsfolk_filthy_street_urchin01_64.png"] = { base=64,
 	feet = {x=35, y=59},
 	hand1 = {x=12, y=32},
 	hand2 = {x=49, y=40},
-	back = {x=31, y=21},
 	belly = {x=33, y=32},
+	back = {x=31, y=21},
 	head = {x=27, y=7},
 }
 tiles["npc/humanoid_orc_icy_orc_wyrmic.png"] = { base=64,
 	feet = {x=34, y=61},
 	hand1 = {x=21, y=21},
 	hand2 = {x=57, y=36},
-	back = {x=32, y=20},
 	belly = {x=32, y=32},
+	back = {x=32, y=20},
 	head = {x=26, y=7},
 }
 tiles["npc/humanoid_human_urkis__the_high_tempest.png"] = { base=64,
 	feet = {x=35, y=60},
 	hand1 = {x=13, y=32},
 	hand2 = {x=51, y=29},
-	back = {x=33, y=9},
 	belly = {x=33, y=24},
+	back = {x=33, y=9},
 	head = {x=33, y=-4},
 }
-tiles["npc/humanoid_halfling_protector_myssil.png"] = { base=64,
-	feet = {x=32, y=60},
-	hand1 = {x=16, y=43},
-	hand2 = {x=45, y=39},
-	belly = {x=31, y=34},
-	back = {x=30, y=22},
-	head = {x=30, y=7},
+tiles["npc/humanoid_halfling_master_slinger.png"] = { base=64,
+	feet = {x=39, y=59},
+	hand1 = {x=15, y=42},
+	hand2 = {x=47, y=10},
+	back = {x=31, y=27},
+	belly = {x=32, y=38},
+	head = {x=28, y=14},
 }
-tiles["npc/humanoid_human_bandit.png"] = { base=64,
-	feet = {x=39, y=56},
-	hand1 = {x=8, y=40},
-	hand2 = {x=51, y=26},
-	belly = {x=33, y=28},
-	back = {x=30, y=16},
-	head = {x=29, y=5},
+tiles["npc/humanoid_orc_orc_assassin.png"] = { base=64,
+	feet = {x=36, y=60},
+	hand1 = {x=4, y=30},
+	hand2 = {x=40, y=3},
+	belly = {x=42, y=29},
+	back = {x=33, y=20},
+	head = {x=24, y=11},
 }
 tiles["npc/humanoid_yaech_blood_master.png"] = { base=64,
 	feet = {x=22, y=60},
 	hand1 = {x=6, y=17},
 	hand2 = {x=50, y=27},
-	back = {x=29, y=25},
 	belly = {x=31, y=32},
+	back = {x=29, y=25},
 	head = {x=36, y=14},
 }
 tiles["npc/humanoid_dwarf_dwarven_summoner.png"] = { base=64,
 	feet = {x=38, y=59},
 	hand1 = {x=14, y=44},
 	hand2 = {x=54, y=44},
-	back = {x=39, y=24},
 	belly = {x=39, y=41},
+	back = {x=39, y=24},
 	head = {x=39, y=7},
 }
-tiles["npc/humanoid_human_sand_wyrmic.png"] = { base=64,
-	feet = {x=29, y=60},
-	hand1 = {x=10, y=38},
-	hand2 = {x=58, y=17},
-	back = {x=32, y=19},
-	belly = {x=31, y=30},
-	head = {x=37, y=8},
+tiles["npc/humanoid_human_trickster.png"] = { base=64,
+	feet = {x=36, y=60},
+	back = {x=35, y=17},
+	hand2 = {x=5, y=32},
+	belly = {x=37, y=29},
+	head = {x=30, y=6},
 }
 tiles["npc/humanoid_human_townsfolk_boilcovered_wretch01_64.png"] = { base=64,
 	feet = {x=35, y=58},
 	hand1 = {x=19, y=38},
 	hand2 = {x=50, y=39},
-	back = {x=34, y=21},
 	belly = {x=34, y=34},
+	back = {x=34, y=21},
 	head = {x=28, y=10},
 }
-tiles["npc/humanoid_dwarf_dwarven_earthwarden.png"] = { base=64,
-	feet = {x=34, y=58},
-	back = {x=36, y=22},
-	hand2 = {x=51, y=36},
-	belly = {x=35, y=37},
-	hand1 = {x=20, y=37},
-	head = {x=35, y=7},
+tiles["npc/humanoid_human_human_sun_paladin.png"] = { base=64,
+	feet = {x=32, y=60},
+	hand1 = {x=14, y=32},
+	hand2 = {x=46, y=32},
+	back = {x=31, y=17},
+	belly = {x=31, y=29},
+	head = {x=31, y=5},
 }
 tiles["npc/humanoid_orc_orc_high_cryomancer.png"] = { base=64,
 	feet = {x=36, y=60},
 	hand1 = {x=7, y=17},
 	hand2 = {x=57, y=31},
-	back = {x=33, y=22},
 	belly = {x=37, y=32},
+	back = {x=33, y=22},
 	head = {x=26, y=8},
 }
-tiles["npc/humanoid_human_hexer.png"] = { base=64,
-	feet = {x=33, y=61},
-	hand1 = {x=26, y=25},
-	hand2 = {x=37, y=25},
-	belly = {x=32, y=37},
-	back = {x=31, y=16},
-	head = {x=31, y=3},
+tiles["npc/humanoid_human_derth_guard.png"] = { base=64,
+	feet = {x=37, y=59},
+	hand1 = {x=10, y=18},
+	hand2 = {x=48, y=33},
+	back = {x=34, y=17},
+	belly = {x=36, y=29},
+	head = {x=34, y=5},
 }
 tiles["npc/humanoid_orc_orc_elite_berserker.png"] = { base=64,
 	feet = {x=34, y=61},
 	hand1 = {x=19, y=21},
 	hand2 = {x=54, y=31},
-	back = {x=33, y=17},
 	belly = {x=30, y=32},
+	back = {x=33, y=17},
 	head = {x=33, y=7},
 }
-tiles["npc/humanoid_human_enthralled_slave.png"] = { base=64,
-	feet = {x=33, y=58},
-	hand1 = {x=16, y=35},
-	hand2 = {x=47, y=36},
-	belly = {x=32, y=29},
-	back = {x=32, y=18},
-	head = {x=31, y=5},
+tiles["npc/humanoid_human_spectator03.png"] = { base=64,
+	feet = {x=32, y=61},
+	hand1 = {x=16, y=38},
+	hand2 = {x=44, y=38},
+	belly = {x=30, y=30},
+	back = {x=30, y=19},
+	head = {x=30, y=4},
 }
-tiles["npc/humanoid_shalore_elven_tempest.png"] = { base=64,
-	feet = {x=35, y=60},
-	hand1 = {x=11, y=9},
-	hand2 = {x=49, y=36},
-	back = {x=32, y=16},
+tiles["npc/humanoid_shalore_elven_cultist.png"] = { base=64,
+	feet = {x=29, y=60},
+	hand1 = {x=8, y=9},
+	hand2 = {x=52, y=9},
 	belly = {x=31, y=28},
-	head = {x=33, y=7},
+	back = {x=30, y=16},
+	head = {x=31, y=6},
 }
 tiles["npc/humanoid_human_townsfolk_pitiful_looking_beggar01_64.png"] = { base=64,
 	feet = {x=41, y=60},
+	belly = {x=41, y=33},
 	back = {x=40, y=20},
 	hand1 = {x=25, y=32},
-	belly = {x=41, y=33},
 	head = {x=31, y=10},
 }
+tiles["npc/humanoid_shalore_elven_tempest.png"] = { base=64,
+	feet = {x=35, y=60},
+	hand1 = {x=11, y=9},
+	hand2 = {x=49, y=36},
+	belly = {x=31, y=28},
+	back = {x=32, y=16},
+	head = {x=33, y=7},
+}
 tiles["npc/humanoid_dwarf_ziguranth_warrior.png"] = { base=64,
 	feet = {x=34, y=59},
 	hand1 = {x=18, y=43},
 	hand2 = {x=50, y=44},
-	belly = {x=35, y=36},
 	back = {x=35, y=22},
+	belly = {x=35, y=36},
 	head = {x=35, y=7},
 }
-tiles["npc/humanoid_human_high_slinger.png"] = { base=64,
-	feet = {x=29, y=59},
-	hand1 = {x=15, y=36},
-	hand2 = {x=57, y=18},
-	belly = {x=30, y=27},
-	back = {x=31, y=15},
-	head = {x=33, y=6},
-}
-tiles["npc/humanoid_human_celia.png"] = { base=64,
-	feet = {x=28, y=59},
-	hand1 = {x=15, y=16},
-	hand2 = {x=50, y=-20},
-	belly = {x=28, y=2},
-	back = {x=29, y=-16},
-	head = {x=29, y=-33},
+tiles["npc/humanoid_human_bandit_lord.png"] = { base=64,
+	feet = {x=34, y=59},
+	hand1 = {x=20, y=20},
+	hand2 = {x=38, y=21},
+	back = {x=31, y=16},
+	belly = {x=32, y=30},
+	head = {x=30, y=5},
 }
 tiles["npc/humanoid_shalore_archmage_tarelion.png"] = { base=64,
 	feet = {x=33, y=59},
 	hand1 = {x=17, y=26},
 	hand2 = {x=45, y=26},
-	back = {x=31, y=0},
 	belly = {x=33, y=18},
+	back = {x=31, y=0},
 	head = {x=30, y=-11},
 }
+tiles["npc/humanoid_human_celia.png"] = { base=64,
+	feet = {x=28, y=59},
+	hand1 = {x=15, y=16},
+	hand2 = {x=50, y=-20},
+	back = {x=29, y=-16},
+	belly = {x=28, y=2},
+	head = {x=29, y=-33},
+}
 tiles["npc/humanoid_human_blood_mage.png"] = { base=64,
 	feet = {x=32, y=61},
 	hand1 = {x=13, y=42},
 	hand2 = {x=51, y=18},
-	belly = {x=30, y=30},
 	back = {x=29, y=19},
+	belly = {x=30, y=30},
 	head = {x=28, y=5},
 }
-tiles["npc/humanoid_human_geomancer.png"] = { base=64,
-	feet = {x=26, y=59},
-	hand1 = {x=19, y=31},
-	hand2 = {x=42, y=6},
-	belly = {x=27, y=28},
-	back = {x=28, y=15},
-	head = {x=28, y=2},
-}
 tiles["npc/humanoid_shalore_elven_mage.png"] = { base=64,
 	feet = {x=31, y=61},
 	hand1 = {x=11, y=35},
 	hand2 = {x=50, y=39},
-	back = {x=31, y=18},
 	belly = {x=31, y=30},
+	back = {x=31, y=18},
 	head = {x=30, y=6},
 }
+tiles["npc/humanoid_human_geomancer.png"] = { base=64,
+	feet = {x=26, y=59},
+	hand1 = {x=19, y=31},
+	hand2 = {x=42, y=6},
+	back = {x=28, y=15},
+	belly = {x=27, y=28},
+	head = {x=28, y=2},
+}
 tiles["npc/humanoid_orc_orc_summoner.png"] = { base=64,
 	feet = {x=35, y=61},
 	hand1 = {x=9, y=35},
 	hand2 = {x=57, y=34},
-	back = {x=28, y=18},
 	belly = {x=32, y=34},
+	back = {x=28, y=18},
 	head = {x=27, y=7},
 }
 tiles["npc/humanoid_human_fallen_sun_paladin_aeryn.png"] = { base=64,
 	feet = {x=33, y=58},
 	hand1 = {x=15, y=20},
 	hand2 = {x=45, y=25},
-	belly = {x=32, y=14},
 	back = {x=32, y=0},
+	belly = {x=32, y=14},
 	head = {x=31, y=-12},
 }
 tiles["npc/humanoid_yeek_yeek_commoner_07.png"] = { base=64,
 	feet = {x=33, y=61},
 	hand1 = {x=14, y=39},
 	hand2 = {x=48, y=36},
-	back = {x=30, y=23},
 	belly = {x=33, y=37},
+	back = {x=30, y=23},
 	head = {x=31, y=11},
 }
 tiles["npc/humanoid_human_assassin.png"] = { base=64,
 	feet = {x=35, y=59},
 	hand1 = {x=12, y=16},
 	hand2 = {x=51, y=33},
-	belly = {x=34, y=32},
 	back = {x=31, y=16},
+	belly = {x=34, y=32},
 	head = {x=29, y=5},
 }
-tiles["npc/humanoid_human_bandit_lord.png"] = { base=64,
-	feet = {x=34, y=59},
-	hand1 = {x=20, y=20},
-	hand2 = {x=38, y=21},
-	belly = {x=32, y=30},
-	back = {x=31, y=16},
-	head = {x=30, y=5},
-}
 tiles["npc/humanoid_orc_warmaster_gnarg.png"] = { base=64,
 	feet = {x=40, y=60},
 	hand1 = {x=60, y=27},
 	hand2 = {x=58, y=28},
-	back = {x=32, y=18},
 	belly = {x=43, y=29},
+	back = {x=32, y=18},
 	head = {x=21, y=9},
 }
 tiles["npc/humanoid_yeek_yeek_wayist.png"] = { base=64,
 	feet = {x=37, y=59},
 	hand1 = {x=14, y=34},
 	hand2 = {x=58, y=36},
-	back = {x=37, y=24},
 	belly = {x=37, y=35},
+	back = {x=37, y=24},
 	head = {x=38, y=13},
 }
+tiles["npc/humanoid_human_high_slinger.png"] = { base=64,
+	feet = {x=29, y=59},
+	hand1 = {x=15, y=36},
+	hand2 = {x=57, y=18},
+	back = {x=31, y=15},
+	belly = {x=30, y=27},
+	head = {x=33, y=6},
+}
 tiles["npc/humanoid_human_thief.png"] = { base=64,
 	feet = {x=27, y=60},
 	hand1 = {x=8, y=27},
 	hand2 = {x=43, y=30},
-	back = {x=24, y=19},
 	belly = {x=27, y=30},
+	back = {x=24, y=19},
 	head = {x=18, y=7},
 }
 tiles["npc/humanoid_shalore_mean_looking_elven_guard.png"] = { base=64,
 	feet = {x=33, y=60},
+	back = {x=31, y=14},
 	belly = {x=32, y=27},
 	hand1 = {x=14, y=31},
-	back = {x=31, y=14},
 	head = {x=31, y=6},
 }
 tiles["npc/humanoid_human_subject_z.png"] = { base=64,
 	feet = {x=32, y=59},
 	hand1 = {x=8, y=11},
 	hand2 = {x=55, y=11},
-	back = {x=31, y=15},
 	belly = {x=31, y=27},
+	back = {x=31, y=15},
 	head = {x=32, y=3},
 }
-tiles["npc/humanoid_human_townsfolk_battlescarred_veteran01_64.png"] = { base=64,
-	feet = {x=35, y=57},
-	hand1 = {x=16, y=39},
-	hand2 = {x=52, y=39},
-	back = {x=33, y=19},
-	belly = {x=33, y=30},
-	head = {x=32, y=7},
-}
-tiles["npc/humanoid_yeek_yeek_commoner_02.png"] = { base=64,
-	feet = {x=31, y=59},
-	hand1 = {x=10, y=20},
-	hand2 = {x=23, y=35},
-	back = {x=30, y=21},
-	belly = {x=32, y=35},
-	head = {x=31, y=11},
+tiles["npc/humanoid_human_hexer.png"] = { base=64,
+	feet = {x=33, y=61},
+	hand1 = {x=26, y=25},
+	hand2 = {x=37, y=25},
+	back = {x=31, y=16},
+	belly = {x=32, y=37},
+	head = {x=31, y=3},
 }
 tiles["npc/humanoid_orc_orc_baby.png"] = { base=64,
 	feet = {x=41, y=40},
 	hand1 = {x=12, y=43},
 	hand2 = {x=30, y=44},
-	back = {x=31, y=21},
 	belly = {x=39, y=26},
+	back = {x=31, y=21},
 	head = {x=19, y=22},
 }
-tiles["npc/humanoid_human_argoniel.png"] = { base=64,
-	feet = {x=30, y=59},
-	hand1 = {x=9, y=2},
-	hand2 = {x=57, y=9},
-	belly = {x=32, y=22},
-	back = {x=32, y=10},
-	head = {x=32, y=-3},
+tiles["npc/humanoid_human_shadowblade.png"] = { base=64,
+	feet = {x=33, y=59},
+	hand1 = {x=8, y=15},
+	hand2 = {x=56, y=40},
+	belly = {x=28, y=31},
+	back = {x=34, y=21},
+	head = {x=37, y=9},
 }
 tiles["npc/humanoid_human_last_hope_guard.png"] = { base=64,
 	feet = {x=31, y=60},
 	hand1 = {x=15, y=32},
 	hand2 = {x=45, y=28},
-	back = {x=31, y=15},
 	belly = {x=30, y=26},
+	back = {x=31, y=15},
 	head = {x=31, y=5},
 }
-tiles["npc/humanoid_orc_orc_child.png"] = { base=64,
-	feet = {x=31, y=55},
-	hand1 = {x=8, y=36},
-	hand2 = {x=48, y=35},
-	back = {x=29, y=24},
-	belly = {x=30, y=32},
-	head = {x=25, y=12},
-}
-tiles["npc/humanoid_orc_orc_high_pyromancer.png"] = { base=64,
-	feet = {x=29, y=60},
-	hand1 = {x=9, y=32},
-	hand2 = {x=58, y=18},
-	back = {x=30, y=20},
-	belly = {x=28, y=33},
-	head = {x=39, y=10},
+tiles["npc/humanoid_orc_young_orc.png"] = { base=64,
+	feet = {x=35, y=60},
+	hand1 = {x=14, y=10},
+	hand2 = {x=52, y=40},
+	belly = {x=35, y=32},
+	back = {x=32, y=19},
+	head = {x=30, y=8},
 }
-tiles["npc/humanoid_shalore_elven_blood_mage.png"] = { base=64,
-	feet = {x=32, y=59},
-	hand1 = {x=15, y=36},
-	hand2 = {x=46, y=36},
+tiles["npc/humanoid_elenulach_thief.png"] = { base=64,
+	feet = {x=30, y=60},
+	hand1 = {x=18, y=37},
+	hand2 = {x=42, y=37},
 	back = {x=30, y=17},
-	belly = {x=30, y=33},
-	head = {x=30, y=7},
+	belly = {x=30, y=32},
+	head = {x=30, y=6},
+}
+tiles["npc/humanoid_human_harno__herald_of_last_hope.png"] = { base=64,
+	feet = {x=32, y=61},
+	hand1 = {x=16, y=37},
+	hand2 = {x=45, y=36},
+	back = {x=30, y=15},
+	belly = {x=31, y=31},
+	head = {x=29, y=4},
 }
 tiles["npc/humanoid_dwarf_dwarven_paddlestriker.png"] = { base=64,
 	feet = {x=39, y=60},
 	hand1 = {x=15, y=37},
 	hand2 = {x=57, y=33},
-	back = {x=33, y=22},
 	belly = {x=35, y=35},
+	back = {x=33, y=22},
 	head = {x=33, y=6},
 }
-tiles["npc/humanoid_human_alchemist.png"] = { base=64,
-	feet = {x=35, y=59},
-	hand1 = {x=10, y=32},
-	hand2 = {x=51, y=34},
-	belly = {x=34, y=32},
-	back = {x=33, y=19},
-	head = {x=33, y=5},
-}
-tiles["npc/humanoid_human_martyr.png"] = { base=64,
+tiles["npc/humanoid_human_tannen.png"] = { base=64,
 	feet = {x=37, y=60},
-	hand1 = {x=17, y=29},
-	hand2 = {x=46, y=31},
-	back = {x=29, y=14},
-	belly = {x=30, y=27},
-	head = {x=28, y=3},
+	hand1 = {x=10, y=16},
+	hand2 = {x=56, y=14},
+	belly = {x=35, y=28},
+	back = {x=31, y=15},
+	head = {x=29, y=4},
+}
+tiles["npc/humanoid_orc_orc_high_pyromancer.png"] = { base=64,
+	feet = {x=29, y=60},
+	hand1 = {x=9, y=32},
+	hand2 = {x=58, y=18},
+	belly = {x=28, y=33},
+	back = {x=30, y=20},
+	head = {x=39, y=10},
 }
 tiles["npc/humanoid_human_apprentice_mage.png"] = { base=64,
 	feet = {x=30, y=61},
 	hand1 = {x=15, y=38},
 	hand2 = {x=42, y=34},
-	belly = {x=29, y=29},
 	back = {x=29, y=16},
+	belly = {x=29, y=29},
 	head = {x=29, y=5},
 }
-tiles["npc/humanoid_human_townsfolk_squinteyed_rogue01_64.png"] = { base=64,
-	feet = {x=33, y=57},
-	hand1 = {x=11, y=28},
-	hand2 = {x=53, y=38},
-	back = {x=33, y=20},
-	belly = {x=33, y=33},
-	head = {x=30, y=7},
+tiles["npc/humanoid_player_default.png"] = { base=64,
+	feet = {x=33, y=60},
+	hand1 = {x=21, y=35},
+	hand2 = {x=44, y=36},
+	belly = {x=33, y=28},
+	back = {x=32, y=14},
+	head = {x=32, y=5},
 }
 tiles["npc/humanoid_human_townsfolk_aimless_looking_merchant01_64.png"] = { base=64,
 	feet = {x=37, y=58},
 	hand1 = {x=14, y=48},
 	hand2 = {x=52, y=23},
-	back = {x=31, y=24},
 	belly = {x=35, y=38},
+	back = {x=31, y=24},
 	head = {x=29, y=6},
 }
-tiles["npc/humanoid_orc_orc_mother.png"] = { base=64,
-	feet = {x=33, y=59},
-	hand1 = {x=10, y=37},
-	hand2 = {x=53, y=35},
-	back = {x=30, y=9},
-	belly = {x=30, y=31},
-	head = {x=28, y=-6},
+tiles["npc/humanoid_orc_orc_archer.png"] = { base=64,
+	feet = {x=30, y=60},
+	hand1 = {x=20, y=29},
+	hand2 = {x=56, y=30},
+	belly = {x=31, y=34},
+	back = {x=30, y=20},
+	head = {x=31, y=10},
 }
 tiles["npc/humanoid_dwarf_lumberjack.png"] = { base=64,
 	feet = {x=34, y=60},
 	hand1 = {x=17, y=16},
 	hand2 = {x=49, y=41},
-	back = {x=34, y=27},
 	belly = {x=35, y=38},
+	back = {x=34, y=27},
 	head = {x=34, y=8},
 }
-tiles["npc/humanoid_human_spectator02.png"] = { base=64,
-	feet = {x=30, y=59},
-	hand1 = {x=18, y=37},
-	hand2 = {x=41, y=37},
-	back = {x=30, y=16},
-	belly = {x=31, y=30},
-	head = {x=30, y=5},
+tiles["npc/humanoid_dwarf_dwarven_earthwarden.png"] = { base=64,
+	feet = {x=34, y=58},
+	back = {x=36, y=22},
+	hand2 = {x=51, y=36},
+	hand1 = {x=20, y=37},
+	belly = {x=35, y=37},
+	head = {x=35, y=7},
 }
-tiles["npc/humanoid_human_fryjia_loren.png"] = { base=64,
-	feet = {x=32, y=58},
-	hand1 = {x=17, y=31},
-	hand2 = {x=45, y=41},
-	belly = {x=29, y=32},
-	back = {x=29, y=21},
-	head = {x=29, y=8},
+tiles["npc/humanoid_naga_naga_tidecaller.png"] = { base=64,
+	feet = {x=33, y=61},
+	hand1 = {x=12, y=15},
+	hand2 = {x=47, y=-14},
+	belly = {x=30, y=7},
+	back = {x=27, y=-6},
+	head = {x=26, y=-17},
 }
-tiles["npc/humanoid_human_townsfolk_blubbering_idiot01_64.png"] = { base=64,
-	feet = {x=33, y=59},
-	hand1 = {x=19, y=41},
-	hand2 = {x=47, y=40},
-	back = {x=31, y=19},
-	belly = {x=31, y=33},
-	head = {x=29, y=7},
+tiles["npc/humanoid_human_lost_merchant.png"] = { base=64,
+	feet = {x=35, y=59},
+	back = {x=32, y=24},
+	belly = {x=35, y=36},
+	hand1 = {x=16, y=47},
+	head = {x=30, y=5},
 }
 tiles["npc/humanoid_human_valfred_loren.png"] = { base=64,
 	feet = {x=29, y=57},
 	hand1 = {x=19, y=36},
 	hand2 = {x=45, y=22},
-	back = {x=29, y=17},
 	belly = {x=29, y=25},
+	back = {x=29, y=17},
 	head = {x=28, y=6},
 }
 tiles["npc/humanoid_elf_anorithil.png"] = { base=64,
 	feet = {x=39, y=60},
 	hand1 = {x=12, y=15},
 	hand2 = {x=55, y=30},
-	belly = {x=40, y=29},
 	back = {x=38, y=18},
+	belly = {x=40, y=29},
 	head = {x=29, y=4},
 }
 tiles["npc/humanoid_orc_golbug_the_destroyer.png"] = { base=64,
 	feet = {x=29, y=58},
 	hand1 = {x=9, y=35},
 	hand2 = {x=51, y=33},
-	back = {x=30, y=12},
 	belly = {x=29, y=25},
+	back = {x=30, y=12},
 	head = {x=32, y=-1},
 }
-tiles["npc/humanoid_yeek_yeek_commoner_08.png"] = { base=64,
-	feet = {x=33, y=61},
-	hand1 = {x=14, y=39},
-	hand2 = {x=48, y=36},
-	back = {x=31, y=21},
-	belly = {x=33, y=34},
-	head = {x=31, y=11},
+tiles["npc/humanoid_orc_orc_pyromancer.png"] = { base=64,
+	feet = {x=28, y=61},
+	hand1 = {x=6, y=30},
+	hand2 = {x=59, y=15},
+	belly = {x=28, y=30},
+	back = {x=30, y=17},
+	head = {x=40, y=5},
 }
-tiles["npc/humanoid_orc_orc_blood_mage.png"] = { base=64,
-	feet = {x=34, y=59},
-	hand1 = {x=11, y=36},
-	hand2 = {x=57, y=37},
-	back = {x=33, y=17},
-	belly = {x=34, y=32},
-	head = {x=32, y=5},
+tiles["npc/humanoid_orc_orc_necromancer.png"] = { base=64,
+	feet = {x=32, y=59},
+	hand1 = {x=7, y=39},
+	hand2 = {x=53, y=36},
+	belly = {x=30, y=32},
+	back = {x=28, y=17},
+	head = {x=29, y=6},
 }
-tiles["npc/humanoid_human_shady_cornac_man.png"] = { base=64,
-	feet = {x=35, y=60},
-	hand1 = {x=19, y=35},
-	hand2 = {x=49, y=35},
-	back = {x=32, y=17},
-	belly = {x=33, y=29},
-	head = {x=29, y=4},
+tiles["npc/humanoid_yeek_yeek_commoner_04.png"] = { base=64,
+	feet = {x=33, y=60},
+	hand1 = {x=17, y=40},
+	hand2 = {x=50, y=44},
+	belly = {x=32, y=36},
+	back = {x=32, y=25},
+	head = {x=32, y=8},
 }
-tiles["npc/humanoid_orc_orc_grand_master_assassin.png"] = { base=64,
-	feet = {x=33, y=61},
-	hand1 = {x=4, y=32},
-	hand2 = {x=60, y=39},
-	back = {x=35, y=18},
-	belly = {x=34, y=30},
-	head = {x=37, y=7},
+tiles["npc/humanoid_human_fryjia_loren.png"] = { base=64,
+	feet = {x=32, y=58},
+	hand1 = {x=17, y=31},
+	hand2 = {x=45, y=41},
+	back = {x=29, y=21},
+	belly = {x=29, y=32},
+	head = {x=29, y=8},
 }
 tiles["npc/humanoid_orc_orc_grand_summoner.png"] = { base=64,
 	feet = {x=29, y=60},
 	hand1 = {x=9, y=8},
 	hand2 = {x=55, y=35},
-	back = {x=34, y=18},
 	belly = {x=32, y=30},
+	back = {x=34, y=18},
 	head = {x=36, y=7},
 }
 tiles["npc/humanoid_orc_rak_shor__grand_necromancer_of_the_pride.png"] = { base=64,
 	feet = {x=29, y=60},
 	hand1 = {x=6, y=39},
 	hand2 = {x=54, y=32},
-	back = {x=28, y=20},
 	belly = {x=28, y=35},
+	back = {x=28, y=20},
 	head = {x=27, y=7},
 }
-tiles["npc/humanoid_human_high_sun_paladin_aeryn.png"] = { base=64,
-	feet = {x=33, y=58},
-	hand1 = {x=15, y=19},
-	hand2 = {x=45, y=25},
-	belly = {x=33, y=16},
-	back = {x=32, y=1},
-	head = {x=31, y=-12},
+tiles["npc/humanoid_thalore_thalore_hunter.png"] = { base=64,
+	feet = {x=31, y=59},
+	hand1 = {x=18, y=38},
+	hand2 = {x=52, y=31},
+	belly = {x=33, y=30},
+	back = {x=33, y=18},
+	head = {x=32, y=8},
 }
 tiles["npc/humanoid_human_ben_cruthdar__the_cursed.png"] = { base=64,
 	feet = {x=36, y=61},
 	hand1 = {x=17, y=33},
 	hand2 = {x=46, y=19},
-	belly = {x=30, y=32},
 	back = {x=29, y=17},
+	belly = {x=30, y=32},
 	head = {x=28, y=4},
 }
-tiles["npc/humanoid_yeek_yeek_commoner_04.png"] = { base=64,
-	feet = {x=33, y=60},
-	hand1 = {x=17, y=40},
-	hand2 = {x=50, y=44},
-	back = {x=32, y=25},
-	belly = {x=32, y=36},
-	head = {x=32, y=8},
+tiles["npc/humanoid_human_high_sun_paladin_aeryn.png"] = { base=64,
+	feet = {x=33, y=58},
+	hand1 = {x=15, y=19},
+	hand2 = {x=45, y=25},
+	back = {x=32, y=1},
+	belly = {x=33, y=16},
+	head = {x=31, y=-12},
 }
-tiles["npc/humanoid_orc_orc_necromancer.png"] = { base=64,
-	feet = {x=32, y=59},
-	hand1 = {x=7, y=39},
-	hand2 = {x=53, y=36},
-	back = {x=28, y=17},
-	belly = {x=30, y=32},
-	head = {x=29, y=6},
+tiles["npc/humanoid_human_slinger.png"] = { base=64,
+	feet = {x=38, y=59},
+	hand1 = {x=10, y=18},
+	hand2 = {x=50, y=36},
+	belly = {x=37, y=27},
+	back = {x=34, y=17},
+	head = {x=34, y=5},
 }
 dolls.race_elf = dolls.race_elf or {}
 dolls.race_elf.female = { base=64,
 	feet = {x=34, y=61},
 	hand1 = {x=19, y=33},
 	hand2 = {x=46, y=33},
-	back = {x=33, y=14},
 	belly = {x=34, y=27},
+	back = {x=33, y=14},
 	head = {x=31, y=3},
 }
 tiles["npc/humanoid_naga_naga_nereid.png"] = { base=64,
 	feet = {x=32, y=62},
 	hand1 = {x=25, y=40},
 	hand2 = {x=59, y=31},
-	back = {x=37, y=17},
 	belly = {x=38, y=28},
+	back = {x=37, y=17},
 	head = {x=35, y=5},
 }
-tiles["npc/humanoid_human_townsfolk_mangy_looking_leper01_64.png"] = { base=64,
-	feet = {x=36, y=57},
-	hand1 = {x=17, y=23},
-	hand2 = {x=18, y=35},
-	back = {x=32, y=18},
-	belly = {x=36, y=31},
-	head = {x=28, y=5},
+tiles["npc/humanoid_yeek_yeek_commoner_08.png"] = { base=64,
+	feet = {x=33, y=61},
+	hand1 = {x=14, y=39},
+	hand2 = {x=48, y=36},
+	belly = {x=33, y=34},
+	back = {x=31, y=21},
+	head = {x=31, y=11},
 }
 tiles["npc/humanoid_human_homeless_fighter.png"] = { base=64,
 	feet = {x=35, y=61},
 	hand1 = {x=6, y=34},
 	hand2 = {x=57, y=34},
-	belly = {x=33, y=34},
 	back = {x=33, y=25},
+	belly = {x=33, y=34},
 	head = {x=32, y=9},
 }
-tiles["npc/humanoid_human_townsfolk_farmer_maggot01_64.png"] = { base=64,
-	feet = {x=36, y=60},
-	hand1 = {x=11, y=31},
-	hand2 = {x=51, y=25},
-	back = {x=35, y=25},
-	belly = {x=36, y=37},
-	head = {x=34, y=11},
+tiles["npc/humanoid_human_townsfolk_blubbering_idiot01_64.png"] = { base=64,
+	feet = {x=33, y=59},
+	hand1 = {x=19, y=41},
+	hand2 = {x=47, y=40},
+	belly = {x=31, y=33},
+	back = {x=31, y=19},
+	head = {x=29, y=7},
 }
 tiles["npc/humanoid_orc_orc_berserker.png"] = { base=64,
 	feet = {x=45, y=60},
 	hand1 = {x=11, y=36},
 	hand2 = {x=40, y=17},
-	back = {x=20, y=19},
 	belly = {x=30, y=31},
+	back = {x=20, y=19},
 	head = {x=17, y=9},
 }
 tiles["npc/humanoid_yaech_yaech_diver.png"] = { base=64,
 	feet = {x=52, y=3},
 	hand1 = {x=9, y=56},
 	hand2 = {x=40, y=57},
-	back = {x=30, y=36},
 	belly = {x=39, y=31},
+	back = {x=30, y=36},
 	head = {x=16, y=39},
 }
-tiles["npc/humanoid_human_tannen.png"] = { base=64,
+tiles["npc/humanoid_human_martyr.png"] = { base=64,
 	feet = {x=37, y=60},
-	hand1 = {x=10, y=16},
-	hand2 = {x=56, y=14},
-	back = {x=31, y=15},
-	belly = {x=35, y=28},
-	head = {x=29, y=4},
+	hand1 = {x=17, y=29},
+	hand2 = {x=46, y=31},
+	belly = {x=30, y=27},
+	back = {x=29, y=14},
+	head = {x=28, y=3},
 }
 tiles["npc/humanoid_female_sluttymaid.png"] = { base=64,
 	feet = {x=31, y=59},
 	hand1 = {x=24, y=30},
 	hand2 = {x=41, y=20},
-	belly = {x=35, y=23},
 	back = {x=35, y=12},
+	belly = {x=35, y=23},
 	head = {x=36, y=0},
 }
 tiles["npc/humanoid_halfling_derth_guard.png"] = { base=64,
 	feet = {x=28, y=60},
 	hand1 = {x=22, y=13},
 	hand2 = {x=47, y=44},
-	belly = {x=33, y=40},
 	back = {x=34, y=31},
+	belly = {x=33, y=40},
 	head = {x=37, y=16},
 }
 tiles["npc/humanoid_orc_massok_the_dragonslayer.png"] = { base=64,
 	feet = {x=34, y=58},
 	hand1 = {x=13, y=33},
 	hand2 = {x=55, y=35},
-	back = {x=32, y=12},
 	belly = {x=33, y=28},
+	back = {x=32, y=12},
 	head = {x=29, y=-3},
 }
-tiles["npc/humanoid_human_gladiator.png"] = { base=64,
-	feet = {x=35, y=58},
-	hand1 = {x=13, y=35},
-	hand2 = {x=53, y=36},
-	belly = {x=35, y=31},
-	back = {x=34, y=19},
-	head = {x=32, y=7},
+tiles["npc/humanoid_human_reaver.png"] = { base=64,
+	feet = {x=34, y=59},
+	hand1 = {x=8, y=37},
+	hand2 = {x=52, y=31},
+	belly = {x=29, y=29},
+	back = {x=29, y=17},
+	head = {x=28, y=6},
 }
-tiles["npc/humanoid_human_human_sun_paladin.png"] = { base=64,
-	feet = {x=32, y=60},
-	hand1 = {x=14, y=32},
-	hand2 = {x=46, y=32},
-	belly = {x=31, y=29},
-	back = {x=31, y=17},
-	head = {x=31, y=5},
+tiles["npc/humanoid_human_alchemist.png"] = { base=64,
+	feet = {x=35, y=59},
+	hand1 = {x=10, y=32},
+	hand2 = {x=51, y=34},
+	back = {x=33, y=19},
+	belly = {x=34, y=32},
+	head = {x=33, y=5},
 }
-tiles["npc/humanoid_human_shadowblade.png"] = { base=64,
-	feet = {x=33, y=59},
-	hand1 = {x=8, y=15},
-	hand2 = {x=56, y=40},
-	back = {x=34, y=21},
-	belly = {x=28, y=31},
-	head = {x=37, y=9},
+tiles["npc/humanoid_orc_orc_grand_master_assassin.png"] = { base=64,
+	feet = {x=33, y=61},
+	hand1 = {x=4, y=32},
+	hand2 = {x=60, y=39},
+	belly = {x=34, y=30},
+	back = {x=35, y=18},
+	head = {x=37, y=7},
 }
 tiles["npc/humanoid_human_sun_paladin_guren.png"] = { base=64,
 	feet = {x=35, y=60},
+	back = {x=30, y=15},
 	belly = {x=31, y=29},
 	hand1 = {x=21, y=35},
-	back = {x=30, y=15},
 	head = {x=30, y=3},
 }
diff --git a/game/modules/tome/data/gfx/shockbolt/object/artifact/bikini.png b/game/modules/tome/data/gfx/shockbolt/object/artifact/bikini.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb949c24767760bd02a1ebe0aa917a65202dd68d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/object/artifact/bikini.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/dwarf_female/special/bikini_01.png b/game/modules/tome/data/gfx/shockbolt/player/dwarf_female/special/bikini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..cec4f569e69bafe7a224a4d580a347e2d6f486b8
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/dwarf_female/special/bikini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/dwarf_male/special/bikini_01.png b/game/modules/tome/data/gfx/shockbolt/player/dwarf_male/special/bikini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..50b2867525c3bfc6ef894f7bf682984107e8958f
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/dwarf_male/special/bikini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/dwarf_male/special/mankini_01.png b/game/modules/tome/data/gfx/shockbolt/player/dwarf_male/special/mankini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f73550790161754edcc5cf632ed62f99f645607
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/dwarf_male/special/mankini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/elf_female/special/bikini_01.png b/game/modules/tome/data/gfx/shockbolt/player/elf_female/special/bikini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..14e8d47bb14ddbdfb5882a5c5482fa21eb32bd58
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/elf_female/special/bikini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/elf_male/special/bikini_01.png b/game/modules/tome/data/gfx/shockbolt/player/elf_male/special/bikini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf2736473872f7b383b87862b0affdf329330d75
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/elf_male/special/bikini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/elf_male/special/mankini_01.png b/game/modules/tome/data/gfx/shockbolt/player/elf_male/special/mankini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..63399890ea443dab249241083048862a2e1caa2c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/elf_male/special/mankini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/ghoul/special/bikini_01.png b/game/modules/tome/data/gfx/shockbolt/player/ghoul/special/bikini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfe746a4b3e2839c105eb4ed0b043ef465024202
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/ghoul/special/bikini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/ghoul/special/mankini_01.png b/game/modules/tome/data/gfx/shockbolt/player/ghoul/special/mankini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..996d0d9e5a9fe1f8b425efccaf8f8ea15d9dc522
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/ghoul/special/mankini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/halfling_female/special/bikini_01.png b/game/modules/tome/data/gfx/shockbolt/player/halfling_female/special/bikini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..babacd2bacb7e08b5e7a813bb4a3e2867a830d92
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/halfling_female/special/bikini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/halfling_male/special/bikini_01.png b/game/modules/tome/data/gfx/shockbolt/player/halfling_male/special/bikini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..914f80c53860dd8723e086351fd554596b4e1ac1
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/halfling_male/special/bikini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/halfling_male/special/mankini_01.png b/game/modules/tome/data/gfx/shockbolt/player/halfling_male/special/mankini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..56a44b89629892e9349353a86dbb09cc2417399b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/halfling_male/special/mankini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/human_female/special/bikini_01.png b/game/modules/tome/data/gfx/shockbolt/player/human_female/special/bikini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..6601bedad6bcc93603e59930ba1e44eb0e9199c0
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/human_female/special/bikini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/human_male/special/bikini_01.png b/game/modules/tome/data/gfx/shockbolt/player/human_male/special/bikini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..e09d07a6dbb2d8a87173ad47e4e295275dc0afd7
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/human_male/special/bikini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/human_male/special/mankini_01.png b/game/modules/tome/data/gfx/shockbolt/player/human_male/special/mankini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f9e398a40d1e87e90a3e77d184d8f8f2cfc4b0a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/human_male/special/mankini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/orc/special/bikini_01.png b/game/modules/tome/data/gfx/shockbolt/player/orc/special/bikini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..e931e3cf5629c0ec245eb27611ce888e58617238
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/orc/special/bikini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/orc/special/mankini_01.png b/game/modules/tome/data/gfx/shockbolt/player/orc/special/mankini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..7dfe5bba286eee27e66f6d023fb23570659f99ce
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/orc/special/mankini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/runic_golem/special/bikini_01.png b/game/modules/tome/data/gfx/shockbolt/player/runic_golem/special/bikini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..3889bbd564baa1c1d4e398d974028ee8b7604c4a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/runic_golem/special/bikini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/runic_golem/special/mankini_01.png b/game/modules/tome/data/gfx/shockbolt/player/runic_golem/special/mankini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d0a07854a3cc2449a011d0c6555330e62bc3514
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/runic_golem/special/mankini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/skeleton/special/bikini_01.png b/game/modules/tome/data/gfx/shockbolt/player/skeleton/special/bikini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..48fe43399420da4f0012c2e5aa5e43be62389006
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/skeleton/special/bikini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/skeleton/special/mankini_01.png b/game/modules/tome/data/gfx/shockbolt/player/skeleton/special/mankini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..70705ca2fc62a69844f92a9f1310a2bddb926d7a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/skeleton/special/mankini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/yeek/special/bikini_01.png b/game/modules/tome/data/gfx/shockbolt/player/yeek/special/bikini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..916601844441ca97aef13b8b3ff45cf948c3fd4d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/yeek/special/bikini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/player/yeek/special/mankini_01.png b/game/modules/tome/data/gfx/shockbolt/player/yeek/special/mankini_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3a95e6dc58bcf4f148e34df6b553d5ce8c598b9
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/player/yeek/special/mankini_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/shader_images/sun_effect.png b/game/modules/tome/data/gfx/shockbolt/shader_images/sun_effect.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb61466c79c0329a8cfd579424714b4185fe51b9
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/shader_images/sun_effect.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_1_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_1_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..59584f25155cdacc7d6be4903aa5df2e9b49f815
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_1_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_2_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_2_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..eecac1fc10725164708875ea38e56f29a2937549
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_2_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_2_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_2_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..83126464ca3653984c63504f9cff7311bdba6958
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_2_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_3_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_3_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..bac795c41daf39c5342bf467032e9d547315758c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_3_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_4_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_4_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..7549ab61e3881f6714177a2310258f5021360e76
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_4_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_4_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_4_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..0cf8628f210e5998b131052fc128dd7c1d1ccf1a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_4_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_6_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_6_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae2a57d0d2464a3af313b12a0182ceeedb062020
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_6_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_6_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_6_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..d937922ec89bec4cb367c4ee45370b86cf97a68e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_6_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_7_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_7_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4e9257d25f639739fb61d9fee3c3c1364a1c679
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_7_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_8_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_8_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d860080e6880185462772ae1cf552508ac06981
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_8_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_8_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_8_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5fd225883a9989932e28cd21a601ab3be7a8172
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_8_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_9_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_9_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f9f12421bc297432afc7fa7ee2fe82b8698c828
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_9_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_1_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_1_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bc3fcdbb827ac9f7464708bbb6ce4dba465b086
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_1_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_1_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_1_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..7da0c2b08de58689a4957c791c13124517f74a5e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_1_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_3_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_3_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..50feefaa25274165b286ade3b1539e009ee72523
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_3_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_3_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_3_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a62cafa2b847a11457ff48846a3b20ba17fbe9c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_3_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_7_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_7_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..d40a915c6766b7cbdc556ecd868069fb551b7ef3
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_7_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_7_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_7_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..c148445e0874ff7fa6dcff3cac7d4353d0d6596d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_7_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_9_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_9_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..b978db73765850b1bff5ebec4948cd7da48d9dca
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_9_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_9_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_9_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..f37f172b65b04abe11ef65b80e29b09cac6a5933
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_inner_9_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e44ef244f1a37cd281cbe7ec7b5c24d835efb14
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..92c3a282f7978f1a14fb3bb32d86584b227ff557
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ec8079e539640c5852074bf56bbf8d4eb54133a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..ded82fb7cf07a503e144de9bfdd496fa18eb67cb
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_05.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_05.png
new file mode 100644
index 0000000000000000000000000000000000000000..a99b9ed993acc15f4e9191fbbcfe71d6dca2ee98
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_05.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_06.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_06.png
new file mode 100644
index 0000000000000000000000000000000000000000..9809a22438697f2f79b106beccf7f0b570973624
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_06.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_07.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_07.png
new file mode 100644
index 0000000000000000000000000000000000000000..35b7719e4bac14cf519bb2d128e14f6ebccc4d71
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_07.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_08.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_08.png
new file mode 100644
index 0000000000000000000000000000000000000000..d879f221ec1a92a18434e579a07bed5b6314387f
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_08.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_09.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_09.png
new file mode 100644
index 0000000000000000000000000000000000000000..25710161c2787629f5683c23d39ae9e680116382
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_09.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_10.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_10.png
new file mode 100644
index 0000000000000000000000000000000000000000..47ad151e7fb2b0b5b462d462c5e26976eb9b7b9e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_10.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_11.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_11.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff29ba011e287ba78ff63ecf3ad0cdcdaa35ed64
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_11.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_12.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_12.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2515b86c675d74c0eae5f72582db114bdc929fd
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_12.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_13.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_13.png
new file mode 100644
index 0000000000000000000000000000000000000000..a25c644d4e2b6cd814ed7bd47deace4dc718250c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_13.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_14.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_14.png
new file mode 100644
index 0000000000000000000000000000000000000000..578af1594d0520684a12a609f066a2cf07fe0b98
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/autumn_grass_main_14.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_1_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_1_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..0469e1901d2ba92569986e2efc0be4afc604330b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_1_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_2_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_2_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..f82f80cffa0c4ff66e307bdd82c8f02a35d40e41
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_2_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_2_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_2_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..38fefcc6c817dc73fc613bca350b8b9b782bf00f
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_2_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_3_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_3_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..309eaec987d3f8bfc08676186a7096877ad17a8e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_3_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_4_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_4_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..0882755ddd9d5e627a1865d0ba5ca814587e8b12
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_4_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_4_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_4_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..830d706eeae39cf5c31fb81ed462f9bd922f1eba
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_4_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_6_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_6_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a39315b7abede5892148282c1bfa278609ee39d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_6_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_6_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_6_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7ecf43856e07ef1b741aca1c61e92e266f48ece
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_6_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_7_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_7_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a8dd176fcdcdcc171b70faebe6d1074d953cf73
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_7_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_8_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_8_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..8243bc347a04aa929f464cb30be7bf34430bf0f4
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_8_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_8_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_8_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..478c8723393a3319722889d3a16dfe5700940c6c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_8_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_9_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_9_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..7eeaa06ecc2dc3f9e0c510c5c7f5e4c795672eca
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_9_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_1_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_1_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..90e0dd8340ab7724b519bd470cb9e6d5c32a7c6c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_1_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_1_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_1_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..57faa5c77325f76017a645b157f71a3db70c3312
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_1_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_3_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_3_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad0cdb38680bc99c9b8fad5ba22ef30998ce3262
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_3_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_3_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_3_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..d483e6a28cb2e7b1c915446a55a4328e2b799fdc
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_3_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_7_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_7_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4208f8df2c281a0e16cf87c39cf192d1102f01b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_7_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_7_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_7_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd03ae515d48d6fdef61b53dd149211d1eb32710
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_7_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_9_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_9_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..37ab8414d90ae6690a0cd2c6b5db1f1eb4c64c31
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_9_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_9_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_9_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..74631eb664c014d003dcddd843daa0f5e308cc95
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_inner_9_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..b033661b78e5bd7c627ef84f7359ce7435bca444
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..3689fb0c379513ef73336cfba9572ada49a52a4b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..eae1f00ce797520b3f09aad375e3eeff72a0efbe
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ec40084a8b6f69de5bed31f75629a4a1ba4967e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_05.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_05.png
new file mode 100644
index 0000000000000000000000000000000000000000..2415adadb37bc8744daf2886e09a9868489f342c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_05.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_06.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_06.png
new file mode 100644
index 0000000000000000000000000000000000000000..3435a87e4eaa1d90cbd5be032f049417d88b19cf
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_06.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_07.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_07.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fa7524384a83f485d98bbb98a426d637ed83305
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_07.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_08.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_08.png
new file mode 100644
index 0000000000000000000000000000000000000000..370b55610804b304e21a68fe5be616c24a48c07a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_08.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_09.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_09.png
new file mode 100644
index 0000000000000000000000000000000000000000..20a86049f03b117124039c026128cce8cedabb9b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_09.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_10.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_10.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4d1390987a5c49c86c9c07399fd59bd16dd29e4
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_10.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_11.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_11.png
new file mode 100644
index 0000000000000000000000000000000000000000..289724b98bf08802461714a7d65322dcfda6031b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_11.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_12.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_12.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b3b325b148e0abfdf2fe4626b0024027ede42d4
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_12.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_13.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_13.png
new file mode 100644
index 0000000000000000000000000000000000000000..c711bfa938f5066fa7b4cb42df2866e489501ea1
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_13.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_14.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_14.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a0fa1edee72c15f1f12659888f5971cf0b90884
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/dark_grass_main_14.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_1_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_1_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..57b5f62ba78c5e5672b4558a012f1dc10a8baf84
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_1_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_2_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_2_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..f66bc86e6dcc8ada8c1d0c80cb1834d13179ba56
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_2_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_2_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_2_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..85e637f11c6ce53cbbf4184859d18515764b15c4
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_2_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_3_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_3_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..07c138c2d6529b1eeec89e87776f55f6515efb99
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_3_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_4_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_4_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..538f3c22a85f177d28c2171d08969d19588b189b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_4_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_4_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_4_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..72d73d6bea4fc512ae28047a98de580633d9ee7f
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_4_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_6_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_6_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..0092a029473d9ba01a465f7a347935fa8d7f821c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_6_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_6_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_6_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..c83b28f93d6eddc6575bcb8ad0da72454f85bf2a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_6_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_7_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_7_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..18f48a99d110350e2f98efa3d82df09eed2f6c27
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_7_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_8_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_8_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..85c2feca12c7cf86b1db59ed051c91da92af26b4
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_8_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_8_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_8_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fae4a7a46caa8859337c0111533350d995e9935
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_8_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_9_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_9_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7f2e54c7a681bfe74809352d8d6d5681c1fd35b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_9_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_1_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_1_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..114f05da7b691448032ae0a3b2dc1cd3e7f7901c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_1_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_1_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_1_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..842fdce214e64b74af1186187aa8e4140f04a729
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_1_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_3_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_3_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..12b5da272ddc38062ee7b4d6bed2306770dcff35
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_3_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_3_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_3_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..399ed49b90b1eccbaa70749e20bf6bb81574a2b6
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_3_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_7_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_7_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2e3e50736f3163c7859f5dbb9ba480152a3be50
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_7_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_7_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_7_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..034fa55e959e68a3779cde819fb6931a60793ff2
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_7_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_9_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_9_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..27ee32cc93c8df3800d7b71e483cb2596763645c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_9_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_9_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_9_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..0af8e93ef478e456f5b56736914feb86cd8a2bc4
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_inner_9_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..7efd78129772108925c25ba9acb716b8a8ec8864
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e5f58f17c051a5d15559a5af99e5d2ee9019bc9
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5123b22248e6d4b9eafa35626d1c049c0cdcb18
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..b258faa2f1b4217c6d421d7a87d26cb1d726a595
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_05.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_05.png
new file mode 100644
index 0000000000000000000000000000000000000000..91ae34e81984d86db4cda90fb293dcbcd0b15fe1
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_05.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_06.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_06.png
new file mode 100644
index 0000000000000000000000000000000000000000..df9cd388325e0e7e1c8cd2cefa953bd644e2d044
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_06.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_07.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_07.png
new file mode 100644
index 0000000000000000000000000000000000000000..90d8f3a3245ab17a1ae141d0e3ca022af952d7e6
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_07.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_08.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_08.png
new file mode 100644
index 0000000000000000000000000000000000000000..dce976ff4680aa7bfe54f717673eecdea7a7ebbc
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_08.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_09.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_09.png
new file mode 100644
index 0000000000000000000000000000000000000000..245b0ba815c85ce7c4b5c6b8a4a4a8605e73d0f1
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_09.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_10.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_10.png
new file mode 100644
index 0000000000000000000000000000000000000000..fbf6bec35ec9cb5ace14b961da068bf4eb1c9a77
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_10.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_11.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_11.png
new file mode 100644
index 0000000000000000000000000000000000000000..21f5b228e729d4fa2c6719338ac4b70379eb0fbf
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_11.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_12.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_12.png
new file mode 100644
index 0000000000000000000000000000000000000000..c24d0e7c6daecf47cea9814c6d918241f4a3d715
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_12.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_13.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_13.png
new file mode 100644
index 0000000000000000000000000000000000000000..70c80726c4d2f004a8caf0163e1cfdbb04f3f749
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_13.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_14.png b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_14.png
new file mode 100644
index 0000000000000000000000000000000000000000..74f1fefecb6abe508f4c3e3870740611931c13eb
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/grass/snowy_grass_main_14.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_01_foliage.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_01_foliage.png
new file mode 100644
index 0000000000000000000000000000000000000000..243847c4301142595ff8a7c8df2ac05362f33e57
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_01_foliage.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_01_foliage_ash_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_01_foliage_ash_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..7af80b422bb86a736070ec7103db38f227407790
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_01_foliage_ash_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_01_foliage_ash_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_01_foliage_ash_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..08325d7cea66db9d0fdf552262d4a254f5b6363a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_01_foliage_ash_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_01_foliage_winter.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_01_foliage_winter.png
new file mode 100644
index 0000000000000000000000000000000000000000..f87d401a75ebad4593a2191eece5a725f5a63130
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_01_foliage_winter.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_01_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_01_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5bacddae00ed5a3521cb181bca2e05b31d715f6
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_01_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_01_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_01_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca44670f0860728bcbf4139473c089a83665fa2e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_01_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_01_trunk_ash_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_01_trunk_ash_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..85b61a7fb2b40416d8099b6b53cca9d8b1e8805d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_01_trunk_ash_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_02_foliage.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_02_foliage.png
new file mode 100644
index 0000000000000000000000000000000000000000..43e6c9a47272e2079ae1ecdc0014b03e2b0d81b5
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_02_foliage.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_02_foliage_ash_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_02_foliage_ash_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5663d9f89b070160eb10a1db3a81fd76aed05a3
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_02_foliage_ash_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_02_foliage_ash_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_02_foliage_ash_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9dc450d9a3ed80cf910fa96891242eeccda8d9c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_02_foliage_ash_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_02_foliage_winter.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_02_foliage_winter.png
new file mode 100644
index 0000000000000000000000000000000000000000..b12781f2f69cd992fd5b05173c7c2a3e03d05641
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_02_foliage_winter.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_02_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_02_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..691840d9a4b5d94de72b5bae84f58fe71521728b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_02_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_02_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_02_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4faf2f1aa4d07610bbf7a97c6050117b6a4417c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_02_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_02_trunk_ash_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_02_trunk_ash_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd830d32af31a42c40658421f2056e597a5547a8
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_02_trunk_ash_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_03_foliage.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_03_foliage.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7c3653a4d83b99986d26a7f8fcfc0ec9300f873
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_03_foliage.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_03_foliage_ash_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_03_foliage_ash_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9eea2a0beaeddd8bf17e9b80f8c48adea844379
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_03_foliage_ash_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_03_foliage_ash_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_03_foliage_ash_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..842f534263abc23e08a0351757679fc39846a138
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_03_foliage_ash_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_03_foliage_winter.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_03_foliage_winter.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d1983da6e7f12137546616eee36b828e99fe69c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_03_foliage_winter.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_03_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_03_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..36dc767f1373ed69727c6f89ece61233d03b161c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_03_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_03_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_03_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..60ba2c76a1d79f2d7bcc9256eda7c8fe006e1125
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_03_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_03_trunk_ash_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_03_trunk_ash_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b105de16aa99934eb599b4e58ee95de15112d36
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/burned_tree_03_trunk_ash_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_foliage_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_foliage_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..045a9aefaec1c5ed98680d46ab9f4a1715626b9b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_foliage_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_foliage_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_foliage_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb3b755215da3c212cf09c5d229f2b72780093bb
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_foliage_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_foliage_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_foliage_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfbe84f4e36a8c095d1c0c542e78317ef82c3f67
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_foliage_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_foliage_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_foliage_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..591976fef7fe970b10f738ba364d32ca3ba3679c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_foliage_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_foliage_winter_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_foliage_winter_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9f7a6fd151e10a80ff5640bfee2673f9e1fdd1f
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_foliage_winter_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_foliage_winter_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_foliage_winter_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bff5df37372c6ca052a78316dacb27bd4f7b710
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_foliage_winter_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ee68dabae67c3ba011189c6ed2a7127144cd6cc
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..705edf19dd1ffec15e8305698e8ff90060d818ec
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/cypress_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elm_foliage_autumn.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elm_foliage_autumn.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf0e11bab640273c05a3695db745f002a53231b9
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elm_foliage_autumn.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elm_foliage_bare.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elm_foliage_bare.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba2632228cf2499197e0dcbf75b599d9eedc83a9
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elm_foliage_bare.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elm_foliage_spring.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elm_foliage_spring.png
new file mode 100644
index 0000000000000000000000000000000000000000..41d025ad24b0df738d5dcca02539a04bd15121d7
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elm_foliage_spring.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elm_foliage_summer.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elm_foliage_summer.png
new file mode 100644
index 0000000000000000000000000000000000000000..358786c86276072573d28819a36d585632310dbd
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elm_foliage_summer.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elm_foliage_winter.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elm_foliage_winter.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a8787a9954772b58020afc353d99418e59341b4
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elm_foliage_winter.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elm_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elm_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e389a8bd0cf3b4066e8c53cda0133922ed919a2
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elm_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elm_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elm_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..6cfb7bcf4a2d30ce3120012e79181e0c351636f1
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elm_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_autumn.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_autumn.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb1b354c2e65f928cb63d53bf812643c4a81b719
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_autumn.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_bare.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_bare.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d1669ac6be54f23ae513fbbdbb5f52da6a04c54
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_bare.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_spring_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_spring_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..614481d5a30601883cc0e41ed0064210981b949d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_spring_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_spring_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_spring_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..02764117312e78b6710ef9375fe8fe9aef7bf29e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_spring_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_spring_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_spring_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2c03f3bdd46b1a76c73dc846cec81e193058452
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_spring_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_spring_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_spring_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..f899b6e45d933bbc56794dd5076de4113a1626eb
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_spring_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_summer.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_summer.png
new file mode 100644
index 0000000000000000000000000000000000000000..7682db11f41cf0c8eacf4bfe2cd05cbf184b37d7
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_summer.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_winter.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_winter.png
new file mode 100644
index 0000000000000000000000000000000000000000..63edc0561880ccf095047538620a3955fb00f9f9
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_foliage_winter.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..004d5b3b2144827c3483152f2b60de94cabba6c1
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..e44fdc5919a781a1864cb7ed9aa43aee22d47dec
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_03_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_foliage_autumn.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_foliage_autumn.png
new file mode 100644
index 0000000000000000000000000000000000000000..44375f138d9280543e62246fa657d1f45a76e4ce
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_foliage_autumn.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_foliage_bare.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_foliage_bare.png
new file mode 100644
index 0000000000000000000000000000000000000000..759f2af0213967bdb18981e5caa869a1edec5bc6
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_foliage_bare.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_foliage_spring.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_foliage_spring.png
new file mode 100644
index 0000000000000000000000000000000000000000..6834b99927593e17e607801467788e72d6f5cd01
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_foliage_spring.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_foliage_summer.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_foliage_summer.png
new file mode 100644
index 0000000000000000000000000000000000000000..efae8a5cc7c6af571edd2085139cd3691abb800b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_foliage_summer.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_foliage_winter.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_foliage_winter.png
new file mode 100644
index 0000000000000000000000000000000000000000..1882243a539c60160dc587eb5032ecd1a7aeed3b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_foliage_winter.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..73ec3e43968f34e589b8f60a5e028bc12e88189a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad8c68e2452f67ec389f565eb611ce3b26c63027
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/elventree_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_autumn_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_autumn_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..895a5b932d01d6df501936235af0cf1fe81d5056
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_autumn_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_autumn_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_autumn_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a1c8893ac0d5a14014bc4bd0567885a90adaf4a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_autumn_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_bare.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_bare.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b9b342767343b9de0ee56fad46cc24db7c2386a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_bare.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_spring_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_spring_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..786558bef4126bb1a1c6ac3fe1788c14d4022586
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_spring_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_spring_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_spring_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f81cb46ff5a12ffa009b3187ed521dab93a036d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_spring_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_spring_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_spring_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..928b538b1f9b0f04f0e7e4699ddc6ba700f4d094
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_spring_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_summer_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_summer_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdcf0e3ee661ed54956af9a65ae2e71385103a87
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_summer_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_summer_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_summer_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef288021e10b16b18cd2f1d12d042615eba33560
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_summer_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_winter.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_winter.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d4584d35ddabcef5c82d4b15bf46fa9de775c66
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_foliage_winter.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fa92c6de23422fbb83c2b247e9710389e51d9ef
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..6561997f8f7d9c229f61b690057a32c00d57907a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/fat_elventree_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/gnarled_tree_foliage_bare.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/gnarled_tree_foliage_bare.png
new file mode 100644
index 0000000000000000000000000000000000000000..def4b2374a65656c175267600517d3680d34b5b1
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/gnarled_tree_foliage_bare.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/gnarled_tree_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/gnarled_tree_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..48d452463cb53d56507e1f247dbb8755952b95e2
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/gnarled_tree_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/gnarled_tree_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/gnarled_tree_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..75160a7874f832e3cc8819931c4185197b2c5d90
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/gnarled_tree_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_pine_foliage_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_pine_foliage_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..c41de4ddce4f4e40b7fef8e1b2afaed40158c3d5
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_pine_foliage_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_pine_foliage_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_pine_foliage_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfed12dfae8ea27a5f317fc1b772dbefdd4dc9bb
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_pine_foliage_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_pine_foliage_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_pine_foliage_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ed585e806987cb55dda821dc7c2787ffeab8e44
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_pine_foliage_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_pine_foliage_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_pine_foliage_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..57f60708d849abcebc02f900b746842899bb2729
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_pine_foliage_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_pine_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_pine_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ea54685606a909625a054f9fc1766501c3d13cb
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_pine_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_pine_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_pine_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec7f428f25b9daa80c87986a256315e7ac0e6233
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_pine_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_narrow_pine_foliage_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_narrow_pine_foliage_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a94352f2bb68dc6679377d2f966974403e91804
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_narrow_pine_foliage_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_narrow_pine_foliage_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_narrow_pine_foliage_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..456176d2fed7cff89211d32b527f943e648f3a0d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_narrow_pine_foliage_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_narrow_pine_foliage_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_narrow_pine_foliage_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..74346de64f2901204ba086982af2dc2f0d56c5fa
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_narrow_pine_foliage_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_narrow_pine_foliage_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_narrow_pine_foliage_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..f61cad5780bd44c36040dce433a9c22f7ac0575b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_narrow_pine_foliage_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_narrow_pine_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_narrow_pine_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e99d15404e860d3c02ecfc70c51afd4484ea513
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_narrow_pine_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_pine_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_pine_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..07aec5afc13ef893a9aee3b5ba1c233a798a0612
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_pine_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_wider_pine_foliage_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_wider_pine_foliage_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6fa4a561a49b3337c5cc997b9eac7dfea823ef6
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_wider_pine_foliage_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_wider_pine_foliage_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_wider_pine_foliage_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e2326037868026967d7fa265471819bb02a97b6
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_wider_pine_foliage_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_wider_pine_foliage_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_wider_pine_foliage_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..66b7626a7dea52e235aa26b26da96dba90bc6ad7
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_wider_pine_foliage_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_wider_pine_foliage_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_wider_pine_foliage_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..65cc908b5e28497be8a211224c079a80b2dabe96
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_wider_pine_foliage_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_wider_pine_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_wider_pine_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..6171d6385f66dac8a4f1acaced9cae35c45ff316
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/light_small_wider_pine_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_foliage_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_foliage_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ba287864053c875d0ca79ad906a5da2069fd460
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_foliage_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_foliage_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_foliage_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0c46b62100df926daacb041e965c5a0284e2ca4
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_foliage_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_foliage_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_foliage_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..1398d2babaccd6304b7c68c258ffc8108b485b54
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_foliage_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_foliage_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_foliage_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..09fa37e52f715d7e30a0dcf69fe942ab2382f5b9
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_foliage_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_foliage_winter_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_foliage_winter_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7f83aa4c121c1510e8700e593ed32f7f3a91305
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_foliage_winter_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_foliage_winter_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_foliage_winter_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffd17b7125633cd7f2e46489661fe980553106f1
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_foliage_winter_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..01dd3aad0c020205fe74f707344680950c2330ec
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..217c90c2433ef85c756fd6da21f0d88c6a27ab23
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/narrow_cypress_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_autumn_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_autumn_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..15a833b990f51393e751d98d33fe48556b8f5c9a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_autumn_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_autumn_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_autumn_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..6445b72cef4ca73ef0f5bbf84a5baa15f7331ab7
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_autumn_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_autumn_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_autumn_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..c843ab505a7da1ca936fa6df740c257386224a1b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_autumn_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_autumn_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_autumn_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4760c8770bb6b83f54fe1e98448f117bb68090c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_autumn_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_bare_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_bare_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..617a3cfdb580ceb57b90154d260e909db4da039f
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_bare_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_bare_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_bare_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..da4fb95234222b9f87e63376392e087d3e92f8d4
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_bare_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_bare_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_bare_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..da4fb95234222b9f87e63376392e087d3e92f8d4
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_bare_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_spring_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_spring_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..2dc965d7051af6795b0558ae1e4119a1c62be967
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_spring_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_spring_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_spring_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..263a76111c4ce36fe2651007f472b38406f4b3e0
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_spring_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_spring_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_spring_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..263a76111c4ce36fe2651007f472b38406f4b3e0
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_spring_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_summer_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_summer_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b427dafa149d9be96ac4389c4d33f2d177e9c2c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_summer_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_summer_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_summer_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd2ba9c0cf8aeb0522d33bff45ed23a4b1fe328c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_summer_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_summer_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_summer_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..9579ceed53ba528fe6db19ea2a3b53faaccf0cc1
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_summer_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_summer_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_summer_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d279065bcb21a359de87def307399f6226e0ef5
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_summer_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_winter_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_winter_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..7af89ff1ab9374c2fc37ea71f260ce9fdb717f70
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_winter_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_winter_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_winter_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..6465a6d7c78466076246185e66e749725a721176
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_winter_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_winter_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_winter_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..6465a6d7c78466076246185e66e749725a721176
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_foliage_winter_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..e00b58fec6ca79f2c1b172d2db14a38dfe855df3
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_trunk_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_trunk_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..3efc50755bcd709e0bfddb2f3129ff4030711793
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_trunk_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_trunk_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_trunk_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e10812efea61d5e9164ebdba5c60fe9c300899b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oak_trunk_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_autumn_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_autumn_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e8f6719513e07a0b3d5c85f54e9538359a8c550
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_autumn_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_autumn_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_autumn_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..de88f40a12e62f16cc186e23b475c630789178db
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_autumn_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_autumn_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_autumn_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..a77c091adbadc4f38ea2a30cb5635b9a66543eed
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_autumn_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_autumn_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_autumn_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..66efaa0d95156bc325c7ead74c36ceda8abf9350
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_autumn_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_bare_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_bare_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e0a4c740fce9333670b518cc4ef381cb111bda8
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_bare_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_bare_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_bare_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..74ff00ee1d37a220ab9f26f197addcf541600327
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_bare_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_bare_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_bare_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e25cc76473dc8e67810b47efc1dc9c9cdc07d1f
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_bare_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_bare_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_bare_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..eef10a2ce142b29891ce08a4b590ab39fdb5aba6
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_bare_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_spring_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_spring_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..177a0a8a21cb203ffcc6619323b6bd8a9e0a0a88
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_spring_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_spring_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_spring_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..a52a1968b6f079b3e59fbe17782d48a90848512e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_spring_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_spring_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_spring_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..42a1d35903bb8095ae8c09a1844303327d709e86
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_spring_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_spring_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_spring_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b2d66a426c54d552a8d086944c15cba126fd1a2
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_spring_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4adfce98b3d753862d7eba369830d35fffecc9e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea36ad8b2ed9789e429cec21e233b4a695f16dee
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..516a19eea81500f41b1c79f3ac6e2078f73f99af
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..a20c8a8d3284b73f0d9594fee20bab5f3def0c09
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_summer_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_winter_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_winter_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..5da300518d451450fc8986ec8fd17520c05eca42
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_winter_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_winter_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_winter_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..473756a05e595ec2044ac0bd97d9d9a5c595a8e9
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_winter_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_winter_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_winter_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..5817edd6234ce2b69f61d22dccffcecd315707d8
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_winter_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_winter_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_winter_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f389eb2dc3f4fb5d0475060649d3ea100f6f3fd
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_foliage_winter_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..76e9d9268fa60bba42b107a16c7b1ed278af657c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_trunk_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_trunk_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..55b485589c0927de40f3fc087c6c7a8842a02023
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_trunk_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_trunk_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_trunk_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..a250cba3f4e729337ff4d64fcff6f22a018e78b5
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_trunk_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_trunk_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_trunk_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..60518ef2c9e03763afb98b49e2740a06d7413723
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_01_trunk_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_autumn_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_autumn_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6efd616cb2521cb52467e12f4ecdefb6309a4c6
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_autumn_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_autumn_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_autumn_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..d80d0ba14d70130e2b1817eb7471f9717c11a062
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_autumn_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_autumn_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_autumn_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..77e96a527897c6fefca9dc559098847498d8daae
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_autumn_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_autumn_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_autumn_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3a2d59b485685fa99f6d6d0332c72f126662c5e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_autumn_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_bare_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_bare_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fad579c0f02327bd4fb50f81c340d493904413c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_bare_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_bare_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_bare_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fa9daed12b5ab680ffc92d4c4149ac3214c071a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_bare_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_bare_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_bare_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..245c1ff97d3c4082c583f782924f905f423e9a56
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_bare_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_bare_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_bare_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac4b60532279df3040c7b173ecab58609e469764
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_bare_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_spring_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_spring_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..6117fa4c2efce25756d4d2dfa9f1af9e127547bf
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_spring_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_spring_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_spring_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ea609405db601f26d394e735e9cf4fb7e263d1c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_spring_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_spring_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_spring_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..578e1c29ecd5c601f348e477304da636fc321206
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_spring_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_spring_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_spring_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..8051f756fd868c3d0a52baf20e3686cce8e8783d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_spring_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..1176c5b19799e1536f5abbe3e1c278c9a27b0455
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..2762f58128b6a657f403333e43d0b527013c7c5a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1218b49738662e0b6c73f5e0b02a2da73e21d11
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..519260390cfd8dbd7d1fc9e1104d5ce73ab5048d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_summer_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_winter_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_winter_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..174c23adee0c37605b9efe57ac6a0bd4c5ded0be
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_winter_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_winter_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_winter_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb3d19be47702f035d74512e1d97b57e96afcbdd
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_winter_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_winter_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_winter_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1dc3688e6ef408389c951ea2f34b77834588310
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_winter_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_winter_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_winter_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..aca9e1dfcf71276e0385133979b0c8e74565edf1
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_foliage_winter_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..30eec5b0fea0b28e9b11c9d0bacb7ab1a509def3
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_trunk_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_trunk_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c2e00ea35c2054fb73f8cb0edd930677503c6ac
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_trunk_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_trunk_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_trunk_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..9be670e3af8366b6f12511b2981e64155c163682
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_trunk_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_trunk_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_trunk_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..02fd9ae213d9de5a3135feb43856481eb11f45f8
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_02_trunk_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_autumn_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_autumn_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..37d4f68c1ae2c331dd6887f438614901ba733e7d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_autumn_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_autumn_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_autumn_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bf037433e197a8292733a4d3642bee332248843
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_autumn_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_autumn_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_autumn_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..959d9d119e6adc669a42babb6260ada7fecf6bda
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_autumn_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_autumn_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_autumn_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..180829f751bf9ada19ad290c1e4f8bac19f37453
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_autumn_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_bare_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_bare_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..baf3417a99b60962ffc146a1c1173ca08179ab2b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_bare_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_bare_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_bare_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..4965c4463ba5587b7fac2d07bb269047a87d0623
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_bare_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_bare_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_bare_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..d79b1de7eb00e3bb1fc69325d5ed2fc232a8e810
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_bare_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_bare_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_bare_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6420eb2f1b436cd7e2477942a58aa9dbbdf7fa0
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_bare_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_spring_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_spring_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a2c3f2399278423a4795bf4cf948c9cd3d8ebdc
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_spring_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_spring_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_spring_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd432dca57bd34d77f948b0ea90168e461c1ca5b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_spring_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_spring_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_spring_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..010c480297089c7a3229651c8d4571337fa8132a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_spring_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_spring_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_spring_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..701ff8e35d2100fee932b2e61358318516b7ba15
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_spring_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..4129e2fd49b1abf9baf9bad18da00eb86a57b652
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffea67edb3026d2e9bde6a9c9a38aa5ff00d5c28
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..8678a36c01786499547307d6a3d69e99f6df3b96
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..4af54b20ba738a6c683905ab9c50d9f57a6a7834
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_summer_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_winter_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_winter_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..bded9a9f7754d96f803e3ca837afa83900078d54
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_winter_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_winter_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_winter_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..fed2abcf96bc34bdf04b5adc40e13786865ffbb7
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_winter_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_winter_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_winter_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4ce9cbe6ec63227dc10d9807bb60ba687b0b0b3
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_winter_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_winter_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_winter_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..95670f5616b2c9611dd5b9dc3898ed14a5930a54
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_foliage_winter_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..77aab8bcbd7b5270e904ea9afc176cdeace3f0db
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_trunk_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_trunk_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6f298f90cf4b058c6b41e157add905474d6b27c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_trunk_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_trunk_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_trunk_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..172886bfcad7ad7501322615c1c94fa977ef4235
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_trunk_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_trunk_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_trunk_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0a418048c071286d7560f811a4227f24392facd
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/oldforest_tree_03_trunk_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_foliage_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_foliage_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5c62199e6cbff151edd2fa0ec970c75453f68f6
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_foliage_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_foliage_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_foliage_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..837d949a812a0f70d6a95f0e0436dc3b7e2365cf
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_foliage_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_foliage_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_foliage_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..b70673309cbd68a7d10293529821c9fe906e89c3
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_foliage_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_foliage_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_foliage_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..3742b72a1ded7e41a6fd1c34ab5e88e378bda149
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_foliage_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_foliage_winter_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_foliage_winter_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..26c349649eb46dc54ea4637e07e49781c54c2508
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_foliage_winter_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_foliage_winter_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_foliage_winter_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..10fdfaca8aa708ecddde5030b0a91ae65cb79a23
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_foliage_winter_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ea54685606a909625a054f9fc1766501c3d13cb
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..922d32e21a86eee02174257c9a64f25ba5b1e9a5
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/pine_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_01_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_01_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..9363f2f9c190c86d667e06da2a4242c808240aee
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_01_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_01_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_01_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a5aa5d06525a4a87565af56b97277762a36a4d1
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_01_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_01_trunk_ash_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_01_trunk_ash_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a523b5570e49b0408d5c6e50c78ba2ae92175cd
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_01_trunk_ash_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_01_trunk_ash_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_01_trunk_ash_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..76a1ab1aaae7a2dd70726c79b05ec7aaf317cb56
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_01_trunk_ash_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_01_trunk_winter.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_01_trunk_winter.png
new file mode 100644
index 0000000000000000000000000000000000000000..977e7d74d0b7ec56d0d39d8d19b3a409a826885f
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_01_trunk_winter.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_02_foliage.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_02_foliage.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdd1ac7ed281cf3be6d9ccc3f0fc360a6174ddda
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_02_foliage.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_02_foliage_ash_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_02_foliage_ash_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..b704677827b00ab67d00cac8a09c548a88966bc0
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_02_foliage_ash_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_02_foliage_ash_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_02_foliage_ash_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2f5592d0fc50ae1dc8a197b31b8fd799dc73bd1
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_02_foliage_ash_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_02_foliage_winter.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_02_foliage_winter.png
new file mode 100644
index 0000000000000000000000000000000000000000..721bdb8db654ea6ec7fd0b4feca4ace065121786
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_02_foliage_winter.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_02_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_02_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e52ce1448959f7168152b2718076d8aedc216f4
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_02_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_02_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_02_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8cf718af715f226c6fd56fa8710fecfd5e5bb87
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_02_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_03_foliage.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_03_foliage.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad647bc0297e4a9ace62cd7daf75973bf792c8b2
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_03_foliage.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_03_foliage_ash_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_03_foliage_ash_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..e50272b9ac1ac684c1913adac9b568ee9588b557
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_03_foliage_ash_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_03_foliage_ash_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_03_foliage_ash_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..af6ce8496e4263017fc08064c665d84cc6cbb483
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_03_foliage_ash_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_03_foliage_winter.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_03_foliage_winter.png
new file mode 100644
index 0000000000000000000000000000000000000000..4487a991e518febb4f01f2149dc0e0e845476ee6
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_03_foliage_winter.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_03_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_03_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..3237f4cf90bac8d7eb7a95ff29758e4814195756
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_03_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_03_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_03_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..87645e1ec6f8ec3735fe6373d8b2feb44ad9eae0
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_burned_tree_03_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_foliage_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_foliage_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..299af1db5537ca4cc095ff577616488b8dbae146
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_foliage_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_foliage_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_foliage_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4c4395edbc7368d8ce760d6b1a231c5741dd845
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_foliage_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_foliage_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_foliage_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..714accb3e4a4b2976489e5ef53f6b9aa695a8020
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_foliage_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_foliage_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_foliage_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..5140ea1c626679defa0c1a66a59389e04c0c081c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_foliage_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_foliage_winter_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_foliage_winter_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fd53a846f361980b1a05367439fc760393c9e40
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_foliage_winter_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_foliage_winter_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_foliage_winter_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..8533e485f2d9a92fa98ee7ce50e416ebdaddf557
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_foliage_winter_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..db9e39e51b1c6b7e378ae5323eaf644a72afb412
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1d26ad039957f9d402a929b5579d3a2de310124
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_cypress_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_elm_foliage_autumn.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_elm_foliage_autumn.png
new file mode 100644
index 0000000000000000000000000000000000000000..105b08b31b1843487150818f6b39b082df9d7158
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_elm_foliage_autumn.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_elm_foliage_bare.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_elm_foliage_bare.png
new file mode 100644
index 0000000000000000000000000000000000000000..eca476578651cdd72af9b54c9fa3c94a9b4a3f7e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_elm_foliage_bare.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_elm_foliage_spring.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_elm_foliage_spring.png
new file mode 100644
index 0000000000000000000000000000000000000000..44ad1d33fbeb9620a94bf145b7d8d42f47500a82
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_elm_foliage_spring.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_elm_foliage_summer.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_elm_foliage_summer.png
new file mode 100644
index 0000000000000000000000000000000000000000..f406d6b7a0b1e55376994bb9cda68921ff88ea78
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_elm_foliage_summer.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_elm_foliage_winter.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_elm_foliage_winter.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a81511e609cf320736060d69aeb27468c73682b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_elm_foliage_winter.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_elm_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_elm_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..3106a4db91decd3a3561e8416b4a01ad071c4b04
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_elm_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_elm_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_elm_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..719426180396c5c6eca9922c8dd88c244ce5165e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_elm_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_foliage_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_foliage_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb51567eab7ec948fbb0f3e6da70abf585b1f360
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_foliage_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_foliage_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_foliage_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..4354dd7797556a80bf18ee8f7c874cb66c69a0d2
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_foliage_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_foliage_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_foliage_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba6d93a73d77d53b7fc18e0af945a8cad044fe92
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_foliage_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_foliage_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_foliage_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..8297931145fcca894dadde34eff35ba26560f761
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_foliage_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_foliage_winter_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_foliage_winter_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..0519df7e09cd1ce435d7259e00a5a9ad1e7b9cd5
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_foliage_winter_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_foliage_winter_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_foliage_winter_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..65d9a7f7f2f9b1f4d499b629bcbde77731fbd27d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_foliage_winter_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e99d15404e860d3c02ecfc70c51afd4484ea513
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e0ed986f51b51867acae6bea230c3382aba99cf
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_narrow_pine_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_autumn_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_autumn_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..7655c809e0689895c521b58b8bb50b0fdcd69ca8
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_autumn_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_autumn_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_autumn_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..edc52d466573d4bed5837509149788b17f795203
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_autumn_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_autumn_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_autumn_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bce3f81c45a4a4b2cb2427ac4b4b469091ff962
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_autumn_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_autumn_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_autumn_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..7124f837b9d0a8c9dda73724e343b4c04decb387
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_autumn_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_bare_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_bare_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..00fc9d5629e963ce983d49bbc97cd41eb6732b0d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_bare_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_bare_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_bare_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..0084876a2f64e2ac496cebd801eeacd5b2150b31
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_bare_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_spring_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_spring_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..612f13fc66456303de726cc279398eb747584ced
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_spring_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_spring_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_spring_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..132516ae697822685d94fd30d02bf77fe386e8ae
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_spring_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_summer_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_summer_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bf52ecc1f0a030877d8e4c4ed31fee66c1f7f7f
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_summer_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_summer_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_summer_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..fff69fd9197f38d33bca420ec46aaa28237a4274
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_summer_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_summer_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_summer_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..d223f32225c1aac697f2169d19a47744c164a2e5
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_summer_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_summer_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_summer_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1b94f286672f437e41109fa565d995c03ac4f2e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_summer_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_winter_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_winter_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..a21e2a6c9bac5769f72ab3180ebb51698df296fc
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_winter_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_winter_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_winter_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a737f7feb2cd2c105def861f6d626ec33903aef
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_foliage_winter_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..e910db9fc5b0c4df8f8aa6af93806e5c18b7ca8f
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_trunk_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_trunk_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d6049fd0812880d1f9d817e47e5f44565e0986c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_trunk_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_trunk_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_trunk_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..dba52b5339528015786ab346ebcb44532b225664
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oak_trunk_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_autumn_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_autumn_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..82eb4d5c975b63a6d27ad463dd1c585d96e21689
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_autumn_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_autumn_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_autumn_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..a09ec5d3e8150556feee4babb5ccfeb14cbb592d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_autumn_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_autumn_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_autumn_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0cb7d67b12e502f34e5edcf0e057af27d35c02d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_autumn_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_autumn_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_autumn_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..40ec0587f47f333a28c1b501b49f184873bbf86a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_autumn_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_bare_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_bare_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..09a1dab985f73b3048aa45bbf94d0916819d6956
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_bare_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_bare_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_bare_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..780aa0f43ff47f3386edc6751e8087fa3f244f0d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_bare_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_bare_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_bare_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..828e647841924d768594c9cf4127725c17503972
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_bare_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_bare_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_bare_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba82723b1c3f9d42b5d75949041cd701c0b0509c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_bare_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_spring_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_spring_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d71a5311fbf216aa34082f5c4c415e8dbe6ed77
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_spring_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_spring_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_spring_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa8c022a14c59236ff9a3a5832474c082a1827ff
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_spring_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_spring_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_spring_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f512dcaabf29a5ecd0270ae43ecdf9eae06f6ba
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_spring_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_spring_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_spring_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b92cc1bdf9b4bcef6a75ac2ca971ebd8c2da353
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_spring_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..55392b423b37bc8817dae15b100bd03b34724ee9
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..37591fb5a7708e6aa5a91c2b7e2097dba6f57a72
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..f480e8c42ead794589838f9c372f6b35fa78f8b5
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..12714cc10e086136c1782a0bc121c2a0ba5aceae
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_summer_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_winter_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_winter_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfd104c382189c77afe47072f5881254cb1c7a3e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_winter_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_winter_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_winter_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..159545d16428e9bf4a344d08a641ad314751b04b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_winter_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_winter_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_winter_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..460f614c4cef11c9e2761e624e79087ee921f0ec
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_winter_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_winter_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_winter_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ba91656ffce68da1df3b0d4114756f234b705a9
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_foliage_winter_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..2417686775a696d1cd411b57257de4da572cc8ab
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_trunk_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_trunk_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..649392c9eeab64809726bc5bdea74b56f9543c2e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_trunk_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_trunk_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_trunk_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bcc1726171fe9ca4981f5f9ec32c8ea8dda72ce
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_trunk_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_trunk_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_trunk_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f145e92ddc9d87ede9e627591b0f4b3980cf2ab
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_01_trunk_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_autumn_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_autumn_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ed04e02ef6edaa9b4385155a03e3f3da870418a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_autumn_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_autumn_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_autumn_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bf9ddcf7b899b7d173bb8bec97363528aacae4b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_autumn_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_autumn_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_autumn_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..6241fa30f1c344a183c836af87e1b77ded0bdba1
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_autumn_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_autumn_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_autumn_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..84047a5a5ac93a072b5d77a4003fa35b63b10bf0
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_autumn_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_bare_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_bare_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..49a10b3b129abecb9dfb7d2465b42ad879d7c887
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_bare_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_bare_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_bare_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..80eb26be5d038d4c26a1928f44c4d50d047c57b0
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_bare_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_bare_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_bare_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ecd36a4891148a82e085dce76366d59b14db1e2
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_bare_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_bare_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_bare_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e95d4755cfbf7ac585852261d9609df09d33c5f
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_bare_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_spring_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_spring_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec42b7ebc7856c542ba87c016f5f216469471ea4
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_spring_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_spring_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_spring_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..24d9ae5f95ff693ebb90ff3673c0762875c7a35b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_spring_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_spring_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_spring_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..eefbb4841d3623d8bd8168154091edba8543205a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_spring_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_spring_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_spring_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..113c3fda573a36ec5bfd975d2ef093360cdf697d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_spring_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..c80f829d2e53e39f852078cde9f5c9bd6ce5c45c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..80ad399ae07708375f61815cc8784cb965e033c3
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..56c58a118bc700c38a42cb8c451e3c79cf45c15c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..80e6073248d1f5c6e120ac51f75a930f1b9160e1
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_summer_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_winter_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_winter_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..d206a8f8913c10b6dda3344c4550294dce281733
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_winter_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_winter_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_winter_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a09e248a06cf3aa86d36c2b80a30c87c3ff1440
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_winter_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_winter_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_winter_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..099d10a90409ff26a86081037e8801b397d8cf95
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_winter_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_winter_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_winter_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ef192f242885a3b78eabb4e5a01b4d0d68830da
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_foliage_winter_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..22ff337d1bf86310225988a0683ade736ce0f6c9
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_trunk_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_trunk_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..09e8491558f7b312dbbd723da456bbd9c8a202b5
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_trunk_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_trunk_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_trunk_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..c26c4023c5591a43f5d57cd1c64a4400add7d047
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_trunk_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_trunk_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_trunk_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac9edd424115490e1bfab8c52ebd5202c5e39bbd
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_02_trunk_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_autumn_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_autumn_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..e45db5b3be05f4238394e5162620f70271e012ec
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_autumn_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_autumn_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_autumn_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f07cd5d8e4cb8bfd966bd61633b49c0da1b91fd
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_autumn_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_autumn_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_autumn_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..14a21f322e10c84655048bebc298eb26f30e3fae
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_autumn_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_autumn_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_autumn_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5fd15ff860bab981f5eb95ab77924cef9a3a44e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_autumn_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_bare_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_bare_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..466aa67154c4e657771e945a26d0da63cc6b7191
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_bare_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_bare_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_bare_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3fe244e3bbd9ddd868b5a7adc30fa0424f97c4d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_bare_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_bare_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_bare_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..a548d988ce083a4c1cb74bf26f8871e1200521cb
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_bare_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_bare_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_bare_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..55e6f8be17b6641924bee0c4c54a98a2dc9f820d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_bare_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_spring_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_spring_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..feb918b0bfebfd715d463e7ee45aa05ab66f3f37
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_spring_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_spring_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_spring_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d4bb77343e8a557edb1cc891d1ae30b482dafe7
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_spring_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_spring_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_spring_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..b74246a4883e04b77105d48f80ad90821d5e9619
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_spring_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_spring_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_spring_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..1cc00b153e1f9890fc6a404bec2644811aa69e70
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_spring_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff5d99bb6676486fa41c022f81900ee4cb54c956
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..89a02791895612ee5fc0ac472453c9d5a80c5dd1
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1b3a0881a411918754a4eb60c44b48ee893f4fe
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..6647a4d5b18587d8e23df8a8ddba816861ff4398
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_summer_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_winter_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_winter_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e6ad349c5d09da1ced7017d0e946c259e1c78bc
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_winter_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_winter_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_winter_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bd66e0421d7ebb2c1eb92a180f2dece12998d71
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_winter_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_winter_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_winter_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..f24f64c852b21689377ffda8e6a4c574cc877819
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_winter_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_winter_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_winter_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce20bc4a4378f5599959b02f553a4f68ce764731
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_foliage_winter_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..53760c73b4e04e7396f4f87888f9ee259223078d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_trunk_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_trunk_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..983f5f92b0218114a25dcbc462752e7f04407d76
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_trunk_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_trunk_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_trunk_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..e08c91c044e3d12b2b8ed93969e0d9e9f46e6968
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_trunk_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_trunk_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_trunk_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b9554fc4dba0cf00600ccb804551db1a4f03516
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_oldforest_tree_03_trunk_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_foliage_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_foliage_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecb85e403ea59818bb251167062e3087377ddf31
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_foliage_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_foliage_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_foliage_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a282a1c9d6a98b656948be784470a2bdad4535d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_foliage_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_foliage_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_foliage_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1ff299a612c5053dcdd995126b324206e2a2db4
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_foliage_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_foliage_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_foliage_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..46f846d4b525e038b71fe022ccc4dd147d2f5f29
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_foliage_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_foliage_winter_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_foliage_winter_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..070517ee673d9f44a3001dfc3779765cc66043ca
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_foliage_winter_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_foliage_winter_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_foliage_winter_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..5587f05c8cf138132111b51ea0758f693a203a3e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_foliage_winter_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..6171d6385f66dac8a4f1acaced9cae35c45ff316
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e0ed986f51b51867acae6bea230c3382aba99cf
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_wider_pine_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_foliage_autumn.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_foliage_autumn.png
new file mode 100644
index 0000000000000000000000000000000000000000..62b1004ee352676f1985754d297436b4d8469959
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_foliage_autumn.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_foliage_bare.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_foliage_bare.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fa562e45e1c4259e544e55c98d080324ac5680d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_foliage_bare.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_foliage_spring.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_foliage_spring.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2844330d334d4dbe709835efee5b24adc355dd3
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_foliage_spring.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_foliage_summer.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_foliage_summer.png
new file mode 100644
index 0000000000000000000000000000000000000000..2dc9d41fdbdf40b921fa8af1dc6e85eafccd28b0
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_foliage_summer.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_foliage_winter.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_foliage_winter.png
new file mode 100644
index 0000000000000000000000000000000000000000..5228984e4a39086f8ce7c54b34b417144d0a604b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_foliage_winter.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_foliage_autumn.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_foliage_autumn.png
new file mode 100644
index 0000000000000000000000000000000000000000..726c1df2fae93042bdb6e856e6f3227c894dd259
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_foliage_autumn.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_foliage_bare.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_foliage_bare.png
new file mode 100644
index 0000000000000000000000000000000000000000..62439ca16f18b886332c217648aafa50c872cb5d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_foliage_bare.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_foliage_spring.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_foliage_spring.png
new file mode 100644
index 0000000000000000000000000000000000000000..e053a654b2b3016abff880bfa9f985ae0bdb9e79
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_foliage_spring.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_foliage_summer.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_foliage_summer.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6eda91cd4412840af102be4905e8c006ba2ba35
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_foliage_summer.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_foliage_winter.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_foliage_winter.png
new file mode 100644
index 0000000000000000000000000000000000000000..9feb59ad5c088827cb41fa0ed829f8beebc4c992
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_foliage_winter.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_roots_mist.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_roots_mist.png
new file mode 100644
index 0000000000000000000000000000000000000000..46b64fe0b43edd6af0d0e2a3f7ae3fbefc8c32db
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_roots_mist.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..fde7b82ead8e3fd570b66d6077fa3d8a32c5a3cd
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_waterripples.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_waterripples.png
new file mode 100644
index 0000000000000000000000000000000000000000..5af14b2af9421cb2a4dacf204bd4e80feeb7a415
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_moss_waterripples.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_roots_mist.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_roots_mist.png
new file mode 100644
index 0000000000000000000000000000000000000000..46b64fe0b43edd6af0d0e2a3f7ae3fbefc8c32db
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_roots_mist.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..36ab8e88e0b69415492471453bcce6d5eee061a2
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..0a02920fa8ca8a633c9a591b04215479955e3f59
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_waterripples.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_waterripples.png
new file mode 100644
index 0000000000000000000000000000000000000000..5af14b2af9421cb2a4dacf204bd4e80feeb7a415
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/small_willow_waterripples.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_foliage_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_foliage_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..2804abcffd70c7a0f2216d034dcbe14d664d4bfe
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_foliage_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_foliage_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_foliage_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c2955bce8972896c9357edaeed9278582d81bed
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_foliage_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_foliage_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_foliage_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..91885a5bf63cfac513d7a13e145c092bd2388f26
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_foliage_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_foliage_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_foliage_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a75898222ed8d6ffb64fb323d0cffdc5a595438
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_foliage_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_foliage_winter_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_foliage_winter_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..43d44c64355850d38a5a29092821f38745e39736
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_foliage_winter_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_foliage_winter_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_foliage_winter_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fc49d0018719a9fddb87157eb007b218e287fee
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_foliage_winter_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb0438daa9de5663ac31181372cb25ca0b63f662
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..2788ebd966015aebdb7121eb177dcc765ff05a47
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/tiny_cypress_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_foliage_autumn.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_foliage_autumn.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca18dcc0d2b827e69730c9275b245be88c2f9d00
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_foliage_autumn.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_foliage_bare.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_foliage_bare.png
new file mode 100644
index 0000000000000000000000000000000000000000..bda223d7e8987c535912512d9bc03d51c455632e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_foliage_bare.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_foliage_moss_autumn.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_foliage_moss_autumn.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ade983f92dd3c69f8e47d7bdecdf116ae91da98
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_foliage_moss_autumn.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_foliage_spring.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_foliage_spring.png
new file mode 100644
index 0000000000000000000000000000000000000000..32d0a10237272c8f7b255f6a5ed42665a7228f42
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_foliage_spring.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_foliage_summer.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_foliage_summer.png
new file mode 100644
index 0000000000000000000000000000000000000000..3af3a62eb61835e5abd4e84295446453738724bd
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_foliage_summer.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_foliage_winter.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_foliage_winter.png
new file mode 100644
index 0000000000000000000000000000000000000000..db5c57f2c1e0d67f23de2549f8fdab5cc9b3e497
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_foliage_winter.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_moss_foliage_bare.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_moss_foliage_bare.png
new file mode 100644
index 0000000000000000000000000000000000000000..4df87a7c456870f91d69f3b1ca10356829732b97
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_moss_foliage_bare.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_moss_foliage_spring.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_moss_foliage_spring.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf6e576d2ada6b9285399f64e10e556093952efb
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_moss_foliage_spring.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_moss_foliage_summer.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_moss_foliage_summer.png
new file mode 100644
index 0000000000000000000000000000000000000000..a10e0e8314a43d9314211b0943ab40ea361990a4
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_moss_foliage_summer.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_moss_foliage_winter.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_moss_foliage_winter.png
new file mode 100644
index 0000000000000000000000000000000000000000..91a15b8c763d20947b3bdfbb20eeccbd1c1b6648
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_moss_foliage_winter.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_moss_roots_mist.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_moss_roots_mist.png
new file mode 100644
index 0000000000000000000000000000000000000000..ceaa471b3c8e771d9675ecb9c9d81f1befac51a7
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_moss_roots_mist.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_moss_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_moss_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3246a23ce2721bc02d66c51ae339bb91225ce69
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_moss_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_moss_waterripples.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_moss_waterripples.png
new file mode 100644
index 0000000000000000000000000000000000000000..d91e62520e9028e40f652dc22cdfa3e070bd59b9
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_moss_waterripples.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_roots_mist.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_roots_mist.png
new file mode 100644
index 0000000000000000000000000000000000000000..ceaa471b3c8e771d9675ecb9c9d81f1befac51a7
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_roots_mist.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_shadow.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_shadow.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c4976cf49fd18e8cf718c92846ea8719c2e0459
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_shadow.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_trunk.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_trunk.png
new file mode 100644
index 0000000000000000000000000000000000000000..47479425df79815e8b3c89b075d2392dbe55fea2
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_trunk.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_waterripples.png b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_waterripples.png
new file mode 100644
index 0000000000000000000000000000000000000000..d91e62520e9028e40f652dc22cdfa3e070bd59b9
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/trees/willow_waterripples.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_19d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_19d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..85787b150cafe2c440fe6bfcc690cc3b20f0a84d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_19d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_2.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..032e88b294a2de043317a42c171cdd384537bfa3
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_2.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_37d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_37d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..9111fa1b4d0110c3b773e0704840ec00534cb35b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_37d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_4.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..28da662d2bbc9fafbdcbe710a077253a3fca31bb
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_4.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_5_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_5_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..4700c4e3d642796fa8d06105a3610385ed5f0d9a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_5_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_5_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_5_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..84cfae60111066f9d13e4e03202f0730c3581a22
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_5_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_5_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_5_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..320aaffbfe77f3ce8bc9163ba7bb57a5a4e40b29
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_5_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_5_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_5_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..d89672a50fee6859dee91a071d6c220f2ae75f71
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_5_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_5_05.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_5_05.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e9e35d99683693838aca4957e5a83582517c13d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_5_05.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_6.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_6.png
new file mode 100644
index 0000000000000000000000000000000000000000..59eaa83ffe17189ee2e63eb14a2a4498e1722631
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_6.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_73d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_73d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..b82364e3320bc20bc76a4df5ababcb563a06fa60
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_73d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_91d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_91d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..7671a96a6e7e50479bc87e0b4492560d28653dc9
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_burnttrees_91d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_19d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_19d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..345090a7db3b93f151006a11e76a6d9aba850048
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_19d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_2_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_2_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..c007e8a8929977c89252cffae9086994c297836b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_2_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_2_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_2_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9ec27279860da5ce812957275337f93856fba1a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_2_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_2_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_2_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..47c6b215caab05df6459d19fedd8b57f16464a4b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_2_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_37d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_37d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..7708caf446a75f8df405ed06adfd5252ef88512e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_37d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_4_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_4_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..50411da53d0353adad676f32faabac507fbb5d26
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_4_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_4_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_4_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..29b202289a345818d9c1a8e793d6e78dedc1347f
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_4_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_5_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_5_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7f9642ce2f0b9ec7582edc8dacefd22e361468d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_5_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_6_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_6_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f5e5f23f7bb29f968b9883764e69625e9d3a32c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_6_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_6_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_6_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7b1b496ba43b2c37ef92424a6dfc4dd1f1c8c5d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_6_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_7.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_7.png
new file mode 100644
index 0000000000000000000000000000000000000000..931f4410a27c29273a72a93409c1c8dde1fc816c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_7.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_73d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_73d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..a63b8106cd735bc7f3afc63c650b3f7e3c9a7e24
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_73d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_8_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_8_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..f69de1b420db1632b3b253f7c597d91038f106f9
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_8_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_8_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_8_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e88d2a879c2416a8e508856b3385be9be6bc4be
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_8_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_8_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_8_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..a82bd2a5f95898aede45af810c5723c076177c6d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_8_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_9.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_9.png
new file mode 100644
index 0000000000000000000000000000000000000000..7076964b5a54d622ab0001819da6ea7b651a321d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_9.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_91d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_91d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..9529894798ce4b10f77f2169e6c932647f6b75c3
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_green_elvenwood_91d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_19d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_19d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..208d43ec9be1d844d5db2b4722a174b7de4d93e2
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_19d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_2_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_2_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..f43e7e3253cb523cfa38c9ca6690c6bf628d499d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_2_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_2_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_2_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2c57a2dac6dbc5ea92f057cc37974a862d039af
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_2_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_2_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_2_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..385465f5dd32ea94526d3b29ecc81490827533aa
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_2_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_37d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_37d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..7340e70ec37479a211a7e243c6f169d369e06906
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_37d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_4_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_4_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..82767fd11d47ee27427aed97926c1020dcc220e1
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_4_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_4_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_4_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9c7b0c92efd97f6fb70052190608596b9432850
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_4_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_5_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_5_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae3192fc1be2ebd20d80f9e6aa95646797d5b476
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_5_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_5_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_5_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bed9075452972accec60648cfa30328c83d780f
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_5_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_5_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_5_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..d87e6d29fda47ba04a553d9113f8768e37d79546
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_5_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_6_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_6_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..021b8f26353c7a3fd6afd1eaf8fda051207bc2eb
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_6_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_6_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_6_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7522ec34b86a138ecde67f112fc602e003ab9ec
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_6_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_7.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_7.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6a39fb11eab6fbb55a09c4b41222b69715e2851
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_7.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_73d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_73d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a0f0d4e8cee38ce7b5befaf29fc50e40b1d1c0a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_73d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_8_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_8_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..659e7c7955bec1d69ccadfca7d56ca6b779b4b2b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_8_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_8_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_8_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..1877213226978f8dcedec6697724a5cec380b46d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_8_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_8_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_8_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d3b582a67775beb51880a00137dfa5f43ec6ab8
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_8_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_9.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_9.png
new file mode 100644
index 0000000000000000000000000000000000000000..b47b875809b01f163f7cd738720f0df038fd68a8
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_9.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_91d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_91d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2f3c742fb6a87df7f2421946f9e4b645f44b980
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_91d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_single_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_single_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..aaae5286df33b9d1b8043609075dbc43fb8fcb86
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_single_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_single_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_single_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c18a8eb8875b4e2881b0ef70413ae6ab3db0aaf
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_single_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_single_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_single_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b40567a7d9efd8d4da0248c8058abd596afb4c6
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_single_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_single_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_single_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0f191e349485cafe4f3be61c3aec842964e79cf
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_single_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_single_05.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_single_05.png
new file mode 100644
index 0000000000000000000000000000000000000000..4612724b279b74297e7bb964dd71604c419ade92
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_jungle_single_05.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_19d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_19d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..1610a329b98a59f42b75380137a37225f01c428e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_19d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_2_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_2_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..01a6d67cb94333db851cdb6ef20fdc67af397254
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_2_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_2_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_2_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d7b3e11b41bdf54eddeabbd4ba6b3f9a8baef8b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_2_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_2_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_2_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad6bf14125f8ebc9601de92922c37004f1588060
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_2_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_2_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_2_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..032feebca635b92cdeb453f4b101849aee8c7141
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_2_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_2_05.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_2_05.png
new file mode 100644
index 0000000000000000000000000000000000000000..d26449bc9884f8758d0e7d2814b007b64453b2c3
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_2_05.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_2_06.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_2_06.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d100f058af3d9ad46153378b73b2e9fbc6abe63
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_2_06.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_37d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_37d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ca0641d5c28814f5aab01c995efec3a780d063c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_37d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_4.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf659a989db80992f7f2cfd420e54f0d2a14ff6d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_4.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd77aa646c9ff6e0e07521924afce9d36e38e6ea
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ce006a7abe33fd99cae0675e9df35c0bb71f44e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..c84570b2c2b665240a07d0dda08f04a93d0d82d6
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3e83d618693b1b2e4f3d4a1ed172715d1718d93
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_05.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_05.png
new file mode 100644
index 0000000000000000000000000000000000000000..928e41e94f77d3054fc22753ffe740379ae8a47f
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_05.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_06.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_06.png
new file mode 100644
index 0000000000000000000000000000000000000000..25031e71d6d623a30bed7b187c9a5ada0552d23a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_06.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_07.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_07.png
new file mode 100644
index 0000000000000000000000000000000000000000..fae47cc7dd1e02cdc62479e80083ea2f25b3506d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_07.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_08.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_08.png
new file mode 100644
index 0000000000000000000000000000000000000000..17ae248dda3369528ccffb501bc7bc98dc2a7083
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_08.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_09.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_09.png
new file mode 100644
index 0000000000000000000000000000000000000000..cedc5797953a3867c70d05af178580d1d0aa48fe
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_09.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_10.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_10.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b248ef160a611cc0cfdddcc4f629d4ecaec3166
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_10.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_11.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_11.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0fd62b2116f738861a5249bf2a2c8aec119ae2d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_11.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_12.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_12.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d16d26e03d6d99ddcc254252ab4aeafa354e747
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_5_12.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_6.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_6.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a01f72ff6a1d3fda16c1ae783c6fd9713c3eff2
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_6.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_7.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_7.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb32498dbb8b0851f170469740b7a14ee9cd08f9
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_7.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_73d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_73d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..91ed8c20a11dc226d0acff6843a71445982210da
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_73d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_8_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_8_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..f243718435c7dc8d2570252cd5e6bc4ad0735d57
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_8_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_8_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_8_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fb3440707d77ee7e6cf5964444c96b0be25f324
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_8_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_8_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_8_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e1d31cdfcc9b50429143eb13601b9fb3ab57e95
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_8_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_8_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_8_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..efe7aa4a5a7113fa56e50db4abe6b23e68f685a2
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_8_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_8_05.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_8_05.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae26c891ba59b3d7c5af191673a43c96c544619e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_8_05.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_8_06.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_8_06.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c3283d4e024e35bb4cbb08d3f8f9ffdb3b7c3ca
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_8_06.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_9.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_9.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3737a050ea927732e70f0fbf6f7df4f2fdfcc6d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_9.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_91d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_91d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..083d8cd26dc979e2cc45b4c5f38fbfd1da7668bd
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_norm_trees_91d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_19d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_19d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..91f4f2a2af671404e92013fb699bfdb30b49da3b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_19d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_2_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_2_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..147e21d8ad516b4a968dc752b8dcc21717ecd822
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_2_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_2_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_2_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa9d57ea58bafbaa34d2b036a28eb2f65d33b647
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_2_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_2_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_2_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..e65a940baaecd32cf63f93eb06f76a11e7c94eb0
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_2_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_37d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_37d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..b36fb6a33ddb5e666262d0cbc717123c6bad4ffe
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_37d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_4_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_4_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..38ca9a59503f156a1af3f255e972415b4c9dc36c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_4_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_4_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_4_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..112944d86a1838ae0c77ae8de3f51823f790d09b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_4_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_5_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_5_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..c326c5f3da8a283d2397002de702282518713e87
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_5_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_5_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_5_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5a2dfd235197f79ce8ded70b4329491518816d5
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_5_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_5_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_5_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..41c4e31047b420cbab28f37a5340347bc944cba5
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_5_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_5_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_5_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e18d4a2d894edc178b08e76674bd5b0ecf752c5
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_5_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_5_05.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_5_05.png
new file mode 100644
index 0000000000000000000000000000000000000000..dccbc448730d37ca3b0758be01d28c58249e6e68
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_5_05.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_6_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_6_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb2d7a1ed9d67bf925dc318348fca2eaca93f04b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_6_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_6_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_6_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7d189d9b20f1b26aacb7d43c25da374678bf3b4
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_6_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_7.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_7.png
new file mode 100644
index 0000000000000000000000000000000000000000..81f87e87a4ee9de3be90e27d3c0388e139119d67
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_7.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_73d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_73d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..665defb559006bc5ef48126ca815f3dee3a720f0
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_73d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_8_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_8_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..539d6bce6ecfea810d0cb470a85db2f6e7ed080b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_8_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_8_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_8_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d854a597afb0a0361f23c7d221798a053c771b2
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_8_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_8_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_8_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f6ffe42f867299852a61649a3f1a4b442df0f9f
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_8_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_9.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_9.png
new file mode 100644
index 0000000000000000000000000000000000000000..b97cdeba5ac363478439ca5a3cd75cbd2801271a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_9.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_91d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_91d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..f14ee24403b2fe1dc42940fa29700f9a1c1f9531
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_oldforest_91d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_19d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_19d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..b65f03b1282f48f28b55f4004f70914a991800f8
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_19d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_2_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_2_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..d7c05fc456bb97a3290e22dabcf0ef5a23d33817
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_2_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_2_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_2_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ccb34acff8ea9a77dbb53d4d7f160a037cc5c66
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_2_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_2_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_2_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9e80afdcf7036b00d389e77a46d356a0cb66fd9
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_2_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_37d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_37d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..de16a0ad7c88a716276b6e7ca6566fc41d74e524
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_37d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_4_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_4_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..db7db6acd7982c1a1b19d03af06d87207382243c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_4_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_4_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_4_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..02b2e911b95a17b8d09a8e235178ee37a8762ade
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_4_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_5_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_5_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..60c4c16153f593d290935c1f52a4fb81a5da705d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_5_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_5_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_5_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..e76b0bdd165ce6dc12a6ecdf514c6ad26afa51f2
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_5_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_5_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_5_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b1b1296da82d43ff3b6c3473aebcad9bed357e0
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_5_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_5_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_5_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae624bba7e66ac9447662422703c293ad971ac96
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_5_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_5_05.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_5_05.png
new file mode 100644
index 0000000000000000000000000000000000000000..e32bf3685295aa70c340e0e8a07c2372015cd4b0
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_5_05.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_6_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_6_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f055c891b7ef40b49f6c421f31d570f72dfd77a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_6_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_6_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_6_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..83cef74177ff65d2db13532fd459b1b786e1a625
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_6_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_73d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_73d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..815751fbe03bdc17bc4b9938711dea6dd353aa60
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_73d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_8_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_8_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b043fc183c55e085575014d6fe75e8600e58b37
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_8_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_8_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_8_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1c080ce8fd7b1e54185e462c1d80fd504d5a19a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_8_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_8_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_8_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..13245730a27de23c46f02531d40baa8a11eca2db
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_8_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_91d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_91d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..9af4b7fc1a5249e6e250405ae3c162fd1e9db2fd
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_palms_91d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_19d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_19d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..96b3f359afb4729c376c4c0f5ca7ee4ec7862efa
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_19d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_2_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_2_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..731f542aacdc15e9775411e934d82dded90f547c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_2_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_2_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_2_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..fba5c77dcff4d1f230156989787b40faf33f9ead
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_2_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_2_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_2_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb44ecac54f494af2f5811190a579a62e543c639
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_2_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_37d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_37d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c3fc353e97d9db75229cc4984b68dbb3a3b971f
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_37d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_4.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bedefb1ae444bd8a2e0b7d51732e1df956d85e4
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_4.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_5_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_5_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..03adcf315fc1c9400c1a379e7b1e6ce4051e7bea
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_5_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_5_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_5_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..49756b0ce75f068038a8fa512c3aa8bf034e0d96
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_5_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_5_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_5_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..41f1a2e24733bf5b6752d3441713b3e50094890a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_5_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_5_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_5_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..f25ade77b4237f494e7f2a531680b407acc0a9f1
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_5_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_5_05.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_5_05.png
new file mode 100644
index 0000000000000000000000000000000000000000..8821fe15dad110265d6ceb13e26c9cf685197f4a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_5_05.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_5_06.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_5_06.png
new file mode 100644
index 0000000000000000000000000000000000000000..f57d4d3b7bdc547be7fc068a5febebeaceb94707
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_5_06.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_6.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_6.png
new file mode 100644
index 0000000000000000000000000000000000000000..7dbd68226454142652cfe72b03dea775443ae851
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_6.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_7.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_7.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e86ab22cad9320a7a69b3a6b47cd2e982778946
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_7.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_73d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_73d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc381629c9a5828e4f6fe4b2aeeb4bfd85c5efa8
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_73d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_8_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_8_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..555a42961d65f3e0b0bc09b74570b3a9514cc395
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_8_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_8_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_8_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd84c0b5221e3615cae81afa9aee69caf4ba5fae
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_8_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_8_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_8_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a123613d31ed1ad062f4cd4eac2862f83acf63d
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_8_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_9.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_9.png
new file mode 100644
index 0000000000000000000000000000000000000000..b941706ea243f30982736e4836d5a728639eaa91
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_9.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_91d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_91d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..759904473dea112250501536b5cb8250a5281771
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_pines_91d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_19d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_19d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fd140f652d94775130cb58efbbdccf16376845a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_19d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_37d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_37d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3731717631c711f75c01461ef851e0f41e33019
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_37d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_4_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_4_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c91fe65fd9db2cd623e334d3ef1e9f5cfa0dc81
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_4_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_4_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_4_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c0f043748bc2e02a2445c32cccfa9998d8a3e58
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_4_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_5_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_5_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..49e0d5226ddb71352a61bcb8e3d2d9a01b5f46c5
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_5_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_5_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_5_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee4095a5eeda72d0c4ace80e5d76c9954e7b7f05
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_5_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_5_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_5_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..93764d3cc2ab3f3dbbc661619ad32bc7798f22df
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_5_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_5_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_5_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..e08f177d009d6844c03e71b085795f85148b338f
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_5_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_5_05.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_5_05.png
new file mode 100644
index 0000000000000000000000000000000000000000..478fecf3c0eca8afc78010a8006f522f822e251f
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_5_05.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_5_06.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_5_06.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0254a5e63e1459b10ac53e5a9035c6b9aeb95a3
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_5_06.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_5_07.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_5_07.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4981db043a7cbd019e6ccbece2def76d9b1ee2a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_5_07.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_6_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_6_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..84449e1262239fc5a550a12d51edf8cd8dd12e3b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_6_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_6_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_6_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..5dc52898882c11a15f1b16a89743fc961e4572dc
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_6_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_7.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_7.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e7883979118c61646d1261173a0953f5651ff5a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_7.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_73d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_73d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e6767149277d6cdaf24afd625fbd40679ec4db4
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_73d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_9.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_9.png
new file mode 100644
index 0000000000000000000000000000000000000000..978c4f9d23f1b4af64e0573ad1e3b9c83994325a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_9.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_91d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_91d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..235c480a1aaea609d3caf361dc82d38f21f4c31f
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_elvenwood_91d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_19d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_19d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..573b05e60dc55dc2ece238ae6bf0f68752cb031c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_19d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_2_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_2_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..541b293369962993e1d14d8c99a6281e48b89d08
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_2_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_2_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_2_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..542f5549b9d057caac047c4815415dbba73d4a79
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_2_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_2_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_2_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c01b4041839e13f884c94dcbccd105a15e536af
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_2_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_37d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_37d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8b8c38e0e0e57df6c3e622000dfce16813548f3
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_37d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_4_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_4_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b0fd823ab53cf1648fba9a539a6c4cd3d24d299
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_4_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_4_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_4_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..08efa172f0bccc0dfe0e2b21b14b948019ffe3e9
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_4_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_5_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_5_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7086f8ecd8f80270f2e0408a025645ee2f680ab
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_5_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_5_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_5_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..5366f3d41e705303f8eb11f1d22204f491d79ee3
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_5_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_5_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_5_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5562770e68fcf1cc3a877524db6728ea92a4f88
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_5_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_5_04.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_5_04.png
new file mode 100644
index 0000000000000000000000000000000000000000..943d3bba6cd65d4e5a63135dad888a381cd2e7e0
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_5_04.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_5_05.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_5_05.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ec8d1487627eefae4e436a34940cbca5a4964b0
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_5_05.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_5_06.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_5_06.png
new file mode 100644
index 0000000000000000000000000000000000000000..065a19d1ea7e5de76cf40dee9b92c08d0d1d85c7
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_5_06.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_6_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_6_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..d46d06e05f9c597c31d0d85af7e8f4fc981b503b
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_6_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_6_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_6_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d1f0233908031ae15147374ae925c3af0179b78
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_6_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_7.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_7.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d7967bc583e3904faf44f1083a00bf59a4a845e
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_7.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_73d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_73d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc5199e87e05489105c9f7f86bf73d9205be7a5a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_73d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_8_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_8_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bc78b80794f93a0418bb497326d6ba89613467a
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_8_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_8_02.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_8_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e48694c252332a063098400f49c75b5ebcc067c
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_8_02.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_8_03.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_8_03.png
new file mode 100644
index 0000000000000000000000000000000000000000..eefdeee52f2307410d423dc6b9188a465fdac299
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_8_03.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_9.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_9.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee782241ea66995f4dafc9738b42fda64c7337d5
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_9.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_91d_01.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_91d_01.png
new file mode 100644
index 0000000000000000000000000000000000000000..5aa4570e363f8d666d04ea8cf22cb6734791f9d0
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/WM_snow_pine_91d_01.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/elventree_snow_1.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/elventree_snow_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..e140b8e24eb40cafc0bfd49ab7b0b60a86d457d1
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/elventree_snow_1.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/elventree_snow_2.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/elventree_snow_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..28efd3c8d12669a300eb7e8f52fc6043679f61a8
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/elventree_snow_2.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/elventree_snow_3.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/elventree_snow_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..b34171b028e2c9824724b410e4dc92be644fae52
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/elventree_snow_3.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/elventree_snow_4.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/elventree_snow_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..6194a4b3d6d1b2d3e762aa862eb9fecd0105a344
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/elventree_snow_4.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/elventree_snow_5.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/elventree_snow_5.png
new file mode 100644
index 0000000000000000000000000000000000000000..46f0b368be41e589a2aec5ad37632d7058ccc6c3
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/elventree_snow_5.png differ
diff --git a/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/elventree_snow_6.png b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/elventree_snow_6.png
new file mode 100644
index 0000000000000000000000000000000000000000..fff51dc9d0e533396ac83f6da240143f69fa9571
Binary files /dev/null and b/game/modules/tome/data/gfx/shockbolt/terrain/worldmap/elventree_snow_6.png differ
diff --git a/game/modules/tome/data/gfx/talents/absorption_strike.png b/game/modules/tome/data/gfx/talents/absorption_strike.png
new file mode 100644
index 0000000000000000000000000000000000000000..28fffa9c1c3d31a565fc66492bf6f5a7d8032da3
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/absorption_strike.png differ
diff --git a/game/modules/tome/data/gfx/talents/execution.png b/game/modules/tome/data/gfx/talents/execution.png
new file mode 100644
index 0000000000000000000000000000000000000000..50ce10b90f75b8beed1e125251d53bbfa4fdc5a8
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/execution.png differ
diff --git a/game/modules/tome/data/gfx/talents/fearless_cleave.png b/game/modules/tome/data/gfx/talents/fearless_cleave.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bf888e2086afd871d4b0650a39db20bf2bd25ee
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/fearless_cleave.png differ
diff --git a/game/modules/tome/data/gfx/talents/flash_of_the_blade.png b/game/modules/tome/data/gfx/talents/flash_of_the_blade.png
new file mode 100644
index 0000000000000000000000000000000000000000..3dd1a6990a9cd3426a59ea62f198579a3e29afd4
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/flash_of_the_blade.png differ
diff --git a/game/modules/tome/data/gfx/talents/hurricane_throw.png b/game/modules/tome/data/gfx/talents/hurricane_throw.png
new file mode 100644
index 0000000000000000000000000000000000000000..a61f6a5de149cc3180dda2e3605deb77eb5b070e
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/hurricane_throw.png differ
diff --git a/game/modules/tome/data/gfx/talents/illumination.png b/game/modules/tome/data/gfx/talents/illumination.png
new file mode 100644
index 0000000000000000000000000000000000000000..655ea852a57f2d7e98c4751361c785cfc04589ce
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/illumination.png differ
diff --git a/game/modules/tome/data/gfx/talents/light_burst.png b/game/modules/tome/data/gfx/talents/light_burst.png
new file mode 100644
index 0000000000000000000000000000000000000000..83f53cfbd4d8e8567e6806ab9e4055eaa4ac7dda
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/light_burst.png differ
diff --git a/game/modules/tome/data/gfx/talents/lightburn.png b/game/modules/tome/data/gfx/talents/lightburn.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b30959ab933d98da762c88b074aa0d030d3a95d
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/lightburn.png differ
diff --git a/game/modules/tome/data/gfx/talents/mark_of_light.png b/game/modules/tome/data/gfx/talents/mark_of_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e2ada88e7ebe46d0e912ee079efd8f1dbcd4ef2
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/mark_of_light.png differ
diff --git a/game/modules/tome/data/gfx/talents/radiance.png b/game/modules/tome/data/gfx/talents/radiance.png
new file mode 100644
index 0000000000000000000000000000000000000000..d36dbf1f7683b263a57e6c6b00ab6360e7c14a16
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/radiance.png differ
diff --git a/game/modules/tome/data/gfx/talents/relentless_fury.png b/game/modules/tome/data/gfx/talents/relentless_fury.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3b4e7992ce35e2a909d739f445a9c0eea08a202
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/relentless_fury.png differ
diff --git a/game/modules/tome/data/gfx/talents/righteous_strength.png b/game/modules/tome/data/gfx/talents/righteous_strength.png
new file mode 100644
index 0000000000000000000000000000000000000000..74d4c8de4183eb157721989a99c41827c061b908
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/righteous_strength.png differ
diff --git a/game/modules/tome/data/gfx/talents/searing_sight.png b/game/modules/tome/data/gfx/talents/searing_sight.png
new file mode 100644
index 0000000000000000000000000000000000000000..343cf41f2c41b21cf8dee47e0720d645a286952d
Binary files /dev/null and b/game/modules/tome/data/gfx/talents/searing_sight.png differ
diff --git a/game/modules/tome/data/lore/ardhungol.lua b/game/modules/tome/data/lore/ardhungol.lua
new file mode 100644
index 0000000000000000000000000000000000000000..07deeca779c49ce7858ac81f3226238bed3a9ace
--- /dev/null
+++ b/game/modules/tome/data/lore/ardhungol.lua
@@ -0,0 +1,71 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009 - 2014 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
+
+--------------------------------------------------------------------------
+-- Ardhungol & Spiderkin
+--------------------------------------------------------------------------
+
+newLore{
+	id = "ardhungol-1",
+	category = "ardhungol",
+	name = "Rashim Journal (1)",
+	lore = [[#{bold}#Journal Entry I#{normal}#
+
+It's been some time since High Sun Paladin Aeryn sent me out on an assignment. According to recent intelligence, it would seem that a cavern has mysteriously emerged near our outpost, the Gates of Morning. They have bestowed the name "Ardhungol" on the newly discovered cavern. The elder warriors seem anxious in regards to the origin of this new subterranean area; they're likely concerned that the orcs are using Ardhungol as a staging point for further aggression against the Gates of Morning. I'll have to make sure I'm well equipped for this journey; the fate of us all could hang in the balance.
+
+#{bold}#Journal Entry II#{normal}#
+
+I spoke with the border patrols tonight. There seem to have been several sightings of orcs and other wild beasts roaming throughout the wilderness, yet strangely enough, none seem to have been anywhere near Ardhungol. Perhaps the subterranean cavern was simply a natural phenomenon with unfortunate timing. It's either that, or an unknown force powerful enough to alter the very foundation of the land upon its arrival. I shudder at the latter thought, but for now this is all merely speculation. If all goes well, I'll be ready to depart by dawn.
+]]
+}
+
+newLore{
+	id = "ardhungol-2",
+	category = "ardhungol",
+	name = "Rashim Journal (2)",
+	lore = [[#{bold}#Journal Entry III#{normal}#
+
+It was a half days journey from the Gates of Morning to Ardhungol, but I've finally arrived. I've decided to rest beneath the shade of a great oak tree and enjoy one of the sweet rolls my wife Melnela prepared for me. I'm unsure why, but the closer I've come to Ardhungol, the thicker the atmosphere has become, almost as if there is a foreign energy infecting the very air I breathe. I've been to many places in this vast world, but I've never felt an aura quite like this; I will have to uncover the source of this energy before I can bring a full report back to Aeryn.
+
+#{bold}#Journal Entry IV#{normal}#
+
+A thick green veil of mist permeates the air within this cavern; I'm uncertain if this is a byproduct of whatever creatures now inhabit this place, or if it's coming directly from another source. There also seem to be arcane rifts appearing in different locations throughout the cavern, though I dare not approach them; I will leave them for our anorithils to assess after I have secured the area. I must admit, I'm not looking forward to encountering the origin of a threat this grave, yet it is my sworn duty as a Sun Paladin to face what lies ahead; even should it be my own doom.
+
+#{bold}#Journal Entry V#{normal}#
+
+Impossible; how could spiders have grown to such an immense size? Not only that, but the markings and physical traits are unlike any arachnid I have previously encountered. The first one I encountered nearly took my left arm during its initial assault, if my reflexes had been a split second slower, I fear the worst may have transpired. If the Gates of Morning are assaulted by not only the orcs, but also this new –found species of arachnids, I fear all hope will be lost. For the sake of all Eyal, I must venture further into this spider infested cavern and destroy the source of this incursion.
+]]
+}
+
+newLore{
+	id = "ardhungol-3",
+	category = "ardhungol",
+	name = "Rashim Journal (3)",
+	lore = [[#{bold}#Journal Entry VI#{normal}#
+
+It took some time, but my muscles have started to adapt and react to the unique movements of these arachnid. The way they fight, it's almost as if they possess a higher level of thought, elevating them far beyond the base intelligence of lesser arachnid... is it possible that they could be sentient? Do they act individually, or are they perhaps manipulated by a greater arachnid? Let us pray that this species is not connected through a hive mind, for this threat could become even greater than I had imagined.
+
+#{bold}#Journal Entry VII#{normal}#
+
+I have slain dozens of these arachnids, each one seemingly more difficult than the last. I am unsure if this is a result of my weariness, or if they are also adapting to my movements and battle techniques. I don't see how that could be possible however, a mere spider couldn't possibly adapt to the battle techniques of a veteran Sun Paladin, it's simply not feasible. Furthermore, the origin of these spiders worries me. So far I have not found any other entrances to this cavern, meaning they were transported here via other means. Those arcane rifts I found earlier are starting to worry me, and I fear for us all when I think of what may be waiting for us beyond them. I must put these thoughts out of my mind; distractions will only serve to weaken my resolve.
+
+#{bold}#Journal Entry VIII#{normal}#
+
+Incredible, the size of that arachnid is unimaginable; there is no doubt about it, that spider is the matriarch here. I am heavily wounded, but there is no turning back now; I must finish what I started for the sake of all those awaiting my return. If I don't make it back, whoever is now reading this journal, please make High Sun Paladin Aeryn at the Gates of Morning aware of the grave situation... and tell Melnela that I'm sorry.]]
+}
diff --git a/game/modules/tome/data/lore/lore.lua b/game/modules/tome/data/lore/lore.lua
index ac00fcb9fa08a8ab09bb27099efe0ce61a6e6144..e4b054bc2195aaab84d7f5af5d74047a6ff1256a 100644
--- a/game/modules/tome/data/lore/lore.lua
+++ b/game/modules/tome/data/lore/lore.lua
@@ -48,3 +48,4 @@ load("/data/lore/misc.lua")
 load("/data/lore/high-peak.lua")
 load("/data/lore/arena.lua")
 load("/data/lore/keepsake.lua")
+load("/data/lore/ardhungol.lua")
diff --git a/game/modules/tome/data/maps/towns/shatur.lua b/game/modules/tome/data/maps/towns/shatur.lua
index 591ae8802a67fec4e7a54ed8894dfecf202369dd..dd086ce70a9ac1edb48f3b2adc89756957a5f875 100644
--- a/game/modules/tome/data/maps/towns/shatur.lua
+++ b/game/modules/tome/data/maps/towns/shatur.lua
@@ -18,9 +18,9 @@
 -- darkgod@te4.org
 
 defineTile('<', "GRASS_UP_WILDERNESS")
-defineTile('t', "TREE")
-defineTile('s', {"ROCKY_SNOWY_TREE","ROCKY_SNOWY_TREE2","ROCKY_SNOWY_TREE3","ROCKY_SNOWY_TREE4","ROCKY_SNOWY_TREE5","ROCKY_SNOWY_TREE6","ROCKY_SNOWY_TREE7","ROCKY_SNOWY_TREE8","ROCKY_SNOWY_TREE9","ROCKY_SNOWY_TREE10","ROCKY_SNOWY_TREE11","ROCKY_SNOWY_TREE12","ROCKY_SNOWY_TREE13","ROCKY_SNOWY_TREE14","ROCKY_SNOWY_TREE15","ROCKY_SNOWY_TREE16","ROCKY_SNOWY_TREE17","ROCKY_SNOWY_TREE18","ROCKY_SNOWY_TREE19","ROCKY_SNOWY_TREE20"})
-defineTile('-', "ROCKY_GROUND")
+defineTile('t', "ELVEN_TREE")
+defineTile('s', "SNOW_ELVEN_TREE")
+defineTile('-', "SNOWY_GRASS")
 defineTile('~', "DEEP_WATER")
 defineTile('.', "GRASS")
 defineTile('_', "COBBLESTONE")
diff --git a/game/modules/tome/data/maps/wilderness/eyal.lua b/game/modules/tome/data/maps/wilderness/eyal.lua
index 6068e5c9d8410f3ff0a2e54f05ac6b68cf6dd913..69e655f8750ad0ab8ba590ee598d3cdcbe884754 100644
--- a/game/modules/tome/data/maps/wilderness/eyal.lua
+++ b/game/modules/tome/data/maps/wilderness/eyal.lua
@@ -38,7 +38,10 @@ defineTile('p', "OASIS")
 defineTile('t', "COLD_FOREST")
 defineTile('_', "BURNT_FOREST")
 defineTile('T', "FOREST")
+defineTile('P', "PINE_FOREST")
 defineTile('v', "OLD_FOREST")
+defineTile('e', "ELVENWOOD_SNOW")
+defineTile('E', "ELVENWOOD_GREEN")
 
 defineTile('.', "PLAINS")
 defineTile('|', "DESERT")
@@ -478,24 +481,24 @@ addZone({145, 51, 167, 63}, "world-encounter", "orc-breeding-pits")
 return {
 {[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],},
 {[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[=]],[[=]],[[=]],[[=]],[[=]],[[~]],[[~]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[~]],[[~]],[[=]],[[=]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],},
-{[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[["]],[["]],[["]],[["]],[[=]],[[m]],[[m]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[T]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],},
-{[[~]],[[~]],[[~]],[[~]],[[~]],[[=]],[[=]],[[~]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[["]],[[t]],[[t]],[[t]],[[=]],[[=]],[[=]],[[=]],[["]],[[t]],[["]],[["]],[["]],[["]],[["]],[[t]],[[m]],[[m]],[[m]],[[t]],[[t]],[["]],[["]],[["]],[["]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[~]],[[~]],[[~]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[T]],[[T]],[[T]],[[T]],[[T]],[[~]],[[~]],[[~]],[[T]],[[T]],[[T]],[[T]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],},
-{[[~]],[[~]],[[=]],[[=]],[[~]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[t]],[["]],[["]],[[=]],[[=]],[[=]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[["]],[[t]],[[t]],[[t]],[[t]],[["]],[[t]],[[m]],[[m]],[[m]],[[m]],[[m]],[[t]],[[t]],[[t]],[[t]],[["]],[["]],[["]],[["]],[["]],[[t]],[["]],[["]],[["]],[["]],[["]],[["]],[["]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[T]],[[T]],[[.]],[[.]],[[.]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],},
-{[[~]],[[~]],[[~]],[[~]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[["]],[[t]],[[t]],[["]],[["]],[["]],[["]],[["]],[["]],[["]],[[t]],[[t]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[["]],[[t]],[[t]],[[t]],[[t]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[t]],[[t]],[["]],[["]],[["]],[["]],[["]],[[t]],[[t]],[["]],[["]],[["]],[["]],[["]],[["]],[["]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[T]],[[T]],[[T]],[[.]],[[T]],[[T]],[[T]],[[T]],[[^]],[[T]],[[.]],[[.]],[[T]],[[T]],[[T]],[[T]],[[.]],[[.]],[[.]],[[T]],[[~]],},
-{[[~]],[[~]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[t]],[[t]],[[t]],[["]],[["]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[["]],[["]],[[t]],[[t]],[[t]],[["]],[[t]],[[t]],[[t]],[[t]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[["]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[["]],[["]],[["]],[[m]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[=]],[[=]],[[=]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[T]],[[T]],[[T]],[[.]],[[T]],[[T]],[[T]],[[^]],[[^]],[[T]],[[T]],[[T]],[[T]],[[-]],[[-]],[[-]],[[-]],[[-]],[[-]],[[T]],[[~]],},
-{[[~]],[[=]],[[=]],[[=]],[[~]],[[~]],[[~]],[[=]],[[=]],[[=]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[["]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[["]],[[t]],[[t]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[m]],[[m]],[[m]],[["]],[["]],[["]],[["]],[["]],[[m]],[[m]],[[m]],[[m]],[[m]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[m]],[[m]],[[m]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[=]],[[=]],[[=]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[!]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[.]],[[.]],[[T]],[[T]],[[T]],[[^]],[[^]],[[^]],[[!]],[[T]],[[-]],[[-]],[[-]],[[-]],[[.]],[[T]],[[.]],[[T]],[[-]],[[-]],[[~]],},
-{[[~]],[[~]],[[=]],[[=]],[[=]],[[~]],[[~]],[[=]],[[=]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[m]],[[m]],[[m]],[[t]],[[t]],[["]],[["]],[[t]],[[t]],[["]],[["]],[[m]],[[m]],[["]],[["]],[[t]],[[t]],[[t]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[["]],[["]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[["]],[["]],[[#]],[[#]],[[#]],[[#]],[[=]],[[=]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[!]],[[^]],[[.]],[[.]],[[T]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[.]],[[T]],[[T]],[[T]],[[^]],[[^]],[[^]],[[T]],[[-]],[[-]],[[T]],[[T]],[[T]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[~]],},
-{[[~]],[[=]],[[=]],[[=]],[[~]],[[~]],[[~]],[[=]],[[=]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[["]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[m]],[[m]],[[m]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[["]],[["]],[["]],[[m]],[[t]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[["]],[["]],[["]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[["]],[["]],[[#]],[[#]],[[#]],[["]],[[=]],[[=]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[!]],[[^]],[[^]],[[T]],[[T]],[[T]],[[T]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[.]],[[T]],[[T]],[[^]],[[^]],[[^]],[[-]],[[-]],[[-]],[[T]],[[T]],[[T]],[[T]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[~]],},
-{[[~]],[[=]],[[~]],[[~]],[[=]],[[=]],[[~]],[[~]],[[=]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[T]],[[T]],[[!]],[[.]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[m]],[[m]],[[m]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[!]],[[!]],[[T]],[[T]],[[!]],[[m]],[[m]],[[m]],[[m]],[["]],[["]],[["]],[["]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[["]],[["]],[["]],[["]],[["]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[!]],[[^]],[[!]],[[^]],[[^]],[[T]],[[T]],[[.]],[[.]],[[T]],[[T]],[[T]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[!]],[[T]],[[^]],[[^]],[[!]],[[!]],[[^]],[[T]],[[T]],[[T]],[[T]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[~]],},
-{[[~]],[[=]],[[~]],[[=]],[[=]],[[=]],[[~]],[[~]],[[=]],[[t]],[[t]],[[t]],[[t]],[[t]],[[T]],[[^]],[[^]],[[^]],[[!]],[[.]],[["]],[["]],[["]],[["]],[["]],[[.]],[[.]],[[.]],[[t]],[[t]],[[t]],[[t]],[[t]],[[m]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[m]],[[m]],[[m]],[[m]],[[!]],[[T]],[[.]],[[.]],[[T]],[[!]],[[!]],[[daikara]],[[m]],[["]],[["]],[["]],[["]],[["]],[["]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[["]],[["]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[^]],[[^]],[[^]],[[^]],[[!]],[[.]],[[.]],[[T]],[[T]],[[.]],[[.]],[[.]],[[T]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[T]],[[T]],[[!]],[[!]],[[!]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[.]],[[~]],},
-{[[~]],[[~]],[[~]],[[~]],[[~]],[[=]],[[=]],[[=]],[[=]],[[=]],[[t]],[[t]],[[T]],[[T]],[[^]],[[^]],[[^]],[[^]],[[!]],[[.]],[[.]],[["]],[["]],[["]],[[.]],[[.]],[[.]],[[.]],[[T]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[T]],[[T]],[[shatur]],[[T]],[[T]],[[t]],[[t]],[[t]],[[t]],[[t]],[[m]],[[m]],[[!]],[[T]],[[T]],[[.]],[[.]],[[T]],[[!]],[[!]],[[!]],[[!]],[[!]],[[.]],[[.]],[["]],[["]],[["]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[["]],[["]],[[#]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[!]],[[^]],[[^]],[[^]],[[^]],[[!]],[[.]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[.]],[[.]],[[.]],[[.]],[[T]],[[T]],[[!]],[[!]],[[!]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[!]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],},
-{[[~]],[[~]],[[=]],[[=]],[[=]],[[~]],[[=]],[[=]],[[=]],[[.]],[[T]],[[T]],[[T]],[[^]],[[^]],[[^]],[[^]],[[!]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[trollmire]],[[T]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[norgos-lair]],[[.]],[[.]],[[!]],[[!]],[[!]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[-]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[!]],[[!]],[[!]],[[!]],[[!]],[[.]],[[.]],[[.]],[["]],[[T]],[[T]],[[#]],[[#]],[[#]],[[#]],[[#]],[["]],[[#]],[[#]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[!]],[[!]],[[^]],[[^]],[[T]],[[T]],[[T]],[[T]],[[T]],[[.]],[[.]],[[.]],[[T]],[[T]],[[.]],[[.]],[[T]],[[T]],[[T]],[[!]],[[^]],[[^]],[[^]],[[high-peak]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[!]],[[!]],[[!]],[[.]],[[.]],[[.]],[[~]],[[~]],},
-{[[~]],[[~]],[[~]],[[=]],[[=]],[[~]],[[~]],[[~]],[[T]],[[T]],[[T]],[[T]],[[!]],[[^]],[[^]],[[^]],[[^]],[[!]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[kor-pul]],[[.]],[[.]],[[.]],[[.]],[[T]],[[T]],[[T]],[[t]],[[t]],[[t]],[[T]],[[.]],[[.]],[[T]],[[!]],[[!]],[[!]],[[.]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[-]],[[T]],[[T]],[[T]],[[T]],[[T]],[[!]],[[!]],[[!]],[[!]],[[!]],[[!]],[[.]],[[.]],[[.]],[[T]],[[T]],[[!]],[[#]],[[#]],[[#]],[[#]],[["]],[["]],[[#]],[[#]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[!]],[[^]],[[^]],[[T]],[[T]],[[T]],[[T]],[[T]],[[.]],[[.]],[[!]],[[!]],[[!]],[[!]],[[.]],[[.]],[[T]],[[T]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[T]],[[T]],[[T]],[[^]],[[^]],[[^]],[[^]],[[!]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],},
-{[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[T]],[[T]],[[!]],[[!]],[[^]],[[^]],[[^]],[[!]],[[!]],[[!]],[[!]],[[&]],[[&]],[[.]],[[.]],[[.]],[[.]],[[.]],[[T]],[[.]],[[.]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[!]],[[T]],[[T]],[[.]],[[heart-gloom]],[[T]],[[T]],[[T]],[[-]],[[-]],[[T]],[[T]],[[T]],[[T]],[[!]],[[!]],[[!]],[[!]],[[!]],[[!]],[[.]],[[.]],[[T]],[[T]],[[T]],[[!]],[[!]],[[#]],[[#]],[[#]],[[#]],[["]],[[#]],[[#]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[^]],[[^]],[[!]],[[.]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[^]],[[^]],[[^]],[[!]],[[!]],[[T]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[!]],[[T]],[[T]],[[T]],[[!]],[[!]],[[^]],[[^]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],},
-{[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[.]],[[.]],[[!]],[[^]],[[^]],[[^]],[[^]],[[!]],[[!]],[[!]],[[&]],[[&]],[[&]],[[&]],[[.]],[[.]],[[.]],[[T]],[[T]],[[T]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[.]],[[T]],[[.]],[[.]],[[T]],[[T]],[[T]],[[-]],[[T]],[[T]],[[T]],[[T]],[[.]],[[.]],[[T]],[[!]],[[!]],[[!]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[!]],[[!]],[[#]],[[#]],[[#]],[[#]],[["]],[["]],[[#]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[!]],[[^]],[[^]],[[^]],[[^]],[[!]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[unremarkable-cave]],[[T]],[[T]],[[T]],[[!]],[[!]],[[!]],[[^]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],},
-{[[~]],[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[.]],[[.]],[[T]],[[!]],[[^]],[[^]],[[^]],[[^]],[[!]],[[!]],[[!]],[[&]],[[&]],[[&]],[[&]],[[.]],[[.]],[[derth]],[[T]],[[T]],[[T]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[T]],[[T]],[[T]],[[T]],[[.]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[-]],[[!]],[[!]],[[T]],[[T]],[[T]],[[.]],[[T]],[[T]],[[T]],[[T]],[[.]],[[T]],[[T]],[[T]],[[T]],[[.]],[[T]],[[!]],[[#]],[[#]],[[#]],[[#]],[["]],[["]],[[#]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[!]],[[!]],[[!]],[[^]],[[^]],[[^]],[[^]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[!]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[T]],[[T]],[[!]],[[!]],[[.]],[[.]],[[!]],[[!]],[[!]],[[!]],[[!]],[[!]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],},
-{[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[|]],[[.]],[[T]],[[T]],[[T]],[[!]],[[^]],[[^]],[[^]],[[!]],[[!]],[[!]],[[&]],[[&]],[[&]],[[.]],[[.]],[[.]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[.]],[[.]],[[!]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[-]],[[-]],[[!]],[[!]],[[T]],[[T]],[[T]],[[.]],[[T]],[[T]],[[T]],[[T]],[[.]],[[T]],[[T]],[[T]],[[.]],[[T]],[[T]],[[T]],[[!]],[[-]],[[#]],[[#]],[[#]],[[#]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[!]],[[^]],[[^]],[[^]],[[^]],[[^]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[!]],[[!]],[[!]],[[!]],[[^]],[[-]],[[-]],[[^]],[[^]],[[.]],[[^]],[[^]],[[T]],[[T]],[[T]],[[!]],[[!]],[[.]],[[.]],[[!]],[[!]],[[!]],[[!]],[[!]],[[!]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],},
-{[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[|]],[[.]],[[T]],[[T]],[[T]],[[!]],[[^]],[[^]],[[^]],[[!]],[[!]],[[!]],[[&]],[[&]],[[&]],[[.]],[[.]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[.]],[[!]],[[^]],[[^]],[[^]],[[!]],[[!]],[[.]],[[.]],[[!]],[[!]],[[!]],[[!]],[[.]],[[.]],[[-]],[[!]],[[!]],[[!]],[[T]],[[T]],[[.]],[[.]],[[T]],[[T]],[[T]],[[.]],[[T]],[[T]],[[T]],[[T]],[[.]],[[.]],[[T]],[[T]],[[T]],[[-]],[[#]],[[#]],[[#]],[[#]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[!]],[[^]],[[^]],[[^]],[[-]],[[^]],[[^]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[.]],[[-]],[[-]],[[-]],[[-]],[[-]],[[-]],[[^]],[[^]],[[^]],[[^]],[[.]],[[(]],[[T]],[[T]],[[T]],[[T]],[[.]],[[.]],[[.]],[[.]],[[w]],[[!]],[[!]],[[!]],[[w]],[[w]],[[!]],[[.]],[[~]],[[~]],[[~]],[[~]],},
+{[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[["]],[["]],[["]],[["]],[[=]],[[m]],[[m]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[P]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],},
+{[[~]],[[~]],[[~]],[[~]],[[~]],[[=]],[[=]],[[~]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[["]],[[t]],[[t]],[[t]],[[=]],[[=]],[[=]],[[=]],[["]],[[t]],[["]],[["]],[["]],[["]],[["]],[[t]],[[m]],[[m]],[[m]],[[t]],[[t]],[["]],[["]],[["]],[["]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[~]],[[~]],[[~]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[P]],[[P]],[[P]],[[P]],[[P]],[[~]],[[~]],[[~]],[[P]],[[P]],[[P]],[[P]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],},
+{[[~]],[[~]],[[=]],[[=]],[[~]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[t]],[["]],[["]],[[=]],[[=]],[[=]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[["]],[[t]],[[t]],[[t]],[[t]],[["]],[[t]],[[m]],[[m]],[[m]],[[m]],[[m]],[[t]],[[t]],[[t]],[[t]],[["]],[["]],[["]],[["]],[["]],[[t]],[["]],[["]],[["]],[["]],[["]],[["]],[["]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[P]],[[P]],[[.]],[[.]],[[.]],[[P]],[[P]],[[P]],[[P]],[[P]],[[P]],[[P]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],},
+{[[~]],[[~]],[[~]],[[~]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[["]],[[t]],[[t]],[["]],[["]],[["]],[["]],[["]],[["]],[["]],[[t]],[[t]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[["]],[[t]],[[t]],[[t]],[[t]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[t]],[[t]],[["]],[["]],[["]],[["]],[["]],[[t]],[[t]],[["]],[["]],[["]],[["]],[["]],[["]],[["]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[P]],[[P]],[[P]],[[.]],[[P]],[[P]],[[P]],[[P]],[[^]],[[P]],[[.]],[[.]],[[P]],[[P]],[[P]],[[P]],[[.]],[[.]],[[.]],[[P]],[[~]],},
+{[[~]],[[~]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[=]],[[t]],[[t]],[[t]],[["]],[["]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[["]],[["]],[[t]],[[t]],[[t]],[["]],[[t]],[[t]],[[t]],[[t]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[["]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[["]],[["]],[["]],[[m]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[=]],[[=]],[[=]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[P]],[[P]],[[P]],[[.]],[[P]],[[P]],[[P]],[[^]],[[^]],[[P]],[[P]],[[P]],[[P]],[[-]],[[-]],[[-]],[[-]],[[-]],[[-]],[[P]],[[~]],},
+{[[~]],[[=]],[[=]],[[=]],[[~]],[[~]],[[~]],[[=]],[[=]],[[=]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[["]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[["]],[[t]],[[t]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[m]],[[m]],[[m]],[["]],[["]],[["]],[["]],[["]],[[m]],[[m]],[[m]],[[m]],[[m]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[m]],[[m]],[[m]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[=]],[[=]],[[=]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[!]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[.]],[[.]],[[P]],[[P]],[[P]],[[^]],[[^]],[[^]],[[!]],[[P]],[[-]],[[-]],[[-]],[[-]],[[.]],[[P]],[[.]],[[P]],[[-]],[[-]],[[~]],},
+{[[~]],[[~]],[[=]],[[=]],[[=]],[[~]],[[~]],[[=]],[[=]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[m]],[[m]],[[m]],[[e]],[[e]],[["]],[["]],[[e]],[[e]],[["]],[["]],[[m]],[[m]],[["]],[["]],[[t]],[[t]],[[t]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[["]],[["]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[["]],[["]],[[#]],[[#]],[[#]],[[#]],[[=]],[[=]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[!]],[[^]],[[.]],[[.]],[[P]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[.]],[[P]],[[P]],[[P]],[[^]],[[^]],[[^]],[[P]],[[-]],[[-]],[[P]],[[P]],[[P]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[~]],},
+{[[~]],[[=]],[[=]],[[=]],[[~]],[[~]],[[~]],[[=]],[[=]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[["]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[m]],[[m]],[[m]],[[e]],[[e]],[[e]],[[e]],[[e]],[[e]],[[e]],[[e]],[[e]],[["]],[["]],[["]],[[m]],[[t]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[["]],[["]],[["]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[["]],[["]],[[#]],[[#]],[[#]],[["]],[[=]],[[=]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[!]],[[^]],[[^]],[[P]],[[P]],[[P]],[[P]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[.]],[[P]],[[P]],[[^]],[[^]],[[^]],[[-]],[[-]],[[-]],[[P]],[[P]],[[P]],[[P]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[~]],},
+{[[~]],[[=]],[[~]],[[~]],[[=]],[[=]],[[~]],[[~]],[[=]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[P]],[[P]],[[!]],[[.]],[["]],[["]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[t]],[[m]],[[m]],[[m]],[[e]],[[e]],[[e]],[[e]],[[e]],[[e]],[[e]],[[e]],[[e]],[[e]],[[e]],[[m]],[[m]],[[m]],[[m]],[[m]],[[m]],[[!]],[[!]],[[P]],[[P]],[[!]],[[m]],[[m]],[[m]],[[m]],[["]],[["]],[["]],[["]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[["]],[["]],[["]],[["]],[["]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[!]],[[^]],[[!]],[[^]],[[^]],[[P]],[[P]],[[.]],[[.]],[[P]],[[P]],[[P]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[!]],[[P]],[[^]],[[^]],[[!]],[[!]],[[^]],[[P]],[[P]],[[P]],[[P]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[~]],},
+{[[~]],[[=]],[[~]],[[=]],[[=]],[[=]],[[~]],[[~]],[[=]],[[t]],[[t]],[[t]],[[t]],[[t]],[[P]],[[^]],[[^]],[[^]],[[!]],[[.]],[["]],[["]],[["]],[["]],[["]],[[.]],[[.]],[[.]],[[t]],[[t]],[[t]],[[t]],[[t]],[[m]],[[e]],[[e]],[[e]],[[e]],[[e]],[[e]],[[e]],[[e]],[[e]],[[e]],[[e]],[[e]],[[e]],[[m]],[[m]],[[m]],[[m]],[[!]],[[P]],[[.]],[[.]],[[P]],[[!]],[[!]],[[daikara]],[[m]],[["]],[["]],[["]],[["]],[["]],[["]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[["]],[["]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[^]],[[^]],[[^]],[[^]],[[!]],[[.]],[[.]],[[P]],[[P]],[[.]],[[.]],[[.]],[[P]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[P]],[[P]],[[!]],[[!]],[[!]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[.]],[[~]],},
+{[[~]],[[~]],[[~]],[[~]],[[~]],[[=]],[[=]],[[=]],[[=]],[[=]],[[t]],[[t]],[[P]],[[P]],[[^]],[[^]],[[^]],[[^]],[[!]],[[.]],[[.]],[["]],[["]],[["]],[[.]],[[.]],[[.]],[[.]],[[T]],[[T]],[[t]],[[t]],[[t]],[[e]],[[e]],[[e]],[[e]],[[e]],[[E]],[[E]],[[shatur]],[[E]],[[E]],[[e]],[[e]],[[e]],[[e]],[[e]],[[m]],[[m]],[[!]],[[P]],[[P]],[[.]],[[.]],[[P]],[[!]],[[!]],[[!]],[[!]],[[!]],[[.]],[[.]],[["]],[["]],[["]],[[#]],[[#]],[[#]],[[#]],[[#]],[[#]],[["]],[["]],[[#]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[!]],[[^]],[[^]],[[^]],[[^]],[[!]],[[.]],[[P]],[[P]],[[P]],[[P]],[[P]],[[P]],[[.]],[[.]],[[.]],[[.]],[[T]],[[T]],[[!]],[[!]],[[!]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[!]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],},
+{[[~]],[[~]],[[=]],[[=]],[[=]],[[~]],[[=]],[[=]],[[=]],[[.]],[[P]],[[P]],[[P]],[[^]],[[^]],[[^]],[[^]],[[!]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[trollmire]],[[T]],[[T]],[[t]],[[t]],[[E]],[[E]],[[e]],[[norgos-lair]],[[.]],[[.]],[[!]],[[!]],[[!]],[[E]],[[E]],[[E]],[[E]],[[E]],[[E]],[[E]],[[-]],[[P]],[[P]],[[P]],[[P]],[[P]],[[P]],[[!]],[[!]],[[!]],[[!]],[[!]],[[.]],[[.]],[[.]],[["]],[[T]],[[T]],[[#]],[[#]],[[#]],[[#]],[[#]],[["]],[[#]],[[#]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[!]],[[!]],[[^]],[[^]],[[P]],[[P]],[[P]],[[P]],[[P]],[[.]],[[.]],[[.]],[[P]],[[P]],[[.]],[[.]],[[T]],[[T]],[[T]],[[!]],[[^]],[[^]],[[^]],[[high-peak]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[!]],[[!]],[[!]],[[.]],[[.]],[[.]],[[~]],[[~]],},
+{[[~]],[[~]],[[~]],[[=]],[[=]],[[~]],[[~]],[[~]],[[P]],[[P]],[[P]],[[P]],[[!]],[[^]],[[^]],[[^]],[[^]],[[!]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[kor-pul]],[[.]],[[.]],[[.]],[[.]],[[T]],[[T]],[[T]],[[T]],[[E]],[[E]],[[E]],[[.]],[[.]],[[E]],[[!]],[[!]],[[!]],[[.]],[[E]],[[E]],[[E]],[[E]],[[E]],[[E]],[[-]],[[P]],[[P]],[[P]],[[P]],[[P]],[[!]],[[!]],[[!]],[[!]],[[!]],[[!]],[[.]],[[.]],[[.]],[[T]],[[T]],[[!]],[[#]],[[#]],[[#]],[[#]],[["]],[["]],[[#]],[[#]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[!]],[[^]],[[^]],[[P]],[[P]],[[P]],[[P]],[[P]],[[.]],[[.]],[[!]],[[!]],[[!]],[[!]],[[.]],[[.]],[[T]],[[T]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[T]],[[T]],[[T]],[[^]],[[^]],[[^]],[[^]],[[!]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],},
+{[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[P]],[[P]],[[!]],[[!]],[[^]],[[^]],[[^]],[[!]],[[!]],[[!]],[[!]],[[&]],[[&]],[[.]],[[.]],[[.]],[[.]],[[.]],[[T]],[[.]],[[.]],[[T]],[[T]],[[T]],[[E]],[[E]],[[E]],[[E]],[[E]],[[E]],[[E]],[[!]],[[E]],[[E]],[[.]],[[heart-gloom]],[[E]],[[E]],[[E]],[[-]],[[-]],[[P]],[[P]],[[P]],[[P]],[[!]],[[!]],[[!]],[[!]],[[!]],[[!]],[[.]],[[.]],[[T]],[[T]],[[T]],[[!]],[[!]],[[#]],[[#]],[[#]],[[#]],[["]],[[#]],[[#]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[^]],[[^]],[[!]],[[.]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[^]],[[^]],[[^]],[[!]],[[!]],[[T]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[!]],[[T]],[[T]],[[T]],[[!]],[[!]],[[^]],[[^]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],},
+{[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[.]],[[.]],[[!]],[[^]],[[^]],[[^]],[[^]],[[!]],[[!]],[[!]],[[&]],[[&]],[[&]],[[&]],[[.]],[[.]],[[.]],[[T]],[[T]],[[T]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[E]],[[E]],[[E]],[[E]],[[E]],[[E]],[[.]],[[E]],[[.]],[[.]],[[E]],[[E]],[[E]],[[-]],[[P]],[[P]],[[P]],[[P]],[[.]],[[.]],[[T]],[[!]],[[!]],[[!]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[!]],[[!]],[[#]],[[#]],[[#]],[[#]],[["]],[["]],[[#]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[!]],[[^]],[[^]],[[^]],[[^]],[[!]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[unremarkable-cave]],[[T]],[[T]],[[T]],[[!]],[[!]],[[!]],[[^]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],},
+{[[~]],[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[.]],[[.]],[[T]],[[!]],[[^]],[[^]],[[^]],[[^]],[[!]],[[!]],[[!]],[[&]],[[&]],[[&]],[[&]],[[.]],[[.]],[[derth]],[[T]],[[T]],[[T]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[E]],[[E]],[[E]],[[E]],[[.]],[[E]],[[E]],[[E]],[[E]],[[E]],[[E]],[[E]],[[-]],[[!]],[[!]],[[P]],[[P]],[[P]],[[.]],[[T]],[[T]],[[T]],[[T]],[[.]],[[T]],[[T]],[[T]],[[T]],[[.]],[[T]],[[!]],[[#]],[[#]],[[#]],[[#]],[["]],[["]],[[#]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[!]],[[!]],[[!]],[[^]],[[^]],[[^]],[[^]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[!]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[T]],[[T]],[[!]],[[!]],[[.]],[[.]],[[!]],[[!]],[[!]],[[!]],[[!]],[[!]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],},
+{[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[|]],[[.]],[[T]],[[T]],[[T]],[[!]],[[^]],[[^]],[[^]],[[!]],[[!]],[[!]],[[&]],[[&]],[[&]],[[.]],[[.]],[[.]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[.]],[[.]],[[!]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[-]],[[-]],[[!]],[[!]],[[P]],[[P]],[[P]],[[.]],[[T]],[[T]],[[T]],[[T]],[[.]],[[T]],[[T]],[[T]],[[.]],[[T]],[[T]],[[T]],[[!]],[[-]],[[#]],[[#]],[[#]],[[#]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[!]],[[^]],[[^]],[[^]],[[^]],[[^]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[!]],[[!]],[[!]],[[!]],[[^]],[[-]],[[-]],[[^]],[[^]],[[.]],[[^]],[[^]],[[T]],[[T]],[[T]],[[!]],[[!]],[[.]],[[.]],[[!]],[[!]],[[!]],[[!]],[[!]],[[!]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],},
+{[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[|]],[[.]],[[T]],[[T]],[[T]],[[!]],[[^]],[[^]],[[^]],[[!]],[[!]],[[!]],[[&]],[[&]],[[&]],[[.]],[[.]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[.]],[[!]],[[^]],[[^]],[[^]],[[!]],[[!]],[[.]],[[.]],[[!]],[[!]],[[!]],[[!]],[[.]],[[.]],[[-]],[[!]],[[!]],[[!]],[[P]],[[P]],[[.]],[[.]],[[T]],[[T]],[[T]],[[.]],[[T]],[[T]],[[T]],[[T]],[[.]],[[.]],[[T]],[[T]],[[T]],[[-]],[[#]],[[#]],[[#]],[[#]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[!]],[[^]],[[^]],[[^]],[[-]],[[^]],[[^]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[.]],[[-]],[[-]],[[-]],[[-]],[[-]],[[-]],[[^]],[[^]],[[^]],[[^]],[[.]],[[(]],[[T]],[[T]],[[T]],[[T]],[[.]],[[.]],[[.]],[[.]],[[w]],[[!]],[[!]],[[!]],[[w]],[[w]],[[!]],[[.]],[[~]],[[~]],[[~]],[[~]],},
 {[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[|]],[[.]],[[T]],[[T]],[[!]],[[^]],[[^]],[[^]],[[^]],[[^]],[[!]],[[!]],[[.]],[[.]],[[.]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[v]],[[T]],[[.]],[[!]],[[^]],[[^]],[[^]],[[^]],[[^]],[[!]],[[.]],[[!]],[[^]],[[^]],[[!]],[[.]],[[.]],[[-]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[.]],[[T]],[[T]],[[T]],[[.]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[-]],[[#]],[[#]],[[#]],[[#]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[!]],[[!]],[[!]],[[!]],[[-]],[[!]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[-]],[[-]],[[-]],[[.]],[[.]],[[.]],[[!]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[(]],[[T]],[[T]],[[T]],[[.]],[[.]],[[.]],[[.]],[[.]],[[w]],[[w]],[[!]],[[w]],[[w]],[[w]],[[w]],[[!]],[[.]],[[~]],[[~]],[[~]],},
 {[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[|]],[[T]],[[T]],[[!]],[[!]],[[^]],[[^]],[[^]],[[^]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[T]],[[T]],[[T]],[[T]],[[.]],[[T]],[[v]],[[v]],[[v]],[[v]],[[.]],[[.]],[[!]],[[!]],[[!]],[[^]],[[^]],[[!]],[[^]],[[^]],[[^]],[[!]],[[!]],[[.]],[[-]],[[-]],[[!]],[[!]],[[.]],[[.]],[[.]],[[T]],[[T]],[[T]],[[T]],[[T]],[[.]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[-]],[[-]],[[#]],[[#]],[[#]],[[#]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[!]],[[!]],[[!]],[[-]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[-]],[[-]],[[.]],[[.]],[[.]],[[.]],[[!]],[[^]],[[^]],[[^]],[[^]],[[!]],[[!]],[[^]],[[(]],[[(]],[[T]],[[T]],[[.]],[[.]],[[.]],[[.]],[[.]],[[w]],[[w]],[[w]],[[w]],[[w]],[[w]],[[w]],[[w]],[[.]],[[~]],[[~]],[[~]],},
 {[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[.]],[[T]],[[T]],[[!]],[[!]],[[^]],[[^]],[[maze]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[.]],[[T]],[[T]],[[.]],[[.]],[[.]],[[.]],[[.]],[[v]],[[v]],[[v]],[[.]],[[v]],[[v]],[[v]],[[!]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[!]],[[.]],[[.]],[[-]],[[!]],[[!]],[[.]],[[.]],[[.]],[[.]],[[T]],[[T]],[[T]],[[T]],[[.]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[T]],[[-]],[[.]],[[#]],[[#]],[[#]],[[#]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[!]],[[!]],[[-]],[[-]],[[.]],[[.]],[[-]],[[-]],[[-]],[[-]],[[T]],[[T]],[[.]],[[.]],[[.]],[[!]],[[^]],[[^]],[[!]],[[!]],[[!]],[[.]],[[.]],[[(]],[[(]],[[(]],[[T]],[[T]],[[.]],[[.]],[[.]],[[.]],[[!]],[[w]],[[w]],[[w]],[[w]],[[w]],[[w]],[[.]],[[~]],[[~]],[[~]],[[~]],},
@@ -519,11 +522,11 @@ return {
 {[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[T]],[[T]],[[T]],[[T]],[[.]],[[T]],[[T]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[.]],[[~]],[[.]],[[T]],[[_]],[[{]],[[{]],[[_]],[[_]],[[spellmurk-lake]],[[spellmurk-lake]],[[spellmurk-lake]],[[spellmurk-lake]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[.]],[[.]],[[-]],[[-]],[[-]],[[-]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[!]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[!]],[[!]],[[^]],[[^]],[[^]],[[!]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[!]],[[!]],[[!]],[[!]],[[^]],[[^]],[[.]],[[.]],[[~]],},
 {[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[&]],[[&]],[[T]],[[T]],[[T]],[[.]],[[T]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[T]],[[_]],[[{]],[[{]],[[{]],[[_]],[[spellmurk-lake]],[[spellmurk-lake]],[[spellmurk-lake]],[[spellmurk-lake]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[-]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[!]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[T]],[[!]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[.]],[[.]],[[.]],[[.]],[[.]],[[!]],[[^]],[[!]],[[!]],[[^]],[[!]],[[!]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[!]],[[!]],[[!]],[[^]],[[^]],[[.]],[[^]],[[~]],},
 {[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[rhaloren-camp]],[[.]],[[&]],[[&]],[[-]],[[.]],[[scintillating-caves]],[[T]],[[T]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[_]],[[_]],[[{]],[[{]],[[{]],[[spellmurk-lake]],[[spellmurk-lake]],[[.]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[-]],[[.]],[[.]],[[.]],[[.]],[[!]],[[!]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[T]],[[!]],[[!]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[|]],[[.]],[[.]],[[.]],[[.]],[[.]],[[^]],[[^]],[[^]],[[!]],[[!]],[[!]],[[^]],[[^]],[[^]],[[|]],[[|]],[[|]],[[^]],[[^]],[[^]],[[!]],[[!]],[[^]],[[^]],[[^]],[[^]],[[~]],},
-{[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[T]],[[~]],[[~]],[[.]],[[.]],[[&]],[[&]],[[-]],[[-]],[[!]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[_]],[[_]],[[_]],[[{]],[[{]],[[.]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[-]],[[-]],[[-]],[[.]],[[.]],[[!]],[[!]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[T]],[[T]],[[!]],[[!]],[[!]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[p]],[[|]],[[|]],[[.]],[[.]],[[.]],[[.]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[|]],[[p]],[[|]],[[|]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[~]],},
-{[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[T]],[[T]],[[T]],[[T]],[[.]],[[&]],[[&]],[[-]],[[elvala]],[[!]],[[!]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[T]],[[_]],[[{]],[[{]],[[{]],[[{]],[[~]],[[~]],[[dreadfell]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[-]],[[.]],[[-]],[[.]],[[.]],[[!]],[[!]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[#]],[[#]],[[T]],[[.]],[[!]],[[!]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[|]],[[p]],[[|]],[[|]],[[|]],[[|]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[~]],},
-{[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[T]],[[T]],[[T]],[[T]],[[.]],[[&]],[[&]],[[-]],[[!]],[[!]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[j]],[[j]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[{]],[[{]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[-]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[#]],[[T]],[[T]],[[.]],[[!]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[|]],[[p]],[[|]],[[p]],[[|]],[[^]],[[^]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[^]],[[|]],[[|]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[!]],[[^]],[[^]],[[~]],[[~]],},
-{[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[T]],[[T]],[[T]],[[.]],[[.]],[[.]],[[-]],[[-]],[[-]],[[-]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[j]],[[j]],[[j]],[[j]],[[j]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[#]],[[#]],[[#]],[[.]],[[!]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[p]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[!]],[[~]],[[~]],[[~]],[[~]],},
-{[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[T]],[[T]],[[.]],[[.]],[[.]],[[-]],[[.]],[[.]],[[-]],[[-]],[[-]],[[-]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[j]],[[j]],[[j]],[[rel-tunnel]],[[k]],[[k]],[[k]],[[|]],[[|]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[#]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[p]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[p]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[^]],[[^]],[[(]],[[^]],[[!]],[[!]],[[.]],[[~]],[[~]],[[~]],[[~]],},
+{[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[P]],[[~]],[[~]],[[.]],[[.]],[[&]],[[&]],[[-]],[[-]],[[!]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[_]],[[_]],[[_]],[[{]],[[{]],[[.]],[[.]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[-]],[[-]],[[-]],[[.]],[[.]],[[!]],[[!]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[T]],[[T]],[[!]],[[!]],[[!]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[p]],[[|]],[[|]],[[.]],[[.]],[[.]],[[.]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[|]],[[p]],[[|]],[[|]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[~]],},
+{[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[P]],[[P]],[[P]],[[P]],[[.]],[[&]],[[&]],[[-]],[[elvala]],[[!]],[[!]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[T]],[[_]],[[{]],[[{]],[[{]],[[{]],[[~]],[[~]],[[dreadfell]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[-]],[[.]],[[-]],[[.]],[[.]],[[!]],[[!]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[#]],[[#]],[[T]],[[.]],[[!]],[[!]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[|]],[[p]],[[|]],[[|]],[[|]],[[|]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[~]],},
+{[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[P]],[[P]],[[P]],[[P]],[[.]],[[&]],[[&]],[[-]],[[!]],[[!]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[j]],[[j]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[{]],[[{]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[-]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[#]],[[T]],[[T]],[[.]],[[!]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[|]],[[p]],[[|]],[[p]],[[|]],[[^]],[[^]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[^]],[[|]],[[|]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[!]],[[^]],[[^]],[[~]],[[~]],},
+{[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[P]],[[P]],[[P]],[[.]],[[.]],[[.]],[[-]],[[-]],[[-]],[[-]],[[.]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[j]],[[j]],[[j]],[[j]],[[j]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[#]],[[#]],[[#]],[[.]],[[!]],[[.]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[p]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[^]],[[!]],[[~]],[[~]],[[~]],[[~]],},
+{[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[P]],[[P]],[[.]],[[.]],[[.]],[[-]],[[.]],[[.]],[[-]],[[-]],[[-]],[[-]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[j]],[[j]],[[j]],[[rel-tunnel]],[[k]],[[k]],[[k]],[[|]],[[|]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[#]],[[#]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[p]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[p]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[^]],[[^]],[[(]],[[^]],[[!]],[[!]],[[.]],[[~]],[[~]],[[~]],[[~]],},
 {[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[.]],[[.]],[[.]],[[-]],[[.]],[[.]],[[.]],[[!]],[[!]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[j]],[[j]],[[j]],[[j]],[[^]],[[^]],[[k]],[[k]],[[|]],[[|]],[[|]],[[ritch-tunnels]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[{]],[[{]],[[{]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[p]],[[p]],[[|]],[[|]],[[p]],[[|]],[[|]],[[|]],[[|]],[[|]],[[p]],[[p]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[p]],[[|]],[[^]],[[(]],[[^]],[[!]],[[!]],[[.]],[[.]],[[.]],[[~]],[[~]],},
 {[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[-]],[[-]],[[.]],[[!]],[[!]],[[!]],[[!]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[irkkk]],[[k]],[[k]],[[^]],[[^]],[[^]],[[k]],[[k]],[[|]],[[|]],[[|]],[[|]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[{]],[[{]],[[{]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[^]],[[(]],[[^]],[[^]],[[!]],[[.]],[[.]],[[.]],[[~]],[[~]],},
 {[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[k]],[[k]],[[k]],[[^]],[[^]],[[^]],[[k]],[[k]],[[k]],[[|]],[[|]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[{]],[[{]],[[{]],[[charred-scar]],[[~]],[[~]],[[~]],[[{]],[[{]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[~]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[q]],[[q]],[[|]],[[|]],[[|]],[[|]],[[p]],[[|]],[[|]],[[|]],[[|]],[[|]],[[|]],[[(]],[[(]],[[|]],[[^]],[[^]],[[^]],[[|]],[[|]],[[~]],[[~]],},
diff --git a/game/modules/tome/data/maps/zones/mark-spellblaze-last.lua b/game/modules/tome/data/maps/zones/mark-spellblaze-last.lua
index 14b89a1852700867f0d3d08010e690032706c9ab..db63b728d25bf7e399a9891cba35175f2ed1761e 100644
--- a/game/modules/tome/data/maps/zones/mark-spellblaze-last.lua
+++ b/game/modules/tome/data/maps/zones/mark-spellblaze-last.lua
@@ -26,7 +26,7 @@ subGenerator{
 		sqrt_percent = 45,
 		noise = "fbm_perlin",
 		floor = "BURNT_GROUND",
-		wall = {"BURNT_TREE1","BURNT_TREE2","BURNT_TREE3","BURNT_TREE4","BURNT_TREE5","BURNT_TREE6","BURNT_TREE7","BURNT_TREE8","BURNT_TREE9","BURNT_TREE10","BURNT_TREE11","BURNT_TREE12","BURNT_TREE13","BURNT_TREE14","BURNT_TREE15","BURNT_TREE16","BURNT_TREE17","BURNT_TREE18","BURNT_TREE19","BURNT_TREE20",},
+		wall = "BURNT_TREE",
 		up = "BURNT_UP4",
 		down = "BURNT_DOWN6",
 	},
@@ -36,7 +36,7 @@ subGenerator{
 checkConnectivity({55,24}, "entrance", "boss-area", "boss-area")
 
 -- defineTile section
-defineTile("#", {"BURNT_TREE1","BURNT_TREE2","BURNT_TREE3","BURNT_TREE4","BURNT_TREE5","BURNT_TREE6","BURNT_TREE7","BURNT_TREE8","BURNT_TREE9","BURNT_TREE10","BURNT_TREE11","BURNT_TREE12","BURNT_TREE13","BURNT_TREE14","BURNT_TREE15","BURNT_TREE16","BURNT_TREE17","BURNT_TREE18","BURNT_TREE19","BURNT_TREE20",})
+defineTile("#", "BURNT_TREE")
 defineTile("~", "LAVA")
 defineTile("+", "ALTAR")
 defineTile(".", "BURNT_GROUND")
diff --git a/game/modules/tome/data/quests/high-peak.lua b/game/modules/tome/data/quests/high-peak.lua
index 4a6614bcea9e93bac6b93d1446513581d15e0d14..78071583cf4443600c566d0097b2e2b3d42a3745 100644
--- a/game/modules/tome/data/quests/high-peak.lua
+++ b/game/modules/tome/data/quests/high-peak.lua
@@ -121,6 +121,9 @@ function win(self, how)
 	elseif how == "yeek-sacrifice" then world:gainAchievement("YEEK_SACRIFICE", game.player)
 	elseif how == "yeek-selfless" then world:gainAchievement("YEEK_SELFLESS", game.player)
 	end
+	
+	local p = game:getPlayer(true)
+	p:inventoryApplyAll(function(inven, item, o) o:check("on_win") end)
 
 	local aeryn = game.level:findEntity{define_as="HIGH_SUN_PALADIN_AERYN"}
 	if aeryn and not aeryn.dead then world:gainAchievement("WIN_AERYN_SURVIVE", game.player) end
diff --git a/game/modules/tome/data/talents/celestial/celestial.lua b/game/modules/tome/data/talents/celestial/celestial.lua
index 11e6030c97fe9b3f1de9a54ff70b2d12de8b17fd..1c8cb7370a06707653b7f81f65b22b9d81c6e26c 100644
--- a/game/modules/tome/data/talents/celestial/celestial.lua
+++ b/game/modules/tome/data/talents/celestial/celestial.lua
@@ -22,6 +22,8 @@ newTalentType{ allow_random=true, no_silence=true, is_spell=true, type="celestia
 newTalentType{ allow_random=true, no_silence=true, is_spell=true, type="celestial/chants", name = "chants", generic = true, description = "Chant the glory of the Sun." }
 newTalentType{ allow_random=true, no_silence=true, is_spell=true, type="celestial/light", name = "light", generic = true, description = "Invoke the power of the light to heal and mend." }
 newTalentType{ allow_random=true, no_silence=true, is_spell=true, type="celestial/combat", name = "combat", description = "Your devotion allows you to combat your foes with indomitable determination." }
+newTalentType{ allow_random=true, no_silence=true, is_spell=true, type="celestial/radiance", name = "radiance", description = "You channel the light of the sun through your body." }
+newTalentType{ allow_random=true, no_silence=true, is_spell=true, type="celestial/crusader", name = "crusader", description = "Forgo your shield for the chance to crush your foes with a mighty two handed weapon." }
 newTalentType{ allow_random=true, no_silence=true, is_spell=true, type="celestial/sunlight", name = "sunlight", description = "Summon the power of the Sun to burn your foes." }
 newTalentType{ allow_random=true, no_silence=true, is_spell=true, type="celestial/sun", name = "sun", description = "Summon the power of the Sun to burn your foes." }
 newTalentType{ allow_random=true, no_silence=true, is_spell=true, type="celestial/glyphs", name = "glyphs", min_lev = 10, description = "Bind the brilliant powers into glyphs to trap your foes." }
@@ -83,6 +85,8 @@ load("/data/talents/celestial/combat.lua")
 load("/data/talents/celestial/light.lua")
 load("/data/talents/celestial/glyphs.lua")
 load("/data/talents/celestial/guardian.lua")
+load("/data/talents/celestial/radiance.lua")
+load("/data/talents/celestial/crusader.lua")
 
 load("/data/talents/celestial/twilight.lua")
 load("/data/talents/celestial/hymns.lua")
diff --git a/game/modules/tome/data/talents/celestial/crusader.lua b/game/modules/tome/data/talents/celestial/crusader.lua
new file mode 100644
index 0000000000000000000000000000000000000000..b67d5612fd890ff93d15f05aef3d96d33800abb3
--- /dev/null
+++ b/game/modules/tome/data/talents/celestial/crusader.lua
@@ -0,0 +1,167 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009 - 2014 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
+
+newTalent{
+	name = "Absorption Strike",
+	type = {"celestial/crusader", 1},
+	require = divi_req1,
+	points = 5,
+	cooldown = 8,
+	positive = -7,
+	tactical = { ATTACK = 2, DISABLE = 1 },
+	range = 1,
+	requires_target = true,
+	getWeakness = function(self, t) return self:combatTalentScale(t, 20, 45, 0.75) end,
+	getDamage = function(self, t) return self:combatTalentWeaponDamage(t, 1.1, 2.3) end,
+	on_pre_use = function(self, t, silent) if not self:hasTwoHandedWeapon() then if not silent then game.logPlayer(self, "You require a two handed weapon to use this talent.") end return false end return true end,
+	action = function(self, t)
+		local tg = {type="hit", range=self:getTalentRange(t)}
+		local x, y, target = self:getTarget(tg)
+		if not x or not y or not target then return nil end
+		if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
+		local hit = self:attackTarget(target, nil, t.getDamage(self, t), true)
+		if hit then
+			self:project({type="ball", radius=2, selffire=false}, self.x, self.y, function(px, py)
+				local a = game.level.map(px, py, Map.ACTOR)
+				if a then
+					a:setEffect(a.EFF_ABSORPTION_STRIKE, 5, {apply_power=self:combatSpellpower(), power=t.getWeakness(self, t)})
+				end
+			end)
+		end
+		return true
+	end,
+	info = function(self, t)
+		local damage = t.getDamage(self, t)
+		return ([[You strike your foe with your two handed weapon, dealing %d%% weapon damage.
+		If the attack hits all foes in radius 2 will have their light resistance reduced by %d%% for 5 turns.]]):
+		format(100 * damage, t.getWeakness(self, t))
+	end,
+}
+
+newTalent{
+	name = "Mark of Light",
+	type = {"celestial/crusader", 2},
+	require = divi_req2,
+	points = 5,
+	no_energy = true,
+	cooldown = 15,
+	positive = 20,
+	tactical = { ATTACK=0.5, DISABLE=2, HEAL=2 },
+	range = 1,
+	requires_target = true,
+	getPower = function(self, t) return self:combatTalentScale(t, 30, 70) end,
+	getDamage = function(self, t) return self:combatTalentWeaponDamage(t, 0.2, 0.7) end,
+	on_pre_use = function(self, t, silent) if not self:hasTwoHandedWeapon() then if not silent then game.logPlayer(self, "You require a two handed weapon to use this talent.") end return false end return true end,
+	action = function(self, t)
+		local tg = {type="hit", range=self:getTalentRange(t)}
+		local x, y, target = self:getTarget(tg)
+		if not x or not y or not target then return nil end
+		if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
+		local hit = self:attackTarget(target, nil, t.getDamage(self, t), true)
+		if hit then
+			target:setEffect(target.EFF_MARK_OF_LIGHT, 5, {apply_power=self:combatSpellpower(), src=self, power=t.getPower(self, t)})
+		end
+		return true
+	end,
+	info = function(self, t)
+		local damage = t.getDamage(self, t)
+		return ([[You swifty thrust the hilt of your 2H weapon into your target, dealing %d%% weapon damage.
+		If the attack hits the creature is marked with light for 5 turns. All melee hits you deal to it will heal you for %d%% of the damage done.]]):
+		format(100 * damage, t.getPower(self, t))
+	end,
+}
+
+newTalent{
+	name = "Righteous Strength",
+	type = {"celestial/crusader",3},
+	require = divi_req3,
+	points = 5,
+	mode = "passive",
+	getArmor = function(self, t) return self:combatTalentScale(t, 5, 30) end,
+	getDamage = function(self, t) return self:combatTalentSpellDamage(t, 10, 120) end,
+	getCrit = function(self, t) return self:combatTalentScale(t, 3, 10, 0.75) end,
+	getPower = function(self, t) return self:combatTalentScale(t, 5, 20) end,
+	callbackOnCrit = function(self, t, kind, dam, chance, target)
+		if kind ~= "physical" or not target then return end
+		if self.turn_procs.righteous_strength then return end
+		self.turn_procs.righteous_strength = true
+
+		target:setEffect(target.EFF_LIGHTBURN, 5, {apply_power=self:combatSpellpower(), src=self, dam=t.getDamage(self, t)/5, armor=t.getArmor(self, t)})
+		self:setEffect(self.EFF_RIGHTEOUS_STRENGTH, 4, {power=t.getPower(self, t), max_power=t.getPower(self, t) * 3})
+	end,
+	passives = function(self, t, p)
+		self:talentTemporaryValue(p, "combat_physcrit", t.getCrit(self, t))
+	end,
+	info = function(self, t)
+		return ([[While wielding a two handed weapon, your critical strike chance is increased by %d%%, and your melee criticals instill you with righteous strength, increasing all physical and light damage you deal by %d%%, stacking up to 3 times.
+		In addition, your melee critical strikes leave a lasting lightburn on the target, dealing %0.2f light damage over 5 turns and reducing opponents armour by %d.
+		The damage increase with your Spellpower.]]):
+		format(t.getCrit(self, t), t.getPower(self, t), damDesc(self, DamageType.LIGHT, t.getDamage(self, t)), t.getArmor(self, t))
+	end,
+}
+
+newTalent{
+	name = "Flash of the Blade",
+	type = {"celestial/crusader", 4},
+	require = divi_req4,
+	random_ego = "attack",
+	points = 5,
+	cooldown = 10,
+	positive = 15,
+	tactical = { ATTACKAREA = {LIGHT = 2} },
+	range = 0,
+	radius = 2,
+	requires_target = true,
+	target = function(self, t)
+		return {type="ball", range=self:getTalentRange(t), selffire=false, radius=self:getTalentRadius(t)}
+	end,
+	on_pre_use = function(self, t, silent) if not self:hasTwoHandedWeapon() then if not silent then game.logPlayer(self, "You require a two handed weapon to use this talent.") end return false end return true end,
+	get1Damage = function(self, t) return self:combatTalentWeaponDamage(t, 0.8, 1.6) end,
+	get2Damage = function(self, t) return self:combatTalentWeaponDamage(t, 0.5, 1.2) end,
+	action = function(self, t)
+		local tg1 = self:getTalentTarget(t) tg1.radius = 1
+		local tg2 = self:getTalentTarget(t)
+		self:project(tg1, self.x, self.y, function(px, py, tg, self)
+			local target = game.level.map(px, py, Map.ACTOR)
+			if target and target ~= self then
+				self:attackTarget(target, nil, t.get1Damage(self, t), true)
+			end
+		end)
+		self:project(tg2, self.x, self.y, function(px, py, tg, self)
+			local target = game.level.map(px, py, Map.ACTOR)
+			if target and target ~= self then
+				self:attackTarget(target, DamageType.LIGHT, t.get2Damage(self, t), true)
+				if self:getTalentLevel(t) >= 4 then
+					target:setEffect(target.EFF_DAZED, 3, {apply_power=self:combatSpellpower()})
+				end
+			end
+		end)
+
+		self:addParticles(Particles.new("meleestorm", 2, {radius=2, img="spinningwinds_yellow"}))
+		self:addParticles(Particles.new("meleestorm", 1, {img="spinningwinds_yellow"}))
+		return true
+	end,
+	info = function(self, t)
+		return ([[Infuse your two handed weapon with light while spinning around.
+		All creatures in radius one take %d%% weapon damage.
+		In addition while spinning your weapon shines so much it deals %d%% light weapon damage to all foes in radius 2.
+		At level 4 creatures may also be dazed by the light.]]):
+		format(t.get1Damage(self, t) * 100, t.get2Damage(self, t) * 100)
+	end,
+}
diff --git a/game/modules/tome/data/talents/celestial/glyphs.lua b/game/modules/tome/data/talents/celestial/glyphs.lua
index a02c203c0fb9c0029093e7bb0c0b1377e140e5cb..06d1748b3c7a2e9f0423640ba19104ea4733dd0c 100644
--- a/game/modules/tome/data/talents/celestial/glyphs.lua
+++ b/game/modules/tome/data/talents/celestial/glyphs.lua
@@ -165,7 +165,7 @@ newTalent{
 		return ([[You bind light in a glyph on the floor. All targets walking over the glyph will be hit by a blast that knocks them back and does %0.2f physical damage.
 		The glyph is a hidden trap (%d detection and %d disarm power based on your Magic) and lasts for %d turns.
 		The damage will increase with your Spellpower.]]):
-		format(damDesc(self, DamageType.SPELLKNOCKBACK, damage), t.trapPower(self, t)*0.8, t.trapPower(self, t), duration)
+		format(damDesc(self, DamageType.PHYSICAL, damage), t.trapPower(self, t)*0.8, t.trapPower(self, t), duration)
 	end,
 }
 
diff --git a/game/modules/tome/data/talents/celestial/radiance.lua b/game/modules/tome/data/talents/celestial/radiance.lua
new file mode 100644
index 0000000000000000000000000000000000000000..8e3937330a2ae4206b565980bd12bca5879ad080
--- /dev/null
+++ b/game/modules/tome/data/talents/celestial/radiance.lua
@@ -0,0 +1,142 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009 - 2014 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
+
+function radianceRadius(self)
+	return self:getTalentRadius(self:getTalentFromId(self.T_RADIANCE))
+end
+
+newTalent{
+	name = "Radiance",
+	type = {"celestial/radiance", 1},
+	mode = "passive",
+	require = divi_req1,
+	points = 5,
+	radius = function(self, t) return self:combatTalentScale(t, 3, 7) end,
+	getResist = function(self, t) return math.min(100, self:combatTalentScale(t, 20, 90)) end,
+	passives = function(self, t, p)
+		self:talentTemporaryValue(p, "radiance_aura", radianceRadius(self))
+		self:talentTemporaryValue(p, "blind_immune", t.getResist(self, t) / 100)
+	end,
+	info = function(self, t)
+		return ([[You are so infused with sunlight that your body glows permanently in radius %d, even in dark places.
+		The light protects your eyes, giving %d%% blindness resistance.
+		The light radius overrides your normal light if it is bigger (it does not stack).
+		]]):
+		format(radianceRadius(self), t.getResist(self, t))
+	end,
+}
+
+newTalent{
+	name = "Illumination",
+	type = {"celestial/radiance", 2},
+	require = divi_req2,
+	points = 5,
+	mode = "passive",
+	getPower = function(self, t) return 15 + self:combatTalentSpellDamage(t, 1, 100) end,
+	getDef = function(self, t) return 5 + self:combatTalentSpellDamage(t, 1, 35) end,
+	callbackOnActBase = function(self, t)
+		local radius = radianceRadius(self)
+		local grids = core.fov.circle_grids(self.x, self.y, radius, true)
+		for x, yy in pairs(grids) do for y, _ in pairs(grids[x]) do local target = game.level.map(x, y, Map.ACTOR) if target and self ~= target then
+			if (self:reactionToward(target) < 0) then
+				target:setEffect(target.EFF_ILLUMINATION, 1, {power=t.getPower(self, t), def=t.getDef(self, t)})
+				local ss = self:isTalentActive(self.T_SEARING_SIGHT)
+				if ss then
+					local dist = core.fov.distance(self.x, self.y, target.x, target.y) - 1
+					local coeff = math.scale(radius - dist, 1, radius, 0.1, 1)
+					local realdam = DamageType:get(DamageType.LIGHT).projector(self, target.x, target.y, DamageType.LIGHT, ss.dam * coeff)
+					if ss.daze and rng.percent(ss.daze) and target:canBe("stun") then
+						target:setEffect(target.EFF_DAZED, 3, {apply_power=self:combatSpellpower()})
+					end
+
+					if realdam and realdam > 0 and self:hasEffect(self.EFF_LIGHT_BURST) then
+						self:setEffect(self.EFF_LIGHT_BURST_SPEED, 4, {})
+					end
+				end
+		end
+		end end end		
+	end,
+	info = function(self, t)
+		return ([[The light of your Radiance allows you to see that which would normally be unseen.
+		All actors in your Radiance aura have their invisibility and stealth power reduced by %d.
+		In addition, all actors affected by illumination are easier to see and therefore hit; their defense is reduced by %d and all evasion bonuses from being unseen are negated.
+		The effects increase with your Spellpower.]]):
+		format(t.getPower(self, t), t.getDef(self, t))
+	end,
+}
+
+newTalent{
+	name = "Searing Sight",
+	type = {"celestial/radiance",3},
+	require = divi_req3,
+	mode = "sustained",
+	points = 5,
+	cooldown = 15,
+	range = function(self) return radianceRadius(self) end,
+	tactical = { ATTACKAREA = {LIGHT=1} },
+	sustain_positive = 40,
+	getDamage = function(self, t) return self:combatTalentSpellDamage(t, 1, 90) end,
+	getDaze = function(self, t) return self:combatTalentLimit(t, 35, 5, 20) end,
+	activate = function(self, t)
+		local daze = nil
+		if self:getTalentLevel(t) >= 4 then daze = t.getDaze(self, t) end
+		return {dam=t.getDamage(self, t), daze=daze}
+	end,
+	deactivate = function(self, t, p)
+		return true
+	end,
+	info = function(self, t)
+		return ([[Your Radiance is so powerful it burns all foes caught in it, doing up to %0.2f light damage (reduced with distance) to all foes caught inside.
+		At level 4 the light is so bright it has %d%% chances to daze them for 3 turns.
+		The damage increase with your Spellpower.]]):
+		format(damDesc(self, DamageType.LIGHT, t.getDamage(self, t)), t.getDaze(self, t))
+	end,
+}
+
+newTalent{
+	name = "Light Burst",
+	type = {"celestial/radiance", 4},
+	require = divi_req4,
+	points = 5,
+	cooldown = 25,
+	positive = 15,
+	tactical = { DISABLE = {blind=1} },
+	range = function(self) return radianceRadius(self) end,
+	requires_target = true,
+	getDur = function(self, t) return self:combatTalentLimit(t, 9, 2, 6) end,
+	getMax = function(self, t) return math.floor(self:combatTalentScale(t, 2, 8)) end,
+	action = function(self, t)
+		local radius = radianceRadius(self)
+		local grids = core.fov.circle_grids(self.x, self.y, radius, true)
+		for x, yy in pairs(grids) do for y, _ in pairs(grids[x]) do local target = game.level.map(x, y, Map.ACTOR) if target and self ~= target then
+			if target:canBe("blind") then
+				target:setEffect(target.EFF_BLINDED, 4, {apply_power=self:combatSpellpower()})
+			end
+		end end end
+
+		self:setEffect(self.EFF_LIGHT_BURST, t.getDur(self, t), {max=t.getMax(self, t)})
+		return true
+	end,
+	info = function(self, t)
+		return ([[Concentrate your Radiance in a blinding flash of light. All foes caught inside will be blinded for 3 turns.
+		In addition for %d turns each time your Searing Sight damages a foe you gain a movement bonus of 10%%, stacking up to %d times.]]):
+		format(t.getDur(self, t), t.getMax(self, t))
+	end,
+}
+
diff --git a/game/modules/tome/data/talents/celestial/sun.lua b/game/modules/tome/data/talents/celestial/sun.lua
index be593362a133451744f6cb6a08d3d65ef1de0154..ec9584b5a9458d831d42a68df9b3b2b1cc9e9cf1 100644
--- a/game/modules/tome/data/talents/celestial/sun.lua
+++ b/game/modules/tome/data/talents/celestial/sun.lua
@@ -47,7 +47,11 @@ newTalent{
 			local _ _, x, y = self:canProject(tg, x, y)
 			self:project({type="ball", x=x, y=y, radius=1, selffire=false}, x, y, DamageType.BLIND, t.getDuration(self, t), {type="light"})
 		end
-		self:removeEffect(self.EFF_SUN_VENGEANCE)
+
+		-- Delay removal of the effect so its still there when no_energy checks
+		game:onTickEnd(function()
+			self:removeEffect(self.EFF_SUN_VENGEANCE)
+		end)
 
 		game:playSoundNear(self, "talents/flame")
 		return true
@@ -148,7 +152,8 @@ newTalent{
 		grids[self.x] = grids[self.x] or {}
 		grids[self.x][self.y] = true
 		local _ _, x, y = self:canProject(tg, x, y)
-		game.level.map:addEffect(self, self.x, self.y, 5, DamageType.SUN_PATH, dam / 5, 0, 5, grids, {type="sun_path", args={tx=x-self.x, ty=y-self.y}, only_one=true}, nil, true)
+		game.level.map:addEffect(self, self.x, self.y, 5, DamageType.SUN_PATH, dam / 5, 0, 5, grids, MapEffect.new{color_br=255, color_bg=249, color_bb=60, alpha=100, effect_shader="shader_images/sun_effect.png"}, nil, true)
+		game.level.map:addEffect(self, self.x, self.y, 5, DamageType.COSMETIC, 0      , 0, 5, grids, {type="sun_path", args={tx=x-self.x, ty=y-self.y}, only_one=true}, nil, true)
 
 		self:setEffect(self.EFF_PATH_OF_THE_SUN, 5, {})
 
diff --git a/game/modules/tome/data/talents/cursed/cursed-aura.lua b/game/modules/tome/data/talents/cursed/cursed-aura.lua
index be0a924a3e2d830690479810aa6364463cda62e1..71f12438b71d06a70bd38095dd13c9ea796a18b6 100644
--- a/game/modules/tome/data/talents/cursed/cursed-aura.lua
+++ b/game/modules/tome/data/talents/cursed/cursed-aura.lua
@@ -435,7 +435,7 @@ newTalent{
 			no_breath = 1,
 			disarm_immune = 1,
 			never_move = 1,
-			no_drops = true, -- remove to drop the weapon
+			--no_drops = true, -- remove to drop the weapon
 
 			resolvers.talents{
 				[Talents.T_WEAPON_COMBAT]={base=1, every=10},
@@ -504,6 +504,6 @@ newTalent{
 		local duration = t.getDuration(self, t)
 		local attackSpeed = 100/t.getAttackSpeed(self, t)
 
-		return ([[Instill a part of your living curse into a weapon in your inventory, and toss it nearby. This nearly impervious sentry will attack all nearby enemies for %d turns. When the curse ends, the weapon will crumble to dust, worn through by your hatred. Attack Speed: %d%%]]):format(duration, attackSpeed)
+		return ([[Instill a part of your living curse into a weapon in your inventory, and toss it nearby. This nearly impervious sentry will attack all nearby enemies for %d turns. When the curse ends, the weapon will drop to the ground. Attack Speed: %d%%]]):format(duration, attackSpeed)
 	end,
 }
diff --git a/game/modules/tome/data/talents/cursed/endless-hunt.lua b/game/modules/tome/data/talents/cursed/endless-hunt.lua
index 1fd54aea2d6c8cc97095a6c73e2c82976c03f663..b2ded74824324502c5a086cf47072ae0b39dfe44 100644
--- a/game/modules/tome/data/talents/cursed/endless-hunt.lua
+++ b/game/modules/tome/data/talents/cursed/endless-hunt.lua
@@ -151,7 +151,7 @@ newTalent{
 		return getHateMultiplier(self, 0.35, 0.67, false, hate)
 	end,
 	getTargetDamageChange = function(self, t)
-		return -self:combatLimit(self:combatTalentStatDamage(t, "wil", 0.7, 0.9), 1, 0, 0, 0.75, 0.87) -- Limit < 100%
+		return -self:combatLimit(self:combatTalentStatDamage(t, "wil", 0.7, 0.9), 1, 0, 0, 0.75, 0.87)*100 -- Limit < 100%
 	end,
 	getDuration = function(self, t)
 		return 2
@@ -196,7 +196,7 @@ newTalent{
 		local targetDamageChange = t.getTargetDamageChange(self, t)
 		local duration = t.getDuration(self, t)
 		return ([[Harass your stalked victim with two quick attacks for %d%% (at 0 Hate) to %d%% (at 100+ Hate) damage each. Each attack that scores a hit disrupts one talent, rune or infusion for %d turns. Your opponent will be unnerved by the attacks, reducing the damage they deal by %d%% for %d turns.
-		Damage reduction increases with the Willpower stat.]]):format(t.getDamageMultiplier(self, t, 0) * 100, t.getDamageMultiplier(self, t, 100) * 100, cooldownDuration, -targetDamageChange * 100, duration)
+		Damage reduction increases with the Willpower stat.]]):format(t.getDamageMultiplier(self, t, 0) * 100, t.getDamageMultiplier(self, t, 100) * 100, cooldownDuration, -targetDamageChange, duration)
 	end,
 }
 
diff --git a/game/modules/tome/data/talents/gifts/mindstar-mastery.lua b/game/modules/tome/data/talents/gifts/mindstar-mastery.lua
index ea24fa16b34aed8790a72f79cd91408f577bef9c..f8db140ac83f4f4afb52ac85f4b042cd4e4796e0 100644
--- a/game/modules/tome/data/talents/gifts/mindstar-mastery.lua
+++ b/game/modules/tome/data/talents/gifts/mindstar-mastery.lua
@@ -21,7 +21,7 @@ function get_mindstar_power_mult(self, div)
 	local main, off = self:hasPsiblades(true, true)
 	if not main or not off then return 1 end
 
-	local mult = 1 + (main.combat.dam + off.combat.dam) / (div or 40)
+	local mult = 1 + (main.combat.dam + off.combat.dam) * 0.8 / (div or 40)
 	return mult
 end
 
@@ -106,7 +106,7 @@ newTalent{
 	cooldown = 25,
 	tactical = { ATTACK = 2, DEFEND=3 },
 	getDamage = function(self, t) return 5 + self:combatTalentMindDamage(t, 5, 35) * get_mindstar_power_mult(self) end,
-	getChance = function(self, t) return util.bound(10 + self:combatTalentMindDamage(t, 5, 35), 10, 40) * get_mindstar_power_mult(self, 90) end,
+	getChance = function(self, t) return util.bound(10 + self:combatTalentMindDamage(t, 3, 25), 10, 40) * get_mindstar_power_mult(self, 90) end,
 	on_pre_use = function(self, t, silent) if not self:hasPsiblades(true, true) then if not silent then game.logPlayer(self, "You require two psiblades in your hands to use this talent.") end return false end return true end,
 	action = function(self, t)
 		-- Add a lasting map effect
diff --git a/game/modules/tome/data/talents/misc/inscriptions.lua b/game/modules/tome/data/talents/misc/inscriptions.lua
index d4f4874c9075684685108370140e74183ecc26ad..c6847ca287b53008b9221c6cceda6b5ca3034020 100644
--- a/game/modules/tome/data/talents/misc/inscriptions.lua
+++ b/game/modules/tome/data/talents/misc/inscriptions.lua
@@ -563,7 +563,7 @@ newInscription{
 	info = function(self, t)
 		local data = self:getInscriptionData(t.short_name)
 		return ([[Activate the rune to create a protective shield absorbing and reflecting at most %d damage for %d turns.
-The effect will scale with your magic stat.]]):format(100+1.5*self:getMag(), 5)
+The effect will scale with your magic stat.]]):format(100+5*self:getMag(), 5)
 	end,
 	short_info = function(self, t)
 		local data = self:getInscriptionData(t.short_name)
diff --git a/game/modules/tome/data/talents/misc/npcs.lua b/game/modules/tome/data/talents/misc/npcs.lua
index 53458c08d7107e85be30498bf3358350a71a0c28..370521a0fa935f97ebacacc6eb5bfe3168412f89 100644
--- a/game/modules/tome/data/talents/misc/npcs.lua
+++ b/game/modules/tome/data/talents/misc/npcs.lua
@@ -2174,3 +2174,75 @@ newTalent{
 		format(defense, saves)
 	end,
 }
+
+newTalent{
+	name = "Maim",
+	type = {"technique/other", 1},
+	points = 5,
+	random_ego = "attack",
+	cooldown = 12,
+	stamina = 10,
+	tactical = { ATTACK = { PHYSICAL = 2 }, DISABLE = 2 },
+	requires_target = true,
+	getDuration = function(self, t) return math.floor(self:combatTalentScale(t, 3, 7)) end,
+	getDamage = function(self, t) return self:combatTalentPhysicalDamage(t, 10, 100) * getUnarmedTrainingBonus(self) end,
+	getMaim = function(self, t) return self:combatTalentPhysicalDamage(t, 5, 30) end,
+	-- Learn the appropriate stance
+	action = function(self, t)
+		local tg = {type="hit", range=self:getTalentRange(t)}
+		local x, y, target = self:getTarget(tg)
+		if not x or not y or not target then return nil end
+		if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
+
+		local grappled = false
+
+		-- breaks active grapples if the target is not grappled
+		if target:isGrappled(self) then
+			grappled = true
+		else
+			self:breakGrapples()
+		end
+
+		-- end the talent without effect if the target is to big
+		if self:grappleSizeCheck(target) then
+			return true
+		end
+
+		-- start the grapple; this will automatically hit and reapply the grapple if we're already grappling the target
+		local hit = self:startGrapple (target)
+		-- deal damage and maim if appropriate
+		if hit then
+			if grappled then
+				self:project(target, x, y, DamageType.PHYSICAL, self:physicalCrit(t.getDamage(self, t), nil, target, self:combatAttack(), target:combatDefense()))
+				target:setEffect(target.EFF_MAIMED, t.getDuration(self, t), {power=t.getMaim(self, t)})
+			else
+				self:project(target, x, y, DamageType.PHYSICAL, self:physicalCrit(t.getDamage(self, t), nil, target, self:combatAttack(), target:combatDefense()))
+			end
+		end
+
+		return true
+	end,
+	info = function(self, t)
+		local duration = t.getDuration(self, t)
+		local damage = t.getDamage(self, t)
+		local maim = t.getMaim(self, t)
+		return ([[Grapples the target and inflicts %0.2f physical damage. If the target is already grappled, the target will be maimed as well, reducing damage by %d and global speed by 30%% for %d turns.
+		The grapple effects will be based off your grapple talent, if you have it, and the damage will scale with your Physical Power.]])
+		:format(damDesc(self, DamageType.PHYSICAL, (damage)), maim, duration)
+	end,
+}
+
+newTalent{
+	name = "Bloodrage",
+	type = {"technique/other", 1},
+	points = 5,
+	mode = "passive",
+	getDuration = function(self, t) return math.floor(self:combatTalentScale(t, 6, 10)) end,
+	on_kill = function(self, t)
+		self:setEffect(self.EFF_BLOODRAGE, t.getDuration(self, t), {max=math.floor(self:getTalentLevel(t) * 6), inc=2})
+	end,
+	info = function(self, t)
+		return ([[Each time one of your foes bites the dust, you feel a surge of power, increasing your strength by 2 up to a maximum of %d for %d turns.]]):
+		format(math.floor(self:getTalentLevel(t) * 6), t.getDuration(self, t))
+	end,
+}
\ No newline at end of file
diff --git a/game/modules/tome/data/talents/psionic/finer-energy-manipulations.lua b/game/modules/tome/data/talents/psionic/finer-energy-manipulations.lua
index 596cac6e3561ad0f88662c4d81c045a48eac03f8..8e831f45f60d648be92b4ef30ead1880a4956f42 100644
--- a/game/modules/tome/data/talents/psionic/finer-energy-manipulations.lua
+++ b/game/modules/tome/data/talents/psionic/finer-energy-manipulations.lua
@@ -55,7 +55,7 @@ newTalent{
 		return math.floor(self:combatStatTalentIntervalDamage(t, "combatMindpower", 3, 20))
 	end,
 	action = function(self, t)
-		local d d = self:showInventory("Reshape which weapon?", self:getInven("INVEN"), function(o) return not o.quest and o.type == "weapon" and not o.fully_reshaped end, function(o, item)
+		local d d = self:showInventory("Reshape which weapon?", self:getInven("INVEN"), function(o) return not o.quest and o.type == "weapon" and not o.fully_reshaped and o.subtype ~= "mindstar" end, function(o, item)
 			--o.wielder = o.wielder or {}
 			if (o.old_atk or 0) < t.boost(self, t) then
 				o.combat.atk = (o.combat.atk or 0) - (o.old_atk or 0)
@@ -83,6 +83,7 @@ newTalent{
 	info = function(self, t)
 		local weapon_boost = t.boost(self, t)
 		return ([[Manipulate forces on the molecular level to realign, rebalance, and hone your weapon. Permanently increases the Accuracy and damage of any weapon by %d.
+		Mindstars being weapons of the mind can not be affected.
 		These values scale with your Mindpower.]]):
 		format(weapon_boost)
 	end,
diff --git a/game/modules/tome/data/talents/psionic/other.lua b/game/modules/tome/data/talents/psionic/other.lua
index 783b95641cf88559a3c1f85754e0bcecf2bf6c6d..e30a5ebf16214b13913867c568750cd9d8920eb0 100644
--- a/game/modules/tome/data/talents/psionic/other.lua
+++ b/game/modules/tome/data/talents/psionic/other.lua
@@ -29,7 +29,7 @@ newTalent{
 	action = function(self, t)
 		local inven = self:getInven("INVEN")
 		local d d = self:showInventory("Telekinetically grasp which item?", inven, function(o)
-			return (o.type == "weapon" or o.type == "gem") and o.subtype ~= "sling"
+			return (o.type == "weapon" or o.type == "gem") and o.subtype ~= "sling" and o.subtype ~= "bow"
 		end, function(o, item)
 			local pf = self:getInven("PSIONIC_FOCUS")
 			if not pf then return end
@@ -97,6 +97,9 @@ newTalent{
 	tactical = { BUFF = 3 },
 	do_tkautoattack = function(self, t)
 		if game.zone.wilderness then return end
+		local tkweapon = self:getInven("PSIONIC_FOCUS")[1]
+		if type(tkweapon) == "boolean" then tkweapon = nil end
+		if not tkweapon or tkweapon.type ~= "weapon" or tkweapon.subtype == "mindstar" then return end
 
 		local targnum = 1
 		if self:hasEffect(self.EFF_PSIFRENZY) then targnum = self:callTalent(self.T_FRENZIED_PSIFIGHTING, "getTargNum") end
@@ -123,9 +126,9 @@ newTalent{
 				for i, o in ipairs(self:getInven(self.INVEN_PSIONIC_FOCUS)) do
 					if o.combat and not o.archery then
 						print("[PSI ATTACK] attacking with", o.name)
-						self.use_psi_combat = true
+						self:attr("use_psi_combat", 1)
 						local s, h = self:attackTargetWith(a, o.combat, nil, 1)
-						self.use_psi_combat = false
+						self:attr("use_psi_combat", -1)
 						speed = math.max(speed or 0, s)
 						hit = hit or h
 						if hit and not sound then sound = o.combat.sound
@@ -145,48 +148,75 @@ newTalent{
 		if not self:getInven("PSIONIC_FOCUS") then return false end
 		local tkweapon = self:getInven("PSIONIC_FOCUS")[1]
 		if type(tkweapon) == "boolean" then tkweapon = nil end
-		if not tkweapon or tkweapon.type == "gem" or tkweapon.archery then
+		if not tkweapon or (tkweapon.type ~= "weapon" and tkweapon.type ~= "gem") then
 --			game.logPlayer(self, "You cannot do that without a telekinetically-wielded melee weapon.")
 			return false
 		end
 		return true
 	end,
 	activate = function (self, t)
-		return true
+		local tk = self:getInven("PSIONIC_FOCUS")[1]
+
+		local ret = {}
+		if tk.type == "gem" then
+			local power = (tk.material_level or 1) * 4
+			self:talentTemporaryValue(ret, "inc_stats", {
+				[self.STAT_STR] = power,
+				[self.STAT_DEX] = power,
+				[self.STAT_MAG] = power,
+				[self.STAT_WIL] = power,
+				[self.STAT_CUN] = power,
+				[self.STAT_CON] = power,
+			})
+		elseif tk.subtype == "mindstar" then
+		else
+			self:talentTemporaryValue(ret, "use_psi_combat", 1)
+		end
+		return ret
 	end,
 	deactivate =  function (self, t)
 		return true
 	end,
 	info = function(self, t)
+		local base = [[Allows you to wield a physical melee weapon, a mindstar or a gem telekinetically, gaining a special effect for each.
+		A gem will provide +4 bonus to all primary stats per tier of the gem and increases the range of some attack talents by 1 per tier.
+		A mindstar will randomly try to grab (7% chance and 1.5 range per tier of the mindstar) a far away foe and bring it to melee range.
+		A physical melee weapon will act as a semi independant entity, attacking foes nearby each turn while also replacing Strength and Dexterity with Willpower and Cunning for accuracy and damage calculations.
+
+		]]
+
+		local o = self:getInven("PSIONIC_FOCUS") and self:getInven("PSIONIC_FOCUS")[1]
+		if type(o) == "boolean" then o = nil end
+		if not o then return base end
+
 		local atk = 0
 		local dam = 0
 		local apr = 0
 		local crit = 0
 		local speed = 1
-		local o = self:getInven("PSIONIC_FOCUS") and self:getInven("PSIONIC_FOCUS")[1]
-		if type(o) == "boolean" then o = nil end
-		if not o then
-			return ([[Allows you to wield a weapon telekinetically, directing it with your willpower and cunning rather than crude flesh. When activated, the telekinetically-wielded weapon will attack a random melee-range target each turn.
-			The telekinetically-wielded weapon uses Willpower in place of Strength and Cunning in place of Dexterity to determine attack and damage.
-			You are not telekinetically wielding anything right now.]])
-		end
-		if o.type == "weapon" then
-			self.use_psi_combat = true
+		if o.type == "gem" then
+			local ml = o.material_level or 1
+			base = base..([[The telekinetically-wielded gem grants you +%d stats and +%d range.]]):format(ml * 4, ml)
+		elseif o.subtype == "mindstar" then
+			local ml = o.material_level or 1			
+			base = base..([[The telekinetically-wielded mindstar has %d%% chances to grab a foe up to %d range away.]]):format(ml * 7, math.ceil(ml * 1.5))
+		else
+			self:attr("use_psi_combat", 1)
 			atk = self:combatAttack(o.combat)
 			dam = self:combatDamage(o.combat)
 			apr = self:combatAPR(o.combat)
 			crit = self:combatCrit(o.combat)
 			speed = self:combatSpeed(o.combat)
-			self.use_psi_combat = false
+			self:attr("use_psi_combat", -1)
+			base = base..([[The telekinetically-wielded weapon uses Willpower in place of Strength, and Cunning in place of Dexterity, to determine Accuracy and damage.
+			Combat stats:
+			Accuracy: %d
+			Damage: %d
+			APR: %d
+			Crit: %0.2f
+			Speed: %0.2f]]):
+			format(atk, dam, apr, crit, speed)
 		end
-		return ([[Allows you to wield a weapon telekinetically, directing it with your Willpower and Cunning rather than crude flesh. When activated, the telekinetically-wielded weapon will attack a random melee-range target each turn.
-		The telekinetically-wielded weapon uses Willpower in place of Strength, and Cunning in place of Dexterity, to determine Accuracy and damage.
-		Combat stats:
-		Accuracy: %d
-		Damage: %d
-		APR: %d
-		Crit: %0.2f
-		Speed: %0.2f]]):
-		format(atk, dam, apr, crit, speed)
+		return base
 	end,
 }
diff --git a/game/modules/tome/data/talents/psionic/psi-archery.lua b/game/modules/tome/data/talents/psionic/psi-archery.lua
index 1aa1a5af92ca610826e35a0edbad7d43fbc5cecc..c51700059f7e5a6250a5a8e85f69c8c7da43b276 100644
--- a/game/modules/tome/data/talents/psionic/psi-archery.lua
+++ b/game/modules/tome/data/talents/psionic/psi-archery.lua
@@ -230,13 +230,13 @@ newTalent{
 			You are not telekinetically wielding anything right now.]]):format(duration)
 		end
 		if o.type == "weapon" then
-			self.use_psi_combat = true
+			self:attr("use_psi_combat", 1)
 			atk = self:combatAttack(o.combat)
 			dam = self:combatDamage(o.combat)
 			apr = self:combatAPR(o.combat)
 			crit = self:combatCrit(o.combat)
 			speed = self:combatSpeed(o.combat)
-			self.use_psi_combat = false
+			self:attr("use_psi_combat ", -1)
 		end
 		return ([[You temporarily set aside a part of you mind to direct your telekinetically-wielded bow. It will automatically attack a target each turn for %d turns.
 			The telekinetically-wielded bow uses Willpower in place of Strength and Cunning in place of Dexterity to determine attack and damage.
diff --git a/game/modules/tome/data/talents/psionic/psi-fighting.lua b/game/modules/tome/data/talents/psionic/psi-fighting.lua
index 9ca4beefc349e63b8a370e8077f7c4b5f6dd127c..bc10ad0906e57b819ec9e67262282349b2f4b76f 100644
--- a/game/modules/tome/data/talents/psionic/psi-fighting.lua
+++ b/game/modules/tome/data/talents/psionic/psi-fighting.lua
@@ -48,9 +48,9 @@ newTalent{
 		local x, y, target = self:getTarget(tg)
 		if not x or not y or not target then return nil end
 		if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
-		self.use_psi_combat = true
+		self:attr("use_psi_combat", 1)
 		self:attackTargetWith(target, weapon.combat, nil, self:combatTalentWeaponDamage(t, 1.8, 3))
-		self.use_psi_combat = false
+		self:attr("use_psi_combat", -1)
 		return true
 	end,
 	info = function(self, t)
diff --git a/game/modules/tome/data/talents/psionic/psionic.lua b/game/modules/tome/data/talents/psionic/psionic.lua
index cd855d9c32f9d442c8b164d663549547dae4ed93..766c20bdb7ad3405e84ba56efa8c299e6e463289 100644
--- a/game/modules/tome/data/talents/psionic/psionic.lua
+++ b/game/modules/tome/data/talents/psionic/psionic.lua
@@ -155,7 +155,7 @@ function getGemLevel(self)
 	local gem_level = 0
 	if self:getInven("PSIONIC_FOCUS") then
 		local tk_item = self:getInven("PSIONIC_FOCUS")[1]
-		if tk_item and ((tk_item.type == "gem") or (tk_item.subtype == "mindstar") or tk_item.combat.is_psionic_focus == true) then
+		if tk_item and ((tk_item.type == "gem") or tk_item.combat.is_psionic_focus == true) then
 			gem_level = tk_item.material_level or 5
 		end
 	end
diff --git a/game/modules/tome/data/talents/spells/golemancy.lua b/game/modules/tome/data/talents/spells/golemancy.lua
index 6a994e4387fbfd06d33de31fa04b53e9bb77f6d8..f1de5bfec21dfd62bb2ab9e486e6ed941da596b3 100644
--- a/game/modules/tome/data/talents/spells/golemancy.lua
+++ b/game/modules/tome/data/talents/spells/golemancy.lua
@@ -32,7 +32,7 @@ local function makeGolem(self)
 		type = "construct", subtype = "golem",
 		display = 'g', color=colors.WHITE, image = "npc/alchemist_golem.png",
 		moddable_tile = "runic_golem",
-		moddable_tile_nude = true,
+		moddable_tile_nude = 1,
 		moddable_tile_base = resolvers.generic(function() return "base_0"..rng.range(1, 5)..".png" end),
 --		level_range = {1, 50}, exp_worth=0,
 		level_range = {1, self.max_level}, exp_worth=0,
diff --git a/game/modules/tome/data/talents/spells/necrosis.lua b/game/modules/tome/data/talents/spells/necrosis.lua
index 5a7a16760da9328125cf1000ff441a7d5e26e7d8..33c9e3629307c95b97c8e71863720304d7ecb893 100644
--- a/game/modules/tome/data/talents/spells/necrosis.lua
+++ b/game/modules/tome/data/talents/spells/necrosis.lua
@@ -175,7 +175,7 @@ newTalent{
 		self.descriptor.subrace = "Lich"
 		if not self.has_custom_tile then
 			self.moddable_tile = "skeleton"
-			self.moddable_tile_nude = true
+			self.moddable_tile_nude = 1
 			self.moddable_tile_base = "base_lich_01.png"
 			self.moddable_tile_ornament = nil
 			self.attachement_spots = "race_skeleton"
diff --git a/game/modules/tome/data/talents/techniques/2h-assault.lua b/game/modules/tome/data/talents/techniques/2h-assault.lua
new file mode 100644
index 0000000000000000000000000000000000000000..ad3aa62edf02495e204b6f60cd5bf7e1baf61d64
--- /dev/null
+++ b/game/modules/tome/data/talents/techniques/2h-assault.lua
@@ -0,0 +1,188 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009 - 2014 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
+
+
+newTalent{
+	name = "Stunning Blow", short_name = "STUNNING_BLOW_ASSAULT", image = "talents/stunning_blow.png",
+	type = {"technique/2hweapon-assault", 1},
+	require = techs_req1,
+	points = 5,
+	cooldown = 6,
+	stamina = 8,
+	tactical = { ATTACK = { weapon = 2 }, DISABLE = { stun = 2 } },
+	requires_target = true,
+	on_pre_use = function(self, t, silent) if not self:hasTwoHandedWeapon() then if not silent then game.logPlayer(self, "You require a two handed weapon to use this talent.") end return false end return true end,
+	getDuration = function(self, t) return math.floor(self:combatTalentScale(t, 3, 7)) end,
+	action = function(self, t)
+		local weapon = self:hasTwoHandedWeapon()
+		if not weapon then return nil end
+
+		local tg = {type="hit", range=self:getTalentRange(t)}
+		local x, y, target = self:getTarget(tg)
+		if not x or not y or not target then return nil end
+		if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
+		local speed, hit = self:attackTargetWith(target, weapon.combat, nil, self:combatTalentWeaponDamage(t, 1, 1.5))
+
+		-- Try to stun !
+		if hit then
+			if target:canBe("stun") then
+				target:setEffect(target.EFF_STUNNED, t.getDuration(self, t), {apply_power=self:combatPhysicalpower()})
+			else
+				game.logSeen(target, "%s resists the stunning blow!", target.name:capitalize())
+			end
+		end
+
+		return true
+	end,
+	info = function(self, t)
+		return ([[Hits the target with your weapon, doing %d%% damage. If the attack hits, the target is stunned for %d turns.
+		The stun chance increases with your Physical Power.]])
+		:format(100 * self:combatTalentWeaponDamage(t, 1, 1.5), t.getDuration(self, t))
+	end,
+}
+
+newTalent{
+	name = "Fearless Cleave",
+	type = {"technique/2hweapon-assault", 2},
+	require = techs_req2,
+	points = 5,
+	cooldown = 0,
+	stamina = 16,
+	no_energy = false,
+	tactical = { ATTACK = { weapon = 2 }, CLOSEIN = 0.5 },
+	requires_target = true,
+	on_pre_use = function(self, t, silent) if not self:hasTwoHandedWeapon() then if not silent then game.logPlayer(self, "You require a two handed weapon to use this talent.") end return false end return true end,
+	action = function(self, t)
+		local weapon = self:hasTwoHandedWeapon()
+		if not weapon then return nil end
+
+		local tg = {type="hit", range=self:getTalentRange(t), simple_dir_request=true}
+		local x, y = self:getTarget(tg)
+		if not x or not y then return nil end
+		if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
+		local dir = util.getDir(x, y, self.x, self.y) or 6
+		local moved = 0.75
+		if self:canMove(x, y) then
+			self:move(x, y)
+			moved = 1
+		end
+
+		local fx, fy = util.coordAddDir(self.x, self.y, dir)
+		local lx, ly = util.coordAddDir(self.x, self.y, util.dirSides(dir, self.x, self.y).left)
+		local rx, ry = util.coordAddDir(self.x, self.y, util.dirSides(dir, self.x, self.y).right)
+		local target, lt, rt = game.level.map(fx, fy, Map.ACTOR), game.level.map(lx, ly, Map.ACTOR), game.level.map(rx, ry, Map.ACTOR)
+
+		if target then self:attackTargetWith(target, weapon.combat, nil, self:combatTalentWeaponDamage(t, 0.9, 2) * moved) end
+		if lt then     self:attackTargetWith(lt, weapon.combat, nil, self:combatTalentWeaponDamage(t, 0.9, 2) * moved) end
+		if rt then     self:attackTargetWith(rt, weapon.combat, nil, self:combatTalentWeaponDamage(t, 0.9, 2) * moved) end
+
+		return true
+	end,
+	info = function(self, t)
+		return ([[Take a step toward your foes using the momentum to cleave all creatures in a 3 wide arc in front of you for %d%% weapon damage.
+		If you failed to move the damage is instead %d%%.]])
+		:format(100 * self:combatTalentWeaponDamage(t, 0.9, 2), 100 * self:combatTalentWeaponDamage(t, 0.9, 2) * 0.75)
+	end,
+}
+
+newTalent{
+	name = "Death Dance", short_name = "DEATH_DANCE_ASSAULT", image = "talents/death_dance.png",
+	type = {"technique/2hweapon-assault", 3},
+	require = techs_req3,
+	points = 5,
+	cooldown = 10,
+	stamina = 30,
+	tactical = { ATTACKAREA = { weapon = 3 } },
+	range = 0,
+	radius = 1,
+	requires_target = true,
+	target = function(self, t)
+		return {type="ball", range=self:getTalentRange(t), selffire=false, radius=self:getTalentRadius(t)}
+	end,
+	on_pre_use = function(self, t, silent) if not self:hasTwoHandedWeapon() then if not silent then game.logPlayer(self, "You require a two handed weapon to use this talent.") end return false end return true end,
+	getBleed = function(self, t) return self:combatTalentScale(t, 0.5, 1.5) end,
+	action = function(self, t)
+		local weapon = self:hasTwoHandedWeapon()
+		if not weapon then
+			game.logPlayer(self, "You cannot use Death Dance without a two-handed weapon!")
+			return nil
+		end
+
+		local scale = nil
+		if self:getTalentLevel(t) >= 3 then
+			scale = t.getBleed(self, t)
+		end
+
+		local tg = self:getTalentTarget(t)
+		self:project(tg, self.x, self.y, function(px, py, tg, self)
+			local target = game.level.map(px, py, Map.ACTOR)
+			if target and target ~= self then
+				local oldlife = target.life
+				self:attackTargetWith(target, weapon.combat, nil, self:combatTalentWeaponDamage(t, 1.4, 2.1))
+				local life_diff = oldlife - target.life
+				if life_diff > 0 and target:canBe('cut') and scale then
+					target:setEffect(target.EFF_CUT, 5, {power=life_diff * scale / 5, src=self, apply_power=self:combatPhysicalpower()})
+				end
+			end
+		end)
+
+		self:addParticles(Particles.new("meleestorm", 1, {}))
+
+		return true
+	end,
+	info = function(self, t)
+		return ([[Spin around, extending your weapon and damaging all targets around you for %d%% weapon damage.
+		At level 3 all damage done will also make the targets bleed for an additional %d%% damage over 5 turns]]):format(100 * self:combatTalentWeaponDamage(t, 1.4, 2.1), t.getBleed(self, t) * 100)
+	end,
+}
+
+newTalent{
+	name = "Execution",
+	type = {"technique/2hweapon-assault", 4},
+	require = techs_req4,
+	points = 5,
+	cooldown = 8,
+	stamina = 25,
+	requires_target = true,
+	tactical = { ATTACK = { weapon = 1 } },
+	getPower = function(self, t) return self:combatTalentScale(t, 1.6, 4.3) end,
+	on_pre_use = function(self, t, silent) if not self:hasTwoHandedWeapon() then if not silent then game.logPlayer(self, "You require a two handed weapon to use this talent.") end return false end return true end,
+	action = function(self, t)
+		local weapon = self:hasTwoHandedWeapon()
+		if not weapon then return nil end
+
+		local tg = {type="hit", range=self:getTalentRange(t)}
+		local x, y, target = self:getTarget(tg)
+		if not x or not y or not target then return nil end
+		if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
+
+		local perc = 1 - (target.life / target.max_life)
+		local power = t.getPower()
+
+		self.turn_procs.auto_phys_crit = true
+		local speed, hit = self:attackTargetWith(target, weapon.combat, nil, power * perc * 100)
+		self.turn_procs.auto_phys_crit = nil
+		return true
+	end,
+	info = function(self, t)
+		return ([[Tries to perform a killing blow. For each missing %% of life of your target you deal %0.2f%% more weapon damage (I.E: at 30%% remaining life you would deal %0.2f%% weapon damage).
+		The blow is an automatic critical hit.]]):
+		format(t.getPower(self, t), t.getPower(self, t) * 70)
+	end,
+}
diff --git a/game/modules/tome/data/talents/techniques/archery.lua b/game/modules/tome/data/talents/techniques/archery.lua
index b8bed8a249192ea93cee7fcc85211893ff7da4d2..61d13014211fcbbe40e7c33b73a735b3b0fb9a31 100644
--- a/game/modules/tome/data/talents/techniques/archery.lua
+++ b/game/modules/tome/data/talents/techniques/archery.lua
@@ -59,6 +59,7 @@ newTalent{
 	innate = true,
 	points = 1,
 	tactical = { AMMO = 2 },
+	no_energy = true,
 	no_reload_break = true,
 	no_break_stealth = true,
 	on_pre_use = function(self, t, silent)
@@ -68,32 +69,20 @@ newTalent{
 		return true 
 	end,
 	no_unlearn_last = true,
-	shots_per_turn = function(self, t)
-		local v = math.max(self:getTalentLevelRaw(self.T_BOW_MASTERY), self:getTalentLevelRaw(self.T_SLING_MASTERY))
-		local add = 0
-		if v >= 5 then add = add + 3
-		elseif v >= 4 then add = add + 2
-		elseif v >= 2 then add = add + 1
-		end
-		return self:getTalentLevelRaw(t) + (self:attr("ammo_reload_speed") or 0) + add
-	end,
 	action = function(self, t)
-		local q, err = self:hasAmmo()
-		if not q then
-			game.logPlayer(self, "%s", err)
-			return
+		if self.resting then return end
+		local ret = self:reload()
+		if ret then
+			self:setEffect(self.EFF_RELOAD_DISARMED, 1, {})
 		end
-		if q.combat.shots_left >= q.combat.capacity then
-			game.logPlayer(self, "Your %s is full.", q.name)
-			return
-		end
-		self:setEffect(self.EFF_RELOADING, q.combat.capacity, {ammo = q, shots_per_turn = t.shots_per_turn(self, t)})
 		return true
 	end,
 	info = function(self, t)
-		local spt = t.shots_per_turn(self, t)
-		return ([[Reload your quiver or shot pouch at the rate of %d shot%s per turn (depends on the ammo used).
-		Reloading does not break stealth.]]):format(spt, (spt > 1 and "s") or "")
+		return ([[Quickly reload your ammo by %d (depends on masteries and object bonuses).
+		Doing so requires no turn but you are considered disarmed for 2 turns.
+
+		Reloading does not break stealth.]])
+		:format(self:reloadRate())
 	end,
 }
 
diff --git a/game/modules/tome/data/talents/techniques/bloodthirst.lua b/game/modules/tome/data/talents/techniques/bloodthirst.lua
index c8bfd15eb99b10564a0e5775d0bc410f7b4c6126..48903d9fea21e7167d0be05fd8743c64941fe757 100644
--- a/game/modules/tome/data/talents/techniques/bloodthirst.lua
+++ b/game/modules/tome/data/talents/techniques/bloodthirst.lua
@@ -17,37 +17,12 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
-
 newTalent{
-	name = "Bloodbath",
+	name = "Mortal Terror",
 	type = {"technique/bloodthirst", 1},
 	require = techs_req_high1,
 	points = 5,
 	mode = "passive",
-	getHealth = function(self,t) return self:combatTalentLimit(t, 50, 2, 10)  end,  -- Limit max health increase to <+50%
-	getDuration = function(self, t) return math.floor(self:combatTalentScale(t, 6, 10)) end,
-	getRegen = function (self, t) return self:combatTalentScale(t, 1.7, 5) end,
-	getMax = function(self, t) return 5*self:combatTalentScale(t, 1.7, 5) end,
-	-- called by _M:attackTargetWith in mod.class.interface.Combat.lua
-	do_bloodbath = function(self, t)
-		self:setEffect(self.EFF_BLOODBATH, t.getDuration(self, t), {regen=t.getRegen(self, t), max=t.getMax(self, t), hp=t.getHealth(self,t)})
-	end,
-	info = function(self, t)
-		local regen = t.getRegen(self, t)
-		local max_regen = t.getMax(self, t)
-		local max_health = t.getHealth(self,t)
-		return ([[Delight in spilling the blood of your foes.  After scoring a critical hit, your maximum hit points will be increased by %d%%, your life regeneration by %0.2f per turn, and your stamina regeneration by %0.2f per turn for %d turns.
-		The life and stamina regeneration will stack up to five times, for a maximum of %0.2f and %0.2f each turn, respectively.]]):
-		format(t.getHealth(self, t), regen, regen/5, t.getDuration(self, t),max_regen, max_regen/5)
-	end,
-}
-
-newTalent{
-	name = "Mortal Terror",
-	type = {"technique/bloodthirst", 2},
-	require = techs_req_high2,
-	points = 5,
-	mode = "passive",
 	threshold = function(self,t) return self:combatTalentLimit(t, 10, 45, 25) end, -- Limit >10%
 	getCrit = function(self, t) return self:combatTalentScale(t, 2.8, 14) end,
 	do_terror = function(self, t, target, dam)
@@ -77,18 +52,42 @@ newTalent{
 }
 
 newTalent{
-	name = "Bloodrage",
-	type = {"technique/bloodthirst", 3},
-	require = techs_req_high3,
+	name = "Bloodbath",
+	type = {"technique/bloodthirst", 2},
+	require = techs_req_high2,
 	points = 5,
 	mode = "passive",
+	getHealth = function(self,t) return self:combatTalentLimit(t, 50, 2, 10)  end,  -- Limit max health increase to <+50%
 	getDuration = function(self, t) return math.floor(self:combatTalentScale(t, 6, 10)) end,
-	on_kill = function(self, t)
-		self:setEffect(self.EFF_BLOODRAGE, t.getDuration(self, t), {max=math.floor(self:getTalentLevel(t) * 6), inc=2})
+	getRegen = function (self, t) return self:combatTalentScale(t, 1.7, 5) end,
+	getMax = function(self, t) return 5*self:combatTalentScale(t, 1.7, 5) end,
+	-- called by _M:attackTargetWith in mod.class.interface.Combat.lua
+	do_bloodbath = function(self, t)
+		self:setEffect(self.EFF_BLOODBATH, t.getDuration(self, t), {regen=t.getRegen(self, t), max=t.getMax(self, t), hp=t.getHealth(self,t)})
+	end,
+	info = function(self, t)
+		local regen = t.getRegen(self, t)
+		local max_regen = t.getMax(self, t)
+		local max_health = t.getHealth(self,t)
+		return ([[Delight in spilling the blood of your foes.  After scoring a critical hit, your maximum hit points will be increased by %d%%, your life regeneration by %0.2f per turn, and your stamina regeneration by %0.2f per turn for %d turns.
+		The life and stamina regeneration will stack up to five times, for a maximum of %0.2f and %0.2f each turn, respectively.]]):
+		format(t.getHealth(self, t), regen, regen/5, t.getDuration(self, t),max_regen, max_regen/5)
 	end,
+}
+
+newTalent{
+	name = "Bloody Butcher",
+	type = {"technique/bloodthirst", 3},
+	require = techs_req_high3,
+	points = 5,
+	mode = "passive",
+	getDam = function(self, t) return self:combatScale(self:getStr(7, true) * self:getTalentLevel(t), 5, 0, 40, 35) end,
+	getResist = function(self,t) return self:combatTalentLimit(t, 50, 10, 40) end,
 	info = function(self, t)
-		return ([[Each time one of your foes bites the dust, you feel a surge of power, increasing your strength by 2 up to a maximum of %d for %d turns.]]):
-		format(math.floor(self:getTalentLevel(t) * 6), t.getDuration(self, t))
+		return ([[You delight in the inflicting of wounds, providing %d physical power.
+		In addition when you make a creature bleed its physical damage resistance is reduced by %d%% (but never below 0%%).
+		Physical power depends on your Strength stat.]]):
+		format(t.getDam(self, t), t.getResist(self, t))
 	end,
 }
 
@@ -108,7 +107,8 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[You enter a battle frenzy for %d turns. During that time, you can not use items, healing has no effect, and your health cannot drop below 1.
-		At the end of the frenzy, you regain %d%% of your health per foe slain during the frenzy.]]):
+		At the end of the frenzy, you regain %d%% of your health per foe slain during the frenzy.
+		While Unstoppable is active, Berserker Rage critical bonus is disabled as you loose the thrill of the risk of death.]]):
 		format(t.getDuration(self, t), t.getHealPercent(self,t))
 	end,
 }
diff --git a/game/modules/tome/data/talents/techniques/bow.lua b/game/modules/tome/data/talents/techniques/bow.lua
index 229f5a56bdbf0ffbe34675beea3698e52d378be2..dfc4f0b913c7e897a419f36f9d7c06267ca1003f 100644
--- a/game/modules/tome/data/talents/techniques/bow.lua
+++ b/game/modules/tome/data/talents/techniques/bow.lua
@@ -25,16 +25,18 @@ newTalent{
 	mode = "passive",
 	getDamage = function(self, t) return self:getTalentLevel(t) * 10 end,
 	getPercentInc = function(self, t) return math.sqrt(self:getTalentLevel(t) / 5) / 2 end,
+	ammo_mastery_reload = function(self, t)
+		return math.floor(self:getTalentLevel(t) / 2)
+	end,
+	passives = function(self, t, p)
+		self:talentTemporaryValue(p, 'ammo_mastery_reload', t.ammo_mastery_reload(self, t))
+	end,
 	info = function(self, t)
 		local damage = t.getDamage(self, t)
 		local inc = t.getPercentInc(self, t)
+		local reloads = t.ammo_mastery_reload(self, t)
 		return ([[Increases Physical Power by %d and increases weapon damage by %d%% when using bows.
-		Also, when using Reload:
-		At level 2 it grants one more reload per turn.
-		At level 4 it grants two more reloads per turn.
-		At level 5 it grants three more reloads per turn.
-		]]):
-		format(damage, inc * 100)
+		Also, increases your reload rate by %d.]]):format(damage, inc * 100, reloads)
 	end,
 }
 
diff --git a/game/modules/tome/data/talents/techniques/combat-training.lua b/game/modules/tome/data/talents/techniques/combat-training.lua
index d45993ff3d6f3d1e0c42ea5729071bd98c72d348..e50c9f6a66914d1ede30d35a7a842f99cde32ac2 100644
--- a/game/modules/tome/data/talents/techniques/combat-training.lua
+++ b/game/modules/tome/data/talents/techniques/combat-training.lua
@@ -108,7 +108,8 @@ newTalent{
 	levelup_screen_break_line = true,
 	require = { level=function(level) return (level - 1) * 4 end },
 	mode = "passive",
-	getAttack = function(self, t) return self:getTalentLevel(t) * 10 end,
+	--getAttack = function(self, t) return self:getTalentLevel(t) * 10 end,
+	getAttack = function(self, t) return self:combatTalentScale(t, 10, 50) end, -- match values at 1 and 5 for old formula
 	info = function(self, t)
 		local attack = t.getAttack(self, t)
 		return ([[Increases the accuracy of unarmed, melee and ranged weapons by %d.]]):
diff --git a/game/modules/tome/data/talents/techniques/excellence.lua b/game/modules/tome/data/talents/techniques/excellence.lua
index efd45bb71ac10ada6289d6a6298bb9b970a2402c..ce224a253cfb153e7cfadc5f8747d99457a6b0b6 100644
--- a/game/modules/tome/data/talents/techniques/excellence.lua
+++ b/game/modules/tome/data/talents/techniques/excellence.lua
@@ -143,7 +143,7 @@ newTalent{
 	require = techs_dex_req_high3,
 	tactical = { BUFF = 2 },
 	getDist = function(self, t) return math.floor(self:combatTalentLimit(t, 11, 1, 3)) end, -- Limit <=10
-	getChance = function(self, t) return math.floor(self:combatTalentLimit(t, 100, 20, 50)) end,
+	getChance = function(self, t) return math.floor(self:combatTalentLimit(t, 50, 5, 40)) end,
 	archery_onhit = function(self, t, target, x, y)
 		if not target or not target:canBe("knockback") then return end
 		target:knockback(self.x, self.y, t.getDist(self, t))
diff --git a/game/modules/tome/data/talents/techniques/finishing-moves.lua b/game/modules/tome/data/talents/techniques/finishing-moves.lua
index f1e1d104796f533e3d8c2e327cd686a5a56d3c1e..6d4995058b1560a97c86a6426f62d1f3e9353cf6 100644
--- a/game/modules/tome/data/talents/techniques/finishing-moves.lua
+++ b/game/modules/tome/data/talents/techniques/finishing-moves.lua
@@ -101,7 +101,8 @@ newTalent{
 
 		if hit then
 			local tg = {type="ball", range=1, radius=self:getTalentRadius(t), selffire=false, talent=t}
-			local damage = t.getAreaDamage(self, t) * (0.25 + (self:getCombo(combo) /5))
+			local damage = self:physicalCrit(t.getAreaDamage(self, t) * (0.25 + (self:getCombo(combo) /5)), nil, target, self:combatAttack(), target:combatDefense())
+			--local damage = self:physicalCrit(t.getAreaDamage(self, t) * (0.25 + (self:getCombo(combo) /5)))
 			self:project(tg, x, y, DamageType.PHYSICAL, damage)
 			game.level.map:particleEmitter(x, y, tg.radius, "ball_earth", {radius=tg.radius})
 			game:playSoundNear(self, "talents/breath")
diff --git a/game/modules/tome/data/talents/techniques/grappling.lua b/game/modules/tome/data/talents/techniques/grappling.lua
index dae486f58cfa4117feafc87b0e0dda0b6b053faf..b82f8719e6c1424bfad56ec932e7903ff6aafa12 100644
--- a/game/modules/tome/data/talents/techniques/grappling.lua
+++ b/game/modules/tome/data/talents/techniques/grappling.lua
@@ -16,7 +16,7 @@
 --
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
-
+-- Obsolete but undeleted incase something uses it 
 newTalent{
 	name = "Grappling Stance",
 	type = {"technique/unarmed-other", 1},
@@ -62,20 +62,11 @@ newTalent{
 	stamina = 5,
 	tactical = { ATTACK = 2, DISABLE = 2 },
 	requires_target = true,
-	getDuration = function(self, t) return math.floor(self:combatTalentScale(t, 5, 8)) end,
-	getPower = function(self, t) return self:combatTalentPhysicalDamage(t, 5, 25) end,
-	getDrain = function(self, t) return 6 - math.max(1, self:getTalentLevelRaw(t) or 0) end,
-	-- Learn the appropriate stance
-	on_learn = function(self, t)
-		if not self:knowTalent(self.T_GRAPPLING_STANCE) then
-			self:learnTalent(self.T_GRAPPLING_STANCE, true, nil, {no_unlearn=true})
-		end
-	end,
-	on_unlearn = function(self, t)
-		if not self:knowTalent(t) then
-			self:unlearnTalent(self.T_GRAPPLING_STANCE)
-		end
-	end,
+	getDuration = function(self, t) return math.floor(self:combatTalentScale(t, 3, 7)) end,
+	getPower = function(self, t) return self:combatTalentPhysicalDamage(t, 20, 60) end,
+	getDrain = function(self, t) return 6 end,
+	getSharePct = function(self, t) return math.min(0.35, self:combatTalentScale(t, 0.05, 0.25)) end,
+	getDamage = function(self, t) return 1 end,
 	action = function(self, t)
 
 		local tg = {type="hit", range=self:getTalentRange(t)}
@@ -85,11 +76,6 @@ newTalent{
 
 		local grappled = false
 
-		-- force stance change
-		if target and not self:isTalentActive(self.T_GRAPPLING_STANCE) then
-			self:forceUseTalent(self.T_GRAPPLING_STANCE, {ignore_energy=true, ignore_cd = true})
-		end
-
 		-- breaks active grapples if the target is not grappled
 		if target:isGrappled(self) then
 			grappled = true
@@ -103,196 +89,219 @@ newTalent{
 		end
 
 		-- start the grapple; this will automatically hit and reapply the grapple if we're already grappling the target
-		local hit = self:startGrapple(target)
-
-		local duration = t.getDuration(self, t)
-
-		-- do crushing hold or strangle if we're already grappling the target
-		if hit and self:knowTalent(self.T_CRUSHING_HOLD) then
-			local t = self:getTalentFromId(self.T_CRUSHING_HOLD)
-			if grappled and not target:attr("no_breath") and not target:attr("undead") and target:canBe("silence") then
-				target:setEffect(target.EFF_STRANGLE_HOLD, duration, {src=self, power=t.getDamage(self, t) * 1.5})
-			else
-				target:setEffect(target.EFF_CRUSHING_HOLD, duration, {src=self, power=t.getDamage(self, t)})
-			end
-		end
-
+		local hit self:attackTarget(target, nil, t.getDamage(self, t), true)
+		local hit2 = self:startGrapple(target)
+		
 		return true
 	end,
 	info = function(self, t)
 		local duration = t.getDuration(self, t)
 		local power = t.getPower(self, t)
 		local drain = t.getDrain(self, t)
-		return ([[Grapples a target up to one size category larger then yourself for %d turns. A grappled opponent will be unable to move, and its Accuracy and Defense will be reduced by %d.  Any movement from the target or you will break the grapple.  Maintaining a grapple drains %d stamina per turn.
-		You may only grapple a single target at a time, and using any targeted unarmed talent on a target that you're not grappling will break the grapple.
-		The grapple Accuracy and Defense reduction, as well as the grapple success chance, will scale with your Physical Power.
-		Performing this action will switch your stance to Grappling Stance.]])
-		:format(duration, power, drain)
+		local share = t.getSharePct(self, t)*100
+		local damage = t.getDamage(self, t)*100
+		return ([[Make a melee attack for %d%% damage and then attempt to grapple a target up to one size category larger then yourself for %d turns. A grappled opponent will be unable to move, take %d damage each turn, and %d%% of the damage you receive from any source will be redirected to them.  Any movement from the target or you will break the grapple.  Maintaining a grapple drains %d stamina per turn.
+		You may only grapple a single target at a time, and using any targeted unarmed talent on a target that you're not grappling will break the grapple.]])
+		:format(damage, duration, power, share, drain)
 	end,
 }
 
+-- I tried to keep this relatively consistent with the existing Grappling code structure, but it wound up pretty awkward as a result
 newTalent{
-	name = "Maim",
+	name = "Crushing Hold",
 	type = {"technique/grappling", 2},
 	require = techs_req2,
+	mode = "passive",
 	points = 5,
-	random_ego = "attack",
-	cooldown = 12,
-	stamina = 10,
-	tactical = { ATTACK = { PHYSICAL = 2 }, DISABLE = 2 },
+	tactical = { ATTACK = { PHYSICAL = 2 }, DISABLE = { silence = 2 } },
 	requires_target = true,
-	getDuration = function(self, t) return math.floor(self:combatTalentScale(t, 3, 7)) end,
-	getDamage = function(self, t) return self:combatTalentPhysicalDamage(t, 10, 100) * getUnarmedTrainingBonus(self) end,
-	getMaim = function(self, t) return self:combatTalentPhysicalDamage(t, 5, 30) end,
-	-- Learn the appropriate stance
-	action = function(self, t)
-
-		local tg = {type="hit", range=self:getTalentRange(t)}
-		local x, y, target = self:getTarget(tg)
-		if not x or not y or not target then return nil end
-		if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
-
-		local grappled = false
-
-		-- breaks active grapples if the target is not grappled
-		if target:isGrappled(self) then
-			grappled = true
+	getDamage = function(self, t) return self:combatTalentPhysicalDamage(t, 5, 50) * getUnarmedTrainingBonus(self) end, -- this function shouldn't be used any more but I left it in to be safe, Clinch now handles the damage 
+	getSlow = function(self, t)
+		if self:getTalentLevel(self.T_CRUSHING_HOLD) >= 5 then
+			return self:combatTalentPhysicalDamage(t, 0.05, 0.65)
 		else
-			self:breakGrapples()
+			return 0
 		end
-
-		-- end the talent without effect if the target is to big
-		if self:grappleSizeCheck(target) then
-			return true
-		end
-
-		-- start the grapple; this will automatically hit and reapply the grapple if we're already grappling the target
-		local hit = self:startGrapple (target)
-		-- deal damage and maim if appropriate
-		if hit then
-			if grappled then
-				self:project(target, x, y, DamageType.PHYSICAL, self:physicalCrit(t.getDamage(self, t), nil, target, self:combatAttack(), target:combatDefense()))
-				target:setEffect(target.EFF_MAIMED, t.getDuration(self, t), {power=t.getMaim(self, t)})
-			else
-				self:project(target, x, y, DamageType.PHYSICAL, self:physicalCrit(t.getDamage(self, t), nil, target, self:combatAttack(), target:combatDefense()))
-			end
+	end,
+	getDamageReduction = function(self, t)
+		return self:combatTalentPhysicalDamage(t, 1, 15)
+	end,
+	getSilence = function(self, t) -- this is a silence without an immunity check by design, if concerned about NPC use this is the talent to block
+		if self:getTalentLevel(self.T_CRUSHING_HOLD) >= 3 then
+			return 1
+		else
+			return 0
 		end
-
-		return true
 	end,
-	info = function(self, t)
-		local duration = t.getDuration(self, t)
-		local damage = t.getDamage(self, t)
-		local maim = t.getMaim(self, t)
-		return ([[Grapples the target and inflicts %0.2f physical damage.  If the target is already grappled, the target will be maimed as well, reducing damage by %d and global speed by 30%% for %d turns.
-		The grapple effects will be based off your grapple talent, if you have it, and the damage will scale with your Physical Power.]])
-		:format(damDesc(self, DamageType.PHYSICAL, (damage)), maim, duration)
+	getBonusEffects = function(self, t) -- used by startGrapple in Combat.lua, essentially merges these properties and the Clinch bonuses
+		return {silence = t.getSilence(self, t), slow = t.getSlow(self, t), reduce = t.getDamageReduction(self, t)}	
 	end,
-}
-
-newTalent{
-	name = "Crushing Hold",
-	type = {"technique/grappling", 3},
-	require = techs_req3,
-	mode = "passive",
-	points = 5,
-	tactical = { ATTACK = { PHYSICAL = 2 }, DISABLE = { silence = 2 } },
-	requires_target = true,
-	getDamage = function(self, t) return self:combatTalentPhysicalDamage(t, 5, 50) * getUnarmedTrainingBonus(self) end,
 	info = function(self, t)
-		local damage = t.getDamage(self, t)
-		return ([[Your clinch talent now starts a crushing hold that deals %0.2f physical damage each turn.  If the target is already grappled, the hold will instead become a stranglehold, silencing the target and inflicting %0.2f physical damage each turn.
-		Undead, targets immune to silence, and creatures that do not breathe are immune to the strangle effect, and will only be affected by the crushing hold.
-		The damage will scale with your Physical Power.]])
-		:format(damDesc(self, DamageType.PHYSICAL, (damage)), damDesc(self, DamageType.PHYSICAL, (damage * 1.5)))
+		local reduction = t.getDamageReduction(self, t)
+		local slow = t.getSlow(self, t)
+		
+		return ([[Enhances your grapples with additional effects.  All additional effects will apply to every grapple with no additional save or resist check.
+		#RED#Talent Level 1:  Reduces base weapon damage by %d
+		Talent Level 3:  Silences
+		Talent Level 5:  Reduces global action speed by %d%%]])
+		:format(reduction, slow*100)
 	end,
 }
 
 newTalent{
 	name = "Take Down",
-	type = {"technique/grappling", 4},
-	require = techs_req4,
+	type = {"technique/grappling", 3},
+	require = techs_req3,
 	points = 5,
 	random_ego = "attack",
-	cooldown = 24,
-	stamina = 12,
-	tactical = { ATTACK = { PHYSICAL = 1, stun = 1}, DISABLE = { stun = 2 }, CLOSEIN = 2 },
+	cooldown = 10,
+	stamina = 15,
+	tactical = { ATTACK = { PHYSICAL = 1}, CLOSEIN = 2 },
 	requires_target = true,
 	range = function(self, t) return math.floor(self:combatTalentScale(t, 2.3, 3.7)) end,
 	getDuration = function(self, t) return math.floor(self:combatTalentScale(t, 3, 7)) end,
 	getTakeDown = function(self, t) return self:combatTalentPhysicalDamage(t, 10, 100) * getUnarmedTrainingBonus(self) end,
-	getSlam = function(self, t) return self:combatTalentPhysicalDamage(t, 15, 150) * getUnarmedTrainingBonus(self) end,
-	-- Learn the appropriate stance
+	getSlam = function(self, t) return self:combatTalentPhysicalDamage(t, 10, 400) * getUnarmedTrainingBonus(self) end,
+	getDamage = function(self, t)
+		return self:combatTalentWeaponDamage(t, .1, 1)
+	end,
 	action = function(self, t)
-		local tg = {type="hit", range=self:getTalentRange(t)}
-		local x, y, target = self:getTarget(tg)
-		if not x or not y or not target then return nil end
-		if core.fov.distance(self.x, self.y, x, y) > self:getTalentRange(t) then return nil end
 
-		local grappled = false
+		-- if the target is grappled then do an attack+AoE project
+		if self:hasEffect(self.EFF_GRAPPLING) then
+			local target = self:hasEffect(self.EFF_GRAPPLING)["trgt"]
+			local tg = {type="ball", range=1, radius=5, selffire=false}
 
-		-- do the rush
-		local block_actor = function(_, bx, by) return game.level.map:checkEntity(bx, by, Map.TERRAIN, "block_move", self) end
-		local l = self:lineFOV(x, y, block_actor)
-		local lx, ly, is_corner_blocked = l:step()
-		local tx, ty = self.x, self.y
-		while lx and ly do
-			if is_corner_blocked or game.level.map:checkAllEntities(lx, ly, "block_move", self) then break end
-			tx, ty = lx, ly
-			lx, ly, is_corner_blocked = l:step()
-		end
+			local hit = self:attackTarget(target, nil, t.getDamage(self, t), true)
+			local slam = self:physicalCrit(t.getSlam(self, t), nil, target, self:combatAttack(), target:combatDefense())
+			self:project(tg, self.x, self.y, DamageType.PHYSICAL, slam, {type="bones"})
+			
+			self:breakGrapples()
+					
+			return true
+		else
+			local tg = {type="hit", range=self:getTalentRange(t)}
+			local x, y, target = self:getTarget(tg)
+			if not x or not y or not target then return nil end
+			if core.fov.distance(self.x, self.y, x, y) > self:getTalentRange(t) then return nil end
+		
 
-		local ox, oy = self.x, self.y
-		self:move(tx, ty, true)
-		if config.settings.tome.smooth_move > 0 then
-			self:resetMoveAnim()
-			self:setMoveAnim(ox, oy, 8, 5)
-		end
+			local grappled = false
 
-		-- breaks active grapples if the target is not grappled
-		if target:isGrappled(self) then
-			grappled = true
-		else
-			self:breakGrapples()
-		end
+			-- do the rush
+			local block_actor = function(_, bx, by) return game.level.map:checkEntity(bx, by, Map.TERRAIN, "block_move", self) end
+			local l = self:lineFOV(x, y, block_actor)
+			local lx, ly, is_corner_blocked = l:step()
+			local tx, ty = self.x, self.y
+			while lx and ly do
+				if is_corner_blocked or game.level.map:checkAllEntities(lx, ly, "block_move", self) then break end
+				tx, ty = lx, ly
+				lx, ly, is_corner_blocked = l:step()
+			end
 
-		if core.fov.distance(self.x, self.y, x, y) == 1 then
-			-- end the talent without effect if the target is to big
-			if self:grappleSizeCheck(target) then
-				return true
+			local ox, oy = self.x, self.y
+			self:move(tx, ty, true)
+			if config.settings.tome.smooth_move > 0 then
+				self:resetMoveAnim()
+				self:setMoveAnim(ox, oy, 8, 5)
 			end
 
-			-- start the grapple; this will automatically hit and reapply the grapple if we're already grappling the target
-			local hit = self:startGrapple (target)
-			-- takedown or slam as appropriate
-			if hit then
-				if grappled then
-					self:project(target, x, y, DamageType.PHYSICAL, self:physicalCrit(t.getSlam(self, t), nil, target, self:combatAttack(), target:combatDefense()))
-					if target:canBe("stun") then
-						target:setEffect(target.EFF_STUNNED, t.getDuration(self, t), {apply_power=self:combatPhysicalpower()})
-					else
-						game.logSeen(target, "%s resists the stun!", target.name:capitalize())
-					end
-				else
-					self:project(target, x, y, DamageType.PHYSICAL, self:physicalCrit(t.getTakeDown(self, t), nil, target, self:combatAttack(), target:combatDefense()))
-					if target:canBe("stun") then
-						target:setEffect(target.EFF_DAZED, t.getDuration(self, t), {apply_power=self:combatPhysicalpower()})
-					else
-						game.logSeen(target, "%s resists the daze!", target.name:capitalize())
-					end
+			-- breaks active grapples if the target is not grappled
+			if target:isGrappled(self) then
+				grappled = true
+			else
+				self:breakGrapples()
+			end
+
+			if core.fov.distance(self.x, self.y, x, y) == 1 then
+				-- end the talent without effect if the target is to big
+				if self:grappleSizeCheck(target) then
+					return true
 				end
+
+				-- start the grapple; this will automatically hit and reapply the grapple if we're already grappling the target
+				local hit = self:attackTarget(target, nil, t.getDamage(self, t), true)	
+				local hit2 = self:startGrapple (target)
+				
 			end
-		end
 
-		return true
+			return true
+			end
 	end,
 	info = function(self, t)
-		local duration = t.getDuration(self, t)
-		local takedown = t.getTakeDown(self, t)
+		local takedown = t.getDamage(self, t)*100
 		local slam = t.getSlam(self, t)
-		return ([[Rushes forward and attempts to take the target to the ground, starting a grapple, inflicting %0.2f physical damage, and dazing the target for %d turns.  If you're already grappling the target you'll instead slam them into the ground for %0.2f physical damage and potentially stun them for %d turns.
+		return ([[Rushes forward and attempts to take the target to the ground, making a melee attack for %d%% damage then attempting to grapple them. If you're already grappling the target you'll instead slam them into the ground creating a radius 5 shockwave for %d physical damage and breaking your grapple.
 		The grapple effects and duration will be based off your grapple talent, if you have it, and the damage will scale with your Physical Power.]])
-		:format(damDesc(self, DamageType.PHYSICAL, (takedown)), duration, damDesc(self, DamageType.PHYSICAL, (slam)), duration)
+		:format(damDesc(self, DamageType.PHYSICAL, (takedown)), damDesc(self, DamageType.PHYSICAL, (slam)))
 	end,
 }
 
+newTalent{
+	name = "Hurricane Throw",
+	type = {"technique/grappling", 4},
+	require = techs_str_req4,
+	points = 5,
+	random_ego = "attack",
+	requires_target = true,
+	cooldown = function(self, t)
+		return 8
+	end,
+	stamina = 20,
+	range = function(self, t)
+		return 8
+	end,
+	radius = function(self, t)
+		return 1
+	end,
+	getDamage = function(self, t)
+		return self:combatTalentWeaponDamage(t, 1, 3.5) -- no interaction with Striking Stance so we make the base damage higher to compensate
+	end,
+	target = function(self, t)
+		return {type="ball", range=self:getTalentRange(t), selffire=false, radius=self:getTalentRadius(t)}
+	end,
+	action = function(self, t)
+	
+		if self:hasEffect(self.EFF_GRAPPLING) then
+			local grappled = self:hasEffect(self.EFF_GRAPPLING)["trgt"]
+			
+			local tg = self:getTalentTarget(t)
+			local x, y, target = self:getTarget(tg)
+			if not x or not y then return nil end
+			local _ _, x, y = self:canProject(tg, x, y)
+			
+			-- if the target square is an actor, find a free grid around it instead
+			if game.level.map(x, y, Map.ACTOR) then
+				x, y = util.findFreeGrid(x, y, 1, true, {[Map.ACTOR]=true})
+				if not x then return end
+			end
+
+			if game.level.map:checkAllEntities(x, y, "block_move") then return end
+
+			local ox, oy = grappled.x, grappled.y
+			grappled:move(x, y, true)
+			if config.settings.tome.smooth_move > 0 then
+				grappled:resetMoveAnim()
+				grappled:setMoveAnim(ox, oy, 8, 5)
+			end
+			
+			-- pick all targets around the landing point and do a melee attack
+			self:project(tg, grappled.x, grappled.y, function(px, py, tg, self)
+				local target = game.level.map(px, py, Map.ACTOR)
+				if target and target ~= self then
+				
+					local hit = self:attackTarget(target, nil, t.getDamage(self, t), true)
+					self:breakGrapples()
+				end
+			end)
+			return true
+
+		else
+			-- only usable if you have something Grappled
+			return false
+		end
+	end,
+	info = function(self, t)
+		return ([[In a mighty show of strength you whirl your grappled victim around and throw them into the air causing %d%% damage to them and any nearby enemies they collide with on landing.]]):format(t.getDamage(self, t)*100)	
+	end,
+}
diff --git a/game/modules/tome/data/talents/techniques/sling.lua b/game/modules/tome/data/talents/techniques/sling.lua
index 37bc5751a6f73dd4b0de7fca748ae267bbc6652b..4bd22e85df9a51297c482921e4efa791b94a31cb 100644
--- a/game/modules/tome/data/talents/techniques/sling.lua
+++ b/game/modules/tome/data/talents/techniques/sling.lua
@@ -25,16 +25,18 @@ newTalent{
 	mode = "passive",
 	getDamage = function(self, t) return self:getTalentLevel(t) * 10 end,
 	getPercentInc = function(self, t) return math.sqrt(self:getTalentLevel(t) / 5) / 2 end,
+	ammo_mastery_reload = function(self, t)
+		return math.floor(self:getTalentLevel(t) / 2)
+	end,
+	passives = function(self, t, p)
+		self:talentTemporaryValue(p, 'ammo_mastery_reload', t.ammo_mastery_reload(self, t))
+	end,
 	info = function(self, t)
 		local damage = t.getDamage(self, t)
 		local inc = t.getPercentInc(self, t)
+		local reloads = t.ammo_mastery_reload(self, t)
 		return ([[Increases Physical Power by %d and increases weapon damage by %d%% when using slings.
-		Also, when using Reload:
-		At level 2, it grants one more reload per turn.
-		At level 4, it grants two more reloads per turn.
-		At level 5, it grants three more reloads per turn.
-		]]):
-		format(damage, inc * 100)
+		Also, increases your reload rate by %d.]]):format(damage, inc * 100, reloads)
 	end,
 }
 
diff --git a/game/modules/tome/data/talents/techniques/strength-of-the-berserker.lua b/game/modules/tome/data/talents/techniques/strength-of-the-berserker.lua
new file mode 100644
index 0000000000000000000000000000000000000000..b20bfe5c747128924db2a41a8ca0e7e8af2f023c
--- /dev/null
+++ b/game/modules/tome/data/talents/techniques/strength-of-the-berserker.lua
@@ -0,0 +1,225 @@
+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009 - 2014 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
+
+newTalent{
+	name = "Warshout", short_name = "WARSHOUT_BERSERKER", image = "talents/warshout.png",
+	type = {"technique/strength-of-the-berserker",1},
+	require = techs_req1,
+	points = 5,
+	message = function(self) if self.subtype == "rodent" then return "@Source@ uses Warsqueak." else return "@Source@ uses Warshout." end end ,
+	stamina = 30,
+	cooldown = 18,
+	tactical = { ATTACKAREA = { confusion = 1 }, DISABLE = { confusion = 3 } },
+	range = 0,
+	radius = function(self, t) return math.floor(self:combatTalentScale(t, 4, 8)) end,
+	getDuration = function(self, t) return math.floor(self:combatTalentScale(t, 4, 8)) end,
+	requires_target = true,
+	target = function(self, t)
+		return {type="cone", range=self:getTalentRange(t), radius=self:getTalentRadius(t), selffire=false}
+	end,
+	on_pre_use = function(self, t, silent) if not self:hasTwoHandedWeapon() then if not silent then game.logPlayer(self, "You require a two handed weapon to use this talent.") end return false end return true end,
+	action = function(self, t)
+		local weapon = self:hasTwoHandedWeapon()
+		if not weapon then return nil end
+
+		local tg = self:getTalentTarget(t)
+		local x, y = self:getTarget(tg)
+		if not x or not y then return nil end
+		self:project(tg, x, y, DamageType.CONFUSION, {
+			dur=t.getDuration(self, t),
+			dam=50+self:getTalentLevelRaw(t)*10,
+			power_check=function() return self:combatPhysicalpower() end,
+			resist_check=self.combatPhysicalResist,
+		})
+		game.level.map:particleEmitter(self.x, self.y, tg.radius, "directional_shout", {life=8, size=3, tx=x-self.x, ty=y-self.y, distorion_factor=0.1, radius=self:getTalentRadius(t), nb_circles=8, rm=0.8, rM=1, gm=0.4, gM=0.6, bm=0.1, bM=0.2, am=1, aM=1})
+		if core.shader.allow("distort") then game.level.map:particleEmitter(self.x, self.y, tg.radius, "gravity_breath", {life=8, radius=tg.radius, tx=x-self.x, ty=y-self.y, allow=true}) end
+		return true
+	end,
+	info = function(self, t)
+		return ([[Shout your warcry in a frontal cone of radius %d. Any targets caught inside will be confused for %d turns.]]):
+		format(self:getTalentRadius(t), t.getDuration(self, t))
+	end,
+}
+
+newTalent{
+	name = "Berserker Rage", image = "talents/berserker.png",
+	type = {"technique/strength-of-the-berserker", 2},
+	require = techs_req2,
+	points = 5,
+	mode = "sustained",
+	cooldown = 10,
+	no_energy = true,
+	sustain_stamina = 20,
+	no_npc_use = true, -- sad but the AI wouldnt use this well at all
+	on_pre_use = function(self, t, silent) if not self:hasTwoHandedWeapon() then if not silent then game.logPlayer(self, "You require a two handed weapon to use this talent.") end return false end return true end,
+	getDam = function(self, t) return self:combatScale(self:getStr(7, true) * self:getTalentLevel(t), 5, 0, 40, 35)end,
+	getAtk = function(self, t) return self:combatScale(self:getDex(7, true) * self:getTalentLevel(t), 5, 0, 40, 35) end ,
+	getImmune = function(self, t) return self:combatTalentLimit(t, 1, 0.17, 0.5) end,
+	hasFoes = function(self)
+		for i = 1, #self.fov.actors_dist do
+			act = self.fov.actors_dist[i]
+			if act and self:reactionToward(act) < 0 and self:canSee(act) then return true end
+		end
+		return false
+	end,
+	callbackOnActBase = function(self, t)
+		if t.hasFoes(self) then
+			local v = (self.max_life * 0.02)
+			if v >= self.life then v = 0 end
+			self.life = self.life - v
+		end
+	end,
+	callbackOnAct = function(self, t)
+		local p = self.sustain_talents[t.id]
+		if t.hasFoes(self) then
+			t.enable(self, t, p)
+		else
+			t.disable(self, t, p)
+		end
+	end,
+	enable = function(self, t, p)
+		if not self:hasEffect(self.EFF_UNSTOPPABLE) then self:setEffect(self.EFF_BERSERKER_RAGE, 1, {power=(1 - (self.life / self.max_life)) * 100 * 0.5})
+		else self:removeEffect(self.EFF_BERSERKER_RAGE, true, true)
+		end
+		if p.enabled then return end
+		p.enabled = true
+		p.stun = self:addTemporaryValue("stun_immune", t.getImmune(self, t))
+		p.pin = self:addTemporaryValue("pin_immune", t.getImmune(self, t))
+		p.dam = self:addTemporaryValue("combat_dam", t.getDam(self, t))
+		p.atk = self:addTemporaryValue("combat_atk", t.getAtk(self, t))
+		self:logCombat(self, "#Source#'s rage awakens!")
+	end,
+	disable = function(self, t, p)
+		if p.enabled then
+			self:logCombat(self, "#Source#'s rage subsides!")
+			self:removeEffect(self.EFF_BERSERKER_RAGE, true, true)
+			self:removeTemporaryValue("stun_immune", p.stun)
+			self:removeTemporaryValue("pin_immune", p.pin)
+			self:removeTemporaryValue("combat_atk", p.atk)
+			self:removeTemporaryValue("combat_dam", p.dam)
+		end
+		p.enabled = false
+	end,
+	activate = function(self, t)
+		local weapon = self:hasTwoHandedWeapon()
+		if not weapon then return nil end
+
+		local p = {}
+		if t.hasFoes(self) then t.enable(self, t, p) end
+		return p
+	end,
+	deactivate = function(self, t, p)
+		t.disable(self, t, p)
+		return true
+	end,
+	info = function(self, t)
+		return ([[You enter an aggressive battle rage, increasing Accuracy by %d and Physical Power by %d and making you nearly unstoppable, granting %d%% stun and pinning resistance.
+		Sustaining this rage takes its toll on your body, decreasing your life by 2%% each turn, but for every 1%% of life missing you gain 0.5%% critical hit chance.
+		Even when sustained, this talent is only active when foes are in sight.
+		The Accuracy bonus increases with your Dexterity, and the Physical Power bonus with your Strength.]]):
+		format( t.getAtk(self, t), t.getDam(self, t), t.getImmune(self, t)*100)
+	end,
+}
+
+newTalent{
+	name = "Shattering Blow", image = "talents/sunder_armour.png",
+	type = {"technique/strength-of-the-berserker", 3},
+	require = techs_req3,
+	points = 5,
+	cooldown = function(self, t) return self:combatTalentLimit(t, 5, 15, 8) end,
+	stamina = 12,
+	requires_target = true,
+	tactical = { ATTACK = { weapon = 2 }, DISABLE = { stun = 2 } },
+	on_pre_use = function(self, t, silent) if not self:hasTwoHandedWeapon() then if not silent then game.logPlayer(self, "You require a two handed weapon to use this talent.") end return false end return true end,
+	getShatter = function(self, t) return self:combatTalentLimit(t, 100, 10, 85) end,
+	getDuration = function(self, t) return math.floor(self:combatTalentScale(t, 5, 9)) end,
+	getArmorReduc = function(self, t) return self:combatTalentScale(t, 5, 25, 0.75) end,
+	action = function(self, t)
+		local weapon = self:hasTwoHandedWeapon()
+		if not weapon then return nil end
+
+		local tg = {type="hit", range=self:getTalentRange(t)}
+		local x, y, target = self:getTarget(tg)
+		if not x or not y or not target then return nil end
+		if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
+		local speed, hit = self:attackTargetWith(target, weapon.combat, nil, self:combatTalentWeaponDamage(t, 1, 1.5))
+
+		-- Try to Sunder !
+		if hit then
+			target:setEffect(target.EFF_SUNDER_ARMOUR, t.getDuration(self, t), {power=t.getArmorReduc(self,t), apply_power=self:combatPhysicalpower()})
+
+			if rng.percent(t.getShatter(self, t)) then
+				local effs = {}
+
+				-- Go through all shield effects
+				for eff_id, p in pairs(target.tmp) do
+					local e = target.tempeffect_def[eff_id]
+					if e.status == "beneficial" and e.subtype and e.subtype.shield then
+						effs[#effs+1] = {"effect", eff_id}
+					end
+				end
+
+				for i = 1, 1 do
+					if #effs == 0 then break end
+					local eff = rng.tableRemove(effs)
+
+					if eff[1] == "effect" then
+						game.logSeen(self, "#CRIMSON#%s shatters %s shield!", self.name:capitalize(), target.name)
+						target:removeEffect(eff[2])
+					end
+				end
+			end
+		end
+
+		return true
+	end,
+	info = function(self, t)
+		return ([[Hits the target with your weapon, doing %d%% damage. If the attack hits, the target's armour and saves are reduced by %d for %d turns.
+		Also if the target is protected by a temporary damage shield there is %d%% chance to shatter it.
+		Armor reduction chance increases with your Physical Power.]])
+		:format(100 * self:combatTalentWeaponDamage(t, 0.8, 1.4), t.getArmorReduc(self, t), t.getDuration(self, t), t.getShatter(self, t))
+	end,
+}
+
+newTalent{
+	name = "Relentless Fury",
+	type = {"technique/strength-of-the-berserker", 4},
+	require = techs_req4,
+	points = 5,
+	cooldown = 25,
+	stamina = 0,
+	range = 10,
+	requires_target = true,
+	tactical = { CLOSEIN = 2, STAMINA = 2, BUFF = 2 },
+	getDur = function(self, t) return math.floor(self:combatTalentLimit(t, 19, 4, 8)) end,
+	getStamina = function(self, t) return self:combatStatScale("con", 4, 25) end,
+	getSpeed = function(self, t) return self:combatTalentLimit(t, 70, 10, 30) end,
+	on_pre_use = function(self, t, silent) if not self:hasTwoHandedWeapon() or self:getStamina() > self:getMaxStamina() * 0.3 then if not silent then game.logPlayer(self, "You require a two handed weapon to use this talent.") end return false end return true end,
+	action = function(self, t)
+		self:setEffect(self.EFF_RELENTLESS_FURY, t.getDur(self, t), {stamina=t.getStamina(self, t), speed=t.getSpeed(self, t)})
+		return true
+	end,
+	info = function(self, t)
+		return ([[Search your inner strength for a surge of power.
+		For %d turns you gain %d stamina per turn and %d%% movement and attack speed.
+		Only usable at 30%% or lower stamina.
+		Stamina regeneration is based on your Constitution stat.]]):
+		format(t.getDur(self, t), t.getStamina(self, t), t.getSpeed(self, t))
+	end,
+}
diff --git a/game/modules/tome/data/talents/techniques/superiority.lua b/game/modules/tome/data/talents/techniques/superiority.lua
index 43c9ac72737ef86dd0b0f0cdfe17189796e336fb..331bf1784cdf15340d45a1a88117ffec8d63e598 100644
--- a/game/modules/tome/data/talents/techniques/superiority.lua
+++ b/game/modules/tome/data/talents/techniques/superiority.lua
@@ -25,17 +25,19 @@ newTalent{
 	points = 5,
 	random_ego = "attack",
 	cooldown = 40,
-	stamina = 60,
+	stamina = 50,
 	no_energy = true,
 	tactical = { DEFEND = 2 },
+	critResist = function(self, t) return self:combatTalentScale(t, 8, 20, 0.75) end,
 	getResist = function(self, t) return self:combatTalentScale(t, 15, 35) end,
 	action = function(self, t)
-		self:setEffect(self.EFF_JUGGERNAUT, 20, {power=t.getResist(self, t)})
+		self:setEffect(self.EFF_JUGGERNAUT, 20, {power=t.getResist(self, t), crits=t.critResist(self, t)})
 		return true
 	end,
 	info = function(self, t)
 		return ([[Concentrate on the battle, ignoring some of the damage you take.
-		Improves physical damage reduction by %d%% for 20 turns.]]):format(t.getResist(self,t))
+		Improves physical damage reduction by %d%% and provides %d%% chances to shrug off critical damage for 20 turns.]]):
+		format(t.getResist(self,t), t.critResist(self, t))
 	end,
 }
 
@@ -45,14 +47,15 @@ newTalent{
 	require = techs_req_high2,
 	points = 5,
 	mode = "sustained",
-	cooldown = 20,
-	sustain_stamina = 50,
+	cooldown = 10,
+	no_energy = true,
+	sustain_stamina = 10,
 	tactical = { BUFF = 2 },
 	range = function(self,t) return math.floor(self:combatTalentLimit(t, 10, 1, 5)) end, -- Limit KB range to <10
 	activate = function(self, t)
 		return {
 			onslaught = self:addTemporaryValue("onslaught", t.range(self,t)), 
-			stamina = self:addTemporaryValue("stamina_regen", -4),
+			stamina = self:addTemporaryValue("stamina_regen", -1),
 		}
 	end,
 
@@ -63,7 +66,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[Take an offensive stance. As you walk through your foes, you knock them all back in an frontal arc (up to %d grids).
-		This consumes stamina rapidly (-4 stamina/turn).]]):
+		This consumes stamina rapidly (-1 stamina/turn).]]):
 		format(t.range(self, t))
 	end,
 }
@@ -124,7 +127,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[Put all of your strength into your weapon blows, creating shockwaves that deal %d%% Physical weapon damage to all nearby targets.  Only one shockwave will be created per action, and the primary target does not take extra damage.
-		Each shattering impact will drain 15 stamina.]]):
+		Each shattering impact will drain 8 stamina.]]):
 		format(100*t.weaponDam(self, t))
 	end,
 }
diff --git a/game/modules/tome/data/talents/techniques/techniques.lua b/game/modules/tome/data/talents/techniques/techniques.lua
index 87619c76d77791d3db0f5753db1bbf5aeb9fb611..907ef2e01a46466ec6f2368bb51c50565b160194 100644
--- a/game/modules/tome/data/talents/techniques/techniques.lua
+++ b/game/modules/tome/data/talents/techniques/techniques.lua
@@ -18,6 +18,8 @@
 -- darkgod@te4.org
 
 -- Physical combat
+newTalentType{ allow_random=true, type="technique/2hweapon-assault", name = "two-handed assault", description = "Specialized two-handed techniques." }
+newTalentType{ allow_random=true, type="technique/strength-of-the-berserker", name = "berserker's strength", description = "Fear nothing!" }
 newTalentType{ allow_random=true, type="technique/2hweapon-offense", name = "two-handed weapons", description = "Specialized two-handed techniques." }
 newTalentType{ allow_random=true, type="technique/2hweapon-cripple", name = "two-handed maiming", description = "Specialized two-handed techniques." }
 newTalentType{ allow_random=true, type="technique/shield-offense", name = "shield offense", description = "Specialized weapon and shield techniques." }
@@ -47,7 +49,7 @@ newTalentType{ is_unarmed=true, allow_random=true, type="technique/pugilism", na
 newTalentType{ is_unarmed=true, allow_random=true, type="technique/finishing-moves", name = "finishing moves", description = "Finishing moves that use combo points and may not be practiced in massive armor or while a weapon or shield is equipped." }
 newTalentType{ is_unarmed=true, allow_random=true, type="technique/grappling", name = "grappling", description = "Grappling techniques that may not be practiced in massive armor or while a weapon or shield is equipped." }
 newTalentType{ is_unarmed=true, allow_random=true, type="technique/unarmed-discipline", name = "unarmed discipline", description = "Advanced unarmed techniques including kicks and throw that may not be practiced in massive armor or while a weapon or shield is equipped." }
-newTalentType{ is_unarmed=true, allow_random=true, type="technique/unarmed-training", name = "unarmed training", description = "Teaches various martial arts techniques that may not be practiced in massive armor or while a weapon or shield is equipped." }
+newTalentType{ is_unarmed=true, allow_random=true, generic = true, type="technique/unarmed-training", name = "unarmed training", description = "Teaches various martial arts techniques that may not be practiced in massive armor or while a weapon or shield is equipped." }
 newTalentType{ allow_random=true, type="technique/conditioning", name = "conditioning", generic = true, description = "Physical conditioning." }
 
 newTalentType{ is_unarmed=true, type="technique/unarmed-other", name = "unarmed other", generic = true, description = "Base martial arts attack and stances." }
@@ -243,6 +245,8 @@ cancelStances = function(self)
 end
 
 load("/data/talents/techniques/2hweapon.lua")
+load("/data/talents/techniques/2h-assault.lua")
+load("/data/talents/techniques/strength-of-the-berserker.lua")
 load("/data/talents/techniques/dualweapon.lua")
 load("/data/talents/techniques/weaponshield.lua")
 load("/data/talents/techniques/superiority.lua")
diff --git a/game/modules/tome/data/talents/techniques/warcries.lua b/game/modules/tome/data/talents/techniques/warcries.lua
index ac09229bf45c15dcefc629ca32fcba6b38f304a2..b8e83f6a957e7fad5e28c14e907267da561d963b 100644
--- a/game/modules/tome/data/talents/techniques/warcries.lua
+++ b/game/modules/tome/data/talents/techniques/warcries.lua
@@ -23,7 +23,6 @@ newTalent{
 	type = {"technique/warcries", 1},
 	require = techs_req_high1,
 	points = 5,
-	random_ego = "attack",
 	cooldown = 7,
 	stamina = 20,
 	range = 0,
@@ -39,11 +38,22 @@ newTalent{
 		local x, y = self:getTarget(tg)
 		if not x or not y then return nil end
 		self:project(tg, x, y, DamageType.PHYSICAL, t.getdamage(self,t))
+		if self:getTalentLevel(t) >= 5 then
+			self:project(tg, x, y, function(px, py)
+				local proj = game.level.map(px, py, Map.PROJECTILE)
+				if not proj then return end
+				proj:terminate(x, y)
+				game.level:removeEntity(proj, true)
+				proj.dead = true
+				self:logCombat(proj, "#Source# shatters '#Target#'.")
+			end)
+		end
 		game.level.map:particleEmitter(self.x, self.y, self:getTalentRadius(t), "directional_shout", {life=8, size=2, tx=x-self.x, ty=y-self.y, distorion_factor=0.1, radius=self:getTalentRadius(t), nb_circles=8, rm=0.8, rM=1, gm=0.8, gM=1, bm=0.1, bM=0.2, am=0.6, aM=0.8})
 		return true
 	end,
 	info = function(self, t)
 		return ([[Release a powerful shout, doing %0.2f physical damage in a radius %d cone in front of you.
+		At level 5 the shout is so strong it shatters all incomming projectiles caught inside.
 		The damage increases with your Strength.]])
 		:format(damDesc(self, DamageType.PHYSICAL, t.getdamage(self,t)), t.radius(self,t))
 	end,
@@ -54,8 +64,8 @@ newTalent{
 	type = {"technique/warcries", 2},
 	require = techs_req_high2,
 	points = 5,
-	random_ego = "utility",
 	cooldown = 50,
+	no_energy = true,
 	tactical = { STAMINA = 2 },
 	getRestore = function(self, t) return self:combatTalentLimit(t, 100, 27, 55) end,
 	action = function(self, t)
@@ -73,18 +83,19 @@ newTalent{
 	type = {"technique/warcries", 3},
 	require = techs_req_high3,
 	points = 5,
-	random_ego = "defensive",
 	cooldown = 30,
-	stamina = 40,
+	stamina = 5,
 	tactical = { DEFEND = 2, BUFF = 1 },
 	getdur = function(self,t) return math.floor(self:combatTalentLimit(t, 30, 7, 15)) end, -- Limit to < 30
-	getPower = function(self, t) return self:combatTalentLimit(t, 50, 11, 15) end, -- Limit to < 50%
+	getPower = function(self, t) return self:combatTalentLimit(t, 50, 11, 25) end, -- Limit to < 50%
 	action = function(self, t)
 		self:setEffect(self.EFF_BATTLE_SHOUT, t.getdur(self,t), {power=t.getPower(self, t)})
 		return true
 	end,
 	info = function(self, t)
-		return ([[Boost your life and stamina by %0.1f%% for %d turns by bellowing your battle shout. When the effect ends, the additional life and stamina will be lost.]]):format(t.getPower(self, t), t.getdur(self, t))
+		return ([[Boost your life and stamina by %0.1f%% for %d turns by bellowing your battle shout.
+		When the effect ends, the additional life and stamina will be lost.]]):
+		format(t.getPower(self, t), t.getdur(self, t))
 	end,
 }
 
@@ -93,7 +104,6 @@ newTalent{
 	type = {"technique/warcries", 4},
 	require = techs_req_high4,
 	points = 5,
-	random_ego = "attack",
 	cooldown = 30,
 	stamina = 40,
 	range = 0,
@@ -117,6 +127,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[Your battle cry shatters the will of your foes within a radius of %d, lowering their Defense by %d for 7 turns, making them easier to hit.
+		All evasion and concealment bonuses are also disabled.
 		The chance to hit increases with your Physical Power.]]):
 		format(self:getTalentRadius(t), 7 * self:getTalentLevel(t))
 	end,
diff --git a/game/modules/gruesome/data/gfx/particles/acid.lua b/game/modules/tome/data/texts/unlock-cosmetic_bikini.lua
similarity index 62%
rename from game/modules/gruesome/data/gfx/particles/acid.lua
rename to game/modules/tome/data/texts/unlock-cosmetic_bikini.lua
index ddf4cfc04c25eea8fcf765c791190efa81d29fbf..731e909595cde5881cdd748431a6615866479aed 100644
--- a/game/modules/gruesome/data/gfx/particles/acid.lua
+++ b/game/modules/tome/data/texts/unlock-cosmetic_bikini.lua
@@ -1,4 +1,4 @@
--- ToME - Tales of Middle-Earth
+-- ToME - Tales of Maj'Eyal
 -- Copyright (C) 2009 - 2014 Nicolas Casalini
 --
 -- This program is free software: you can redistribute it and/or modify
@@ -17,22 +17,13 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
-return {
-	base = 1000,
+return "New Cosmetic Option: #LIGHT_GREEN#Bikini and Mankini",
+[[You have saved Melinda again at the beach.
 
-	angle = { 0, 360 }, anglev = { 2000, 4000 }, anglea = { 200, 600 },
+You may now create characters that start equiped with either bikini or mankini.
+This has no effect on gameplay at all but it is fun!
 
-	life = { 5, 10 },
-	size = { 3, 6 }, sizev = {0, 0}, sizea = {0, 0},
+#{bold}#Also if you never take your bikini/mankini off and manage to win, you will get an achievement!#{normal}#
 
-	r = {0, 0}, rv = {0, 0}, ra = {0, 0},
-	g = {80, 200}, gv = {0, 10}, ga = {0, 0},
-	b = {0, 0}, bv = {0, 0}, ba = {0, 0},
-	a = {255, 255}, av = {0, 0}, aa = {0, 0},
-
-}, function(self)
-	self.nb = (self.nb or 0) + 1
-	if self.nb < 4 then
-		self.ps:emit(100)
-	end
-end
+#LIGHT_GREEN#This is only available to donators. Thanks for your support!
+]]
diff --git a/game/modules/tome/data/timed_effects/magical.lua b/game/modules/tome/data/timed_effects/magical.lua
index 4ec01e27b90301c81e848b13fb77effd9b02275d..8241a0677284878aa87d4c0d6e2851615f8955a9 100644
--- a/game/modules/tome/data/timed_effects/magical.lua
+++ b/game/modules/tome/data/timed_effects/magical.lua
@@ -2490,3 +2490,152 @@ newEffect{
 		self:removeParticles(eff.particle)
 	end,
 }
+
+newEffect{
+	name = "ABSORPTION_STRIKE", image = "talents/absorption_strike.png",
+	desc = "Absorption Strike",
+	long_desc = function(self, eff) return ("The target's light has been drained, reducing light resistance by %d%%."):format(eff.power) end,
+	type = "magical",
+	subtype = { sun=true, },
+	status = "detrimental",
+	parameters = { power = 10 },
+	on_gain = function(self, err) return "#Target# is drained from light!", "+Absorption Strike" end,
+	on_lose = function(self, err) return "#Target#'s light is back.", "-Absorption Strike" end,
+	activate = function(self, eff)
+		self:effectTemporaryValue(eff, "resists", {[DamageType.LIGHT]=-eff.power})
+	end,
+}
+
+newEffect{
+	name = "MARK_OF_LIGHT", image = "talents/mark_of_light.png",
+	desc = "Mark of Light",
+	long_desc = function(self, eff) return ("The creature that marked the target with light will be healed for all melee attacks against it by %d%%."):format(eff.power) end,
+	type = "magical",
+	subtype = { sun=true, },
+	status = "detrimental",
+	parameters = { power = 10 },
+	on_gain = function(self, err) return "#Target# is marked by light!", "+Mark of Light" end,
+	on_lose = function(self, err) return "#Target#'s mark disappears.", "-Mark of Light" end,
+	callbackOnMeleeHit = function(self, eff, src, dam)
+		if eff.src == src then
+			src:heal(dam * eff.power / 100, self)
+			if core.shader.active(4) then
+				eff.src:addParticles(Particles.new("shader_shield_temp", 1, {toback=true, size_factor=1.5, y=-0.3, img="healcelestial", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=2.0, beamColor1={0xd8/255, 0xff/255, 0x21/255, 1}, beamColor2={0xf7/255, 0xff/255, 0x9e/255, 1}, circleDescendSpeed=3}))
+				eff.src:addParticles(Particles.new("shader_shield_temp", 1, {toback=false,size_factor=1.5, y=-0.3, img="healcelestial", life=25}, {type="healing", time_factor=2000, beamsCount=20, noup=1.0, beamColor1={0xd8/255, 0xff/255, 0x21/255, 1}, beamColor2={0xf7/255, 0xff/255, 0x9e/255, 1}, circleDescendSpeed=3}))
+			end
+		end
+	end,
+}
+
+newEffect{
+	name = "RIGHTEOUS_STRENGTH", image = "talents/righteous_strength.png",
+	desc = "Righteous Strength",
+	long_desc = function(self, eff) return ("Increase light and physical damage by %d%%."):format(eff.power) end,
+	type = "magical",
+	subtype = { sun=true, },
+	status = "beneficial",
+	parameters = { power = 10 },
+	on_gain = function(self, err) return "#Target# shines with light!", "+Righteous Strength" end,
+	on_lose = function(self, err) return "#Target# stops shining.", "-Righteous Strength" end,
+	charges = function(self, eff) return eff.charges end,
+	on_merge = function(self, old_eff, new_eff)
+		new_eff.charges = math.min(old_eff.charges + 1, 3)
+		new_eff.power = math.min(new_eff.power + old_eff.power, new_eff.max_power)
+		self:removeTemporaryValue("inc_damage", old_eff.tmpid)
+		new_eff.tmpid = self:addTemporaryValue("inc_damage", {[DamageType.PHYSICAL] = new_eff.power, [DamageType.LIGHT] = new_eff.power})
+		return new_eff
+	end,
+	activate = function(self, eff)
+		eff.charges = 1
+		eff.tmpid = self:addTemporaryValue("inc_damage", {[DamageType.PHYSICAL] = eff.power, [DamageType.LIGHT] = eff.power})
+	end,
+	deactivate = function(self, eff)
+		self:removeTemporaryValue("inc_damage", eff.tmpid)
+	end,
+}
+
+newEffect{
+	name = "LIGHTBURN", image = "talents/righteous_strength.png",
+	desc = "Lightburn",
+	long_desc = function(self, eff) return ("The creature is burnt by light, dealing %0.2f light damage each turn and reducing armour by %d."):format(eff.dam, eff.armor) end,
+	type = "magical",
+	subtype = { sun=true, },
+	status = "detrimental",
+	parameters = { armor = 10, dam = 10 },
+	on_gain = function(self, err) return "#Target# burns with light!", "+Lightburn" end,
+	on_lose = function(self, err) return "#Target# stops burning.", "-Lightburn" end,
+	on_merge = function(self, old_eff, new_eff)
+		-- Merge the flames!
+		local olddam = old_eff.dam * old_eff.dur
+		local newdam = new_eff.dam * new_eff.dur
+		local dur = math.ceil((old_eff.dur + new_eff.dur) / 2)
+		old_eff.dur = dur
+		old_eff.dam = (olddam + newdam) / dur
+		return old_eff
+	end,
+	activate = function(self, eff)
+		self:effectTemporaryValue(eff, "combat_armor", -eff.armor)
+	end,
+	on_timeout = function(self, eff)
+		DamageType:get(DamageType.LIGHT).projector(eff.src, self.x, self.y, DamageType.LIGHT, eff.dam)
+	end,
+}
+
+newEffect{
+	name = "ILLUMINATION",
+	desc = "Illumination ", image = "talents/illumination.png",
+	long_desc = function(self, eff) return ("The target glows in the light, reducing its stealth and invisibility power by %d, defense by %d and looses all evasion bonus from being unseen."):format(eff.power, eff.def) end,
+	type = "physical",
+	subtype = { sun=true },
+	status = "detrimental",
+	parameters = { power=20, def=20 },
+	on_gain = function(self, err) return nil, "+Illumination" end,
+	on_lose = function(self, err) return nil, "-Illumination" end,
+	activate = function(self, eff)
+		self:effectTemporaryValue(eff, "inc_stealth", -eff.power)
+		if self:attr("invisible") then self:effectTemporaryValue(eff, "invisible", -eff.power) end
+		self:effectTemporaryValue(eff, "combat_def", -eff.def)
+		self:effectTemporaryValue(eff, "blind_fighted", 1)
+	end,
+}
+
+newEffect{
+	name = "LIGHT_BURST",
+	desc = "Light Burst ", image = "talents/light_burst.png",
+	long_desc = function(self, eff) return ("The is invigorated when dealing damage with Searing Sight."):format() end,
+	type = "physical",
+	subtype = { sun=true },
+	status = "beneficial",
+	parameters = { max=1 },
+	on_gain = function(self, err) return nil, "+Light Burst" end,
+	on_lose = function(self, err) return nil, "-Light Burst" end,
+}
+
+newEffect{
+	name = "LIGHT_BURST_SPEED",
+	desc = "Light Burst Speed ", image = "effects/light_burst_speed.png",
+	long_desc = function(self, eff) return ("The is invigorated from Searing Sight, increasing movement speed by %d%%."):format(eff.charges * 10) end,
+	type = "physical",
+	subtype = { sun=true },
+	status = "beneficial",
+	parameters = {},
+	charges = function(self, eff) return eff.charges end,
+	on_gain = function(self, err) return nil, "+Light Burst Speed" end,
+	on_lose = function(self, err) return nil, "-Light Burst Speed" end,
+	on_merge = function(self, old_eff, new_eff)
+		local p = self:hasEffect(self.EFF_LIGHT_BURST)
+		if not p then p = {max=1} end
+
+		new_eff.charges = math.min(old_eff.charges + 1, p.max)
+		self:removeTemporaryValue("movement_speed", old_eff.tmpid)
+		new_eff.tmpid = self:addTemporaryValue("movement_speed", new_eff.charges * 0.1)
+		return new_eff
+	end,
+	activate = function(self, eff)
+		eff.charges = 1
+		eff.tmpid = self:addTemporaryValue("movement_speed", eff.charges * 0.1)
+	end,
+	deactivate = function(self, eff)
+		self:removeTemporaryValue("movement_speed", eff.tmpid)
+	end,
+}
diff --git a/game/modules/tome/data/timed_effects/mental.lua b/game/modules/tome/data/timed_effects/mental.lua
index 329b519d7e77f727ce2a65532209f39da2adadaa..bf7e82936902cd96b37a54564cf4cfcdb3f68e2d 100644
--- a/game/modules/tome/data/timed_effects/mental.lua
+++ b/game/modules/tome/data/timed_effects/mental.lua
@@ -159,9 +159,7 @@ newEffect{
 newEffect{
 	name = "BATTLE_SHOUT", image = "talents/battle_shout.png",
 	desc = "Battle Shout",
-	
 	long_desc = function(self, eff) return ("Increases maximum life and stamina by %d%%. When the effect ends, the extra life and stamina will be lost."):format(eff.power) end,
-	
 	type = "mental",
 	subtype = { morale=true },
 	status = "beneficial",
@@ -194,10 +192,9 @@ newEffect{
 	on_gain = function(self, err) return "#Target#'s will is shattered.", "+Battle Cry" end,
 	on_lose = function(self, err) return "#Target# regains some of its will.", "-Battle Cry" end,
 	activate = function(self, eff)
-		eff.tmpid = self:addTemporaryValue("combat_def", -eff.power)
-	end,
-	deactivate = function(self, eff)
-		self:removeTemporaryValue("combat_def", eff.tmpid)
+		self:effectTemporaryValue(eff, "combat_def", -eff.power)
+		self:effectTemporaryValue(eff, "no_evasion", 1)
+		self:effectTemporaryValue(eff, "blind_fighted", 1)
 	end,
 }
 
diff --git a/game/modules/tome/data/timed_effects/other.lua b/game/modules/tome/data/timed_effects/other.lua
index 7c0cbcdb954c5f46b3d5d665192c8397551e5e91..d425d2f79ea6aaa8f59ad52fc61584c3c469016b 100644
--- a/game/modules/tome/data/timed_effects/other.lua
+++ b/game/modules/tome/data/timed_effects/other.lua
@@ -2421,3 +2421,23 @@ newEffect{
 		self:removeTemporaryValue("combat_mentalresist", eff.mresid)
 	end,
 }
+
+newEffect{
+	name = "RELOAD_DISARMED", image = "talents/disarm.png",
+	desc = "Disarmed",
+	long_desc = function(self, eff) return "The target has replenished some ammo." end,
+	type = "other",
+	subtype = { disarm=true },
+	status = "detrimental",
+	parameters = {},
+	on_gain = function(self, err) return "#Target# is disarmed!", "+Disarmed" end,
+	on_lose = function(self, err) return "#Target# rearms.", "-Disarmed" end,
+	activate = function(self, eff)
+		self:removeEffect(self.EFF_COUNTER_ATTACKING) -- Cannot parry or counterattack while disarmed
+		self:removeEffect(self.EFF_DUAL_WEAPON_DEFENSE) 
+		eff.tmpid = self:addTemporaryValue("disarmed", 1)
+	end,
+	deactivate = function(self, eff)
+		self:removeTemporaryValue("disarmed", eff.tmpid)
+	end,
+}
diff --git a/game/modules/tome/data/timed_effects/physical.lua b/game/modules/tome/data/timed_effects/physical.lua
index b446f1eab835e856e60341faf0f5a438ae393b19..2d464a3b04aaeaf5e4364d15a46569b983effd7f 100644
--- a/game/modules/tome/data/timed_effects/physical.lua
+++ b/game/modules/tome/data/timed_effects/physical.lua
@@ -43,6 +43,8 @@ newEffect{
 	end,
 }
 
+
+
 newEffect{
 	name = "CUT", image = "effects/cut.png",
 	desc = "Bleeding",
@@ -62,6 +64,13 @@ newEffect{
 		old_eff.power = (olddam + newdam) / dur
 		return old_eff
 	end,
+	activate = function(self, eff)
+		if eff.src:knowTalent(self.T_BLOODY_BUTCHER) then
+			local t = eff.src:getTalentFromId(eff.src.T_BLOODY_BUTCHER)
+			local resist = math.min(t.getResist(eff.src, t), math.max(0, self:combatGetResist(DamageType.PHYSICAL)))
+			self:effectTemporaryValue(eff, "resists", {[DamageType.PHYSICAL] = -resist})
+		end
+	end,
 	on_timeout = function(self, eff)
 		DamageType:get(DamageType.PHYSICAL).projector(eff.src or self, self.x, self.y, DamageType.PHYSICAL, eff.power)
 	end,
@@ -1084,54 +1093,67 @@ newEffect{
 newEffect{
 	name = "GRAPPLING", image = "talents/clinch.png",
 	desc = "Grappling",
-	long_desc = function(self, eff) return ("The target is engaged in a grapple.  Any movement will break the effect as will some unarmed talents."):format() end,
+	long_desc = function(self, eff) return ("Engaged in a grapple draining %d stamina per turn and redirecting %d%% of damage taken to %s.  Any movement will break the effect as will some unarmed talents."):format(eff.drain, eff.sharePct*100, eff.trgt.name or "unknown") end,
 	type = "physical",
 	subtype = { grapple=true, },
 	status = "beneficial",
-	parameters = {},
+	parameters = {trgt, sharePct = 0.1, drain = 0},
 	on_gain = function(self, err) return "#Target# is engaged in a grapple!", "+Grappling" end,
 	on_lose = function(self, err) return "#Target# has released the hold.", "-Grappling" end,
 	on_timeout = function(self, eff)
 		local p = eff.trgt:hasEffect(eff.trgt.EFF_GRAPPLED)
-		local drain = 6 - (self:getTalentLevelRaw(self.T_CLINCH) or 0)
 		if not p or p.src ~= self or core.fov.distance(self.x, self.y, eff.trgt.x, eff.trgt.y) > 1 or eff.trgt.dead or not game.level:hasEntity(eff.trgt) then
 			self:removeEffect(self.EFF_GRAPPLING)
 		else
-			self:incStamina(-drain)
+			self:incStamina(-eff.drain)
 		end
 	end,
 	activate = function(self, eff)
 	end,
 	deactivate = function(self, eff)
 	end,
+	callbackOnHit = function(self, eff, cb, src)
+		if not src then return cb.value end
+		local share = cb.value * eff.sharePct
+		
+		-- deal the redirected damage as physical because I don't know how to preserve the damage type in a callback
+		DamageType:get(DamageType.PHYSICAL).projector(self or eff.src, eff.trgt.x, eff.trgt.y, DamageType.PHYSICAL, share)
+		
+		return cb.value - share
+	end,
 }
 
 newEffect{
 	name = "GRAPPLED", image = "talents/grab.png",
 	desc = "Grappled",
-	long_desc = function(self, eff) return ("The target is grappled, unable to move, and has its defense and attack reduced by %d."):format(eff.power) end,
+	long_desc = function(self, eff) return ("The target is grappled, unable to move, and limited in its offensive capabilities.\n#RED#Silenced\nPinned\n%s\n%s\n%s"):format("Damage reduced by " .. eff.reduce, "Slowed by " .. eff.slow, "Damage per turn " .. math.ceil(eff.power) ) end,
 	type = "physical",
 	subtype = { grapple=true, pin=true },
 	status = "detrimental",
-	parameters = {},
+	parameters = {silence = 0, slow = 0, reduce = 1, power = 1},
 	remove_on_clone = true,
 	on_gain = function(self, err) return "#Target# is grappled!", "+Grappled" end,
 	on_lose = function(self, err) return "#Target# is free from the grapple.", "-Grappled" end,
 	activate = function(self, eff)
-		eff.tmpid = self:addTemporaryValue("never_move", 1)
-		eff.def = self:addTemporaryValue("combat_def", -eff.power)
-		eff.atk = self:addTemporaryValue("combat_atk", -eff.power)
+		self:effectTemporaryValue(eff, "never_move", 1)
+		self:effectTemporaryValue(eff, "combat_dam", -eff.reduce)
+		if (eff.silence > 0) then
+			self:effectTemporaryValue(eff, "silence", 1)
+		end
+		if (eff.slow > 0) then
+			self:effectTemporaryValue(eff, "global_speed_add", -eff.slow)
+		end
 	end,
 	on_timeout = function(self, eff)
 		if not self.x or not eff.src or not eff.src.x or core.fov.distance(self.x, self.y, eff.src.x, eff.src.y) > 1 or eff.src.dead or not game.level:hasEntity(eff.src) then
 			self:removeEffect(self.EFF_GRAPPLED)
+		else
+			DamageType:get(DamageType.PHYSICAL).projector(eff.src or self, self.x, self.y, DamageType.PHYSICAL, eff.power)
 		end
 	end,
 	deactivate = function(self, eff)
-		self:removeTemporaryValue("combat_atk", eff.atk)
-		self:removeTemporaryValue("combat_def", eff.def)
-		self:removeTemporaryValue("never_move", eff.tmpid)
-	end,
+
+	end, 
 }
 
 newEffect{
@@ -2296,7 +2318,7 @@ newEffect{
 newEffect{
 	name = "JUGGERNAUT", image = "talents/juggernaut.png",
 	desc = "Juggernaut",
-	long_desc = function(self, eff) return ("Reduces physical damage received by %d%%."):format(eff.power) end,
+	long_desc = function(self, eff) return ("Reduces physical damage received by %d%% and provides %d%% chances to ignore critial hits."):format(eff.power, eff.crits) end,
 	type = "physical",
 	subtype = { superiority=true },
 	status = "beneficial",
@@ -2305,11 +2327,11 @@ newEffect{
 	on_lose = function(self, err) return "#Target#'s skin returns to normal.", "-Juggernaut" end,
 	activate = function(self, eff)
 		eff.particle = self:addParticles(Particles.new("stone_skin", 1, {density=4}))
-		eff.tmpid = self:addTemporaryValue("resists", {[DamageType.PHYSICAL]=eff.power})
+		self:effectTemporaryValue(eff, "resists", {[DamageType.PHYSICAL]=eff.power})
+		self:effectTemporaryValue(eff, "ignore_direct_crits", eff.crits)
 	end,
 	deactivate = function(self, eff)
 		self:removeParticles(eff.particle)
-		self:removeTemporaryValue("resists", eff.tmpid)
 	end,
 }
 
@@ -2328,3 +2350,34 @@ newEffect{
 	end,
 }
 
+
+newEffect{
+	name = "BERSERKER_RAGE", image = "talents/berserker.png",
+	desc = "Berserker Rage",
+	long_desc = function(self, eff) return ("Increases critical hit chance by %d%%."):format(eff.power) end,
+	type = "physical",
+	subtype = { tactic=true },
+	status = "beneficial",
+	decrease = 0, no_remove = true,
+	parameters = {power=1},
+	charges = function(self, eff) return ("%0.1f%%"):format(eff.power) end,
+	activate = function(self, eff)
+		self:effectTemporaryValue(eff, "combat_physcrit", eff.power)
+	end,
+}
+
+
+newEffect{
+	name = "RELENTLESS_FURY", image = "talents/relentless_fury.png",
+	desc = "Relentless Fury",
+	long_desc = function(self, eff) return ("Increases stamina regeneration by %d, movement and attack speed by %d%%."):format(eff.stamina, eff.speed) end,
+	type = "physical",
+	subtype = { tactic=true },
+	status = "beneficial",
+	parameters = {stamina=1, speed=10},
+	activate = function(self, eff)
+		self:effectTemporaryValue(eff, "stamina_regen", eff.stamina)
+		self:effectTemporaryValue(eff, "movement_speed", eff.speed/100)
+		self:effectTemporaryValue(eff, "combat_physspeed", eff.speed/100)
+	end,
+}
diff --git a/game/modules/tome/data/zones/abashed-expanse/zone.lua b/game/modules/tome/data/zones/abashed-expanse/zone.lua
index 354b54cae84b4832e0c664d789446f698ce6cdcc..3ee9efbef7ca204ade3a090e12bb0fd518ca49e8 100644
--- a/game/modules/tome/data/zones/abashed-expanse/zone.lua
+++ b/game/modules/tome/data/zones/abashed-expanse/zone.lua
@@ -43,7 +43,7 @@ return {
 			no_tunnels = true,
 			rooms = {"space_tree_pod"},
 			['.'] = "FLOATING_ROCKS",
-			['T'] = {"BURNT_TREE1","BURNT_TREE2","BURNT_TREE3","BURNT_TREE4","BURNT_TREE5","BURNT_TREE6","BURNT_TREE7","BURNT_TREE8","BURNT_TREE9","BURNT_TREE10","BURNT_TREE11","BURNT_TREE12","BURNT_TREE13","BURNT_TREE14","BURNT_TREE15","BURNT_TREE16","BURNT_TREE17","BURNT_TREE18","BURNT_TREE19","BURNT_TREE20",},
+			['T'] = "BURNT_TREE",
 			['#'] = "OUTERSPACE",
 			wormhole = "WORMHOLE",
 			door = "GRASS",
diff --git a/game/modules/tome/data/zones/ardhungol/grids.lua b/game/modules/tome/data/zones/ardhungol/grids.lua
index 6b6084e6d2924c3ac82c55c48f53677aca74655b..b03591d1c2e38838eb3a5f32c1eca4a0228ab8f8 100644
--- a/game/modules/tome/data/zones/ardhungol/grids.lua
+++ b/game/modules/tome/data/zones/ardhungol/grids.lua
@@ -20,3 +20,33 @@
 load("/data/general/grids/basic.lua")
 load("/data/general/grids/cave.lua")
 load("/data/general/grids/water.lua")
+
+newEntity{ base="CAVEFLOOR", define_as = "WORMHOLE", nice_tiler = false,
+	name = "unstable wormhole",
+	display = '*', color = colors.GREY,
+	force_clone = true,
+	damage_project = function(self, src, x, y, type, dam)
+		local source_talent = src.__projecting_for and src.__projecting_for.project_type and (src.__projecting_for.project_type.talent_id or src.__projecting_for.project_type.talent) and src.getTalentFromId and src:getTalentFromId(src.__projecting_for.project_type.talent or src.__projecting_for.project_type.talent_id)
+		if _G.type(dam) == "table" and _G.type(dam.dam) == "number" then dam = dam.dam end
+		if dam and source_talent and source_talent.is_spell and rng.percent(dam / 3) and not game.__tmp_ardhungol_projecting then
+			local a = game.level.map(x, y, engine.Map.ACTOR)
+			if a then
+				game.logSeen(src, "#VIOLET#The wormhole absorbs the energy of the spell and teleports %s away!", a.name)
+				a:teleportRandom(x, y, 20)
+			else
+				game.logSeen({x=x,y=y}, "#VIOLET#The wormhole absorbs the energy of the spell and explodes in a burst of nullmagic!")
+				local DT = engine.DamageType
+
+				local grids = core.fov.circle_grids(x, y, 2, true)
+				game.__tmp_ardhungol_projecting = true -- OMFG this is fugly :/
+				for x, yy in pairs(grids) do for y, _ in pairs(yy) do
+					DT:get(DT.MANABURN).projector(self, x, y, DT.MANABURN, util.bound(dam / 2, 1, 200))					
+				end end
+				game.__tmp_ardhungol_projecting = nil
+
+				game.level.map:particleEmitter(x, y, 2, "generic_sploom", {rm=150, rM=180, gm=20, gM=60, bm=180, bM=200, am=80, aM=150, radius=2, basenb=120})
+			end
+		end
+	end,
+	resolvers.generic(function(e) e:addParticles(engine.Particles.new("wormhole", 1, {})) end),
+}
diff --git a/game/modules/tome/data/zones/ardhungol/objects.lua b/game/modules/tome/data/zones/ardhungol/objects.lua
index 1d6260fc2b4f2005ec0f2a8efd8969c22dc45f9c..0eda256c9a9895d14877218b54a037caad5f4c28 100644
--- a/game/modules/tome/data/zones/ardhungol/objects.lua
+++ b/game/modules/tome/data/zones/ardhungol/objects.lua
@@ -20,6 +20,16 @@
 load("/data/general/objects/objects-far-east.lua")
 load("/data/general/objects/lore/sunwall.lua")
 
+for i = 1, 3 do
+newEntity{ base = "BASE_LORE",
+	define_as = "NOTE"..i,
+	name = "diary page", lore="ardhungol-"..i,
+	desc = [[A page of a diary.]],
+	rarity = false,
+	encumberance = 0,
+}
+end
+
 newEntity{ base = "BASE_ROD",
 	power_source = {nature=true},
 	define_as = "ROD_SPYDRIC_POISON",
diff --git a/game/modules/tome/data/zones/ardhungol/zone.lua b/game/modules/tome/data/zones/ardhungol/zone.lua
index 507faab2b363cfad91aa7df59144105fc0135c6d..cc5b594f511aa6292737a72e82af57fe14a43791 100644
--- a/game/modules/tome/data/zones/ardhungol/zone.lua
+++ b/game/modules/tome/data/zones/ardhungol/zone.lua
@@ -39,7 +39,7 @@ return {
 			class = "engine.generator.map.Cavern",
 			zoom = 16,
 			min_floor = 1100,
-			floor = "CAVEFLOOR",
+			floor = function() if rng.percent(96) then return "CAVEFLOOR" else return "WORMHOLE" end end,
 			wall = "CAVEWALL",
 			up = "CAVE_LADDER_UP",
 			down = "CAVE_LADDER_DOWN",
@@ -71,6 +71,9 @@ return {
 	},
 
 	post_process = function(level)
+		-- Place a lore note on each level
+		game:placeRandomLoreObject("NOTE"..level.level)
+
 		game.state:makeAmbientSounds(level, {
 			dungeon2={ chance=250, volume_mod=1, pitch=1, random_pos={rad=10}, files={"ambient/dungeon/dungeon1","ambient/dungeon/dungeon2","ambient/dungeon/dungeon3","ambient/dungeon/dungeon4","ambient/dungeon/dungeon5"}},
 		})
diff --git a/game/modules/tome/data/zones/mark-spellblaze/zone.lua b/game/modules/tome/data/zones/mark-spellblaze/zone.lua
index 19bfd250e59a35b4622b82ed0a7e4176ebf770bf..f1a6bd5508e5055477c1ea84f154c83304b5c6fb 100644
--- a/game/modules/tome/data/zones/mark-spellblaze/zone.lua
+++ b/game/modules/tome/data/zones/mark-spellblaze/zone.lua
@@ -41,7 +41,7 @@ return {
 			sqrt_percent = 45,
 			noise = "fbm_perlin",
 			floor = "BURNT_GROUND",
-			wall = {"BURNT_TREE1","BURNT_TREE2","BURNT_TREE3","BURNT_TREE4","BURNT_TREE5","BURNT_TREE6","BURNT_TREE7","BURNT_TREE8","BURNT_TREE9","BURNT_TREE10","BURNT_TREE11","BURNT_TREE12","BURNT_TREE13","BURNT_TREE14","BURNT_TREE15","BURNT_TREE16","BURNT_TREE17","BURNT_TREE18","BURNT_TREE19","BURNT_TREE20",},
+			wall = "BURNT_TREE",
 			up = "BURNT_UP4",
 			down = "BURNT_DOWN6",
 			do_ponds =  {
diff --git a/game/modules/tome/data/zones/murgol-lair/zone.lua b/game/modules/tome/data/zones/murgol-lair/zone.lua
index 23b569e9bd999964ebc8052a8d7fd9e2ae2472ea..3c620a0f341fad98e97defe3e53208d455dcf281 100644
--- a/game/modules/tome/data/zones/murgol-lair/zone.lua
+++ b/game/modules/tome/data/zones/murgol-lair/zone.lua
@@ -54,6 +54,7 @@ return {
 			nb_npc = {20, 30},
 			filters = { {max_ood=2}, },
 			guardian = is_invaded and "NASHVA" or "MURGOL",
+			randelite = 0,
 		},
 		object = {
 			class = "engine.generator.object.Random",
diff --git a/game/modules/tome/data/zones/old-forest/grids.lua b/game/modules/tome/data/zones/old-forest/grids.lua
index a3ee268cb2ff654c18a3769a5c47687f2bf26bf5..5c7ed2273dfcc86e27ee6e301852c96d62a1a125 100644
--- a/game/modules/tome/data/zones/old-forest/grids.lua
+++ b/game/modules/tome/data/zones/old-forest/grids.lua
@@ -21,11 +21,194 @@ load("/data/general/grids/basic.lua")
 load("/data/general/grids/forest.lua")
 load("/data/general/grids/water.lua")
 
-newEntity{
-	define_as = "LAKE_NUR",
-	name = "way to the lake of Nur",
-	display = '>', color_r=255, color_g=255, color_b=0, image = "terrain/grass.png", add_displays = {class.new{image = "terrain/way_next_2.png"}},
-	notice = true,
-	always_remember = true,
-	change_level = 1, change_zone = "lake-nur",
-}
+if not currentZone.is_crystaline then
+	local grass_editer = { method="borders_def", def="dark_grass"}
+
+	newEntity{
+		define_as = "GRASS",
+		type = "floor", subtype = "dark_grass",
+		name = "grass", image = "terrain/grass/dark_grass_main_01.png",
+		display = '.', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+		grow = "TREE",
+		nice_tiler = { method="replace", base={"GRASS_PATCH", 100, 1, 14}},
+		nice_editer = grass_editer,
+	}
+	for i = 1, 14 do newEntity{ base = "GRASS", define_as = "GRASS_PATCH"..i, image = ("terrain/grass/dark_grass_main_%02d.png"):format(i) } end
+
+	local treesdef = {
+		{"oldforest_tree_01", {tall=-1, "shadow", "trunk_01", {"foliage_summer_%02d",1,2}}},
+		{"oldforest_tree_01", {tall=-1, "shadow", "trunk_02", {"foliage_summer_%02d",3,3}}},
+		{"oldforest_tree_01", {tall=-1, "shadow", "trunk_03", {"foliage_summer_%02d",4,4}}},
+		{"oldforest_tree_02", {tall=-1, "shadow", "trunk_01", {"foliage_summer_%02d",1,2}}},
+		{"oldforest_tree_02", {tall=-1, "shadow", "trunk_02", {"foliage_summer_%02d",3,3}}},
+		{"oldforest_tree_02", {tall=-1, "shadow", "trunk_03", {"foliage_summer_%02d",4,4}}},
+		{"oldforest_tree_03", {tall=-1, "shadow", "trunk_01", {"foliage_summer_%02d",1,2}}},
+		{"oldforest_tree_03", {tall=-1, "shadow", "trunk_02", {"foliage_summer_%02d",3,3}}},
+		{"oldforest_tree_03", {tall=-1, "shadow", "trunk_03", {"foliage_summer_%02d",4,4}}},
+		{"small_oldforest_tree_01", {"shadow", "trunk_01", {"foliage_summer_%02d",1,2}}},
+		{"small_oldforest_tree_01", {"shadow", "trunk_02", {"foliage_summer_%02d",3,3}}},
+		{"small_oldforest_tree_01", {"shadow", "trunk_03", {"foliage_summer_%02d",4,4}}},
+		{"small_oldforest_tree_02", {"shadow", "trunk_01", {"foliage_summer_%02d",1,2}}},
+		{"small_oldforest_tree_02", {"shadow", "trunk_02", {"foliage_summer_%02d",3,3}}},
+		{"small_oldforest_tree_02", {"shadow", "trunk_03", {"foliage_summer_%02d",4,4}}},
+		{"small_oldforest_tree_03", {"shadow", "trunk_01", {"foliage_summer_%02d",1,2}}},
+		{"small_oldforest_tree_03", {"shadow", "trunk_02", {"foliage_summer_%02d",3,3}}},
+		{"small_oldforest_tree_03", {"shadow", "trunk_03", {"foliage_summer_%02d",4,4}}},
+
+		{"oldforest_tree_01", {tall=-1, "shadow", "trunk_01", {"foliage_bare_%02d",1,2}}},
+		{"oldforest_tree_01", {tall=-1, "shadow", "trunk_02", {"foliage_bare_%02d",3,3}}},
+		{"oldforest_tree_01", {tall=-1, "shadow", "trunk_03", {"foliage_bare_%02d",4,4}}},
+		{"oldforest_tree_02", {tall=-1, "shadow", "trunk_01", {"foliage_bare_%02d",1,2}}},
+		{"oldforest_tree_02", {tall=-1, "shadow", "trunk_02", {"foliage_bare_%02d",3,3}}},
+		{"oldforest_tree_02", {tall=-1, "shadow", "trunk_03", {"foliage_bare_%02d",4,4}}},
+		{"oldforest_tree_03", {tall=-1, "shadow", "trunk_01", {"foliage_bare_%02d",1,2}}},
+		{"oldforest_tree_03", {tall=-1, "shadow", "trunk_02", {"foliage_bare_%02d",3,3}}},
+		{"oldforest_tree_03", {tall=-1, "shadow", "trunk_03", {"foliage_bare_%02d",4,4}}},
+		{"small_oldforest_tree_01", {"shadow", "trunk_01", {"foliage_bare_%02d",1,2}}},
+		{"small_oldforest_tree_01", {"shadow", "trunk_02", {"foliage_bare_%02d",3,3}}},
+		{"small_oldforest_tree_01", {"shadow", "trunk_03", {"foliage_bare_%02d",4,4}}},
+		{"small_oldforest_tree_02", {"shadow", "trunk_01", {"foliage_bare_%02d",1,2}}},
+		{"small_oldforest_tree_02", {"shadow", "trunk_02", {"foliage_bare_%02d",3,3}}},
+		{"small_oldforest_tree_02", {"shadow", "trunk_03", {"foliage_bare_%02d",4,4}}},
+		{"small_oldforest_tree_03", {"shadow", "trunk_01", {"foliage_bare_%02d",1,2}}},
+		{"small_oldforest_tree_03", {"shadow", "trunk_02", {"foliage_bare_%02d",3,3}}},
+		{"small_oldforest_tree_03", {"shadow", "trunk_03", {"foliage_bare_%02d",4,4}}},
+	}
+
+	newEntity{
+		define_as = "TREE",
+		type = "wall", subtype = "dark_grass",
+		name = "tree",
+		image = "terrain/tree.png",
+		display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+		always_remember = true,
+		can_pass = {pass_tree=1},
+		does_block_move = true,
+		block_sight = true,
+		dig = "GRASS",
+		nice_tiler = { method="replace", base={"TREE", 100, 1, 30}},
+		nice_editer = grass_editer,
+	}
+	newEntity{
+		define_as = "HARDTREE",
+		type = "wall", subtype = "dark_grass",
+		name = "tall thick tree",
+		image = "terrain/tree.png",
+		display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+		always_remember = true,
+		does_block_move = true,
+		block_sight = true,
+		block_sense = true,
+		block_esp = true,
+		nice_tiler = { method="replace", base={"HARDTREE", 100, 1, 30}},
+		nice_editer = grass_editer,
+	}
+	for i = 1, 30 do
+		newEntity(class:makeNewTrees({base="TREE", define_as = "TREE"..i, image = "terrain/grass/dark_grass_main_01.png"}, treesdef, 3))
+	end
+	for i = 1, 30 do
+		newEntity(class:makeNewTrees({base="HARDTREE", define_as = "HARDTREE"..i, image = "terrain/grass/dark_grass_main_01.png"}, treesdef))
+	end
+
+	newEntity{
+		define_as = "LAKE_NUR",
+		name = "way to the lake of Nur",
+		display = '>', color_r=255, color_g=255, color_b=0, image = "terrain/grass/dark_grass_main_01.png", add_displays = {class.new{image = "terrain/way_next_2.png"}},
+		notice = true,
+		always_remember = true,
+		change_level = 1, change_zone = "lake-nur",
+	}
+
+	newEntity{
+		define_as = "GRASS_UP_WILDERNESS", base = "GRASS_UP_WILDERNESS",
+		image = "terrain/grass/dark_grass_main_01.png",
+		nice_editer = grass_editer,
+	}
+
+else -- Crystaline
+	local grass_editer = { method="borders_def", def="grass"}
+
+	local treesdef = {
+		{"oldforest_tree_01", {tall=-1, "shadow", "trunk_01", {"foliage_spring_%02d",1,2}}},
+		{"oldforest_tree_01", {tall=-1, "shadow", "trunk_02", {"foliage_spring_%02d",3,3}}},
+		{"oldforest_tree_01", {tall=-1, "shadow", "trunk_03", {"foliage_spring_%02d",4,4}}},
+		{"oldforest_tree_02", {tall=-1, "shadow", "trunk_01", {"foliage_spring_%02d",1,2}}},
+		{"oldforest_tree_02", {tall=-1, "shadow", "trunk_02", {"foliage_spring_%02d",3,3}}},
+		{"oldforest_tree_02", {tall=-1, "shadow", "trunk_03", {"foliage_spring_%02d",4,4}}},
+		{"oldforest_tree_03", {tall=-1, "shadow", "trunk_01", {"foliage_spring_%02d",1,2}}},
+		{"oldforest_tree_03", {tall=-1, "shadow", "trunk_02", {"foliage_spring_%02d",3,3}}},
+		{"oldforest_tree_03", {tall=-1, "shadow", "trunk_03", {"foliage_spring_%02d",4,4}}},
+		{"small_oldforest_tree_01", {"shadow", "trunk_01", {"foliage_spring_%02d",1,2}}},
+		{"small_oldforest_tree_01", {"shadow", "trunk_02", {"foliage_spring_%02d",3,3}}},
+		{"small_oldforest_tree_01", {"shadow", "trunk_03", {"foliage_spring_%02d",4,4}}},
+		{"small_oldforest_tree_02", {"shadow", "trunk_01", {"foliage_spring_%02d",1,2}}},
+		{"small_oldforest_tree_02", {"shadow", "trunk_02", {"foliage_spring_%02d",3,3}}},
+		{"small_oldforest_tree_02", {"shadow", "trunk_03", {"foliage_spring_%02d",4,4}}},
+		{"small_oldforest_tree_03", {"shadow", "trunk_01", {"foliage_spring_%02d",1,2}}},
+		{"small_oldforest_tree_03", {"shadow", "trunk_02", {"foliage_spring_%02d",3,3}}},
+		{"small_oldforest_tree_03", {"shadow", "trunk_03", {"foliage_spring_%02d",4,4}}},
+
+		{"oldforest_tree_01", {tall=-1, "shadow", "trunk_01", {"foliage_bare_%02d",1,2}}},
+		{"oldforest_tree_01", {tall=-1, "shadow", "trunk_02", {"foliage_bare_%02d",3,3}}},
+		{"oldforest_tree_01", {tall=-1, "shadow", "trunk_03", {"foliage_bare_%02d",4,4}}},
+		{"oldforest_tree_02", {tall=-1, "shadow", "trunk_01", {"foliage_bare_%02d",1,2}}},
+		{"oldforest_tree_02", {tall=-1, "shadow", "trunk_02", {"foliage_bare_%02d",3,3}}},
+		{"oldforest_tree_02", {tall=-1, "shadow", "trunk_03", {"foliage_bare_%02d",4,4}}},
+		{"oldforest_tree_03", {tall=-1, "shadow", "trunk_01", {"foliage_bare_%02d",1,2}}},
+		{"oldforest_tree_03", {tall=-1, "shadow", "trunk_02", {"foliage_bare_%02d",3,3}}},
+		{"oldforest_tree_03", {tall=-1, "shadow", "trunk_03", {"foliage_bare_%02d",4,4}}},
+		{"small_oldforest_tree_01", {"shadow", "trunk_01", {"foliage_bare_%02d",1,2}}},
+		{"small_oldforest_tree_01", {"shadow", "trunk_02", {"foliage_bare_%02d",3,3}}},
+		{"small_oldforest_tree_01", {"shadow", "trunk_03", {"foliage_bare_%02d",4,4}}},
+		{"small_oldforest_tree_02", {"shadow", "trunk_01", {"foliage_bare_%02d",1,2}}},
+		{"small_oldforest_tree_02", {"shadow", "trunk_02", {"foliage_bare_%02d",3,3}}},
+		{"small_oldforest_tree_02", {"shadow", "trunk_03", {"foliage_bare_%02d",4,4}}},
+		{"small_oldforest_tree_03", {"shadow", "trunk_01", {"foliage_bare_%02d",1,2}}},
+		{"small_oldforest_tree_03", {"shadow", "trunk_02", {"foliage_bare_%02d",3,3}}},
+		{"small_oldforest_tree_03", {"shadow", "trunk_03", {"foliage_bare_%02d",4,4}}},
+	}
+
+	newEntity{
+		define_as = "TREE",
+		type = "wall", subtype = "grass",
+		name = "tree",
+		image = "terrain/tree.png",
+		display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+		always_remember = true,
+		can_pass = {pass_tree=1},
+		does_block_move = true,
+		block_sight = true,
+		dig = "GRASS",
+		nice_tiler = { method="replace", base={"TREE", 100, 1, 30}},
+		nice_editer = grass_editer,
+	}
+	newEntity{
+		define_as = "HARDTREE",
+		type = "wall", subtype = "grass",
+		name = "tall thick tree",
+		image = "terrain/tree.png",
+		display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+		always_remember = true,
+		does_block_move = true,
+		block_sight = true,
+		block_sense = true,
+		block_esp = true,
+		nice_tiler = { method="replace", base={"HARDTREE", 100, 1, 30}},
+		nice_editer = grass_editer,
+	}
+	for i = 1, 30 do
+		newEntity(class:makeNewTrees({base="TREE", define_as = "TREE"..i, image = "terrain/grass.png"}, treesdef, 3))
+	end
+	for i = 1, 30 do
+		newEntity(class:makeNewTrees({base="HARDTREE", define_as = "HARDTREE"..i, image = "terrain/grass.png"}, treesdef))
+	end
+
+	newEntity{
+		define_as = "LAKE_NUR",
+		name = "way to the lake of Nur",
+		display = '>', color_r=255, color_g=255, color_b=0, image = "terrain/grass.png", add_displays = {class.new{image = "terrain/way_next_2.png"}},
+		notice = true,
+		always_remember = true,
+		change_level = 1, change_zone = "lake-nur",
+	}
+end
diff --git a/game/modules/tome/data/zones/old-forest/zone.lua b/game/modules/tome/data/zones/old-forest/zone.lua
index 6f4f393a7119bc4019a91d2e24b6a2bd0f2d78c3..143be2aabf9dc310ad7deac569b03e1ad5c9b5a8 100644
--- a/game/modules/tome/data/zones/old-forest/zone.lua
+++ b/game/modules/tome/data/zones/old-forest/zone.lua
@@ -32,8 +32,8 @@ return {
 	all_lited = true,
 	day_night = true,
 	persistent = "zone",
-	color_shown = {0.7, 0.7, 0.7, 1},
-	color_obscure = {0.7*0.6, 0.7*0.6, 0.7*0.6, 0.6},
+	color_shown = is_crystaline and {0.7, 0.7, 0.7, 1} or {0.9, 0.9, 0.9, 1},
+	color_obscure = is_crystaline and {0.7*0.6, 0.7*0.6, 0.7*0.6, 0.6} or {0.9*0.6, 0.9*0.6, 0.9*0.6, 0.6},
 	ambient_music = {"Woods of Eremae.ogg", "weather/rain.ogg"},
 	min_material_level = function() return game.state:isAdvanced() and 3 or 1 end,
 	max_material_level = function() return game.state:isAdvanced() and 4 or 2 end,
diff --git a/game/modules/tome/data/zones/ritch-tunnels/zone.lua b/game/modules/tome/data/zones/ritch-tunnels/zone.lua
index 2e4fc80c4da3263d797db1ae038389cc98030c05..317cade552b5c4614f9ccb8a04ccd15078a2ab0d 100644
--- a/game/modules/tome/data/zones/ritch-tunnels/zone.lua
+++ b/game/modules/tome/data/zones/ritch-tunnels/zone.lua
@@ -50,6 +50,7 @@ return {
 			class = "mod.class.generator.actor.Random",
 			nb_npc = {20, 30},
 			filters = { {max_ood=2}, },
+			randelite = 0,
 			guardian = "HIVE_MOTHER",
 		},
 		object = {
diff --git a/game/modules/tome/data/zones/slazish-fen/grids.lua b/game/modules/tome/data/zones/slazish-fen/grids.lua
index f933b83eb3775eaaedda0e6e3287c420d4c5b844..8263ee91323fbf9c68038db0b4b933dbfb19904a 100644
--- a/game/modules/tome/data/zones/slazish-fen/grids.lua
+++ b/game/modules/tome/data/zones/slazish-fen/grids.lua
@@ -27,17 +27,36 @@ newEntity{
 	define_as = "BOGTREE",
 	type = "wall", subtype = "water",
 	name = "tree",
-	image = "terrain/swamptree.png",
+	image = "terrain/poisoned_water_01.png",
 	display = '#', color=colors.LIGHT_GREEN, back_color=colors.DARK_BLUE,
 	always_remember = true,
 	can_pass = {pass_tree=1},
 	does_block_move = true,
 	block_sight = true,
 	dig = "SHALLOW_WATER",
-	nice_tiler = { method="replace", base={"BOGTREE", 100, 1, 20}},
+	nice_tiler = { method="replace", base={"BOGTREE", 100, 1, 40}},
 	shader = "water",
 }
-for i = 1, 20 do newEntity{ base="BOGTREE", define_as = "BOGTREE"..i, image = "terrain/poisoned_water_01.png", add_displays = class:makeTrees("terrain/swamptree", 3, 3)} end
+for i = 1, 40 do
+	newEntity(class:makeNewTrees({base="BOGTREE", define_as = "BOGTREE"..i}, {
+		{"small_willow", {"shadow", "trunk", "waterripples", "foliage_bare"}},
+		{"small_willow_moss", {"shadow", "trunk", "waterripples", "foliage_bare"}},
+		{"willow", {tall=-1, "shadow", "trunk", "waterripples", "foliage_bare"}},
+		{"willow_moss", {tall=-1, "shadow", "trunk", "waterripples", "foliage_bare"}},
+		{"small_willow", {"shadow", "trunk", "waterripples", "foliage_spring"}},
+		{"small_willow_moss", {"shadow", "trunk", "waterripples", "foliage_spring"}},
+		{"willow", {tall=-1, "shadow", "trunk", "waterripples", "foliage_spring"}},
+		{"willow_moss", {tall=-1, "shadow", "trunk", "waterripples", "foliage_spring"}},
+		{"small_willow", {"shadow", "trunk", "waterripples", "foliage_spring"}},
+		{"small_willow_moss", {"shadow", "trunk", "waterripples", "foliage_spring"}},
+		{"willow", {tall=-1, "shadow", "trunk", "waterripples", "foliage_spring"}},
+		{"willow_moss", {tall=-1, "shadow", "trunk", "waterripples", "foliage_spring"}},
+		{"small_willow", {"shadow", "trunk", "waterripples", "foliage_spring"}},
+		{"small_willow_moss", {"shadow", "trunk", "waterripples", "foliage_spring"}},
+		{"willow", {tall=-1, "shadow", "trunk", "waterripples", "foliage_spring"}},
+		{"willow_moss", {tall=-1, "shadow", "trunk", "waterripples", "foliage_spring"}},
+	}))
+end
 
 newEntity{ base="WATER_BASE",
 	define_as = "BOGWATER",
diff --git a/game/modules/tome/data/zones/slazish-fen/zone.lua b/game/modules/tome/data/zones/slazish-fen/zone.lua
index a07d6856a0a70e732855b1fc2e989822a556b2f4..44c751ce6efaa3e87f034c3aaf5c73c59ee91015 100644
--- a/game/modules/tome/data/zones/slazish-fen/zone.lua
+++ b/game/modules/tome/data/zones/slazish-fen/zone.lua
@@ -59,6 +59,7 @@ return {
 			class = "mod.class.generator.actor.Random",
 			nb_npc = {7, 10},
 			filters = { {max_ood=2}, },
+			randelite = 0,
 		},
 		object = {
 			class = "engine.generator.object.Random",
diff --git a/game/modules/tome/data/zones/south-beach/npcs.lua b/game/modules/tome/data/zones/south-beach/npcs.lua
index 130566e03cef1f022e046d40e74f2af946a9f7c8..a18edb9fc2366f2c2de89a48c4b63fbc7996462f 100644
--- a/game/modules/tome/data/zones/south-beach/npcs.lua
+++ b/game/modules/tome/data/zones/south-beach/npcs.lua
@@ -37,7 +37,7 @@ newEntity{
 	never_anger = true,
 	resists = {all=86},
 
-	moddable_tile_nude = true,
+	moddable_tile_nude = 1,
 	moddable_tile_ornament = {female="braid_redhead_01"},
 	resolvers.equip{ id=true,
 		{defined="MELINDA_BIKINI", autoreq=true, ego_chance=-1000}
diff --git a/game/modules/tome/data/zones/town-shatur/grids.lua b/game/modules/tome/data/zones/town-shatur/grids.lua
index e75fe56ecb58fdf71c36d265568b6d30f1cc8728..1619fc1b3dac02c5aa277e55428dbec181c532f7 100644
--- a/game/modules/tome/data/zones/town-shatur/grids.lua
+++ b/game/modules/tome/data/zones/town-shatur/grids.lua
@@ -20,6 +20,8 @@
 load("/data/general/grids/basic.lua")
 load("/data/general/grids/forest.lua")
 load("/data/general/grids/water.lua")
+load("/data/general/grids/snowy_forest.lua")
+load("/data/general/grids/elven_forest.lua")
 load("/data/general/grids/mountain.lua", function(e)
 	if e.image == "terrain/rocky_ground.png" then
 		e.image = "terrain/snowy_grass.png"
diff --git a/game/modules/tome/data/zones/trollmire/grids.lua b/game/modules/tome/data/zones/trollmire/grids.lua
index 53310e31087d7d1de73218240d2e23d3d17492f7..bfec29fe65da6ec6600c0eb6d3d463b04d4ce585 100644
--- a/game/modules/tome/data/zones/trollmire/grids.lua
+++ b/game/modules/tome/data/zones/trollmire/grids.lua
@@ -19,6 +19,7 @@
 
 load("/data/general/grids/basic.lua")
 load("/data/general/grids/forest.lua")
+load("/data/general/grids/autumn_forest.lua")
 load("/data/general/grids/water.lua")
 
 local grass_editer = { method="borders_def", def="grass"}
@@ -55,7 +56,18 @@ newEntity{
 	nice_tiler = { method="replace", base={"BOGTREE", 100, 1, 20}},
 	shader = "water",
 }
-for i = 1, 20 do newEntity{ base="BOGTREE", define_as = "BOGTREE"..i, image = "terrain/water_grass_5_1.png", add_displays = class:makeTrees("terrain/tree_alpha", 13, 9)} end
+for i = 1, 20 do
+	newEntity(class:makeNewTrees({base="BOGTREE", define_as = "BOGTREE"..i, image = "terrain/water_grass_5_1.png"}, {
+		{"small_willow", {"shadow", "trunk", "foliage_bare"}},
+		{"small_willow_moss", {"shadow", "trunk", "foliage_bare"}},
+		{"willow", {tall=-1, "shadow", "trunk", "foliage_bare"}},
+		{"willow_moss", {tall=-1, "shadow", "trunk", "foliage_bare"}},
+		{"small_willow", {"shadow", "trunk", "foliage_spring"}},
+		{"small_willow_moss", {"shadow", "trunk", "foliage_spring"}},
+		{"willow", {tall=-1, "shadow", "trunk", "foliage_spring"}},
+		{"willow_moss", {tall=-1, "shadow", "trunk", "foliage_spring"}},
+	}, 1))
+end
 
 newEntity{ base="WATER_BASE",
 	define_as = "BOGWATER",
diff --git a/game/modules/tome/data/zones/trollmire/zone.lua b/game/modules/tome/data/zones/trollmire/zone.lua
index a13a442ad0353a036501e8c46fc11d12ceb22972..203cb28baf0bea567cb924a878a83ff1f82b67d6 100644
--- a/game/modules/tome/data/zones/trollmire/zone.lua
+++ b/game/modules/tome/data/zones/trollmire/zone.lua
@@ -18,6 +18,7 @@
 -- darkgod@te4.org
 
 local layout = game.state:alternateZoneTier1(short_name, {"FLOODED", 1})
+--layout="DEFAULT"
 if layout == "FLOODED" then
 
 return {
@@ -35,8 +36,8 @@ return {
 	tier1_escort = 2,
 	persistent = "zone",
 	-- Apply a greenish tint to all the map
-	color_shown = {0.8, 1, 0.6, 1},
-	color_obscure = {0.8*0.6, 1*0.6, 0.6*0.6, 0.6},
+--	color_shown = {0.8, 1, 0.6, 1},
+--	color_obscure = {0.8*0.6, 1*0.6, 0.6*0.6, 0.6},
 	ambient_music = "Rainy Day.ogg",
 	min_material_level = function() return game.state:isAdvanced() and 3 or 1 end,
 	max_material_level = function() return game.state:isAdvanced() and 4 or 2 end,
diff --git a/game/modules/tome/data/zones/wilderness/grids.lua b/game/modules/tome/data/zones/wilderness/grids.lua
index c85baa348f713920cb6244e70c14b8e00f355f1e..44c3bd9f1a5da9eaa29d46fb98e49fae497d5409 100644
--- a/game/modules/tome/data/zones/wilderness/grids.lua
+++ b/game/modules/tome/data/zones/wilderness/grids.lua
@@ -55,6 +55,22 @@ newEntity{ base="PLAINS", define_as="LOW_HILLS",
 }
 for i = 1, 6 do newEntity{ base = "LOW_HILLS", define_as = "LOW_HILLS"..i, image="terrain/grass.png", add_mos={{image="terrain/grass_hill_"..i.."_01.png"}} } end
 
+local forest_editer = { method="borders", type="forest", use_type="name",
+	default8={z=16,  add_mos={{image="terrain/worldmap/WM_norm_trees_8_%02d.png", display_y=-1}}, min=1, max=6},
+	default2={z=6, add_mos={{image="terrain/worldmap/WM_norm_trees_2_%02d.png", display_h=2}}, min=1, max=6},
+	default4={z=16, add_mos={{image="terrain/worldmap/WM_norm_trees_4.png", display_x=-1}}, min=1, max=1},
+	default6={z=16, add_mos={{image="terrain/worldmap/WM_norm_trees_6.png", display_x=1}}, min=1, max=1},
+
+	default1={z=6, add_mos={{image="terrain/worldmap/WM_norm_trees_37d_%02d.png", display_y=1, display_x=-1}}, min=1, max=1},
+	default3={z=6, add_mos={{image="terrain/worldmap/WM_norm_trees_19d_%02d.png", display_y=1, display_x=1}}, min=1, max=1},
+	default7={z=16,  add_mos={{image="terrain/worldmap/WM_norm_trees_91d_%02d.png", display_y=-1, display_x=-1}}, min=1, max=1},
+	default9={z=16,  add_mos={{image="terrain/worldmap/WM_norm_trees_73d_%02d.png", display_y=-1, display_x=1}}, min=1, max=1},
+
+	default1i={},
+	default3i={},
+	default7i={z=6, add_mos={{image="terrain/worldmap/WM_norm_trees_7.png", display_y=-1, display_x=-1}}, min=1, max=1},
+	default9i={z=6, add_mos={{image="terrain/worldmap/WM_norm_trees_9.png", display_y=-1, display_x=1}}, min=1, max=1},
+}
 newEntity{
 	define_as = "FOREST",
 	type = "wall", subtype = "grass",
@@ -65,27 +81,79 @@ newEntity{
 	can_pass = {pass_tree=1},
 	does_block_move = true,
 	block_sight = true,
-	nice_tiler = { method="replace", base={"FOREST", 100, 1, 30}},
 	nice_editer = grass_editer,
+	nice_editer2 = forest_editer,
+	nice_tiler = { method="replace", base={"FOREST", 100, 1, 12}},
+	special_minimap = colors.GREEN,
+}
+for i = 1, 12 do newEntity{ base="FOREST", define_as = "FOREST"..i, image = "terrain/grass.png", add_displays={class.new{z=17, image=("terrain/worldmap/WM_norm_trees_5_%02d.png"):format(i), display_h=2, display_y=-1}}} end
+
+local pine_forest_editer = { method="borders", type="pine forest", use_type="name",
+	default8={z=16,  add_mos={{image="terrain/worldmap/WM_pines_8_%02d.png", display_y=-1}}, min=1, max=3},
+	default2={z=6, add_mos={{image="terrain/worldmap/WM_pines_2_%02d.png", display_h=2}}, min=1, max=3},
+	default4={z=16, add_mos={{image="terrain/worldmap/WM_pines_4.png", display_x=-1, display_h=2, display_y=-1}}, min=1, max=1},
+	default6={z=16, add_mos={{image="terrain/worldmap/WM_pines_6.png", display_x=1, display_h=2, display_y=-1}}, min=1, max=1},
+
+	default1={z=6, add_mos={{image="terrain/worldmap/WM_pines_37d_%02d.png", display_y=1, display_x=-1}}, min=1, max=1},
+	default3={z=6, add_mos={{image="terrain/worldmap/WM_pines_19d_%02d.png", display_y=1, display_x=1}}, min=1, max=1},
+	default7={z=16,  add_mos={{image="terrain/worldmap/WM_pines_91d_%02d.png", display_y=-1, display_x=-1}}, min=1, max=1},
+	default9={z=16,  add_mos={{image="terrain/worldmap/WM_pines_73d_%02d.png", display_y=-1, display_x=1}}, min=1, max=1},
+
+	default1i={},
+	default3i={},
+	default7i={z=6, add_mos={{image="terrain/worldmap/WM_pines_7.png", display_y=-1, display_x=-1}}, min=1, max=1},
+	default9i={z=6, add_mos={{image="terrain/worldmap/WM_pines_9.png", display_y=-1, display_x=1}}, min=1, max=1},
+}
+newEntity{
+	define_as = "PINE_FOREST",
+	type = "wall", subtype = "grass",
+	name = "pine forest",
+	image = "terrain/tree.png",
+	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+	always_remember = true,
+	can_pass = {pass_tree=1},
+	does_block_move = true,
+	block_sight = true,
+	nice_editer = grass_editer,
+	nice_editer2 = pine_forest_editer,
+	nice_tiler = { method="replace", base={"PINE_FOREST", 100, 1, 6}},
 	special_minimap = colors.GREEN,
 }
-for i = 1, 30 do newEntity{ base="FOREST", define_as = "FOREST"..i, image = "terrain/grass.png", add_displays = class:makeTrees("terrain/tree_alpha", 13, 9)} end
+for i = 1, 6 do newEntity{ base="PINE_FOREST", define_as = "PINE_FOREST"..i, image = "terrain/grass.png", add_displays={class.new{z=17, image="terrain/worldmap/WM_pines_5_0"..i..".png", display_h=2, display_y=-1}}} end
+
+
+local old_forest_editer = { method="borders", type="Old forest", use_type="name",
+	default8={z=16,  add_mos={{image="terrain/worldmap/WM_oldforest_8_%02d.png", display_y=-1}}, min=1, max=3},
+	default2={z=6, add_mos={{image="terrain/worldmap/WM_oldforest_2_%02d.png", display_h=2}}, min=1, max=3},
+	default4={z=16, add_mos={{image="terrain/worldmap/WM_oldforest_4_%02d.png", display_x=-1, display_h=2, display_y=-1}}, min=1, max=2},
+	default6={z=16, add_mos={{image="terrain/worldmap/WM_oldforest_6_%02d.png", display_x=1, display_h=2, display_y=-1}}, min=1, max=2},
 
+	default1={z=6, add_mos={{image="terrain/worldmap/WM_oldforest_37d_%02d.png", display_y=1, display_x=-1}}, min=1, max=1},
+	default3={z=6, add_mos={{image="terrain/worldmap/WM_oldforest_19d_%02d.png", display_y=1, display_x=1}}, min=1, max=1},
+	default7={z=16,  add_mos={{image="terrain/worldmap/WM_oldforest_91d_%02d.png", display_y=-1, display_x=-1}}, min=1, max=1},
+	default9={z=16,  add_mos={{image="terrain/worldmap/WM_oldforest_73d_%02d.png", display_y=-1, display_x=1}}, min=1, max=1},
+
+	default1i={},
+	default3i={},
+	default7i={z=6, add_mos={{image="terrain/worldmap/WM_oldforest_7.png", display_y=-1, display_x=-1}}, min=1, max=1},
+	default9i={z=6, add_mos={{image="terrain/worldmap/WM_oldforest_9.png", display_y=-1, display_x=1}}, min=1, max=1},
+}
 newEntity{
 	define_as = "OLD_FOREST",
 	type = "wall", subtype = "grass",
 	name = "Old forest",
-	image = "terrain/tree_dark.png",
-	display = '#', color=colors.GREEN, back_color={r=34,g=65,b=33},
+	image = "terrain/tree.png",
+	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
 	always_remember = true,
 	can_pass = {pass_tree=1},
 	does_block_move = true,
 	block_sight = true,
-	nice_tiler = { method="replace", base={"OLD_FOREST", 100, 1, 30}},
 	nice_editer = grass_editer,
+	nice_editer2 = old_forest_editer,
+	nice_tiler = { method="replace", base={"OLD_FOREST", 100, 1, 5}},
 	special_minimap = colors.GREEN,
 }
-for i = 1, 30 do newEntity{ base="OLD_FOREST", define_as = "OLD_FOREST"..i, image = "terrain/grass.png", add_displays = class:makeTrees("terrain/tree_alpha", 13, 9, colors.GREY)} end
+for i = 1, 5 do newEntity{ base="OLD_FOREST", define_as = "OLD_FOREST"..i, image = "terrain/grass.png", add_displays={class.new{z=17, image="terrain/worldmap/WM_oldforest_5_0"..i..".png", display_h=2, display_y=-1}}} end
 
 --------------------------------------------------------------------------------
 -- Desolation
@@ -102,21 +170,38 @@ newEntity{
 }
 for i = 1, 16 do newEntity{ base = "CHARRED_SCAR", define_as = "CHARRED_SCAR_PATCH"..i, image = "terrain/lava/lava_floor"..i..".png" } end
 
+local burnt_forest_editer = { method="borders", type="burnt forest", use_type="name",
+--	default8={z=16,  add_mos={{image="terrain/worldmap/WM_burnttrees_8_%02d.png", display_y=-1}}, min=1, max=3},
+	default2={z=6, add_mos={{image="terrain/worldmap/WM_burnttrees_2.png", display_h=2}}, min=1, max=1},
+	default4={z=16, add_mos={{image="terrain/worldmap/WM_burnttrees_4.png", display_x=-1}}, min=1, max=1},
+	default6={z=16, add_mos={{image="terrain/worldmap/WM_burnttrees_6.png", display_x=1}}, min=1, max=1},
+
+	default1={z=6, add_mos={{image="terrain/worldmap/WM_burnttrees_37d_%02d.png", display_y=1, display_x=-1}}, min=1, max=1},
+	default3={z=6, add_mos={{image="terrain/worldmap/WM_burnttrees_19d_%02d.png", display_y=1, display_x=1}}, min=1, max=1},
+	default7={z=16,  add_mos={{image="terrain/worldmap/WM_burnttrees_91d_%02d.png", display_y=-1, display_x=-1}}, min=1, max=1},
+	default9={z=16,  add_mos={{image="terrain/worldmap/WM_burnttrees_73d_%02d.png", display_y=-1, display_x=1}}, min=1, max=1},
+
+	default1i={},
+	default3i={},
+--	default7i={z=6, add_mos={{image="terrain/worldmap/WM_burnttrees_7.png", display_y=-1, display_x=-1}}, min=1, max=1},
+--	default9i={z=6, add_mos={{image="terrain/worldmap/WM_burnttrees_9.png", display_y=-1, display_x=1}}, min=1, max=1},
+}
 newEntity{
 	define_as = "BURNT_FOREST",
 	type = "wall", subtype = "lava",
-	name = "burnt tree",
+	name = "burnt forest",
 	image = "terrain/burnt_tree.png",
 	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
 	always_remember = true,
 	can_pass = {pass_tree=1},
 	does_block_move = true,
 	block_sight = true,
-	nice_tiler = { method="replace", base={"BURNT_FOREST", 100, 1, 20}},
+	nice_tiler = { method="replace", base={"BURNT_FOREST", 100, 1, 5}},
 	nice_editer = lava_editer,
+	nice_editer2 = burnt_forest_editer,
 	special_minimap = colors.GREY,
 }
-for i = 1, 20 do newEntity{ base="BURNT_FOREST", define_as = "BURNT_FOREST"..i, name = "burnt tree", image = "terrain/lava_floor.png", add_displays = class:makeTrees("terrain/burnttree_alpha", 8, 0)} end
+for i = 1, 5 do newEntity{ base="BURNT_FOREST", define_as = "BURNT_FOREST"..i, name = "burnt forest", image = "terrain/lava_floor.png", add_mos={{image="terrain/worldmap/WM_burnttrees_5_0"..i..".png", display_y=-1, display_h=2}}} end
 
 --------------------------------------------------------------------------------
 -- Iceland
@@ -142,25 +227,104 @@ newEntity{
 }
 for i = 1, 4 do newEntity{ base="FROZEN_SEA", define_as = "FROZEN_SEA"..i, add_mos = {{image = "terrain/ice/frozen_ground_5_0"..i..".png"}}} end
 
+local pine_forest_editer = { method="borders", type="cold forest", use_type="name",
+	default8={z=16,  add_mos={{image="terrain/worldmap/WM_snow_pine_8_%02d.png", display_y=-1}}, min=1, max=3},
+	default2={z=6, add_mos={{image="terrain/worldmap/WM_snow_pine_2_%02d.png", display_h=2}}, min=1, max=3},
+	default4={z=16, add_mos={{image="terrain/worldmap/WM_snow_pine_4.png", display_x=-1, display_h=2, display_y=-1}}, min=1, max=1},
+	default6={z=16, add_mos={{image="terrain/worldmap/WM_snow_pine_6.png", display_x=1, display_h=2, display_y=-1}}, min=1, max=1},
+
+	default1={z=6, add_mos={{image="terrain/worldmap/WM_snow_pine_37d_%02d.png", display_y=1, display_x=-1}}, min=1, max=1},
+	default3={z=6, add_mos={{image="terrain/worldmap/WM_snow_pine_19d_%02d.png", display_y=1, display_x=1}}, min=1, max=1},
+	default7={z=16,  add_mos={{image="terrain/worldmap/WM_snow_pine_91d_%02d.png", display_y=-1, display_x=-1}}, min=1, max=1},
+	default9={z=16,  add_mos={{image="terrain/worldmap/WM_snow_pine_73d_%02d.png", display_y=-1, display_x=1}}, min=1, max=1},
+
+	default1i={},
+	default3i={},
+	default7i={z=6, add_mos={{image="terrain/worldmap/WM_snow_pine_7.png", display_y=-1, display_x=-1}}, min=1, max=1},
+	default9i={z=6, add_mos={{image="terrain/worldmap/WM_snow_pine_9.png", display_y=-1, display_x=1}}, min=1, max=1},
+}
 newEntity{
 	define_as = "COLD_FOREST",
 	type = "wall", subtype = "ice",
-	name = "cold forest", image = "terrain/tree_dark_snow1.png",
-	display = '#', color=colors.WHITE, back_color=colors.LIGHT_UMBER,
+	name = "cold forest",
+	image = "terrain/tree.png",
+	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
 	always_remember = true,
 	can_pass = {pass_tree=1},
 	does_block_move = true,
 	block_sight = true,
-	nice_tiler = { method="replace", base={"COLD_FOREST", 100, 1, 30} },
+	nice_editer = ice_editer,
+	nice_editer2 = pine_forest_editer,
+	nice_tiler = { method="replace", base={"COLD_FOREST", 100, 1, 6}},
+	special_minimap = colors.GREEN,
 }
-for i = 1, 30 do
-newEntity{ base="COLD_FOREST",
-	define_as = "COLD_FOREST"..i,
-	image = "terrain/frozen_ground.png",
-	add_displays = class:makeTrees("terrain/tree_dark_snow", 13, 10),
-	nice_tiler = false,
+for i = 1, 6 do newEntity{ base="COLD_FOREST", define_as = "COLD_FOREST"..i, image = "terrain/frozen_ground.png", add_displays={class.new{z=17, image="terrain/worldmap/WM_snow_pine_5_0"..i..".png", display_h=2, display_y=-1}}} end
+
+local elvenwoon_snow_forest_editer = { method="borders", type="cold thaloren forest", use_type="name",
+--	default8={z=16,  add_mos={{image="terrain/worldmap/WM_snow_elvenwood_8_%02d.png", display_y=-1}}, min=1, max=3},
+--	default2={z=6, add_mos={{image="terrain/worldmap/WM_snow_elvenwood_2_%02d.png", display_h=2}}, min=1, max=3},
+	default4={z=16, add_mos={{image="terrain/worldmap/WM_snow_elvenwood_4_%02d.png", display_x=-1, display_h=2, display_y=-1}}, min=1, max=2},
+	default6={z=16, add_mos={{image="terrain/worldmap/WM_snow_elvenwood_6_%02d.png", display_x=1, display_h=2, display_y=-1}}, min=1, max=2},
+
+	-- default1={z=6, add_mos={{image="terrain/worldmap/WM_snow_elvenwood_37d_%02d.png", display_y=1, display_x=-1}}, min=1, max=1},
+	-- default3={z=6, add_mos={{image="terrain/worldmap/WM_snow_elvenwood_19d_%02d.png", display_y=1, display_x=1}}, min=1, max=1},
+	-- default7={z=16,  add_mos={{image="terrain/worldmap/WM_snow_elvenwood_91d_%02d.png", display_y=-1, display_x=-1}}, min=1, max=1},
+	-- default9={z=16,  add_mos={{image="terrain/worldmap/WM_snow_elvenwood_73d_%02d.png", display_y=-1, display_x=1}}, min=1, max=1},
+
+	default1i={},
+	default3i={},
+	default7i={z=6, add_mos={{image="terrain/worldmap/WM_snow_elvenwood_7.png", display_y=-1, display_x=-1}}, min=1, max=1},
+	default9i={z=6, add_mos={{image="terrain/worldmap/WM_snow_elvenwood_9.png", display_y=-1, display_x=1}}, min=1, max=1},
 }
-end
+newEntity{
+	define_as = "ELVENWOOD_SNOW",
+	type = "wall", subtype = "ice",
+	name = "cold thaloren forest",
+	image = "terrain/tree.png",
+	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+	always_remember = true,
+	can_pass = {pass_tree=1},
+	does_block_move = true,
+	block_sight = true,
+	nice_editer = ice_editer,
+	nice_editer2 = elvenwoon_snow_forest_editer,
+	nice_tiler = { method="replace", base={"ELVENWOOD_SNOW", 100, 1, 7}},
+	special_minimap = colors.GREEN,
+}
+for i = 1, 7 do newEntity{ base="ELVENWOOD_SNOW", define_as = "ELVENWOOD_SNOW"..i, image = "terrain/frozen_ground.png", add_displays={class.new{z=17, image="terrain/worldmap/WM_snow_elvenwood_5_0"..i..".png", display_h=2, display_y=-1}}} end
+
+local elvenwoon_green_forest_editer = { method="borders", type="thaloren forest", use_type="name",
+	default8={z=16, add_mos={{image="terrain/worldmap/WM_green_elvenwood_8_%02d.png", display_y=-1, display_h=2}}, min=1, max=3},
+	default2={z=6,  add_mos={{image="terrain/worldmap/WM_green_elvenwood_2_%02d.png", display_y=-1, display_h=2}}, min=1, max=3},
+	default4={z=16, add_mos={{image="terrain/worldmap/WM_green_elvenwood_4_%02d.png", display_x=-1, display_h=2, display_y=-1}}, min=1, max=2},
+	default6={z=16, add_mos={{image="terrain/worldmap/WM_green_elvenwood_6_%02d.png", display_x=1, display_h=2, display_y=-1}}, min=1, max=2},
+
+	default1={z=6, add_mos={{image="terrain/worldmap/WM_green_elvenwood_37d_%02d.png", display_y=1, display_x=-1}}, min=1, max=1},
+	default3={z=6, add_mos={{image="terrain/worldmap/WM_green_elvenwood_19d_%02d.png", display_y=1, display_x=1}}, min=1, max=1},
+	default7={z=16,  add_mos={{image="terrain/worldmap/WM_green_elvenwood_91d_%02d.png", display_y=-1, display_x=-1}}, min=1, max=1},
+	default9={z=16,  add_mos={{image="terrain/worldmap/WM_green_elvenwood_73d_%02d.png", display_y=-1, display_x=1}}, min=1, max=1},
+
+	default1i={},
+	default3i={},
+	default7i={z=6, add_mos={{image="terrain/worldmap/WM_green_elvenwood_7.png", display_y=-1, display_x=-1}}, min=1, max=1},
+	default9i={z=6, add_mos={{image="terrain/worldmap/WM_green_elvenwood_9.png", display_y=-1, display_x=1}}, min=1, max=1},
+}
+newEntity{
+	define_as = "ELVENWOOD_GREEN",
+	type = "wall", subtype = "grass",
+	name = "thaloren forest",
+	image = "terrain/tree.png",
+	display = '#', color=colors.LIGHT_GREEN, back_color={r=44,g=95,b=43},
+	always_remember = true,
+	can_pass = {pass_tree=1},
+	does_block_move = true,
+	block_sight = true,
+	nice_editer = grass_editer,
+	nice_editer2 = elvenwoon_green_forest_editer,
+	nice_tiler = { method="replace", base={"ELVENWOOD_GREEN", 100, 1, 1}},
+	special_minimap = colors.GREEN,
+}
+for i = 1, 1 do newEntity{ base="ELVENWOOD_GREEN", define_as = "ELVENWOOD_GREEN"..i, image = "terrain/grass.png", add_displays={class.new{z=17, image="terrain/worldmap/WM_green_elvenwood_5_0"..i..".png", display_h=2, display_y=-1}}} end
 
 --------------------------------------------------------------------------------
 -- Water
@@ -254,6 +418,22 @@ for i = 1, 4 do
 	newEntity{ base = "JUNGLE_PLAINS", define_as = "JUNGLE_PLAINS_PATCH"..(i+5+8+3+4), add_displays={class.new{z=3,image = "terrain/jungle/jungle_plant_0"..i..".png"}} }
 end
 
+local jungle_forest_editer = { method="borders", type="jungle", use_type="name",
+	default8={z=16,  add_mos={{image="terrain/worldmap/WM_jungle_8_%02d.png", display_y=-1}}, min=1, max=3},
+	default2={z=6, add_mos={{image="terrain/worldmap/WM_jungle_2_%02d.png", display_h=2}}, min=1, max=3},
+	default4={z=16, add_mos={{image="terrain/worldmap/WM_jungle_4_%02d.png", display_x=-1, display_h=2, display_y=-1}}, min=1, max=2},
+	default6={z=16, add_mos={{image="terrain/worldmap/WM_jungle_6_%02d.png", display_x=1, display_h=2, display_y=-1}}, min=1, max=2},
+
+	default1={z=6, add_mos={{image="terrain/worldmap/WM_jungle_37d_%02d.png", display_y=1, display_x=-1}}, min=1, max=1},
+	default3={z=6, add_mos={{image="terrain/worldmap/WM_jungle_19d_%02d.png", display_y=1, display_x=1}}, min=1, max=1},
+	default7={z=16,  add_mos={{image="terrain/worldmap/WM_jungle_91d_%02d.png", display_y=-1, display_x=-1}}, min=1, max=1},
+	default9={z=16,  add_mos={{image="terrain/worldmap/WM_jungle_73d_%02d.png", display_y=-1, display_x=1}}, min=1, max=1},
+
+	default1i={},
+	default3i={},
+	default7i={z=6, add_mos={{image="terrain/worldmap/WM_jungle_7.png", display_y=-1, display_x=-1}}, min=1, max=1},
+	default9i={z=6, add_mos={{image="terrain/worldmap/WM_jungle_9.png", display_y=-1, display_x=1}}, min=1, max=1},
+}
 newEntity{
 	define_as = "JUNGLE_FOREST",
 	type = "wall", subtype = "grass",
@@ -264,12 +444,13 @@ newEntity{
 	can_pass = {pass_tree=1},
 	does_block_move = true,
 	block_sight = true,
-	nice_tiler = { method="replace", base={"JUNGLE_FOREST", 100, 1, 30}},
+	nice_tiler = { method="replace", base={"JUNGLE_FOREST", 100, 1, 3}},
 	nice_editer = jungle_grass_editer,
+	nice_editer2 = jungle_forest_editer,
 	special_minimap = colors.GREEN,
 }
-for i = 1, 30 do
-	newEntity{ base="JUNGLE_FOREST", define_as = "JUNGLE_FOREST"..i, image = "terrain/jungle/jungle_grass_floor_01.png", add_displays = class:makeTrees("terrain/jungle/jungle_tree_", 17, 7)}
+for i = 1, 3 do
+	newEntity{ base="JUNGLE_FOREST", define_as = "JUNGLE_FOREST"..i, image = "terrain/jungle/jungle_grass_floor_01.png", add_displays={class.new{z=17, image="terrain/worldmap/WM_jungle_5_0"..i..".png", display_h=2, display_y=-1}}}
 end
 
 --------------------------------------------------------------------------------
@@ -285,6 +466,22 @@ newEntity{
 	nice_editer = sand_editer,
 }
 
+local oasis_forest_editer = { method="borders", type="oasis", use_type="name",
+	default8={z=16,  add_mos={{image="terrain/worldmap/WM_palms_8_%02d.png", display_y=-1}}, min=1, max=3},
+--	default2={z=6, add_mos={{image="terrain/worldmap/WM_palms_2_%02d.png", display_h=2}}, min=1, max=3},
+	default4={z=16, add_mos={{image="terrain/worldmap/WM_palms_4_%02d.png", display_x=-1}}, min=1, max=2},
+	default6={z=16, add_mos={{image="terrain/worldmap/WM_palms_6_%02d.png", display_x=1}}, min=1, max=2},
+
+	default1={z=6, add_mos={{image="terrain/worldmap/WM_palms_37d_%02d.png", display_y=1, display_x=-1}}, min=1, max=1},
+	default3={z=6, add_mos={{image="terrain/worldmap/WM_palms_19d_%02d.png", display_y=1, display_x=1}}, min=1, max=1},
+	default7={z=16,  add_mos={{image="terrain/worldmap/WM_palms_91d_%02d.png", display_y=-1, display_x=-1}}, min=1, max=1},
+	default9={z=16,  add_mos={{image="terrain/worldmap/WM_palms_73d_%02d.png", display_y=-1, display_x=1}}, min=1, max=1},
+
+	default1i={},
+	default3i={},
+--	default7i={z=6, add_mos={{image="terrain/worldmap/WM_palms_7.png", display_y=-1, display_x=-1}}, min=1, max=1},
+--	default9i={z=6, add_mos={{image="terrain/worldmap/WM_palms_9.png", display_y=-1, display_x=1}}, min=1, max=1},
+}
 newEntity{
 	define_as = "OASIS",
 	type = "wall", subtype = "sand",
@@ -295,16 +492,12 @@ newEntity{
 	can_pass = {pass_tree=1},
 	does_block_move = true,
 	block_sight = true,
-	nice_tiler = { method="replace", base={"OASIS", 100, 1, 30} },
+	nice_tiler = { method="replace", base={"OASIS", 100, 1, 5} },
 	nice_editer = sand_editer,
+	nice_editer2 = oasis_forest_editer,
 }
-for i = 1, 30 do
-newEntity{ base="OASIS",
-	define_as = "OASIS"..i,
-	image = "terrain/sandfloor.png",
-	add_displays = class:makeTrees("terrain/palmtree_alpha", 4),
-	nice_tiler = false,
-}
+for i = 1, 5 do
+	newEntity{ base="OASIS", define_as = "OASIS"..i, image = "terrain/sandfloor.png", add_displays={class.new{z=17, image="terrain/worldmap/WM_palms_5_0"..i..".png", display_h=2, display_y=-1}}}
 end
 
 --------------------------------------------------------------------------------
diff --git a/game/modules/tome/dialogs/Birther.lua b/game/modules/tome/dialogs/Birther.lua
index 96bbcc8c3f37197dab9aa66d5eda915ccc6e82d1..1767bdf02d17ad09554c276d66b2ffec099e5c0f 100644
--- a/game/modules/tome/dialogs/Birther.lua
+++ b/game/modules/tome/dialogs/Birther.lua
@@ -55,7 +55,7 @@ function _M:init(title, actor, order, at_end, quickbirth, w, h)
 
 	self.obj_list = Object:loadList("/data/general/objects/objects.lua")
 	self.obj_list_by_name = {}
-	for i, e in ipairs(self.obj_list) do if e.name and e.rarity then self.obj_list_by_name[e.name] = e end end
+	for i, e in ipairs(self.obj_list) do if e.name and (e.rarity or e.define_as) then self.obj_list_by_name[e.name] = e end end
 
 	self.descriptors = {}
 	self.descriptors_by_type = {}
@@ -294,7 +294,7 @@ function _M:atEnd(v)
 				self.actor.make_tile = nil
 				self.actor.moddable_tile = nil
 			end
-			self:applyCosmeticActor()
+			self:applyCosmeticActor(true)
 			game:setPlayerName(self.c_name.text)
 
 			local save = Savefile.new(game.save_name)
@@ -1086,8 +1086,6 @@ function _M:setTile(f, w, h, last)
 	end
 	self:resetAttachementSpots()
 
-	self:applyCosmeticActor()
-
 	if not last then
 		-- Add an example particles if any
 		local ps = self.actor:getParticlesList("all")
@@ -1104,12 +1102,15 @@ function _M:setTile(f, w, h, last)
 		end
 
 		self:fakeEquip(true)
+		self:applyCosmeticActor(false)
 		self.actor:updateModdableTile()
 		self:fakeEquip(false)
+	else
+		self:applyCosmeticActor(true)
 	end
 end
 
-function _M:applyCosmeticActor()
+function _M:applyCosmeticActor(last)
 	self.actor.is_redhaed = nil -- Booh this is ugly
 
 	local list = {}
@@ -1118,7 +1119,7 @@ function _M:applyCosmeticActor()
 	end
 	table.sort(list, function(a,b) return a.priority < b.priority end)
 	for i, d in ipairs(list) do
-		d.on_actor(self.actor)
+		d.on_actor(self.actor, self, last)
 	end
 end
 
diff --git a/game/modules/tome/dialogs/GraphicMode.lua b/game/modules/tome/dialogs/GraphicMode.lua
index 0504cb8e3d1543ceea2cd501dbc9be358ffc3858..6b7b42fc5126962f84eb6c2fe46f5ff4d66d23f7 100644
--- a/game/modules/tome/dialogs/GraphicMode.lua
+++ b/game/modules/tome/dialogs/GraphicMode.lua
@@ -30,8 +30,7 @@ local Map = require "engine.Map"
 module(..., package.seeall, class.inherit(Dialog))
 
 local tiles_packs = {
-	shockbolt = {name= "Shockbolt", order=1},
---	mushroom = {name= "Mushroom", order=2},
+	shockbolt = {name= "Modern", order=1},
 	ascii = {name= "ASCII", order=5},
 	ascii_full = {name= "ASCII with background", order=6},
 	customtiles = {name= "Custom Tileset", order=7},
diff --git a/game/modules/tome/dialogs/LevelupDialog.lua b/game/modules/tome/dialogs/LevelupDialog.lua
index ef54ce60ad8d143fb22304a426a13f20e3f1de9a..9f2ce06be030349aa4a8b61201410b19fd8e1331 100644
--- a/game/modules/tome/dialogs/LevelupDialog.lua
+++ b/game/modules/tome/dialogs/LevelupDialog.lua
@@ -792,7 +792,7 @@ function _M:getStatDesc(item)
 		text:add("Mindpower: ", color, ("%0.2f"):format(diff * 0.7), dc, true)
 		text:add("Mental save: ", color, ("%0.2f"):format(diff * 0.35), dc, true)
 		text:add("Spell save: ", color, ("%0.2f"):format(diff * 0.35), dc, true)
-		if self.actor.use_psi_combat then
+		if self.actor:attr("use_psi_combat") then
 			text:add("Accuracy: ", color, ("%0.2f"):format(diff * 0.35), dc, true)
 		end
 	elseif stat_id == self.actor.STAT_STR then
@@ -803,7 +803,7 @@ function _M:getStatDesc(item)
 		text:add("Crit. chance: ", color, ("%0.2f"):format(diff * 0.3), dc, true)
 		text:add("Mental save: ", color, ("%0.2f"):format(diff * 0.35), dc, true)
 		text:add("Mindpower: ", color, ("%0.2f"):format(diff * 0.4), dc, true)
-		if self.actor.use_psi_combat then
+		if self.actor:attr("use_psi_combat") then
 			text:add("Accuracy: ", color, ("%0.2f"):format(diff * 0.35), dc, true)
 		end
 	elseif stat_id == self.actor.STAT_MAG then
diff --git a/game/modules/tome/dialogs/MapMenu.lua b/game/modules/tome/dialogs/MapMenu.lua
index 6dc9d42cd63677e080d1fe8a56cf4d08347b2fb2..8e3404e6a134d52be09bb317f832725b894646d3 100644
--- a/game/modules/tome/dialogs/MapMenu.lua
+++ b/game/modules/tome/dialogs/MapMenu.lua
@@ -138,7 +138,8 @@ function _M:generateList()
 	if a and not self.on_player and game.party:canControl(a, false) then list[#list+1] = {name="Control", action="control", color=colors.simple(colors.TEAL), actor=a} end
 	if a and not self.on_player and game.party:canOrder(a, false) then list[#list+1] = {name="Give order", action="order", color=colors.simple(colors.TEAL), actor=a} end
 	if a and not self.on_player and config.settings.cheat then list[#list+1] = {name="Target player", action="target-player", color=colors.simple(colors.RED), actor=a} end
-	if a and config.settings.cheat then list[#list+1] = {name="Lua inspect", action="debug-inspect", color=colors.simple(colors.LIGHT_BLUE), actor=a} end
+	if a and config.settings.cheat then list[#list+1] = {name="Lua inspect [Actor]", action="debug-inspect", color=colors.simple(colors.LIGHT_BLUE), actor=a} end
+	if g and config.settings.cheat then list[#list+1] = {name="Lua inspect [Terrain]", action="debug-inspect", color=colors.simple(colors.LIGHT_BLUE), actor=g} end
 	if a and config.settings.cheat then list[#list+1] = {name="Show inventory", action="debug-inventory", color=colors.simple(colors.YELLOW), actor=a} end
 	if self.on_player then list[#list+1] = {name="Rest a while", action="rest", color=colors.simple(colors.ANTIQUE_WHITE)} end
 	if self.on_player then list[#list+1] = {name="Auto-explore", action="autoexplore", color=colors.simple(colors.ANTIQUE_WHITE)} end
diff --git a/game/modules/tome/init.lua b/game/modules/tome/init.lua
index bba90cc8dc2d6748c372ea375f35c3e91f3fa905..47ad606e4883c9b5ea7d29ca03d46d279ecb4f97 100644
--- a/game/modules/tome/init.lua
+++ b/game/modules/tome/init.lua
@@ -22,8 +22,8 @@ long_name = "Tales of Maj'Eyal: Age of Ascendancy"
 short_name = "tome"
 author = { "DarkGod", "darkgod@te4.org" }
 homepage = "http://te4.org/"
-version = {1,1,6}
-engine = {1,1,6,"te4"}
+version = {1,2,0}
+engine = {1,2,0,"te4"}
 description = [[
 Welcome to Maj'Eyal.
 
diff --git a/game/thirdparty/cef3/cef.pak b/game/thirdparty/cef3/cef.pak
new file mode 100644
index 0000000000000000000000000000000000000000..d28556596f8473d4c2c03a76451d5f7db9e18ca4
Binary files /dev/null and b/game/thirdparty/cef3/cef.pak differ
diff --git a/game/thirdparty/cef3/locales/am.pak b/game/thirdparty/cef3/locales/am.pak
new file mode 100644
index 0000000000000000000000000000000000000000..22ce577b0e95895ee40a51dd1d92f82b65e4cdf4
Binary files /dev/null and b/game/thirdparty/cef3/locales/am.pak differ
diff --git a/game/thirdparty/cef3/locales/ar.pak b/game/thirdparty/cef3/locales/ar.pak
new file mode 100644
index 0000000000000000000000000000000000000000..2e825e3a64bf0634865d93a59478d5015a21f09d
Binary files /dev/null and b/game/thirdparty/cef3/locales/ar.pak differ
diff --git a/game/thirdparty/cef3/locales/bg.pak b/game/thirdparty/cef3/locales/bg.pak
new file mode 100644
index 0000000000000000000000000000000000000000..a8dc7401df58f730da0eaa10cb9a73aed11e729d
Binary files /dev/null and b/game/thirdparty/cef3/locales/bg.pak differ
diff --git a/game/thirdparty/cef3/locales/bn.pak b/game/thirdparty/cef3/locales/bn.pak
new file mode 100644
index 0000000000000000000000000000000000000000..9e2c476ee6fd8706e7f392afe6a6703de024b647
Binary files /dev/null and b/game/thirdparty/cef3/locales/bn.pak differ
diff --git a/game/thirdparty/cef3/locales/ca.pak b/game/thirdparty/cef3/locales/ca.pak
new file mode 100644
index 0000000000000000000000000000000000000000..d2f6a3efb99db32d480874e2aeb65b842633f361
Binary files /dev/null and b/game/thirdparty/cef3/locales/ca.pak differ
diff --git a/game/thirdparty/cef3/locales/cs.pak b/game/thirdparty/cef3/locales/cs.pak
new file mode 100644
index 0000000000000000000000000000000000000000..dcfe0479e9f73547f9f9434edea65490c5395d04
Binary files /dev/null and b/game/thirdparty/cef3/locales/cs.pak differ
diff --git a/game/thirdparty/cef3/locales/da.pak b/game/thirdparty/cef3/locales/da.pak
new file mode 100644
index 0000000000000000000000000000000000000000..241e5e414a10e229ab63d929b9a1392f3bda5bd7
Binary files /dev/null and b/game/thirdparty/cef3/locales/da.pak differ
diff --git a/game/thirdparty/cef3/locales/de.pak b/game/thirdparty/cef3/locales/de.pak
new file mode 100644
index 0000000000000000000000000000000000000000..bd7c5ca57bb97e71f7e8618ab71329bbb29e08b2
Binary files /dev/null and b/game/thirdparty/cef3/locales/de.pak differ
diff --git a/game/thirdparty/cef3/locales/el.pak b/game/thirdparty/cef3/locales/el.pak
new file mode 100644
index 0000000000000000000000000000000000000000..3461cb0bbb6309a3a6fff79e9a9214076d5a11cc
Binary files /dev/null and b/game/thirdparty/cef3/locales/el.pak differ
diff --git a/game/thirdparty/cef3/locales/en-GB.pak b/game/thirdparty/cef3/locales/en-GB.pak
new file mode 100644
index 0000000000000000000000000000000000000000..8e42aa7614792035bc718c9f4574d5fd64912f9c
Binary files /dev/null and b/game/thirdparty/cef3/locales/en-GB.pak differ
diff --git a/game/thirdparty/cef3/locales/en-US.pak b/game/thirdparty/cef3/locales/en-US.pak
new file mode 100644
index 0000000000000000000000000000000000000000..1dd24415eb8e33c947ccc184ba37b8c382c443d6
Binary files /dev/null and b/game/thirdparty/cef3/locales/en-US.pak differ
diff --git a/game/thirdparty/cef3/locales/es-419.pak b/game/thirdparty/cef3/locales/es-419.pak
new file mode 100644
index 0000000000000000000000000000000000000000..2ceb0b6204f00e663d58ddd948ebe5935bc1413a
Binary files /dev/null and b/game/thirdparty/cef3/locales/es-419.pak differ
diff --git a/game/thirdparty/cef3/locales/es.pak b/game/thirdparty/cef3/locales/es.pak
new file mode 100644
index 0000000000000000000000000000000000000000..24c3c635e6e234127ca009f8903bcc5735a3097e
Binary files /dev/null and b/game/thirdparty/cef3/locales/es.pak differ
diff --git a/game/thirdparty/cef3/locales/et.pak b/game/thirdparty/cef3/locales/et.pak
new file mode 100644
index 0000000000000000000000000000000000000000..c2c554740be9cd920181af4f751aee0dbb97a46c
Binary files /dev/null and b/game/thirdparty/cef3/locales/et.pak differ
diff --git a/game/thirdparty/cef3/locales/fa.pak b/game/thirdparty/cef3/locales/fa.pak
new file mode 100644
index 0000000000000000000000000000000000000000..eb5cb072a17495e3d2db192f91756f184c0e030a
Binary files /dev/null and b/game/thirdparty/cef3/locales/fa.pak differ
diff --git a/game/thirdparty/cef3/locales/fi.pak b/game/thirdparty/cef3/locales/fi.pak
new file mode 100644
index 0000000000000000000000000000000000000000..fc399c2cc87ca5353f3d10b7eea833212d8a6f91
Binary files /dev/null and b/game/thirdparty/cef3/locales/fi.pak differ
diff --git a/game/thirdparty/cef3/locales/fil.pak b/game/thirdparty/cef3/locales/fil.pak
new file mode 100644
index 0000000000000000000000000000000000000000..c13edfe79b01f1fed2f1196fee13a5f72af63054
Binary files /dev/null and b/game/thirdparty/cef3/locales/fil.pak differ
diff --git a/game/thirdparty/cef3/locales/fr.pak b/game/thirdparty/cef3/locales/fr.pak
new file mode 100644
index 0000000000000000000000000000000000000000..b1b93dee92dbaf387366236e9f201dc45227b686
Binary files /dev/null and b/game/thirdparty/cef3/locales/fr.pak differ
diff --git a/game/thirdparty/cef3/locales/gu.pak b/game/thirdparty/cef3/locales/gu.pak
new file mode 100644
index 0000000000000000000000000000000000000000..05dfeec8a71bb1ef909b9e43c6f15658c3d8776d
Binary files /dev/null and b/game/thirdparty/cef3/locales/gu.pak differ
diff --git a/game/thirdparty/cef3/locales/he.pak b/game/thirdparty/cef3/locales/he.pak
new file mode 100644
index 0000000000000000000000000000000000000000..d5607f5ead425c9e2ad32f94a020637fab0a0237
Binary files /dev/null and b/game/thirdparty/cef3/locales/he.pak differ
diff --git a/game/thirdparty/cef3/locales/hi.pak b/game/thirdparty/cef3/locales/hi.pak
new file mode 100644
index 0000000000000000000000000000000000000000..6949eb744f9700ee0fff4de0a4e534dcdfc02500
Binary files /dev/null and b/game/thirdparty/cef3/locales/hi.pak differ
diff --git a/game/thirdparty/cef3/locales/hr.pak b/game/thirdparty/cef3/locales/hr.pak
new file mode 100644
index 0000000000000000000000000000000000000000..466e1ab9caaa041fb13c6aae38b5f70d93f6e8c5
Binary files /dev/null and b/game/thirdparty/cef3/locales/hr.pak differ
diff --git a/game/thirdparty/cef3/locales/hu.pak b/game/thirdparty/cef3/locales/hu.pak
new file mode 100644
index 0000000000000000000000000000000000000000..cd9dbc99ac1943654d55b90348f1967e07e069cf
Binary files /dev/null and b/game/thirdparty/cef3/locales/hu.pak differ
diff --git a/game/thirdparty/cef3/locales/id.pak b/game/thirdparty/cef3/locales/id.pak
new file mode 100644
index 0000000000000000000000000000000000000000..44e31886e25363bba8d6e1e7495289f5cc62e917
Binary files /dev/null and b/game/thirdparty/cef3/locales/id.pak differ
diff --git a/game/thirdparty/cef3/locales/it.pak b/game/thirdparty/cef3/locales/it.pak
new file mode 100644
index 0000000000000000000000000000000000000000..da80433bddf1d8c2e96f6a0ebd194c4ffc7fb15a
Binary files /dev/null and b/game/thirdparty/cef3/locales/it.pak differ
diff --git a/game/thirdparty/cef3/locales/ja.pak b/game/thirdparty/cef3/locales/ja.pak
new file mode 100644
index 0000000000000000000000000000000000000000..4b75a4b043d1ed15bc83b739bc03a5a9b130d966
Binary files /dev/null and b/game/thirdparty/cef3/locales/ja.pak differ
diff --git a/game/thirdparty/cef3/locales/kn.pak b/game/thirdparty/cef3/locales/kn.pak
new file mode 100644
index 0000000000000000000000000000000000000000..140023baf803e51c51fc25fca9e70bd2d869d807
Binary files /dev/null and b/game/thirdparty/cef3/locales/kn.pak differ
diff --git a/game/thirdparty/cef3/locales/ko.pak b/game/thirdparty/cef3/locales/ko.pak
new file mode 100644
index 0000000000000000000000000000000000000000..aa3c2f7c6dc9317e5ce7d19bcda4744b8faa4e9f
Binary files /dev/null and b/game/thirdparty/cef3/locales/ko.pak differ
diff --git a/game/thirdparty/cef3/locales/lt.pak b/game/thirdparty/cef3/locales/lt.pak
new file mode 100644
index 0000000000000000000000000000000000000000..ae97ed5da1c445a0660b2119be1b8caf26b98844
Binary files /dev/null and b/game/thirdparty/cef3/locales/lt.pak differ
diff --git a/game/thirdparty/cef3/locales/lv.pak b/game/thirdparty/cef3/locales/lv.pak
new file mode 100644
index 0000000000000000000000000000000000000000..8e4751831177dacafb6c99b79e517208fb83b4e8
Binary files /dev/null and b/game/thirdparty/cef3/locales/lv.pak differ
diff --git a/game/thirdparty/cef3/locales/ml.pak b/game/thirdparty/cef3/locales/ml.pak
new file mode 100644
index 0000000000000000000000000000000000000000..5bc21dc93c90c1abc1d239c7e0c944b01150f4b3
Binary files /dev/null and b/game/thirdparty/cef3/locales/ml.pak differ
diff --git a/game/thirdparty/cef3/locales/mr.pak b/game/thirdparty/cef3/locales/mr.pak
new file mode 100644
index 0000000000000000000000000000000000000000..f522fc2bcc08c05cfcbb9050ece79d7de7f762c4
Binary files /dev/null and b/game/thirdparty/cef3/locales/mr.pak differ
diff --git a/game/thirdparty/cef3/locales/ms.pak b/game/thirdparty/cef3/locales/ms.pak
new file mode 100644
index 0000000000000000000000000000000000000000..9ff113c85e2a5254349a939b4f1e9731a92e3271
Binary files /dev/null and b/game/thirdparty/cef3/locales/ms.pak differ
diff --git a/game/thirdparty/cef3/locales/nb.pak b/game/thirdparty/cef3/locales/nb.pak
new file mode 100644
index 0000000000000000000000000000000000000000..b230b85d8006771a78dfdca478c9c43f0fb4d6a3
Binary files /dev/null and b/game/thirdparty/cef3/locales/nb.pak differ
diff --git a/game/thirdparty/cef3/locales/nl.pak b/game/thirdparty/cef3/locales/nl.pak
new file mode 100644
index 0000000000000000000000000000000000000000..7ad0abde43d3177a0e2aa987cd6f2afd868ebaea
Binary files /dev/null and b/game/thirdparty/cef3/locales/nl.pak differ
diff --git a/game/thirdparty/cef3/locales/pl.pak b/game/thirdparty/cef3/locales/pl.pak
new file mode 100644
index 0000000000000000000000000000000000000000..4d9e124c640c69d2e0432de53671ce29124080c2
Binary files /dev/null and b/game/thirdparty/cef3/locales/pl.pak differ
diff --git a/game/thirdparty/cef3/locales/pt-BR.pak b/game/thirdparty/cef3/locales/pt-BR.pak
new file mode 100644
index 0000000000000000000000000000000000000000..ea147c087fd3f8707cbb9ab273dbbdc5a0209167
Binary files /dev/null and b/game/thirdparty/cef3/locales/pt-BR.pak differ
diff --git a/game/thirdparty/cef3/locales/pt-PT.pak b/game/thirdparty/cef3/locales/pt-PT.pak
new file mode 100644
index 0000000000000000000000000000000000000000..91d515998cc58a17a8ec4dbc885ce9b4c73dc519
Binary files /dev/null and b/game/thirdparty/cef3/locales/pt-PT.pak differ
diff --git a/game/thirdparty/cef3/locales/ro.pak b/game/thirdparty/cef3/locales/ro.pak
new file mode 100644
index 0000000000000000000000000000000000000000..a8db00f74135331527e05f7eacef2b37bd0e5a18
Binary files /dev/null and b/game/thirdparty/cef3/locales/ro.pak differ
diff --git a/game/thirdparty/cef3/locales/ru.pak b/game/thirdparty/cef3/locales/ru.pak
new file mode 100644
index 0000000000000000000000000000000000000000..57c2412b9f7611af9a5de1e8f283abd00d837826
Binary files /dev/null and b/game/thirdparty/cef3/locales/ru.pak differ
diff --git a/game/thirdparty/cef3/locales/sk.pak b/game/thirdparty/cef3/locales/sk.pak
new file mode 100644
index 0000000000000000000000000000000000000000..40226f4394388bc7998b59c2cbbee4e4fcd83cc6
Binary files /dev/null and b/game/thirdparty/cef3/locales/sk.pak differ
diff --git a/game/thirdparty/cef3/locales/sl.pak b/game/thirdparty/cef3/locales/sl.pak
new file mode 100644
index 0000000000000000000000000000000000000000..b4fdb3b3b4d130de7c0f5349bb7cd7a5f2595676
Binary files /dev/null and b/game/thirdparty/cef3/locales/sl.pak differ
diff --git a/game/thirdparty/cef3/locales/sr.pak b/game/thirdparty/cef3/locales/sr.pak
new file mode 100644
index 0000000000000000000000000000000000000000..ecb6ddcebccfae5f38c4feef5a85b03248e713b8
Binary files /dev/null and b/game/thirdparty/cef3/locales/sr.pak differ
diff --git a/game/thirdparty/cef3/locales/sv.pak b/game/thirdparty/cef3/locales/sv.pak
new file mode 100644
index 0000000000000000000000000000000000000000..c23b711105c9760d316e44219186096c1af5bae0
Binary files /dev/null and b/game/thirdparty/cef3/locales/sv.pak differ
diff --git a/game/thirdparty/cef3/locales/sw.pak b/game/thirdparty/cef3/locales/sw.pak
new file mode 100644
index 0000000000000000000000000000000000000000..4c7adcb85e1a8414b5067138ffb315f73da5263e
Binary files /dev/null and b/game/thirdparty/cef3/locales/sw.pak differ
diff --git a/game/thirdparty/cef3/locales/ta.pak b/game/thirdparty/cef3/locales/ta.pak
new file mode 100644
index 0000000000000000000000000000000000000000..e4a6fca3bb085e0a757937f97a1211736f69f527
Binary files /dev/null and b/game/thirdparty/cef3/locales/ta.pak differ
diff --git a/game/thirdparty/cef3/locales/te.pak b/game/thirdparty/cef3/locales/te.pak
new file mode 100644
index 0000000000000000000000000000000000000000..2564ff44e2f1f4d68b786d2e30f1e599112129ec
Binary files /dev/null and b/game/thirdparty/cef3/locales/te.pak differ
diff --git a/game/thirdparty/cef3/locales/th.pak b/game/thirdparty/cef3/locales/th.pak
new file mode 100644
index 0000000000000000000000000000000000000000..93f7af400905f251b210190eefb13bfc5c984dab
Binary files /dev/null and b/game/thirdparty/cef3/locales/th.pak differ
diff --git a/game/thirdparty/cef3/locales/tr.pak b/game/thirdparty/cef3/locales/tr.pak
new file mode 100644
index 0000000000000000000000000000000000000000..7a78322315641ef1e290e0e0131afe4a6ee74cbf
Binary files /dev/null and b/game/thirdparty/cef3/locales/tr.pak differ
diff --git a/game/thirdparty/cef3/locales/uk.pak b/game/thirdparty/cef3/locales/uk.pak
new file mode 100644
index 0000000000000000000000000000000000000000..b3157568e5dd8557bdfa89115a0f2355cb81d946
Binary files /dev/null and b/game/thirdparty/cef3/locales/uk.pak differ
diff --git a/game/thirdparty/cef3/locales/vi.pak b/game/thirdparty/cef3/locales/vi.pak
new file mode 100644
index 0000000000000000000000000000000000000000..5e160d3f318f67cb7eacf3e676a9fc2288c48159
Binary files /dev/null and b/game/thirdparty/cef3/locales/vi.pak differ
diff --git a/game/thirdparty/cef3/locales/zh-CN.pak b/game/thirdparty/cef3/locales/zh-CN.pak
new file mode 100644
index 0000000000000000000000000000000000000000..c89f000b727f0108c24998c6af5d996dd245db6f
Binary files /dev/null and b/game/thirdparty/cef3/locales/zh-CN.pak differ
diff --git a/game/thirdparty/cef3/locales/zh-TW.pak b/game/thirdparty/cef3/locales/zh-TW.pak
new file mode 100644
index 0000000000000000000000000000000000000000..8c621832a7abb3dd84af3ca82e617581f5e4f6cf
Binary files /dev/null and b/game/thirdparty/cef3/locales/zh-TW.pak differ
diff --git a/premake4.lua b/premake4.lua
index 5445daf9907fab1fd3e7df92c47200cbdc7200de..e0f0bdd028795d4599f1036b9da46d6df2ee8ebd 100644
--- a/premake4.lua
+++ b/premake4.lua
@@ -5,7 +5,6 @@ solution "TEngine"
 	objdir "obj"
 	defines {"GLEW_STATIC"}
 	if _OPTIONS.force32bits then buildoptions{"-m32"} linkoptions{"-m32"} libdirs{"/usr/lib32"} end
-	if _OPTIONS.relpath then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib "} end
 
 	includedirs {
 		"src",
@@ -17,9 +16,24 @@ solution "TEngine"
 		"src/physfs",
 		"src/zlib",
 		"src/bzip2",
-		"/opt/SDL-2.0/include/SDL2",
-		"/usr/include/GL",
 	}
+	if _OPTIONS['web-awesomium'] then
+		includedirs { "src/web-awesomium" }
+	end
+	if _OPTIONS['web-cef3'] then
+		includedirs { "src/web-cef3" }
+	end
+	if _OPTIONS.wincross then
+		includedirs {
+			"/usr/i686-pc-mingw32/usr/include/",
+			"/usr/i686-pc-mingw32/usr/include/GL/",
+		}
+	else
+		includedirs {
+			"/opt/SDL-2.0/include/SDL2",
+			"/usr/include/GL",
+		}
+	end
 	if _OPTIONS.lua == "default" then includedirs{"src/lua"}
 	elseif _OPTIONS.lua == "jit2" then includedirs{"src/luajit2/src", "src/luajit2/dynasm",}
 	end
@@ -36,15 +50,26 @@ configuration "bsd"
 		"/usr/local/include",
 	}
 
+if _OPTIONS.wincross then
 configuration "windows"
 	libdirs {
-		"/c/code/SDL/lib",
+		"/Test/xcompile/local//lib",
 	}
 	includedirs {
+		"/Test/xcompile/local/include/SDL2",
+		"/Test/xcompile/local/include",
+	}
+else
+configuration "windows"
+ 	libdirs {
+		"/c/code/SDL/lib",
+ 	}
+ 	includedirs {
 		"/c/code/SDL/include/SDL2",
 		"/c/code/SDL/include",
 		"/c/mingw2/include/GL",
-	}
+ 	}
+end
 
 configuration "macosx"
 	buildoptions { "-isysroot /Developer/SDKs/MacOSX10.6.sdk", "-mmacosx-version-min=10.6" }
@@ -54,7 +79,7 @@ configuration "Debug"
 	defines { }
 	flags { "Symbols" }
 	buildoptions { "-ggdb" }
-	buildoptions { "-O3" }
+--	buildoptions { "-O3" }
 	targetdir "bin/Debug"
 	if _OPTIONS.luaassert then defines {"LUA_USE_APICHECK"} end
 	if _OPTIONS.pedantic then buildoptions { "-Wall" } end
diff --git a/src/main.c b/src/main.c
index 79fb447d1f31717b25a12042a04a57db5bfed949..7d51cc90ea12604d3db2afa0e93c267f4cfb0754 100644
--- a/src/main.c
+++ b/src/main.c
@@ -41,6 +41,7 @@
 #include "serial.h"
 #include "profile.h"
 #include "main.h"
+#include "te4web.h"
 #include "lua_externs.h"
 #include "runner/core.h"
 #ifdef SELFEXE_WINDOWS
@@ -363,7 +364,10 @@ void on_event(SDL_Event *event)
 			else
 				lua_pushnil(L);
 
-			docall(L, 9, 0);
+			lua_pushnil(L);
+			lua_pushnumber(L, event->key.keysym.sym);
+
+			docall(L, 11, 0);
 		}
 		break;
 	case SDL_MOUSEBUTTONDOWN:
@@ -606,6 +610,7 @@ void on_redraw()
 #ifdef STEAM_TE4
 	if (!no_steam) te4_steam_callbacks();
 #endif
+	if (te4_web_update) te4_web_update(L);
 }
 
 void pass_command_args(int argc, char *argv[])
@@ -1068,6 +1073,8 @@ void boot_lua(int state, bool rebooting, int argc, char *argv[])
 			PHYSFS_mount("game/", "/", 1);
 		}
 
+		if (te4_web_init) te4_web_init(L);
+
 		// And run the lua engine pre init scripts
 		if (!luaL_loadfile(L, "/loader/pre-init.lua"))
 			docall(L, 0, 0);
@@ -1194,15 +1201,14 @@ int main(int argc, char *argv[])
 	core_def->define = &define_core;
 	core_def->define(core_def, "te4core", -1, NULL, NULL, NULL, NULL, 0, NULL);
 
+	g_argc = argc;
+	g_argv = argv;
+
+	bool is_zygote = FALSE;
 #ifdef SELFEXE_WINDOWS
-	FILE *logfile;
-	logfile = freopen ("te4_log.txt", "w", stdout);
 	bool windows_autoflush = FALSE;
 #endif
 
-	g_argc = argc;
-	g_argv = argv;
-
 	// Parse arguments
 	int i;
 	for (i = 1; i < argc; i++)
@@ -1216,7 +1222,6 @@ int main(int argc, char *argv[])
 		{
 			setvbuf(stdout, (char *) NULL, _IOLBF, 0);
 #ifdef SELFEXE_WINDOWS
-			setvbuf(logfile, NULL, _IONBF, 2);
 			windows_autoflush = TRUE;
 #endif
 		}
@@ -1226,8 +1231,19 @@ int main(int argc, char *argv[])
 		if (!strncmp(arg, "--safe-mode", 11)) safe_mode = TRUE;
 		if (!strncmp(arg, "--home", 6)) override_home = strdup(argv[++i]);
 		if (!strncmp(arg, "--no-steam", 10)) no_steam = TRUE;
+		if (!strncmp(arg, "--type=zygote", 13)) is_zygote = TRUE;
 	}
 
+#ifdef SELFEXE_WINDOWS
+	if (!is_zygote) {
+		FILE *logfile;
+		logfile = freopen("te4_log.txt", "w", stdout);
+		if (windows_autoflush) setvbuf(logfile, NULL, _IONBF, 2);
+	}
+#endif
+
+	te4_web_load();
+
 	// Initialize display lock for thread safety.
 	renderingLock = SDL_CreateMutex();
 	realtimeLock = SDL_CreateMutex();
@@ -1480,6 +1496,7 @@ int main(int argc, char *argv[])
 	cleanupTimerLock(renderingLock, &display_timer_id, &redraw_pending);
 	cleanupTimerLock(realtimeLock, &realtime_timer_id, &realtime_pending);
 	
+	te4_web_terminate();
 	SDL_Quit();
 	deinit_openal();
 	printf("Thanks for having fun!\n");
diff --git a/src/te4web.h b/src/te4web.h
new file mode 100644
index 0000000000000000000000000000000000000000..fd14caede488828ce7e04bab5de14f545d99779f
--- /dev/null
+++ b/src/te4web.h
@@ -0,0 +1,30 @@
+/*
+    TE4 - T-Engine 4
+    Copyright (C) 2009 - 2014 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
+*/
+#ifndef _TE4_TE4WEB_H_
+#define _TE4_TE4WEB_H_
+
+extern void te4_web_load();
+extern void te4_web_init(lua_State *L);
+extern void te4_web_update(lua_State *L);
+extern void te4_web_terminate();
+
+#endif
+
diff --git a/src/web-awesomium/build/windows/build.bat b/src/web-awesomium/build/windows/build.bat
new file mode 100644
index 0000000000000000000000000000000000000000..90ea754b1a65da1fdef22987c8aff3d09b37bc83
--- /dev/null
+++ b/src/web-awesomium/build/windows/build.bat
@@ -0,0 +1,36 @@
+@rem Script to compile T-Engine's webapi functionality.
+@rem See copyright notice in web-te4.h.
+@rem To use: load a windows SDK command prompt, navigate to source file root
+@rem setenv /release /x86 /xp
+@rem build\windows\build-te4-web.bat
+
+@rem SDK tools to use (with options)
+@rem TODO: offer a debugging build?
+@if not defined INCLUDE goto :BADENV
+
+@setlocal
+@set CXX=cl
+@set CXXFLAGS=/nologo /MT /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /EHsc
+@rem @set CXXFLAGS=/nologo /MT /Od /Zi /Wall /D_CRT_SECURE_NO_DEPRECATE /EHsc
+@set DLLNAME=te4-web.dll
+@set LIBNAME=te4-web.lib
+@set TE4_WEB_C=web.cpp web-utils.cpp gl_texture_surface.cpp
+@set TE4_WEB_INCLUDES=/I ".." /I "C:\MingW\include\SDL2"  /I "n:\libs\awesomium\1.7.4.1\include"
+@set TE4_WEB_LIBS="n:\libs\awesomium\1.7.4.1\build\lib\awesomium.lib"
+
+%CXX% %CXXFLAGS% /LD /Fe%DLLNAME% %TE4_WEB_INCLUDES% %TE4_WEB_C% %TE4_WEB_LIBS%
+
+@if errorlevel 1 goto :COMPILATION_ERROR
+
+@rem All done.
+@echo Successfully built %DLLNAME%.
+@goto :END
+
+:COMPILATION_ERROR
+@echo ERROR: Failed to build te4web.  Check SDK tool output for errors.
+@goto :END
+
+:BAD_ENV
+@echo ERROR: Must be compiled in a Windows SDK Command Prompt!
+
+:END
\ No newline at end of file
diff --git a/src/web-awesomium/gl_texture_surface.cpp b/src/web-awesomium/gl_texture_surface.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..6ba5feb428da3105a3a170001769d0605d30fac6
--- /dev/null
+++ b/src/web-awesomium/gl_texture_surface.cpp
@@ -0,0 +1,106 @@
+// Taken from awesomium examples
+#include "gl_texture_surface.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+GLRAMTextureSurface::GLRAMTextureSurface(int width, int height) : texture_id_(NULL),
+	buffer_(0), bpp_(4), rowspan_(0), width_(width), height_(height) {
+	rowspan_ = width_ * bpp_;
+	buffer_ = new unsigned char[rowspan_ * height_];
+	needs_update_ = false;
+
+	texture_id_ = web_make_texture(width_, height_);
+}
+
+GLRAMTextureSurface::~GLRAMTextureSurface() {
+	web_del_texture(texture_id_);
+	delete[] buffer_;
+}
+
+void* GLRAMTextureSurface::GetTexture() const {
+	const_cast<GLRAMTextureSurface*>(this)->UpdateTexture();
+
+	return texture_id_;
+}
+
+void GLRAMTextureSurface::Paint(unsigned char* src_buffer,
+										int src_row_span,
+										const Awesomium::Rect& src_rect,
+										const Awesomium::Rect& dest_rect) {
+	for (int row = 0; row < dest_rect.height; row++)
+		memcpy(buffer_ + (row + dest_rect.y) * rowspan_ + (dest_rect.x * 4),
+			src_buffer + (row + src_rect.y) * src_row_span + (src_rect.x * 4),
+			dest_rect.width * 4);
+
+	needs_update_ = true;
+}
+
+void GLRAMTextureSurface::Scroll(int dx,
+										int dy,
+										const Awesomium::Rect& clip_rect) {
+	if (abs(dx) >= clip_rect.width || abs(dy) >= clip_rect.height)
+		return;
+
+	if (dx < 0 && dy == 0) {
+		// Area shifted left by dx
+		unsigned char* tempBuffer = new unsigned char[(clip_rect.width + dx) * 4];
+
+		for (int i = 0; i < clip_rect.height; i++) {
+			memcpy(tempBuffer, buffer_ + (i + clip_rect.y) * rowspan_ +
+				(clip_rect.x - dx) * 4, (clip_rect.width + dx) * 4);
+			memcpy(buffer_ + (i + clip_rect.y) * rowspan_ + (clip_rect.x) * 4,
+				tempBuffer, (clip_rect.width + dx) * 4);
+		}
+
+		delete[] tempBuffer;
+	} else if (dx > 0 && dy == 0) {
+		// Area shifted right by dx
+		unsigned char* tempBuffer = new unsigned char[(clip_rect.width - dx) * 4];
+
+		for (int i = 0; i < clip_rect.height; i++) {
+			memcpy(tempBuffer, buffer_ + (i + clip_rect.y) * rowspan_ +
+				(clip_rect.x) * 4, (clip_rect.width - dx) * 4);
+			memcpy(buffer_ + (i + clip_rect.y) * rowspan_ + (clip_rect.x + dx) * 4,
+				tempBuffer, (clip_rect.width - dx) * 4);
+		}
+
+		delete[] tempBuffer;
+	} else if (dy < 0 && dx == 0) {
+		// Area shifted down by dy
+		for (int i = 0; i < clip_rect.height + dy ; i++)
+			memcpy(buffer_ + (i + clip_rect.y) * rowspan_ + (clip_rect.x * 4),
+			buffer_ + (i + clip_rect.y - dy) * rowspan_ + (clip_rect.x * 4),
+			clip_rect.width * 4);
+	} else if (dy > 0 && dx == 0) {
+		// Area shifted up by dy
+		for (int i = clip_rect.height - 1; i >= dy; i--)
+			memcpy(buffer_ + (i + clip_rect.y) * rowspan_ + (clip_rect.x * 4),
+			buffer_ + (i + clip_rect.y - dy) * rowspan_ + (clip_rect.x * 4),
+			clip_rect.width * 4);
+	}
+
+	needs_update_ = true;
+}
+
+void GLRAMTextureSurface::UpdateTexture() {
+	if (needs_update_) {
+		web_texture_update(texture_id_, width_, height_, buffer_);
+		needs_update_ = false;
+	}
+}
+
+
+GLTextureSurfaceFactory::GLTextureSurfaceFactory() {
+}
+
+GLTextureSurfaceFactory::~GLTextureSurfaceFactory() {
+}
+
+Awesomium::Surface* GLTextureSurfaceFactory::CreateSurface(Awesomium::WebView* view, int width, int height) {
+	return new GLRAMTextureSurface(width, height);
+}
+
+void GLTextureSurfaceFactory::DestroySurface(Awesomium::Surface* surface) {
+	delete static_cast<GLRAMTextureSurface*>(surface);
+}
diff --git a/src/web-awesomium/gl_texture_surface.h b/src/web-awesomium/gl_texture_surface.h
new file mode 100644
index 0000000000000000000000000000000000000000..c006e05d8afedbe55066b16555bc17a818a745b1
--- /dev/null
+++ b/src/web-awesomium/gl_texture_surface.h
@@ -0,0 +1,80 @@
+// Taken from awesomium examples
+
+#ifndef __GL_TEXTURE_SURFACE_H__
+#define __GL_TEXTURE_SURFACE_H__
+
+#include <Awesomium/Surface.h>
+extern "C" {
+#include "tgl.h"
+}
+
+class GLTextureSurface : public Awesomium::Surface {
+public:
+	virtual void Paint(unsigned char* src_buffer,
+										 int src_row_span,
+										 const Awesomium::Rect& src_rect,
+										 const Awesomium::Rect& dest_rect) = 0;
+
+	virtual void Scroll(int dx,
+											int dy,
+											const Awesomium::Rect& clip_rect) = 0;
+
+	virtual void* GetTexture() const = 0;
+	virtual int width() const = 0;
+	virtual int height() const = 0;
+	virtual int size() const = 0;
+};
+
+class GLRAMTextureSurface : public GLTextureSurface {
+	void *texture_id_;
+	unsigned char* buffer_;
+	int bpp_, rowspan_, width_, height_;
+	bool needs_update_;
+
+ public:
+	GLRAMTextureSurface(int width, int height);
+	virtual ~GLRAMTextureSurface();
+
+	void* GetTexture() const;
+
+	int width() const { return width_; }
+
+	int height() const { return height_; }
+
+	int size() const { return rowspan_ * height_; }
+
+ protected:
+	virtual void Paint(unsigned char* src_buffer,
+										 int src_row_span,
+										 const Awesomium::Rect& src_rect,
+										 const Awesomium::Rect& dest_rect);
+
+	virtual void Scroll(int dx,
+											int dy,
+											const Awesomium::Rect& clip_rect);
+
+	void UpdateTexture();
+};
+
+class GLTextureSurfaceFactory : public Awesomium::SurfaceFactory {
+public:
+	GLTextureSurfaceFactory();
+
+	virtual ~GLTextureSurfaceFactory();
+
+	virtual Awesomium::Surface* CreateSurface(Awesomium::WebView* view,
+																						int width,
+																						int height);
+
+	virtual void DestroySurface(Awesomium::Surface* surface);
+};
+
+extern void *(*web_mutex_create)();
+extern void (*web_mutex_destroy)(void *mutex);
+extern void (*web_mutex_lock)(void *mutex);
+extern void (*web_mutex_unlock)(void *mutex);
+extern void *(*web_make_texture)(int w, int h);
+extern void (*web_del_texture)(void *tex);
+extern void (*web_texture_update)(void *tex, int w, int h, const void* buffer);
+
+#endif  // __GL_TEXTURE_SURFACE_H__
diff --git a/src/web-awesomium/web-internal.h b/src/web-awesomium/web-internal.h
new file mode 100644
index 0000000000000000000000000000000000000000..badb41c2bb4a4a05f5ac47dff1a675edd9ea42a3
--- /dev/null
+++ b/src/web-awesomium/web-internal.h
@@ -0,0 +1,23 @@
+/*
+    TE4 - T-Engine 4
+    Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+
+    No permission to copy or replicate in any ways.
+*/
+
+#ifndef __TE4WEB_INTERNAL_H__
+#define __TE4WEB_INTERNAL_H__
+
+extern void te4_web_init_utils();
+
+extern void push_order(WebEvent *event);
+extern WebEvent *pop_order();
+extern void push_event(WebEvent *event);
+extern WebEvent *pop_event();
+
+extern void *(*web_mutex_create)();
+extern void (*web_mutex_destroy)(void *mutex);
+extern void (*web_mutex_lock)(void *mutex);
+extern void (*web_mutex_unlock)(void *mutex);
+
+#endif
diff --git a/src/web-awesomium/web-utils.cpp b/src/web-awesomium/web-utils.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..7634a8dcd9c5d0a17d4e0775288f7b1968451942
--- /dev/null
+++ b/src/web-awesomium/web-utils.cpp
@@ -0,0 +1,73 @@
+/*
+    TE4 - T-Engine 4
+    Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+
+    No permission to copy or replicate in any ways, awesomium is not gpl so we cant link directly
+*/
+
+extern "C" {
+#include <stdio.h>
+#include "web-external.h"
+}
+
+#include "web.h"
+#include "web-internal.h"
+
+#include <vector>
+
+static std::vector<WebEvent*> *iqueue = new std::vector<WebEvent*>;
+static std::vector<WebEvent*> *oqueue = new std::vector<WebEvent*>;
+static void *lock_iqueue = NULL;
+static void *lock_oqueue = NULL;
+
+void te4_web_init_utils() {
+	if (!lock_iqueue) lock_iqueue = web_mutex_create();
+	if (!lock_oqueue) lock_oqueue = web_mutex_create();
+}
+
+void push_order(WebEvent *event)
+{
+	if (!lock_iqueue) return;
+	web_mutex_lock(lock_iqueue);
+	iqueue->push_back(event);
+	web_mutex_unlock(lock_iqueue);
+}
+
+WebEvent *pop_order()
+{
+	if (!lock_iqueue) return NULL;
+	WebEvent *event = NULL;
+
+	web_mutex_lock(lock_iqueue);
+	if (!iqueue->empty()) {
+		event = iqueue->back();
+		iqueue->pop_back();
+	}
+	web_mutex_unlock(lock_iqueue);
+
+	return event;
+}
+
+void push_event(WebEvent *event)
+{
+	if (!lock_oqueue) return;
+	web_mutex_lock(lock_oqueue);
+	oqueue->push_back(event);
+	web_mutex_unlock(lock_oqueue);
+}
+
+WebEvent *pop_event()
+{
+	if (!lock_oqueue) return NULL;
+	WebEvent *event = NULL;
+
+	web_mutex_lock(lock_oqueue);
+	if (!oqueue->empty()) {
+		event = oqueue->back();
+		oqueue->pop_back();
+	}
+	web_mutex_unlock(lock_oqueue);
+
+	return event;
+}
+
diff --git a/src/web-awesomium/web.cpp b/src/web-awesomium/web.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..65e8ece4e0ff89c5ae63ba0a6ea1abea188eac7c
--- /dev/null
+++ b/src/web-awesomium/web.cpp
@@ -0,0 +1,504 @@
+/*
+    TE4 - T-Engine 4
+    Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+
+    No permission to copy or replicate in any ways, awesomium is not gpl so we cant link directly
+*/
+
+extern "C" {
+#include <stdio.h>
+#include <stdlib.h>
+#include "../web-external.h"
+}
+#include "web.h"
+#include "web-internal.h"
+
+#include <Awesomium/WebCore.h>
+#include <Awesomium/BitmapSurface.h>
+#include <Awesomium/DataSource.h>
+#include <Awesomium/STLHelpers.h>
+#include "gl_texture_surface.h"
+
+void *(*web_mutex_create)();
+void (*web_mutex_destroy)(void *mutex);
+void (*web_mutex_lock)(void *mutex);
+void (*web_mutex_unlock)(void *mutex);
+void *(*web_make_texture)(int w, int h);
+void (*web_del_texture)(void *tex);
+void (*web_texture_update)(void *tex, int w, int h, const void* buffer);
+static void (*web_key_mods)(bool *shift, bool *ctrl, bool *alt, bool *meta);
+static void (*web_instant_js)(int handlers, const char *fct, int nb_args, WebJsValue *args, WebJsValue *ret);
+
+using namespace Awesomium;
+
+class TE4DataSource;
+
+static WebCore *web_core = NULL;
+static WebSession *web_session = NULL;
+static TE4DataSource *web_data_source = NULL;
+
+class WebListener;
+
+static char *webstring_to_buf(const WebString &wstr, size_t *flen) {
+	char *buf;
+	unsigned int len = 0;
+	len = wstr.ToUTF8(NULL, 0);
+	buf = (char*)malloc(len + 1);
+	wstr.ToUTF8(buf, len);	
+	buf[len] = '\0';
+	if (flen) *flen = (size_t)len;
+	return buf;
+}
+
+class WebListener : 
+	public WebViewListener::View,
+	public WebViewListener::Download,
+	public WebViewListener::Load,
+	public JSMethodHandler
+{
+private:
+	int handlers;
+public:
+	JSObject te4_js;
+	WebListener(int handlers) { this->handlers = handlers; }
+
+	virtual void OnChangeTitle(Awesomium::WebView* caller, const Awesomium::WebString& title) {
+		char *cur_title = webstring_to_buf(title, NULL);
+		WebEvent *event = new WebEvent();
+		event->kind = TE4_WEB_EVENT_TITLE_CHANGE;
+		event->handlers = handlers;
+		event->data.title = cur_title;
+		push_event(event);
+	}
+
+	virtual void OnChangeAddressBar(Awesomium::WebView* caller, const Awesomium::WebURL& url) {
+	}
+
+	virtual void OnChangeTooltip(Awesomium::WebView* caller, const Awesomium::WebString& tooltip) {
+	}
+
+	virtual void OnChangeTargetURL(Awesomium::WebView* caller, const Awesomium::WebURL& url) {
+	}
+
+	virtual void OnChangeCursor(Awesomium::WebView* caller, Awesomium::Cursor cursor) {
+	}
+
+	virtual void OnChangeFocus(Awesomium::WebView* caller, Awesomium::FocusedElementType focused_type) {
+	}
+
+	virtual void OnAddConsoleMessage(Awesomium::WebView* caller, const Awesomium::WebString& message, int line_number, const Awesomium::WebString& source) {
+		char *msg = webstring_to_buf(message, NULL);
+		char *src = webstring_to_buf(source, NULL);
+		printf("[WEBCORE:console %s:%d] %s\n", src, line_number, msg);
+		free(msg);
+		free(src);
+	}
+
+	virtual void OnShowCreatedWebView(Awesomium::WebView* caller, Awesomium::WebView* new_view, const Awesomium::WebURL& opener_url, const Awesomium::WebURL& target_url, const Awesomium::Rect& initial_pos, bool is_popup) {
+		new_view->Destroy();
+
+		WebString rurl = target_url.spec();
+		char *url = webstring_to_buf(rurl, NULL);
+
+		WebEvent *event = new WebEvent();
+		event->kind = TE4_WEB_EVENT_REQUEST_POPUP_URL;
+		event->handlers = handlers;
+		event->data.popup.url = url;
+		event->data.popup.w = initial_pos.width;
+		event->data.popup.h = initial_pos.height;
+		push_event(event);
+
+		printf("[WEBCORE] stopped popup to %s (%dx%d), pushing event...\n", url, event->data.popup.w, event->data.popup.h);
+	}
+
+	void OnRequestDownload(WebView* caller, int download_id, const WebURL& wurl, const WebString& suggested_filename, const WebString& mime_type) {
+		WebString rurl = wurl.spec();
+		const char *mime = webstring_to_buf(mime_type, NULL);
+		const char *url = webstring_to_buf(rurl, NULL);
+		const char *name = webstring_to_buf(suggested_filename, NULL);
+		printf("[WEBCORE] Download request [name: %s] [mime: %s] [url: %s]\n", name, mime, url);
+
+		WebEvent *event = new WebEvent();
+		event->kind = TE4_WEB_EVENT_DOWNLOAD_REQUEST;
+		event->handlers = handlers;
+		event->data.download_request.url = url;
+		event->data.download_request.name = name;
+		event->data.download_request.mime = mime;
+		event->data.download_request.id = download_id;
+		push_event(event);
+	}
+	void OnUpdateDownload(WebView* caller, int download_id, int64 total_bytes, int64 received_bytes, int64 current_speed) {
+		WebEvent *event = new WebEvent();
+		event->kind = TE4_WEB_EVENT_DOWNLOAD_UPDATE;
+		event->handlers = handlers;
+		event->data.download_update.id = download_id;
+		event->data.download_update.got = received_bytes;
+		event->data.download_update.total = total_bytes;
+		event->data.download_update.percent = 100 * ((double)received_bytes / (double)total_bytes);
+		event->data.download_update.speed = current_speed;
+		push_event(event);
+	}
+	void OnFinishDownload(WebView* caller, int download_id, const WebURL& url, const WebString& saved_path) {
+		WebEvent *event = new WebEvent();
+		event->kind = TE4_WEB_EVENT_DOWNLOAD_FINISH;
+		event->handlers = handlers;
+		event->data.download_finish.id = download_id;
+		push_event(event);
+	}
+
+	/// This event occurs when the page begins loading a frame.
+	virtual void OnBeginLoadingFrame(Awesomium::WebView* caller, int64 frame_id, bool is_main_frame, const Awesomium::WebURL& wurl, bool is_error_page) {
+		WebString rurl = wurl.spec();
+		const char *url = webstring_to_buf(rurl, NULL);
+
+		WebEvent *event = new WebEvent();
+		event->kind = TE4_WEB_EVENT_LOADING;
+		event->handlers = handlers;
+		event->data.loading.url = url;
+		event->data.loading.status = 0;
+		push_event(event);
+	}
+
+	/// This event occurs when a frame fails to load. See error_desc
+	/// for additional information.
+	virtual void OnFailLoadingFrame(Awesomium::WebView* caller, int64 frame_id, bool is_main_frame, const Awesomium::WebURL& wurl, int error_code, const Awesomium::WebString& error_desc) {
+		WebString rurl = wurl.spec();
+		const char *url = webstring_to_buf(rurl, NULL);
+
+		WebEvent *event = new WebEvent();
+		event->kind = TE4_WEB_EVENT_LOADING;
+		event->handlers = handlers;
+		event->data.loading.url = url;
+		event->data.loading.status = -1;
+		push_event(event);
+	}
+
+	/// This event occurs when the page finishes loading a frame.
+	/// The main frame always finishes loading last for a given page load.
+	virtual void OnFinishLoadingFrame(Awesomium::WebView* caller, int64 frame_id, bool is_main_frame, const Awesomium::WebURL& wurl) {
+
+	}
+
+	/// This event occurs when the DOM has finished parsing and the
+	/// window object is available for JavaScript execution.
+	virtual void OnDocumentReady(Awesomium::WebView* caller, const Awesomium::WebURL& wurl) {
+		WebString rurl = wurl.spec();
+		const char *url = webstring_to_buf(rurl, NULL);
+
+		WebEvent *event = new WebEvent();
+		event->kind = TE4_WEB_EVENT_LOADING;
+		event->handlers = handlers;
+		event->data.loading.url = url;
+		event->data.loading.status = 1;
+		push_event(event);
+	}
+
+	virtual void OnMethodCall(WebView* caller, unsigned int remote_object_id, const WebString& method_name, const JSArray& args) {
+		if (remote_object_id == te4_js.remote_id() && method_name == WSLit("lua")) {
+			JSValue arg = args[0];
+			WebString wcode = arg.ToString();
+			const char *code = webstring_to_buf(wcode, NULL);
+
+			WebEvent *event = new WebEvent();
+			event->kind = TE4_WEB_EVENT_RUN_LUA;
+			event->handlers = handlers;
+			event->data.run_lua.code = code;
+			push_event(event);
+		}
+	}
+
+	virtual JSValue OnMethodCallWithReturnValue(WebView* caller, unsigned int remote_object_id, const WebString& method_name, const JSArray& jsargs) {
+		if (remote_object_id != te4_js.remote_id()) {
+			JSValue ret(false);
+			return ret;
+		}
+
+		const char *fct = webstring_to_buf(method_name, NULL);
+		WebJsValue ret;
+		int nb_args = jsargs.size();
+		WebJsValue *args = new WebJsValue[nb_args];
+		for (int i = 0; i < nb_args; i++) {
+			WebJsValue *wv = &args[i];
+			JSValue v = jsargs[i];
+			if (v.IsNull()) {
+				wv->kind = TE4_WEB_JS_NULL;
+			} else if (v.IsBoolean()) {
+				wv->kind = TE4_WEB_JS_BOOLEAN;
+				wv->data.b = v.ToBoolean();
+			} else if (v.IsNumber()) {
+				wv->kind = TE4_WEB_JS_NUMBER;
+				wv->data.n = v.ToDouble();
+			} else if (v.IsString()) {
+				wv->kind = TE4_WEB_JS_STRING;
+				const char *s = webstring_to_buf(v.ToString(), NULL);
+				wv->data.s = s;
+			}
+		}
+
+		web_instant_js(handlers, fct, nb_args, args, &ret);
+
+		// Free the fucking strings. I love GC. I want a GC :/
+		for (int i = 0; i < nb_args; i++) {
+			WebJsValue *wv = &args[i];
+			JSValue v = jsargs[i];
+			if (v.IsString()) free((void*)wv->data.s);
+		}
+		delete args;
+		free((void*)fct);
+
+		if (ret.kind == TE4_WEB_JS_NULL) return JSValue::Null();
+		else if (ret.kind == TE4_WEB_JS_BOOLEAN) return JSValue(ret.data.b);
+		else if (ret.kind == TE4_WEB_JS_NUMBER) return JSValue(ret.data.n);
+		else if (ret.kind == TE4_WEB_JS_STRING) {
+			WebString s = WebString::CreateFromUTF8(ret.data.s, strlen(ret.data.s));
+			return JSValue(s);
+		}
+		return JSValue();
+	}
+};
+
+class TE4DataSource : public DataSource {
+public:
+	virtual void OnRequest(int request_id, const ResourceRequest& request, const WebString& wpath) {
+		const char *path = webstring_to_buf(wpath, NULL);
+
+		WebEvent *event = new WebEvent();
+		event->kind = TE4_WEB_EVENT_LOCAL_REQUEST;
+		event->data.local_request.id = request_id;
+		event->data.local_request.path = path;
+		push_event(event);
+	}
+};
+
+
+class WebViewOpaque {
+public:
+	WebView *view;
+	WebListener *listener;
+};
+
+void te4_web_new(web_view_type *view, int w, int h) {
+	WebViewOpaque *opaque = new WebViewOpaque();
+	view->opaque = (void*)opaque;
+
+	opaque->view = web_core->CreateWebView(w, h, web_session, kWebViewType_Offscreen);
+	opaque->listener = new WebListener(view->handlers);
+	opaque->view->set_view_listener(opaque->listener);
+	opaque->view->set_download_listener(opaque->listener);
+	opaque->view->set_load_listener(opaque->listener);
+	opaque->view->set_js_method_handler(opaque->listener);
+	view->w = w;
+	view->h = h;
+	view->closed = false;
+
+	opaque->listener->te4_js = (opaque->view->CreateGlobalJavascriptObject(WSLit("te4"))).ToObject();
+	opaque->listener->te4_js.SetCustomMethod(WSLit("lua"), false);
+
+	opaque->view->SetTransparent(true);
+	printf("Created webview: %dx%d\n", w, h);
+}
+
+bool te4_web_close(web_view_type *view) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (!view->closed) {
+		opaque->view->Destroy();
+		delete opaque->listener;
+		view->closed = true;
+		printf("Destroyed webview\n");
+		return true;
+	}
+	return false;
+}
+
+void te4_web_load_url(web_view_type *view, const char *url) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (view->closed) return;
+
+	size_t urllen = strlen(url);
+	WebURL lurl(WebString::CreateFromUTF8(url, urllen));
+	opaque->view->LoadURL(lurl);
+}
+
+void te4_web_set_js_call(web_view_type *view, const char *name) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (view->closed) return;
+
+	opaque->listener->te4_js.SetCustomMethod(WebString::CreateFromUTF8(name, strlen(name)), true);
+}
+
+void *te4_web_toscreen(web_view_type *view, int *w, int *h) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (view->closed) return NULL;
+
+	const GLTextureSurface* surface = static_cast<const GLTextureSurface*> (opaque->view->surface());
+	if (!surface) return NULL;
+
+	*w = (*w < 0) ? view->w : *w;
+	*h = (*h < 0) ? view->h : *h;
+	return surface->GetTexture();
+}
+
+bool te4_web_loading(web_view_type *view) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (view->closed) return false;
+	return opaque->view->IsLoading();
+}
+
+void te4_web_focus(web_view_type *view, bool focus) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (view->closed) return;
+
+	if (focus) opaque->view->Focus();
+	else opaque->view->Unfocus();
+}
+
+void te4_web_inject_mouse_move(web_view_type *view, int x, int y) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (view->closed) return;
+
+	opaque->view->InjectMouseMove(x, y);
+}
+
+void te4_web_inject_mouse_wheel(web_view_type *view, int x, int y) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (view->closed) return;
+
+	opaque->view->InjectMouseWheel(-y, -x);
+}
+
+void te4_web_inject_mouse_button(web_view_type *view, int kind, bool up) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (view->closed) return;
+
+	MouseButton b = kMouseButton_Left;
+	if (kind == 2) b = kMouseButton_Middle;
+	else if (kind == 3) b = kMouseButton_Right;
+
+	if (up) opaque->view->InjectMouseUp(b);
+	else opaque->view->InjectMouseDown(b);
+}
+
+void te4_web_inject_key(web_view_type *view, int scancode, int asymb, const char *uni, int unilen, bool up) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (view->closed) return;
+
+	WebKeyboardEvent keyEvent;
+	keyEvent.type = !up ? WebKeyboardEvent::kTypeKeyDown : WebKeyboardEvent::kTypeKeyUp;
+	
+	char* buf = new char[20];
+	keyEvent.virtual_key_code = asymb;
+	Awesomium::GetKeyIdentifierFromVirtualKeyCode(keyEvent.virtual_key_code, &buf);
+	strcpy(keyEvent.key_identifier, buf);
+	delete[] buf;
+	
+	bool shift, ctrl, alt, meta;
+	web_key_mods(&shift, &ctrl, &alt, &meta);
+	keyEvent.modifiers = 0;
+	if (shift) keyEvent.modifiers |= WebKeyboardEvent::kModShiftKey;
+	else if (ctrl) keyEvent.modifiers |= WebKeyboardEvent::kModControlKey;
+	else if (alt) keyEvent.modifiers |= WebKeyboardEvent::kModAltKey;
+	else if (meta) keyEvent.modifiers |= WebKeyboardEvent::kModMetaKey;
+	
+	keyEvent.native_key_code = scancode;
+	if (up) {
+		opaque->view->InjectKeyboardEvent(keyEvent);
+	} else {
+		if (uni) {
+			WebString wstr = WebString::CreateFromUTF8(uni, unilen);
+			memcpy(keyEvent.text, wstr.data(), wstr.length() * sizeof(wchar16));
+			memcpy(keyEvent.unmodified_text, wstr.data(), wstr.length() * sizeof(wchar16));
+		}
+		
+		opaque->view->InjectKeyboardEvent(keyEvent);
+
+		if (uni) {
+			keyEvent.type = WebKeyboardEvent::kTypeChar;
+			keyEvent.virtual_key_code = keyEvent.text[0];
+			keyEvent.native_key_code = keyEvent.text[0];
+			opaque->view->InjectKeyboardEvent(keyEvent);
+		}
+	}
+}
+
+void te4_web_download_action(web_view_type *view, long id, const char *path) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (view->closed) return;
+
+	if (path) {
+		WebString wpath = WebString::CreateFromUTF8(path, strlen(path));
+		opaque->view->DidChooseDownloadPath(id, wpath);
+	} else {
+		opaque->view->DidCancelDownload(id);
+	}
+}
+
+void te4_web_reply_local(int id, const char *mime, const char *result, size_t len) {
+	WebString wmime = WebString::CreateFromUTF8(mime, strlen(mime));
+	web_data_source->SendResponse(id, len, (unsigned char *)result, wmime);
+}
+
+
+void te4_web_do_update(void (*cb)(WebEvent*)) {
+	if (!web_core) return;
+
+	web_core->Update();
+	WebEvent *event;
+	while (event = pop_event()) {
+		cb(event);
+
+		switch (event->kind) {
+			case TE4_WEB_EVENT_TITLE_CHANGE:
+				free((void*)event->data.title);
+				break;
+			case TE4_WEB_EVENT_REQUEST_POPUP_URL:
+				free((void*)event->data.popup.url);
+				break;
+			case TE4_WEB_EVENT_DOWNLOAD_REQUEST:
+				free((void*)event->data.download_request.url);
+				free((void*)event->data.download_request.name);
+				free((void*)event->data.download_request.mime);
+				break;
+			case TE4_WEB_EVENT_LOADING:
+				free((void*)event->data.loading.url);
+				break;
+			case TE4_WEB_EVENT_LOCAL_REQUEST:
+				free((void*)event->data.local_request.path);
+				break;
+			case TE4_WEB_EVENT_RUN_LUA:
+				free((void*)event->data.run_lua.code);
+				break;
+		}
+
+		delete event;
+	}
+}
+
+void te4_web_setup(
+	int argc, char **gargv, char *spawnc,
+	void*(*mutex_create)(), void(*mutex_destroy)(void*), void(*mutex_lock)(void*), void(*mutex_unlock)(void*),
+	void *(*make_texture)(int, int), void (*del_texture)(void*), void (*texture_update)(void*, int, int, const void*),
+	void (*key_mods)(bool*, bool*, bool*, bool*),
+	void (*instant_js)(int handlers, const char *fct, int nb_args, WebJsValue *args, WebJsValue *ret)
+	) {
+
+	web_mutex_create = mutex_create;
+	web_mutex_destroy = mutex_destroy;
+	web_mutex_lock = mutex_lock;
+	web_mutex_unlock = mutex_unlock;
+	web_make_texture = make_texture;
+	web_del_texture = del_texture;
+	web_texture_update = texture_update;
+	web_key_mods = key_mods;
+	web_instant_js = instant_js;
+	if (!web_core) {
+		web_core = WebCore::Initialize(WebConfig());
+		web_core->set_surface_factory(new GLTextureSurfaceFactory());
+		web_session = web_core->CreateWebSession(WSLit(""), WebPreferences());
+		web_data_source = new TE4DataSource();
+		web_session->AddDataSource(WSLit("te4"), web_data_source);
+	}
+}
+
+void te4_web_initialize() {
+	te4_web_init_utils();
+}
diff --git a/src/web-awesomium/web.h b/src/web-awesomium/web.h
new file mode 100644
index 0000000000000000000000000000000000000000..18de1ce2eac8059330504a8e09df6942879a3316
--- /dev/null
+++ b/src/web-awesomium/web.h
@@ -0,0 +1,48 @@
+/*
+    TE4 - T-Engine 4
+    Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+
+    No permission to copy or replicate in any ways.
+*/
+
+#ifndef __TE4WEB_H__
+#define __TE4WEB_H__
+
+#ifdef __cplusplus
+/* C++ compiler needs to make this a C API. */
+#if defined( _WIN32 )
+/* Windows needs this to be a DLL, so be sure to export. */
+#define WEB_TE4_API extern "C" __declspec( dllexport ) 
+#else
+/* Non-windows platforms are fine linking statically. */
+#define WEB_TE4_API extern "C"
+#endif
+#else
+/* C compiler is using this header. */
+#define WEB_TE4_API
+#endif
+
+WEB_TE4_API void te4_web_setup(
+	int argc, char **argv, char *spawn,
+	void*(*mutex_create)(), void(*mutex_destroy)(void*), void(*mutex_lock)(void*), void(*mutex_unlock)(void*),
+	void*(*make_texture)(int, int), void (*del_texture)(void*), void (*texture_update)(void*, int, int, const void*),
+	void (*key_mods)(bool*, bool*, bool*, bool*),
+	void (*web_instant_js)(int handlers, const char *fct, int nb_args, WebJsValue *args, WebJsValue *ret)
+);
+WEB_TE4_API void te4_web_initialize();
+WEB_TE4_API void te4_web_do_update(void (*cb)(WebEvent*));
+WEB_TE4_API void te4_web_new(web_view_type *view, int w, int h);
+WEB_TE4_API bool te4_web_close(web_view_type *view);
+WEB_TE4_API void *te4_web_toscreen(web_view_type *view, int *w, int *h);
+WEB_TE4_API bool te4_web_loading(web_view_type *view);
+WEB_TE4_API void te4_web_focus(web_view_type *view, bool focus);
+WEB_TE4_API void te4_web_inject_mouse_move(web_view_type *view, int x, int y);
+WEB_TE4_API void te4_web_inject_mouse_wheel(web_view_type *view, int x, int y);
+WEB_TE4_API void te4_web_inject_mouse_button(web_view_type *view, int kind, bool up);
+WEB_TE4_API void te4_web_inject_key(web_view_type *view, int scancode, int asymb, const char *uni, int unilen, bool up);
+WEB_TE4_API void te4_web_download_action(web_view_type *view, long id, const char *path);
+WEB_TE4_API void te4_web_reply_local(int id, const char *mime, const char *result, size_t len);
+WEB_TE4_API void te4_web_load_url(web_view_type *view, const char *url);
+WEB_TE4_API void te4_web_set_js_call(web_view_type *view, const char *name);
+
+#endif
diff --git a/src/web-cef3/build/windows/build.bat b/src/web-cef3/build/windows/build.bat
new file mode 100644
index 0000000000000000000000000000000000000000..dcfea2b98774b2e7da1b1662148c6eb7b7ad006c
--- /dev/null
+++ b/src/web-cef3/build/windows/build.bat
@@ -0,0 +1,36 @@
+@rem Script to compile T-Engine's webapi functionality.
+@rem See copyright notice in web-te4.h.
+@rem To use: load a windows SDK command prompt, navigate to source file root
+@rem setenv /release /x86 /xp
+@rem build\windows\build-te4-web.bat
+
+@rem SDK tools to use (with options)
+@rem TODO: offer a debugging build?
+@if not defined INCLUDE goto :BADENV
+
+@setlocal
+@set CXX=cl
+@set CXXFLAGS=/nologo /MT /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /EHsc /DSELFEXE_WINDOWS
+@rem @set CXXFLAGS=/nologo /MT /Od /Zi /Wall /D_CRT_SECURE_NO_DEPRECATE /EHsc
+@set DLLNAME=te4-web.dll
+@set LIBNAME=te4-web.lib
+@set TE4_WEB_C=web.cpp web-utils.cpp
+@set TE4_WEB_INCLUDES=/I ".." /I "C:\MingW\include\SDL2"  /I "n:\libs\cef3\include" /I "n:\libs\cef3"
+@set TE4_WEB_LIBS="n:\libs\cef3\Release\libcef.lib" "n:\libs\cef3\out\Release\lib\libcef_dll_wrapper.lib" "user32.lib"
+
+%CXX% %CXXFLAGS% /LD /Fe%DLLNAME% %TE4_WEB_INCLUDES% %TE4_WEB_C% %TE4_WEB_LIBS%
+
+@if errorlevel 1 goto :COMPILATION_ERROR
+
+@rem All done.
+@echo Successfully built %DLLNAME%.
+@goto :END
+
+:COMPILATION_ERROR
+@echo ERROR: Failed to build te4web.  Check SDK tool output for errors.
+@goto :END
+
+:BAD_ENV
+@echo ERROR: Must be compiled in a Windows SDK Command Prompt!
+
+:END
\ No newline at end of file
diff --git a/src/web-cef3/web-internal.h b/src/web-cef3/web-internal.h
new file mode 100644
index 0000000000000000000000000000000000000000..6e6cb71e4f3e9e603bcd962ab67a56d1d40796ee
--- /dev/null
+++ b/src/web-cef3/web-internal.h
@@ -0,0 +1,35 @@
+/*
+    TE4 - T-Engine 4
+    Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+
+    No permission to copy or replicate in any ways.
+*/
+
+#ifndef __TE4WEB_INTERNAL_H__
+#define __TE4WEB_INTERNAL_H__
+
+#ifndef UINT_MAX
+	#define UINT_MAX 65535
+#endif
+#include <cef_app.h>
+#include <cef_client.h>
+#include <cef_display_handler.h>
+#include <cef_render_handler.h>
+#include <cef_request_handler.h>
+#include <cef_download_handler.h>
+#include <cef_render_process_handler.h>
+#include <cef_v8.h>
+
+extern void te4_web_init_utils();
+
+extern void push_order(WebEvent *event);
+extern WebEvent *pop_order();
+extern void push_event(WebEvent *event);
+extern WebEvent *pop_event();
+
+extern void *(*web_mutex_create)();
+extern void (*web_mutex_destroy)(void *mutex);
+extern void (*web_mutex_lock)(void *mutex);
+extern void (*web_mutex_unlock)(void *mutex);
+
+#endif
diff --git a/src/web-cef3/web-utils.cpp b/src/web-cef3/web-utils.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..734e69251ae20e136414598a401feffc7f0131f4
--- /dev/null
+++ b/src/web-cef3/web-utils.cpp
@@ -0,0 +1,81 @@
+/*
+    TE4 - T-Engine 4
+    Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+
+    No permission to copy or replicate in any ways, awesomium is not gpl so we cant link directly
+*/
+
+extern "C" {
+#include "tSDL.h"
+#include "tgl.h"
+#include "web-external.h"
+}
+
+#include "web.h"
+#include "web-internal.h"
+
+#include <cef_app.h>
+#include <cef_app.h>
+#include <cef_client.h>
+#include <cef_display_handler.h>
+#include <cef_render_handler.h>
+#include <cef_request_handler.h>
+#include <cef_render_process_handler.h>
+#include <vector>
+
+static std::vector<WebEvent*> *iqueue = new std::vector<WebEvent*>;
+static std::vector<WebEvent*> *oqueue = new std::vector<WebEvent*>;
+static void *lock_iqueue = NULL;
+static void *lock_oqueue = NULL;
+
+void te4_web_init_utils() {
+	if (!lock_iqueue) lock_iqueue = web_mutex_create();
+	if (!lock_oqueue) lock_oqueue = web_mutex_create();
+}
+
+void push_order(WebEvent *event)
+{
+	if (!lock_iqueue) return;
+	web_mutex_lock(lock_iqueue);
+	iqueue->push_back(event);
+	web_mutex_unlock(lock_iqueue);
+}
+
+WebEvent *pop_order()
+{
+	if (!lock_iqueue) return NULL;
+	WebEvent *event = NULL;
+
+	web_mutex_lock(lock_iqueue);
+	if (!iqueue->empty()) {
+		event = iqueue->back();
+		iqueue->pop_back();
+	}
+	web_mutex_unlock(lock_iqueue);
+
+	return event;
+}
+
+void push_event(WebEvent *event)
+{
+	if (!lock_oqueue) return;
+	web_mutex_lock(lock_oqueue);
+	oqueue->push_back(event);
+	web_mutex_unlock(lock_oqueue);
+}
+
+WebEvent *pop_event()
+{
+	if (!lock_oqueue) return NULL;
+	WebEvent *event = NULL;
+
+	web_mutex_lock(lock_oqueue);
+	if (!oqueue->empty()) {
+		event = oqueue->back();
+		oqueue->pop_back();
+	}
+	web_mutex_unlock(lock_oqueue);
+
+	return event;
+}
+
diff --git a/src/web-cef3/web.cpp b/src/web-cef3/web.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..167fdfdebffeb77f63ebfaa6bfb0fabb89c91f8d
--- /dev/null
+++ b/src/web-cef3/web.cpp
@@ -0,0 +1,784 @@
+/*
+    TE4 - T-Engine 4
+    Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+
+    No permission to copy or replicate in any ways.
+*/
+
+#include <map>
+
+extern "C" {
+#include "web-external.h"
+#include <stdio.h>
+#include <stdlib.h>
+}
+#include "web.h"
+#include "web-internal.h"
+
+
+void *(*web_mutex_create)();
+void (*web_mutex_destroy)(void *mutex);
+void (*web_mutex_lock)(void *mutex);
+void (*web_mutex_unlock)(void *mutex);
+void *(*web_make_texture)(int w, int h);
+void (*web_del_texture)(void *tex);
+void (*web_texture_update)(void *tex, int w, int h, const void* buffer);
+static void (*web_key_mods)(bool *shift, bool *ctrl, bool *alt, bool *meta);
+static void (*web_instant_js)(int handlers, const char *fct, int nb_args, WebJsValue *args, WebJsValue *ret);
+
+static bool web_core = false;
+
+static char *cstring_to_c(const CefString &cstr) {
+	std::string str = cstr.ToString();
+	size_t len = cstr.size();
+	char *ret = (char*)malloc((len+1) * sizeof(char));
+	memcpy(ret, str.c_str(), len);
+	ret[len] = '\0';
+	return ret;
+}
+
+class RenderHandler : public CefRenderHandler
+{
+public:
+	void *tex;
+	int w, h;
+
+	RenderHandler(int w, int h) {
+		this->w = w;
+		this->h = h;
+
+		tex = web_make_texture(w, h);
+	}
+
+	~RenderHandler() {
+		printf("Destroyed renreder\n");
+
+		WebEvent *event = new WebEvent();
+		event->kind = TE4_WEB_EVENT_DELETE_TEXTURE;
+		event->data.texture = tex;
+		push_event(event);
+	}
+
+	// CefRenderHandler interface
+public:
+	bool GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect)
+	{
+		rect = CefRect(0, 0, w, h);
+		return true;
+	}
+	void OnPaint(CefRefPtr<CefBrowser> browser, PaintElementType type, const RectList &dirtyRects, const void *buffer, int width, int height)
+	{
+		web_texture_update(tex, width, height, buffer);
+	}
+
+	// CefBase interface
+public:
+	IMPLEMENT_REFCOUNTING(RenderHandler);
+};
+
+class CurrentDownload {
+public:
+	CurrentDownload() { accept_cb = NULL; cancel_cb = NULL; }
+	CefRefPtr<CefBeforeDownloadCallback> accept_cb;
+	CefRefPtr<CefDownloadItemCallback> cancel_cb;
+};
+
+class BrowserClient :
+	public CefClient,
+	public CefRequestHandler,
+	public CefDisplayHandler,
+	public CefLifeSpanHandler,
+	public CefDownloadHandler,
+	public CefLoadHandler
+{
+	std::map<int32, CurrentDownload*> downloads;
+	CefRefPtr<CefRenderHandler> m_renderHandler;
+	int handlers;
+
+public:
+	bool first_load;
+	BrowserClient(RenderHandler *renderHandler, int handlers) : m_renderHandler(renderHandler) {
+		this->handlers = handlers;
+		this->first_load = true;
+	}
+	~BrowserClient() {
+		printf("Destroyed client\n");
+		for (std::map<int32, CurrentDownload*>::iterator it=downloads.begin(); it != downloads.end(); ++it) {
+			delete it->second;
+		}
+	}
+
+	virtual CefRefPtr<CefRenderHandler> GetRenderHandler() {
+		return m_renderHandler;
+	}
+	virtual CefRefPtr<CefDisplayHandler> GetDisplayHandler() OVERRIDE {
+		return this;
+	}
+	virtual CefRefPtr<CefRequestHandler> GetRequestHandler() OVERRIDE {
+		return this;
+	}
+	virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() OVERRIDE {
+		return this;
+	}
+	virtual CefRefPtr<CefDownloadHandler> GetDownloadHandler() OVERRIDE {
+		return this;
+	}
+	virtual CefRefPtr<CefLoadHandler> GetLoadHandler() OVERRIDE {
+		return this;
+	}
+
+	virtual void OnTitleChange(CefRefPtr<CefBrowser> browser, const CefString& title) OVERRIDE {
+		char *cur_title = cstring_to_c(title);
+		WebEvent *event = new WebEvent();
+		event->kind = TE4_WEB_EVENT_TITLE_CHANGE;
+		event->handlers = handlers;
+		event->data.title = cur_title;
+		push_event(event);
+	}
+
+	virtual bool OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request) OVERRIDE {
+		return false;
+	}
+
+	virtual bool OnBeforePopup(CefRefPtr<CefBrowser> browser,
+	                             CefRefPtr<CefFrame> frame,
+	                             const CefString& target_url,
+	                             const CefString& target_frame_name,
+	                             const CefPopupFeatures& popupFeatures,
+	                             CefWindowInfo& windowInfo,
+	                             CefRefPtr<CefClient>& client,
+	                             CefBrowserSettings& settings,
+	                             bool* no_javascript_access) OVERRIDE {
+		char *url = cstring_to_c(target_url);
+
+		WebEvent *event = new WebEvent();
+		event->kind = TE4_WEB_EVENT_REQUEST_POPUP_URL;
+		event->handlers = handlers;
+		event->data.popup.url = url;
+		event->data.popup.w = popupFeatures.widthSet ? popupFeatures.width : -1;
+		event->data.popup.h = popupFeatures.heightSet ? popupFeatures.height : -1;
+		push_event(event);
+
+		printf("[WEB] stopped popup to %s (%dx%d), pushing event...\n", url, event->data.popup.w, event->data.popup.h);
+
+		return true;
+	}
+
+	virtual void OnBeforeDownload(CefRefPtr<CefBrowser> browser, CefRefPtr<CefDownloadItem> download_item, const CefString& suggested_name, CefRefPtr<CefBeforeDownloadCallback> callback) OVERRIDE {
+		int32 id = download_item->GetId();
+		CurrentDownload *cd = new CurrentDownload();
+		cd->accept_cb = callback;
+		this->downloads[id] = cd;
+
+		const char *mime = cstring_to_c(download_item->GetMimeType());
+		const char *url = cstring_to_c(download_item->GetURL());
+		const char *name = cstring_to_c(suggested_name);
+		printf("[WEB] Download request [name: %s] [mime: %s] [url: %s]\n", name, mime, url);
+
+		WebEvent *event = new WebEvent();
+		event->kind = TE4_WEB_EVENT_DOWNLOAD_REQUEST;
+		event->handlers = handlers;
+		event->data.download_request.url = url;
+		event->data.download_request.name = name;
+		event->data.download_request.mime = mime;
+		event->data.download_request.id = id;
+		push_event(event);
+	}
+
+	virtual void OnDownloadUpdated(CefRefPtr<CefBrowser> browser, CefRefPtr<CefDownloadItem> download_item, CefRefPtr<CefDownloadItemCallback> callback) OVERRIDE {
+		int32 id = download_item->GetId();
+		CurrentDownload *cd = this->downloads[id];
+		if (!cd) { return; }
+		cd->cancel_cb = callback;
+
+		if (download_item->IsComplete() || download_item->IsCanceled()) {
+			WebEvent *event = new WebEvent();
+			event->kind = TE4_WEB_EVENT_DOWNLOAD_FINISH;
+			event->handlers = handlers;
+			event->data.download_finish.id = id;
+			push_event(event);
+		} else {
+			WebEvent *event = new WebEvent();
+			event->kind = TE4_WEB_EVENT_DOWNLOAD_UPDATE;
+			event->handlers = handlers;
+			event->data.download_update.id = id;
+			event->data.download_update.got = download_item->GetReceivedBytes();
+			event->data.download_update.total = download_item->GetTotalBytes();
+			event->data.download_update.percent = download_item->GetPercentComplete();
+			event->data.download_update.speed = download_item->GetCurrentSpeed();
+			push_event(event);
+		}
+	}
+
+	void downloadAction(int32 id, const char *path) {
+		CurrentDownload *cd = this->downloads[id];
+		if (!cd) return;
+
+		if (!path) {
+			// Cancel
+			if (cd->cancel_cb) cd->cancel_cb->Cancel();
+			delete cd;
+			downloads.erase(id);
+			printf("[WEB] Cancel download(%d)\n", id);
+		} else {
+			// Accept
+			CefString fullpath(path);
+			cd->accept_cb->Continue(fullpath, false);
+			printf("[WEB] Accepting download(%d) to %s\n", id, path);
+		}
+	}
+
+	virtual void OnLoadStart(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame) {
+		const char *url = cstring_to_c(frame->GetURL());
+		WebEvent *event = new WebEvent();
+		event->kind = TE4_WEB_EVENT_LOADING;
+		event->handlers = handlers;
+		event->data.loading.url = url;
+		event->data.loading.status = 0;
+		push_event(event);
+	}
+
+	virtual void OnLoadEnd(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, int httpStatusCode) {
+		const char *url = cstring_to_c(frame->GetURL());
+		WebEvent *event = new WebEvent();
+		event->kind = TE4_WEB_EVENT_LOADING;
+		event->handlers = handlers;
+		event->data.loading.url = url;
+		event->data.loading.status = 1;
+		push_event(event);
+	}
+
+	IMPLEMENT_REFCOUNTING(BrowserClient);
+};
+
+class ClientApp :
+	public CefApp,
+	public CefRenderProcessHandler
+{
+public:
+	virtual CefRefPtr<CefRenderProcessHandler> GetRenderProcessHandler() OVERRIDE {
+		return this;
+	}
+
+	virtual bool OnBeforeNavigation(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, NavigationType navigation_type, bool is_redirect) OVERRIDE { 
+		return false;
+	}
+
+	IMPLEMENT_REFCOUNTING(ClientApp);
+};
+
+
+class WebViewOpaque {
+public:
+	CefRefPtr<RenderHandler> render;
+	CefRefPtr<CefBrowser> browser;
+	CefRefPtr<BrowserClient> view;
+};
+
+void te4_web_new(web_view_type *view, int w, int h) {
+	WebViewOpaque *opaque = new WebViewOpaque();
+	view->opaque = (void*)opaque;
+
+	CefWindowInfo window_info;
+	CefBrowserSettings browserSettings;
+	window_info.SetAsOffScreen(NULL);
+	window_info.SetTransparentPainting(true);
+	opaque->render = new RenderHandler(w, h);
+	opaque->view = new BrowserClient(opaque->render, view->handlers);
+	CefString curl("");
+	opaque->browser = CefBrowserHost::CreateBrowserSync(window_info, opaque->view.get(), curl, browserSettings);
+
+	view->w = w;
+	view->h = h;
+	view->closed = false;
+	printf("Created webview\n");
+}
+
+bool te4_web_close(web_view_type *view) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (!view->closed) {
+		view->closed = true;
+		opaque->render = NULL;
+		opaque->view = NULL;
+		opaque->browser->GetHost()->CloseBrowser(true);
+		opaque->browser = NULL;
+		printf("Destroyed webview\n");
+		return true;
+	}
+	return false;
+}
+
+void te4_web_load_url(web_view_type *view, const char *url) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (view->closed) return;
+
+	CefString curl(url);
+	opaque->browser->GetMainFrame()->LoadURL(curl);
+}
+
+void te4_web_set_js_call(web_view_type *view, const char *name) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (view->closed) return;
+
+//	opaque->listener->te4_js.SetCustomMethod(WebString::CreateFromUTF8(name, strlen(name)), true);
+}
+
+void *te4_web_toscreen(web_view_type *view, int *w, int *h) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (view->closed) return NULL;
+
+	const RenderHandler* surface = opaque->render;
+
+	if (surface) {
+		*w = (*w < 0) ? surface->w : *w;
+		*h = (*h < 0) ? surface->h : *h;
+		return surface->tex;
+	}
+	return NULL;
+}
+
+bool te4_web_loading(web_view_type *view) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (view->closed) return false;
+
+	return opaque->browser->IsLoading();
+}
+
+void te4_web_focus(web_view_type *view, bool focus) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (view->closed) return;
+	
+	opaque->browser->GetHost()->SendFocusEvent(focus);
+}
+
+static int get_cef_state_modifiers() {
+	bool shift, ctrl, alt, meta;
+	web_key_mods(&shift, &ctrl, &alt, &meta);
+
+	int modifiers = 0;
+	if (shift)
+		modifiers |= EVENTFLAG_SHIFT_DOWN;
+	else if (ctrl)
+		modifiers |= EVENTFLAG_CONTROL_DOWN;
+	else if (alt)
+		modifiers |= EVENTFLAG_ALT_DOWN;
+
+	return modifiers;
+}
+
+void te4_web_inject_mouse_move(web_view_type *view, int x, int y) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (view->closed) return;
+
+	view->last_mouse_x = x;
+	view->last_mouse_y = y;
+	CefMouseEvent mouse_event;
+	mouse_event.x = x;
+	mouse_event.y = y;
+	mouse_event.modifiers = get_cef_state_modifiers();
+
+	opaque->browser->GetHost()->SendMouseMoveEvent(mouse_event, false);
+}
+
+void te4_web_inject_mouse_wheel(web_view_type *view, int x, int y) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (view->closed) return;
+	
+	CefMouseEvent mouse_event;
+	mouse_event.x = view->last_mouse_x;
+	mouse_event.y = view->last_mouse_y;
+	mouse_event.modifiers = get_cef_state_modifiers();
+	opaque->browser->GetHost()->SendMouseWheelEvent(mouse_event, -x, -y);
+}
+
+void te4_web_inject_mouse_button(web_view_type *view, int kind, bool up) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (view->closed) return;
+	
+	CefBrowserHost::MouseButtonType button_type = MBT_LEFT;
+	if (kind == 2) button_type = MBT_MIDDLE;
+	else if (kind == 3) button_type = MBT_RIGHT;
+
+	CefMouseEvent mouse_event;
+	mouse_event.x = view->last_mouse_x;
+	mouse_event.y = view->last_mouse_y;
+	mouse_event.modifiers = get_cef_state_modifiers();
+
+	opaque->browser->GetHost()->SendMouseClickEvent(mouse_event, button_type, up, 1);
+}
+
+#if defined(SELFEXE_MACOSX)
+#include <Carbon/Carbon.h>
+
+// A convenient array for getting symbol characters on the number keys.
+static const char kShiftCharsForNumberKeys[] = ")!@#$%^&*(";
+
+// Convert an ANSI character to a Mac key code.
+static int GetMacKeyCodeFromChar(int key_code) {
+	switch (key_code) {
+		case ' ': return kVK_Space;
+
+		case '0': case ')': return kVK_ANSI_0;
+		case '1': case '!': return kVK_ANSI_1;
+		case '2': case '@': return kVK_ANSI_2;
+		case '3': case '#': return kVK_ANSI_3;
+		case '4': case '$': return kVK_ANSI_4;
+		case '5': case '%': return kVK_ANSI_5;
+		case '6': case '^': return kVK_ANSI_6;
+		case '7': case '&': return kVK_ANSI_7;
+		case '8': case '*': return kVK_ANSI_8;
+		case '9': case '(': return kVK_ANSI_9;
+
+		case 'a': case 'A': return kVK_ANSI_A;
+		case 'b': case 'B': return kVK_ANSI_B;
+		case 'c': case 'C': return kVK_ANSI_C;
+		case 'd': case 'D': return kVK_ANSI_D;
+		case 'e': case 'E': return kVK_ANSI_E;
+		case 'f': case 'F': return kVK_ANSI_F;
+		case 'g': case 'G': return kVK_ANSI_G;
+		case 'h': case 'H': return kVK_ANSI_H;
+		case 'i': case 'I': return kVK_ANSI_I;
+		case 'j': case 'J': return kVK_ANSI_J;
+		case 'k': case 'K': return kVK_ANSI_K;
+		case 'l': case 'L': return kVK_ANSI_L;
+		case 'm': case 'M': return kVK_ANSI_M;
+		case 'n': case 'N': return kVK_ANSI_N;
+		case 'o': case 'O': return kVK_ANSI_O;
+		case 'p': case 'P': return kVK_ANSI_P;
+		case 'q': case 'Q': return kVK_ANSI_Q;
+		case 'r': case 'R': return kVK_ANSI_R;
+		case 's': case 'S': return kVK_ANSI_S;
+		case 't': case 'T': return kVK_ANSI_T;
+		case 'u': case 'U': return kVK_ANSI_U;
+		case 'v': case 'V': return kVK_ANSI_V;
+		case 'w': case 'W': return kVK_ANSI_W;
+		case 'x': case 'X': return kVK_ANSI_X;
+		case 'y': case 'Y': return kVK_ANSI_Y;
+		case 'z': case 'Z': return kVK_ANSI_Z;
+
+		// U.S. Specific mappings.  Mileage may vary.
+		case ';': case ':': return kVK_ANSI_Semicolon;
+		case '=': case '+': return kVK_ANSI_Equal;
+		case ',': case '<': return kVK_ANSI_Comma;
+		case '-': case '_': return kVK_ANSI_Minus;
+		case '.': case '>': return kVK_ANSI_Period;
+		case '/': case '?': return kVK_ANSI_Slash;
+		case '`': case '~': return kVK_ANSI_Grave;
+		case '[': case '{': return kVK_ANSI_LeftBracket;
+		case '\\': case '|': return kVK_ANSI_Backslash;
+		case ']': case '}': return kVK_ANSI_RightBracket;
+		case '\'': case '"': return kVK_ANSI_Quote;
+	}
+	
+	return -1;
+}
+#endif  // defined(OS_MACOSX)
+extern "C" {
+	#include <tSDL.h>
+}
+
+void te4_web_inject_key(web_view_type *view, int scancode, int asymb, const char *uni, int unilen, bool up) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (view->closed) return;
+	
+	int key_code = scancode;
+
+	CefKeyEvent key_event;
+
+	key_event.modifiers = get_cef_state_modifiers();
+
+	// OMFG ... CEF3 is very very nice, except for key handling
+	// Once this will be working(-ish) I never want to take a look at that thing again.
+#if defined(SELFEXE_LINUX)
+	if (key_code == SDLK_BACKSPACE)
+		key_event.native_key_code = 0xff08;
+	else if (key_code == SDLK_DELETE)
+		key_event.native_key_code = 0xffff;
+	else if (key_code == SDLK_DOWN)
+		key_event.native_key_code = 0xff54;
+	else if (key_code == SDLK_RETURN)
+		key_event.native_key_code = 0xff0d;
+	else if (key_code == SDLK_ESCAPE)
+		key_event.native_key_code = 0xff1b;
+	else if (key_code == SDLK_LEFT)
+		key_event.native_key_code = 0xff51;
+	else if (key_code == SDLK_RIGHT)
+		key_event.native_key_code = 0xff53;
+	else if (key_code == SDLK_TAB)
+		key_event.native_key_code = 0xff09;
+	else if (key_code == SDLK_UP)
+		key_event.native_key_code = 0xff52;
+	else if (key_code == SDLK_PAGEUP)
+		key_event.native_key_code = 0xff55;
+	else if (key_code == SDLK_PAGEDOWN)
+		key_event.native_key_code = 0xff56;
+	else
+		key_event.native_key_code = key_code;
+#elif defined(SELFEXE_WINDOWS)
+	// This has been fully untested and most certainly isnt working
+	BYTE VkCode;
+	if (key_code == SDLK_BACKSPACE)
+		VkCode = VK_BACK;
+	else if (key_code == SDLK_DELETE)
+		VkCode = VK_DELETE;
+	else if (key_code == SDLK_DOWN)
+		VkCode = VK_DOWN;
+	else if (key_code == SDLK_RETURN)
+		VkCode = VK_RETURN;
+	else if (key_code == SDLK_ESCAPE)
+		VkCode = VK_ESCAPE;
+	else if (key_code == SDLK_LEFT)
+		VkCode = VK_LEFT;
+	else if (key_code == SDLK_RIGHT)
+		VkCode = VK_RIGHT;
+	else if (key_code == SDLK_TAB)
+		VkCode = VK_TAB;
+	else if (key_code == SDLK_UP)
+		VkCode = VK_UP;
+	else if (unilen == 1 && uni[0] >= 'A' && uni[0] <= 'Z')
+		VkCode = uni[0];
+	else if (unilen == 1 && uni[0] >= 'a' && uni[0] <= 'z')
+		VkCode = uni[0];
+	else
+		VkCode = LOBYTE(VkKeyScanA(key_code));
+	UINT scanCode = MapVirtualKey(VkCode, MAPVK_VK_TO_VSC);
+	key_event.native_key_code = (scanCode << 16) |  // key scan code
+                              1;  // key repeat count
+	key_event.windows_key_code = VkCode;
+#elif defined(SELFEXE_MACOSX)
+	if (key_code == SDLK_BACKSPACE) {
+		cef_event.native_key_code = kVK_Delete;
+		cef_event.unmodified_character = kBackspaceCharCode;
+	} else if (key_code == SDLK_DELETE) {
+		cef_event.native_key_code = kVK_ForwardDelete;
+		cef_event.unmodified_character = kDeleteCharCode;
+	} else if (key_code == SDLK_DOWN) {
+		cef_event.native_key_code = kVK_DownArrow;
+		cef_event.unmodified_character = /* NSDownArrowFunctionKey */ 0xF701;
+	} else if (key_code == SDLK_RETURN) {
+		cef_event.native_key_code = kVK_Return;
+		cef_event.unmodified_character = kReturnCharCode;
+	} else if (key_code == SDLK_ESCAPE) {
+		cef_event.native_key_code = kVK_Escape;
+		cef_event.unmodified_character = kEscapeCharCode;
+	} else if (key_code == SDLK_LEFT) {
+		cef_event.native_key_code = kVK_LeftArrow;
+		cef_event.unmodified_character = /* NSLeftArrowFunctionKey */ 0xF702;
+	} else if (key_code == SDLK_RIGHT) {
+		cef_event.native_key_code = kVK_RightArrow;
+		cef_event.unmodified_character = /* NSRightArrowFunctionKey */ 0xF703;
+	} else if (key_code == SDLK_TAB) {
+		cef_event.native_key_code = kVK_Tab;
+		cef_event.unmodified_character = kTabCharCode;
+	} else if (key_code == SDLK_UP) {
+		cef_event.native_key_code = kVK_UpArrow;
+		cef_event.unmodified_character = /* NSUpArrowFunctionKey */ 0xF700;
+	} else {
+		cef_event.native_key_code = GetMacKeyCodeFromChar(key_code);
+		if (cef_event.native_key_code == -1)
+			return;
+		
+		cef_event.unmodified_character = key_code;
+	}
+
+	cef_event.character = cef_event.unmodified_character;
+
+	// Fill in |character| according to flags.
+	if (cef_event.modifiers & EVENTFLAG_SHIFT_DOWN) {
+		if (key_code >= '0' && key_code <= '9') {
+			cef_event.character = kShiftCharsForNumberKeys[key_code - '0'];
+		} else if (key_code >= 'A' && key_code <= 'Z') {
+			cef_event.character = 'A' + (key_code - 'A');
+		} else {
+			switch (cef_event.native_key_code) {
+				case kVK_ANSI_Grave:
+					cef_event.character = '~';
+					break;
+				case kVK_ANSI_Minus:
+					cef_event.character = '_';
+					break;
+				case kVK_ANSI_Equal:
+					cef_event.character = '+';
+					break;
+				case kVK_ANSI_LeftBracket:
+					cef_event.character = '{';
+					break;
+				case kVK_ANSI_RightBracket:
+					cef_event.character = '}';
+					break;
+				case kVK_ANSI_Backslash:
+					cef_event.character = '|';
+					break;
+				case kVK_ANSI_Semicolon:
+					cef_event.character = ':';
+					break;
+				case kVK_ANSI_Quote:
+					cef_event.character = '\"';
+					break;
+				case kVK_ANSI_Comma:
+					cef_event.character = '<';
+					break;
+				case kVK_ANSI_Period:
+					cef_event.character = '>';
+					break;
+				case kVK_ANSI_Slash:
+					cef_event.character = '?';
+					break;
+				default:
+					break;
+			}
+		}
+	}
+
+	// Control characters.
+	if (cef_event.modifiers & EVENTFLAG_CONTROL_DOWN) {
+		if (key_code >= 'A' && key_code <= 'Z')
+			cef_event.character = 1 + key_code - 'A';
+		else if (cef_event.native_key_code == kVK_ANSI_LeftBracket)
+			cef_event.character = 27;
+		else if (cef_event.native_key_code == kVK_ANSI_Backslash)
+			cef_event.character = 28;
+		else if (cef_event.native_key_code == kVK_ANSI_RightBracket)
+			cef_event.character = 29;
+	}
+#else
+	// Try a fallback..
+	key_event.native_key_code = key_code;
+#endif
+
+	key_event.unmodified_character = key_code;
+	key_event.character = key_event.unmodified_character;
+	key_event.modifiers = get_cef_state_modifiers();
+
+	if (unilen) {
+		key_event.type = KEYEVENT_RAWKEYDOWN;
+		opaque->browser->GetHost()->SendKeyEvent(key_event);
+		key_event.type = KEYEVENT_KEYUP;
+		opaque->browser->GetHost()->SendKeyEvent(key_event);
+		key_event.type = KEYEVENT_CHAR;
+		opaque->browser->GetHost()->SendKeyEvent(key_event);
+	} else if (!up) {
+		key_event.type = KEYEVENT_KEYDOWN;
+		opaque->browser->GetHost()->SendKeyEvent(key_event);
+	} else {
+		// Need to send both KEYUP and CHAR events.
+		key_event.type = KEYEVENT_KEYUP;
+		opaque->browser->GetHost()->SendKeyEvent(key_event);
+	}
+}
+
+void te4_web_download_action(web_view_type *view, long id, const char *path) {
+	WebViewOpaque *opaque = (WebViewOpaque*)view->opaque;
+	if (view->closed) return;
+
+	opaque->view->downloadAction(id, path);
+}
+
+void te4_web_reply_local(int id, const char *mime, const char *result, size_t len) {
+}
+
+void te4_web_do_update(void (*cb)(WebEvent*)) {
+	if (!web_core) return;
+
+	CefDoMessageLoopWork();
+
+	WebEvent *event;
+	while (event = pop_event()) {
+		cb(event);
+
+		switch (event->kind) {
+			case TE4_WEB_EVENT_TITLE_CHANGE:
+				free((void*)event->data.title);
+				break;
+			case TE4_WEB_EVENT_REQUEST_POPUP_URL:
+				free((void*)event->data.popup.url);
+				break;
+			case TE4_WEB_EVENT_DOWNLOAD_REQUEST:
+				free((void*)event->data.download_request.url);
+				free((void*)event->data.download_request.name);
+				free((void*)event->data.download_request.mime);
+				break;
+			case TE4_WEB_EVENT_LOADING:
+				free((void*)event->data.loading.url);
+				break;
+			case TE4_WEB_EVENT_LOCAL_REQUEST:
+				free((void*)event->data.local_request.path);
+				break;
+			case TE4_WEB_EVENT_RUN_LUA:
+				free((void*)event->data.run_lua.code);
+				break;
+			case TE4_WEB_EVENT_DELETE_TEXTURE:
+				web_del_texture(event->data.texture);
+				break;
+		}
+
+		delete event;
+	}
+}
+
+static int g_argc;
+static char **g_argv;
+CefRefPtr<ClientApp> app(new ClientApp);
+
+void te4_web_setup(
+	int argc, char **gargv, char *spawnc,
+	void*(*mutex_create)(), void(*mutex_destroy)(void*), void(*mutex_lock)(void*), void(*mutex_unlock)(void*),
+	void *(*make_texture)(int, int), void (*del_texture)(void*), void (*texture_update)(void*, int, int, const void*),
+	void (*key_mods)(bool*, bool*, bool*, bool*),
+	void (*instant_js)(int handlers, const char *fct, int nb_args, WebJsValue *args, WebJsValue *ret)
+	) {
+
+	web_mutex_create = mutex_create;
+	web_mutex_destroy = mutex_destroy;
+	web_mutex_lock = mutex_lock;
+	web_mutex_unlock = mutex_unlock;
+	web_make_texture = make_texture;
+	web_del_texture = del_texture;
+	web_texture_update = texture_update;
+	web_key_mods = key_mods;
+	web_instant_js = instant_js;
+
+	g_argc = argc;
+	g_argv = gargv;
+
+#ifdef _WIN32
+	CefMainArgs args(GetModuleHandle(NULL));
+#else
+	char **cargv = (char**)calloc(argc, sizeof(char*));
+	for (int i = 0; i < argc; i++) cargv[i] = strdup(gargv[i]);
+	CefMainArgs args(argc, cargv);
+#endif
+
+	int exit_code = CefExecuteProcess(args, app.get());
+	if (exit_code >= 0) {
+		exit(exit_code);
+	}
+}
+
+void te4_web_initialize(const char *locales, const char *pak) {
+	if (!web_core) {
+#ifdef _WIN32
+		CefMainArgs args(GetModuleHandle(NULL));
+#else
+		char **cargv = (char**)calloc(g_argc, sizeof(char*));
+		for (int i = 0; i < g_argc; i++) cargv[i] = strdup(g_argv[i]);
+		CefMainArgs args(g_argc, cargv);
+#endif
+
+		CefSettings settings;
+		settings.multi_threaded_message_loop = false;
+
+		CefString clocales(locales);
+		CefString(&settings.locales_dir_path) = clocales;
+		CefString resources(pak);
+		CefString(&settings.resources_dir_path) = resources;
+		CefInitialize(args, settings, app.get());
+		web_core = true;
+	}
+
+	te4_web_init_utils();
+}
+
+void te4_web_shutdown() {
+	CefShutdown();
+}
diff --git a/src/web-cef3/web.h b/src/web-cef3/web.h
new file mode 100644
index 0000000000000000000000000000000000000000..90b0718d9307545b5f7e8e464fa1f9a1e6d32ed4
--- /dev/null
+++ b/src/web-cef3/web.h
@@ -0,0 +1,49 @@
+/*
+    TE4 - T-Engine 4
+    Copyright (C) 2009, 2010, 2011, 2012, 2013 Nicolas Casalini
+
+    No permission to copy or replicate in any ways.
+*/
+
+#ifndef __TE4WEB_H__
+#define __TE4WEB_H__
+
+#ifdef __cplusplus
+/* C++ compiler needs to make this a C API. */
+#if defined( _WIN32 )
+/* Windows needs this to be a DLL, so be sure to export. */
+#define WEB_TE4_API extern "C" __declspec( dllexport ) 
+#else
+/* Non-windows platforms are fine linking statically. */
+#define WEB_TE4_API extern "C"
+#endif
+#else
+/* C compiler is using this header. */
+#define WEB_TE4_API
+#endif
+
+WEB_TE4_API void te4_web_setup(
+	int argc, char **argv, char *spawn,
+	void*(*mutex_create)(), void(*mutex_destroy)(void*), void(*mutex_lock)(void*), void(*mutex_unlock)(void*),
+	void*(*make_texture)(int, int), void (*del_texture)(void*), void (*texture_update)(void*, int, int, const void*),
+	void (*key_mods)(bool*, bool*, bool*, bool*),
+	void (*web_instant_js)(int handlers, const char *fct, int nb_args, WebJsValue *args, WebJsValue *ret)
+);
+WEB_TE4_API void te4_web_initialize(const char *locales, const char *pak);
+WEB_TE4_API void te4_web_shutdown();
+WEB_TE4_API void te4_web_do_update(void (*cb)(WebEvent*));
+WEB_TE4_API void te4_web_new(web_view_type *view, int w, int h);
+WEB_TE4_API bool te4_web_close(web_view_type *view);
+WEB_TE4_API void *te4_web_toscreen(web_view_type *view, int *w, int *h);
+WEB_TE4_API bool te4_web_loading(web_view_type *view);
+WEB_TE4_API void te4_web_focus(web_view_type *view, bool focus);
+WEB_TE4_API void te4_web_inject_mouse_move(web_view_type *view, int x, int y);
+WEB_TE4_API void te4_web_inject_mouse_wheel(web_view_type *view, int x, int y);
+WEB_TE4_API void te4_web_inject_mouse_button(web_view_type *view, int kind, bool up);
+WEB_TE4_API void te4_web_inject_key(web_view_type *view, int scancode, int asymb, const char *uni, int unilen, bool up);
+WEB_TE4_API void te4_web_download_action(web_view_type *view, long id, const char *path);
+WEB_TE4_API void te4_web_reply_local(int id, const char *mime, const char *result, size_t len);
+WEB_TE4_API void te4_web_load_url(web_view_type *view, const char *url);
+WEB_TE4_API void te4_web_set_js_call(web_view_type *view, const char *name);
+
+#endif
diff --git a/src/web-external.h b/src/web-external.h
new file mode 100644
index 0000000000000000000000000000000000000000..bf1a837555cb4d41ad8da4d96dd98d1ccacc8443
--- /dev/null
+++ b/src/web-external.h
@@ -0,0 +1,102 @@
+/*
+    TE4 - T-Engine 4
+    Copyright (C) 2009 - 2014 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
+*/
+
+#ifndef __TE4WEB_EXTERNAL_H__
+#define __TE4WEB_EXTERNAL_H__
+
+enum web_event_kind {
+	// Internal stuff
+	TE4_WEB_EVENT_DELETE_TEXTURE,
+
+	// Eternal stuff
+	TE4_WEB_EVENT_TITLE_CHANGE,
+	TE4_WEB_EVENT_REQUEST_POPUP_URL,
+	TE4_WEB_EVENT_DOWNLOAD_REQUEST,
+	TE4_WEB_EVENT_DOWNLOAD_UPDATE,
+	TE4_WEB_EVENT_DOWNLOAD_FINISH,
+	TE4_WEB_EVENT_LOADING,
+	TE4_WEB_EVENT_LOCAL_REQUEST,
+	TE4_WEB_EVENT_RUN_LUA,
+};
+
+typedef struct {
+	enum web_event_kind kind;
+	int handlers;
+	union {
+		const char *title;
+		struct {
+			const char *url;
+			int w, h;
+		} popup;
+		struct {
+			long id;
+			const char *url;
+			const char *mime;
+			const char *name;
+		} download_request;
+		struct {
+			long id;
+			long total, got, speed;
+			int percent;
+		} download_update;
+		struct {
+			long id;
+		} download_finish;
+		struct {
+			const char *url;
+			signed char status;
+		} loading;
+		struct {
+			int id;
+			const char *path;
+		} local_request;
+		struct {
+			const char *code;
+		} run_lua;
+		void *texture;
+	} data;
+} WebEvent;
+
+enum web_js_kind {
+	TE4_WEB_JS_NULL,
+	TE4_WEB_JS_BOOLEAN,
+	TE4_WEB_JS_NUMBER,
+	TE4_WEB_JS_STRING,
+};
+
+typedef struct {
+	enum web_js_kind kind;
+	union {
+		bool b;
+		double n;
+		const char *s;
+	} data;
+} WebJsValue;
+
+typedef struct {
+	void *opaque;
+	int w, h;
+	int last_mouse_x, last_mouse_y;
+	int handlers;
+	bool closed;
+} web_view_type;
+
+#endif
diff --git a/src/web.c b/src/web.c
new file mode 100644
index 0000000000000000000000000000000000000000..6d1cac6e3460734ebcf911a83c2031848d94c87e
--- /dev/null
+++ b/src/web.c
@@ -0,0 +1,533 @@
+/*
+    TE4 - T-Engine 4
+    Copyright (C) 2009 - 2014 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
+*/
+
+#include "display.h"
+#include "lua.h"
+#include "lauxlib.h"
+#include "lualib.h"
+#include "auxiliar.h"
+#include "physfs.h"
+#include "core_lua.h"
+#include "types.h"
+#include "main.h"
+#include "te4web.h"
+#include "web-external.h"
+#include "lua_externs.h"
+
+/*
+ * Grab web browser methods -- availabe only here
+ */
+static bool webcore = FALSE;
+static void (*te4_web_setup)(
+	int, char**, char*,
+	void*(*)(), void(*)(void*), void(*)(void*), void(*)(void*),
+	void* (*)(int, int), void (*)(void*), void (*)(void*, int, int, const void*),
+	void (*)(bool*, bool*, bool*, bool*),
+	void (*)(int handlers, const char *fct, int nb_args, WebJsValue *args, WebJsValue *ret)
+);
+static void (*te4_web_initialize)(const char *locales, const char *pak);
+static void (*te4_web_shutdown)();
+static void (*te4_web_do_update)(void (*cb)(WebEvent*));
+static void (*te4_web_new)(web_view_type *view, int w, int h);
+static bool (*te4_web_close)(web_view_type *view);
+static void* (*te4_web_toscreen)(web_view_type *view, int *w, int *h);
+static bool (*te4_web_loading)(web_view_type *view);
+static void (*te4_web_focus)(web_view_type *view, bool focus);
+static void (*te4_web_inject_mouse_move)(web_view_type *view, int x, int y);
+static void (*te4_web_inject_mouse_wheel)(web_view_type *view, int x, int y);
+static void (*te4_web_inject_mouse_button)(web_view_type *view, int kind, bool up);
+static void (*te4_web_inject_key)(web_view_type *view, int scancode, int asymb, const char *uni, int unilen, bool up);
+static void (*te4_web_download_action)(web_view_type *view, long id, const char *path);
+static void (*te4_web_reply_local)(int id, const char *mime, const char *result, size_t len);
+static void (*te4_web_load_url)(web_view_type *view, const char *url);
+static void (*te4_web_set_js_call)(web_view_type *view, const char *name);
+
+static int lua_web_new(lua_State *L) {
+	int w = luaL_checknumber(L, 1);
+	int h = luaL_checknumber(L, 2);
+
+	web_view_type *view = (web_view_type*)lua_newuserdata(L, sizeof(web_view_type));
+	auxiliar_setclass(L, "web{view}", -1);
+
+	lua_pushvalue(L, 3);
+	view->handlers = luaL_ref(L, LUA_REGISTRYINDEX);
+
+	te4_web_new(view, w, h);
+
+	return 1;
+}
+
+static int lua_web_close(lua_State *L) {
+	web_view_type *view = (web_view_type*)auxiliar_checkclass(L, "web{view}", 1);
+	if (!te4_web_close(view)) {
+		luaL_unref(L, LUA_REGISTRYINDEX, view->handlers);
+	}
+	return 0;
+}
+
+static int lua_web_load_url(lua_State *L) {
+	web_view_type *view = (web_view_type*)auxiliar_checkclass(L, "web{view}", 1);
+	const char* url = luaL_checkstring(L, 2);
+	te4_web_load_url(view, url);
+	return 0;
+}
+
+static int lua_web_toscreen(lua_State *L) {
+	web_view_type *view = (web_view_type*)auxiliar_checkclass(L, "web{view}", 1);
+	int x = luaL_checknumber(L, 2);
+	int y = luaL_checknumber(L, 3);
+	int w = -1;
+	int h = -1;
+	if (lua_isnumber(L, 4)) w = lua_tonumber(L, 4);
+	if (lua_isnumber(L, 5)) h = lua_tonumber(L, 5);
+	GLuint *tex = (GLuint*)te4_web_toscreen(view, &w, &h);
+
+	if (tex) {
+		float r = 1, g = 1, b = 1, a = 1;
+
+		glBindTexture(GL_TEXTURE_2D, *tex);
+
+		GLfloat texcoords[2*4] = {
+			0, 0,
+			0, 1,
+			1, 1,
+			1, 0,
+		};
+		GLfloat colors[4*4] = {
+			r, g, b, a,
+			r, g, b, a,
+			r, g, b, a,
+			r, g, b, a,
+		};
+		glColorPointer(4, GL_FLOAT, 0, colors);
+		glTexCoordPointer(2, GL_FLOAT, 0, texcoords);
+
+		GLfloat vertices[2*4] = {
+			x, y,
+			x, y + h,
+			x + w, y + h,
+			x + w, y,
+		};
+		glVertexPointer(2, GL_FLOAT, 0, vertices);
+
+		glDrawArrays(GL_QUADS, 0, 4);
+	}
+	return 0;
+}
+
+static int lua_web_loading(lua_State *L) {
+	web_view_type *view = (web_view_type*)auxiliar_checkclass(L, "web{view}", 1);
+
+	lua_pushboolean(L, te4_web_loading(view));
+	return 1;
+}
+
+static int lua_web_focus(lua_State *L) {
+	web_view_type *view = (web_view_type*)auxiliar_checkclass(L, "web{view}", 1);
+	te4_web_focus(view, lua_toboolean(L, 2));
+	return 0;
+}
+
+static int lua_web_inject_mouse_move(lua_State *L) {
+	web_view_type *view = (web_view_type*)auxiliar_checkclass(L, "web{view}", 1);
+	int x = luaL_checknumber(L, 2);
+	int y = luaL_checknumber(L, 3);
+
+	te4_web_inject_mouse_move(view, x, y);
+	return 0;
+}
+
+static int lua_web_inject_mouse_wheel(lua_State *L) {
+	web_view_type *view = (web_view_type*)auxiliar_checkclass(L, "web{view}", 1);
+	int x = luaL_checknumber(L, 2);
+	int y = luaL_checknumber(L, 3);
+
+	te4_web_inject_mouse_wheel(view, x, y);
+	return 0;
+}
+
+static int lua_web_inject_mouse_button(lua_State *L) {
+	web_view_type *view = (web_view_type*)auxiliar_checkclass(L, "web{view}", 1);
+	bool up = lua_toboolean(L, 2);
+	int kind = luaL_checknumber(L, 3);
+
+	te4_web_inject_mouse_button(view, kind, up);
+	return 0;
+}
+
+static int lua_web_inject_key(lua_State *L) {
+	web_view_type *view = (web_view_type*)auxiliar_checkclass(L, "web{view}", 1);
+	bool up = lua_toboolean(L, 2);
+	int scancode = lua_tonumber(L, 3);
+	int asymb = lua_tonumber(L, 4);
+	const char *uni = NULL;
+	size_t unilen = 0;
+	if (lua_isstring(L, 5)) uni = lua_tolstring(L, 5, &unilen);
+
+	te4_web_inject_key(view, scancode, asymb, uni, unilen, up);
+	return 0;
+}
+
+static int lua_web_download_action(lua_State *L) {
+	web_view_type *view = (web_view_type*)auxiliar_checkclass(L, "web{view}", 1);
+	long id = lua_tonumber(L, 2);
+	if (lua_isstring(L, 3)) te4_web_download_action(view, id, lua_tostring(L, 3));
+	else te4_web_download_action(view, id, NULL);
+	return 0;
+}
+
+static int lua_web_set_method(lua_State *L) {
+	web_view_type *view = (web_view_type*)auxiliar_checkclass(L, "web{view}", 1);
+	const char *name = luaL_checkstring(L, 2);
+	te4_web_set_js_call(view, name);
+	return 0;
+}
+
+static int lua_web_local_reply_file(lua_State *L) {
+	int id = lua_tonumber(L, 1);
+	const char *mime = luaL_checkstring(L, 2);
+	const char *file = luaL_checkstring(L, 3);
+
+	PHYSFS_file *f = PHYSFS_openRead(file);
+	if (!f) {
+		te4_web_reply_local(id, mime, NULL, 0);
+		return 0;
+	}
+
+	size_t len = PHYSFS_fileLength(f);
+	char *data = malloc(len * sizeof(char));
+	size_t read = 0;
+	while (read < len) {
+		size_t rl = PHYSFS_read(f, data + read, sizeof(char), len - read);
+		if (rl <= 0) break;
+		read += rl;
+	}
+	PHYSFS_close(f);
+
+	te4_web_reply_local(id, mime, data, read);
+	return 0;
+}
+
+static int lua_web_local_reply_data(lua_State *L) {
+	int id = lua_tonumber(L, 1);
+	const char *mime = luaL_checkstring(L, 2);
+	size_t len;
+	const char *data = luaL_checklstring(L, 3, &len);
+
+	te4_web_reply_local(id, mime, data, len);
+	return 0;
+}
+
+static const struct luaL_Reg view_reg[] =
+{
+	{"__gc", lua_web_close},
+	{"downloadAction", lua_web_download_action},
+	{"loadURL", lua_web_load_url},
+	{"toScreen", lua_web_toscreen},
+	{"focus", lua_web_focus},
+	{"loading", lua_web_loading},
+	{"injectMouseMove", lua_web_inject_mouse_move},
+	{"injectMouseWheel", lua_web_inject_mouse_wheel},
+	{"injectMouseButton", lua_web_inject_mouse_button},
+	{"injectKey", lua_web_inject_key},
+	{"setMethod", lua_web_set_method},
+	{NULL, NULL},
+};
+
+static const struct luaL_Reg weblib[] =
+{
+	{"new", lua_web_new},
+	{"localReplyData", lua_web_local_reply_data},
+	{"localReplyFile", lua_web_local_reply_file},
+	{NULL, NULL},
+};
+
+static lua_State *he_L;
+static void handle_event(WebEvent *event) {
+	switch (event->kind) {
+		case TE4_WEB_EVENT_TITLE_CHANGE:
+			lua_rawgeti(he_L, LUA_REGISTRYINDEX, event->handlers);
+			lua_pushstring(he_L, "on_title");
+			lua_gettable(he_L, -2);
+			lua_remove(he_L, -2);
+			if (!lua_isnil(he_L, -1)) {
+				lua_pushstring(he_L, event->data.title);
+				docall(he_L, 1, 0);
+			} else lua_pop(he_L, 1);
+			break;
+
+		case TE4_WEB_EVENT_REQUEST_POPUP_URL:
+			lua_rawgeti(he_L, LUA_REGISTRYINDEX, event->handlers);
+			lua_pushstring(he_L, "on_popup");
+			lua_gettable(he_L, -2);
+			lua_remove(he_L, -2);
+			if (!lua_isnil(he_L, -1)) {
+				lua_pushstring(he_L, event->data.popup.url);
+				lua_pushnumber(he_L, event->data.popup.w);
+				lua_pushnumber(he_L, event->data.popup.h);
+				docall(he_L, 3, 0);
+			} else lua_pop(he_L, 1);
+			break;
+
+		case TE4_WEB_EVENT_DOWNLOAD_REQUEST:
+			lua_rawgeti(he_L, LUA_REGISTRYINDEX, event->handlers);
+			lua_pushstring(he_L, "on_download_request");
+			lua_gettable(he_L, -2);
+			lua_remove(he_L, -2);
+			if (!lua_isnil(he_L, -1)) {
+				lua_pushnumber(he_L, event->data.download_request.id);
+				lua_pushstring(he_L, event->data.download_request.url);
+				lua_pushstring(he_L, event->data.download_request.name);
+				lua_pushstring(he_L, event->data.download_request.mime);
+				docall(he_L, 4, 0);
+			} else lua_pop(he_L, 1);
+			break;
+
+		case TE4_WEB_EVENT_DOWNLOAD_UPDATE:
+			lua_rawgeti(he_L, LUA_REGISTRYINDEX, event->handlers);
+			lua_pushstring(he_L, "on_download_update");
+			lua_gettable(he_L, -2);
+			lua_remove(he_L, -2);
+			if (!lua_isnil(he_L, -1)) {
+				lua_pushnumber(he_L, event->data.download_update.id);
+				lua_pushnumber(he_L, event->data.download_update.got);
+				lua_pushnumber(he_L, event->data.download_update.total);
+				lua_pushnumber(he_L, event->data.download_update.percent);
+				lua_pushnumber(he_L, event->data.download_update.speed);
+				docall(he_L, 5, 0);
+			} else lua_pop(he_L, 1);
+			break;
+
+		case TE4_WEB_EVENT_DOWNLOAD_FINISH:
+			lua_rawgeti(he_L, LUA_REGISTRYINDEX, event->handlers);
+			lua_pushstring(he_L, "on_download_finish");
+			lua_gettable(he_L, -2);
+			lua_remove(he_L, -2);
+			if (!lua_isnil(he_L, -1)) {
+				lua_pushnumber(he_L, event->data.download_update.id);
+				docall(he_L, 1, 0);
+			} else lua_pop(he_L, 1);
+			break;
+
+		case TE4_WEB_EVENT_LOADING:
+			lua_rawgeti(he_L, LUA_REGISTRYINDEX, event->handlers);
+			lua_pushstring(he_L, "on_loading");
+			lua_gettable(he_L, -2);
+			lua_remove(he_L, -2);
+			if (!lua_isnil(he_L, -1)) {
+				lua_pushstring(he_L, event->data.loading.url);
+				lua_pushnumber(he_L, event->data.loading.status);
+				docall(he_L, 2, 0);
+			} else lua_pop(he_L, 1);
+			break;
+
+		case TE4_WEB_EVENT_LOCAL_REQUEST:
+			lua_getglobal(he_L, "core");
+			lua_getfield(he_L, -1, "webview");
+			lua_getfield(he_L, -1, "responder");
+			lua_remove(he_L, -2);
+			lua_remove(he_L, -2);
+			if (!lua_isnil(he_L, -1)) {
+				lua_pushnumber(he_L, event->data.local_request.id);
+				lua_pushstring(he_L, event->data.local_request.path);
+				docall(he_L, 2, 0);
+			} else lua_pop(he_L, 1);
+			break;
+
+		case TE4_WEB_EVENT_RUN_LUA:
+			if (!luaL_loadstring(he_L, event->data.run_lua.code)) {
+				docall(he_L, 0, 0);
+			} else {
+				printf("[WEBCORE] Failed to run lua code:\n%s\n ==>> Error: %s\n", event->data.run_lua.code, lua_tostring(he_L, -1));
+				lua_pop(he_L, 1);
+			}
+			break;
+	}
+}
+
+void te4_web_update(lua_State *L) {
+	if (webcore) {
+		he_L = L;
+		te4_web_do_update(handle_event);		
+	}
+}
+
+void te4_web_init(lua_State *L) {
+	if (!webcore) return;
+
+	char *locales = PHYSFS_getDependentPath("/cef3/locales/");
+	char *pak = PHYSFS_getDependentPath("/cef3/");
+	te4_web_initialize(locales, pak);
+	free(locales);
+	free(pak);
+
+	auxiliar_newclass(L, "web{view}", view_reg);
+	luaL_openlib(L, "core.webview", weblib, 0);
+	lua_pushstring(L, "kind");
+	lua_pushstring(L, "cef3");
+	lua_settable(L, -3);
+	lua_settop(L, 0);
+}
+
+static void *web_mutex_create() {
+	return (void*)SDL_CreateMutex();
+}
+static void web_mutex_destroy(void *mutex) {
+	SDL_DestroyMutex((SDL_mutex*)mutex);
+}
+static void web_mutex_lock(void *mutex) {
+	SDL_mutexP((SDL_mutex*)mutex);
+}
+static void web_mutex_unlock(void *mutex) {
+	SDL_mutexV((SDL_mutex*)mutex);
+}
+
+static void *web_make_texture(int w, int h) {
+	GLuint *tex = malloc(sizeof(GLuint));
+	glGenTextures(1, tex);
+	glBindTexture(GL_TEXTURE_2D, *tex);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+	GLfloat largest_supported_anisotropy;
+	glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &largest_supported_anisotropy);
+	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, largest_supported_anisotropy);
+	unsigned char *buffer = calloc(w * h * 4, sizeof(unsigned char));
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_BGRA, GL_UNSIGNED_BYTE, buffer);
+	free(buffer);
+	return tex;
+}
+static void web_del_texture(void *tex) {
+	GLuint t = *((GLuint*)tex);
+	glDeleteTextures(1, &t);
+	free(tex);
+}
+static void web_texture_update(void *tex, int w, int h, const void* buffer) {
+	GLuint t = *((GLuint*)tex);
+	tglBindTexture(GL_TEXTURE_2D, t);
+	glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_BGRA, GL_UNSIGNED_BYTE, buffer);
+}
+
+static void web_key_mods(bool *shift, bool *ctrl, bool *alt, bool *meta) {
+	SDL_Keymod smod = SDL_GetModState();
+
+	*shift = *ctrl = *alt = *meta = FALSE;
+	if (smod & KMOD_SHIFT) *shift = TRUE;
+	if (smod & KMOD_CTRL) *ctrl = TRUE;
+	if (smod & KMOD_ALT) *alt = TRUE;
+	if (smod & KMOD_GUI) *meta = TRUE;
+}
+
+static void web_instant_js(int handlers, const char *fct, int nb_args, WebJsValue *args, WebJsValue *ret) {
+	lua_rawgeti(he_L, LUA_REGISTRYINDEX, handlers);
+	lua_pushstring(he_L, fct);
+	lua_gettable(he_L, -2);
+	lua_remove(he_L, -2);
+	if (!lua_isnil(he_L, -1)) {
+		int i;
+		for (i = 0; i < nb_args; i++) {
+			if (args[i].kind == TE4_WEB_JS_NULL) lua_pushnil(he_L);
+			else if (args[i].kind == TE4_WEB_JS_BOOLEAN) lua_pushboolean(he_L, args[i].data.b);
+			else if (args[i].kind == TE4_WEB_JS_NUMBER) lua_pushnumber(he_L, args[i].data.n);
+			else if (args[i].kind == TE4_WEB_JS_STRING) lua_pushstring(he_L, args[i].data.s);
+		}
+		if (!docall(he_L, nb_args, 1)) {
+			if (lua_isnumber(he_L, -1)) {
+				ret->kind = TE4_WEB_JS_NUMBER;
+				ret->data.n = lua_tonumber(he_L, -1);
+			} else if (lua_isstring(he_L, -1)) {
+				ret->kind = TE4_WEB_JS_STRING;
+				ret->data.s = lua_tostring(he_L, -1);
+			} else if (lua_isboolean(he_L, -1)) {
+				ret->kind = TE4_WEB_JS_BOOLEAN;
+				ret->data.b = lua_toboolean(he_L, -1);
+			} else {
+				ret->kind = TE4_WEB_JS_NULL;
+			}
+			lua_pop(he_L, 1);
+		} else {
+			ret->kind = TE4_WEB_JS_NULL;
+		}
+	} else {
+		ret->kind = TE4_WEB_JS_NULL;
+		lua_pop(he_L, 1);
+	}
+}
+
+void te4_web_load() {
+#if defined(SELFEXE_LINUX) || defined(SELFEXE_BSD)
+#if defined(TE4_RELPATH64)
+	void *web = SDL_LoadObject("lib64/libte4-web.so");
+#elif defined(TE4_RELPATH64)
+	void *web = SDL_LoadObject("lib/libte4-web.so");
+#else
+	void *web = SDL_LoadObject("libte4-web.so");
+#endif
+#elif defined(SELFEXE_WINDOWS)
+	void *web = SDL_LoadObject("te4-web.dll");
+#elif defined(SELFEXE_MACOSX)
+	void *web = SDL_LoadObject("libte4-web.dylib");
+#else
+	void *web = NULL;
+#endif
+	printf("Loading web core: %s\n", web ? "loaded!" : SDL_GetError());
+
+	if (web) {
+		webcore = TRUE;
+		te4_web_setup = (void (*)(
+			int, char**, char*,
+			void*(*)(), void(*)(void*), void(*)(void*), void(*)(void*),
+			void* (*)(int, int), void (*)(void*), void (*)(void*, int, int, const void*),
+			void (*)(bool*, bool*, bool*, bool*),
+			void (*)(int handlers, const char *fct, int nb_args, WebJsValue *args, WebJsValue *ret)
+		)) SDL_LoadFunction(web, "te4_web_setup");
+		te4_web_initialize = (void (*)(const char *locales, const char *pak)) SDL_LoadFunction(web, "te4_web_initialize");
+		te4_web_shutdown = (void (*)()) SDL_LoadFunction(web, "te4_web_shutdown");
+		te4_web_do_update = (void (*)(void (*cb)(WebEvent*))) SDL_LoadFunction(web, "te4_web_do_update");
+		te4_web_new = (void (*)(web_view_type *view, int w, int h)) SDL_LoadFunction(web, "te4_web_new");
+		te4_web_close = (bool (*)(web_view_type *view)) SDL_LoadFunction(web, "te4_web_close");
+		te4_web_toscreen = (void* (*)(web_view_type *view, int *w, int *h)) SDL_LoadFunction(web, "te4_web_toscreen");
+		te4_web_loading = (bool (*)(web_view_type *view)) SDL_LoadFunction(web, "te4_web_loading");
+		te4_web_focus = (void (*)(web_view_type *view, bool focus)) SDL_LoadFunction(web, "te4_web_focus");
+		te4_web_inject_mouse_move = (void (*)(web_view_type *view, int x, int y)) SDL_LoadFunction(web, "te4_web_inject_mouse_move");
+		te4_web_inject_mouse_wheel = (void (*)(web_view_type *view, int x, int y)) SDL_LoadFunction(web, "te4_web_inject_mouse_wheel");
+		te4_web_inject_mouse_button = (void (*)(web_view_type *view, int kind, bool up)) SDL_LoadFunction(web, "te4_web_inject_mouse_button");
+		te4_web_inject_key = (void (*)(web_view_type *view, int scancode, int asymb, const char *uni, int unilen, bool up)) SDL_LoadFunction(web, "te4_web_inject_key");
+		te4_web_download_action = (void (*)(web_view_type *view, long id, const char *path)) SDL_LoadFunction(web, "te4_web_download_action");
+		te4_web_reply_local = (void (*)(int id, const char *mime, const char *result, size_t len)) SDL_LoadFunction(web, "te4_web_reply_local");
+		te4_web_load_url = (void (*)(web_view_type *view, const char *url)) SDL_LoadFunction(web, "te4_web_load_url");
+		te4_web_set_js_call = (void (*)(web_view_type *view, const char *name)) SDL_LoadFunction(web, "te4_web_set_js_call");
+
+		te4_web_setup(
+			g_argc, g_argv, NULL,
+			web_mutex_create, web_mutex_destroy, web_mutex_lock, web_mutex_unlock,
+			web_make_texture, web_del_texture, web_texture_update,
+			web_key_mods,
+			web_instant_js
+			);
+	}
+}
+
+void te4_web_terminate() {
+	if (!webcore) return;
+	te4_web_shutdown();
+}
diff --git a/tiled-maps/eyal2.tmx b/tiled-maps/eyal2.tmx
index 241c64dad1d023239e9c9aba4f638dde747b25bb..c4b94029b78e5e65010b148a75a626b8432be77f 100644
--- a/tiled-maps/eyal2.tmx
+++ b/tiled-maps/eyal2.tmx
@@ -73,6 +73,16 @@
     <property name="display" value="v"/>
    </properties>
   </tile>
+  <tile id="57">
+   <properties>
+    <property name="display" value="E"/>
+   </properties>
+  </tile>
+  <tile id="60">
+   <properties>
+    <property name="display" value="P"/>
+   </properties>
+  </tile>
   <tile id="69">
    <properties>
     <property name="display" value="p"/>
@@ -114,6 +124,11 @@
     <property name="display" value="t"/>
    </properties>
   </tile>
+  <tile id="92">
+   <properties>
+    <property name="display" value="e"/>
+   </properties>
+  </tile>
   <tile id="93">
    <properties>
     <property name="display" value="!"/>
@@ -295,7 +310,7 @@
  </tileset>
  <layer name="Terrain" width="170" height="100">
   <data encoding="base64" compression="zlib">
-   eJzt3UluHDcUBmCu2zBgxckFfIhWfAEB1jKANzagA+gSBnKGHKAPEC8zj8g850pJAf2gp19vImtgd9Vb/LBUXQOL/JpksVvJdSnlOpPZWG6FWK/VBs/V+34zp5fbGfMSMmx7dUzk+N51s+Xsjqk97pId23I8b/vbxgzWXrNor6NP2v6K5bWyb2vZ+P3hPUf2zdz3yXMphB+Dr+Hx3jV5e0TamLvh27k1K9I+klG0qpm13E/lOt3aTiV7klvNaItXLdyXZQL3iTiVfGpeI9ec02pvI3N6i1ixjKFF9Lkv951afrE/jraP1adp/Sa+1mqUx7uuVs7h2A8aszanljXPaqvTfblzyvNCCXeq1T/fbvWLnhfs66R9NIPcl2bVc4rnb3W6Nque0ZvKY2+OkbzuWW6KbJOO2cHrmkncFvEQsRoxqu2PXqXz1fbFlkdtny0Z3Zf75iLn4VY1p9xgZL5qGW11Gu3fLKM1Y/jYOUONUz6/7e1sDqs3LNr47DmXnHKjOKbXOkWb/HfLDV2DylZrtdap13dSPfFyWU4jVnl625rLK9mUjJKX6LM6nY8b5f5rnvslp7cl7lSac3CnPPyamrkao5pVqhter1Q/3xR97lszB+htag6jO2hL3p7c5w62WUZvhHOi/xshllPMrRDsP6370ozS/UUM0nW+Yz9bVnkfKjmV6qJl/O/tag6jkilpjmn1gZI9zal0Lc2pZRN/x/LWXAfzebGt/gv1h+O4FGmuE33PvmT7ak75771tTW2U17M2J9XW7vH3y/LQ5w9lnFWp7NwpRWr3GqffCtv4+bAP5fvgeWudSkaxjHzfyLNUb19T+uROI0a1etT6L22898Zjy6iUx8dgu2tGhxyOkepDew9awfH8H3hde3b0jEr7rr0v1YzyNtXGRKvtPaM4HkrXbHX6mEV630lODxA06j3fWXMhzbi1voFevbnB2uemkr1Iv1Y738T8qNQ3X2NocSoZjYz5hyI7/aTEnEpWLb/kVHIYPRe/tzU7RXNWW0Y8R4IupTLUzEs1o+TUmp9qTi173tzHcsxDY36rU+nehvNJz1O9nU3p1HqOkYxK2bP6p3PsykOj5+LUm39KdefdF3cqjevStTW3uH1rTrkzq5/QvieC3od9L4y6pryFtnvLto11WvNe9Hw+L7pTnCtp8/wXyrWjTrV5xNqd8uB73fK5g/No4z06ldqGu3wLiVhFp9h3R8cLbcx9DpHqj59buxaO+d57JOKUzrlmp1jX6E8yitstB+SUW7WcaqlxytsWDX1RYn2Z9Bo65b9b79NoX9pilJwO+67RqWYVLUrf/8R2xL4E2+Gi+FalfjRq1HIa7Ue1fFke9qXkUtpmXe9diPce8eaktJ3aa7jO32V9TtEqt8mNWs+73Kk2X7go46xGnH5VbKefHf/9WSjfkCcs+Bo5fO8Yqhc0ao33aFTyGnEq7cedDtmSU2/tBH1p/RQarXGK57TuQ1s7jfSnT4SgUe70eXloVXNK57GcSlatfkFzSnW4NqOeVWntRJu7WWOp5FQ7h/Y81eoUrdY65Va5U8nqc+FaUzjFesLXnh5DdUjp7WoJq1pfqhmzQufxnqXQKjda45SXFdfc0Cm5pP0lp3x8wTmptiaH10GXl0Wfq9Y4fQrBfXu7mjraeiiuQ2t1J1nnRvlagjeHkOaoXvk9p9IzIjrl29Co9CzFx3zNKz/PT+XOKKXFKe2DRiWrvV1NGaluaL3De9bE+vCcSustEas1Tun8Uv+GVqXx/kmx+1Cck1prUtLfJWrrSpJVyShFc8qv19vWkk6toFO0ikYjfbM29kedWutDdF9YHm4VLXtOPaOSP6xna92acigPv4Og9aP8/dHb15ROqQ75z9a6FCbiFG16z2Utc1TpsyFpni3dV+SZP9KX4hxAuj+8b8vqQQker1nu7Wtup9E+1XJK5qxxT3P6calziu8NfJbxnA7bap1yn7+we9We+61ITg9O0Djfvman2NdJn0HVOsW+wjPKrdU4la69E64rfb7mjb2181KpP/fMtjjFctP2tRm1rFLdSaaiTqNzLzTa+rkUvz6WBd97uLYRLZvnE/tz6/P+MU6lctNra3WKbUr3aH1uKhmlY2rb33PaWu+SBexHPZP8Z+sZzQpdz7Lq1dWhPHSq7bNWo9iu+HuN01qXntGavtS6J+m50HMqfU/Pc8rPIc2Btc/FIu/rg7PfoWzDqdbGUafYxth/WPMzzSgdM+Y+tLbFbXgf3vzT+g6Wtv5kHec5tYyu/TPTWqdSu0pOa+Zm3Kk2do6xKq3f8nb37kOL5k1bJ92V+/WCx10XvX40o1im3mZ6O8X60fbFOqydy83h1FsPi9yH9B7TjH4EGba9wyIdZ5Xh05JGI049o/hdJUpk3PT8Yr/Teg+1c5faXLNzDjafHUNW34FYdUrbvGfSNKq3W9SotT5jPZtox7U45eU5HCNZ9e5ZcyRdE52S1RqneK0tG70s8X7KMyo5pbrk9vDn6Po4Od1X3uNwzF/lvlNq8z+LvmYxNtSHcquaz0jdW057O5ozu3LnNGJVel36W2SMZ28P55D2R8PevXF3VI5Dub+mY80Np7bKvdYavS7yuL8Fo9SW3Kn1nCJt57auyrj5KZ7D2z96b3xsP5Q7p9+X+PtzinrGfvUZe/3rwDnI59ac0t/PUBu2PE9jX3olbLNcepnTqfesbeX9Y2rrnK6DTmuO19Z61xxyyq1O4ZT+jZrcF98mH/sjZdPWnqxn5xqjPEu325aMklPKWKdSXzq2z0SntfenOeU/13yXmNv87f88YqH76d2ma86Yv6GNOK0xTC4vysPPeVrvT3O6K/E5HvahVE50OuSPEWWV5q+ZceEOr4rvEvfTPGtOKa3l5WN97Wc4v5Y7k7yfl5y29qtpdD6jc4Q71T7/Xjp8jJecTjX2c6sfKq/1bvtTTqu5N8fUzAXov0WB89ep5oC7Uu8enT5SMrZsuHYlpbeFU81YozyR4ySjY52iTSneOX4vus2pnHpWe1s45bQ+H9X4HM7F/7s++Fw1ti+NOI1YHZ6hpjQZNeu1T28jp5KpxnuvH5WszjXeS+ldzzV5NmHdrCljx3zPLe9TeV899X3sjqHz78r5Oc35gJ3ouN/idOr+M3IPPLtiWx1b3invdTgmnba31ZRWe97DUseMcbpEXZ1rvDq2zNa025xtUHvN1nLPdY9LvqfXnNo2inyW1bN86XTd8exFPvenfeYsV+13aMbMucdancp6Jl6vc/Y5Y8sj2dXm21N5Tafn5VQ7bmmn3KpnNLruVmO113t5i4kalOp6ijYY03+2OH3DjsVztn5HN50u6zRiaM73SI0Z7qzGKFpt6bvT6nbS0n9qkRzi3wnMMV9Nr+vPlO3tGdWs9naaVk8/LX2o9v0XzSntT04vhX17O02rp51oG16xaN/Vspxyo5LTqdcD0uv6UmO01qn2/ysYu3aVTrcZz+lFsY1KTiWzrWsCS9hMp+cRz6n3/WzP6thkH5qxrHrjPe0zt9d0mrGc1oRMt/rrZbV3vWfGG9U+K/U+QyV3V87+Nd9lSaPbzpxjamuyL82cg9Ml0rveM+k0na4vvb2k08ypWj2F90nvOs+crtO5y1Fzzt51njk9o0uWs3d9ZubJVAaXspNOt5kp+8kl7aTTbWVup0uWu3ddZubNlHO/Xk5712FmmZzjOHoOZczM0+bn5DSzvaTRzDkknWbOIWk0cw5Jp5lzSDrNnEPSaeZckk4zmUwmk8lkMplMJpM5/fwHyOh+Kg==
+   eJzt3Ulu3EYUBuBat2HAspML+BBSZMBbAdYygDc2ogPoEgZyhhygDxAvM4/IPOdKCYF+0NPfb6oi2dVNvsWPSGwOxaqvH4vstnJdSrnOZFaWWyHWa7XBffU+38zx5XbGvIQMy17tEtm+d9+sOZtdard7zrZt2Z6P/W1jBmuvWbTX0Sctf8XyWlm3tW38/PCcI+tm7vvkeS6Eb4Ov4fbeMfl4RMaYu+HLuTUr0jqSUbSqmbXcT+U63dpOJXuSW81oi1ct3JdlAteJOJV8al4jx5zTam8jc3qLWLGMoUX0eV7uO7X8Yj2Ojo9V07S6ia+1GuXxjqu1c9j2/cYszallzbPa6vS83DnleaGEO9X6ny+36qLnBWudtI5mkPvSrHpOcf+tTpdm1TN6U7ntzS6S13OWmyLbpG028LpmEpdFPESsRox+sAutj79bRmtrseVRW2dNRs/LfXOR/XCrmlNuMDJftYy2Oo3WN8uoFayxY+cMNU75/La3szms3rBo12fPueSUG8Vreq1TtMl/t5zRMahttVZrnVI0g9RPvF2W04hVnt625vJKNiWj5CV6r07740a5/5r7fsnpbYk7leYc3CkPP6ZmtcaoZpX6hvcr9c83RZ/71swBepuaw+gGxpKPJ/e5gWWW0Rthn+j/RojlFHMrBOundV6a0SEXu3CnksFnu3zHfras8hoqOZX6ouX639vVHEYlU9Ic06qBNK7S3MGL5dSyib9je2uOg/m87FvlDv+F/qM8MyLNdaLv2ZesPZpT/ntvW1Mb5f2szUmlWsqXXZT7TrmNH8o4q1LbuVOKNO41Tr8Vll1AuDla55mw31qnklFsI+/fyL1Ub19T+uROI0a1fqQ+9CxeGOtGaqmWh7vguGtGh2x3kfrjQjg3dIrhtXTY7p+yb1Ry6hnFGqA5XYNRPqbaNdEae88orYP9jftpcfqQRXrfSU63EDRKkfphiGZ1U/ZrrVVL+TF5+7COR5wuaW4q2YvUtdr5JuZHpb/5M4YWp5JRae4RdfpJiTmVrFp+ySk+iyKr6NFatnSnaM4ay4jnSNCl1IaaealmlJxa82TNKT+mVse42Zp7MQpd81udSuc27E+6n+rtbEqn1n2MZFTKOet/2sem7Bs9FaeWUbKi7VM7L+6UL7fuQzW3uHxtTrkzq05o3xNB78O6Z0ZfU97C2L1ly8Y6rXkvej4vi+4U50raPP+FcuyoUylrcMqD73XL5wb2o13v0ak0NtzlW0jEKjrV7tG896B2zb2ESP3H960dC6/53nsk4pT2uWSn2NfoTzKKyy0H5JRbtZxqqXHKxxYNfVFitUx6DZ3y3633abSWthglp8O6S3SqWUWLeF2XxhFrCY7DWfGtSnU0atRyGq2jWr4s+7WUXErLrOO9A/HeI96clJbTeA3H+bsszyla5Ta5Uet+lzvV5gtnZZzViNOviu30s91/fxbaN+QRC75GDt/dhfoFjVrXezQqeY04ldbjToesySnOo6z5pTWfRaM1TnGf1nloz04j9fSREDTKnV6WfauaU9qP5VSyatUFzSn14dKMela5P+8+yLqWSk61fWj3U61O0WqtU26VO5WsXgrHmsIp9hO+9mQX6kNKb1eHsKrVUs2YFdqPdy+FVrnRGqe8rfjMDZ2SS1pfcsqvLzgn1Z7J4XHQ5UXR56o1Tp9AcN3erqaO9jyUO90Uve8k69wof5bgzSGkOarXfs+pdI+ITvkyNCrdS/FrvuaV7+encmeU0uKU1kGjktXerqaM1Df0vMO718T+8JxKz1siVmuc0v6l+oZWpev9o2LXUJyTWs+k8Hmz9VxJsioZpWhO+fF62zqkUyvoFK2i0Uht1q79UafW8yE6L2wPt4qWPaeeUckf9rP13JqyLfvfQdDqKH9/9PY1pVPqQ/6z9VwKE3GKNr37spY5qvTZkDTPls4rcs8fqaU4B5DOD8/bsrpVgttrlnv7mttptKZaTsmcdd3TnH5c6pziewPvZTynw7Jap9znL+xctft+K5LTrRM0zpcv2SnWOukzqFqnWCs8o9xajVPp2BvhuNLna961t3ZeKtVzz2yLU2w3LV+aUcsq9Z1kKuo0OvdCo62fS/HjY1vwvYfPNqJt83xiPbc+7x/jVGo3vbZUpzimdI7W56aSUdqmdvw9p639LlnAOuqZ5D9b92hW6HiWVa+vtmXfqbbOUo3iuOLvNU5rXXpGa2qpdU7SfaHnVPqenueU70OaA2ufi0Xe11tnvW1Zh1NtjKNOcYyxfljzM80obTPmPLSxxWV4Ht780/oOlvb8ydrOc2oZXfpnprVOpXGVnNbMzbhT7do5xqr0/JaPu3ceWjRv2nPSTbnfL7jdddH7RzOKbeptprdT7B9tXezD2rncHE6952GR85DeY5rRjyDDsscs0nZWGz4taTTi1DOK31WiRK6bnl+sO63nUDt3qc012+dg8+kuZPUxxOpTWubdk6ZRfdyiRq3nM9a9ibZdi1Penu0uklXvnDVH0jHRKVmtcYrHWrPRixKvU55RySn1JbeHP0efj5PT88pzHLb5q9x3SmP+Z9GfWYwN1VBuVfMZ6XvLaW9Hc2ZT7pxGrEqvS/8WGePZO4d9SOujYe/cpL8fvC33n+lYc8OprXKvtUavi3zdX4PRIVRHIvcp0nJu66qMm5/iPrz1I07xb4xsy53T70v8/TlFP2Ndfcpe/zqwD/K5Nqf072doftZyP4219EpYZrn0MqdT717bynu71PY5HQed1myvPetdcsgptzqFU/pv1OR58W3ya3+kbdrfabXunWuM8hx63NZklJxSxjqVaunYmolOa89Pc8p/rvkuMbf52/95wELn03tMl5wx/4Y24rTGMLk8K/uf87Sen+Z0U+JzPKyh1E50OuSPEW2V5q+ZceEOr4rvEtfTPGtOKa3t5df62s9wfi13Jnmdl5y21tU0Op/ROcKdap9/Hzr8Gi85neraz61+qLzWe+yPOa3m3uxSMxegv0WB89ep5oCbUu8enT5QMrZt+OxKSm8Lx5qxRnki20lGxzpFm1K8ffxedJtTOfWs9rZwzGm9P6rxOeyL/10fvK8aW0sjTiNWh3uoKU1GzXrj09vIsWSq671XRyWrc13vpfTu55o8nbBvlpSx13zPLa+pvFZPfR6bXWj/m3J6TnM+YCd63W9xOnX9jJwDz6bYVse2d8pzHbZJp+1jNaXVnudwqG3GOD1EX51qvD62zNaM25xjUHvM1nbPdY6HfE8vObVjFPksq2f70umy49mLfO5P68zZrtrv0IyZc4+1OpX1TLxf56w5Y9sj2dXm21N5Taen5VTb7tBOuVXPaPS5W43VXu/lNSZqUOrrKcZgTP1scfqGbYv7bP2Objo9rNOIoTnfIzVmuLMao2i1pXan1fWkpX5qkRzi31KZY76aXpefKcfbM6pZ7e00rR5/Wmqo9v0XzSmtT04vhHV7O02rx53oGF6xaN/Vspxyo5LTqZ8HpNflpcZorVPt/1cw9tlVOl1nPKdnxTYqOZXMtj4TOITNdHoa8Zx638/2rI5N1tCMZdW73tM6c3tNpxnLaU3IdKu/XlZ793tmvFHts1LvM1Ryd+WsX/NdljS67sx5TW1N1tLMKTg9RHr3eyadptPlpbeXdJo5VqvH8D7p3eeZ43U6dztq9tm7zzPHZ/SQ7ezdn5l5MpXBQ9lJp+vMlHXykHbS6boyt9NDtrt3X2bmzZRzv15Oe/dh5jA5xevoKbQxM8+Yn5LTzPqSRjOnkHSaOYWk0cwpJJ1mTiHpNHMKSaeZU0k6zWQymUwmk8lkMplM5vjzH1GIggI=
   </data>
  </layer>
  <objectgroup name="addSpot#pops" width="170" height="100" visible="0">
diff --git a/utils/release.sh b/utils/release.sh
index 976cb6e41b6c2a193527b5f0ef83a0ecf26017f2..53bb772dafb9d440c36dba43a6364a3e6c9b61a6 100755
--- a/utils/release.sh
+++ b/utils/release.sh
@@ -36,7 +36,7 @@ rm -rf mac/base_app/
 rm -rf game/modules/angband
 rm -rf game/modules/rogue
 rm -rf game/modules/gruesome
-find . -name '*~' -or -name '.svn' | xargs rm -rf
+find . -name '*~' -or -name '.svn' -or -name '.keep' | xargs rm -rf
 
 # create teae/teams
 cd game/engines
@@ -46,8 +46,8 @@ te4_pack_engine.sh default/ te4-"$ever" 1
 mv boot*team ../modules
 rm -rf default
 cd ../modules
-te4_pack_module.sh tome "$tver"
-te4_pack_module.sh tome "$tver" 1
+te4_pack_module_tome.sh tome "$tver"
+#te4_pack_module.sh tome "$tver" 1
 \cp -f tome*.team /var/www/te4.org/htdocs/dl/modules/tome/
 rm -f tome*nomusic.team
 rm -f boot*nomusic.team
@@ -106,9 +106,10 @@ IFS=$'\n'; for i in `find game/ -name '*.ogg'`; do
 	echo "$i"|grep '/music/' -q
 	if test $? -eq 0; then rm "$i"; fi
 done
-rm game/modules/tome*team
+rm game/modules/tome*-music.team
+#rm game/modules/tome*team
 rm game/modules/boot*team
-cp /var/www/te4.org/htdocs/dl/modules/tome/tome-"$tver"-nomusic.team game/modules/
+#cp /var/www/te4.org/htdocs/dl/modules/tome/tome-"$tver"-nomusic.team game/modules/
 cp /var/www/te4.org/htdocs/dl/engines/boot-te4-"$ever"-nomusic.team game/modules/
 cd ..
 tar cvjf t-engine4-src-"$ver"-nomusic.tar.bz2 t-engine4-src-"$ver"
@@ -120,9 +121,10 @@ IFS=$'\n'; for i in `find game/ -name '*.ogg'`; do
 	echo "$i"|grep '/music/' -q
 	if test $? -eq 0; then rm "$i"; fi
 done
-rm game/modules/tome*team
+rm game/modules/tome*-music.team
+#rm game/modules/tome*team
 rm game/modules/boot*team
-cp /var/www/te4.org/htdocs/dl/modules/tome/tome-"$tver"-nomusic.team game/modules/
+#cp /var/www/te4.org/htdocs/dl/modules/tome/tome-"$tver"-nomusic.team game/modules/
 cp /var/www/te4.org/htdocs/dl/engines/boot-te4-"$ever"-nomusic.team game/modules/
 cd ..
 zip -r -9 t-engine4-windows-"$ver"-nomusic.zip t-engine4-windows-"$ver"
@@ -134,9 +136,10 @@ IFS=$'\n'; for i in `find game/ -name '*.ogg'`; do
 	echo "$i"|grep '/music/' -q
 	if test $? -eq 0; then rm "$i"; fi
 done
-rm game/modules/tome*team
+rm game/modules/tome*-music.team
+#rm game/modules/tome*team
 rm game/modules/boot*team
-cp /var/www/te4.org/htdocs/dl/modules/tome/tome-"$tver"-nomusic.team game/modules/
+#cp /var/www/te4.org/htdocs/dl/modules/tome/tome-"$tver"-nomusic.team game/modules/
 cp /var/www/te4.org/htdocs/dl/engines/boot-te4-"$ever"-nomusic.team game/modules/
 cd ..
 tar -cvjf t-engine4-linux32-"$ver"-nomusic.tar.bz2 t-engine4-linux32-"$ver"
@@ -148,9 +151,10 @@ IFS=$'\n'; for i in `find game/ -name '*.ogg'`; do
 	echo "$i"|grep '/music/' -q
 	if test $? -eq 0; then rm "$i"; fi
 done
-rm game/modules/tome*team
+rm game/modules/tome*-music.team
+#rm game/modules/tome*team
 rm game/modules/boot*team
-cp /var/www/te4.org/htdocs/dl/modules/tome/tome-"$tver"-nomusic.team game/modules/
+#cp /var/www/te4.org/htdocs/dl/modules/tome/tome-"$tver"-nomusic.team game/modules/
 cp /var/www/te4.org/htdocs/dl/engines/boot-te4-"$ever"-nomusic.team game/modules/
 cd ..
 tar -cvjf t-engine4-linux64-"$ver"-nomusic.tar.bz2 t-engine4-linux64-"$ver"
diff --git a/utils/te4_generate_patch.sh b/utils/te4_generate_patch.sh
index 723b7e94c7656260c72bb47eea677b70bf6995d3..6db79e3caab12546a16d21ead875de11036bd0e9 100644
--- a/utils/te4_generate_patch.sh
+++ b/utils/te4_generate_patch.sh
@@ -20,8 +20,8 @@ fi
 $unpack /var/www/te4.org/htdocs/dl/t-engine/t-engine4-$os-$old$ext
 $unpack /var/www/te4.org/htdocs/dl/t-engine/t-engine4-$os-$new$ext
 
-oldv=`ls t-engine4-$os-$old/game/modules/tome-*.team | head -n1 | sed -e 's/^.*tome-//' -e 's/\.team$//'`
-newv=`ls t-engine4-$os-$new/game/modules/tome-*.team | head -n1 | sed -e 's/^.*tome-//' -e 's/\.team$//'`
+oldv=`ls t-engine4-$os-$old/game/modules/tome-*[0-9].team | head -n1 | sed -e 's/^.*tome-//' -e 's/\.team$//'`
+newv=`ls t-engine4-$os-$new/game/modules/tome-*[0-9].team | head -n1 | sed -e 's/^.*tome-//' -e 's/\.team$//'`
 
 cd "t-engine4-$os-$new"
 sh ../../utils/te4_patch.sh $oldv $newv ../t-engine4-$os-$old ../patch $os
@@ -29,4 +29,4 @@ pmd5=`md5sum ../$os-patch-$oldv-to-$newv.zip | cut -d' ' -f1`
 cp "../$os-patch-$oldv-to-$newv.zip" /var/www/te4.org/htdocs/dl/t-engine/patch/
 
 echo "SQL:"
-echo "REPLACE INTO patch_chain SET os='$os', vfrom='$oldv', vto='$newv', file='$os-patch-$oldv-to-$newv.zip', md5='$pmd5';"
\ No newline at end of file
+echo "REPLACE INTO patch_chain SET os='$os', vfrom='$oldv', vto='$newv', file='$os-patch-$oldv-to-$newv.zip', md5='$pmd5', shown='false';"
diff --git a/utils/te4_patch.sh b/utils/te4_patch.sh
index e2f3eca05c1e2849accdbb1d432142fbd44ca9d5..fa2c27b098c472195e87cf5bea8d5958a9178094 100644
--- a/utils/te4_patch.sh
+++ b/utils/te4_patch.sh
@@ -26,6 +26,12 @@ for file in `find . -type f`; do
 		continue
 	fi
 
+	ignorable='false'
+	echo "$file" | grep -q "\-music\.team$"
+	if test $? -eq 0; then ignorable='true'; fi
+	echo "$file" | grep -q "\.teaa$"
+	if test $? -eq 0; then ignorable='true'; fi
+
 	if test -f "$oldd/$file"; then
 		cmp -s "$oldd/$file" "$file"
 		if test $? -ne 0; then
@@ -42,7 +48,7 @@ for file in `find . -type f`; do
 				p=`dirname $file`/`basename $file`.patch
 				mkdir -p "$patch"/`dirname $file`
 				bsdiff "$oldd/$file" "$file" "$patch"/$p
-				echo "change('$file', '$p')" >> $pl
+				echo "change('$file', '$p', $ignorable)" >> $pl
 				echo -n "$file:" >> $fm
 				md5sum "$file" | cut -d' ' -f1 >> $fm
 			fi
@@ -54,7 +60,7 @@ for file in `find . -type f`; do
 			mkdir -p "$patch"/`dirname $file`
 			p=`dirname $file`/`basename $rfile`-to-`basename $file`.patch
 			bsdiff "$oldd/$rfile" "$file" "$patch"/$p
-			echo "update('$rfile', '$file', '$p')" >> $pl
+			echo "update('$rfile', '$file', '$p', $ignorable)" >> $pl
 			echo -n "$file:" >> $fm
 			md5sum "$file" | cut -d' ' -f1 >> $fm
 		else