Merge branch 'inconstant-resource-drain' into 'master'

Support inconstant resource drain

Make things like `drain_vim` recalculate in every turn.

This will fix the problem with `Fearscape`, and the regen value of `Dream Prison` and `Meditation` will be automatically updated.

It will also make addon maker easier to make sustained talent with changing resource drain.

See merge request !727

@@ -579,6 +579,18 @@ function _M:actBase()
 		end
 	end
 
+	for _, defs in pairs(self._applied_resources_inconstant_drain or {}) do
+		local new_cost = util.getval(defs.cost, self, defs.ab) or 0
+		new_cost = self:alterTalentCost(defs.ab, defs.res_def.drain_prop, new_cost)
+		if not defs.res_def.invert_values then
+			new_cost = - new_cost
+		end
+		if defs.old_cost ~= new_cost then
+			self:removeTemporaryValue(defs.res_def.regen_prop, defs.temporary_value)
+			defs.temporary_value = self:addTemporaryValue(defs.res_def.regen_prop, new_cost)
+			defs.old_cost = new_cost
+		end
+	end
 	self:regenResources()
 
 	-- update psionic feedback
@@ -6350,7 +6362,7 @@ function _M:postUseTalent(ab, ret, silent)
 				trigger = true; self:incMaxFeedback(-util.getval(ab.sustain_feedback, self, ab))
 			end
 			local cost
-			ret._applied_costs,	ret._applied_drains = {}, {} -- to store the resource effects
+			ret._applied_costs,	ret._applied_drains, ret._applied_inconstant_drains = {}, {}, {} -- to store the resource effects
 			for res, res_def in ipairs(_M.resources_def) do
 				-- apply sustain costs
 				cost = ab[res_def.sustain_prop]
@@ -6369,7 +6381,19 @@ function _M:postUseTalent(ab, ret, silent)
 				end
 				-- apply drain costs
 				cost = ab[res_def.drain_prop]
-				if cost then
+				if type(cost) == "function" then -- non-constant resource drain
+					local init_cost = util.getval(cost, self, ab) or 0
+					init_cost = self:alterTalentCost(ab, res_def.drain_prop, init_cost)
+					if not res_def.invert_values then
+						init_cost = - init_cost
+					end
+					local temporary_value = self:addTemporaryValue(res_def.regen_prop, init_cost)
+					local tid_res = ab.id .. "_" .. res_def.drain_prop
+					self._applied_resources_inconstant_drain = self._applied_resources_inconstant_drain or {}
+					self._applied_resources_inconstant_drain[tid_res] = {ab = ab, res_def = res_def, cost = cost, old_cost = init_cost, temporary_value = temporary_value}
+					ret._applied_inconstant_drains[res_def.short_name] = tid_res
+					trigger = true
+				elseif cost then
 					cost = util.getval(cost, self, ab) or 0
 					cost = self:alterTalentCost(ab, res_def.drain_prop, cost)
 					if cost ~= 0 then
@@ -6412,6 +6436,14 @@ function _M:postUseTalent(ab, ret, silent)
 					end
 				end
 			end
+			-- reverse non-constant resource drain
+			if ret._applied_inconstant_drains then
+				for _, tid_res in pairs(ret._applied_inconstant_drains) do
+					local defs = self._applied_resources_inconstant_drain[tid_res]
+					self:removeTemporaryValue(defs.res_def.regen_prop, defs.temporary_value)
+					self._applied_resources_inconstant_drain[tid_res] = nil
+				end
+			end
 			-- reverse resource drains
 			if ret._applied_drains then
 				local res_def

@@ -125,9 +125,7 @@ newTalent{
 	callbackOnActBase = function(self, t)
 		local p = self:isTalentActive(t.id)
 		if not p then return end
-		if p.stamina then self:removeTemporaryValue("stamina_regen", p.stamina) end
 		if p.turns then p.turns = p.turns + 1 end
-		p.stamina = self:addTemporaryValue("stamina_regen", -(t.drain_stamina(self, t, p.turns) - t.drain_stamina(self, t, 0)))
 
 		-- This should be redundant but there are cases the value won't properly update, ie direct life reductions
 		if p.resid then self:removeTemporaryValue("resists", p.resid) end