Index: game/engines/default/engine/dialogs/KeyBinder.lua =================================================================== --- game/engines/default/engine/dialogs/KeyBinder.lua (revision 3772) +++ game/engines/default/engine/dialogs/KeyBinder.lua (working copy) @@ -107,7 +107,7 @@ d:mouseZones{ norestrict=true, { x=0, y=0, w=game.w, h=game.h, fct=function(button, x, y, xrel, yrel, tx, ty) if xrel or yrel then return end - if button == "left" then return end + if button == "right" then return end local ks = KeyBind:makeMouseString( button, Index: game/modules/tome/dialogs/UseTalents.lua =================================================================== --- game/modules/tome/dialogs/UseTalents.lua (revision 3772) +++ game/modules/tome/dialogs/UseTalents.lua (working copy) @@ -46,8 +46,10 @@ {name="Talent", width=80, display_prop="name"}, {name="Status", width=20, display_prop="status"}, {name="Hotkey", width={75,"fixed"}, display_prop="hotkey"}, - {name="Left Mouse", width={60,"fixed"}, display_prop=function(item) - if item.talent and item.talent == self.actor.auto_shoot_talent then return "LeftClick" else return "" end + {name="Mouse Click", width={60,"fixed"}, display_prop=function(item) + if item.talent and item.talent == self.actor.auto_shoot_talent then return "LeftClick" + elseif item.talent and item.talent == self.actor.auto_shoot_midclick_talent then return "MiddleClick" + else return "" end end}, } self.c_list = TreeList.new{width=math.floor(self.iw / 2 - 10), height=self.ih - 10, all_clicks=true, scrollbar=true, columns=cols, tree=self.list, fct=function(item, sel, button) self:use(item, button) end, select=function(item, sel) self:select(item) end} Index: game/modules/tome/data/quests/ring-of-blood.lua =================================================================== --- game/modules/tome/data/quests/ring-of-blood.lua (revision 3772) +++ game/modules/tome/data/quests/ring-of-blood.lua (working copy) @@ -106,6 +106,7 @@ foe.is_ring_foe = true foe.faction = "neutral" foe.arena_old_on_die = foe.on_die + foe.no_drops = true foe.on_die = function(self, ...) local q = game.player:hasQuest("ring-of-blood") q.inside_kills = q.inside_kills + 1 Index: game/modules/tome/data/quests/brotherhood-of-alchemists.lua =================================================================== --- game/modules/tome/data/quests/brotherhood-of-alchemists.lua (revision 3772) +++ game/modules/tome/data/quests/brotherhood-of-alchemists.lua (working copy) @@ -108,7 +108,7 @@ --called in the on_die functions of ingredient-dropping monsters to determine if they should really drop their ingredient need_part = function(self, player, ingredient, monster) if self:isEnded() then return end - if not player or not game.party:hasMember(player) then return end + if not player or not game.party:hasMember(player) or player.suppress_alchemist_drops then return end local list = self.needed_ingredients local needed = false local ing_list = mod.class.Object:loadList("/data/general/objects/elixir-ingredients.lua") Index: game/modules/tome/data/zones/ring-of-blood/npcs.lua =================================================================== --- game/modules/tome/data/zones/ring-of-blood/npcs.lua (revision 3772) +++ game/modules/tome/data/zones/ring-of-blood/npcs.lua (working copy) @@ -106,11 +106,12 @@ stats = { str=18, dex=18, cun=18, mag=10, con=16 }, instakill_immune = 1, move_others=true, - + no_drops = true, + suppress_alchemist_drops = true, body = { INVEN = 1000, QS_MAINHAND = 1, QS_OFFHAND = 1, MAINHAND = 1, OFFHAND = 1, FINGER = 2, NECK = 1, LITE = 1, BODY = 1, HEAD = 1, CLOAK = 1, HANDS = 1, BELT = 1, FEET = 1, TOOL = 1, QUIVER = 1, MOUNT = 1 }, resolvers.equip{ {type="armor", subtype="hands", autoreq=true}, Index: game/modules/tome/data/maps/quests/lost-merchant.lua =================================================================== --- game/modules/tome/data/maps/quests/lost-merchant.lua (revision 3772) +++ game/modules/tome/data/maps/quests/lost-merchant.lua (working copy) @@ -62,6 +62,12 @@ on_die = function(self, who) game.level.map(self.x, self.y, game.level.map.TERRAIN, game.zone.grid_list.UP_WILDERNESS) game.logSeen(who, "As the assassin dies the magical veil protecting the stairs out vanishes.") + for uid, e in pairs(game.level.entities) do + if e.is_merchant and not e.dead then + e.can_talk = "lost-merchant" + break + end + end end, is_assassin_lord = true, Index: game/modules/tome/data/chats/lost-merchant.lua =================================================================== --- game/modules/tome/data/chats/lost-merchant.lua (revision 3772) +++ game/modules/tome/data/chats/lost-merchant.lua (working copy) @@ -28,7 +28,7 @@ newChat{ id="welcome2", text = [[Please get me out of here!]], answers = { - {"Come, there is a way out!", action = function(npc, player) npc.can_talk = nil end}, + {"Come, there is a way out!", action = function(npc, player) npc.can_talk = nil npc.cant_be_moved = nil end}, } } Index: game/modules/tome/data/general/objects/scrolls.lua =================================================================== --- game/modules/tome/data/general/objects/scrolls.lua (revision 3772) +++ game/modules/tome/data/general/objects/scrolls.lua (working copy) @@ -36,7 +36,7 @@ newEntity{ define_as = "BASE_INFUSION", - type = "scroll", subtype="infusion", add_name = " [#INSCRIPTION#]", + type = "scroll", subtype="infusion", add_name = " (#INSCRIPTION#)", unided_name = "infusion", id_by_type = true, display = "?", color=colors.LIGHT_GREEN, image="object/rune_green.png", encumber = 0.1, @@ -58,7 +58,7 @@ newEntity{ define_as = "BASE_RUNE", - type = "scroll", subtype="rune", add_name = " [#INSCRIPTION#]", + type = "scroll", subtype="rune", add_name = " (#INSCRIPTION#)", unided_name = "rune", id_by_type = true, display = "?", color=colors.LIGHT_BLUE, image="object/rune_red.png", encumber = 0.1, @@ -81,7 +81,7 @@ newEntity{ define_as = "BASE_TAINT", - type = "scroll", subtype="taint", add_name = " [#INSCRIPTION#]", + type = "scroll", subtype="taint", add_name = " (#INSCRIPTION#)", unided_name = "taint", id_by_type = true, display = "?", color=colors.LIGHT_BLUE, image="object/rune_yellow.png", encumber = 0.1,