diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-26 16:26:19 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-26 16:26:19 +0000 |
commit | cedbcef437a9834f6ccae42848f118351fd8a086 (patch) | |
tree | 843cd2b02e27cd146660f6d0f8b9b0811872ffcc /crawl-ref | |
parent | c9b566351f624d4e3743ece4c02661a407694e60 (diff) | |
download | crawl-ref-cedbcef437a9834f6ccae42848f118351fd8a086.tar.gz crawl-ref-cedbcef437a9834f6ccae42848f118351fd8a086.zip |
Trowel card now picks vaults tagged "trowel_portal".
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2600 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/dat/bazaar.des | 2 | ||||
-rw-r--r-- | crawl-ref/source/dat/lab.des | 2 | ||||
-rw-r--r-- | crawl-ref/source/dat/levdes.vim | 2 | ||||
-rw-r--r-- | crawl-ref/source/decks.cc | 12 |
4 files changed, 4 insertions, 14 deletions
diff --git a/crawl-ref/source/dat/bazaar.des b/crawl-ref/source/dat/bazaar.des index 4f0fa92174..7fdc5a86f1 100644 --- a/crawl-ref/source/dat/bazaar.des +++ b/crawl-ref/source/dat/bazaar.des @@ -62,7 +62,7 @@ default-depth: D:10-27 # Dummy entry NAME: bzr_entry_dummy -TAGS: bzr_entry transparent allow_dup +TAGS: bzr_entry transparent trowel_portal allow_dup ORIENT: float MARKER: O = lua:bazaar_portal() MAP diff --git a/crawl-ref/source/dat/lab.des b/crawl-ref/source/dat/lab.des index 0b337f9204..860a3c91fd 100644 --- a/crawl-ref/source/dat/lab.des +++ b/crawl-ref/source/dat/lab.des @@ -9,7 +9,7 @@ # Labyrinth entry vaults NAME: lab_entry_generic -TAGS: lab_entry transparent allow_dup +TAGS: lab_entry transparent trowel_portal allow_dup DEPTH: 12-26 ORIENT: float : messager = bell_clock_msg { initmsg="You hear a distant snort." } diff --git a/crawl-ref/source/dat/levdes.vim b/crawl-ref/source/dat/levdes.vim index 8666ef12e0..413a49f027 100644 --- a/crawl-ref/source/dat/levdes.vim +++ b/crawl-ref/source/dat/levdes.vim @@ -61,7 +61,7 @@ syn keyword desOrientation D: contained syn match desComment "^\s*#.*$" -syn match desEntry "\w*_entry" +syn match desEntry "\<\w*_entry\>" " 'transparent' is a Vim syntax keyword??? syn match desTransparent "transparent" syn match desRange "\d*-\d*" diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index 60bc2fa278..ef905bd040 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -1874,17 +1874,7 @@ static void trowel_card(int power, deck_rarity_type rarity) if ( power_level >= 2 ) { // generate a portal to something - int mapidx = -1; - if ( coinflip() ) - { - // generate a bazaar portal - mapidx = find_map_by_name("bzr_entry_dummy"); - } - else - { - mapidx = find_map_by_name("lab_entry_generic"); - } - + const int mapidx = random_map_for_tag("trowel_portal", false, false); if ( mapidx == -1 ) { mpr("A buggy portal flickers into view, then vanishes."); |