New egos: helms

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

game/modules/tome/class/Object.lua

@@ -275,8 +275,13 @@ function _M:getTextualDesc()
 	if w.instakill_immune then desc[#desc+1] = ("Increases instant-death immunity: %d%%."):format(w.instakill_immune * 100) end
 
 	if w.life_regen then desc[#desc+1] = ("Regenerates %0.2f hitpoints each turn."):format(w.life_regen) end
+	if w.stamina_regen then desc[#desc+1] = ("Regenerates %0.2f stamina each turn."):format(w.stamina_regen) end
 	if w.mana_regen then desc[#desc+1] = ("Regenerates %0.2f mana each turn."):format(w.mana_regen) end
 
+	if w.stamina_regen_on_hit then desc[#desc+1] = ("Regenerates %0.2f stamina when hit."):format(w.stamina_regen_on_hit) end
+	if w.mana_regen_on_hit then desc[#desc+1] = ("Regenerates %0.2f mana when hit."):format(w.mana_regen_on_hit) end
+	if w.equilibrium_regen_on_hit then desc[#desc+1] = ("Regenerates %0.2f equilibrium when hit."):format(w.equilibriumregen_on_hit) end
+
 	if w.max_life then desc[#desc+1] = ("Maximum life %d"):format(w.max_life) end
 	if w.max_mana then desc[#desc+1] = ("Maximum mana %d"):format(w.max_mana) end
 	if w.max_stamina then desc[#desc+1] = ("Maximum stamina %d"):format(w.max_stamina) end

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

@@ -220,6 +220,10 @@ function _M:archeryShoot(damtype, mult, on_hit, tg, params)
 				end
 			end end
 
+			-- Regen on being hit
+			if hitted and not target.dead and target:attr("stamina_regen_on_hit") then target:incStamina(target.stamina_regen_on_hit) end
+			if hitted and not target.dead and target:attr("mana_regen_on_hit") then target:incMana(target.mana_regen_on_hit) end
+
 			ret.speed = self:combatSpeed(weapon)
 			ret.hitted = hitted
 		end
@@ -390,8 +394,13 @@ function _M:attackTargetWith(target, weapon, damtype, mult)
 		end
 	end end
 
+	-- Regen on being hit
+	if hitted and not target.dead and target:attr("stamina_regen_on_hit") then target:incStamina(target.stamina_regen_on_hit) end
+	if hitted and not target.dead and target:attr("mana_regen_on_hit") then target:incMana(target.mana_regen_on_hit) end
+	if hitted and not target.dead and target:attr("equilibrium_regen_on_hit") then target:incEquilibrium(-target.equilibrium_regen_on_hit) end
+
 	-- Riposte!
-	if not hitted and not evaded and target:knowTalent(target.T_RIPOSTE) and rng.percent(util.bound(target:getTalentLevel(target.T_RIPOSTE) * target:getDex(40), 10, 60)) then
+	if not hitted and not target.dead and not evaded and target:knowTalent(target.T_RIPOSTE) and rng.percent(util.bound(target:getTalentLevel(target.T_RIPOSTE) * target:getDex(40), 10, 60)) then
 		game.logSeen(self, "%s ripostes!", target.name:capitalize())
 		target:attackTarget(self, nil, nil, true)
 	end

game/modules/tome/data/general/objects/egos/amulets.lua

@@ -95,7 +95,7 @@ newEntity{
 newEntity{
 	name = " of greater telepathy", suffix=true,
 	level_range = {40, 50},
-	rarity = 15,
+	rarity = 120,
 	cost = 25,
 	wielder = {
 		life_regen = -3,

game/modules/tome/data/general/objects/egos/bow.lua

@@ -48,7 +48,7 @@ newEntity{
 }
 
 newEntity{
-	name = " of dexterity", suffix=true, instant_resolve=true,
+	name = " of dexterity (#STATBONUS#)", suffix=true, instant_resolve=true,
 	level_range = {20, 50},
 	rarity = 7,
 	cost = 7,

game/modules/tome/data/general/objects/egos/helm.lua

@@ -16,14 +16,72 @@
 --
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
---[[
+local Stats = require "engine.interface.ActorStats"
+local DamageType = require "engine.DamageType"
+
 newEntity{
 	name = " of rage", suffix=true, instant_resolve=true,
 	level_range = {20, 50},
 	rarity = 5,
 	cost = 6,
 	wielder = {
-		resists={[DamageType.FIRE] = resolvers.mbonus_material(30, 10, function(e, v) return v * 0.15 end)},
+		stamina_regen_on_hit = resolvers.mbonus_material(23, 7, function(e, v) v=v/10 return v * 10, v end),
+	},
+}
+newEntity{
+	name = " of the wilds", suffix=true, instant_resolve=true,
+	level_range = {20, 50},
+	rarity = 5,
+	cost = 6,
+	wielder = {
+		equilibrium_regen_on_hit = resolvers.mbonus_material(23, 7, function(e, v) v=v/10 return v * 10, v end),
+	},
+}
+newEntity{
+	name = " of strength (#STATBONUS#)", suffix=true,
+	level_range = {1, 50},
+	rarity = 6,
+	cost = 4,
+	wielder = {
+		inc_stats = { [Stats.STAT_STR] = resolvers.mbonus_material(8, 2, function(e, v) return v * 3 end) },
+	},
+}
+newEntity{
+	name = " of constitution (#STATBONUS#)", suffix=true,
+	level_range = {1, 50},
+	rarity = 6,
+	cost = 4,
+	wielder = {
+		inc_stats = { [Stats.STAT_CON] = resolvers.mbonus_material(8, 2, function(e, v) return v * 3 end) },
+	},
+}
+newEntity{
+	name = " of greater telepathy", suffix=true,
+	level_range = {40, 50},
+	rarity = 120,
+	cost = 25,
+	wielder = {
+		life_regen = -3,
+		esp = {all=1},
+	},
+}
+newEntity{
+	name = " of telepathic range", suffix=true,
+	level_range = {40, 50},
+	rarity = 15,
+	cost = 15,
+	wielder = {
+		esp = {range=10},
+	},
+}
+newEntity{
+	name = "gondorian ", prefix=true, instant_resolve=true,
+	level_range = {25, 50},
+	rarity = 10,
+	cost = 10,
+	wielder = {
+		inc_stats = { [Stats.STAT_WIL] = resolvers.mbonus_material(2, 1, function(e, v) return v * 3 end) },
+		disease_immune = 0.3,
+		stun_immune = 0.2,
 	},
 }
-]]
\ No newline at end of file

game/modules/tome/data/general/objects/egos/sling.lua

@@ -48,7 +48,7 @@ newEntity{
 }
 
 newEntity{
-	name = " of dexterity", suffix=true, instant_resolve=true,
+	name = " of dexterity (#STATBONUS#)", suffix=true, instant_resolve=true,
 	level_range = {20, 50},
 	rarity = 7,
 	cost = 7,

game/modules/tome/data/general/objects/egos/wizard-hat.lua

+-- ToME - Tales of Middle-Earth
+-- Copyright (C) 2009, 2010 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+local Stats = require "engine.interface.ActorStats"
+local DamageType = require "engine.DamageType"
+
+newEntity{
+	name = " of amplification", suffix=true, instant_resolve=true,
+	level_range = {20, 50},
+	rarity = 5,
+	cost = 6,
+	wielder = {
+		mana_regen_on_hit = resolvers.mbonus_material(23, 7, function(e, v) v=v/10 return v * 10, v end),
+	},
+}
+newEntity{
+	name = " of the wilds", suffix=true, instant_resolve=true,
+	level_range = {20, 50},
+	rarity = 5,
+	cost = 6,
+	wielder = {
+		equilibrium_regen_on_hit = resolvers.mbonus_material(23, 7, function(e, v) v=v/10 return v * 10, v end),
+	},
+}
+newEntity{
+	name = " of magic (#STATBONUS#)", suffix=true,
+	level_range = {1, 50},
+	rarity = 6,
+	cost = 4,
+	wielder = {
+		inc_stats = { [Stats.STAT_MAG] = resolvers.mbonus_material(8, 2, function(e, v) return v * 3 end) },
+	},
+}
+newEntity{
+	name = " of willpower (#STATBONUS#)", suffix=true,
+	level_range = {1, 50},
+	rarity = 6,
+	cost = 4,
+	wielder = {
+		inc_stats = { [Stats.STAT_WIL] = resolvers.mbonus_material(8, 2, function(e, v) return v * 3 end) },
+	},
+}
+newEntity{
+	name = " of cunning (#STATBONUS#)", suffix=true,
+	level_range = {1, 50},
+	rarity = 6,
+	cost = 4,
+	wielder = {
+		inc_stats = { [Stats.STAT_CUN = resolvers.mbonus_material(8, 2, function(e, v) return v * 3 end) },
+	},
+}
+newEntity{
+	name = " of greater telepathy", suffix=true,
+	level_range = {40, 50},
+	rarity = 120,
+	cost = 25,
+	wielder = {
+		life_regen = -3,
+		esp = {all=1},
+	},
+}
+newEntity{
+	name = " of telepathic range", suffix=true,
+	level_range = {40, 50},
+	rarity = 15,
+	cost = 15,
+	wielder = {
+		esp = {range=10},
+	},
+}
+newEntity{
+	name = "shimmering ", prefix=true,
+	level_range = {1, 50},
+	rarity = 10,
+	cost = 4,
+	wielder = {
+		max_mana = resolvers.mbonus_material(100, 10, function(e, v) return v * 0.2 end),
+	},
+}

game/modules/tome/data/general/objects/wizard-hat.lua

+-- ToME - Tales of Middle-Earth
+-- Copyright (C) 2009, 2010 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+newEntity{
+	define_as = "BASE_WIZARD_HAT",
+	slot = "HEAD",
+	type = "armor", subtype="head",
+	add_name = " (#ARMOR#)",
+	display = "]", color=colors.BLUE,
+	encumber = 2,
+	rarity = 6,
+	desc = [[A pointy cloth hat, very wizardy...]],
+	egos = "/data/general/objects/egos/wizard-hat.lua", egos_chance = { prefix=resolvers.mbonus(40, 5), suffix=resolvers.mbonus(40, 5) },
+}
+
+newEntity{ base = "BASE_WIZARD_HAT",
+	name = "linen wizard hat",
+	level_range = {1, 20},
+	cost = 2,
+	material_level = 1,
+	wielder = {
+		combat_def = 1,
+	},
+}
+
+newEntity{ base = "BASE_WIZARD_HAT",
+	name = "cashmere wizard hat",
+	level_range = {20, 40},
+	cost = 4,
+	material_level = 3,
+	wielder = {
+		combat_def = 2,
+	},
+}
+
+newEntity{ base = "BASE_WIZARD_HAT",
+	name = "elven-silk wizard hat",
+	level_range = {40, 50},
+	cost = 7,
+	material_level = 5,
+	wielder = {
+		combat_def = 3,
+	},
+}

game/modules/tome/data/general/objects/world-artifacts.lua

@@ -222,6 +222,7 @@ newEntity{
 
 newEntity{ base = "BASE_LONGBOW",
 	name = "Gondor-Tree Longbow", unided_name = "glowing elven-wood longbow", unique=true,
+	desc = [[In the aftermath of the wars against Sauron, the strength of the Trees of Gondor faded and one of the trees died despite the efforts of the men of the city to save it. Its wood was fashioned into a bow to be wielded against the darkness that poisoned Gondor's tree.]],
 	level_range = {40, 50},
 	rarity = 200
 	require = { stat = { dex=36 }, },