Skip to content
Snippets Groups Projects
Commit d7039cee authored by dg's avatar dg
Browse files

Bumping encounters on the worldmap triggers them

git-svn-id: http://svn.net-core.org/repos/t-engine4@1985 51575b47-30f0-44d4-a5cc-537603b46e54
parent 083a1414
No related branches found
No related tags found
No related merge requests found
......@@ -32,6 +32,7 @@ module(..., package.seeall, class.make)
function _M:bumpInto(target)
local reaction = self:reactionToward(target)
if reaction < 0 then
if target.encounterAttack and self.player then self:onWorldEncounter(target) return end
return self:attackTarget(target)
elseif reaction >= 0 then
-- Talk ?
......
......@@ -165,7 +165,7 @@ newTalent{
-- Highers's power, a "weak" regeneration
newTalent{
short_name = "HIGHER_HEAL",
name = "King's Gift",
name = "Gift of the Pureborn",
type = {"base/race", 1},
no_energy = true,
cooldown = 50,
......@@ -174,7 +174,7 @@ newTalent{
return true
end,
info = function(self)
return ([[Call upon the gift of the Kings to regenerate your body for %d life every turn for 10 turns.
return ([[Call upon the gift of the pureborn to regenerate your body for %d life every turn for 10 turns.
The life healed will increase with the Willpower stat]]):format(5 + self:getWil() * 0.5)
end,
}
......
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment