From 1a449519fdd981752f0293b1ee27dad794c59a03 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sun, 27 Jun 2010 00:00:14 +0000
Subject: [PATCH] added drops to rak'shor and mount doom

git-svn-id: http://svn.net-core.org/repos/t-engine4@851 51575b47-30f0-44d4-a5cc-537603b46e54
---
 .../tome/data/zones/mount-doom/npcs.lua       |  1 +
 .../tome/data/zones/mount-doom/objects.lua    |  4 +-
 .../tome/data/zones/rak-shor-pride/npcs.lua   |  3 +-
 .../data/zones/rak-shor-pride/objects.lua     | 71 +++----------------
 4 files changed, 16 insertions(+), 63 deletions(-)

diff --git a/game/modules/tome/data/zones/mount-doom/npcs.lua b/game/modules/tome/data/zones/mount-doom/npcs.lua
index aa76dae93c..5b2bf6953a 100644
--- a/game/modules/tome/data/zones/mount-doom/npcs.lua
+++ b/game/modules/tome/data/zones/mount-doom/npcs.lua
@@ -275,6 +275,7 @@ This one looks even nastier and looks toward you with what seems to be disdain.
 	resolvers.equip{
 		{type="jewelry", subtype="amulet", defined="FIERY_CHOKER"},
 	},
+	resolvers.drops{chance=100, nb=5, {ego_chance=100} },
 
 	resolvers.talents{
 		[Talents.T_FLAME]=4,
diff --git a/game/modules/tome/data/zones/mount-doom/objects.lua b/game/modules/tome/data/zones/mount-doom/objects.lua
index b9cf2a9fd2..506ef07b00 100644
--- a/game/modules/tome/data/zones/mount-doom/objects.lua
+++ b/game/modules/tome/data/zones/mount-doom/objects.lua
@@ -35,8 +35,8 @@ newEntity{ base = "BASE_AMULET",
 			[DamageType.COLD] = -20,
 		},
 		inc_damage={
-			[DamageType.FIRE] = 6,
-			[DamageType.COLD] = -6,
+			[DamageType.FIRE] = 10,
+			[DamageType.COLD] = -5,
 		},
 		blind_immune = 1,
 	},
diff --git a/game/modules/tome/data/zones/rak-shor-pride/npcs.lua b/game/modules/tome/data/zones/rak-shor-pride/npcs.lua
index bb2237f7bc..0c1eb9d207 100644
--- a/game/modules/tome/data/zones/rak-shor-pride/npcs.lua
+++ b/game/modules/tome/data/zones/rak-shor-pride/npcs.lua
@@ -47,8 +47,9 @@ newEntity{ base="BASE_NPC_ORC_RAK_SHOR", define_as = "RAK_SHOR",
 
 	resolvers.equip{
 		{type="weapon", subtype="staff", ego_change=100, autoreq=true},
-		{type="armor", subtype="cloth", ego_change=100, autoreq=true},
+		{type="armor", subtype="cloth", defined="BLACK_ROBE", autoreq=true},
 	},
+	resolvers.drops{chance=100, nb=5, {ego_chance=100} },
 
 	summon = {
 		{type="undead", number=2, hasxp=false},
diff --git a/game/modules/tome/data/zones/rak-shor-pride/objects.lua b/game/modules/tome/data/zones/rak-shor-pride/objects.lua
index 523d3ab6a6..fa2a248859 100644
--- a/game/modules/tome/data/zones/rak-shor-pride/objects.lua
+++ b/game/modules/tome/data/zones/rak-shor-pride/objects.lua
@@ -19,69 +19,20 @@
 
 load("/data/general/objects/objects.lua")
 
-newEntity{ base = "BASE_RING",
-	define_as = "RING_LOST_LOVE", rarity=false,
-	name = "Ring of Lost Love", unique=true,
-	unided_name = "wedding ring", color=colors.LIGHT_BLUE,
-	desc = [[Letters are engraved in it: "Crichton my love".]],
+local Stats = require"engine.interface.ActorStats"
+
+newEntity{ base = "BASE_CLOTH_ARMOR",
+	define_as = "BLACK_ROBE", rarity=false,
+	name = "Black Robe", unique=true,
+	unided_name = "black robe", color=colors.DARK_GREY,
+	desc = [[A silk robe, darker than the darkest night sky, it radiates power.]],
 	cost = 500,
 	wielder = {
+		inc_stats = { [Stats.STAT_MAG] = 5, [Stats.STAT_WIL] = 4, [Stats.STAT_CUN] = 3 },
 		see_invisible = 10,
 		blind_immune = 1,
-		combat_spellpower = 5,
-		combat_dam = 5,
+		combat_spellpower = 10,
+		combat_dam = 10,
+		combat_def = 6,
 	},
-	max_power = 60, power_regen = 1,
-	use_power = { name = "summon an elder vampire to your side", power = 60, use = function(self, who)
-		-- Find space
-		local x, y = util.findFreeGrid(who.x, who.y, 5, true, {[engine.Map.ACTOR]=true})
-		if not x then
-			game.logPlayer(who, "Not enough space to invoke the vampire!")
-			return
-		end
-		print("Invoking guardian on", x, y)
-
-		local NPC = require "mod.class.NPC"
-		local vampire = NPC.new{
-			type = "undead", subtype = "vampires",
-			display = "V",
-			name = "elder vampire", color=colors.RED,
-			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.]],
-
-			combat = { dam=resolvers.rngavg(9,13), atk=10, apr=9, damtype=DamageType.DRAINLIFE, dammod={str=1.9} },
-
-			body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
-
-			autolevel = "warriormage",
-			ai = "summoned", ai_real = "dumb_talented_simple", ai_state = { talent_in=3, },
-			energy = { mod=1 },
-			stats = { str=12, dex=12, mag=12, con=12 },
-			life_regen = 3,
-			size_category = 3,
-			rank = 3,
-
-			resolvers.tmasteries{ ["technique/other"]=0.5, ["spell/phantasm"]=0.8, },
-
-			resists = { [DamageType.COLD] = 80, [DamageType.NATURE] = 80, [DamageType.LIGHT] = -50,  },
-			blind_immune = 1,
-			confusion_immune = 1,
-			see_invisible = 5,
-			undead = 1,
-
-			level_range = {who.level, who.level}, exp_worth = 0,
-			max_life = resolvers.rngavg(90,100),
-			combat_armor = 12, combat_def = 10,
-			resolvers.talents{ [who.T_STUN]=2, [who.T_BLUR_SIGHT]=3, [who.T_PHANTASMAL_SHIELD]=2, [who.T_ROTTING_DISEASE]=3, },
-
-			faction = who.faction,
-			summoner = who,
-			summon_time = 10,
-		}
-
-		vampire:resolve()
-		game.zone:addEntity(game.level, vampire, "actor", x, y)
-
-		game:playSoundNear(who, "talents/spell_generic")
-	end },
 }
-- 
GitLab