Merge branch 'master' into WaveFunctionCollapse

@@ -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"

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

@@ -620,7 +620,7 @@ if _OPTIONS.steam then
 	dofile("../steamworks/build/steam-code.lua")
 end
 
-if _OPTIONS.discord then
+if _OPTIONS.discord and not _OPTIONS['discord-nolib'] then
 project "te4-discord"
 	configuration "linux"
 		kind "SharedLib"

@@ -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)
@@ -92,6 +92,13 @@ function _M:cloneActor(post_copy, alt_nodes)
 	if post_copy or self.clone_copy then post_copy = post_copy or {} table.update(post_copy, self.clone_copy or {}, true) end
 	-- 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

@@ -43,16 +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,
 		setTextFont = function(font, size) self.dialog_text_font = {font, size} end,
 		setAnswerFont = function(font, size) self.dialog_answer_font = {font, size} end,
-	}, {__index=data}))
+	}, {__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

@@ -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

@@ -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

@@ -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}

@@ -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

@@ -253,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)
@@ -329,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

@@ -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

@@ -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)

@@ -49,6 +49,8 @@ end
 
 --- place a door in a wall
 function _M:doorOnWall(wall)
+	print("=WALLLDOOR")
+	table.print(wall)
 	if wall.vert then
 		local j = rng.table(table.keys(wall.ps))
 		self.map(wall.base, j, Map.TERRAIN, self:resolve("door"))
@@ -72,11 +74,11 @@ function _M:addWall(vert, base, p1, p2)
 			ps[z] = nil
 		else
 			rm_map.walled = true
-			if z == p1 or z == p2 or not game.level.map:checkEntity(x, y, Map.TERRAIN, "block_move") or 2 ~= 
-				(game.level.map:checkEntity(x - 1, y, Map.TERRAIN, "block_move") and 1 or 0) + 
-				(game.level.map:checkEntity(x + 1, y, Map.TERRAIN, "block_move") and 1 or 0) + 
-				(game.level.map:checkEntity(x, y - 1, Map.TERRAIN, "block_move") and 1 or 0) + 
-				(game.level.map:checkEntity(x, y + 1, Map.TERRAIN, "block_move") and 1 or 0) then 
+			if z == p1 or z == p2 or not self.map:checkEntity(x, y, Map.TERRAIN, "block_move") or 2 ~= 
+				(self.map:checkEntity(x - 1, y, Map.TERRAIN, "block_move") and 1 or 0) + 
+				(self.map:checkEntity(x + 1, y, Map.TERRAIN, "block_move") and 1 or 0) + 
+				(self.map:checkEntity(x, y - 1, Map.TERRAIN, "block_move") and 1 or 0) + 
+				(self.map:checkEntity(x, y + 1, Map.TERRAIN, "block_move") and 1 or 0) then 
 					ps[z] = nil
 			end
 		end

@@ -24,7 +24,7 @@ require "engine.Generator"
 --- @classmod engine.generator.map.Hexacle
 module(..., package.seeall, class.inherit(engine.Generator))
 
-function _M:init(zone, map, grid_list, data)
+function _M:init(zone, map, level, data)
 	engine.Generator.init(self, zone, map, level)
 	data.segment_wide_chance = data.segment_wide_chance or 70
 	data.nb_segments = data.nb_segments or 8

@@ -24,7 +24,7 @@ require "engine.Generator"
 --- @classmod engine.generator.map.Maze
 module(..., package.seeall, class.inherit(engine.Generator))
 
-function _M:init(zone, map, grid_list, data)
+function _M:init(zone, map, level, data)
 	engine.Generator.init(self, zone, map, level)
 	self.data = data
 	data.widen_w = data.widen_w or 1

@@ -191,7 +191,7 @@ function _M:tmxLoad(file)
 	local g = self:getLoader(t)
 	local map = lom.parse(data)
 	local mapprops = {}
-	if map:findOne("properties") then mapprops = map:findOne("properties"):findAllAttrs("property", "name", "value") end
+	if map:findOne("properties", nil, nil, true) then mapprops = map:findOne("properties", nil, nil, true):findAllAttrsValueOrBody("property", "name", "value") end
 	local w, h = tonumber(map.attr.width), tonumber(map.attr.height)
 	local tw, th = tonumber(map.attr.tilewidth), tonumber(map.attr.tileheight)
 	local chars = {}

@@ -45,10 +45,14 @@ fs.mkdir(fs.getHomePath().."/4.0/")
 fs.mkdir(fs.getHomePath().."/4.0/profiles/")
 fs.mkdir(fs.getHomePath().."/4.0/settings/")
 
-fs.setPathAllowed(engine.homepath)
-fs.setPathAllowed(fs.getRealPath("/addons/"))
-if fs.getRealPath("/dlcs/") then fs.setPathAllowed(fs.getRealPath("/dlcs/")) end
-fs.setPathAllowed(fs.getRealPath("/modules/"))
+fs.setPathAllowed(engine.homepath, true)
+fs.setPathAllowed(fs.getRealPath("/addons/"), true)
+if fs.getRealPath("/dlcs/") then fs.setPathAllowed(fs.getRealPath("/dlcs/"), true) end
+fs.setPathAllowed(fs.getRealPath("/modules/"), true)
+
+-- Last resort, add currently mounted paths, as readonly, so taht reset mounts work
+for _, path in ipairs(fs.getSearchPath()) do fs.setPathAllowed(path) end
+
 fs.doneSettingPathAllowed()
 fs.setWritePath(engine.homepath)
 
@@ -76,14 +80,34 @@ censor_boot = true
 chat.filter = {}
 chat.ignores = {}
 addons = {}
