fix

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

game/modules/tome/class/Object.lua

@@ -93,7 +93,9 @@ end
 
 --- Returns a tooltip for the object
 function _M:tooltip()
-	return self:getDesc{do_color=true}
+	local str = self:getDesc{do_color=true}
+	if config.settings.cheat then str:add(true, "UID: "..self.uid, true, self.image) end
+	return str
 end
 
 --- Describes an attribute, to expand object name

game/modules/tome/class/interface/Combat.lua

@@ -341,6 +341,12 @@ function _M:attackTargetWith(target, weapon, damtype, mult)
 		t.do_terror(self, t, target, dam)
 	end
 
+	-- Conduit (Psi)
+	if hitted and not target.dead and self:knowTalent(self.T_CONDUIT) and self:isTalentActive(self.T_CONDUIT) then
+		local t =  self:getTalentFromId(self.T_CONDUIT)
+		t.do_combat(self, t, target)
+	end
+
 	-- Special effect
 	if hitted and not target.dead and weapon.special_on_hit and weapon.special_on_hit.fct then
 		weapon.special_on_hit.fct(weapon, self, target)
@@ -655,6 +661,11 @@ function _M:combatTalentStatDamage(t, stat, base, max)
 	return ((base + (self:getStat(stat))) * ((math.sqrt(self:getTalentLevel(t)) - 1) * 0.8 + 1) * mod) * 0.75
 end
 
+--- Gets damage based on talent, stat, and interval
+function _M:combatTalentIntervalDamage(t, stat, min, max)
+	return (min + (1 + (self:getStat(stat) / 100) * (max / 6.5 - 1)) * self:getTalentLevel(t)) * 0.75
+end
+
 --- Computes physical resistance
 function _M:combatPhysicalResist()
 	return self.combat_physresist + (self:getCon() + self:getStr() + (self:getLck() - 50) * 0.5) * 0.35