Merge branch 'master' into cef_full

@@ -11,4 +11,14 @@ out.avi
 out.ogv
 te4_log_web.txt
 t-engine
-tengine_doc
\ No newline at end of file
+tengine_doc
+game/modules/pits/
+game/modules/uaws/
+game/modules/bare_minimum/
+game/modules/bone/
+game/modules/demo/
+game/modules/particles_editor/
+steam_appid.txt
+oprofile_data/
+game/modules/tome/data/gfx/ts-gfx*
+game/engines/default/modules/boot/data/gfx/ts-gfx*

@@ -29,12 +29,19 @@ if __SELFEXE then
 	print("SelfExe gave us app directory of:", dir)
 	fs.mount(dir..fs.getPathSeparator().."game"..fs.getPathSeparator().."thirdparty", "/", true)
 	fs.mount(dir..fs.getPathSeparator().."game", "/", true)
+	fs.setPathAllowed(dir..fs.getPathSeparator().."game", false)
 else
 	print("No SelfExe, using basic path")
 	fs.mount("game"..fs.getPathSeparator().."thirdparty", "/", true)
 	fs.mount("game", "/", true)
 end
 
+fs.setPathAllowed(fs.getRealPath("/engines/"), false)
+fs.setPathAllowed(fs.getRealPath("/thirdparty/"), false)
+fs.setPathAllowed(fs.getRealPath("/addons/"), true)
+if fs.getRealPath("/dlcs/") then fs.setPathAllowed(fs.getRealPath("/dlcs/"), true) end
+fs.setPathAllowed(fs.getRealPath("/modules/"), true)
+
 -- Look for a core
 function get_core(coretype, id)
 	coretype = coretype or "te4core"

@@ -66,6 +66,16 @@ newoption {
 }
 
 newoption {
+	trigger	    = "discord",
+	description = "Discord integration"
+}
+
+newoption {
+	trigger	    = "discord-nolib",
+	description = "Dont build discord lib"
+}
+
+newoption {
 	trigger	    = "web-awesomium",
 	description = "Use awesomium embedded browser as the webcore"
 }

@@ -38,6 +38,7 @@ project "TEngine"
 		files { "../steamworks/luasteam.c", }
 	end
 	links { "physfs", "lua".._OPTIONS.lua, "fov", "luasocket", "luaprofiler", "lpeg", "tcodimport", "lxp", "expatstatic", "luamd5", "luazlib", "luabitop", "te4-bzip" }
+	if _OPTIONS.discord then defines { "DISCORD_TE4" } end
 	defines { "_DEFAULT_VIDEOMODE_FLAGS_='SDL_HWSURFACE|SDL_DOUBLEBUF'" }
 	defines { [[TENGINE_HOME_PATH='".t-engine"']], "TE4CORE_VERSION="..TE4CORE_VERSION }
 	buildoptions { "-O3" }
@@ -597,3 +598,27 @@ end
 if _OPTIONS.steam then
 	dofile("../steamworks/build/steam-code.lua")
 end
+
+if _OPTIONS.discord and not _OPTIONS['discord-nolib'] then
+project "te4-discord"
+	configuration "linux"
+		kind "SharedLib"
+		language "C++"
+		targetname "discord-rpc"
+		buildoptions { "-std=gnu++11" }
+
+		includedirs { "../src/discord-rpc/include/", "../src/discord-rpc/rapidjson/", }
+
+		defines { "DISCORD_DYNAMIC_LIB" }
+
+		files { "../src/discord-rpc/src/discord-rpc.cpp", "../src/discord-rpc/src/rpc_connection.cpp", "../src/discord-rpc/src/serialization.cpp", }
+		files { "../src/discord-rpc/src/connection_unix.cpp", "../src/discord-rpc/src/discord_register_linux.cpp", }
+
+	configuration "windows"
+		kind "SharedLib"
+		-- Empty
+
+	configuration "macosx"
+		kind "SharedLib"
+		-- Empty
+end

 -- ToME - Tales of Maj'Eyal
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- ToME - Tales of Maj'Eyal
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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
@@ -73,7 +73,7 @@ end
 -- modules should update this as needed
 _M.clone_nodes = {player=false, x=false, y=false,
 	fov_computed=false,	fov={v={actors={}, actors_dist={}}}, distance_map={v={}},
-	_mo=false, _last_mo=false, add_mos=false, add_displays=false,
+	_mo=false, _last_mo=false, add_displays=false,
 	shader=false, shader_args=false,
 }
 --- cloneActor default fields (merged by _M.cloneActor with cloneCustom)
