Merge branch '174-miscs' into 'master'

Miscs

1. Bring back the fix: The duration of an existing effect will not be reduced by setting a new effect with a shorter duration (controlled by on_merge for some  effects).
2. Living lightning correctly works with Range Amplification Device
3. Stormshield rune's block number and threshold should be an integer
4. Randart bows & slings should not have base damage

See merge request !771

@@ -7630,6 +7630,7 @@ function _M:on_set_temporary_effect(eff_id, e, p)
 	p.getName = e.getName
 	p.resolveSource = e.resolveSource
 
+	local old = self.tmp[eff_id]
 	local olddur = old and not e.on_merge and old.dur or 0 -- let mergable effects handle their own duration
 	-- Adjust duration based on saves
 	if p.apply_power and (save_for_effects[e.type] or p.apply_save) then

@@ -30,6 +30,9 @@ load("/data/general/objects/random-artifacts/melee.lua", function(e)
 		e.wielder.ranged_project = table.clone(e.wielder.melee_project)
 		e.wielder.melee_project = nil
 	end
+	if e.combat and e.combat.dam then -- bows & slings should not have base damage
+		e.rarity = nil
+	end
 end)
 
 ----------------------------------------------------------------

@@ -751,11 +751,11 @@ newInscription{
 	end,
 	getThreshold = function(self, t) 
 		local data = self:getInscriptionData(t.short_name)
-		return data.threshold
+		return math.ceil(data.threshold)
 	end,
 	getBlocks = function(self, t) 
 		local data = self:getInscriptionData(t.short_name)
-		return data.blocks + data.inc_stat
+		return math.ceil(data.blocks + data.inc_stat)
 	end,
 	action = function(self, t)
 		local data = self:getInscriptionData(t.short_name)

@@ -152,7 +152,7 @@ newTalent{
 	target = function(self, t) return{type="hit", range=self:getTalentRange(t), talent=t, friendlyblock=false, friendlyfire=false} end,
 	callbackOnActBase = function(self, t)
 		local tgts = {}
-		local grids = core.fov.circle_grids(self.x, self.y, 6, true)
+		local grids = core.fov.circle_grids(self.x, self.y, self:getTalentRange(t), true)
 		for x, yy in pairs(grids) do for y, _ in pairs(grids[x]) do
 			local a = game.level.map(x, y, Map.ACTOR)
 			if a and self:reactionToward(a) < 0 then