+allow_online_events = true
+disable_all_connectivity = true
+upload_charsheet = true
 upgrades { v1_0_5=true }
 ]]
+local loaded_config_files = {}
 for i, file in ipairs(fs.list("/settings/")) do
 	if file:find(".cfg$") then
 		config.load("/settings/"..file)
+		loaded_config_files[file] = true
 	end
 end
 
+-- Keep the same setting when upgrading
+-- What a FRELLING MESS
+if not loaded_config_files["disable_all_connectivity.cfg"] and not config.settings.firstrun_gdpr then
+	config.settings.disable_all_connectivity = false
+end
+
+if config.settings.disable_all_connectivity then
+	core.game.disableConnectivity()
+	local function void(t) for _, k in ipairs(table.keys(t)) do t[k] = nil end end
+	-- if core.steam then void(core.steam) core.steam = nil end
+	if core.discord then void(core.discord) core.discord = nil end
+	if core.webview then void(core.webview) core.webview = nil end
+	if socketcore then void(socketcore) socketcore = nil end
+end
+
 if config.settings.force_safeboot then
 	util.removeForceSafeBoot()
 	core.display.forceSafeMode()

@@ -316,13 +316,15 @@ function _M:aiTalentTargets(t, aitarget, tg, all_targets, ax, ay)
 			friendlyfire = typ.friendlyfire and (type(typ.friendlyfire) == "number" and typ.friendlyfire or 100) or 0
 			if all_targets then	typ.selffire, typ.friendlyfire = 100, 100 end
 			targets = {}
-			self:project(typ, ax, ay, function(px, py)
-				local tgt = game.level.map(px, py, typ.scan_on or Map.ACTOR)
-				if tgt and not tgt.dead then
-					if log_detail > 2 then print("[aiTalentTargets]", t.id, "may affect", px, py, "actor:", tgt.uid, tgt.name) end
-					targets[#targets+1] = tgt
-				end
-			end)
+			if ax and ay then
+				self:project(typ, ax, ay, function(px, py)
+					local tgt = game.level.map(px, py, typ.scan_on or Map.ACTOR)
+					if tgt and not tgt.dead then
+						if log_detail > 2 then print("[aiTalentTargets]", t.id, "may affect", px, py, "actor:", tgt.uid, tgt.name) end
+						targets[#targets+1] = tgt
+					end
+				end)
+			end
 		end
 	end
 	return targets, selffire, friendlyfire, tg

@@ -51,6 +51,7 @@ function _M:newTalentType(t)
 	assert(t.name, "no talent type name")
 	assert(t.type, "no talent type type")
 	t.description = t.description or ""
+	t.category = t.category or t.type:gsub("/.*", "")
 	t.points = t.points or 1
 	t.talents = {}
 	table.insert(self.talents_types_def, t)
@@ -95,7 +96,8 @@ end
 function _M:init(t)
 	self.talents = t.talents or {}
 	self.talents_types = t.talents_types or {}
-	self.talents_types_mastery = self.talents_types_mastery  or {}
+	self.talents_types_mastery = self.talents_types_mastery or {}
+	self.talents_mastery_bonus = self.talents_mastery_bonus or {}
 	self.talents_cd = self.talents_cd or {}
 	self.sustain_talents = self.sustain_talents or {}
 	self.talents_auto = self.talents_auto or {}
@@ -831,7 +833,8 @@ function _M:getTalentLevel(id)
 	else
 		t = _M.talents_def[id]
 	end
-	return t and (self:getTalentLevelRaw(id)) * ((self.talents_types_mastery[t.type[1]] or 0) + 1) or 0
+	return t and (self:getTalentLevelRaw(id)) * (self:getTalentMastery(t) or 0) or 0
+
 end
 
 --- Talent type level, sum of all raw levels of talents inside
@@ -997,12 +1000,13 @@ function _M:getTalentDisplayName(t)
 	return t.display_name
 end
 
---- Cooldown all talents by one
+--- Cooldown all talents
 -- This should be called in your actors "act()" method
-function _M:cooldownTalents()
+-- @param turns the number of turns to cooldown the talents
+function _M:cooldownTalents(turns)
 	for tid, c in pairs(self.talents_cd) do
 		self.changed = true
-		self.talents_cd[tid] = self.talents_cd[tid] - 1
+		self.talents_cd[tid] = self.talents_cd[tid] - (turns or 1)
 		if self.talents_cd[tid] <= 0 then
 			self.talents_cd[tid] = nil
 			if self.onTalentCooledDown then self:onTalentCooledDown(tid) end
@@ -1079,14 +1083,24 @@ function _M:triggerTalent(tid, name, ...)
 
 	local t = _M.talents_def[tid]
 	name = name or "trigger"
-	if t[name] then return t[name](self, t, ...) end
+	if t[name] then
+		self.__talent_running = t
+		local ret = {t[name](self, t, ...)}
+		self.__talent_running = nil
+		return unpack(ret, 1, table.maxn(ret))
+	end
 end
 
 --- Trigger a talent method
 function _M:callTalent(tid, name, ...)
 	local t = _M.talents_def[tid]
 	name = name or "trigger"
-	if t[name] then return t[name](self, t, ...) end
+	if t[name] then
+		self.__talent_running = t
+		local ret = {t[name](self, t, ...)}
+		self.__talent_running = nil
+		return unpack(ret, 1, table.maxn(ret))
+	end
 end
 
 --- Trigger all talents matching

@@ -36,6 +36,18 @@ function _M:init()
 
 	-- Allow scrolling when targetting
 	self.target.on_set_target = function(self, how)
+		if self.target and self.target_type and self.target.x and self.active and self.target_type.stop_before_target and how == "scan" then
+			local start_x = self.target_type.start_x or self.target_type.x or self.target_type.source_actor and self.target_type.source_actor.x or self.x
+			local start_y = self.target_type.start_y or self.target_type.y or self.target_type.source_actor and self.target_type.source_actor.y or self.y
+			local l = core.fov.line(self.target.x, self.target.y, start_x, start_y)
+			local lx, ly = l:step()
+			if lx and ly then
+				self.target.x = lx
+				self.target.y = ly
+				self.target.entity = game.level.map(self.target.x, self.target.y, engine.Map.ACTOR)
+			end
+		end
+
 		if self.key ~= self.targetmode_key then return end
 		local dx, dy = game.level.map:moveViewSurround(self.target.x, self.target.y, 1, 1, true)
 		if how == "mouse" and (dx ~= 0 or dy ~= 0) then

@@ -29,6 +29,7 @@ allow_late_uuid = false
 
 --- Register the character on te4.org and return a UUID for it
 function _M:getUUID()
+	if game.allowJSONDump and not game:allowJSONDump() then return end
 	if self.__te4_uuid then return self.__te4_uuid end
 	local uuid = profile:registerNewCharacter(game.__mod_info.short_name)
 	if uuid then
@@ -38,6 +39,7 @@ end
 
 --- Call this when a character is saved to upload data to te4.org
 function _M:saveUUID(do_charball)
+	if game.allowJSONDump and not game:allowJSONDump() then return end
 	if game:isTainted() then return end
 	if not self.__te4_uuid then
 		-- Try to grab an UUID even after char reg

@@ -222,6 +222,8 @@ A usual problem is shaders and thus should be your first target to disable.]], 7
 	if reboot_message then
 		Dialog:simpleLongPopup("Message", reboot_message, 700)
 	end
