improved randarts

git-svn-id: http://svn.net-core.org/repos/t-engine4@1891 51575b47-30f0-44d4-a5cc-537603b46e54

game/engines/default/engine/Entity.lua

@@ -290,7 +290,7 @@ function _M:resolve(t, last, on_entity)
 	t = t or self
 	for k, e in pairs(t) do
 		if type(e) == "table" and e.__resolver and (not e.__resolve_last or last) then
-			t[k] = resolvers.calc[e.__resolver](e, on_entity or self, self)
+			t[k] = resolvers.calc[e.__resolver](e, on_entity or self, self, t, k)
 		elseif type(e) == "table" and not e.__CLASSNAME then
 			self:resolve(e, last, on_entity)
 		end

game/engines/default/engine/interface/ActorFOV.lua

@@ -82,7 +82,7 @@ function _M:computeFOV(radius, block, apply, force, no_store, cache)
 				fov.actors_dist[#fov.actors_dist+1] = a
 				a.__sqdist = sqdist
 				a:check("seen_by", self)
---				a:updateFOV(self, t.sqdist)
+				a:updateFOV(self, t.sqdist)
 			end
 		end, cache and game.level.map._fovcache[block])
 

game/engines/default/engine/utils.lua

@@ -108,6 +108,12 @@ function table.listify(t)
 	return tt
 end
 
+function table.keys(t)
+	local tt = {}
+	for k, e in pairs(t) do tt[#tt+1] = k end
+	return tt
+end
+
 function table.update(dst, src, deep)
 	for k, e in pairs(src) do
 		if deep and dst[k] and type(e) == "table" and type(dst[k]) == "table" and not e.__CLASSNAME then

game/modules/tome/class/GameState.lua

@@ -144,12 +144,11 @@ function _M:generateRandart(add)
 	o.no_unique_lore = true
 	o.rarity = rng.range(200, 290)
 
+	local allthemes = {'misc','psionic','sorcerous','nature','brawny','lightning','arcane','light','physical','def','tireless','unyielding','dark','nimble','spell','cold','fire','venom','attack'}
 	local pthemes = table.listify(o.randart_able)
-	local themes = {}
-	local no_theme = true
+	local themes = {[rng.table(allthemes)] = true}
 	for i = 1, #pthemes do if rng.percent(pthemes[i][2]) then themes[pthemes[i][1]] = true no_theme = false end end
 	local themes_fct = function(e)
-		if no_theme then return true end
 		for theme, _ in pairs(e.theme) do if themes[theme] then return true end end
 		return false
 	end
@@ -159,6 +158,7 @@ function _M:generateRandart(add)
 	local nb_powers = 2 + rng.dice(math.max(1, lev / 10), 2)
 	local powers = {}
 	print("Creating randart "..o.name.." with level "..lev)
+	print(" == using themes", table.concat(table.keys(themes), ','))
 
 	-- Select some powers
 	for i = 1, nb_powers do
@@ -170,6 +170,26 @@ function _M:generateRandart(add)
 		end
 	end
 
+	local function merger(dst, src)
+		for k, e in pairs(src) do
+			if type(e) == "table" then
+				if e.__resolver and e.__resolver == "randartmax" then
+					dst[k] = (dst[k] or 0) + e.v
+					if dst[k] > e.max then
+						dst[k] = e.max
+					end
+				else
+					if not dst[k] then dst[k] = {} end
+					merger(dst[k], e)
+				end
+			elseif type(e) == "number" then
+				dst[k] = (dst[k] or 0) + e
+			else
+				error("Type "..type(e).. " for randart property unsupported!")
+			end
+		end
+	end
+
 	-- Distribute points
 	local hpoints = math.ceil(points / 2)
 	local i = 0
@@ -178,13 +198,16 @@ function _M:generateRandart(add)
 
 		local p = powers[i]:clone()
 		if p.points <= hpoints then
-			p:resolve(nil, nil, o)
-			p.__CLASSNAME = nil
-			table.mergeAddAppendArray(o, p, true)
-			print(" * adding power: "..p.name)
+			if p.wielder then
+				o.wielder = o.wielder or {}
+				merger(o.wielder, p.wielder)
+			end
+			if p.copy then merger(o, p.copy) end
+--			print(" * adding power: "..p.name)
 		end
 		hpoints = hpoints - p.points
 	end
+	o:resolve() o:resolve(nil, true)
 
 	-- Bias toward some powers
 	local bias_powers = {}
@@ -196,13 +219,15 @@ function _M:generateRandart(add)
 		i = util.boundWrap(i + 1, 1, #bias_powers)
 
 		local p = bias_powers[i]:clone()
-		if p.points <= hpoints then
-			p:resolve(nil, nil, o)
-			p.__CLASSNAME = nil
-			table.mergeAddAppendArray(o, p, true)
-			print(" * adding power: "..p.name)
+		if p.points <= hpoints * 2 then
+			if p.wielder then
+				o.wielder = o.wielder or {}
+				merger(o.wielder, p.wielder)
+			end
+			if p.copy then merger(o, p.copy) end
+--			print(" * adding power: "..p.name)
 		end
-		hpoints = hpoints - p.points
+		hpoints = hpoints - p.points * 2
 	end
 
 	-- Setup the name

game/modules/tome/resolvers.lua

@@ -274,3 +274,11 @@ function resolvers.calc.sustains_at_birth(_, e)
 		end
 	end
 end
+
+--- Help creating randarts
+function resolvers.randartmax(v, max)
+	return {__resolver="randartmax", v=v, max=max}
+end
+function resolvers.calc.randartmax(t, e)
+	return t.v
+end