Merge branch 'Bunny/t-engine4-1.7.3bnnsc'

@@ -203,7 +203,8 @@ function _M:tooltip(x, y)
 				if p.level <= data.level_range[1] - 10 then color = "CRIMSON"
 				elseif p.level <= data.level_range[1] - 4 then color = "ORANGE"
 				end
-				tstr:add(true, {"font","bold"}, {"color", color}, _t"Min.level: "..data.level_range[1], {"color", "LAST"}, {"font","normal"}, true)
+				tstr:add(true, {"font","bold"}, {"color", color}, _t"Min.level: "..math.floor((data.level_range[1]+(game.state.birth.difficulty_level_add or 0))*(game.state.birth.difficulty_level_mult or 1)), {"color", "LAST"}, {"font","normal"}, true)
+				tstr:add(true, {"font","bold"}, {"color", color}, _t"Max.level: "..math.ceil((data.level_range[2]+(game.state.birth.difficulty_level_add or 0))*(game.state.birth.difficulty_level_mult or 1)), {"color", "LAST"}, {"font","normal"}, true)
 			end
 		end
 	end

@@ -127,7 +127,7 @@ function _M:attackTarget(target, damtype, mult, noenergy, force_unarmed)
 --		if ret then return false end
 --	end
 
-	if not target.turn_procs.warding_weapon and target:knowTalent(target.T_WARDING_WEAPON) and target:getTalentLevelRaw(target.T_WARDING_WEAPON) >= 5
+	if not target.turn_procs.warding_weapon and target:knowTalent(target.T_WARDING_WEAPON) and target:getTalentLevel(target.T_WARDING_WEAPON) >= 5
 		and rng.percent(target:callTalent(target.T_WARDING_WEAPON, "getChance")) then
 		local t = self:getTalentFromId(self.T_WARDING_WEAPON)
 		if target:getPsi() >= t.psi then

