From 39ccc05692a4e9ff4fc5590806459c6a31968362 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Mon, 14 Jan 2013 23:42:38 +0000
Subject: [PATCH] No need to use the orb of scrying to id artifacts anymore
git-svn-id: http://svn.net-core.org/repos/t-engine4@6350 51575b47-30f0-44d4-a5cc-537603b46e54
---
.../modules/tome/data/birth/races/construct.lua | 1 -
game/modules/tome/data/birth/races/dwarf.lua | 1 -
game/modules/tome/data/birth/races/elf.lua | 1 -
game/modules/tome/data/birth/races/halfling.lua | 1 -
game/modules/tome/data/birth/races/human.lua | 1 -
.../data/general/objects/quest-artifacts.lua | 17 +++--------------
game/modules/tome/data/talents/misc/races.lua | 9 ++-------
.../tome/data/talents/undeads/undeads.lua | 9 ++-------
8 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/game/modules/tome/data/birth/races/construct.lua b/game/modules/tome/data/birth/races/construct.lua
index 9d27345034..507f84dafa 100644
--- a/game/modules/tome/data/birth/races/construct.lua
+++ b/game/modules/tome/data/birth/races/construct.lua
@@ -89,7 +89,6 @@ newBirthDescriptor
starting_quest = "start-allied",
blood_color = colors.GREY,
resolvers.inventory{ id=true, {defined="ORB_SCRYING"} },
- resolvers.generic(function(e) e.hotkey[10] = {"inventory", "Orb of Scrying"} end),
mana_regen = 0.5,
mana_rating = 7,
diff --git a/game/modules/tome/data/birth/races/dwarf.lua b/game/modules/tome/data/birth/races/dwarf.lua
index 96e50e3d41..03fbab4fc8 100644
--- a/game/modules/tome/data/birth/races/dwarf.lua
+++ b/game/modules/tome/data/birth/races/dwarf.lua
@@ -47,7 +47,6 @@ newBirthDescriptor{
resolvers.inscription("INFUSION:_REGENERATION", {cooldown=10, dur=5, heal=60}),
resolvers.inscription("INFUSION:_WILD", {cooldown=12, what={physical=true}, dur=4, power=14}),
resolvers.inventory{ id=true, {defined="ORB_SCRYING"} },
- resolvers.generic(function(e) e.hotkey[10] = {"inventory", "Orb of Scrying"} end),
},
random_escort_possibilities = { {"tier1.1", 1, 2}, {"tier1.2", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
diff --git a/game/modules/tome/data/birth/races/elf.lua b/game/modules/tome/data/birth/races/elf.lua
index 380c3be21c..5e3c922cfb 100644
--- a/game/modules/tome/data/birth/races/elf.lua
+++ b/game/modules/tome/data/birth/races/elf.lua
@@ -51,7 +51,6 @@ newBirthDescriptor{
starting_zone = "trollmire",
starting_quest = "start-allied",
resolvers.inventory{ id=true, {defined="ORB_SCRYING"} },
- resolvers.generic(function(e) e.hotkey[10] = {"inventory", "Orb of Scrying"} end),
},
cosmetic_unlock = {
diff --git a/game/modules/tome/data/birth/races/halfling.lua b/game/modules/tome/data/birth/races/halfling.lua
index 0fb99aa5e0..e8bd3c90a5 100644
--- a/game/modules/tome/data/birth/races/halfling.lua
+++ b/game/modules/tome/data/birth/races/halfling.lua
@@ -52,7 +52,6 @@ newBirthDescriptor{
resolvers.inscription("INFUSION:_REGENERATION", {cooldown=10, dur=5, heal=60}),
resolvers.inscription("INFUSION:_WILD", {cooldown=12, what={physical=true}, dur=4, power=14}),
resolvers.inventory{ id=true, {defined="ORB_SCRYING"} },
- resolvers.generic(function(e) e.hotkey[10] = {"inventory", "Orb of Scrying"} end),
},
random_escort_possibilities = { {"tier1.1", 1, 2}, {"tier1.2", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
diff --git a/game/modules/tome/data/birth/races/human.lua b/game/modules/tome/data/birth/races/human.lua
index 8a40e917ed..77a7918328 100644
--- a/game/modules/tome/data/birth/races/human.lua
+++ b/game/modules/tome/data/birth/races/human.lua
@@ -53,7 +53,6 @@ newBirthDescriptor{
resolvers.inscription("INFUSION:_REGENERATION", {cooldown=10, dur=5, heal=60}),
resolvers.inscription("INFUSION:_WILD", {cooldown=12, what={physical=true}, dur=4, power=14}),
resolvers.inventory{ id=true, {defined="ORB_SCRYING"} },
- resolvers.generic(function(e) e.hotkey[10] = {"inventory", "Orb of Scrying"} end),
},
random_escort_possibilities = { {"tier1.1", 1, 2}, {"tier1.2", 1, 2}, {"daikara", 1, 2}, {"old-forest", 1, 4}, {"dreadfell", 1, 8}, {"reknor", 1, 2}, },
diff --git a/game/modules/tome/data/general/objects/quest-artifacts.lua b/game/modules/tome/data/general/objects/quest-artifacts.lua
index 0faa28e888..707777a0c4 100644
--- a/game/modules/tome/data/general/objects/quest-artifacts.lua
+++ b/game/modules/tome/data/general/objects/quest-artifacts.lua
@@ -284,12 +284,11 @@ newEntity{ define_as = "ORB_SCRYING",
unique = true, quest=true, no_unique_lore=true,
type = "orb", subtype="orb",
unided_name = "orb of scrying",
- name = "Orb of Scrying",
+ name = "Scrying Orb",
display = "*", color=colors.VIOLET, image = "object/artifact/orb_scrying.png",
encumber = 1,
plot = true, quest = true,
- save_hotkey = true,
- desc = [[This orb was given to you by Elisa the Halfling scryer. It will automatically identify normal and rare items for you and can be activated to contact Elisa for rarer items.]],
+ desc = [[This orb will automatically items you find.]],
on_drop = function(self, who)
if who == game.player then
@@ -298,18 +297,8 @@ newEntity{ define_as = "ORB_SCRYING",
end
end,
- max_power = 1, power_regen = 1,
- use_power = { name = "use the orb", power = 1,
- use = function(self, who)
- local Chat = require("engine.Chat")
- local chat = Chat.new("elisa-orb-scrying", {name="Elisa the Scryer"}, who, {version="elisa"})
- chat:invoke()
- return {id=true, used=true}
- end
- },
-
carrier = {
- auto_id = 2,
+ auto_id = 100,
},
}
diff --git a/game/modules/tome/data/talents/misc/races.lua b/game/modules/tome/data/talents/misc/races.lua
index d26d4f243c..cfcd326831 100644
--- a/game/modules/tome/data/talents/misc/races.lua
+++ b/game/modules/tome/data/talents/misc/races.lua
@@ -860,13 +860,8 @@ newTalent{
type = {"base/race", 1},
no_npc_use = true,
no_unlearn_last = true,
- on_learn = function(self, t) self.auto_id = 2 end,
- action = function(self, t)
- local Chat = require("engine.Chat")
- local chat = Chat.new("elisa-orb-scrying", {name="The Way"}, self, {version="yeek"})
- chat:invoke()
- return true
- end,
+ mode = "passive",
+ on_learn = function(self, t) self.auto_id = 100 end,
info = function(self, t)
return ([[You merge your mind with the rest of the Way for a brief moment; the sum of all yeek knowledge gathers in your mind,
and allows you to identify any item you could not recognize yourself.]])
diff --git a/game/modules/tome/data/talents/undeads/undeads.lua b/game/modules/tome/data/talents/undeads/undeads.lua
index 33a8f6d2cb..66cc6adc6e 100644
--- a/game/modules/tome/data/talents/undeads/undeads.lua
+++ b/game/modules/tome/data/talents/undeads/undeads.lua
@@ -51,14 +51,9 @@ newTalent{
name = "Knowledge of the Past",
type = {"undead/base", 1},
no_npc_use = true,
+ mode = "passive",
no_unlearn_last = true,
- on_learn = function(self, t) self.auto_id = 2 end,
- action = function(self, t)
- local Chat = require("engine.Chat")
- local chat = Chat.new("elisa-orb-scrying", {name="Past memories"}, self, {version="undead"})
- chat:invoke()
- return true
- end,
+ on_learn = function(self, t) self.auto_id = 100 end,
info = function(self)
return ([[You concentrate for a moment to recall some of your memories as a living being and look for knowledge to identify rare objects.]])
end,
--
GitLab