desc objects

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

game/modules/tome/class/Object.lua

@@ -218,6 +218,7 @@ function _M:getDesc()
 		local rs = {}
 		for type, i in pairs(w.esp) do
 			if type == "all" then rs[#rs+1] = "all"
+			elseif type == "range" then rs[#rs+1] = "increase range by "..i
 			else
 				local _, _, t, st = type:find("^([^/]+)/?(.*)$")
 				if st then
@@ -227,7 +228,7 @@ function _M:getDesc()
 				end
 			end
 		end
-		desc[#desc+1] = ("Grants telepathy to %s."):format(table.concat(rs, ','))
+		desc[#desc+1] = ("Grants telepathy: %s."):format(table.concat(rs, ','))
 	end
 
 	if w.talents_types_mastery then
@@ -243,6 +244,16 @@ function _M:getDesc()
 
 	if w.combat_physresist then desc[#desc+1] = ("Increases physical resistance: %s."):format(w.combat_physresist) end
 	if w.combat_spellresist then desc[#desc+1] = ("Increases spell resistance: %s."):format(w.combat_spellresist) end
+	if w.combat_mentalresist then desc[#desc+1] = ("Increases mental resistance: %s."):format(w.combat_mentalresist) end
+
+	if w.blind_immune then desc[#desc+1] = ("Increases blindness immunity: %d%%."):format(w.blind_immune * 100) end
+	if w.poison_immune then desc[#desc+1] = ("Increases poison immunity: %d%%."):format(w.poison_immune * 100) end
+	if w.cut_immune then desc[#desc+1] = ("Increases cut immunity: %d%%."):format(w.cut_immune * 100) end
+	if w.confusion_immune then desc[#desc+1] = ("Increases confusion immunity: %d%%."):format(w.confusion_immune * 100) end
+	if w.stun_immune then desc[#desc+1] = ("Increases stun immunity: %d%%."):format(w.stun_immune * 100) end
+	if w.fear_immune then desc[#desc+1] = ("Increases fear immunity: %d%%."):format(w.fear_immune * 100) end
+	if w.knockback_immune then desc[#desc+1] = ("Increases knockback immunity: %d%%."):format(w.knockback_immune * 100) end
+	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 %d hitpoints a turn."):format(w.life_regen) end
 	if w.mana_regen then desc[#desc+1] = ("Regenerates %d mana a turn."):format(w.mana_regen) end
@@ -255,6 +266,9 @@ function _M:getDesc()
 
 	if w.lite then desc[#desc+1] = ("Light radius %d"):format(w.lite) end
 
+	if w.see_invisible then desc[#desc+1] = ("See invisible: %d"):format(w.see_invisible) end
+	if w.invisible then desc[#desc+1] = ("Invisibility: %d"):format(w.invisible) end
+
 	local use_desc = self:getUseDesc()
 	if use_desc then desc[#desc+1] = use_desc end
 

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

@@ -60,3 +60,63 @@ newEntity{
 		inc_stats = { [Stats.STAT_MAG] = resolvers.mbonus(5, 1), [Stats.STAT_WIL] = resolvers.mbonus(5, 1) },
 	},
 }
+
+newEntity{
+	name = "magma ", prefix=true,
+	level_range = {1, 50},
+	rarity = 3,
+	cost = 5,
+	wielder = {
+		inc_damage={ [DamageType.FIRE] = resolvers.mbonus(25, 8), },
+	},
+}
+
+newEntity{
+	name = "icy ", prefix=true,
+	level_range = {1, 50},
+	rarity = 3,
+	cost = 5,
+	wielder = {
+		inc_damage={ [DamageType.COLD] = resolvers.mbonus(25, 8), },
+	},
+}
+
+newEntity{
+	name = "acidic ", prefix=true,
+	level_range = {1, 50},
+	rarity = 3,
+	cost = 5,
+	wielder = {
+		inc_damage={ [DamageType.ACID] = resolvers.mbonus(25, 8), },
+	},
+}
+
+newEntity{
+	name = "crackling ", prefix=true,
+	level_range = {1, 50},
+	rarity = 3,
+	cost = 5,
+	wielder = {
+		inc_damage={ [DamageType.LIGHTNING] = resolvers.mbonus(25, 8), },
+	},
+}
+
+newEntity{
+	name = "naturalist ", prefix=true,
+	level_range = {1, 50},
+	rarity = 3,
+	cost = 5,
+	wielder = {
+		inc_damage={ [DamageType.NATURE] = resolvers.mbonus(25, 8), },
+	},
+}
+
+newEntity{
+	name = "blighted ", prefix=true,
+	level_range = {1, 50},
+	rarity = 3,
+	cost = 5,
+	wielder = {
+		inc_damage={ [DamageType.BLIGHT] = resolvers.mbonus(25, 8), },
+	},
+}

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

@@ -97,3 +97,13 @@ newEntity{
 		},
 	},
 }
+
+newEntity{
+	name = " of massacre",
+	level_range = {1, 50},
+	rarity = 3,
+	cost = 4,
+	wielder = {
+		inc_damage={ [DamageType.PHYSICAL] = resolvers.mbonus(25, 8), },
+	},
+}

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

@@ -39,6 +39,10 @@ newEntity{ base = "BASE_STAFF",
 	wielder = {
 		combat_spellpower = 10,
 		combat_spellcrit = 15,
+		inc_damage={
+			[DamageType.FIRE] = resolvers.mbonus(25, 8),
+			[DamageType.LIGHTNING] = resolvers.mbonus(25, 8),
+		},
 	},
 }
 

game/modules/tome/data/zones/tower-amon-sul/objects.lua

@@ -36,5 +36,12 @@ newEntity{ base = "BASE_STAFF",
 		see_invisible = 2,
 		combat_spellpower = 15,
 		combat_spellcrit = 8,
+		inc_damage={
+			[DamageType.FIRE] = 7,
+			[DamageType.COLD] = 7,
+			[DamageType.ACID] = 7,
+			[DamageType.LIGHTNING] = 7,
+			[DamageType.BLIGHT] = 7,
+		},
 	},
 }