New artifacts

New vaults


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

game/modules/tome/data/general/objects/potions.lua

@@ -195,7 +195,7 @@ newEntity{ base = "BASE_POTION",
 	rarity = 7,
 	cost = 3,
 
-	use_simple = { name="cure poison", use = function(self, who)
+	use_simple = { name="cure diseases", use = function(self, who)
 		local target = who
 		local effs = {}
 		local known = false

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

@@ -33,7 +33,7 @@ newEntity{ base = "BASE_STAFF",
 	unided_name = "darkness infused staff",
 	level_range = {20, 25},
 	color=colors.VIOLET,
-	rarity = 100,
+	rarity = 170,
 	desc = [[This unique looking staff is carved with runes of destruction.]],
 	cost = 200,
 	material_level = 3,
@@ -55,6 +55,60 @@ newEntity{ base = "BASE_STAFF",
 	},
 }
 
+newEntity{ base = "BASE_STAFF",
+	unique = true,
+	name = "Penitence",
+	unided_name = "glowing staff",
+	level_range = {10, 18},
+	color=colors.VIOLET,
+	rarity = 200,
+	desc = [[A powerful staff sent in secret to Angolwen by the Shaloren, to aid their fighting of the plagues following the Spellblaze.]],
+	cost = 200,
+	material_level = 2,
+
+	require = { stat = { mag=24 }, },
+	combat = {
+		dam = 10,
+		apr = 4,
+		dammod = {mag=1.2},
+		damtype = DamageType.ARCANE,
+	},
+	wielder = {
+		combat_spellpower = 15,
+		combat_spellcrit = 10,
+		resists = {
+			[DamageType.BLIGHT] = 30,
+		},
+	},
+	max_power = 60, power_regen = 1,
+	use_power = { name = "cure diseases", power = 50,
+		use = function(self, who)
+			local target = who
+			local effs = {}
+			local known = false
+
+			-- Go through all spell effects
+			for eff_id, p in pairs(target.tmp) do
+				local e = target.tempeffect_def[eff_id]
+				if e.type == "disease" then
+					effs[#effs+1] = {"effect", eff_id}
+				end
+			end
+
+			for i = 1, 3 + math.floor(who:getMag() / 10) do
+				if #effs == 0 then break end
+				local eff = rng.tableRemove(effs)
+
+				if eff[1] == "effect" then
+					target:removeEffect(eff[2])
+					known = true
+				end
+			end
+			game.logSeen(who, "%s is cured of diseases!", who.name:capitalize())
+		end
+	},
+}
+
 newEntity{ base = "BASE_RING",
 	unique = true,
 	name = "Vargh Redemption", color = colors.LIGHT_BLUE,
@@ -162,6 +216,22 @@ newEntity{ base = "BASE_RING",
 	},
 }
 
+newEntity{ base = "BASE_RING",
+	unique = true,
+	name = "Feathersteel Amulet", color = colors.WHITE,
+	unided_name = "light amulet",
+	desc = [[The weight of the world seems a little lighter with this amulet around your neck.]],
+	level_range = {5, 15},
+	rarity = 200,
+	cost = 90,
+	material_level = 2,
+
+	wielder = {
+		max_encumber = 20,
+		fatigue = -20,
+	},
+}
+
 newEntity{ base = "BASE_LITE",
 	unique = true,
 	name = "Summertide Phial",
@@ -1166,7 +1236,7 @@ newEntity{ base = "BASE_MASSIVE_ARMOR",
 	desc = [[Beautifully detailed with images of King Toknor's defence of Last Hope. Despair fills the hearts of even the blackest villains at the sight of it.]],
 	color = colors.WHITE,
 	level_range = {45, 50},
-	rarity = 350,
+	rarity = 390,
 	require = { stat = { str=48 }, },
 	cost = 800,
 	material_level = 5,
@@ -1188,6 +1258,30 @@ newEntity{ base = "BASE_MASSIVE_ARMOR",
 	},
 }
 
+newEntity{ base = "BASE_MASSIVE_ARMOR",
+	unique = true,
+	name = "Cuirass of the Thronesmen",
+	unided_name = "",
+	desc = [[This heavy dwarven-steel armour was created in the deepest forges of the Iron Throne. While it grants incomparable protection, it demands that you rely only on your own strength.]],
+	color = colors.WHITE,
+	level_range = {35, 40},
+	rarity = 320,
+	require = { stat = { str=44 }, },
+	cost = 500,
+	material_level = 4,
+	wielder = {
+		inc_stats = { [Stats.STAT_CON] = 6, },
+		resists = {
+			[DamageType.FIRE] = 25,
+		},
+		combat_def = 20,
+		combat_armor = 29,
+		stun_immune = 0.5,
+		knockback_immune = 0.5,
+		healing_factor = -0.4,
+	},
+}
+
 newEntity{ base = "BASE_GREATSWORD",
 	unique = true,
 	name = "Golden Three-Edged Sword 'The Truth' ",

game/modules/tome/data/maps/vaults/lightning-vault.lua

+-- ToME - Tales of Maj'Eyal
+-- 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
+
+setStatusAll{no_teleport=true}
+
+rotates = {"default", "90", "180", "270", "flipx", "flipy"}
+
+startx = 8
+starty = 16
+
+defineTile('.', "FLOOR")
+defineTile('X', "HARDWALL")
+defineTile('#', "WALL")
+defineTile('!', "DOOR_VAULT")
+defineTile('^', "FLOOR", nil, nil, {random_filter={add_levels=5}})
+
+defineTile('P', "FLOOR", nil, {random_filter={name="snow giant thunderer", add_levels=10}})
+defineTile('T', "FLOOR", nil, {random_filter={name="mountain troll thunderer", add_levels=10}})
+defineTile('e', "FLOOR", nil, {random_filter={name="greater gwelgoroth", add_levels=10}})
+defineTile('E', "FLOOR", nil, {random_filter={name="ultimate gwelgoroth", add_levels=15}})
+defineTile('D', "FLOOR", nil, {random_filter={name="storm wyrm", add_levels=20}})
+
+defineTile('$', "FLOOR", "MONEY_BIG")
+defineTile('1', "FLOOR", {random_filter={add_levels=15, ego_chance=45}})
+defineTile('2', "FLOOR", {random_filter={type="ammo", add_levels=10, ego_chance=80}})
+
+return {
+[[XXXXXXXXXXXXXXXXX]],
+[[XE$..#.....#..$EX]],
+[[X$2$##..P..##$2$X]],
+[[X.$##.......##$.X]],
+[[X.##...X^X...##.X]],
+[[X##..e.X^X.e..##X]],
+[[X......X#X......X]],
+[[X...XXX111XXX...X]],
+[[X.T.^^#1D1#^^.T.X]],
+[[X...XXX111XXX...X]],
+[[X......X#X......X]],
+[[X##..e.X^X.e..##X]],
+[[X.##...X^X...##.X]],
+[[X.$##.......##$.X]],
+[[X$2$##..P..##$2$X]],
+[[XE$..#.....#..$EX]],
+[[XXXXXXXX!XXXXXXXX]],
+}

game/modules/tome/data/maps/vaults/water-vault.lua

+-- ToME - Tales of Maj'Eyal
+-- 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
+
+setStatusAll{no_teleport=true}
+
+rotates = {"default", "90", "180", "270", "flipx", "flipy"}
+
+startx = 13
+starty = 12
+
+defineTile('.', "FLOOR")
+defineTile('X', "HARDWALL")
+defineTile('#', "WALL")
+defineTile('!', "DOOR_VAULT")
+defineTile('~', "DEEP_WATER")
+
+defineTile('n', "FLOOR", nil, {random_filter={subtype="naga", add_levels=10}})
+defineTile('1', "FLOOR", nil, {random_filter={no_breath=1, add_levels=5}})
+
+defineTile('$', "FLOOR", {random_filter={add_levels=10, ego_chance=20}})
+
+return {
+[[#XXXXX###############XXXXX#]],
+[[XX~~~XX###XXXXXXX###XX~~~XX]],
+[[X~111~XXXXX~~~~~XXXXX~111~X]],
+[[X~1n1~~~~~~~~~~~~~~~~~1n1~X]],
+[[X~111~XXXXXXX~XXXXXXX~111~X]],
+[[XX~~~XXXXXXXX~XXXXXXXX~~~XX]],
+[[#XX~XXXXXXXXX~XXXXXXXXX~XX#]],
+[[##X~XXX$$$XX~~~XX$$$XXX~X##]],
+[[##X~XXX111X~...~X111XXX~X##]],
+[[##X~~~~1n1X~...~X1n1~~~~X##]],
+[[##XXXXX111X~...~X111XXXXX##]],
+[[######X$$$XX~~~XX$$$X######]],
+[[######XXXXXXX!XXXXXXX######]],
+}

game/modules/tome/data/rooms/greater_vault.lua

@@ -19,7 +19,7 @@
 
 local max_w, max_h = 50, 50
 local list = {
-	"double-t", "crypt", "treasure1", "diggers", "hillbert_curve", "quiet",
+	"double-t", "crypt", "treasure1", "diggers", "hillbert_curve", "quiet", "lightning-vault", "water-vault",
 }
 
 return function(gen, id, lev, old_lev)

game/modules/tome/data/zones/grushnak-pride/grids.lua

@@ -21,6 +21,7 @@ load("/data/general/grids/basic.lua")
 load("/data/general/grids/underground.lua")
 load("/data/general/grids/lava.lua")
 load("/data/general/grids/water.lua")
+load("/data/general/grids/forest.lua")
 
 newEntity{
 	define_as = "SLIME_TUNNELS",

game/modules/tome/data/zones/grushnak-pride/zone.lua

@@ -36,7 +36,6 @@ return {
 			lite_room_chance = 20,
 			rooms = {"forest_clearing", {"money_vault",5}, {"pit",7}, {"greater_vault",8}},
 			rooms_config = {pit={filters={{subtype="orc"},{subtype="troll"}}}},
-			greater_vaults_list = {"dragon-loot"},
 			['.'] = "UNDERGROUND_FLOOR",
 			['#'] = {"UNDERGROUND_TREE","UNDERGROUND_TREE2","UNDERGROUND_TREE3","UNDERGROUND_TREE4","UNDERGROUND_TREE5","UNDERGROUND_TREE6","UNDERGROUND_TREE7","UNDERGROUND_TREE8","UNDERGROUND_TREE9","UNDERGROUND_TREE10","UNDERGROUND_TREE11","UNDERGROUND_TREE12","UNDERGROUND_TREE13","UNDERGROUND_TREE14","UNDERGROUND_TREE15","UNDERGROUND_TREE16","UNDERGROUND_TREE17","UNDERGROUND_TREE18","UNDERGROUND_TREE19","UNDERGROUND_TREE20",},
 			up = "UP",

game/modules/tome/data/zones/high-peak/grids.lua

@@ -18,6 +18,9 @@
 -- darkgod@te4.org
 
 load("/data/general/grids/basic.lua")
+load("/data/general/grids/water.lua")
+load("/data/general/grids/forest.lua")
+load("/data/general/grids/lava.lua")
 
 newEntity{
 	define_as = "FAR_EAST_PORTAL",

game/modules/tome/data/zones/infinite-dungeon/grids.lua

@@ -18,3 +18,6 @@
 -- darkgod@te4.org
 
 load("/data/general/grids/basic.lua")
+load("/data/general/grids/water.lua")
+load("/data/general/grids/forest.lua")
+load("/data/general/grids/lava.lua")

game/modules/tome/data/zones/infinite-dungeon/zone.lua

@@ -36,7 +36,6 @@ return {
 --			rooms = {"simple", "pilar", {"money_vault",5}},
 			rooms = {"random_room", "greater_vault"},
 			rooms_config = {pit={filters={{type="undead"}}}},
-			greater_vaults_list = {"double-t","crypt","treasure1","diggers"},
 			lite_room_chance = 50,
 			['.'] = "FLOOR",
 			['#'] = "WALL",

game/modules/tome/data/zones/tol-falas/grids.lua

@@ -18,6 +18,9 @@
 -- darkgod@te4.org
 
 load("/data/general/grids/basic.lua")
+load("/data/general/grids/water.lua")
+load("/data/general/grids/forest.lua")
+load("/data/general/grids/lava.lua")
 
 newEntity{
 	define_as = "LORE_NOTE",