@@ -90,7 +90,15 @@ _M.clone_copy = nil
 function _M:cloneActor(post_copy, alt_nodes)
 	alt_nodes = table.merge(alt_nodes or {}, self.clone_nodes, true)
 	if post_copy or self.clone_copy then post_copy = post_copy or {} table.update(post_copy, self.clone_copy or {}, true) end
-	local a = self:cloneCustom(alt_nodes, post_copy)
+	-- Clone all except sub-actors which need to simply reference the same ones
+	local a = self:cloneCustom(alt_nodes, function(d) return not d:isClassName("mod.class.Actor") end, post_copy)
+	-- Handle add_displays as a special case
+	if self.add_displays then
+		a.add_displays = {}
+		for i, d in ipairs(self.add_displays) do
+			table.insert(a.add_displays, d:cloneFull())
+		end
+	end
 	a:removeAllMOs()
 	return a, post_copy
 end

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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
@@ -43,13 +43,17 @@ function _M:init(name, npc, player, data)
 
 	local f, err = loadfile(self:getChatFile(name))
 	if not f and err then error(err) end
-	setfenv(f, setmetatable({
+	local env = setmetatable({
+		cur_chat = self,
 		setDialogWidth = function(w) self.force_dialog_width = w end,
 		newChat = function(c) self:addChat(c) end,
-	}, {__index=data}))
+		setTextFont = function(font, size) self.dialog_text_font = {font, size} end,
+		setAnswerFont = function(font, size) self.dialog_answer_font = {font, size} end,
+	}, {__index=data})
+	setfenv(f, env)
 	self.default_id = f()
 
-	self:triggerHook{"Chat:load", data=data}
+	self:triggerHook{"Chat:load", data=data, env=env}
 end
 
 --- Get chat file
@@ -100,7 +104,10 @@ function _M:invoke(id)
 	if self.npc.onChat then self.npc:onChat() end
 	if self.player.onChat then self.player:onChat() end
 
-	local d = engine.dialogs.Chat.new(self, id or self.default_id, self.force_dialog_width or 500)
+	local hd = {"Chat:invoke", id = id or self.default_id }
+	self:triggerHook(hd)
+
+	local d = engine.dialogs.Chat.new(self, hd.id, self.force_dialog_width or 500)
 	game:registerDialog(d)
 	return d
 end

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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
@@ -32,17 +32,18 @@ frame_oy2 = 15
 --- @string text
 -- @int[opt=60] dur
 -- @param[opt=colors.Black] color
-function _M:init(text, dur, color)
+function _M:init(text, dur, color, font)
 	self.text = text
 	self.dur = dur or 60
 	self.color = color or colors.BLACK
+	self.use_font = font
 
-	Base.init(self, {font = {"/data/font/DroidSans-Bold.ttf", 16}})
+	Base.init(self, {font = self.use_font or {"/data/font/DroidSans-Bold.ttf", 16}})
 end
 
 --- on loaded
 function _M:loaded()
-	Base.init(self, {font = {"/data/font/DroidSans-Bold.ttf", 16}})
+	Base.init(self, {font = self.use_font or {"/data/font/DroidSans-Bold.ttf", 16}})
 end
 
 --- Serialization

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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
@@ -1206,6 +1206,10 @@ function _M:loadList(file, no_default, res, mod, loaded)
 		load = function(f, new_mod)
 			self:loadList(f, no_default, res, new_mod or mod, loaded)
 		end,
+		loadIfNot = function(f, new_mod)
+			if loaded[f] then return end
+			self:loadList(f, no_default, res, new_mod or mod, loaded)
+		end,
 		loadList = function(f, new_mod, list, loaded)
 			return self:loadList(f, no_default, list, new_mod or mod, loaded)
 		end,

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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
@@ -475,7 +475,7 @@ function _M:addonMD5(add, base)
 	print("[MODULE LOADER] addon ", add.short_name, " MD5", fmd5, "computed in ", core.game.getTime() - t, vbase)
 
 	if __module_extra_info.compute_md5_only then
-		local f = io.open(__module_extra_info.compute_md5_only, "a")
+		local f = fs.open(__module_extra_info.compute_md5_only, "a")
 		f:write(("%s : addon[%s] md5\n"):format(fmd5, add.version_name))
 		f:close()
 	end
