fix

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

game/modules/tome/class/Actor.lua

@@ -2895,7 +2895,8 @@ function _M:checkMindstar(o)
 
 	local new
 	local old
-
+	local psb = self:getTalentFromId(self.T_PSIBLADES) --I5
+	
 	if o.wielded then
 		new = self:attr("psiblades_active")
 		old = o.psiblade_active
@@ -2910,18 +2911,18 @@ function _M:checkMindstar(o)
 		o.psiblade_active = new
 
 		local nm = {}
-		for s, v in pairs(o.combat.dammod) do nm[s] = v * (1.3 + pv / 10) end
+		for s, v in pairs(o.combat.dammod) do nm[s] = v * psb.getStatmult(self, psb) end --I5
 		o.combat.dammod = nm
-		o.combat.apr = o.combat.apr * (1 + pv / 6.3)
+		o.combat.apr = o.combat.apr * psb.getAPRmult(self,psb) --I5		
 
 		print("Activating psiblade", o.name)
 	elseif not new and old then
 		local pv = o.psiblade_active
 
 		local nm = {}
-		for s, v in pairs(o.combat.dammod) do nm[s] = v / (1.3 + pv / 10) end
+		for s, v in pairs(o.combat.dammod) do nm[s] = v / psb.getStatmult(self,psb,pv) end --I5		
 		o.combat.dammod = nm
-		o.combat.apr = o.combat.apr / (1 + pv / 6.3)
+		o.combat.apr = o.combat.apr / psb.getAPRmult(self,psb,pv) --I5 		
 
 		o.moddable_tile_ornament = nil
 		o.psiblade_active = false

game/modules/tome/class/Object.lua

@@ -153,7 +153,7 @@ function _M:descAttribute(attr)
 		return c.shots_left.."/"..math.floor(c.capacity)..", "..c.dam.."-"..(c.dam*(c.damrange or 1.1)).." power, "..(c.apr or 0).." apr"
 	elseif attr == "COMBAT_DAMTYPE" then
 		local c = self.combat
-		return c.dam.."-"..(c.dam*(c.damrange or 1.1)).." power, "..(c.apr or 0).." apr, "..DamageType:get(c.damtype).name.." damage"
+		return c.dam.."-"..(c.dam*(c.damrange or 1.1)).." power, "..("%d"):format((c.apr or 0)).." apr, "..DamageType:get(c.damtype).name.." damage"
 	elseif attr == "SHIELD" then
 		local c = self.special_combat
 		if c and (game.player:knowTalentType("technique/shield-offense") or game.player:knowTalentType("technique/shield-defense") or game.player:attr("show_shield_combat")) then

game/modules/tome/data/damage_types.lua

@@ -58,7 +58,7 @@ setDefaultProjector(function(src, x, y, type, dam, tmp, no_martyr)
 		print("[PROJECTOR] after difficulty dam", dam)
 
 		-- Daze
-		if target:attr("dazed") then
+		if src:attr("dazed") then
 			dam = dam * 0.5
 		end
 

game/modules/tome/data/talents/gifts/mindstar-mastery.lua

@@ -34,6 +34,8 @@ newTalent{
 	sustain_equilibrium = 18,
 	cooldown = 6,
 	tactical = { BUFF = 4 },
+	getStatmult = function(self,t,level) return 1.076 + 0.324*(level or self:getTalentLevel(t))^.5 end, --I5
+	getAPRmult = function(self,t,level) return 0.65 + 0.51*(level or self:getTalentLevel(t))^.5 end, -- I5
 	getDamage = function(self, t) return self:getTalentLevel(t) * 10 end,
 	getPercentInc = function(self, t) return math.sqrt(self:getTalentLevel(t) / 5) / 2 end,
 	activate = function(self, t)
@@ -62,7 +64,7 @@ newTalent{
 		return ([[Channel your mental power through your wielded mindstars, generating psionic blades sprouting from the mindstars.
 		Mindstar psiblades have their damage modifiers (how much damage they gain from stats) multiplied by %0.2f and their armour penetration by %0.2f.
 		Also increases Physical Power by %d and increases weapon damage by %d%% when using mindstars.]]):
-		format(1 * (1.3 + self:getTalentLevel(t) / 10), 1 * (1 + self:getTalentLevel(t) / 6.3), damage, 100 * inc)
+		format(t.getStatmult(self, t), t.getAPRmult(self, t), damage, 100 * inc) --I5
 	end,
 }
 

game/modules/tome/data/talents/uber/str.lua

@@ -169,7 +169,7 @@ uberTalent{
 		self.can_breath = self.can_breath or {}
 		self.can_breath.water = (self.can_breath.water or 0) + 1
 
-		require("engine.ui.Dialog"):simplePopup("Legacy of the Naloren", "Slasul will be happy to know your faith in his cause. You should return speak to him.")
+		require("engine.ui.Dialog"):simplePopup("Legacy of the Naloren", "Slasul will be happy to know your faith in his cause. You should return to speak to him.")
 	end,
 	info = function(self, t)
 		return ([[You sided with Slasul ad helped him vanquish Ukllmswwik. You are now able to breathe underwater with ease.