upgraded Gurshnak pride

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

@@ -129,6 +129,7 @@ newBirthDescriptor{
 		"#LIGHT_BLUE# * +2 Strength, +0 Dexterity, +0 Constitution",
 		"#LIGHT_BLUE# * +4 Magic, +3 Willpower, +0 Cunning",
 	},
+	not_on_random_boss = true,
 	stats = { str=2, wil=3, mag=4, },
 	talents_types = {
 		["wild-gift/call"]={true, 0.2},

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011 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
+
+startx = 15
+starty = 8
+endx = 0
+endy = 8
+
+-- defineTile section
+defineTile("#", "HARDWALL")
+defineTile("o", "FLOOR", nil, {entity_mod=function(e) e.make_escort = nil return e end, random_filter={type='humanoid', subtype='orc', special=function(e) return e.pride == data.pride end}})
+quickEntity("g", 'o')
+defineTile("+", "DOOR")
+if level.level == 1 then defineTile("<", "UNDERGROUND_LADDER_UP_WILDERNESS") else defineTile("<", data.up) end
+defineTile(">", data.down, nil, nil, nil, {no_teleport=true})
+if level.level == 1 then defineTile("O", "FLOOR", nil, {random_filter={type='humanoid', subtype='orc', special=function(e) return e.pride == data.pride end, random_boss={nb_classes=1, loot_quality="store", loot_quantity=3, rank=3.5,}}})
+else quickEntity('O', 'o') end
+defineTile(".", "FLOOR")
+defineTile(";", "FLOOR", nil, nil, nil, {no_teleport=true})
+defineTile("*", "LEVER_DOOR", nil, nil, nil, nil, {type="lever", subtype="door"})
+defineTile("&", "LEVER", nil, nil, nil, nil, {type="lever", subtype="lever"})
+defineTile(" ", "FLOOR", nil, {entity_mod=function(e) e.make_escort = nil return e end, random_filter={type='humanoid', subtype='orc', special=function(e) return e.pride == data.pride end, random_boss={nb_classes=1, loot_quality="store", loot_quantity=1, no_loot_randart=true, rank=3}}}, nil, {no_teleport=true})
+
+-- addSpot section
+
+-- addZone section
+
+-- ASCII map section
+return [[
+################
+################
+####&.....oo####
+####......oo####
+######....######
+####........####
+###..........###
+###..#o.. #..###
+>O*...o.. .....<
+###..#o.. #..###
+###..........###
+####........####
+######....######
+####......oo####
+####&.....oo####
+################]]
\ No newline at end of file

@@ -19,6 +19,7 @@
 
 -- Wild Gifts
 newTalentType{ allow_random=true, type="wild-gift/call", name = "call of the wild", generic = true, description = "Be at one with nature." }
+newTalentType{ allow_random=true, type="wild-gift/harmony", name = "harmony", generic = true, description = "Nature heals and cleans you." }
 newTalentType{ allow_random=true, type="wild-gift/antimagic", name = "antimagic", generic = true, description = "The way to combat magic, or even nullify it.\nUsing a magical device or a spell will put all antimagic talents on cooldown for a few turns." }
 newTalentType{ allow_random=true, type="wild-gift/summon-melee", name = "summoning (melee)", description = "The art of calling creatures to your aid." }
 newTalentType{ allow_random=true, type="wild-gift/summon-distance", name = "summoning (distance)", description = "The art of calling creatures to your aid." }
@@ -55,6 +56,7 @@ gifts_req5 = {
 }
 
 load("/data/talents/gifts/call.lua")
+load("/data/talents/gifts/harmony.lua")
 
 load("/data/talents/gifts/antimagic.lua")
 

+-- ToME - Tales of Maj'Eyal
+-- Copyright (C) 2009, 2010, 2011 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
+
+newTalent{
+	name = "Waters of Life",
+	type = {"wild-gift/harmony", 1},
+	require = gifts_req1,
+	points = 5,
+	cooldown = 30,
+	equilibrium = 10,
+	tactical = { HEAL=2 },
+	on_pre_use = function(self, t)
+		for eff_id, p in pairs(self.tmp) do
+			local e = self.tempeffect_def[eff_id]
+			if e.type == "disease" or e.type == "poison" then
+				return true
+			end
+		end
+		return false
+	end,
+	action = function(self, t)
+		local nb = 0
+		for eff_id, p in pairs(self.tmp) do
+			local e = self.tempeffect_def[eff_id]
+			if e.type == "disease" or e.type == "poison" then
+				nb = nb + 1
+			end
+		end
+		self:heal(nb * self:combatTalentStatDamage(t, "wil", 20, 60))
+
+		self:setEffect(self.EFF_WATERS_OF_LIFE, 5 + self:getTalentLevel(t), {})
+
+		game:playSoundNear(self, "talents/spell_generic2")
+		return true
+	end,
+	info = function(self, t)
+		return ([[The waters of life flow through you, purifying any poisons or diseases currently affecting you.
+		For %x turns all poisons and diseases will heal you instead of damaging you.
+		When activated it also heals you for %d life per diseases or poisons on you.
+		The healing will increase with your Willpower stat.]]):
+		format(5 + self:getTalentLevel(t), self:combatTalentStatDamage(t, "wil", 20, 60))
+	end,
+}
+
+newTalent{
+	name = "Elemental Harmony",
+	type = {"wild-gift/harmony", 2},
+	require = gifts_req2,
+	random_ego = "defensive",
+	points = 5,
+	equilibrium = 10,
+	cooldown = 20,
+	range = 1,
+	requires_target = true,
+	no_npc_use = true,
+	action = function(self, t)
+		local tg = {default_target=self, type="hit", nowarning=true, range=self:getTalentRange(t), first_target="friend"}
+		local x, y, target = self:getTarget(tg)
+		if not x or not y or not target then return nil end
+		if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
+		if not target.undead then
+			target:heal(20 + self:getWil(50) * self:getTalentLevel(t))
+		end
+		game:playSoundNear(self, "talents/heal")
+		return true
+	end,
+	info = function(self, t)
+		return ([[Touch a target (or yourself) to infuse it with Nature, healing it for %d(heal does not work on undead).
+		Heal will increase with your Willpower stat.]]):
+		format(20 + self:getWil(50) * self:getTalentLevel(t))
+	end,
+}
+
+newTalent{
+	name = "One with Nature",
+	type = {"wild-gift/harmony", 3},
+	require = gifts_req3,
+	points = 5,
+	equilibrium = 15,
+	cooldown = 30,
+	tactical = { BUFF=2 },
+	on_pre_use = function(self, t) return self:hasEffect(self.EFF_INFUSION_SATURATION) end,
+	action = function(self, t)
+		self:removeEffect(self.EFF_INFUSION_SATURATION)
+		local tids = {}
+		local nb = self:getTalentLevelRaw(t)
+		for tid, _ in pairs(self.talents_cd) do
+			local tt = self:getTalentFromId(tid)
+			if tt.type[1] == "inscriptions/infusions" and self:isTalentCoolingDown(t) then tids[#tids+1] = tid end
+		end
+		for i = 1, nb do
+			if #tids == 0 then break end
+			local tid = rng.tableRemove(tids)
+			self.talents_cd[tid] = self.talents_cd[tid] - (1 + math.floor(self:getTalentLevel(t) / 2))
+			if self.talents_cd[tid] <= 0 then self.talents_cd[tid] = nil end
+		end
+		game:playSoundNear(self, "talents/spell_generic2")
+		return true
+	end,
+	info = function(self, t)
+		local turns = 1 + math.floor(self:getTalentLevel(t) / 2)
+		local nb = self:getTalentLevelRaw(t)
+		return ([[Commune with nature, removing the infusion saturation effect and reducing the cooldown of %d infusions by %d turns.]]):
+		format(nb, turns)
+	end,
+}
+
+newTalent{
+	name = "Natural Perfection",
+	type = {"wild-gift/harmony", 4},
+	require = gifts_req4,
+	points = 5,
+	equilibrium = 20,
+	cooldown = 50,
+	range = 10,
+	tactical = { BUFF = 2 },
+	action = function(self, t)
+		local nb = math.ceil(self:getTalentLevel(t) + 2)
+		local tids = {}
+		for tid, _ in pairs(self.talents_cd) do
+			local tt = self:getTalentFromId(tid)
+			if tt.type[2] <= self:getTalentLevelRaw(t) and tt.type[1]:find("^wild%-gift/") then
+				tids[#tids+1] = tid
+			end
+		end
+		for i = 1, nb do
+			if #tids == 0 then break end
+			local tid = rng.tableRemove(tids)
+			self.talents_cd[tid] = nil
+		end
+		self.changed = true
+		game:playSoundNear(self, "talents/spell_generic2")
+		return true
+	end,
+	info = function(self, t)
+		return ([[Your deep link with Nature allows you to reset the cooldown of %d of your wild gifts of level %d or less.]]):
+		format(math.ceil(self:getTalentLevel(t) + 2), self:getTalentLevelRaw(t))
+	end,
+}

@@ -226,7 +226,9 @@ newEffect{
 		return old_eff
 	end,
 	on_timeout = function(self, eff)
-		DamageType:get(DamageType.NATURE).projector(eff.src, self.x, self.y, DamageType.NATURE, eff.power)
+		if self:attr("purify_poison") then self:heal(eff.power)
+		else DamageType:get(DamageType.NATURE).projector(eff.src, self.x, self.y, DamageType.NATURE, eff.power)
+		end
 	end,
 }
 
@@ -244,7 +246,9 @@ newEffect{
 		eff.dur = self:updateEffectDuration(eff.dur, "pin")
 	end,
 	on_timeout = function(self, eff)
-		DamageType:get(DamageType.NATURE).projector(eff.src, self.x, self.y, DamageType.NATURE, eff.power)
+		if self:attr("purify_poison") then self:heal(eff.power)
+		else DamageType:get(DamageType.NATURE).projector(eff.src, self.x, self.y, DamageType.NATURE, eff.power)
+		end
 	end,
 	deactivate = function(self, eff)
 		self:removeTemporaryValue("never_move", eff.tmpid)
@@ -264,7 +268,9 @@ newEffect{
 		eff.healid = self:addTemporaryValue("healing_factor", -eff.heal_factor / 100)
 	end,
 	on_timeout = function(self, eff)
-		DamageType:get(DamageType.NATURE).projector(eff.src, self.x, self.y, DamageType.NATURE, eff.power)
+		if self:attr("purify_poison") then self:heal(eff.power)
+		else DamageType:get(DamageType.NATURE).projector(eff.src, self.x, self.y, DamageType.NATURE, eff.power)
+		end
 	end,
 	deactivate = function(self, eff)
 		self:removeTemporaryValue("healing_factor", eff.healid)
@@ -1317,7 +1323,9 @@ newEffect{
 	on_lose = function(self, err) return "#Target# is free from the rotting disease." end,
 	-- Damage each turn
 	on_timeout = function(self, eff)
-		DamageType:get(DamageType.BLIGHT).projector(eff.src, self.x, self.y, DamageType.BLIGHT, eff.dam, {from_disease=true})
+		if self:attr("purify_disease") then self:heal(eff.dam)
+		else DamageType:get(DamageType.BLIGHT).projector(eff.src, self.x, self.y, DamageType.BLIGHT, eff.dam, {from_disease=true})
+		end
 	end,
 	-- Lost of CON
 	activate = function(self, eff)
@@ -1339,7 +1347,9 @@ newEffect{
 	on_lose = function(self, err) return "#Target# is free from the decrepitude disease." end,
 	-- Damage each turn
 	on_timeout = function(self, eff)
-		DamageType:get(DamageType.BLIGHT).projector(eff.src, self.x, self.y, DamageType.BLIGHT, eff.dam, {from_disease=true})
+		if self:attr("purify_disease") then self:heal(eff.dam)
+		else DamageType:get(DamageType.BLIGHT).projector(eff.src, self.x, self.y, DamageType.BLIGHT, eff.dam, {from_disease=true})
+		end
 	end,
 	-- Lost of CON
 	activate = function(self, eff)
@@ -1361,7 +1371,9 @@ newEffect{
 	on_lose = function(self, err) return "#Target# is free from the weakness disease." end,
 	-- Damage each turn
 	on_timeout = function(self, eff)
-		DamageType:get(DamageType.BLIGHT).projector(eff.src, self.x, self.y, DamageType.BLIGHT, eff.dam, {from_disease=true})
+		if self:attr("purify_disease") then self:heal(eff.dam)
+		else DamageType:get(DamageType.BLIGHT).projector(eff.src, self.x, self.y, DamageType.BLIGHT, eff.dam, {from_disease=true})
+		end
 	end,
 	-- Lost of CON
 	activate = function(self, eff)
@@ -1383,7 +1395,9 @@ newEffect{
 	on_lose = function(self, err) return "#Target# is free from the epidemic." end,
 	-- Damage each turn
 	on_timeout = function(self, eff)
-		DamageType:get(DamageType.BLIGHT).projector(eff.src, self.x, self.y, DamageType.BLIGHT, eff.dam, {from_disease=true})
+		if self:attr("purify_disease") then self:heal(eff.dam)
+		else DamageType:get(DamageType.BLIGHT).projector(eff.src, self.x, self.y, DamageType.BLIGHT, eff.dam, {from_disease=true})
+		end
 	end,
 	activate = function(self, eff)
 		eff.tmpid = self:addTemporaryValue("diseases_spread_on_blight", 1)
@@ -3917,3 +3931,20 @@ newEffect{
 		eff.last_y = eff.src.y
 	end,
 }
+
+newEffect{
+	name = "WATERS_OF_LIFE",
+	desc = "Waters of Life",
+	long_desc = function(self, eff) return ("The target purifies all diseases and poisons, turning them into healing effects.") end,
+	type = "physical",
+	status = "beneficial",
+	parameters = { },
+	activate = function(self, eff)
+		eff.poisid = self:addTemporaryValue("purify_poison", 1)
+		eff.diseid = self:addTemporaryValue("purify_disease", 1)
+	end,
+	deactivate = function(self, eff)
+		self:removeTemporaryValue("purify_poison", eff.poisid)
+		self:removeTemporaryValue("purify_disease", eff.diseid)
+	end,
+}

@@ -32,3 +32,49 @@ newEntity{
 	change_level = 1,
 	change_zone = "slime-tunnels",
 }
+
+newEntity{
+	define_as = "LEVER_DOOR",
+	type = "wall", subtype = "floor",
+	name = "sealed door", image = "terrain/granite_door1.png",
+	display = '+', color_r=238, color_g=154, color_b=77, back_color=colors.DARK_UMBER,
+	nice_tiler = { method="door3d", north_south="LEVER_DOOR_VERT", west_east="LEVER_DOOR_HORIZ" },
+	notice = true,
+	always_remember = true,
+	block_sight = true,
+	block_sense = true,
+	block_esp = true,
+	levers = 0,
+	force_clone = true,
+	door_player_stop = "This door seems to have been sealed off, you need to find a way to open it.",
+	door_opened = "DOOR_OPEN",
+}
+newEntity{ base = "LEVER_DOOR", define_as = "LEVER_DOOR_HORIZ", image = "terrain/granite_door1.png", add_displays = {class.new{image="terrain/granite_wall3.png", z=18, display_y=-1}}, door_opened = "DOOR_HORIZ_OPEN"}
+newEntity{ base = "LEVER_DOOR", define_as = "LEVER_DOOR_VERT", image = "terrain/marble_floor.png", add_displays = {class.new{image="terrain/granite_door1_vert.png", z=17}, class.new{image="terrain/granite_door1_vert_north.png", z=18, display_y=-1}}, door_opened = "DOOR_OPEN_VERT"}
+
+newEntity{
+	define_as = "LEVER",
+	type = "lever", subtype = "floor",
+	name = "huge lever",
+	display = '&', color=colors.UMBER, back_color=colors.DARK_UMBER,
+	notice = true,
+	always_remember = true,
+	lever = true,
+	force_clone = true,
+	block_move = function(self, x, y, e, act)
+		if act and e.player and self.lever then
+			self.lever = false
+			local spot = game.level:pickSpot{type="lever", subtype="door"}
+			if not spot then return true end
+			local g = game.level.map(spot.x, spot.y, engine.Map.TERRAIN)
+			g.levers = (g.levers or 0) + 1
+			if g.levers >= 2 then
+				game.level.map(spot.x, spot.y, engine.Map.TERRAIN, game.zone.grid_list[g.door_opened])
+				game.log("#VIOLET#You hear a door openning.")
+			else
+				game.log("#VIOLET#You hear a mechanism clicking.")
+			end
+		end
+		return true
+	end,
+}

@@ -19,11 +19,19 @@
 
 return {
 	name = "Grushnak Pride",
+	display_name = function()
+		if game.level.level % 2 == 0 then return "Grushnak Pride ("..(game.level.level/2)..")"
+		else return "Grushnak Pride (guarded barracks)"
+		end
+	end,
+	variable_zone_name = true,
 	level_range = {35, 60},
 	level_scheme = "player",
-	max_level = 5,
+	max_level = 10,
 	decay = {300, 800},
-	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
+	-- 10 levels but really only 5, the 5 others are just transitions
+	actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + math.floor(level.level / 2) + rng.range(-1,2) end,
+	level_adjust_level = function(zone, level) return zone.base_level + math.floor(level.level / 2) end,
 	width = 50, height = 50,
 	persistent = "zone",
 --	all_remembered = true,
@@ -34,6 +42,7 @@ return {
 	generator =  {
 		map = {
 			class = "engine.generator.map.Roomer",
+			pride = "grushnak",
 			nb_rooms = 10,
 			lite_room_chance = 20,
 			rooms = {"forest_clearing", {"money_vault",5}, {"pit",7}, {"greater_vault",8}},
@@ -57,18 +66,40 @@ return {
 	},
 	post_process = function(level)
 		-- Place a lore note on each level
-		game:placeRandomLoreObject("GARKUL_HISTORY"..level.level)
+		if level.level == 2 or level.level == 4 or level.level == 6 or level.level == 8 or level.level == 10 then
+			game:placeRandomLoreObject("GARKUL_HISTORY"..(level.level/2))
+		end
 
 		for uid, e in pairs(level.entities) do e.faction="orc-pride" end
 	end,
 	levels =
 	{
-		[1] = {
-			generator = { map = {
-				up = "UNDERGROUND_LADDER_UP_WILDERNESS",
-			}, },
-		},
-		[5] = {
+		[1] = { generator = {
+			map = { class = "engine.generator.map.Static", map = "zones/prides-middle" },
+			actor = { nb_npc = {0, 0} },
+			object = { nb_object = {0, 0} },
+		}},
+		[3] = { generator = {
+			map = { class = "engine.generator.map.Static", map = "zones/prides-middle" },
+			actor = { nb_npc = {0, 0} },
+			object = { nb_object = {0, 0} },
+		}},
+		[5] = { generator = {
+			map = { class = "engine.generator.map.Static", map = "zones/prides-middle" },
+			actor = { nb_npc = {0, 0} },
+			object = { nb_object = {0, 0} },
+		}},
+		[7] = { generator = {
+			map = { class = "engine.generator.map.Static", map = "zones/prides-middle" },
+			actor = { nb_npc = {0, 0} },
+			object = { nb_object = {0, 0} },
+		}},
+		[9] = { generator = {
+			map = { class = "engine.generator.map.Static", map = "zones/prides-middle" },
+			actor = { nb_npc = {0, 0} },
+			object = { nb_object = {0, 0} },
+		}},
+		[10] = {
 			generator = { map = {
 				down = "SLIME_TUNNELS",
 				force_last_stair = true,