more better

seriously edge your patch file names are getting worse than my commit messages ! :)


git-svn-id: http://svn.net-core.org/repos/t-engine4@5462 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/class/Actor.lua

@@ -1755,10 +1755,16 @@ function _M:onTakeHit(value, src)
 			local eff = rng.tableRemove(effs)
 			if eff[1] == "effect" then
 				local e = self:hasEffect(eff[2])
-				if e.power * e.dur < value then
-					game:onTickEnd(function() self:removeEffect(eff[2]) end) -- Happens on tick end so Night Terror can work properly
-				else
-					e.dur = math.max(0, e.dur - math.ceil(value/e.power))
+				-- Reduce the duration by 1 for every full incriment of the effect power
+				-- We add a temp_power parameter to track total damage over multiple turns
+				e.temp_power = (e.temp_power or e.power) - value
+				while e.temp_power <= 0 do
+					e.dur = e.dur - 1
+					e.temp_power = e.temp_power + e.power
+					if e.dur <=0 then
+						game:onTickEnd(function() self:removeEffect(eff[2]) end) -- Happens on tick end so Night Terror can work properly
+						break
+					end
 				end
 			end
 		end

game/modules/tome/data/talents/psionic/dreaming.lua

@@ -40,9 +40,9 @@ newTalent{
 		local power = self:combatTalentMindDamage(t, 5, 25)
 		if self:knowTalent(self.T_SANDMAN) then
 			local t = self:getTalentFromId(self.T_SANDMAN)
-			power = power + t.getSleepPowerBonus(self, t)
+			power = power * t.getSleepPowerBonus(self, t)
 		end
-		return power
+		return math.ceil(power)
 	end,
 	doContagiousSleep = function(self, target, p, t)
 		local tg = {type="ball", radius=1, talent=t}

game/modules/tome/data/talents/psionic/nightmare.lua

@@ -39,9 +39,9 @@ newTalent{
 		local power = self:combatTalentMindDamage(t, 5, 25)
 		if self:knowTalent(self.T_SANDMAN) then
 			local t = self:getTalentFromId(self.T_SANDMAN)
-			power = power + t.getSleepPowerBonus(self, t)
+			power = power * t.getSleepPowerBonus(self, t)
 		end
-		return power
+		return math.ceil(power)
 	end,
 	getDamage = function(self, t) return self:combatTalentMindDamage(t, 10, 100) end,
 	action = function(self, t)

game/modules/tome/data/talents/psionic/psychic-assault.lua

@@ -127,7 +127,7 @@ newTalent{
 	type = {"psionic/psychic-assault", 4},
 	require = psi_wil_req4,
 	points = 5,
-	cooldown = 2,
+	cooldown = 4,
 	psi = 5,
 	tactical = { ATTACK = { MIND = 2}, DISABLE = 1},
 	range = 7,
@@ -147,7 +147,7 @@ newTalent{
 		local dam =self:mindCrit(t.getDamage(self, t))
 		if target:hasEffect(target.EFF_BRAINLOCKED) then dam = dam * 2 end
 		self:project(tg, x, y, DamageType.MIND, {dam=dam, alwaysHit=true}, {type="mind"})
-		target:setEffect(target.EFF_SUNDER_MIND, 2, {power=dam/10})
+		target:setEffect(target.EFF_SUNDER_MIND, 4, {power=dam/10})
 		
 		game:playSoundNear(self, "talents/warp")
 		return true
@@ -155,7 +155,7 @@ newTalent{
 	info = function(self, t)
 		local damage = t.getDamage(self, t)
 		local power = t.getDamage(self, t) / 10
-		return ([[Cripples the target's mind, inflicting %0.2f mind damage and reducing it's mental save by %d for 2 turns.  This attack always hits and the mental save reduction stacks.
+		return ([[Cripples the target's mind, inflicting %0.2f mind damage and reducing it's mental save by %d for 4 turns.  This attack always hits and the mental save reduction stacks.
 		Against brainlocked targets the damage and mental save reduction will be doubled.
 		The damage and save reduction will scale with your mindpower.]]):
 		format(damDesc(self, DamageType.MIND, (damage)), power)

game/modules/tome/data/talents/psionic/slumber.lua

@@ -39,9 +39,9 @@ newTalent{
 		local power = self:combatTalentMindDamage(t, 10, 100)
 		if self:knowTalent(self.T_SANDMAN) then
 			local t = self:getTalentFromId(self.T_SANDMAN)
-			power = power + t.getSleepPowerBonus(self, t)
+			power = power * t.getSleepPowerBonus(self, t)
 		end
-		return power
+		return math.ceil(power)
 	end,
 	action = function(self, t)
 		local tg = self:getTalentTarget(t)
@@ -98,14 +98,14 @@ newTalent{
 	points = 5,
 	require = psi_wil_req3,
 	mode = "passive",
-	getSleepPowerBonus = function(self, t) return self:combatTalentMindDamage(t, 5, 25) end,
+	getSleepPowerBonus = function(self, t) return 1 + math.min(2, self:getTalentLevel(t)/5) end,
 	getInsomniaPower = function(self, t) return math.min(10, self:getTalentLevel(t) * 1.2) end,
 	info = function(self, t)
-		local power_bonus = t.getSleepPowerBonus(self, t)
+		local power_bonus = t.getSleepPowerBonus(self, t) - 1
 		local insomnia = t.getInsomniaPower(self, t)
-		return([[Increases the amount of damage you can deal to sleeping targets before reducing the effect duration by %d and reduces the sleep immunity of your Insomnia effects by %d%%.
+		return([[Increases the amount of damage you can deal to sleeping targets before reducing the effect duration by %d%% and reduces the sleep immunity of your Insomnia effects by %d%%.
 		These effects will be directly reflected in the appropriate talent descriptions.
-		The damage threshold bonus will scale with your mindpower.]]):format(power_bonus, insomnia)
+		The damage threshold bonus will scale with your mindpower.]]):format(power_bonus * 100, insomnia)
 	end,
 }
 

game/modules/tome/data/talents/psionic/thought-forms.lua

@@ -65,6 +65,12 @@ newTalent{
 				e.moddable_tile = e.summoner.moddable_tile and e.summoner.moddable_tile or nil
 				e.moddable_tile_base = e.summoner.moddable_tile_base and e.summoner.moddable_tile_base or nil
 				e.moddable_tile_ornament = e.summoner.moddable_tile_ornament and e.summoner.moddable_tile_ornament or nil
+				if e.summoner.image == "invis.png" and e.summoner.add_mos then
+					local summoner_image, summoner_h, summoner_y = e.summoner.add_mos[1].image or nil, e.summoner.add_mos[1].display_h or nil, e.summoner.add_mos[1].display_y or nil
+					if summoner_image and summoner_h and summoner_y then
+						e.add_mos = {{image=summoner_image, display_h=summoner_h, display_y=summoner_y}}
+					end
+				end
 			end),
 			-- Disable our sustain when we die
 			on_die = function(self)
@@ -226,6 +232,12 @@ newTalent{
 				e.moddable_tile = e.summoner.moddable_tile and e.summoner.moddable_tile or nil
 				e.moddable_tile_base = e.summoner.moddable_tile_base and e.summoner.moddable_tile_base or nil
 				e.moddable_tile_ornament = e.summoner.moddable_tile_ornament and e.summoner.moddable_tile_ornament or nil
+				if e.summoner.image == "invis.png" and e.summoner.add_mos then
+					local summoner_image, summoner_h, summoner_y = e.summoner.add_mos[1].image or nil, e.summoner.add_mos[1].display_h or nil, e.summoner.add_mos[1].display_y or nil
+					if summoner_image and summoner_h and summoner_y then
+						e.add_mos = {{image=summoner_image, display_h=summoner_h, display_y=summoner_y}}
+					end
+				end
 			end),
 			-- Disable our sustain when we die
 			on_die = function(self)
@@ -377,6 +389,12 @@ newTalent{
 				e.moddable_tile = e.summoner.moddable_tile and e.summoner.moddable_tile or nil
 				e.moddable_tile_base = e.summoner.moddable_tile_base and e.summoner.moddable_tile_base or nil
 				e.moddable_tile_ornament = e.summoner.moddable_tile_ornament and e.summoner.moddable_tile_ornament or nil
+				if e.summoner.image == "invis.png" and e.summoner.add_mos then
+					local summoner_image, summoner_h, summoner_y = e.summoner.add_mos[1].image or nil, e.summoner.add_mos[1].display_h or nil, e.summoner.add_mos[1].display_y or nil
+					if summoner_image and summoner_h and summoner_y then
+						e.add_mos = {{image=summoner_image, display_h=summoner_h, display_y=summoner_y}}
+					end
+				end
 			end),
 			-- Disable our sustain when we die
 			on_die = function(self)