some more

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

game/modules/tome/data/quests/maglor.lua

@@ -35,6 +35,12 @@ desc = function(self, who)
 	return table.concat(desc, "\n")
 end
 
+on_status_change = function(self, who, status, sub)
+	if sub and (sub == "kill-maglor" or sub == "kill-drake") then
+		who:setQuestStatus(self.id, engine.Quest.DONE)
+	end
+end
+
 on_grant = function(self, who)
 	local g = mod.class.Grid.new{
 		show_tooltip=true,
@@ -50,6 +56,10 @@ on_grant = function(self, who)
 end
 
 portal_back = function(self, who)
+	if self:isCompleted("portal-back") then return end
+	-- Do it on the quets object directly to not trigger a message to the player
+	self:setStatus(engine.Quest.COMPLETED, "portal-back", who)
+
 	local g = mod.class.Grid.new{
 		show_tooltip=true,
 		name="Portal to the Flooded Cave",

game/modules/tome/data/zones/caverns-osse/npcs.lua

@@ -42,12 +42,14 @@ He wears a mace and a shield.]],
 	move_others=true,
 
 	instakill_immune = 1,
-	instakill_teleport = 1,
-	instakill_confusion = 1,
+	teleport_immune = 1,
+	confusion_immune= 1,
 	combat_spellresist = 25,
 	combat_mentalresist = 25,
 	combat_physresist = 30,
 
+	resists = { [DamageType.COLD] = 60, [DamageType.ACID] = 20, },
+
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, LITE=1 },
 	equipment = resolvers.equip{
 		{type="weapon", subtype="mace", ego_chance=100, autoreq=true},
@@ -85,6 +87,7 @@ He wears a mace and a shield.]],
 
 	on_die = function(self, who)
 		game.player:resolveSource():setQuestStatus("maglor", engine.Quest.COMPLETED, "kill-maglor")
+		game.player:resolveSource():hasQuest("maglor"):portal_back()
 	end,
 
 	can_talk = "maglor",

game/modules/tome/data/zones/flooded-cave/npcs.lua

@@ -29,10 +29,11 @@ newEntity{ define_as = "UKLLMSWWIK",
 	faction="water-lair",
 	display = "D", color=colors.VIOLET,
 	desc = [[It looks like a cross between a shark and a dragon, only nastier.]],
+	energy = {mod = 1.4},
 	level_range = {30, 50}, exp_worth = 4,
-	max_life = 250, life_rating = 17, fixed_rating = true,
+	max_life = 250, life_rating = 27, fixed_rating = true,
 	max_stamina = 85,
-	stats = { str=25, dex=10, cun=8, mag=10, con=20 },
+	stats = { str=25, dex=10, cun=48, wil=50, mag=50, con=20 },
 	rank = 4,
 	size_category = 4,
 	can_breath={water=1},
@@ -40,16 +41,36 @@ newEntity{ define_as = "UKLLMSWWIK",
 	move_others=true,
 
 	instakill_immune = 1,
+	teleport_immune = 1,
+	confusion_immune= 1,
+	combat_spellresist = 25,
+	combat_mentalresist = 25,
+	combat_physresist = 30,
+
+	resists = { [DamageType.COLD] = 60, [DamageType.LIGHTNING] = 20, },
 
 	body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
-	drops = resolvers.drops{chance=100, nb=3, {ego_chance=100} },
+	resolvers.drops{chance=100, nb=1, {type="weapon", subtype="greatmaul", defined="TRIDENT_TIDES", autoreq=true} },
+	resolvers.drops{chance=100, nb=5, {ego_chance=100} },
+	resolvers.drops{chance=100, nb=10, {type="money"} },
 
 	resolvers.talents{
-		[Talents.T_STUN]=2, [Talents.T_KNOCKBACK]=1,
+		[Talents.T_WEAPON_COMBAT]=5,
+		[Talents.T_KNOCKBACK]=3,
+
+		[Talents.T_ICE_STORM]=4,
+		[Talents.T_FREEZE]=3,
+
+		[Talents.T_ICE_CLAW]=5,
+		[Talents.T_ICY_SKIN]=5,
+		[Talents.T_ICE_BREATH]=5,
+		[Talents.T_LIGHTNING_BREATH]=5,
+		[Talents.T_POISON_BREATH]=5,
 	},
+	resolvers.sustains_at_birth(),
 
 	autolevel = "warrior",
-	ai = "dumb_talented_simple", ai_state = { talent_in=4, ai_move="move_astar", },
+	ai = "dumb_talented_simple", ai_state = { talent_in=2, ai_move="move_astar", },
 
 	on_die = function(self, who)
 		game.player:resolveSource():setQuestStatus("maglor", engine.Quest.COMPLETED, "kill-drake")

game/modules/tome/data/zones/flooded-cave/objects.lua

@@ -17,24 +17,42 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
+local Talents = require "engine.interface.ActorTalents"
+local Stats = require "engine.interface.ActorStats"
+local DamageType = require "engine.DamageType"
+
 load("/data/general/objects/objects.lua")
 
 -- Artifact, droped (and used!) by Bill the Stone Troll
 
-newEntity{ base = "BASE_GREATMAUL",
-	define_as = "GREATMAUL_BILL_TRUNK",
-	name = "Bill's Tree Trunk", unique=true,
-	desc = [[This ia big nasty looking tree trunk that Bill was using as a weapon. It could still serve this purpose, should you be strong enough to wield it!]],
-	require = { stat = { str=25 }, },
-	cost = 5,
+newEntity{ base = "BASE_BATTLEAXE",
+	define_as = "TRIDENT_TIDES",
+	name = "Trident of the Tides", unique=true,
+	desc = [[As you wield this trident you can feel the power of the tides rushing through your arms.
+The trident counts as an axe for purpose of weapon combat talents.]],
+	require = { stat = { str=35 }, },
+	cost = 300,
+	material_level = 4,
 	combat = {
-		dam = 30,
-		apr = 7,
-		physcrit = 1.5,
+		dam = 50,
+		atk = 10,
+		apr = 4,
+		physcrit = 15,
 		dammod = {str=1.3},
-		damrange = 1.7,
+		damrange = 1.4,
 	},
 
 	wielder = {
+		combat_spellresist = 18,
+		see_invisible = 2,
+		resists={[DamageType.COLD] = 25},
+		inc_damage = { [DamageType.COLD] = 20 },
+		melee_project={
+			[DamageType.COLD] = 15,
+			[DamageType.NATURE] = 20,
+		},
 	},
+
+	max_power = 150, power_regen = 1,
+	use_talent = { id = Talents.T_WATER_BOLT, level=3, power = 60 },
 }