spelling + wild gift line: Call of the Wild

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

game/modules/tome/class/Actor.lua

@@ -357,19 +357,19 @@ function _M:attack(target)
 	self:bumpInto(target)
 end
 
-function _M:getMaxEncumberance()
+function _M:getMaxEncumbrance()
 	return math.floor(40 + self:getStr() * 1.8)
 end
 
-function _M:checkEncumberance()
-	-- Compute encumberance
-	local enc, max = 0, self:getMaxEncumberance()
+function _M:checkEncumbrance()
+	-- Compute encumbrance
+	local enc, max = 0, self:getMaxEncumbrance()
 	for inven_id, inven in pairs(self.inven) do
 		for item, o in ipairs(inven) do
 			o:forAllStack(function(so) enc = enc + so.encumber end)
 		end
 	end
-	print("Total encumberance", enc, max)
+	print("Total encumbrance", enc, max)
 
 	-- We are pinned to the ground if we carry too much
 	if not self.encumbered and enc > max then
@@ -387,14 +387,14 @@ end
 function _M:onAddObject(o)
 	engine.interface.ActorInventory.onAddObject(self, o)
 
-	self:checkEncumberance()
+	self:checkEncumbrance()
 end
 
 --- Call when an object is removed
 function _M:onRemoveObject(o)
 	engine.interface.ActorInventory.onRemoveObject(self, o)
 
-	self:checkEncumberance()
+	self:checkEncumbrance()
 end
 
 --- Actor learns a talent

game/modules/tome/class/Object.lua

@@ -129,7 +129,7 @@ function _M:getDesc()
 	end
 
 	if self.encumber then