+
+	self:checkBootLoginRegister()
 end
 
 function _M:grabAddons()
@@ -540,39 +542,46 @@ function _M:onQuit()
 	end, "Quit", "Continue")
 end
 
-profile_help_text = [[#LIGHT_GREEN#T-Engine4#LAST# allows you to sync your player profile with the website #LIGHT_BLUE#https://te4.org/#LAST#
+profile_help_text = [[Welcome to #LIGHT_GREEN#Tales of Maj'Eyal#LAST#!
+
+Before you can start dying in many innovative ways we need to ask you about online play.
 
-This allows you to:
+This is a #{bold}#single player game#{normal}# but it also features many online features to enhance your gameplay and connect you to the community:
 * Play from several computers without having to copy unlocks and achievements.
-* Keep track of your modules progression, kill count, ...
-* Talk ingame to other fellow players
-* Cool statistics for each module to help sharpen your gameplay style
+* Talk ingame to other fellow players, ask for advice, share your most memorable moments...
+* Keep track of your kill count, deaths, most played classes...
+* Cool statistics for to help sharpen your gameplay style
+* Install official expansions and third-party addons directly from the game, hassle-free
+* Access your purchaser / donator bonuses if you have bought the game or donated on https://te4.org/
 * Help the game developers balance and refine the game
 
-You will also have a user page on https://te4.org/ where you can show off your achievements to your friends.
-This is all optional, you are not forced to use this feature at all, but the developers would thank you if you did as it will make balancing easier.
-Online profile requires an internet connection, if not available it will wait and sync when it finds one.]]
+You will also have a user page on #LIGHT_BLUE#https://te4.org/#LAST# to show off to your friends.
+This is all optional, you are not forced to use this feature at all, but the developer would thank you if you did as it will make balancing easier.]]
 
 function _M:checkFirstTime()
