From 0cf8d8cde2403d3694b5a93c2f827a230f190905 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Mon, 15 Nov 2010 14:44:48 +0000
Subject: [PATCH]
plop
git-svn-id: http://svn.net-core.org/repos/t-engine4@1906 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/data/birth/descriptors.lua | 15 ---------------
game/modules/tome/data/general/stores/basic.lua | 8 ++++----
.../tome/data/talents/misc/inscriptions.lua | 2 +-
3 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/game/modules/tome/data/birth/descriptors.lua b/game/modules/tome/data/birth/descriptors.lua
index e5f855a76b..b8f30e55cd 100644
--- a/game/modules/tome/data/birth/descriptors.lua
+++ b/game/modules/tome/data/birth/descriptors.lua
@@ -70,21 +70,6 @@ newBirthDescriptor{
resolvers.equip{ id=true,
{type="lite", subtype="lite", name="brass lantern"},
},
- resolvers.inventory{ id=true,
- {type="scroll", name="healing infusion", ego_chance=-1000},
- {type="scroll", name="wild infusion", ego_chance=-1000},
- {type="scroll", name="movement infusion", ego_chance=-1000},
- {type="scroll", name="sun infusion", ego_chance=-1000},
- {type="scroll", name="strength infusion", ego_chance=-1000},
- {type="scroll", name="will infusion", ego_chance=-1000},
- {type="scroll", name="vision", ego_chance=-1000},
- {type="scroll", name="speed rune", ego_chance=-1000},
- {type="scroll", name="controlled phase door rune", ego_chance=-1000},
- {type="scroll", name="phase door rune", ego_chance=-1000},
- {type="scroll", name="teleportation rune", ego_chance=-1000},
- {type="scroll", name="shielding rune", ego_chance=-1000},
- {type="scroll", name="invisibility rune", ego_chance=-1000},
- },
resolvers.inscription("INFUSION:_HEALING", {cooldown=10, heal=50}),
resolvers.inscription("INFUSION:_WILD", {cooldown=12, what={poison=true}, dur=4, power=20}),
},
diff --git a/game/modules/tome/data/general/stores/basic.lua b/game/modules/tome/data/general/stores/basic.lua
index bcd7e6aa9a..5473ef181d 100644
--- a/game/modules/tome/data/general/stores/basic.lua
+++ b/game/modules/tome/data/general/stores/basic.lua
@@ -74,7 +74,7 @@ newEntity{
newEntity{
define_as = "POTION",
- name = "alchemist store",
+ name = "infusion store",
display = '4', color=colors.LIGHT_BLUE,
store = {
purse = 10,
@@ -84,14 +84,14 @@ newEntity{
min_fill = 40,
max_fill = 60,
filters = {
- {type="potion", id=true},
+ {type="scroll", subtype="infusion", id=true},
},
},
}
newEntity{
define_as = "SCROLL",
- name = "scribe store",
+ name = "rune store",
display = '5', color=colors.WHITE,
store = {
purse = 10,
@@ -101,7 +101,7 @@ newEntity{
min_fill = 40,
max_fill = 60,
filters = {
- {type="scroll", id=true},
+ {type="scroll", subtype="rune", id=true},
},
},
}
diff --git a/game/modules/tome/data/talents/misc/inscriptions.lua b/game/modules/tome/data/talents/misc/inscriptions.lua
index 44b46704fe..4de8d5f2cd 100644
--- a/game/modules/tome/data/talents/misc/inscriptions.lua
+++ b/game/modules/tome/data/talents/misc/inscriptions.lua
@@ -206,7 +206,7 @@ newInscription{
end,
action = function(self, t)
local data = self:getInscriptionData(t.short_name)
- local tg = {type="ball", nolock=true, no_restrict=true, nowarning=true, range=data.range + data.inc_stat, radius=3}
+ local tg = {type="ball", nolock=true, pass_terrain=true, nowarning=true, range=data.range + data.inc_stat, radius=3, requires_knowledge=false}
x, y = self:getTarget(tg)
if not x then return nil end
-- Target code doesnot restrict the target coordinates to the range, it lets the poject function do it
--
GitLab