armor & robe egos

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

game/modules/tome/class/Actor.lua

@@ -651,12 +651,12 @@ end
 --- Can the target be applied some effects
 -- @param what a string describing what is being tried
 function _M:canBe(what)
-	if what == "poison" and rng.percent(100 * self:attr("poison_immune")) then return false end
-	if what == "cut" and rng.percent(100 * self:attr("cut_immune")) then return false end
-	if what == "blind" and rng.percent(100 * self:attr("blind_immune")) then return false end
-	if what == "stun" and rng.percent(100 * self:attr("stun_immune")) then return false end
-	if what == "knockback" and rng.percent(100 * self:attr("knockback_immune")) then return false end
-	if what == "instakill" and rng.percent(100 * self:attr("instakill_immune")) then return false end
+	if what == "poison" and rng.percent(100 * (self:attr("poison_immune") or 0)) then return false end
+	if what == "cut" and rng.percent(100 * (self:attr("cut_immune") or 0)) then return false end
+	if what == "blind" and rng.percent(100 * (self:attr("blind_immune") or 0)) then return false end
+	if what == "stun" and rng.percent(100 * (self:attr("stun_immune") or 0)) then return false end
+	if what == "knockback" and rng.percent(100 * (self:attr("knockback_immune") or 0)) then return false end
+	if what == "instakill" and rng.percent(100 * (self:attr("instakill_immune") or 0)) then return false end
 	return true
 end
 

game/modules/tome/data/general/objects/cloth-armors.lua