-		desc[#desc+1] = ("#67AD00#%0.2f Encumberance."):format(self.encumber)
+		desc[#desc+1] = ("#67AD00#%0.2f Encumbrance."):format(self.encumber)
 	end
 
 	-- Stop here if unided
@@ -141,12 +141,12 @@ function _M:getDesc()
 		for stat, i in pairs(self.combat.dammod or {}) do
 			dm[#dm+1] = ("+%d%% %s"):format(i * 100, Stats.stats_def[stat].name)
 		end
-		desc[#desc+1] = ("%d Damage [Range %0.2f] (%s), %d Attack, %d Armor Peneration, Crit %d%%"):format(self.combat.dam or 0, self.combat.damrange or 1.1, table.concat(dm, ','), self.combat.atk or 0, self.combat.apr or 0, self.combat.physcrit or 0)
+		desc[#desc+1] = ("%d Damage [Range %0.2f] (%s), %d Attack, %d Armor Penetration, Crit %d%%"):format(self.combat.dam or 0, self.combat.damrange or 1.1, table.concat(dm, ','), self.combat.atk or 0, self.combat.apr or 0, self.combat.physcrit or 0)
 		desc[#desc+1] = ""
 	end
 
 	local w = self.wielder or {}
-	if w.combat_atk or w.combat_dam or w.combat_apr then desc[#desc+1] = ("Attack %d, Armor Peneration %d, Physical Crit %d%%, Physical damage %d"):format(w.combat_atk or 0, w.combat_apr or 0, w.combat_physcrit or 0, w.combat_dam or 0) end
+	if w.combat_atk or w.combat_dam or w.combat_apr then desc[#desc+1] = ("Attack %d, Armor Penetration %d, Physical Crit %d%%, Physical damage %d"):format(w.combat_atk or 0, w.combat_apr or 0, w.combat_physcrit or 0, w.combat_dam or 0) end
 	if w.combat_armor or w.combat_def then desc[#desc+1] = ("Armor %d, Defense %d"):format(w.combat_armor or 0, w.combat_def or 0) end
 	if w.fatigue then desc[#desc+1] = ("Fatigue %d%%"):format(w.fatigue) end
 

game/modules/tome/data/talents/gifts/call.lua

+newTalent{
+	name = "Meditation",
+	type = {"wild-gift/call", 1},
+	require = gifts_req1,
+	points = 5,
+	message = "@Source@ meditates on nature.",
+	equilibrium = 0,
+	cooldown = 300,
+	range = 20,
+	action = function(self, t)
+		self:setEffect(self.EFF_STUNNED, 17 - self:getTalentLevel(t), {})
+		self:incEquilibrium(-10 - self:getWil(50) * self:getTalentLevel(t))
+		return true
+	end,
+	info = function(self, t)
+		return ([[Meditate on your link with Nature. You are considered stunned for %d turns and regenerate %d equilibrium.
+		The effect will incease with your Willpower stat.]]):
+		format(17 - self:getTalentLevel(t), 10 + self:getWil(50) * self:getTalentLevel(t))
+	end,
+}
+
+newTalent{
+	name = "???",
+	type = {"wild-gift/call", 2},
+	require = gifts_req2,
+	points = 5,
+	equilibrium = 0,
+	cooldown = 300,
+	range = 20,
+	action = function(self, t)
+		return true
+	end,
+	info = function(self, t)
+		return ([[Meditate on your link with Nature. You are considered stunned for %d turns and regenerate %d equilibrium.
+		The effect will incease with your Willpower stat.]]):
+		format(17 - self:getTalentLevel(t), 10 + self:getWil(50) * self:getTalentLevel(t))
+	end,
+}
+
+newTalent{
+	name = "???",
+	type = {"wild-gift/call", 3},
+	require = gifts_req3,
+	points = 5,
+	equilibrium = 0,
+	cooldown = 300,
+	range = 20,
+	action = function(self, t)
+		return true
+	end,
+	info = function(self, t)
+		return ([[Meditate on your link with Nature. You are considered stunned for %d turns and regenerate %d equilibrium.
+		The effect will incease with your Willpower stat.]]):
+		format(17 - self:getTalentLevel(t), 10 + self:getWil(50) * self:getTalentLevel(t))
+	end,
+}
+
+newTalent{
+	name = "Nature's Balance",
+	type = {"wild-gift/call", 4},
+	require = gifts_req4,
+	points = 5,
+	equilibrium = 20,
+	cooldown = 50,
+	range = 20,
+	action = function(self, t)
+		local nb = math.ceil(self:getTalentLevel(t) + 2)
+		local tids = {}
+		for tid, _ in pairs(self.talents_cd) do
+			local tt = self:getTalentFromId(tid)
+			if tt.type[2] <= self:getTalentLevelRaw(t) and tt.type[1]:find("^wild-gift/") then
+				tids[#tids+1] = tid
+			end
+		end
+		for i = 1, nb do
+			if #tids == 0 then break end
+			local tid = rng.tableRemove(tids)
+			self.talents_cd[tid] = nil
+		end
+		self.changed = true
+		return true
+	end,
+	info = function(self, t)
+		return ([[Your deep link with Nature allows you to reset the cooldown of %d of your wild gifts of level %d or less.]]):
+		format(math.ceil(self:getTalentLevel(t) + 2), self:getTalentLevelRaw(t))
+	end,
+}

game/modules/tome/data/texts/intro-bree-man.lua

 return [[Welcome #LIGHT_GREEN#]]..name..[[#WHITE#.
 You are a native of the town of Bree, a multicultural town that both men and hobbits call home.
-Humans are the most common race of the land, and you are part of them. In an attempt to prove your worth you have decided to venture into the old and wild places of the world, looking for treasures of old and glory.
+Humans are the most common race of the land, and you are one of them. In an attempt to prove your worth you have decided to venture into the old and wild places of the world, looking for ancient treasures and glory.
 
-You have come to a land called Rhudaur, just east of Bree, in search of the ruined tower of Amon Sûl. You heard the caves below were infested by vermin and undeads.
-Nearby to the east also lies the Trollshaws and other dangerous place, an old forest infested with trolls and all kinds of wild animals.
+You have come to a land called Rhudaur, just east of Bree, in search of the ruined tower of Amon Sûl. You heard the caves below were infested by vermin and undead.
+To the east lies another dangerous place: the Trollshaws. It is an old forest infested with trolls and all kinds of wild animals.
 
 After days of travels you have found the ruined tower and entered the caves, what will you find there...
 ]]

game/modules/tome/data/texts/intro-dunadan.lua

 return [[Welcome #LIGHT_GREEN#]]..name..[[#WHITE#.
-You are a Dúnedain, one of the last descendant of the pround men of Númenor.
-Hailing from a great line of greater men you have decided to prove your worth by venturing into the old and wild places of the world, looking for treasures of old and glory.
+You are a Dúnedain, one of the last descendants of the proud men of Númenor.
+Hailing from a great line of greater men you have decided to prove your worth by venturing into the old and wild places of the world, looking for ancient treasures and glory.
 
-You have come to a northern land called Rhudaur, on the western steppes of the Misty Mountains in search of the ruined tower of Amon Sûl. You heard the caves below were infested by vermin and undeads.
-Nearby to the east also lies the Trollshaws and other dangerous place, an old forest infested with trolls and all kinds of wild animals.
+You have come to a northern land called Rhudaur, on the western steppes of the Misty Mountains in search of the ruined tower of Amon Sûl. You heard the caves below were infested by vermin and undead.
+To the east lies another dangerous place: the Trollshaws. It is an old forest infested with trolls and all kinds of wild animals.
 
 After days of travels you have found the ruined tower and entered the caves, what will you find there...
 ]]

game/modules/tome/data/texts/intro-dwarf.lua

 return [[Welcome #LIGHT_GREEN#]]..name..[[#WHITE#.
-You are a member of the pround race of the Dwarves.
-Hailing from the dwarven kingdom under the Lonely Mountain you have decided to take the road and start a new life of aventuring.
+You are a member of the proud race of the Dwarves.
+Hailing from the dwarven kingdom under the Lonely Mountain you have decided to take to the road and start a new life of aventuring.
 
-You have decided to venture into the old and wild places of the world, looking for treasures of old and glory.
+You have decided to venture into the old and wild places of the world, looking for ancient treasures and glory.
 
-You have come to a land called Rhudaur, on the western steppes of the Misty Mountains, far away from your home, in search of the ruined tower of Amon Sûl. You heard the caves below were infested by vermin and undeads.
-Nearby to the east also lies the Trollshaws and other dangerous place, an old forest infested with trolls and all kinds of wild animals.
+You have come to a land called Rhudaur, on the western steppes of the Misty Mountains, far away from your home, in search of the ruined tower of Amon Sûl. You heard the caves below were infested by vermin and undead.
+To the east lies another dangerous place: the Trollshaws. It is an old forest infested with trolls and all kinds of wild animals.
 
 After days of travels you have found the ruined tower and entered the caves, what will you find there...
 ]]
+

game/modules/tome/data/texts/intro-elf.lua

@@ -6,7 +6,7 @@ You lived a peaceful life deep in the forest for many years but lately you have
 You have decided to venture into the old and wild places looking for ancient treasures and glory.
 
 You have come to a land called Rhudaur on the western side of the Misty Mountains, far away from your home in search of the ruined tower of Amon Sul. You have heard that the caverns below are infested with vermin and undead.
-Close by, to the east are the Trollshaws another dangerous place - an old forest infested with trolls and other dangerous animals.
+To the east lies another dangerous place: the Trollshaws. It is an old forest infested with trolls and all kinds of wild animals.
 
 After days of travel you have found the tower and are about to enter the caves. What will you discover...
 ]]

game/modules/tome/data/texts/intro-hobbit.lua

 return [[Welcome #LIGHT_GREEN#]]..name..[[#WHITE#.
 You are a hobbit of the Shire. Most hobbits never leave the borders of their beloved Shire, even in this time of peace. Few know about the distant lands and fewer yet are willing to venture there.
 
-You are one of those rare few, inpired by the stories of dragons, gold and treasures of Bilbo nearly two hundred years before, you have decided to venture into the old and wild places of the world, looking for treasures of old and glory.
+You are one of those rare few, inpired by the stories of dragons, gold and the treasures of Bilbo nearly two hundred years before, you have decided to venture into the old and wild places of the world, looking for ancient treasures and glory.
 
 You have come to a land called Rhudaur, east of the Shire, in search of the ruined tower of Amon Sûl. You heard the caves below were infested by vermin and undeads.
-Nearby to the east also lies the Trollshaws and other dangerous place, an old forest infested with trolls and all kinds of wild animals.
+To the east lies another dangerous place: the Trollshaws. It is an old forest infested with trolls and all kinds of wild animals.
 
 After days of travels you have found the ruined tower and entered the caves, what will you find there...
 ]]