@@ -982,7 +982,7 @@ function _M:instanciate(mod, name, new_game, no_reboot, extra_module_info)
 			print("[MODULE LOADER] module MD5", module_md5, "computed in ", core.game.getTime() - t)
 
 			if __module_extra_info.compute_md5_only then
-				local f = io.open(__module_extra_info.compute_md5_only, "w")
+				local f = fs.open(__module_extra_info.compute_md5_only, "w")
 				f:write(("%s : module[%s] md5\n"):format(module_md5, mod.version_string))
 				f:close()
 			end
@@ -1019,6 +1019,7 @@ function _M:instanciate(mod, name, new_game, no_reboot, extra_module_info)
 	profile:incrLoadProfile(mod)
 	profile:currentCharacter(mod.full_version_string, "game did not tell us")
 
+
 	UIBase:clearCache()
 
 	-- Some requires cleanup, to correctly let modules apply settings	

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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
@@ -205,6 +205,9 @@ function _M:getSubtypeOrder()
 	return self.subtype or ""
 end
 
+--- Describe requirements flags naming
+_M.requirement_flags_names = {}
+
 --- Describe requirements
 function _M:getRequirementDesc(who)
 	local req = rawget(self, "require")
@@ -212,6 +215,19 @@ function _M:getRequirementDesc(who)
 
 	local str = tstring{"Requires:", true}
 
+	if req.flag then
+		for _, flag in ipairs(req.flag) do
+			if type(flag) == "table" then
+				local name = self.requirement_flags_names[flag[1]] or flag[1]
+				local c = (who:attr(flag[1]) and who:attr(flag[1]) >= flag[2]) and {"color", 0x00,0xff,0x00} or {"color", 0xff,0x00,0x00}
+				str:add(c, "- ", ("%s (level %d)"):format(name, flag[2]), {"color", "LAST"}, true)
+			else
+				local name = self.requirement_flags_names[flag] or flag
+				local c = who:attr(flag) and {"color", 0x00,0xff,0x00} or {"color", 0xff,0x00,0x00}
+				str:add(c, "- ", ("%s"):format(name), {"color", "LAST"}, true)
+			end
+		end
+	end
 	if req.stat then
 		for s, v in pairs(req.stat) do
 			local c = (who:getStat(s) >= v) and {"color", 0x00,0xff,0x00} or {"color", 0xff,0x00,0x00}

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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
@@ -23,6 +23,7 @@ local url = require "socket.url"
 local ltn12 = require "ltn12"
 local Dialog = require "engine.ui.Dialog"
 local UserChat = require "engine.UserChat"
+local sha1 = require("sha1").sha1
 require "Json2"
 
 --- Handles the player profile, possibly online
@@ -98,6 +99,12 @@ function _M:start()
 	self:loadGenericProfile()
 
 	if self.generic.online and self.generic.online.login and self.generic.online.pass then
+		-- Convert to encrypted pass
+		if not self.generic.online.v2 then
+			self.generic.online.pass = sha1(self.generic.online.pass)
+			self:saveGenericProfile("online", {login=self.generic.online.login, pass=self.generic.online.pass, v2=true})
+		end
+
 		self.login = self.generic.online.login
 		self.pass = self.generic.online.pass
 		self:tryAuth()
@@ -130,7 +137,7 @@ function _M:mountProfile(online, module)
 	fs.mkdir(string.format("/profiles/%s/generic/", online and "online" or "offline"))
 	if module then fs.mkdir(string.format("/profiles/%s/modules/%s", online and "online" or "offline", module)) end
 
-	local path = engine.homepath.."/profiles/"..(online and "online" or "offline")
+	local path = engine.homepath..fs.getPathSeparator().."profiles"..fs.getPathSeparator()..(online and "online" or "offline")
 	fs.mount(path, "/current-profile")
 	print("[PROFILE] mounted ", online and "online" or "offline", "on /current-profile")
 	fs.setWritePath(path)
@@ -138,7 +145,7 @@ function _M:mountProfile(online, module)
 	return restore
 end
 function _M:umountProfile(online, pop)
-	local path = engine.homepath.."/profiles/"..(online and "online" or "offline")
+	local path = engine.homepath..fs.getPathSeparator().."profiles"..fs.getPathSeparator()..(online and "online" or "offline")
 	fs.umount(path)
 	print("[PROFILE] unmounted ", online and "online" or "offline", "from /current-profile")
 
