Merge branch 'master' of git.net-core.org:tome/t-engine4

@@ -627,7 +627,7 @@ end
 function _M:createProfile(loginItem)
 	if not loginItem.create then
 		self.auth_tried = nil
-		local d = Dialog:simpleWaiter(_t"Login in...", _t"Please wait...") core.display.forceRedraw()
+		local d = Dialog:simpleWaiter(_t"Logging in...", _t"Please wait...") core.display.forceRedraw()
 		profile:performlogin(loginItem.login, loginItem.pass)
 		profile:waitFirstAuth()
 		d:done()

@@ -274,7 +274,7 @@ function _M:login()
 end
 
 function _M:loginSteam()
-	local d = self:simpleWaiter(_t"Login...", _t"Login in your account, please wait...") core.display.forceRedraw()
+	local d = self:simpleWaiter(_t"Login...", _t"Logging in your account, please wait...") core.display.forceRedraw()
 	d:timeout(10, function() Dialog:simplePopup("Steam", _t"Steam client not found.")	end)
 	core.steam.sessionTicket(function(ticket)
 		if not ticket then

@@ -41,7 +41,7 @@ newTalent{
 		return true
 	end,
 	info = function(self, t)
-		return ([[Increases your spell critical damage multiplier by %d%%.
+		return ([[Increases your critical damage multiplier by %d%%.
 		The multiplier will increase with your Spellpower.]]):
 		tformat(self:combatTalentSpellDamage(t, 20, 50))
 	end,

@@ -512,7 +512,7 @@ newTalent{
 	target = SummonTarget,
 	onAIGetTarget = onAIGetTargetSummon,
 	aiSummonGrid = aiSummonGridRanged,
-	tactical = { ATTACK = { ACID = 1, LIGHTING = 1, NATURE = 1 } },
+	tactical = { ATTACK = { ACID = 1, LIGHTNING = 1, NATURE = 1 } },
 	on_pre_use = function(self, t, silent)
 		if not self:canBe("summon") and not silent then game.logPlayer(self, "You cannot summon; you are suppressed!") return end
 		return not checkMaxSummon(self, silent)

@@ -945,7 +945,7 @@ newTalent{
 	end,
 	callbackOnTakeDamage = function(self, t, src, x, y, type, dam, state)
 		if self:isTalentCoolingDown(t) then return end
-		if (self.life / self.max_life) >= 0.3 then return end
+		if ((self.life-dam) / self.max_life) > 0.3 then return end
 
 		game.logSeen(self, "#RED#%s reacts immediately after taking severe wounds!#LAST#", self:getName():capitalize())
 		self.energy.value = self.energy.value + game.energy_to_act * 1.5
@@ -954,7 +954,7 @@ newTalent{
 	info = function(self, t)
 		return ([[Yeeks live fast, think fast, and sacrifice fast for the Way.
 		Your global speed is increased by %0.1f%%.
-		If your life drops below 30%% you gain 1.5 turns.  This effect can only happen once every %d turns.]]):tformat(100*t.speedup(self, t), self:getTalentCooldown(t))
+		If your life is below 30%% after taking damage you gain 1.5 turns.  This effect can only happen once every %d turns.]]):tformat(100*t.speedup(self, t), self:getTalentCooldown(t))
 	end,
 }
 

@@ -138,8 +138,8 @@ newTalent{
 	info = function(self, t)
 		local damage = t.getDamage(self, t)
 		local targets = t.getTargetCount(self, t)
-		return ([[Invokes a forking beam of lightning doing %0.2f to %0.2f damage (%0.2f average) and forking to another target.
-		It can hit up to %d targets up to 10 grids apart, and will never hit the same one twice; nor will it hit the caster.
+		return ([[Invokes an arc of lightning doing %0.2f to %0.2f damage (%0.2f average) and chaining to another target.
+		The arc can jump to %d targets at most, up to 10 grids apart, and will never jump to the same target twice, or to the caster. The arc will also strike all creatures between each target.
 		The damage will increase with your Spellpower.]]):
 		tformat(damDesc(self, DamageType.LIGHTNING, damage / 3),
 			damDesc(self, DamageType.LIGHTNING, damage),

@@ -89,9 +89,8 @@ newTalent{
 		local inc = t.getDurInc(self, t)
 		return ([[Improves your ability to perform counterstrikes after blocks in the following ways:
 		Allows counterstrikes after incomplete blocks.
-		Increases the duration of the counterstrike debuff on attackers by %d %s.
 		Increases the number of counterstrikes you can perform on a target while they're vulnerable by %d.
-		Increases the crit chance of counterstrikes by %d%%. This increase scales with your Dexterity.]]):tformat(inc, (inc > 1 and _t"turns" or _t"turn"), inc, t.getCritInc(self, t))
+		Increases the crit chance of counterstrikes by %d%%. This increase scales with your Dexterity.]]):tformat(inc, t.getCritInc(self, t))
 	end,
 }
 

@@ -410,7 +410,7 @@ newEffect{
 	subtype = { ward=true, },
 	status = "beneficial",
 	parameters = { wards = {} },
-	on_gain = function(self, err) return _t"#Target# summons a prismatic shield to protect him!", _t"+Prismatic" end,
+	on_gain = function(self, err) return _t"#Target# summons a prismatic shield for protection!", _t"+Prismatic" end,
 	on_lose = function(self, err) return _t"#Target#'s prismatic shield fades.", _t"-Prismatic" end,
 	activate = function(self, eff)
 	end,
@@ -440,7 +440,7 @@ newEffect{
 	subtype = { arcane=true, },
 	status = "beneficial",
 	parameters = {},
-	on_gain = function(self, err) return _t"#Target# is being purged of his physical ailments!", _t"+Purging" end,
+	on_gain = function(self, err) return _t"#Target# is being purged of physical ailments!", _t"+Purging" end,
 	on_lose = function(self, err) return _t"#Target#'s is no longer being purged.", _t"-Purging" end,
 	activate = function(self, eff)
 	end,

@@ -19,11 +19,11 @@
 
 return {
 	name = _t"Abashed Expanse",
-	level_range = {1, 5},
+	level_range = {1, 7},
 	level_scheme = "player",
 	max_level = 3,
 	decay = {300, 800},
-	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
+	actor_adjust_level = function(zone, level, e) return zone.base_level + level.level-1 + e:getRankLevelAdjust() + 1 end,
 	width = 50, height = 50,
 	all_remembered = true,
 	all_lited = true,

@@ -19,11 +19,11 @@
 
 return {
 	name = _t"Blighted Ruins",
-	level_range = {1, 5},
+	level_range = {1, 7},
 	level_scheme = "player",
 	max_level = 3,
 	decay = {300, 800},
-	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + (zone.max_level - level.level) + rng.range(-1,2) end,
+	actor_adjust_level = function(zone, level, e) return zone.base_level + level.level-1 + e:getRankLevelAdjust() + 1 end,
 	level_adjust_level = function(zone, level) return zone.base_level + (zone.max_level - level.level) end,
 	width = 50, height = 50,
 	tier1 = true,

@@ -19,11 +19,11 @@
 
 return {
 	name = _t"The Deep Bellow",
-	level_range = {1, 5},
+	level_range = {1, 7},
 	level_scheme = "player",
 	max_level = 3,
 	decay = {300, 800},
-	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
+	actor_adjust_level = function(zone, level, e) return zone.base_level + level.level-1 + e:getRankLevelAdjust() + 1 end,
 	width = 50, height = 50,
 --	tier1 = true,
 --	all_remembered = true,

@@ -22,11 +22,11 @@ local is_invaded = layout == "INVASION"
 
 return {
 	name = _t"Murgol Lair",
-	level_range = {1, 5},
+	level_range = {1, 7},
 	level_scheme = "player",
 	max_level = 3,
 	decay = {300, 800},
-	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
+	actor_adjust_level = function(zone, level, e) return zone.base_level + level.level-1 + e:getRankLevelAdjust() + 1 end,
 	width = 50, height = 50,
 	tier1 = true,
 --	all_remembered = true,

@@ -19,11 +19,11 @@
 
 return {
 	name = _t"Escape from Reknor",
-	level_range = {1, 5},
+	level_range = {1, 7},
 	level_scheme = "player",
 	max_level = 3,
 	decay = {300, 800},
-	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
+	actor_adjust_level = function(zone, level, e) return zone.base_level + level.level-1 + e:getRankLevelAdjust() + 1 end,
 	width = 50, height = 50,
 	tier1 = true,
 --	all_remembered = true,

@@ -97,7 +97,7 @@ return {
 	level_scheme = "player",
 	max_level = 3,
 	decay = {300, 800},
-	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
+	actor_adjust_level = function(zone, level, e) return zone.base_level + level.level-1 + e:getRankLevelAdjust() + 1 end,
 	width = 50, height = 50,
 	tier1 = true,
 --	all_remembered = true,

@@ -19,11 +19,11 @@
 
 return {
 	name = _t"Ritches Tunnels",
-	level_range = {1, 5},
+	level_range = {1, 7},
 	level_scheme = "player",
 	max_level = 3,
 	decay = {300, 800},
-	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
+	actor_adjust_level = function(zone, level, e) return zone.base_level + level.level-1 + e:getRankLevelAdjust() + 1 end,
 	width = 50, height = 50,
 --	all_remembered = true,
 --	all_lited = true,

@@ -109,7 +109,7 @@ return {
 	level_scheme = "player",
 	max_level = 3,
 	decay = {300, 800},
-	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
+	actor_adjust_level = function(zone, level, e) return zone.base_level + level.level-1 + e:getRankLevelAdjust() + 1 end,
 	width = 50, height = 50,
 --	all_remembered = true,
 	tier1 = true,

@@ -19,11 +19,11 @@
 
 return {
 	name = _t"Slazish Fens",
-	level_range = {1, 5},
+	level_range = {1, 7},
 	level_scheme = "player",
 	max_level = 3,
 	decay = {300, 800},
-	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
+	actor_adjust_level = function(zone, level, e) return zone.base_level + level.level-1 + e:getRankLevelAdjust() + 1 end,
 	width = 50, height = 50,
 --	all_remembered = true,
 	all_lited = true,

@@ -157,7 +157,7 @@ return {
 	level_scheme = "player",
 	max_level = 3,
 	decay = {300, 800},
-	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
+	actor_adjust_level = function(zone, level, e) return zone.base_level + level.level-1 + e:getRankLevelAdjust() + 1 end,
 	width = 65, height = 40,
 --	all_remembered = true,
 	all_lited = true,

@@ -19,11 +19,11 @@
 
 return {
 	name = _t"Unhallowed Morass",
-	level_range = {1, 5},
+	level_range = {1, 7},
 	level_scheme = "player",
 	max_level = 3,
 	decay = {300, 800},
-	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
+	actor_adjust_level = function(zone, level, e) return zone.base_level + level.level-1 + e:getRankLevelAdjust() + 1 end,
 	width = 50, height = 50,
 --	all_remembered = true,
 	all_lited = true,

@@ -1398,7 +1398,7 @@ function resolvers.staff_element(name)
 	return {__resolver="staff_element", name}
 end
 function resolvers.calc.staff_element(t, e)
-	local command_flavor, command_lement = nil, nil
+	local command_flavor, command_element = nil, nil
 	if not e.flavor_name then
 		if not e.flavors then -- standard
 			local staff_type = rng.table{2, 2, 2, 2, 3, 3, 3, 4, 4, 4}