From 5e94933aa85521b85338a4748bf194d444e6b6ee Mon Sep 17 00:00:00 2001
From: Shibari <ShibariTOME@Gmail.com>
Date: Fri, 23 Jun 2017 05:48:42 -0400
Subject: [PATCH] Replace Taint of Telepathy with Taint of Purging as the alch
reward
Add Rune of Dissipation as a reward for killing Urkis via Angolwen
---
.../tome/data/chats/alchemist-last-hope.lua | 6 +++---
.../tome/data/chats/angolwen-leader.lua | 20 ++++++++++++++++++-
.../general/objects/brotherhood-artifacts.lua | 16 ++++++---------
.../tome/data/quests/lightning-overload.lua | 3 +++
.../tome/data/zones/tempest-peak/npcs.lua | 2 +-
.../tome/data/zones/town-angolwen/objects.lua | 12 +++++++++++
6 files changed, 44 insertions(+), 15 deletions(-)
diff --git a/game/modules/tome/data/chats/alchemist-last-hope.lua b/game/modules/tome/data/chats/alchemist-last-hope.lua
index 54f83d2574..9e50d213a2 100644
--- a/game/modules/tome/data/chats/alchemist-last-hope.lua
+++ b/game/modules/tome/data/chats/alchemist-last-hope.lua
@@ -21,7 +21,7 @@ local art_list = mod.class.Object:loadList("/data/general/objects/brotherhood-ar
local alchemist_num = 4
local other_alchemist_nums = {1, 2, 3}
local q = game.player:hasQuest("brotherhood-of-alchemists")
-local final_reward = "TAINT_TELEPATHY"
+local final_reward = "TAINT_PURGING"
local e = {
{
short_name = "brawn",
@@ -150,7 +150,7 @@ newChat{ id="help",
}
newChat{ id="competition",
- text = [[Oh, easy. You get a swig of each brew, of course. They'll put hair on your chest, and possibly your eyelids and fingernails. And, if your aid proves the deciding factor, then I've got a real treat for you: perhaps the last Taint of Telepathy left in Maj'Eyal.]],
+ text = [[Oh, easy. You get a swig of each brew, of course. They'll put hair on your chest, and possibly your eyelids and fingernails. And, if your aid proves the deciding factor, then I've got a real treat for you: perhaps the last Taint of Purging left in Maj'Eyal.]],
answers = {
{"I accept.", jump="choice", action = function(npc, player) player:grantQuest("brotherhood-of-alchemists") end,},
{"I cannot aid you at this time."},
@@ -403,7 +403,7 @@ Tastes like Urh'Rok's own piss, but it gets the job done.]],
--Final elixir:
newChat{ id="totally-complete3",
text = [[#LIGHT_GREEN#*The dwarf finally returns with a vial and a small pouch.*#WHITE#
-I put a bit of the good stuff in this one, though it won't do you any favors tomorrow morning. And careful with that Taint of Telepathy, especially if the wife answers the door the next time you knock. Har!]],
+I put a bit of the good stuff in this one, though it won't do you any favors tomorrow morning. And careful with that Taint of Purging, especially if the wife answers the door the next time you knock. Har!]],
answers = {
{"Thank you. I'll be off.",
cond = function(npc, player) return q and q:isCompleted(e[1].almost) and not q:isCompleted(e[1].full) end,
diff --git a/game/modules/tome/data/chats/angolwen-leader.lua b/game/modules/tome/data/chats/angolwen-leader.lua
index d990e7de97..f63b29e047 100644
--- a/game/modules/tome/data/chats/angolwen-leader.lua
+++ b/game/modules/tome/data/chats/angolwen-leader.lua
@@ -22,7 +22,10 @@ newChat{ id="welcome",
I am Linaniil of the Kar'Krul. Welcome to our city, @playerdescriptor.subclass@. What may I do for thee?]],
answers = {
{"I require all the help I can get, not for my sake but for the town of Derth, to the northeast of here.", jump="save-derth", cond=function(npc, player) local q = player:hasQuest("lightning-overload") return q and q:isCompleted("saved-derth") and not q:isCompleted("tempest-located") and not q:isStatus(q.DONE) end},
- {"I am ready! Send me to Urkis!", jump="teleport-urkis", cond=function(npc, player) local q = player:hasQuest("lightning-overload") return q and not q:isEnded("tempest-located") and q:isCompleted("tempest-located") end},
+ {"I am ready! Send me to Urkis!", jump="teleport-urkis", cond=function(npc, player) local q = player:hasQuest("lightning-overload") return q and not q:isEnded("tempest-located") and q:isCompleted("tempest-located") and not q:isCompleted("tempest-urkis-slain") end},
+ {"Urkis has been slain.", jump="reward-urkis", cond=function(npc, player)
+ local q = player:hasQuest("lightning-overload")
+ return q and q:isCompleted("tempest-urkis-slain") and not q:isStatus(q.DONE) end},
{"Nothing for now. Sorry to have taken your time. Farewell, my lady."},
}
}
@@ -53,4 +56,19 @@ newChat{ id="teleport-urkis",
}
}
+newChat{ id="reward-urkis",
+ text = [[I see the storm is calmed. Take this rune as a token of my appreciation.]],
+ answers = {
+ {"Thank you.", action=function(npc, player)
+ local q = player:hasQuest("lightning-overload")
+ local o = game.zone:makeEntityByName(game.level, "object", "RUNE_DISSIPATION")
+ if q then player:setQuestStatus("lightning-overload", engine.Quest.COMPLETED) end
+ if not o then return end
+ o:identify(true)
+ game.zone:addEntity(game.level, o, "object")
+ player:addObject(player:getInven("INVEN"), o)
+ end},
+ }
+}
+
return "welcome"
diff --git a/game/modules/tome/data/general/objects/brotherhood-artifacts.lua b/game/modules/tome/data/general/objects/brotherhood-artifacts.lua
index a4b08d1d5d..f94c484d09 100644
--- a/game/modules/tome/data/general/objects/brotherhood-artifacts.lua
+++ b/game/modules/tome/data/general/objects/brotherhood-artifacts.lua
@@ -268,20 +268,16 @@ newEntity{
-- The four possible final rewards for the Brotherhood of Alchemists quest:
newEntity{ base = "BASE_TAINT",
- name = "Taint of Telepathy",
- define_as = "TAINT_TELEPATHY", image = "object/taint_of_telepathy.png",
- unique = true,
- identified = true,
- cost = 200,
+ name = "Taint of Purging", unique = true, define_as = "TAINT_PURGING",
+ level_range = {5, 50},
+ cost = 20,
material_level = 3,
- quest = 1,
-
- inscription_kind = "utility",
+ inscription_kind = "protect",
inscription_data = {
- cooldown = 15,
+ cooldown = 20,
dur = 5,
},
- inscription_talent = "TAINT:_TELEPATHY",
+ inscription_talent = "TAINT:_PURGING",
}
newEntity{ base = "BASE_INFUSION",
diff --git a/game/modules/tome/data/quests/lightning-overload.lua b/game/modules/tome/data/quests/lightning-overload.lua
index fcd85edd9c..6b51e8d19a 100644
--- a/game/modules/tome/data/quests/lightning-overload.lua
+++ b/game/modules/tome/data/quests/lightning-overload.lua
@@ -31,6 +31,9 @@ desc = function(self, who)
if self:isCompleted("tempest-entrance") then
desc[#desc+1] = " * You have learned the real threat comes from a rogue Archmage, a Tempest. You have been shown a secret entrance to his stronghold."
end
+ if self:isCompleted("tempest-urkis-slain") then
+ desc[#desc+1] = " * You have slain Urkis. Return to Angolwen for a reward."
+ end
if self:isCompleted() then
desc[#desc+1] = " * Urkis has been dealt with. Permanently."
end
diff --git a/game/modules/tome/data/zones/tempest-peak/npcs.lua b/game/modules/tome/data/zones/tempest-peak/npcs.lua
index aae599afdd..f00632ba89 100644
--- a/game/modules/tome/data/zones/tempest-peak/npcs.lua
+++ b/game/modules/tome/data/zones/tempest-peak/npcs.lua
@@ -75,7 +75,7 @@ newEntity{ define_as = "URKIS",
resolvers.sustains_at_birth(),
on_die = function(self, who)
- game.player:resolveSource():setQuestStatus("lightning-overload", engine.Quest.COMPLETED)
+ game.player:resolveSource():setQuestStatus("lightning-overload", engine.Quest.COMPLETED, "tempest-urkis-slain")
game:unlockBackground("urkis", "Urkis, the High Tempest")
end,
}
diff --git a/game/modules/tome/data/zones/town-angolwen/objects.lua b/game/modules/tome/data/zones/town-angolwen/objects.lua
index cfa7bfd15f..7834382988 100644
--- a/game/modules/tome/data/zones/town-angolwen/objects.lua
+++ b/game/modules/tome/data/zones/town-angolwen/objects.lua
@@ -37,3 +37,15 @@ newEntity{ base = "BASE_LORE",
cost = 2,
}
+-- Reward for killing Urkis
+newEntity{ base = "BASE_RUNE",
+ name = "Rune of Dissipation", unique=true, define_as="RUNE_DISSIPATION",
+ level_range = {5, 50},
+ cost = 20,
+ inscription_kind = "protect",
+ inscription_data = {
+ cooldown = 20,
+ },
+ inscription_talent = "RUNE:_DISSIPATION",
+}
+
--
GitLab