@@ -146,6 +146,7 @@ newBirthDescriptor{
 		["cursed/shadows"]={true, 0.3},
 		["cursed/darkness"]={true, 0.3},
 		["cursed/cursed-form"]={true, 0.0},
+		["technique/combat-training"]={true, 0.0},
 		["cunning/survival"]={false, 0.0},
 		["cursed/fears"]={false, 0.3},
 		["cursed/one-with-shadows"]={false, 0.3},

@@ -76,7 +76,7 @@ newBirthDescriptor{
 		["technique/shield-offense"]={true, 0.0},
 		["technique/2hweapon-assault"]={true, 0.0},
 		["technique/combat-techniques-active"]={false, 0.0},
-		["technique/combat-training"]={true, 0.0},
+		["technique/combat-training"]={true, 0.3},
 		["cunning/survival"]={false, 0.0},
 		["technique/combat-techniques-passive"]={true, 0.0},
 		["celestial/sun"]={true, 0.3},
@@ -149,6 +149,7 @@ newBirthDescriptor{
 	power_source = {arcane=true},
 	stats = { mag=6, cun=3, },
 	talents_types = {
+		["technique/combat-training"]={true, 0.0},
 		["cunning/survival"]={false, 0.0},
 		["celestial/sunlight"]={true, 0.3},
 		["celestial/chants"]={true, 0.3},

@@ -114,6 +114,7 @@ newBirthDescriptor{
 		["chronomancy/chronomancy"]={true, 0.3},
 		["chronomancy/fate-weaving"]={true, 0.3},
 		["chronomancy/spacetime-weaving"]={true, 0.3},
+		["technique/combat-training"]={true, 0.0},
 
 		-- locked generic
 		["chronomancy/energy"]={false, 0.3},

@@ -132,6 +132,7 @@ newBirthDescriptor{
 		end,
 	},
 	talents_types = {
+		["technique/combat-training"]={true, 0.0},
 		["cunning/survival"]={false, 0.0},
 		["corruption/sanguisuge"]={true, 0.3},
 		["corruption/hexes"]={true, 0.3},

@@ -87,6 +87,7 @@ newBirthDescriptor{
 		["spell/acid-alchemy"]={true, 0.3},
 		["spell/frost-alchemy"]={true, 0.3},
 		["spell/energy-alchemy"]={false, 0.3},
+		["technique/combat-training"]={true, 0.0},
 		["spell/staff-combat"]={true, 0.3},
 		["cunning/survival"]={false, 0.0},
 	},
@@ -201,6 +202,7 @@ newBirthDescriptor{
 		["spell/divination"]={true, 0.3},
 		["spell/conveyance"]={true, 0.3},
 		["spell/aegis"]={true, 0.3},
+		["technique/combat-training"]={true, 0.0},
 		["cunning/survival"]={false, 0.0},
 	},
 	talents = {
@@ -268,6 +270,7 @@ newBirthDescriptor{
 		["spell/death"]={true, 0.3},
 		["spell/animus"]={true, 0.3},
 		["spell/eradication"]={false, 0.3},
+		["technique/combat-training"]={true, 0.0},
 		["spell/spectre"]={true, 0.3},
 		["spell/necrosis"]={true, 0.3},
 		["cunning/survival"]={true, 0.0},

@@ -90,7 +90,7 @@ newBirthDescriptor{
 		["psionic/charged-mastery"]={false, 0.3},
 		--Miscellaneous trees:
 		["cunning/survival"]={true, 0},
-		["technique/combat-training"]={true, 0},
+		["technique/combat-training"]={true, 0.3},
 	},
 	talents = {
 		[ActorTalents.T_KINETIC_SHIELD] = 1,
@@ -171,6 +171,7 @@ newBirthDescriptor{
 		["psionic/feedback"]={true, 0.3},
 		["psionic/mentalism"]={true, 0.3},
 		["cunning/survival"]={true, 0.0},
+		["technique/combat-training"]={true, 0.0},
 
 		-- locked trees
 		["psionic/discharge"]={false, 0.3},

@@ -355,7 +355,7 @@ newBirthDescriptor{
 		["cunning/dirty"]={false, 0.0},
 		["cunning/tactical"]={true, 0.3},
 		["cunning/survival"]={true, 0.0},
-		["technique/combat-training"]={true, 0.0},
+		["technique/combat-training"]={true, 0.3},
 		["technique/combat-techniques-active"]={true, 0.3},
 		["technique/combat-techniques-passive"]={true, 0.0},
 		["technique/pugilism"]={true, 0.3},

@@ -212,6 +212,7 @@ newBirthDescriptor{
 	stats = { wil=5, cun=4, },
 	talents_types = {
 		["cunning/survival"]={true, 0.0},
+		["technique/combat-training"]={true, 0.0},
 		["wild-gift/call"]={true, 0.3},
 		["wild-gift/antimagic"]={true, 0.3},
 		["wild-gift/mindstar-mastery"]={true, 0.3},

@@ -283,8 +283,8 @@ newEntity{ base = "BASE_LITE", define_as = "WINTERTIDE_PHIAL",
 	material_level = 2,
 
 	wielder = {
-		lite = 1,
-		infravision = 6,
+		lite = 2,
+		infravision = 7,
 	},
 
 	max_power = 60, power_regen = 1,

@@ -501,7 +501,7 @@ newEntity{ base = "BASE_KNIFE",
 		dam = 45,
 		apr = 11,
 		physcrit = 18,
-		dammod = {dex=0.55,str=0.35},
+		dammod = {dex=0.5,str=0.5},
 	},
 	wielder = {
 		lite = 1,
@@ -1176,7 +1176,7 @@ newEntity{ base = "BASE_KNIFE", -- Thanks Grayswandir!
 		dam = 20,
 		apr = 10,
 		physcrit = 12,
-		dammod = {dex=0.45,str=0.45,},
+		dammod = {dex=0.5,str=0.5,},
 		lifesteal = 6,
 		melee_project = {
 			[DamageType.FIRE] = 20,

@@ -370,6 +370,7 @@ newEntity{ base = "BASE_LITE", define_as = "SUMMERTIDE_PHIAL",
 	desc = _t[[A small crystal phial that captured Sunlight during the Summertide.]],
 	special_desc = function(self) return _t"When attacking in melee, deals 15 light damage and lights tiles in radius 1." end,
 	cost = 200,
+	material_level = 1,
 
 	max_power = 15, power_regen = 1,
 	use_power = {
@@ -848,7 +849,7 @@ newEntity{ base = "BASE_KNIFE",
 		dam = 25,
 		apr = 10,
 		physcrit = 8,
-		dammod = {dex=0.55,str=0.35},
+		dammod = {dex=0.65,str=0.35},
 		no_stealth_break = true,
 		no_garrote = true,
 		melee_project={[DamageType.RANDOM_SILENCE] = 10},
@@ -2966,7 +2967,7 @@ newEntity{ base = "BASE_KNIFE",
 		dam = 25,
 		apr = 10,
 		physcrit = 9,
-		dammod = {dex=0.45,str=0.45, mag=0.1},
+		dammod = {dex=0.5,str=0.5, mag=0.15},
 		convert_damage = {
 			[DamageType.DARKNESS] = 50,
 		},
@@ -6140,7 +6141,7 @@ Passed on and on, this blade has developed a thirst of its own.]],
 		dam = 27,
 		apr = 8,
 		physcrit = 9,
-		dammod = {str=0.45, dex=0.55, mag=0.05},
+		dammod = {str=0.35, dex=0.55, mag=0.2},
 		talent_on_hit = { T_DISPERSE_MAGIC = {level=1, chance=15},},
 		special_on_hit = {desc=_t"steals up to 50 mana from the target", fct=function(combat, who, target)
 			local manadrain = util.bound(target:getMana(), 0, 50)
@@ -8221,7 +8222,7 @@ Their killing spree ended when one of the victims got lucky and managed to stab
 		dam = 35,
 		apr = 10,
 		physcrit = 15,
-		dammod = {str=0.45, dex=0.45},
+		dammod = {str=0.5, dex=0.5},
 		melee_project = { [DamageType.COLD]=30 },
 		special_on_crit = {desc=_t"freezes the target", fct=function(combat, who, target)
 			if not target or target == self then return end

@@ -35,7 +35,7 @@ return {
 	system_rotation = dir, system_rotationv = 0,
 	generator = function()
 	return {
-		life = 42,
+		life = 15,
 		--size = 30, sizev = 2.1*64*radius/16, sizea = 0,
 		size = 3.5*64*radius, sizev = 0, sizea = 0,
 
@@ -47,7 +47,7 @@ return {
 		r = 1, rv = 0, ra = 0,
 		g = 1, gv = 0, ga = 0,
 		b = 1, bv = 0, ba = 0,
-		a = 1, av = 0, aa = 0,
+		a = 0.7, av = 0, aa = 0,
 	}
 end, },
 function(self)

@@ -51,7 +51,7 @@ defineTile('2', "FLOOR", {random_filter={type="ammo", add_levels=10, tome_mod="v
 
 return {
 [[XXXXXXXXXXXXXXXXX]],
-[[XE$..#.....#..$EX]],
+[[XE$...........$EX]],
 [[X$2$##..P..##$2$X]],
 [[X.$##.......##$.X]],
 [[X.##...X^X...##.X]],
@@ -61,7 +61,7 @@ return {
 [[X.T.^.#1D1#.^.T.X]],
 [[X...XXX111XXX...X]],
 [[X......X#X......X]],
-[[X##..e.X.X.e..##X]],
+[[X.#..e.X.X.e..#.X]],
 [[X.##...X^X...##.X]],
 [[X.$##.......##$.X]],
 [[X$2$##..P..##$2$X]],

@@ -55,19 +55,19 @@ defineTile('O', "FLOOR", nil, {random_filter={add_levels=15, name="orc necromanc
 defineTile('K', "FLOOR", nil, {random_filter={add_levels=5, type="undead", subtype="giant", special_rarity="bonegiant_rarity"}})
 
 return {
-[[...............................]],
-[[.#############################.]],
-[[.#...................+...+.K\#.]],
-[[.#.......o....o......#####.o\#.]],
-[[.#......................K#.K\#.]],
-[[.#.....o.................#####.]],
-[[.#~~~.....o...###........#o.K#.]],
-[[.#~O~..o......%$#........+...X.]],
-[[.#~~~.........###........#o.K#.]],
-[[.#.......o..o............#####.]],
-[[.#......................K#.K(#.]],
-[[.#....o....o.........#####.o(#.]],
-[[.#...................+...+.K(#.]],
-[[.#############################.]],
-[[...............................]],
+[[...........................]],
+[[.#########################.]],
+[[.#...............+...+.K\#.]],
+[[.#......o...o....#####.o\#.]],
+[[.#..................K#.K\#.]],
+[[.#.....o.............#####.]],
+[[.#~~~...o...###......#o.K#.]],
+[[.#~O~..o.....$#......+...X.]],
+[[.#~~~.......###......#o.K#.]],
+[[.#.....o..o..........#####.]],
+[[.#..................K#.K(#.]],
+[[.#...o...o.......#####.o(#.]],
+[[.#...............+...+.K(#.]],
+[[.#########################.]],
+[[...........................]],
 }

@@ -50,17 +50,17 @@ defineTile('d', "FLOOR", {random_filter={add_levels=15, tome_mod="gvault"}}, {ra
 return {
 
 [[########################]],
-[[#$$a/##.........c##d...#]],
+[[#$$a/##.........c..d...#]],
 [[#$$a##.........a.a##...#]],
-[[#ca##....^^^^^^.c.b%%..#]],
-[[#c%%.....^^^^^^.a.a.##.#]],
-[[###......^^^^^^c.a.ba###]],
-[[##.......^^^/^^.caaa...X]],
-[[###......^^^~^^caa.b.###]],
+[[#ca##....^^^^^^.c.b##..#]],
+[[#c##.....^^^^^^.a.a.##.#]],
+[[#.#......^^^^^^c.a.ba###]],
+[[#........^^^/^^.caaa...X]],
+[[#.#......^^^~^^caa.b.###]],
 [[#$##.....^~~~^^a..ba##d#]],
 [[#$$##....^~^^^^.c.a##..#]],
-[[#aaa##............%%...#]],
-[[#aacc%%.........c##....#]],
+[[#aaa##............##...#]],
+[[#aacc##.........c......#]],
 [[########################]],
 
 }
\ No newline at end of file

@@ -78,20 +78,21 @@ defineTile('!', "DOOR_VAULT")
 defineTile('>', "DYNAMIC_ZONE_EXIT")
 
 
-defineTile('b', "FLOOR", {random_filter={add_levels=20, tome_mod="gvault"}}, {random_filter={add_levels=5, name="skeleton magus"}})
+defineTile('b', "FLOOR", {random_filter={add_levels=15, tome_mod="gvault"}}, {random_filter={add_levels=5, name="skeleton magus"}})
 defineTile('$', "FLOOR", {random_filter={add_levels=25, type="money"}})
-defineTile('j', "FLOOR", {random_filter={add_levels=10, type="jewelry", tome_mod="gvault"}})
-defineTile('t', "FLOOR", {random_filter={add_levels=5, tome_mod="gvault"}}, turret())
+defineTile('j', "FLOOR", {random_filter={add_levels=5, type="jewelry", tome_mod="vault"}})
+defineTile('J', "FLOOR", {random_filter={add_levels=10, type="jewelry", tome_mod="gvault"}})
+defineTile('t', "FLOOR", {random_filter={add_levels=5, tome_mod="vault"}}, turret())
 
 local def = {
 [[##############]],
-[[#tjj##########]],
+[[#tjJ##########]],
 [[#b$$##########]],
 [[##.##t$..t####]],
 [[#t.+...>..####]],
 [[##.##...$.####]],
 [[#b$$#$...t####]],
-[[#tjj##########]],
+[[#tjJ##########]],
 [[##############]],
 }
 

@@ -20,7 +20,7 @@
 name = _t"Following The Way"
 desc = function(self, who)
 	local desc = {}
-	desc[#desc+1] = _t"You have been tasked to remove at leastg one of the threats to the yeeks.\n"
+	desc[#desc+1] = _t"You have been tasked to remove at least one of the threats to the yeeks.\n"
 	desc[#desc+1] = _t"Protect the Way, and vanquish your foes.\n"
 	if self:isCompleted("murgol") then
 		if self:isCompleted("murgol-invaded") then

@@ -140,7 +140,7 @@ newTalent{
 	no_sustain_autoreset = true,
 	random_boss_rarity = 5,
 	rnd_boss_restrict = function(self, t, data)
-		return data.level < 20
+		return true -- allow only on fixedbosses specifically granted the talent
 	end,
 	tactical = {
 		-- heals (negative attack) demons hurts others

@@ -162,8 +162,8 @@ newTalent{
 	range = 1,
 	target = function(self, t) return {type="hit", range=self:getTalentRange(t)} end,
 	getDamage = function(self, t) return self:combatTalentWeaponDamage(t, 1, 1.5) end,
-	getDuration = function(self, t) return self:combatTalentScale(t, 2, 4, "log") end,
-	getDebuffs = function(self, t) return math.floor(self:combatTalentScale(t, 1, 3, "log")) end,
+	getDuration = function(self, t) return math.floor(self:combatTalentScale(t, 2, 5)) end,
+	getDebuffs = function(self, t) return math.floor(self:combatTalentScale(t, 1.5, 3)) end,
 	speed = "weapon",
 	action = function(self, t)
 		local tg = self:getTalentTarget(t)

@@ -40,7 +40,7 @@ newTalent{
 	getPin = function(self, t) return math.ceil(self:combatTalentLimit(t, 100, 25, 45)) end, -- Limit < 100%
 	range = 0,
 	radius = function(self, t)
-		return math.floor(self:combatTalentScale(t,2.5, 4.5, nil, 0, 0, true)) --uses raw talent level
+		return math.floor(self:combatTalentScale(t, 2.35, 4.25))
 	end,
 	target = function(self, t)
 		return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t)}
@@ -90,7 +90,7 @@ newTalent{
 	getHeal = function(self, t) return math.floor(self:combatTalentLimit(t, 200, 62, 110)) end, -- Limit < 200%	
 	range = 0,
 	radius = function(self, t)
-		return math.floor(self:combatTalentScale(t,2.5, 4.5, nil, 0, 0, true))
+		return math.floor(self:combatTalentScale(t, 2.35, 4.25))
 	end,
 	target = function(self, t)
 		return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t)}
@@ -138,7 +138,7 @@ newTalent{
 	getFail = function(self, t) return self:combatTalentLimit(t, 50, 20, 35) end, -- Limit < 50%
 	range = 0,
 	radius = function(self, t)
-		return math.floor(self:combatTalentScale(t,2.5, 4.5, nil, 0, 0, true)) 
+		return math.floor(self:combatTalentScale(t, 2.35, 4.25)) 
 	end,
 	target = function(self, t)
 		return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t)}
@@ -187,7 +187,7 @@ newTalent{
 	getPower = function(self, t) return math.max(0,self:combatTalentLimit(t, 50, 20, 40)) end, -- Limit < 50%
 	range = 0,
 	radius = function(self, t)
-		return math.floor(self:combatTalentScale(t,2.5, 4.5, nil, 0, 0, true))
+		return math.floor(self:combatTalentScale(t, 2.35, 4.25))
 	end,
 	target = function(self, t)
 		return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t)}

@@ -129,7 +129,7 @@ newTalent{
 	on_unlearn = function(self, t) self.resists[DamageType.LIGHTNING] = (self.resists[DamageType.LIGHTNING] or 0) - 1 end,
 	getMoveDamage = function(self, t) return self:combatTalentMindDamage(t, 10, 30) end,
 	getDamage = function(self, t) return self:combatTalentMindDamage(t, 10, 150) end,
-	getRadius = function(self, t) return math.floor(self:combatTalentScale(t, 2, 4, 0.5, 0, 0, true)) end,
+	getRadius = function(self, t) return math.floor(self:combatTalentScale(t, 2, 4)) end,
 	action = function(self, t)
 		local tg = {type="hit", range=self:getTalentRange(t), selffire=false, talent=t}
 		local x, y = self:getTarget(tg)

@@ -48,7 +48,7 @@ newTalent{
 	equilibrium = 5,
 	cooldown = 25,
 	range = 10,
-	radius = function(self, t) return math.floor(self:combatTalentScale(t, 4, 8, 0.5, 0, 0, true)) end,
+	radius = function(self, t) return math.floor(self:combatTalentScale(t, 4, 8)) end,
 	requires_target = true,
 	no_npc_use = true,
 --[[ WIP: how to set up tactics: (Not implemented at this time)

@@ -129,8 +129,8 @@ newTalent{
 	info = function(self, t)
 		return ([[Assume a defensive mental state.
 		For one turn, you will fully block the next melee attack used against you with your telekinetically-wielded weapon and then strike the attacker with it for %d%% weapon damage.
-		At raw talent level 3 you will also disarm the attacker for 3 turns.
-		At raw talent level 5 you will be able to reflexively block up to one attack per turn with a %d%% chance, based on your cunning. Each trigger requires and uses 10 Psi.
+		At talent level 3 you will also disarm the attacker for 3 turns.
+		At talent level 5 you will be able to reflexively block up to one attack per turn with a %d%% chance, based on your cunning. Each trigger requires and uses 10 Psi.
 		This requires a telekinetically-wielded weapon.]]):
 		tformat(100 * t.getWeaponDamage(self, t), t.getChance(self, t))
 	end,

@@ -53,7 +53,7 @@ newTalent{
 			DamageType.BONEYARD, {resist=t:_getResist(self), cooldown=t:_getCooldown(self), power=t:_getPower(self), resurrect=t:_getResurrect(self)},
 			self:getTalentRadius(t),
 			5, nil,
-			MapEffect.new{zdepth=3, color_br=255, color_bg=255, color_bb=255, effect_shader="shader_images/boneyard_ground_gfx_3.png"},
+			MapEffect.new{zdepth=3, alpha=85, color_br=255, color_bg=255, color_bb=255, effect_shader="shader_images/boneyard_ground_gfx_3.png"},
 			nil,
 			true, true
 		)

@@ -24,7 +24,7 @@ newTalent{
 	points = 5,
 	mana = 5,
 	cooldown = 4,
-	range = function(self, t) return math.floor(self:combatTalentScale(t, 5, 9, 0.5, 0, 0, true)) end,
+	range = function(self, t) return math.min(10, math.floor(self:combatTalentScale(t, 5, 9))) end,
 	radius = function(self, t) return self:callTalent(self.T_EXPLOSION_EXPERT, "getRadius") end,
 	direct_hit = true,
 	requires_target = true,
@@ -154,22 +154,17 @@ newTalent{
 	require = spells_req2,
 	mode = "passive",
 	points = 5,
-	on_learn = function(self, t)
-		self.resists[DamageType.FIRE] = (self.resists[DamageType.FIRE] or 0) + 3
-		self.resists[DamageType.COLD] = (self.resists[DamageType.COLD] or 0) + 3
-		self.resists[DamageType.LIGHTNING] = (self.resists[DamageType.LIGHTNING] or 0) + 3
-		self.resists[DamageType.ACID] = (self.resists[DamageType.ACID] or 0) + 3
-	end,
-	on_unlearn = function(self, t)
-		self.resists[DamageType.FIRE] = self.resists[DamageType.FIRE] - 3
-		self.resists[DamageType.COLD] = self.resists[DamageType.COLD] - 3
-		self.resists[DamageType.LIGHTNING] = self.resists[DamageType.LIGHTNING] - 3
-		self.resists[DamageType.ACID] = self.resists[DamageType.ACID] - 3
+	getResists = function(self, t) return self:combatTalentScale(t, 4, 17) end,
+	passives = function(self, t, p) 
+		self:talentTemporaryValue(p, "resists",{[DamageType.FIRE]=t.getResists(self, t)})
+		self:talentTemporaryValue(p, "resists",{[DamageType.COLD]=t.getResists(self, t)})
+		self:talentTemporaryValue(p, "resists",{[DamageType.LIGHTNING]=t.getResists(self, t)})
+		self:talentTemporaryValue(p, "resists",{[DamageType.ACID]=t.getResists(self, t)})
 	end,
 	info = function(self, t)
 		return ([[Grants %d%% protection to you, your golem and other friendly creatures against the elemental damage of your own bombs, and against external elemental damage (fire, cold, lightning and acid) by %d%%.
 		At talent level 5 it also protects against all side effects of your bombs.]]):
-		tformat(math.min(100, self:getTalentLevelRaw(t) * 20), self:getTalentLevelRaw(t) * 3)
+		tformat(math.min(100, self:getTalentLevelRaw(t) * 20), t.getResists(self, t))
 	end,
 }
 
@@ -210,7 +205,7 @@ newTalent{
 	points = 5,
 	mana = 32,
 	cooldown = 10,
-	range = function(self, t) return math.floor(self:combatTalentScale(t, 5, 9, 0.5, 0, 0, true)) end,
+	range = function(self, t) return math.floor(self:combatTalentScale(t, 5, 9)) end,
 	radius = 2,
 	direct_hit = true,
 	requires_target = true,

@@ -99,13 +99,13 @@ newTalent{
 			if self:attr("burning_wake") and self:attr("cleansing_flame") then return 1	end
 		end },
 	range = 0,
-	radius = function(self, t) return math.floor(self:combatTalentScale(t, 4, 8, 0.5, 0, 0, true)) end,
+	radius = function(self, t) return math.floor(self:combatTalentScale(t, 4, 8)) end,
 	requires_target = true,
 	target = function(self, t)
 		return {type="cone", range=self:getTalentRange(t), radius=self:getTalentRadius(t), selffire=false, talent=t}
 	end,
 	getDamage = function(self, t) return self:combatTalentSpellDamage(t, 10, 250) end,
-	getStunDuration = function(self, t) return self:combatTalentScale(t, 3, 7, 0.5, 0, 0, true) end,
+	getStunDuration = function(self, t) return self:combatTalentScale(t, 2.5, 5.5) end,
 	action = function(self, t)
 		local tg = self:getTalentTarget(t)
 		local x, y = self:getTarget(tg)
@@ -146,7 +146,7 @@ newTalent{
 	cooldown = 8,
 	tactical = { ATTACKAREA = { FIRE = 2 } },
 	range = 7,
-	radius = function(self, t) return math.floor(self:combatTalentScale(t, 2, 6, 0.5, 0, 0, true)) end,
+	radius = function(self, t) return math.floor(self:combatTalentScale(t, 2, 5.5)) end,
 	proj_speed = 4,
 	direct_hit = true,
 	requires_target = true,

@@ -153,6 +153,12 @@ newTalent{
 	tactical = { DEFEND = 3, ATTACK = 2 },
 	getLife = function(self, t) return math.ceil(self:combatTalentScale(t, 5, 12)) end,
 	on_pre_use = function(self, t) return self.in_combat and not self:hasEffect(self.EFF_MIRROR_IMAGE_REAL) end,
+	callbackOnDeath = function(self, t)
+		-- Remove mirror image on death
+		for uid, e in pairs(game.level.entities) do
+			if e.is_mirror_image and e.summoner and e.summoner == self then e:disappear() end
+		end
+	end,
 	action = function(self, t)
 		if not self:canBe("summon") then game.logPlayer(self, "You cannot summon; you are suppressed!") return end
 
@@ -242,6 +248,7 @@ newTalent{
 			iceblock_pierce = self.iceblock_pierce,
 			no_breath = 1,
 			remove_from_party_on_death = true,
+			is_mirror_image = 1,
 		}
 
 		image:resolve()

@@ -24,7 +24,7 @@ newTalent{
 	mode = "passive",
 	points = 5,
 	require = { stat = { con=function(level) return 14 + level * 9 end }, },
-	getRes = function(self, t) return self:combatTalentScale(t, 4, 15, 0.75, 0, 0, true) end,
+	getRes = function(self, t) return self:combatTalentScale(t, 3.16, 12.2, 0.75) end,
 	passives = function(self, t, p)
 		self:talentTemporaryValue(p, "resists", {all = t.getRes(self, t)})
 	end,

@@ -281,6 +281,7 @@ newTalent{
 	points = 5,
 	mode = "passive",
 	range = 0,
+	no_npc_use = true,
 	getCrit = function(self, t) return self:combatTalentScale(t, 3, 15) end,
 	getCritPower = function(self, t) return self:combatTalentScale(t, 7, 20) end,
 	getChance = function(self, t) return self:combatTalentLimit(t, 100, 20, 45) end,

@@ -99,10 +99,10 @@ newTalent {
 		return  self:combatTalentLimit(t, 0, 0.15, .05)
 	end,
 	getReduction = function(self, t)
-		return self:combatScale(self:combatDefense() * self:getTalentLevel(t), 5, 10, 30, 450)
+		return self:combatScale(self:combatDefense() * self:getTalentLevel(t), 5, 10, 30, 550)
 	end,
 	getBlockChance = function(self, t)
-		return self:combatTalentLimit(t, 100, 25, 55)
+		return self:combatTalentLimit(t, 100, 20, 40)
 	end,
 	callbackOnTakeDamageBeforeResists = function(self, t, src, x, y, type, dam, tmp)
 		local shield = self:hasShield()
@@ -113,7 +113,7 @@ newTalent {
 		local bt, bt_string = t2.getBlockedTypes(self, t2)
 		local bv = t2.getBlockValue(self, t2)
 		if not bt[type] then return end -- ignore types we can't block
-		if rng.percent(chance) and dam > bv/4 and not self:isTalentCoolingDown(t2) and not eff then 
+		if rng.percent(chance) and dam > bv/3 and not self:isTalentCoolingDown(t2) and not eff then 
 			self:forceUseTalent(self.T_BLOCK, {ignore_energy=true})
 			return {dam=dam}
 		end
@@ -124,7 +124,7 @@ newTalent {
 		chance = t.getBlockChance(self, t)
 		return ([[Control your movements to increase your defenses. This allows you to shrug off minor damage and, if you have a shield equipped, preemptively Block in reaction to incoming damage.  
 		While this talent is activated, you are globally slowed by %0.1f%% and all damage you take is reduced by a flat %0.1f.
-		If you have a shield equipped and Block is not on cooldown, any blockable damage that is greater than 25%% of your block value (before resistances) will have a %d%% chance to instantly activate Block.
+		If you have a shield equipped and Block is not on cooldown, any blockable damage that is greater than 33%% of your block value (before resistances) will have a %d%% chance to instantly activate Block.
 		The flat damage reduction will increase with your defense.]])
 		:tformat(slow, reduction, chance)
 	end,

@@ -2763,7 +2763,7 @@ newEffect{
 					self:attackTargetWith(target, o.combat, nil, t.getWeaponDamage(self, t))
 				end
 			end
-			if self:getTalentLevelRaw(t) >= 3 and target:canBe("disarm") then
+			if self:getTalentLevel(t) >= 3 and target:canBe("disarm") then
 				target:setEffect(target.EFF_DISARMED, 3, {apply_power=self:combatMindpower()})
 			end
 		end

@@ -93,7 +93,7 @@ elseif layout == "OVERGROUND" then
 -- Overground
 return {
 	name = _t"Rhaloren Camp",
-	level_range = {1, 5},
+	level_range = {1, 7},
 	level_scheme = "player",
 	max_level = 3,
 	decay = {300, 800},

@@ -105,7 +105,7 @@ else
 
 return {
 	name = _t"Scintillating Caves",
-	level_range = {1, 5},
+	level_range = {1, 7},
 	level_scheme = "player",
 	max_level = 3,
 	decay = {300, 800},

@@ -153,7 +153,7 @@ elseif layout == "DEFAULT" then
 
 return {
 	name = _t"Trollmire",
-	level_range = {1, 5},
+	level_range = {1, 7},
 	level_scheme = "player",
 	max_level = 3,
 	decay = {300, 800},