@@ -147,9 +154,9 @@ end
 
 -- Define the fields that are sync'ed online, and how they are sync'ed
 local generic_profile_defs = {
-	firstrun = {nosync=true, {firstrun="number"}, receive=function(data, save) save.firstrun = data.firstrun end },
-	online = {nosync=true, {login="string:40", pass="string:40"}, receive=function(data, save) save.login = data.login save.pass = data.pass end },
-	onlinesteam = {nosync=true, {autolog="boolean"}, receive=function(data, save) save.autolog = data.autolog end },
+	firstrun = {nosync=true, no_sync=true, {firstrun="number"}, receive=function(data, save) save.firstrun = data.firstrun end },
+	online = {nosync=true, no_sync=true, {login="string:40", pass="string:40", v2="number"}, receive=function(data, save) save.login = data.login save.pass = data.pass save.v2 = data.v2 end },
+	onlinesteam = {nosync=true, no_sync=true, {autolog="boolean"}, receive=function(data, save) save.autolog = data.autolog end },
 	modules_played = { {name="index:string:30"}, {time_played="number"}, receive=function(data, save) max_set(save, data.name, data, "time_played") end, export=function(env) for k, v in pairs(env) do add{name=k, time_played=v} end end },
 	modules_loaded = { {name="index:string:30"}, {nb="number"}, receive=function(data, save) max_set(save, data.name, data, "nb") end, export=function(env) for k, v in pairs(env) do add{name=k, nb=v} end end },
 }
@@ -425,14 +432,16 @@ function _M:checkFirstRun()
 end
 
 function _M:performlogin(login, pass)
+	pass = sha1(pass)
+
 	self.login=login
 	self.pass=pass
 	print("[ONLINE PROFILE] attempting log in ", self.login)
 	self.auth_tried = nil
 	self:tryAuth()
 	self:waitFirstAuth()
-	if (profile.auth) then
-		self:saveGenericProfile("online", {login=login, pass=pass})
+	if profile.auth then
+		self:saveGenericProfile("online", {login=login, pass=pass, v2=true})
 		self:getConfigs("generic")
 		self:syncOnline("generic")
 	end
@@ -477,6 +486,9 @@ function _M:popEvent(specific)
 end
 
 function _M:waitEvent(name, cb, wait_max)
+	-- Dont try as it would fail and we'd fait for nothing
+	if config.settings.disable_all_connectivity then return end
+
 	-- Wait anwser, this blocks thegame but cant really be avoided :/
 	local stop = false
 	local first = true
@@ -509,6 +521,9 @@ function _M:noMoreAuthWait()
 end
 
 function _M:waitFirstAuth(timeout)
+	-- Dont try as it would fail and we'd fait for nothing
+	if config.settings.disable_all_connectivity then return end
+
 	if self.no_more_wait_auth then return end
 	if self.auth_tried and self.auth_tried >= 1 then return end
 	if not self.waiting_auth then return end
@@ -564,7 +579,7 @@ function _M:eventGetNews(e)
 end
 
 function _M:eventIncrLogConsume(e)
-	local module = game.__mod_info.short_name
+	local module = type(game) == "table" and game.__mod_info.short_name
 	if not module then return end
 	print("[PROFILE] Server accepted our incr log, deleting")
 	local pop = self:mountProfile(true, module)
@@ -592,6 +607,13 @@ function _M:eventGetConfigs(e)
 end
 
 function _M:eventPushCode(e)
+	if not config.settings.allow_online_events then
+		if e.return_uuid then
+			core.profile.pushOrder(string.format("o='CodeReturn' uuid=%q data=%q", e.return_uuid, table.serialize{error='user disabled events, refusing to load code'}))
+		end
+		return
+	end
+
 	local f, err = loadstring(e.code)
 	if not f then
 		if e.return_uuid then
@@ -649,6 +671,9 @@ function _M:getNews(callback, steam)
 end
 
 function _M:tryAuth()
+	-- Dont try as it would fail and we'd fait for nothing
+	if config.settings.disable_all_connectivity then return end
+
 	print("[ONLINE PROFILE] auth")
 	self.auth_last_error = nil
 	if self.steam_token then
@@ -1019,7 +1044,8 @@ function _M:isDonator(s)
 end
 
 function _M:allowDLC(dlc)
