diff --git a/game/engines/default/engine/dialogs/Chat.lua b/game/engines/default/engine/dialogs/Chat.lua
index e083afef771c1cad65021c38c1a035309e710fb5..07365f0d364367e29ffb794d00f096de0b571cb8 100644
--- a/game/engines/default/engine/dialogs/Chat.lua
+++ b/game/engines/default/engine/dialogs/Chat.lua
@@ -132,12 +132,21 @@ function _M:generateList()
local list = { chars={} }
local nb = 1
for i, a in ipairs(self.chat:get(self.cur_id).answers) do
- if not a.cond or a.cond(self.npc, self.player) then
+ if not a.fallback and (not a.cond or a.cond(self.npc, self.player)) then
list[#list+1] = { name=string.char(string.byte('a')+nb-1)..") "..self.chat:replace(a[1]), answer=i, color=a.color}
list.chars[string.char(string.byte('a')+nb-1)] = #list
nb = nb + 1
end
end
+ if #list == 0 then
+ for i, a in ipairs(self.chat:get(self.cur_id).answers) do
+ if a.fallback and (not a.cond or a.cond(self.npc, self.player)) then
+ list[#list+1] = { name=string.char(string.byte('a')+nb-1)..") "..self.chat:replace(a[1]), answer=i, color=a.color}
+ list.chars[string.char(string.byte('a')+nb-1)] = #list
+ nb = nb + 1
+ end
+ end
+ end
self.list = list
self.text = self.chat:replace(self.chat:get(self.cur_id).text)
diff --git a/game/modules/tome/class/Party.lua b/game/modules/tome/class/Party.lua
index befa124bbc42d324373104b55453d7eb77fa4fc0..8ca078b7ddc2f33ee01468b8bc988f536427a491 100644
--- a/game/modules/tome/class/Party.lua
+++ b/game/modules/tome/class/Party.lua
@@ -418,3 +418,11 @@ function _M:reward(title, action)
end
game:registerDialog(d)
end
+
+function _M:findInAllPartyInventoriesBy(prop, value)
+ local o, item, inven_id
+ for i, mem in ipairs(game.party.m_list) do
+ o, item, inven_id = mem:findInAllInventoriesBy(prop, value)
+ if o then return mem, o, item, inven_id end
+ end
+end
diff --git a/game/modules/tome/data/chats/last-hope-elder.lua b/game/modules/tome/data/chats/last-hope-elder.lua
index 94f1a17fb7d0e2f2d7784c2a0680e81075bd91b6..90a340a1fe58afa523b16d49577f66f85ce12372 100644
--- a/game/modules/tome/data/chats/last-hope-elder.lua
+++ b/game/modules/tome/data/chats/last-hope-elder.lua
@@ -30,10 +30,12 @@ newChat{ id="found_staff",
text = [[#LIGHT_GREEN#*He remains silent for a while*#WHITE# Indeed you were right to come here.
The staff you describe reminds me of an artifact of great power from ancient times. May I see it?]],
answers = {
- {"Here it is. #LIGHT_GREEN#*Tell him the encounter with the orcs*#LAST# You should keep it. I can feel its power and it would be safer if it were guarded by the armies of the kingdom.",
- jump="given_staff", cond=function(npc, player) return player:findInAllInventoriesBy("define_as", "STAFF_ABSORPTION") and player:isQuestStatus("staff-absorption", engine.Quest.COMPLETED, "survived-ukruk") end},
+ {"Here it is. #LIGHT_GREEN#*Tell him about the encounter with the orcs*#LAST# You should keep it. I can feel its power and it would be safer if it were guarded by the armies of the kingdom.",
+ jump="given_staff", cond=function(npc, player) return game.party:findInAllPartyInventoriesBy("define_as", "STAFF_ABSORPTION") and player:isQuestStatus("staff-absorption", engine.Quest.COMPLETED, "survived-ukruk") or false end},
{"I am afraid I lost it. #LIGHT_GREEN#*Tell him about the encounter with the orcs*",
jump="lost_staff", cond=function(npc, player) return player:isQuestStatus("staff-absorption", engine.Quest.COMPLETED, "ambush-finish") end},
+ {"I had it briefly but have lost it somehow. It could have been some orcs I encountered ...",
+ jump="lost_staff", fallback=true, cond=function(npc, player) return player:hasQuest("staff-absorption") end},
}
}
@@ -43,9 +45,11 @@ As for the orcs, it is deeply troubling. We have not seen any for eighty years.
Anyway, thank you again, @playername@, for your help.]],
answers = {
{"Thank you, my lord.", action=function(npc, player)
- local o, item, inven_id = player:findInAllInventoriesBy("define_as", "STAFF_ABSORPTION")
- player:removeObject(inven_id, item, true)
- o:removed()
+ local mem, o, item, inven_id = game.party:findInAllPartyInventoriesBy("define_as", "STAFF_ABSORPTION")
+ if mem and o then
+ mem:removeObject(inven_id, item, true)
+ o:removed()
+ end
player:setQuestStatus("staff-absorption", engine.Quest.DONE)
world:gainAchievement("A_DANGEROUS_SECRET", player)
diff --git a/game/modules/tome/data/general/objects/quest-artifacts.lua b/game/modules/tome/data/general/objects/quest-artifacts.lua
index 707777a0c449adbac4a782afbe65bb9f574223c7..a7d9d8f3c1565b71a08b29908c26d653a47ef8e4 100644
--- a/game/modules/tome/data/general/objects/quest-artifacts.lua
+++ b/game/modules/tome/data/general/objects/quest-artifacts.lua
@@ -32,6 +32,7 @@ newEntity{ define_as = "STAFF_ABSORPTION",
level_range = {30, 30},
display = "\\", color=colors.VIOLET, image = "object/artifact/staff_absorption.png",
encumber = 7,
+ auto_pickup = 1,
plot = true, quest = true,
desc = [[Carved with runes of power, this staff seems to have been made long ago. Yet it bears no signs of tarnishment.
Light around it seems to dim and you can feel its tremendous power simply by touching it.]],