New vampire tiles

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

game/modules/tome/class/Actor.lua

@@ -250,6 +250,9 @@ function _M:act()
 	local equilibrium_level = game.level.map:checkEntity(self.x, self.y, Map.TERRAIN, "equilibrium_level")
 	if equilibrium_level then self:incEquilibrium(equilibrium_level) end
 
+	-- Do stuff to things standing in the fire
+	game.level.map:checkEntity(self.x, self.y, Map.TERRAIN, "on_stand", self)
+
 	-- Still enough energy to act ?
 	if self.energy.value < game.energy_to_act then return false end
 

game/modules/tome/data/birth/classes/corrupted.lua

@@ -83,7 +83,8 @@ newBirthDescriptor{
 	name = "Corruptor",
 	desc = {
 		"A corruptor is a terrible foe, wielding dark magics that can sap the very soul of her targets.",
-		"They can harness the blight of evil, crushing their sould, stealing their life force to replenish themselves.",
+		"They can harness the blight of evil, crushing their soul, stealing their life force to replenish themselves.",
+		"The most powerful corruptors can even take on some demonic aspects for themselves.",
 		"Their most important stats are: Magic and Willpower",
 		"#GOLD#Stats modifiers:",
 		"#LIGHT_BLUE# * +0 Strength, +0 Dexterity, +2 Constitution",
@@ -93,26 +94,25 @@ newBirthDescriptor{
 	talents_types = {
 		["cunning/survival"]={false, 0},
 		["corruption/sanguisuge"]={true, 0.3},
-		["corruption/hexes"]={false, 0.3},
-		["corruption/curses"]={false, 0.3},
-		["corruption/bone"]={true, 0.3},
+		["corruption/hexes"]={true, 0.3},
+		["corruption/curses"]={true, 0.3},
+		["corruption/bone"]={false, 0.3},
 		["corruption/plague"]={true, 0.3},
-		["corruption/shadowflame"]={true, 0.3},
+		["corruption/shadowflame"]={false, 0.3},
 		["corruption/blood"]={true, 0.3},
-		["corruption/soul"]={true, 0.3},
+		["corruption/vim"]={true, 0.3},
 		["corruption/blight"]={true, 0.3},
 	},
 	talents = {
 		[ActorTalents.T_BLOOD_SACRIFICE] = 1,
 		[ActorTalents.T_BLOOD_GRASP] = 1,
-		[ActorTalents.T_BONE_SPEAR] = 1,
-		[ActorTalents.T_VIRULENT_DISEASE] = 1,
+		[ActorTalents.T_SOUL_ROT] = 1,
+		[ActorTalents.T_PACIFICATION_HEX] = 1,
 	},
 	copy = {
 		resolvers.equip{ id=true,
-			{type="weapon", subtype="waraxe", name="iron waraxe", autoreq=true},
-			{type="weapon", subtype="waraxe", name="iron waraxe", autoreq=true},
-			{type="armor", subtype="heavy", name="iron mail armour", autoreq=true}
+			{type="weapon", subtype="staff", name="elm staff", autoreq=true},
+			{type="armor", subtype="cloth", name="linen robe", autoreq=true}
 		},
 	},
 }

game/modules/tome/data/birth/classes/divine.lua

@@ -117,7 +117,7 @@ newBirthDescriptor{
 		max_life = 90,
 		resolvers.equip{ id=true,
 			{type="weapon", subtype="staff", name="elm staff", autoreq=true},
-			{type="armor", subtype="cloth", name="robe", autoreq=true},
+			{type="armor", subtype="cloth", name="linen robe", autoreq=true}
 		},
 	},
 }

game/modules/tome/data/general/grids/lava.lua

@@ -24,7 +24,7 @@ newEntity{
 	shader = "lava",
 	mindam = resolvers.mbonus(5, 15),
 	maxdam = resolvers.mbonus(10, 30),
-	on_move = function(self, x, y, who)
+	on_stand = function(self, x, y, who)
 		local DT = engine.DamageType
 		local dam = DT:get(DT.FIRE).projector(self, x, y, DT.FIRE, rng.range(self.mindam, self.maxdam))
 		if dam > 0 then game.logPlayer(who, "The laval burns you!") end

game/modules/tome/data/general/npcs/elven-caster.lua

@@ -84,7 +84,6 @@ newEntity{ base = "BASE_NPC_ELVEN_CASTER",
 	combat_armor = 0, combat_def = 0,
 	resolvers.talents{
 		[Talents.T_BLOOD_SPRAY]=4,
-		[Talents.T_SOUL_ROT]=4,
 		[Talents.T_BLOOD_GRASP]=4,
 		[Talents.T_BLOOD_BOIL]=3,
 		[Talents.T_BLOOD_FURY]=3,
@@ -111,11 +110,7 @@ newEntity{ base = "BASE_NPC_ELVEN_CASTER",
 		[Talents.T_BLOOD_SPRAY]=5,
 		[Talents.T_SOUL_ROT]=5,
 		[Talents.T_BLOOD_GRASP]=4,
-		[Talents.T_BLOOD_BOIL]=3,
-		[Talents.T_BLOOD_FURY]=3,
 		[Talents.T_BONE_SPEAR]=5,
-		[Talents.T_VIRULENT_DISEASE]=5,
-		[Talents.T_DARKFIRE]=5,
 	},
 	resolvers.sustains_at_birth(),
 }

game/modules/tome/data/general/npcs/vampire.lua

@@ -71,7 +71,7 @@ newEntity{
 }
 
 newEntity{ base = "BASE_NPC_VAMPIRE",
-	name = "lesser vampire", color=colors.SLATE,
+	name = "lesser vampire", color=colors.SLATE, image = "npc/lesser_vampire.png",
 	desc=[[This vampire has only just begun it's new life, it has not yet fathomed its newfound power.  Yet it still has its thirst for blood.]],
 	level_range = {15, nil}, exp_worth = 1,
 	rarity = 1,
@@ -82,7 +82,7 @@ newEntity{ base = "BASE_NPC_VAMPIRE",
 }
 
 newEntity{ base = "BASE_NPC_VAMPIRE",
-	name = "vampire", color=colors.SLATE,
+	name = "vampire", color=colors.SLATE, image = "npc/vampire.png",
 	desc=[[It is a humanoid with an aura of power. You notice a sharp set of front teeth.]],
 	level_range = {20, nil}, exp_worth = 1,
 	rarity = 1,
@@ -93,7 +93,7 @@ newEntity{ base = "BASE_NPC_VAMPIRE",
 }
 
 newEntity{ base = "BASE_NPC_VAMPIRE",
-	name = "master vampire", color=colors.GREEN,
+	name = "master vampire", color=colors.GREEN, image = "npc/master_vampire.png",
 	desc=[[It is a humanoid form dressed in robes. Power emanates from its chilling frame.]],
 	level_range = {23, nil}, exp_worth = 1,
 	rarity = 1,
@@ -104,7 +104,7 @@ newEntity{ base = "BASE_NPC_VAMPIRE",
 }
 
 newEntity{ base = "BASE_NPC_VAMPIRE",
-	name = "elder vampire", color=colors.RED,
+	name = "elder vampire", color=colors.RED, image = "npc/elder_vampire.png",
 	desc=[[A terrible robed undead figure, this creature has existed in its unlife for many centuries by stealing the life of others.
 It can summon the very shades of its victims from beyond the grave to come enslaved to its aid.]],
 	level_range = {26, nil}, exp_worth = 1,
@@ -118,7 +118,7 @@ It can summon the very shades of its victims from beyond the grave to come ensla
 }
 
 newEntity{ base = "BASE_NPC_VAMPIRE",
-	name = "vampire lord", color=colors.BLUE,
+	name = "vampire lord", color=colors.BLUE, image = "npc/vampire_lord.png",
 	desc=[[A foul wind chills your bones as this ghastly figure approaches.]],
 	level_range = {30, nil}, exp_worth = 1,
 	rarity = 4,

game/modules/tome/data/lore/tol-falas.lua

@@ -64,5 +64,5 @@ newLore{
 	name = "note from the Master",
 	lore = [[MINIONS: To my newest vampire, burn foolish adventurer, burn! I bet you are sorry for that flame spell now, aren't you? Suffer as I revisit it upon you.
 
-To the rest of you, there will be punishment. An adventurer got down to my bedroom and surprised me. I, myself, was hurt and almost had to use my special power. All is well now and I am as dangerous as ever, but you shall suffer for letting him get so low. The next minion I see shall be toasted with my marshmellows. Where then were the special pits of doom I organized? Where was the poison of my wights or the diseases of my ghouls? Indeed, I should slaughter all of you and I would, but those who were most foully remiss were already slaughtered by the adventurer. The rest of you? Beware my wrath.]],
+To the rest of you, there will be punishment. An adventurer got down to my bedroom and surprised me. I, myself, was hurt and almost had to use my special power. All is well now and I am as dangerous as ever, but you shall suffer for letting him get so low. The next minion I see shall be toasted with my marshmallows. Where then were the special pits of doom I organized? Where was the poison of my wights or the diseases of my ghouls? Indeed, I should slaughter all of you and I would, but those who were most foully remiss were already slaughtered by the adventurer. The rest of you? Beware my wrath.]],
 }

game/modules/tome/data/maps/zones/mark-spellblaze-last.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
+
+subGenerator{
+	x = 0, y = 0, w = 50, h = 50,
+	generator = "engine.generator.map.Forest",
+	data = {
+		edge_entrances = {4,6},
+		zoom = 4,
+		sqrt_percent = 45,
+		noise = "fbm_perlin",
+		floor = {"BURNT_GROUND1","BURNT_GROUND2","BURNT_GROUND3","BURNT_GROUND4",},
+		wall = {"BURNT_TREE1","BURNT_TREE2","BURNT_TREE3","BURNT_TREE4","BURNT_TREE5","BURNT_TREE6","BURNT_TREE7","BURNT_TREE8","BURNT_TREE9","BURNT_TREE10","BURNT_TREE11","BURNT_TREE12","BURNT_TREE13","BURNT_TREE14","BURNT_TREE15","BURNT_TREE16","BURNT_TREE17","BURNT_TREE18","BURNT_TREE19","BURNT_TREE20",},
+		up = "UP",
+		down = "DOWN",
+	},
+	define_up = true,
+}
+
+checkConnectivity({55,24}, "entrance", "boss-area", "boss-area")
+
+-- defineTile section
+defineTile("#", {"BURNT_TREE1","BURNT_TREE2","BURNT_TREE3","BURNT_TREE4","BURNT_TREE5","BURNT_TREE6","BURNT_TREE7","BURNT_TREE8","BURNT_TREE9","BURNT_TREE10","BURNT_TREE11","BURNT_TREE12","BURNT_TREE13","BURNT_TREE14","BURNT_TREE15","BURNT_TREE16","BURNT_TREE17","BURNT_TREE18","BURNT_TREE19","BURNT_TREE20",})
+defineTile("~", "LAVA")
+defineTile("+", "ALTAR")
+defineTile(".", {"BURNT_GROUND1","BURNT_GROUND2","BURNT_GROUND3","BURNT_GROUND4",})
+defineTile("@", "ALTAR", nil, "GRAND_CORRUPTOR")
+
+-- addSpot section
+
+-- addZone section
+
+-- ASCII map section
+return [[
+                                                  ...............
+                                                  ...............
+                                                  .#..#....#.....
+                                                  ##......##.....
+                                                  ..#............
+                                                  ....##.........
+                                                  ...........##..
+                                                  ...............
+                                                  .......#.......
+                                                  ............#..
+                                                  .#.#...........
+                                                  ...#...........
+                                                  #...#....#.....
+                                                  #.....#........
+                                                  .....##....#...
+                                                  .....#.........
+                                                  ...............
+                                                  ...............
+                                                  .#.............
+                                                  .#.......~...#.
+                                                  ##.#....~~~.~..
+                                                  #..#...~~~~~~~.
+                                                  #..#..+~~~~~~..
+                                                  #.....@~~~~~~..
+                                                  #.....+~~~~~~..
+                                                  ..#...+~~~~~...
+                                                  .#.....~~~~~...
+                                                  .#......~~~~~..
+                                                  .#......~~....#
+                                                  ..............#
+                                                  ..#...........#
+                                                  .#.............
+                                                  .#...#.........
+                                                  ...............
+                                                  ..........#....
+                                                  ...##.....#....
+                                                  ..##.....###...
+                                                  .......#...#...
+                                                  .##............
+                                                  ......#...#....
+                                                  ..........#....
+                                                  ...............
+                                                  ....#......#...
+                                                  ...............
+                                                  ...............
+                                                  ...............
+                                                  .........##.#..
+                                                  ............#..
+                                                  .....#.........
+                                                  ...............]]

game/modules/tome/data/zones/crypt-kryl-feijan/npcs.lua

@@ -17,7 +17,7 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
-load("/data/general/npcs/elven-demonologist.lua", rarity(0))
+load("/data/general/npcs/elven-caster.lua", rarity(0))
 load("/data/general/npcs/elven-warrior.lua", rarity(0))
 load("/data/general/npcs/minor-demon.lua", rarity(5))
 load("/data/general/npcs/major-demon.lua", function(e) e.rarity = nil end)

game/modules/tome/data/zones/mark-spellblaze/grids.lua

@@ -37,7 +37,17 @@ newEntity{
 }
 end
 
-newEntity{ define_as = "BURNT_GROUND",
+for i = 1, 4 do
+newEntity{ define_as = "BURNT_GROUND"..i,
 	name='burnt ground',
-	display='.', color=colors.UMBER, back_color=colors.DARK_GREY, image="terrain/grass_burnt1.png",
+	display='.', color=colors.UMBER, back_color=colors.DARK_GREY, image="terrain/grass_burnt"..i..".png",
+}
+end
+
+newEntity{
+	define_as = "ALTAR",
+	name = "corrupted alter", image = "terrain/floor_pentagram.png",
+	display = ';', color=colors.RED, back_color=colors.DARK_UMBER,
+	notice = true,
+	always_remember = true,
 }

game/modules/tome/data/zones/mark-spellblaze/objects.lua

@@ -18,14 +18,3 @@
 -- darkgod@te4.org
 
 load("/data/general/objects/objects.lua")
-
-for i = 1, 5 do
-newEntity{ base = "BASE_LORE",
-	define_as = "NOTE"..i,
-	name = "tattered paper scrap", lore="trollshaws-note-"..i,
-	desc = [[A paper scrap, left by an adventurer.]],
-	rarity = false,
-	is_magic_device = false,
-	encumberance = 0,
-}
-end