-	if core.steam then if core.steam.checkDLC(dlc[2]) then return true end end
-	if self.auth and self.auth.dlcs and self.auth.dlcs[dlc[1]] then return true end
-	return false
+	-- if core.steam then if core.steam.checkDLC(dlc[2]) then return true end end
+	-- if self.auth and self.auth.dlcs and self.auth.dlcs[dlc[1]] then return true end
+	-- return false
+	return true
 end

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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
@@ -74,6 +74,13 @@ function _M:isEnded()
 	if self.status == DONE or self.status == FAILED then return true else return false end
 end
 
+--- Checks if the quest is ended in success
+-- @return[1] false if quest didn't end
+-- @return[2] true if quest ended
+function _M:isSuccess()
+	if self.status == DONE then return true else return false end
+end
+
 --- Check for an quest property
 -- If not a function it returns it directly, otherwise it calls the function
 -- with the extra parameters

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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
@@ -163,15 +163,22 @@ function _M:unregisterTalkEvents(fct)
 	self.on_event[fct] = nil
 end
 
+function _M:getUserColor(e)
+	local name = e.name
+	local color = colors.WHITE
+	if e.status == 'dev' then color = colors.CRIMSON name = "{dev} "..name
+	elseif e.status == 'mod' then color = colors.GOLD name = "[mod] "..name
+	elseif e.donator == "oneshot" then color = colors.LIGHT_GREEN
+	elseif e.donator == "recurring" then color = colors.ROYAL_BLUE end
+	e.color_name = color
+	return color, name
+end
+
 function _M:event(e)
 	if not profile.auth then return end
 	if e.se == "Talk" then
 		e.msg = e.msg:removeColorCodes():gsub("#", "##")
-		local color = colors.WHITE
-		if e.status == 'dev' then color = colors.CRIMSON
-		elseif e.status == 'mod' then color = colors.GOLD
-		elseif e.donator == "oneshot" then color = colors.LIGHT_GREEN
-		elseif e.donator == "recurring" then color = colors.ROYAL_BLUE end
+		local color, uname = self:getUserColor(e)
 
 		self.channels[e.channel] = self.channels[e.channel] or {users={}, log={}}
 		if profile and profile.auth and profile.auth.name then
@@ -180,21 +187,17 @@ function _M:event(e)
 				e.msg = e.msg:sub(1, ni - 1).."#YELLOW##{underline}#"..profile.auth.name.."#{normal}##LAST#"..e.msg:sub(nj + 1)
 			end
 		end
-		self:addMessage("talk", e.channel, e.login, {e.name, color}, e.msg)
+		self:addMessage("talk", e.channel, e.login, {uname, color}, e.msg)
 
 		if type(game) == "table" and game.logChat and self.cur_channel == e.channel then
 			game.logChat("#YELLOW#<%s> %s", e.name, e.msg)
 		end
 	elseif e.se == "Whisper" then
 		e.msg = e.msg:removeColorCodes()
-		local color = colors.WHITE
-		if e.status == 'dev' then color = colors.CRIMSON
-		elseif e.status == 'mod' then color = colors.GOLD
-		elseif e.donator == "oneshot" then color = colors.LIGHT_GREEN
-		elseif e.donator == "recurring" then color = colors.ROYAL_BLUE end
+		local color, uname = self:getUserColor(e)
 
 		self.channels[self.cur_channel] = self.channels[self.cur_channel] or {users={}, log={}}
-		self:addMessage("whisper", self.cur_channel, e.login, e.name, e.msg)
+		self:addMessage("whisper", self.cur_channel, e.login, uname, e.msg)
 
 		if type(game) == "table" and game.logChat then
 			game.logChat("#GOLD#<Whisper from %s> %s", e.name, e.msg)
@@ -202,11 +205,7 @@ function _M:event(e)
 		e.channel = self.cur_channel
 	elseif e.se == "Achievement" then
 		e.msg = e.msg:removeColorCodes()
-		local color = colors.WHITE
-		if e.status == 'dev' then color = colors.CRIMSON
-		elseif e.status == 'mod' then color = colors.GOLD
-		elseif e.donator == "oneshot" then color = colors.LIGHT_GREEN
-		elseif e.donator == "recurring" then color = colors.ROYAL_BLUE end
+		local color, uname = self:getUserColor(e)
 
 		local kind = "achievement_other"
 		if e.first then kind = "achievement_first"
