hiemal shield regens, and stuff

game/modules/tome/data/gfx/particles/rime_wraith_move.lua

@@ -46,4 +46,4 @@ return {
 	}
 end}, function(self)
 	if first then self.ps:emit(1) first = false end
-end, 1, "particles_images/flaming_bat_projectile"
+end, 1, "particles_images/rime_wraith"

game/modules/tome/data/talents/spells/eradication.lua

@@ -84,6 +84,7 @@ newTalent{
 	getNb = function(self, t) return math.floor(self:combatTalentScale(t, 1, 5)) end,
 	target = function(self, t) return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t)} end,
 	on_pre_use = function(self, t)
+		if not game.level then return false end
 		for i, e in ipairs(game.level.map.effects) do
 			if e.damtype == DamageType.BONEYARD and e.src == self then return true end
 		end		

game/modules/tome/data/talents/spells/glacial-waste.lua

@@ -39,6 +39,16 @@ newTalent{
 		if val >= 1000 then fnt = "buff_font_smaller" end
 		return tostring(math.ceil(val)), fnt
 	end,
+	resetShield = function(self, t, ret)
+		ret.been_used = nil
+		ret.shield = t:_getMaxAbsorb(self)
+		ret.original_shield = ret.shield
+		if self:knowTalent(self.T_DESOLATE_WASTE) then
+			ret.waste_threshold = self:callTalent(self.T_DESOLATE_WASTE, "getThreshold")
+			ret.waste_triggers = math.floor(100 / ret.waste_threshold)
+			ret.waste_counter = 0
+		end
+	end,
 	callbackOnActBase = checkLifeThreshold(1, function(self, t)
 		local p = self:isTalentActive(t.id)
 		if not p then return end
@@ -53,7 +63,36 @@ newTalent{
 				p.crit_id = nil
 			end
 		end
+	end, function(self, t)
+		local p = self:isTalentActive(t.id)
+		if not p then return end
+
+		if p.out_combat_turn and p.out_combat_turn < game.turn - 100 and p.been_used then
+			local mana = util.getval(t.mana, self, t) or 0
+			mana = self:alterTalentCost(t, "mana", mana)
+			local soul = util.getval(t.soul, self, t) or 0
+			soul = self:alterTalentCost(t, "soul", soul)
+
+			if self:getSoul() < soul or self:getMana() < mana then
+				game.logPlayer(self, "#GREY#Your hiemal shield does not have enough ressources!")
+				self:forceUseTalent(t.id, {ignore_energy=true})
+			else
+				game.logPlayer(self, "#GREY#Your hiemal shield regenerates to full!")
+				t:_resetShield(self, p)
+				self:incMana(-mana)
+				self:incSoul(-soul)
+			end
+		end
 	end),
+	callbackOnCombat = function(self, t, state)
+		local p = self:isTalentActive(t.id)
+		if not p then return end
+		if state then
+			p.out_combat_turn = nil
+		else
+			p.out_combat_turn = game.turn
+		end
+	end,
 	callbackOnHit = function(self, t, cb, src, dt)
 		local p = self:isTalentActive(t.id)
 		if not p then return end
@@ -84,6 +123,7 @@ newTalent{
 			cb.value = (rvalue - p.shield) / reduce
 			p.shield = 0
 		end
+		p.been_used = true
 
 		self.turn_procs.hiemal_shield = self.turn_procs.hiemal_shield or {}
 		if src and src ~= self and src.x and src.y and not self.turn_procs.hiemal_shield[src] then
@@ -99,13 +139,7 @@ newTalent{
 	end,
 	activate = function(self, t)
 		local ret = { }
-		ret.shield = t:_getMaxAbsorb(self)
-		ret.original_shield = ret.shield
-		if self:knowTalent(self.T_DESOLATE_WASTE) then
-			ret.waste_threshold = self:callTalent(self.T_DESOLATE_WASTE, "getThreshold")
-			ret.waste_triggers = math.floor(100 / ret.waste_threshold)
-			ret.waste_counter = 0
-		end
+		t:_resetShield(self, ret)
 
 		if core.shader.active(4) then
 			ret.particle = self:addParticles(Particles.new("shader_shield", 1, {size_factor=1.4, img="hiemal_aegis"}, {type="shield", ellipsoidalFactor=1, shieldIntensity=0.4, color={0.9, 0.9, 1.0}}))
@@ -125,6 +159,7 @@ newTalent{
 		return ([[Conjure a shield of ice around you that can absorbs a total of %d damage.
 		Anytime it does it retaliates by sending a bolt of ice at the attacker, dealing %0.2f cold damage (this can only happen once per turn per creature).
 		When you are under 1 life it also reduces the damage of critical hits by %d%%.
+		10 turns after leaving combat the shield will consume its mana and soul cost again to fully regenerate if needed. if that cost can not be matched, it unsustains.
 		The shield strength will increase with your Spellpower.]]):
 		tformat(t:_getMaxAbsorb(self), damDesc(self, DamageType.COLD, t:_getDamage(self)), t:_getCritResist(self))
 	end,

game/modules/tome/data/talents/spells/grave.lua

@@ -70,9 +70,9 @@ newTalent{
 	requires_target = true,
 	target = function(self, t)
 		if self:getTalentLevel(t) < 5 then
-			return {type="hit", range=self:getTalentRange(t)}
+			return {type="hit", range=self:getTalentRange(t), friendlyfire=false}
 		else
-			return {type="ball", radius=1, range=self:getTalentRange(t)}
+			return {type="ball", radius=1, range=self:getTalentRange(t), friendlyfire=false}
 		end
 	end,
 	getDamage = function(self, t) return self:combatTalentSpellDamage(t, 20, 250) end,

game/modules/tome/data/talents/spells/necrosis.lua

@@ -75,7 +75,7 @@ newTalent{
 		local cd = t.getCD(self, t)
 		local dam = self:spellCrit(t.getDamage(self, t))
 		game.logSeen(self, "#GREY#%s unleashes a blast of frostdusk as %s crosses the veil!", self:getName():capitalize(), string.he_she(self))
-		self:projectApply({type="ball", radius=self:getTalentRadius(t), talent=t}, self.x, self.y, Map.ACTOR, function(target, px, py)
+		self:projectApply({type="ball", radius=self:getTalentRadius(t), talent=t, friendlyfire=false}, self.x, self.y, Map.ACTOR, function(target, px, py)
 			local d = DamageType:get(DamageType.FROSTDUSK).projector(self, target.x, target.y, DamageType.FROSTDUSK, dam)
 			if d > 0 and #list > 0 then
 				self:alterTalentCoolingdown(rng.tableRemove(list), -cd)

game/modules/tome/data/talents/spells/nightfall.lua

@@ -88,7 +88,7 @@ newTalent{
 			5, nil,
 			{type="circle_of_death", overlay_particle={zdepth=6, only_one=true, type="circle", args={oversize=1, a=100, appear=8, speed=-0.05, img="necromantic_circle", radius=self:getTalentRadius(t)}}},
 --			{zdepth=6, only_one=true, type="circle", args={oversize=1, a=130, appear=8, speed=-0.03, img="arcane_circle", radius=self:getTalentRadius(t)}},
-			nil, false
+			nil, false, false
 		)
 
 		game:playSoundNear(self, "talents/fire")
@@ -162,7 +162,7 @@ newTalent{
 	direct_hit = true,
 	requires_target = true,
 	radius = function(self, t) return math.floor(self:combatTalentScale(t, 3, 4)) end,
-	target = function(self, t) return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), friendlyfire=true, talent=t, display={particle="bolt_dark", trail="darktrail"}} end,
+	target = function(self, t) return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), friendlyfire=false, talent=t, display={particle="bolt_dark", trail="darktrail"}} end,
 	getDamage = function(self, t) return self:combatTalentSpellDamage(t, 20, 280) end,
 	iconOverlay = function(self, t, p)
 		local val = p.dur

game/modules/tome/data/talents/spells/spells.lua

@@ -268,7 +268,7 @@ function necroSetupSummon(self, def, x, y, level, turns, no_control)
 	return m
 end
 
-function checkLifeThreshold(val, fct)
+function checkLifeThreshold(val, fct, basefct)
 	return function(self, t)
 		local checkid = "__check_threshold_"..t.id
 		if not self[checkid] then self[checkid] = self.life end
@@ -276,6 +276,7 @@ function checkLifeThreshold(val, fct)
 			fct(self, t)
 		end
 		self[checkid] = self.life
+		if basefct then basefct(self, t) end
 	end
 end
 -------------------------------------------

game/modules/tome/data/timed_effects/magical.lua

@@ -5102,7 +5102,7 @@ local rime_wraith_def = {
 	end,
 	activate = function(self, eff)
 		if core.shader.active() then
-			self:effectParticles(eff, {type="shader_shield", args={toback=false,  size_factor=1.5, img="05_vimsense"}, shader={type="tentacles", appearTime=0.6, time_factor=1000, noup=0.0}})
+			self:effectParticles(eff, {type="shader_shield", args={toback=false,  size_factor=1.5, img="rime_wraith_tentacle_shader_wings"}, shader={type="tentacles", appearTime=0.6, time_factor=1000, noup=0.0}})
 		end
 	end,
 	on_timeout = function(self, eff)