summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-06 22:37:39 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-06 22:37:39 +0000
commit82d8dad204b5e36201a706fb5123053d85e46270 (patch)
treeb1fc4cf16f6433f40454726b3ec22354429b8c34
parent07ff311372d81ac5db0e4213cf910f3efdf4d42c (diff)
downloadcrawl-ref-82d8dad204b5e36201a706fb5123053d85e46270.tar.gz
crawl-ref-82d8dad204b5e36201a706fb5123053d85e46270.zip
Bug 1948750: The lua function item.name() now returns by default names
like "golden rune of Zot" rather than "golden rune", so change lua markers which were dependant on the names of items. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5508 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/dat/clua/lm_flags.lua4
-rw-r--r--crawl-ref/source/dat/crypt.des2
-rw-r--r--crawl-ref/source/dat/hells.des10
3 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/dat/clua/lm_flags.lua b/crawl-ref/source/dat/clua/lm_flags.lua
index 86814a26a8..b042511f19 100644
--- a/crawl-ref/source/dat/clua/lm_flags.lua
+++ b/crawl-ref/source/dat/clua/lm_flags.lua
@@ -51,8 +51,8 @@
-- * item_pickup_change_flags(): Creates a marker which acts when
-- an item on its grid gets picked up. Accepts the parameter
-- "item", which is the plain name of the item its watching
--- (i.e., "Orb of Zot" and "golden rune" rather than "the Orb of Zot"
--- or "a golden rune").
+-- (i.e., "Orb of Zot" and "golden rune of Zot" rather than
+-- "the Orb of Zot" or "a golden rune of Zot").
--------------------------------------------------------------------------
ChangeFlags = { }
diff --git a/crawl-ref/source/dat/crypt.des b/crawl-ref/source/dat/crypt.des
index 978a1518ab..c164ab2d1c 100644
--- a/crawl-ref/source/dat/crypt.des
+++ b/crawl-ref/source/dat/crypt.des
@@ -717,7 +717,7 @@ SUBST: $ = *:2 |:1 $:17
MONS: mummy, guardian mummy, mummy priest, greater mummy
#
MARKER: O = lua:item_pickup_change_flags { \
- branch_flags="!no_tele_control", item="golden rune" \
+ branch_flags="!no_tele_control", item="golden rune of Zot" \
}
MAP
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
diff --git a/crawl-ref/source/dat/hells.des b/crawl-ref/source/dat/hells.des
index ffd8773c53..e0c9be0e95 100644
--- a/crawl-ref/source/dat/hells.des
+++ b/crawl-ref/source/dat/hells.des
@@ -320,7 +320,7 @@ TAGS: dis
ORIENT: north
LFLAGS: no_tele_control
MARKER: O = lua:item_pickup_change_flags { \
- level_flags="!no_tele_control", item="iron rune" \
+ level_flags="!no_tele_control", item="iron rune of Zot" \
}
MONS: Dispater, Fiend, Ice Fiend, iron devil, metal gargoyle
MONS: iron dragon
@@ -375,7 +375,7 @@ PLACE: Geh:7
ORIENT: encompass
LFLAGS: no_tele_control
MARKER: O = lua:item_pickup_change_flags { \
- level_flags="!no_tele_control", item="obsidian rune" \
+ level_flags="!no_tele_control", item="obsidian rune of Zot" \
}
MONS: Asmodeus, Fiend, Balrug, molten gargoyle
MONS: Serpent of Hell, random, random
@@ -464,7 +464,7 @@ PLACE: Coc:7
ORIENT: encompass
LFLAGS: no_tele_control
MARKER: O = lua:item_pickup_change_flags { \
- level_flags="!no_tele_control", item="icy rune" \
+ level_flags="!no_tele_control", item="icy rune of Zot" \
}
MONS: Antaeus, Ice Fiend, ice dragon / nothing
ITEM: any, any misc, any misc, any misc
@@ -557,7 +557,7 @@ SUBST: X=., 3=3.
MONS: Antaeus, Ice Fiend, ice dragon, Ice Fiend
LFLAGS: no_tele_control
MARKER: O = lua:item_pickup_change_flags { \
- level_flags="!no_tele_control", item="icy rune" \
+ level_flags="!no_tele_control", item="icy rune of Zot" \
}
MAP
xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -642,7 +642,7 @@ PLACE: Tar:7
ORIENT: encompass
LFLAGS: no_tele_control
MARKER: O = lua:item_pickup_change_flags { \
- level_flags="!no_tele_control", item="bone rune" \
+ level_flags="!no_tele_control", item="bone rune of Zot" \
}
MONS: Ereshkigal, necrophage, wraith, shadow, small zombie
MONS: small skeleton, Shadow Fiend