@@ -220,18 +219,13 @@ function _M:event(e)
 		if e.first then first = " for the #FIREBRICK#first time!" end
 
 		self.channels[e.channel] = self.channels[e.channel] or {users={}, log={}}
-		self:addMessage(kind, e.channel, e.login, {e.name, color}, "#{italic}##"..acolor.."#has earned the achievement <"..e.msg..">"..first.."#{normal}#", nil, true)
+		self:addMessage(kind, e.channel, e.login, {uname, color}, "#{italic}##"..acolor.."#has earned the achievement <"..e.msg..">"..first.."#{normal}#", nil, true)
 
 		if type(game) == "table" and game.logChat and self.cur_channel == e.channel then
 			game.logChat("#"..acolor.."#%s has earned the achievement <%s>%s", e.name, e.msg, first)
 		end
 	elseif e.se == "SerialData" then
-		local color = colors.WHITE
-		if e.status == 'dev' then color = colors.CRIMSON
-		elseif e.status == 'mod' then color = colors.GOLD
-		elseif e.donator == "oneshot" then color = colors.LIGHT_GREEN
-		elseif e.donator == "recurring" then color = colors.ROYAL_BLUE end
-		e.color_name = color
+		local color, uname = self:getUserColor(e)
 
 		local data = zlib.decompress(e.msg)
 		if not data then return end
@@ -259,8 +253,6 @@ 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
 		self:addMessage("join", e.channel, profile.auth.login, e.channel, "#{italic}#Joined channel#{normal}#", nil, true)
@@ -272,58 +264,42 @@ Again, thank you, and enjoy Eyal!
 		self:updateChanList()
 		self:saveChannels()
 	elseif e.se == "Join" then
-		local color = colors.WHITE
-		if e.status == 'dev' then color = colors.CRIMSON
-		elseif e.status == 'mod' then color = colors.GOLD
-		elseif e.donator == "oneshot" then color = colors.LIGHT_GREEN
-		elseif e.donator == "recurring" then color = colors.ROYAL_BLUE end
+		local color, uname = self:getUserColor(e)
 
 		self.channels[e.channel] = self.channels[e.channel] or {users={}, log={}}
 		self.channels[e.channel].users[e.login] = {name=e.name, donator=e.donator, status=e.status, login=e.login}
 		self.channels_changed = true
-		self:addMessage("join", e.channel, e.login, {e.name, color}, "#{italic}##FIREBRICK#has joined the channel#{normal}#", nil, true)
+		self:addMessage("join", e.channel, e.login, {uname, color}, "#{italic}##FIREBRICK#has joined the channel#{normal}#", nil, true)
 		if type(game) == "table" and game.logChat and e.channel == self.cur_channel then
 			game.logChat("#{italic}##FIREBRICK#%s has joined channel %s (press space to talk).#{normal}#", e.login, e.channel)
 		end
 		self:updateChanList()
 	elseif e.se == "Part" then
-		local color = colors.WHITE
-		if e.status == 'dev' then color = colors.CRIMSON
-		elseif e.status == 'mod' then color = colors.GOLD
-		elseif e.donator == "oneshot" then color = colors.LIGHT_GREEN
-		elseif e.donator == "recurring" then color = colors.ROYAL_BLUE end
+		local color, uname = self:getUserColor(e)
 
 		self.channels[e.channel] = self.channels[e.channel] or {users={}, log={}}
 		self.channels[e.channel].users[e.login] = nil
 		self.channels_changed = true
-		self:addMessage("join", e.channel, e.login, {e.name, color}, "#{italic}##FIREBRICK#has left the channel#{normal}#", nil, true)
+		self:addMessage("join", e.channel, e.login, {uname, color}, "#{italic}##FIREBRICK#has left the channel#{normal}#", nil, true)
 		if type(game) == "table" and game.logChat and e.channel == self.cur_channel then
 			game.logChat("#{italic}##FIREBRICK#%s has left channel %s.#{normal}#", e.login, e.channel)
 		end
 		self:updateChanList()
 	elseif e.se == "FriendJoin" then
-		local color = colors.WHITE
-		if e.status == 'dev' then color = colors.CRIMSON
-		elseif e.status == 'mod' then color = colors.GOLD
-		elseif e.donator == "oneshot" then color = colors.LIGHT_GREEN
-		elseif e.donator == "recurring" then color = colors.ROYAL_BLUE end
+		local color, uname = self:getUserColor(e)
 
 		self.friends[e.login] = {name=e.name, donator=e.donator, status=e.status, login=e.login}
 		if not e.silent then