-	if not profile.generic.firstrun and not core.steam then
-		profile:checkFirstRun()
-		local text = "Thanks for downloading T-Engine/ToME.\n\n"..profile_help_text
-		Dialog:yesnocancelLongPopup("Welcome to T-Engine", text, 600, function(ret, cancel)
-			if cancel then return end
-			if not ret then
-				local dialogdef = {}
-				dialogdef.fct = function(login) self:setPlayerLogin(login) end
-				dialogdef.name = "login"
-				dialogdef.justlogin = true
-				game:registerDialog(require('mod.dialogs.ProfileLogin').new(dialogdef, game.profile_help_text))
-			else
-				local dialogdef = {}
-				dialogdef.fct = function(login) self:setPlayerLogin(login) end
-				dialogdef.name = "creation"
-				dialogdef.justlogin = false
-				game:registerDialog(require('mod.dialogs.ProfileLogin').new(dialogdef, game.profile_help_text))
+	if not profile.generic.firstrun then
+		local d = require("mod.dialogs.FirstRun").new(profile_help_text)
+		local mm = self.dialogs[#self.dialogs]
+		self:unregisterDialog(mm)
+		self.tooltip = nil
+		self:registerDialog(d)
+	end
+end
+
+function _M:checkBootLoginRegister()
+	if __module_extra_info.boot_and_register then
+		if core.steam then
+			local mm = self.dialogs[#self.dialogs]
+			if mm and mm:isClassName("mod.dialogs.MainMenu") then
+				mm:loginSteam()
 			end
-		end, "Register new account", "Log in existing account", "Maybe later")
+		else
+			local dialogdef = {}
+			dialogdef.fct = function(login) self:setPlayerLogin(login) end
+			dialogdef.name = "creation"
+			dialogdef.justlogin = false
+			game:registerDialog(require('mod.dialogs.ProfileLogin').new(dialogdef, game.profile_help_text))
+		end
 	end
 end
 

@@ -84,6 +84,7 @@ function _M:init()
 
 	self.c_list = List.new{width=self.iw, nb_items=#self.list, list=self.list, fct=function(item) end, font={FontPackage:getFont("default")}}
 
+	self.c_discord = ButtonImage.new{no_decoration=true, alpha_unfocus=0.5, file="discord.png", fct=function() util.browserOpenUrl("https://discord.gg/tales-of-majeyal", {is_external=true}) end}
 	self.c_facebook = ButtonImage.new{no_decoration=true, alpha_unfocus=0.5, file="facebook.png", fct=function() util.browserOpenUrl("https://www.facebook.com/tales.of.maj.eyal", {is_external=true}) end}
 	self.c_twitter = ButtonImage.new{no_decoration=true, alpha_unfocus=0.5, file="twitter.png", fct=function() util.browserOpenUrl("https://twitter.com/TalesOfMajEyal", {is_external=true}) end}
 	self.c_forums = ButtonImage.new{no_decoration=true, alpha_unfocus=0.5, file="forums.png", fct=function() util.browserOpenUrl("http://forums.te4.org/", {is_external=true}) end}
@@ -92,6 +93,7 @@ function _M:init()
 		{left=0, top=0, ui=self.c_list},
 		{left=0, bottom=0, absolute=true, ui=self.c_background},
 		{right=self.c_facebook.w, bottom=0, absolute=true, ui=self.c_version},
+		{right=0, bottom=self.c_facebook.h+self.c_twitter.h+self.c_forums.h, absolute=true, ui=self.c_discord},
 		{right=0, bottom=self.c_facebook.h+self.c_twitter.h, absolute=true, ui=self.c_forums},
 		{right=0, bottom=self.c_twitter.h, absolute=true, ui=self.c_facebook},
 		{right=0, bottom=0, absolute=true, ui=self.c_twitter},
@@ -121,10 +123,12 @@ end
 function _M:updateUI()
 	local uis = table.clone(self.base_uis)
 
-	if profile.auth then
-		self:uiStats(uis)
-	else
-		self:uiLogin(uis)
+	if not config.settings.disable_all_connectivity then
+		if profile.auth then
+			self:uiStats(uis)
+		else
+			self:uiLogin(uis)
+		end
 	end
 
 	self:loadUI(uis)

@@ -27,7 +27,7 @@ local Textzone = require "engine.ui.Textzone"
 module(..., package.seeall, class.inherit(Dialog))
 
 function _M:init(dialogdef, profile_help_text)
-	Dialog.init(self, "Online profile "..dialogdef.name, 600, 400)
+	Dialog.init(self, "Online profile "..dialogdef.name, math.min(800, game.w * 0.9), 400)
 	self.profile_help_text = profile_help_text
 	self.dialogdef = dialogdef
 	self.alpha = 230
@@ -65,9 +65,10 @@ function _M:init(dialogdef, profile_help_text)
 		self.c_pass = Textbox.new{title="Password: ", size_title=pwa, text="", chars=30, max_len=20, hide=true, filter=pass_filter, fct=function(text) self:okclick() end}
 		self.c_pass2 = Textbox.new{title=pwa, text="", size_title=pwa, chars=30, max_len=20, hide=true, filter=pass_filter, fct=function(text) self:okclick() end}
 		self.c_email = Textbox.new{title="Email: ", size_title=pwa, text="", chars=30, max_len=60, filter=pass_filter, fct=function(text) self:okclick() end}
-		self.c_news = Checkbox.new{title="Accept to receive #{bold}#very infrequent#{normal}# (a few per year) mails", default=true, fct=function() self:okclick() end}
-		self.c_news2 = Textzone.new{text="about important game events from us.", width=self.iw - 20, auto_height=true}
+		self.c_news = Checkbox.new{title="Accept to receive #{bold}#very infrequent#{normal}# (a few per year) mails about important game events from us.", default=false, fct=function() self:okclick() end}
+		self.c_age = Checkbox.new{title="You at least 16 years old, or have parental authorization to play the game.", default=false, fct=function() self:okclick() end}
 		local ok = require("engine.ui.Button").new{text="Create", fct=function() self:okclick() end}
+		local privacy = require("engine.ui.Button").new{text="Privacy Policy (opens in browser)", fct=function() self:privacypolicy() end}
 		local cancel = require("engine.ui.Button").new{text="Cancel", fct=function() self:cancelclick() end}
 
 		self:loadUI{
@@ -77,9 +78,10 @@ function _M:init(dialogdef, profile_help_text)
 			{left=0, top=self.c_desc.h+self.c_login.h+self.c_pass.h+5, ui=self.c_pass2},
 			{left=0, top=self.c_desc.h+self.c_login.h+self.c_pass.h+self.c_pass2.h+10, ui=self.c_email},
 			{left=0, top=self.c_desc.h+self.c_login.h+self.c_pass.h+self.c_pass2.h+self.c_email.h+10, ui=self.c_news},
-			{left=0, top=self.c_desc.h+self.c_login.h+self.c_pass.h+self.c_pass2.h+self.c_email.h+self.c_news2.h+10, ui=self.c_news2},
+			{left=0, top=self.c_desc.h+self.c_login.h+self.c_pass.h+self.c_pass2.h+self.c_email.h+self.c_news.h+10, ui=self.c_age},
 			{left=0, bottom=0, ui=ok},
 			{right=0, bottom=0, ui=cancel},
+			{hcenter=0, bottom=0, ui=privacy},
 		}
 		self:setFocus(self.c_login)
 	end
@@ -108,6 +110,10 @@ function _M:okclick()
 		self:simplePopup("Email", "Your email seems invalid")
 		return
 	end
+	if not self.c_age.checked then
+		self:simplePopup("Age Check", "You need to be 16 years old or more or to have parental authorization to play this game.")
+		return
+	end
 
 	game:unregisterDialog(self)
 	game:createProfile({create=self.c_email and true or false, login=self.c_login.text, pass=self.c_pass.text, email=self.c_email and self.c_email.text, news=self.c_news and self.c_news.checked})
@@ -116,3 +122,7 @@ end
 function _M:cancelclick()
 	self.key:triggerVirtual("EXIT")
 end
+
+function _M:privacypolicy()
+	util.browserOpenUrl("https://te4.org/privacy-policy-data", {is_external=true})	
+end

@@ -27,7 +27,7 @@ local Textzone = require "engine.ui.Textzone"
 module(..., package.seeall, class.inherit(Dialog))
 
 function _M:init()
-	Dialog.init(self, "Steam User Account", 500, 400)
+	Dialog.init(self, "Steam User Account", math.min(800, game.w * 0.9), 400)
 	self.alpha = 230
 
 	self.c_desc = Textzone.new{width=math.floor(self.iw - 10), auto_height=true, text=[[Welcome to #GOLD#Tales of Maj'Eyal#LAST#.
@@ -43,18 +43,20 @@ Luckily this is very easy to do: you only require a profile name and optionally
 
 	self.c_login = Textbox.new{title="Username: ", text="", chars=30, max_len=20, fct=function(text) self:okclick() end}
 	self.c_email = Textbox.new{title="Email: ", size_title=self.c_login.title, text="", chars=30, max_len=60, fct=function(text) self:okclick() end}
-	self.c_news = Checkbox.new{title="Accept to receive #{bold}#very infrequent#{normal}# (a few per year) mails", default=true, fct=function() self:okclick() end}
-	self.c_news2 = Textzone.new{text="about important game events from us.", width=self.iw - 20, auto_height=true}
+	self.c_news = Checkbox.new{title="Accept to receive #{bold}#very infrequent#{normal}# (a few per year) mails about important game events from us.", default=false, fct=function() self:okclick() end}
+	self.c_age = Checkbox.new{title="You at least 16 years old, or have parental authorization to play the game.", default=false, fct=function() self:okclick() end}
 	local ok = require("engine.ui.Button").new{text="Register", fct=function() self:okclick() end}
 	local cancel = require("engine.ui.Button").new{text="Cancel", fct=function() self:cancelclick() end}
+	local privacy = require("engine.ui.Button").new{text="Privacy Policy (opens in browser)", fct=function() self:privacypolicy() end}
 	self:loadUI{
 		{left=0, top=0, ui=self.c_desc},
 		{left=0, top=self.c_desc.h, ui=self.c_login},
 		{left=0, top=self.c_desc.h+self.c_login.h+5, ui=self.c_email},
 		{left=0, top=self.c_desc.h+self.c_login.h+self.c_email.h+5, ui=self.c_news},
-		{left=0, top=self.c_desc.h+self.c_login.h+self.c_email.h+self.c_news.h+5, ui=self.c_news2},
+		{left=0, top=self.c_desc.h+self.c_login.h+self.c_email.h+self.c_news.h+5, ui=self.c_age},
 		{left=0, bottom=0, ui=ok},
 		{right=0, bottom=0, ui=cancel},
+		{hcenter=0, bottom=0, ui=privacy},
 	}
 	self:setFocus(self.c_login)
 	self:setupUI(true, true)
@@ -74,7 +76,11 @@ function _M:okclick()
 		self:simplePopup("Email", "Your email does not look right.")
 		return
 	end
-
+	if not self.c_age.checked then
+		self:simplePopup("Age Check", "You need to be 16 years old or more or to have parental authorization to play this game.")
+		return
+	end
+	
 	local d = self:simpleWaiter("Registering...", "Registering on https://te4.org/, please wait...") core.display.forceRedraw()
 	d:timeout(30, function() Dialog:simplePopup("Steam", "Steam client not found.")	end)
 	core.steam.sessionTicket(function(ticket)
@@ -99,3 +105,7 @@ end
 function _M:cancelclick()
 	self.key:triggerVirtual("EXIT")
 end
+
+function _M:privacypolicy()
+	util.browserOpenUrl("https://te4.org/privacy-policy-data", {is_external=true})	
+end

@@ -129,6 +129,9 @@ _M.temporary_values_conf.force_melee_damtype = "last"
 -- AI
 _M.temporary_values_conf.ai_move = "last"
 
+-- Misc
+_M.temporary_values_conf.death_dialog = "last"
+
 _M.projectile_class = "mod.class.Projectile"
 
 function _M:init(t, no_default)
@@ -600,17 +603,53 @@ function _M:actBase()
 	end
 
 	-- Cooldown talents after effects, because some of them involve breaking sustains.
-	if not self:attr("no_talents_cooldown") then self:cooldownTalents() end
+
+	if not self:attr("no_talents_cooldown") then
+		if self:attr("half_talents_cooldown") then self:cooldownTalents(0.5) else self:cooldownTalents(1) end
+	end
 
 	self:checkStillInCombat()
 end
 
+function _M:hasProc(proc)
+	if not self.turn_procs then return end
+	if self.turn_procs[proc] then 
+		return self.turn_procs[proc] 
+	elseif self.turn_procs.multi then 
+		return self.turn_procs.multi[proc] 
+	end
+end
+
+function _M:setProc(name, val, turns)
+	turns = turns or 1
+	val = val or true
+	local proc = {val = val, turns = turns}
+	if turns > 1 then
+		table.set(self, "turn_procs", "multi", name, proc)
+	else 
+		self.turn_procs[name] = proc
+	end
+end
+
 -- General entry point for Actors to act, called by NPC:act or Player:act
 function _M:act()
 	if not engine.Actor.act(self) then return end
 
 	self.changed = true
+
+	-- Store procs with more than 1 turn remaining and re-add them after we clear turn_procs
+	local temp = {}
+	if self.turn_procs.multi then
+		for proc, val in pairs(self.turn_procs.multi) do
+			if proc then
+				self.turn_procs.multi[proc].turns = self.turn_procs.multi[proc].turns - 1
+				if self.turn_procs.multi[proc].turns > 0 then temp[proc] = val end
+			end
+		end
+	end
+
 	self.turn_procs = {}
+	if temp then self.turn_procs.multi = temp end
 
 	-- Break some sustains if certain resources are too low
 	-- Note: force_talent_ignore_ressources has no effect here
@@ -1312,7 +1351,7 @@ function _M:move(x, y, force)
 
 		-- Confused ?
 		if not force and self:attr("confused") then
-			if rng.percent(self:attr("confused")) then
+			if rng.percent(util.bound(self:attr("confused"), 0, 50)) then
 				x, y = self.x + rng.range(-1, 1), self.y + rng.range(-1, 1)
 			end
 		end
@@ -1406,7 +1445,7 @@ function _M:move(x, y, force)
 	end
 
 	-- Break channels
-	if moved then
+	if not force and moved and ox and oy and (ox ~= self.x or oy ~= self.y) then
 		self:breakPsionicChannel()
 		self:breakSpacetimeTuning()
 	end
@@ -1593,7 +1632,7 @@ function _M:teleportRandom(x, y, dist, min_dist)
 		
 		-- after moving
 		if self:attr("defense_on_teleport") or self:attr("resist_all_on_teleport") or self:attr("effect_reduction_on_teleport") then
-			self:setEffect(self.EFF_OUT_OF_PHASE, 5, {defense=self:attr("defense_on_teleport") or 0, resists=self:attr("resist_all_on_teleport") or 0, effect_reduction=self:attr("effect_reduction_on_teleport") or 0})
+			self:setEffect(self.EFF_OUT_OF_PHASE, 5, {})
 		end
 	end
 	
@@ -1860,7 +1899,8 @@ function _M:tooltip(x, y, seen_by)
 	if self.type == "humanoid" or self.type == "giant" then ts:add({"font","italic"}, "(", self.female and "female" or "male", ")", {"font","normal"}, true) else ts:add(true) end
 	ts:add(self.type:capitalize(), " / ", self.subtype:capitalize(), true)
 	ts:add("Rank: ") ts:merge(rank_color:toTString()) ts:add(rank, {"color", "WHITE"}, true)
-	ts:add({"color", 0, 255, 255}, ("Level: %d"):format(self.level), {"color", "WHITE"}, true)
+	if self.hide_level_tooltip then ts:add({"color", 0, 255, 255}, "Level: unknown", {"color", "WHITE"}, true)
+	else ts:add({"color", 0, 255, 255}, ("Level: %d"):format(self.level), {"color", "WHITE"}, true) end
 	if self:attr("invulnerable") then ts:add({"color", "PURPLE"}, "INVULNERABLE!", true) end
 	ts:add({"color", 255, 0, 0}, ("HP: %d (%d%%)"):format(self.life, self.life * 100 / self.max_life), {"color", "WHITE"})
 
@@ -2018,7 +2058,11 @@ function _M:tooltip(x, y, seen_by)
 			if e.type == "physical" then
 				effphysical:add(true, "- ", {"color", "LIGHT_RED"}, desceffect(e, p, dur), {"color", "WHITE"} )
 			elseif e.type == "magical" then
-				effmagical:add(true, "- ", {"color", "DARK_ORCHID"}, desceffect(e, p, dur), {"color", "WHITE"} )
+				if e.subtype and e.subtype.disease then
+					effmagical:add(true, "- ", {"color", "DARK_GREEN"}, desceffect(e, p, dur), {"color", "WHITE"} )
+				else
+					effmagical:add(true, "- ", {"color", "DARK_ORCHID"}, desceffect(e, p, dur), {"color", "WHITE"} )
+				end
 			elseif e.type == "mental" then
 				effmental:add(true, "- ", {"color", "YELLOW"}, desceffect(e, p, dur), {"color", "WHITE"} )
 			elseif e.type == "other" then
@@ -2386,14 +2430,6 @@ function _M:onTakeHit(value, src, death_note)
 		end
 	end
 
-	if value > 0 and self:isTalentActive(self.T_BONE_SHIELD) then
-		local t = self:getTalentFromId(self.T_BONE_SHIELD)
-		if t.absorb(self, t, self:isTalentActive(self.T_BONE_SHIELD)) then
-			game:delayedLogDamage(src, self, 0, ("#SLATE#(%d to bones)#LAST#"):format(value), false)
-			value = 0
-		end
-	end
-
 	if value <=0 then return 0 end
 	if self.knowTalent and (self:knowTalent(self.T_SEETHE) or self:knowTalent(self.T_GRIM_RESOLVE)) then
 		if not self:hasEffect(self.EFF_CURSED_FORM) then
@@ -2583,7 +2619,7 @@ function _M:onTakeHit(value, src, death_note)
 	end
 
 	-- Bloodlust!
-	if value > 0 and src and src.knowTalent and src:knowTalent(src.T_BLOODLUST) then
+	if value > 0 and src and not (src == self) and src.knowTalent and src:knowTalent(src.T_BLOODLUST) then
 		src:setEffect(src.EFF_BLOODLUST, 1, {})
 	end
 
@@ -2722,7 +2758,7 @@ function _M:onTakeHit(value, src, death_note)
 		local vt = self:getTalentFromId(self.T_LEECH)
 		self:incVim(vt.getVim(self, vt))
 		self:heal(vt.getHeal(self, vt), src)
-		if self.player then src:logCombat(src, "#AQUAMARINE#You leech a part of #Target#'s vim.") end
+		--if self.player then src:logCombat(src, "#AQUAMARINE#You leech a part of #Target#'s vim.") end
 	end
 
 	-- Invisible on hit
@@ -2860,7 +2896,7 @@ end
 
 function _M:takeHit(value, src, death_note)
 	self:enterCombatStatus(src)
-	if src.enterCombatStatus then src:enterCombatStatus(self) end
+	if src and src.enterCombatStatus then src:enterCombatStatus(self) end
 
 	for eid, p in pairs(self.tmp) do
 		local e = self.tempeffect_def[eid]
@@ -2879,15 +2915,6 @@ function _M:takeHit(value, src, death_note)
 
 	if src and src.fireTalentCheck then src:fireTalentCheck("callbackOnDealDamage", val, self, dead, death_note) end
 
-	if dead and src and src.attr and src:attr("overkill") and src.project and not src.turn_procs.overkill then
-		src.turn_procs.overkill = true
-		local dam = (self.die_at - self.life) * src:attr("overkill") / 100
-		local incdam = self.inc_damage
-		self.inc_damage = {}
-		src:project({type="ball", radius=2, selffire=false, x=self.x, y=self.y}, self.x, self.y, DamageType.BLIGHT, dam, {type="acid"})
-		self.inc_damage = incdam
-	end
-
 	return dead, val
 end
 
@@ -3292,25 +3319,391 @@ function _M:die(src, death_note)
 	return true
 end
 
-function _M:learnStats(statorder)
-	self.auto_stat_cnt = self.auto_stat_cnt or 1
+--- Learn stats (stat increment) in a specified order up to a maximum
+-- @param[table] statorder: an orded list of stat ids in which to learn, generally all learned in one character level
+-- @param repeats: maximum number of times to apply the statorder <1>
+function _M:learnStats(statorder, repeats)
+	statorder.idx = statorder.idx or 1
+	repeats = (repeats or 1)*#statorder
 	local nb = 0
 	local max = 60
 
-	-- Allow to go over a natural 60, up to 80 at level 50
+	-- Allow stats to go over a natural 60, up to 80 at level 50
 	if not self.no_auto_high_stats then max = 60 + (self.level * 20 / 50) end
 
-	while self.unused_stats > 0 do
-		if self:getStat(statorder[self.auto_stat_cnt]) < max then
-			self:incIncStat(statorder[self.auto_stat_cnt], 1)
+	while self.unused_stats > 0 and nb < repeats do
+		if self:getStat(statorder[statorder.idx]) < max then
+			self:incIncStat(statorder[statorder.idx], 1)
 			self.unused_stats = self.unused_stats - 1
 		end
-		self.auto_stat_cnt = util.boundWrap(self.auto_stat_cnt + 1, 1, #statorder)
+		statorder.idx = util.boundWrap(statorder.idx + 1, 1, #statorder)
 		nb = nb + 1
-		if nb >= #statorder then break end
 	end
 end
 
+--- Actor learns/advances in a character class, randomly gaining stats and learning talents based on levels in the class
+--	When first called, the actor gains starting stat bonuses and talents and learns talent categories according to the birth class descriptor
+-- Note: this does not handle any special class requirements, such as creating a golem, generating equipment, etc.
+-- @see game.state:applyRandomClass
+-- @param c_data[table] contains info on the class to learn/levelup in:
+-- @field class: name (birth descriptor subclass name) of the character class to learn ("Bulwark", "Solipsist", ...)
+-- @field start_level: starting actor level to begin leveling in the class <1>
+-- @field level_rate: rate levels in character class are gained as % of actor level <100>
+-- @field check_talents_level: set true to enforce character level limits on talent levels (i.e. level 5 at level 50) <nil>
+-- @field level_by_class: set true to use class level rather than actor level when checking talent/stat limits <nil>
+-- @foe;d ignore_special: set true to skip checking talent special requirements
+-- @field auto_sustain: set true to automatically turn on sustained talents learned <nil>
+-- @field tt_focus: talent type focus, higher values cause talent selections to be focused within fewer talent types <3>
+-- @field use_actor_points: set true to apply stat/talent points from base actor levels in addtion to class levels <nil>
+--  The following fields are automatically generated or updated from the class birth descriptor:
+-- @field ttypes[table]: talent trees to learn talents from (updated with birth descriptor)
+--		{talent_type_name = {[1]=known, [2]=mastery_add}, ...}
+-- @field auto_stats: ordered list of stat ids to use when applying unused_stats points
+--		generated from class descriptor by default, set false to disable, see Actor:learnStats
+-- Additional talent inputs for each talent definition t:
+--	t.random_boss_rarity: if defined, the percent chance the talent may be learned each time randomly selected
+function _M:levelupClass(c_data)
+	c_data.last_level = c_data.last_level or 0
+	c_data.start_level = c_data.start_level or 1
+
+	local new_level = math.ceil((self.level - c_data.start_level + 1)*(c_data.level_rate or 100)/100)
+	
+	if new_level <= c_data.last_level then return end
+	print("[Actor:levelupClass]", self.name, "auto level up", c_data.class, c_data.last_level, "-->", new_level, c_data)
+	
+	local ttypes
+	-- temporarily remove any previous stat/talent points if they won't be used
+	local base_points = {self.unused_stats, self.unused_talents, self.unused_generics}
+	if not c_data.use_actor_points then
+		self.unused_stats, self.unused_talents, self.unused_generics = 0, 0, 0 
+	end
+
+	-- Initialize if needed, updating auto_classes table
+	if c_data.class and not c_data.initialized then -- build talent category list from the class
+		local Birther = require "engine.Birther"
+		local c_def = Birther.birth_descriptor_def.subclass[c_data.class]
+		if not c_def then
+			print("[Actor:levelupClass] ### undefined class:", c_data.class)
+			return
+		end
+
+		local mclasses = Birther.birth_descriptor_def.class
+		local mclass = nil
+		for name, data in pairs(mclasses) do
+			if data.descriptor_choices and data.descriptor_choices.subclass and data.descriptor_choices.subclass[c_def.name] then mclass = data break end
+		end
+		if not mclass then
+			print("[Actor:levelupClass] ###class", c_data.class, "has no parent class type###")
+			return 
+		end
+
+		print(("[Actor:levelupClass] %s %s ## Initialzing auto_class %s (%s) %s%% level_rate from level %s ##"):format(self.uid, self.name, c_data.class, mclass.name, c_data.level_rate, c_data.start_level))
+
+		-- update class descriptor list and build inherent power sources
+		self.descriptor = self.descriptor or {}
+		self.descriptor.classes = self.descriptor.classes or {}
+		table.append(self.descriptor.classes, {c_def.name})
+		
+		-- build inherent power sources and forbidden power sources
+		-- self.forbid_power_source --> self.not_power_source used for classes
+		self.power_source = table.merge(self.power_source or {}, c_def.power_source or {})
+		self.not_power_source = table.merge(self.not_power_source or {}, c_def.not_power_source or {})
+		-- update power source parameters with the new class
+		self.not_power_source, self.power_source = game.state:updatePowers(game.state:attrPowers(self, self.not_power_source), self.power_source)
+		print("  *** power types: not_power_source =", table.concat(table.keys(self.not_power_source),","), "power_source =", table.concat(table.keys(self.power_source),","))
+		
+		-- apply class stat bonuses and set up class auto_stats (in auto_classes)
+		local auto_stats
+		if c_def.stats and c_data.auto_stats ~= false then
+			auto_stats = {}
+			for stat, v in pairs(c_def.stats or {}) do
+				local stat_id = self.stats_def[stat].id
+				self.stats[stat_id] = (self.stats[stat_id] or 10) + v
+				for i = 1, v do auto_stats[#auto_stats+1] = stat_id end
+			end
+			c_data.auto_stats = auto_stats
+		end
+		c_data.auto_stats = c_data.auto_stats or auto_stats
+
+		ttypes = {}
+		for tt, d in pairs(mclass.talents_types or {}) do
+			self:learnTalentType(tt, d[1]) self:setTalentTypeMastery(tt, (self:getTalentTypeMastery(tt) or 1) + d[2])
+			ttypes[tt] = table.clone(d)
+		end
+		for tt, d in pairs(mclass.unlockable_talents_types or {}) do
+			self:learnTalentType(tt, d[1]) self:setTalentTypeMastery(tt, (self:getTalentTypeMastery(tt) or 1) + d[2])
+			ttypes[tt] = table.clone(d)
+		end
+		for tt, d in pairs(c_def.talents_types or {}) do
+			self:learnTalentType(tt, d[1]) self:setTalentTypeMastery(tt, (self:getTalentTypeMastery(tt) or 1) + d[2])
+			ttypes[tt] = table.clone(d)
+		end
+		for tt, d in pairs(c_def.unlockable_talents_types or {}) do
+			self:learnTalentType(tt, d[1]) self:setTalentTypeMastery(tt, (self:getTalentTypeMastery(tt) or 1) + d[2])
+			ttypes[tt] = table.clone(d)
+		end
+		
+		-- set up input talent categories specified (generally for non-class talents)
+		if c_data.ttypes then
+			for tt, d in pairs(c_data.ttypes) do
+				if not self:knowTalentType(tt) then
+					if type(d) ~= "table" then
+						d={true, type(d) == "number" and d or rng.range(1, 3)*0.1}
+					else d=table.clone(d)
+					end
+					self:learnTalentType(tt, d[1])
+					self:setTalentTypeMastery(tt, (self:getTalentTypeMastery(tt) or 1) + d[2])
+					ttypes[tt] = table.mergeAdd(ttypes[tt] or {}, d)
+				end
+			end
+		end
+		if not next(ttypes) then -- if not specified, use all known talent types
+			for tt, known in pairs(self.talents_types) do
+				ttypes[tt] = {known, (self:getTalentTypeMastery(tt) or 1) - 1}
+			end
+		end
+		
+		-- Note: could limit number of talent trees selected here to limit # talents learned
+		
+--print("\t *** auto_levelup initialized talent category choices:", mclass.name , c_def.name , "\n\t")
+		-- set up (semi-random) rarity levels for talent categories
+		-- This tends to focus learned talents within certain trees (usually those with improved mastery)
+		local tt_count = 0
+		local unknown_tt={}
+		local tt_focus = c_data.tt_focus or 3
+		for tt, d in pairs(ttypes) do
+			d.tt = tt
+			tt_count = tt_count + 1
+			d.tt_count = tt_count
+			d.rarity = d.rarity or (1.3 + 0.5*tt_count)/math.max(0.1, self:getTalentTypeMastery(tt)*rng.float(0.1, tt_focus))^2
+--print(("\t *** %-40s  rarity %5.3f"):format(tt, d.rarity))
+			if not d[1] then table.insert(unknown_tt, d) end
+		end
+		c_data.unknown_tt = unknown_tt