@@ -7,6 +7,7 @@ newEntity{
 	encumber = 2,
 	rarity = 5,
 	desc = [[A cloth vestment. It offers no intrinsinc protection but can be enchanted.]],
+	egos = "/data/general/objects/egos/robe.lua", egos_chance = resolvers.mbonus(30, 15),
 }
 
 newEntity{ base = "BASE_CLOTH_ARMOR",

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

+newEntity{
+	name = " of fire resistance",
+	level_range = {1, 50},
+	rarity = 5,
+	cost = 6,
+	wielder = {
+		resists={[DamageType.FIRE] = resolvers.mbonus(30, 10)},
+	},
+}
+newEntity{
+	name = " of cold resistance",
+	level_range = {1, 50},
+	rarity = 5,
+	cost = 6,
+	wielder = {
+		resists={[DamageType.COLD] = resolvers.mbonus(30, 10)},
+	},
+}
+newEntity{
+	name = " of acid resistance",
+	level_range = {1, 50},
+	rarity = 5,
+	cost = 6,
+	wielder = {
+		resists={[DamageType.ACID] = resolvers.mbonus(30, 10)},
+	},
+}
+newEntity{
+	name = " of lightning resistance",
+	level_range = {1, 50},
+	rarity = 5,
+	cost = 6,
+	wielder = {
+		resists={[DamageType.LIGHTNING] = resolvers.mbonus(30, 10)},
+	},
+}
+newEntity{
+	name = " of nature resistance",
+	level_range = {1, 50},
+	rarity = 5,
+	cost = 6,
+	wielder = {
+		resists={[DamageType.NATURE] = resolvers.mbonus(30, 10)},
+	},
+}
+
+newEntity{
+	name = " of stability",
+	level_range = {10, 50},
+	rarity = 7,
+	cost = 6,
+	wielder = {
+		stun_immune = 0.7,
+		knockback_immune = 0.7,
+	},
+}

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

+newEntity{
+	name = " of fire resistance",
+	level_range = {1, 50},
+	rarity = 5,
+	cost = 6,
+	wielder = {
+		resists={[DamageType.FIRE] = resolvers.mbonus(30, 10)},
+	},
+}
+newEntity{
+	name = " of cold resistance",
+	level_range = {1, 50},
+	rarity = 5,
+	cost = 6,
+	wielder = {
+		resists={[DamageType.COLD] = resolvers.mbonus(30, 10)},
+	},
+}
+newEntity{
+	name = " of acid resistance",
+	level_range = {1, 50},
+	rarity = 5,
+	cost = 6,
+	wielder = {
+		resists={[DamageType.ACID] = resolvers.mbonus(30, 10)},
+	},
+}
+newEntity{
+	name = " of lightning resistance",
+	level_range = {1, 50},
+	rarity = 5,
+	cost = 6,
+	wielder = {
+		resists={[DamageType.LIGHTNING] = resolvers.mbonus(30, 10)},
+	},
+}
+newEntity{
+	name = " of nature resistance",
+	level_range = {1, 50},
+	rarity = 5,
+	cost = 6,
+	wielder = {
+		resists={[DamageType.NATURE] = resolvers.mbonus(30, 10)},
+	},
+}
+
+newEntity{
+	name = "shimmering ", prefix=true,
+	level_range = {10, 50},
+	rarity = 7,
+	cost = 6,
+	wielder = {
+		max_mana = resolvers.mbonus(100, 10),
+	},
+}
+
+newEntity{
+	name = "slimy ", prefix=true,
+	level_range = {10, 50},
+	rarity = 7,
+	cost = 6,
+	wielder = {
+		on_melee_hit={[DamageType.SLIME] = resolvers.mbonus(7, 3)},
+	},
+}

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

 newEntity{
-	name = "flaming ", prefix=true,
+	name = " of fire resistance",
 	level_range = {1, 50},
 	rarity = 5,
-	cost = 8,
+	cost = 4,
 	wielder = {
-		on_melee_hit={[DamageType.FIRE] = resolvers.mbonus(7, 3)},
+		resists={[DamageType.FIRE] = resolvers.mbonus(20, 10)},
 	},
 }
 newEntity{
-	name = "icy ", prefix=true,
+	name = " of cold resistance",
+	level_range = {1, 50},
+	rarity = 5,
+	cost = 4,
+	wielder = {
+		resists={[DamageType.COLD] = resolvers.mbonus(20, 10)},
+	},
+}
+newEntity{
+	name = " of acid resistance",
+	level_range = {1, 50},
+	rarity = 5,
+	cost = 4,
+	wielder = {
+		resists={[DamageType.ACID] = resolvers.mbonus(20, 10)},
+	},
+}
+newEntity{
+	name = " of lightning resistance",
+	level_range = {1, 50},
+	rarity = 5,
+	cost = 4,
+	wielder = {
+		resists={[DamageType.LIGHTNING] = resolvers.mbonus(20, 10)},
+	},
+}
+newEntity{
+	name = " of nature resistance",
 	level_range = {1, 50},
 	rarity = 5,
+	cost = 4,
+	wielder = {
+		resists={[DamageType.NATURE] = resolvers.mbonus(20, 10)},
+	},
+}
+
+
+newEntity{
+	name = "flaming ", prefix=true,
+	level_range = {15, 50},
+	rarity = 8,
+	cost = 8,
+	wielder = {
+		resists={[DamageType.FIRE] = resolvers.mbonus(7, 3)},
+	},
+}
+newEntity{
+	name = "icy ", prefix=true,
+	level_range = {15, 50},
+	rarity = 8,
 	cost = 10,
 	wielder = {
 		on_melee_hit={[DamageType.ICE] = resolvers.mbonus(4, 3)},
@@ -18,8 +65,8 @@ newEntity{
 }
 newEntity{
 	name = "acidic ", prefix=true,
-	level_range = {1, 50},
-	rarity = 5,
+	level_range = {15, 50},
+	rarity = 8,
 	cost = 8,
 	wielder = {
 		on_melee_hit={[DamageType.ACID] = resolvers.mbonus(7, 3)},
@@ -27,11 +74,11 @@ newEntity{
 }
 newEntity{
 	name = "shocking ", prefix=true,
-	level_range = {1, 50},
-	rarity = 5,
+	level_range = {15, 50},
+	rarity = 8,
 	cost = 8,
 	wielder = {
-		on_melee_hit={[DamageType.FIRE] = resolvers.mbonus(7, 3)},
+		on_melee_hit={[DamageType.LIGHTNING] = resolvers.mbonus(7, 3)},
 	},
 }
 

game/modules/tome/data/general/objects/heavy-armors.lua

@@ -10,6 +10,7 @@ newEntity{
 	encumber = 17,
 	rarity = 5,
 	desc = [[A suit of armour made of mail.]],
+	egos = "/data/general/objects/egos/armor.lua", egos_chance = resolvers.mbonus(40, 5),
 }
 
 newEntity{ base = "BASE_HEAVY_ARMOR",

game/modules/tome/data/general/objects/light-armors.lua

@@ -7,6 +7,7 @@ newEntity{
 	encumber = 17,
 	rarity = 5,
 	desc = [[A suit of armour made of leather.]],
+	egos = "/data/general/objects/egos/armor.lua", egos_chance = resolvers.mbonus(40, 5),
 }
 
 newEntity{ base = "BASE_LIGHT_ARMOR",

game/modules/tome/data/general/objects/massive-armors.lua

@@ -10,6 +10,7 @@ newEntity{
 	encumber = 17,
 	rarity = 5,
 	desc = [[A suit of armour made of metal plates.]],
+	egos = "/data/general/objects/egos/armor.lua", egos_chance = resolvers.mbonus(40, 5),
 }
 
 newEntity{ base = "BASE_MASSIVE_ARMOR",

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

@@ -9,7 +9,7 @@ newEntity{ base = "BASE_STAFF",
 	color=colors.VIOLET,
 	rarity = 100,
 	desc = [[This unique looking staff is carved with runes of destruction.]],
-	cost = 5000,
+	cost = 500,
 
 	require = { stat = { mag=24 }, },
 	combat = {
@@ -30,7 +30,7 @@ newEntity{ base = "BASE_RING",
 	desc = [[This azure ring seems to be always moist to the touch.]],
 	level_range = {10, 20},
 	rarity = 150,
-	cost = 5000,
+	cost = 500,
 
 	max_power = 60, power_regen = 1,
 	use_power = { name = "summon a tidal wave", power = 60,
@@ -73,7 +73,7 @@ newEntity{ base = "BASE_LITE",
 	encumber = 1,
 	rarity = 100,
 	desc = [[A small crystal phial, with the light of Earendil's Star contained inside. Its light is imperishable, and near it darkness cannot endure.]],
-	cost = 2000,
+	cost = 200,
 
 	max_power = 15, power_regen = 1,
 	use_power = { name = "call light", power = 10,
@@ -96,7 +96,7 @@ newEntity{ base = "BASE_LITE",
 	encumber = 1,
 	rarity = 250,
 	desc = [[A great globe seemingly filled with moonlight, the famed Heart of the Mountain, which splinters the light that falls upon it into a thousand glowing shards.]],
-	cost = 4000,
+	cost = 400,
 
 	max_power = 150, power_regen = 1,
 	use_power = { name = "map surroundings", power = 100,
@@ -120,7 +120,7 @@ newEntity{
 	encumber = 0.4,
 	rarity = 150,
 	desc = [[Bottle containing healing magic. But the more you drink from it, the more it refills!]],
-	cost = 200,
+	cost = 80,
 
 	max_power = 100, power_regen = 1,
 	use_power = { name = "heal", power = 80,
@@ -141,7 +141,7 @@ newEntity{
 	encumber = 0.4,
 	rarity = 150,
 	desc = [[Bottle containing raw magic. But the more you drink from it, the more it refills!]],
-	cost = 200,
+	cost = 80,
 
 	max_power = 100, power_regen = 1,
 	use_power = { name = "restore mana", power = 80,