-			self:addMessage("friendjoin", self.cur_channel, e.login, {e.name, color}, "#{italic}##YELLOW_GREEN#has logged in#{normal}#", nil, true)
+			self:addMessage("friendjoin", self.cur_channel, e.login, {uname, color}, "#{italic}##YELLOW_GREEN#has logged in#{normal}#", nil, true)
 			if type(game) == "table" and game.logChat then
 				game.logChat("#{italic}##YELLOW_GREEN#%s has logged in (press space to talk).#{normal}#", e.login, e.channel)
 			end
 		end
 	elseif e.se == "FriendPart" then
-		local color = colors.WHITE
-		if e.status == 'dev' then color = colors.CRIMSON
-		elseif e.status == 'mod' then color = colors.GOLD
-		elseif e.donator == "oneshot" then color = colors.LIGHT_GREEN
-		elseif e.donator == "recurring" then color = colors.ROYAL_BLUE end
+		local color, uname = self:getUserColor(e)
 
 		self.friends[e.login] = nil
-		self:addMessage("friendpart", self.cur_channel, e.login, {e.name, color}, "#{italic}##CRIMSON#has logged off#{normal}#", nil, true)
+		self:addMessage("friendpart", self.cur_channel, e.login, {uname, color}, "#{italic}##CRIMSON#has logged off#{normal}#", nil, true)
 		if type(game) == "table" and game.logChat then
 			game.logChat("#{italic}##CRIMSON#%s has logged off.#{normal}#", e.login, e.channel)
 		end
@@ -351,6 +327,10 @@ Again, thank you, and enjoy Eyal!
 		self.channels_changed = true
 	end
 
+	if self.uc_ext then
+		self.uc_ext:event(e)
+	end
+
 	for fct, _ in pairs(self.on_event) do
 		fct(e)
 	end

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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
@@ -769,7 +769,8 @@ function _M:addEntity(level, e, typ, x, y, no_added)
 		if x and y then level.map(x, y, Map.TRIGGER, e) end
 	end
 	e:check("addedToLevel", level, x, y)
-	e:check("on_added", level, x, y)
+	e:check("on_added", level, x, y)  -- Sustains are activated here
+	e:check("on_added_final", level, x, y)
 end
 
 --- If we are loaded we need a new uid
@@ -811,6 +812,7 @@ function _M:load(dynamic)
 		data = dynamic
 		ret = false
 		for k, e in pairs(data) do self[k] = e end
+		self:onLoadZoneFile(false)
 		self:triggerHook{"Zone:create", dynamic=dynamic}
 		if self.on_loaded then self:on_loaded() end
 	else

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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
@@ -250,7 +250,7 @@ end)
 -- this requires the ActorFOV interface, or an interface that provides self.fov.actors*
 newAI("target_simple", function(self)
 	-- keep same (hostile) target 90% of the time
-	if self.ai_target.actor and not self.ai_target.actor.dead and self:reactionToward(act) < 0 and rng.percent(90) then return true end
+	if self.ai_target.actor and not self.ai_target.actor.dead and self:reactionToward(self.ai_target.actor) < 0 and rng.percent(90) then return true end
 
 	-- Find closer enemy and target it
 	-- Get list of actors ordered by distance

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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
@@ -278,11 +278,14 @@ function _M:cloneFull(post_copy)
 end
 
 --- Automatically called by cloneCustom()
-local function cloneCustomRecurs(clonetable, d, noclonecall, use_saveinstead, alt_nodes)
+local function cloneCustomRecurs(clonetable, d, noclonecall, use_saveinstead, alt_nodes, type_checker, first)
 	if use_saveinstead and (d.__ATOMIC or d.__CLASSNAME) and d.__SAVEINSTEAD then
 		d = d.__SAVEINSTEAD
 		if clonetable[d] then return d, 1 end
 	end
+	if not first and type_checker and d.__CLASSNAME then
+		if not type_checker(d) then return d, 1 end
+	end
 
 	local nb = 0
 	local add
@@ -313,11 +316,11 @@ local function cloneCustomRecurs(clonetable, d, noclonecall, use_saveinstead, al
 			if ne_alt ~= nil then ne = ne_alt else ne = e end
 			
 			if clonetable[nk] then nk = clonetable[nk]
-			elseif type(nk) == "table" then nk, add = cloneCustomRecurs(clonetable, nk, noclonecall, use_saveinstead, alt_nodes) nb = nb + add
+			elseif type(nk) == "table" then nk, add = cloneCustomRecurs(clonetable, nk, noclonecall, use_saveinstead, alt_nodes, type_checker, false) nb = nb + add
 			end
 
 			if clonetable[ne] then ne = clonetable[ne]
-			elseif type(ne) == "table" and (type(nk) ~= "string" or nk ~= "__threads") then ne, add = cloneCustomRecurs(clonetable, ne, noclonecall, use_saveinstead, alt_nodes) nb = nb + add
+			elseif type(ne) == "table" and (type(nk) ~= "string" or nk ~= "__threads") then ne, add = cloneCustomRecurs(clonetable, ne, noclonecall, use_saveinstead, alt_nodes, type_checker, false) nb = nb + add
 			end
 			
 			n[nk] = ne
@@ -340,11 +343,12 @@ end
 -- @      or nil to use the default name/ref as keys on the clone
 -- @    v = the value to assign for instances of this node,
 -- @      or nil to use the default assignment value
+-- @param[type=function] type_checker  Optional, a function that returns true if the given object is to be cloned and false if it is to be referenced
 -- @param[type=table] post_copy  Optional, a table to be merged (recursively) with the new object after cloning.
 -- @return a reference to the clone
-function _M:cloneCustom(alt_nodes, post_copy)
+function _M:cloneCustom(alt_nodes, type_checker, post_copy)
 	local clonetable = {}
-	local n = cloneCustomRecurs(clonetable, self, nil, nil, alt_nodes)
+	local n = cloneCustomRecurs(clonetable, self, nil, nil, alt_nodes, type_checker, true)
 	if post_copy then
 		table.merge(n, post_copy, true)
 	end
@@ -389,6 +393,15 @@ function _M:setCurrentHookDir(dir)
 	_current_hook_dir = dir
 end
 
+function _M:loadHooksFile(file)
+	assert(_current_hook_dir, "loadHooksFile can only be used in hooks/load.lua")	
+
+	local f, err = loadfile(_current_hook_dir.."/"..file)
+	if not f and err then error(err) end
+	setfenv(f, setmetatable({}, {__index = _G}))
+	f()
+end
+
 function _M:bindHook(hook, fct)
 	if type(fct) == "string" and _current_hook_dir then
 		local f, err = loadfile(_current_hook_dir..fct..".lua")

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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
@@ -46,8 +46,8 @@ function _M:init(chat, id, width)
 
 	self:generateList()
 
-	self.c_desc = Textzone.new{width=self.iw - 10 - xoff, height=1, auto_height=true, text=self.text.."\n"}
-	self.c_list = VariableList.new{width=self.iw - 10 - xoff, max_height=game.h * 0.70 - self.c_desc.h, list=self.list, fct=function(item) self:use(item) end, select=function(item) self:select(item) end}
+	self.c_desc = Textzone.new{font=chat.dialog_text_font, width=self.iw - 10 - xoff, height=1, auto_height=true, text=self.text.."\n"}
+	self.c_list = VariableList.new{font=chat.dialog_answer_font, width=self.iw - 10 - xoff, max_height=game.h * 0.70 - self.c_desc.h, list=self.list, fct=function(item) self:use(item) end, select=function(item) self:select(item) end}
 
 	local uis = {
 		{left=0, top=0, ui=self.c_desc},

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 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
@@ -131,7 +131,7 @@ 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
+		if mime == "application/t-engine-addon" and self.allow_downloads.addons and url:find("^https://te4%.org/") 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
 			print("Accepting addon download to:", self.dest)
@@ -140,7 +140,7 @@ function _M:onDownload(handlers)
 			game:registerDialog(self.download_dialog)
 			self.view:downloadAction(downid, self.dest)
 			return
-		elseif mime == "application/t-engine-module" and self.allow_downloads.modules and url:find("^http://te4%.org/") then
+		elseif mime == "application/t-engine-module" and self.allow_downloads.modules and url:find("^https://te4%.org/") 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
 			print("Accepting module download to:", self.dest)

 -- TE4 - T-Engine 4
--- Copyright (C) 2009 - 2017 Nicolas Casalini
+-- Copyright (C) 2009 - 2018 Nicolas Casalini
 --
 -- This program is free software: you can redistribute it and/or modify