summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/dat/des
diff options
context:
space:
mode:
authorChris Campbell <chriscampbell89@gmail.com>2014-01-30 16:35:03 +0000
committerChris Campbell <chriscampbell89@gmail.com>2014-01-30 16:35:03 +0000
commit1ce7209620cc79e64619d7b695c9c6f1097de508 (patch)
treee8f554129b6a0a66f9cfb888c34afa5f999d24e8 /crawl-ref/source/dat/des
parentd099a18359ff5877f1734e430d97f7f3bf328d2b (diff)
downloadcrawl-ref-1ce7209620cc79e64619d7b695c9c6f1097de508.tar.gz
crawl-ref-1ce7209620cc79e64619d7b695c9c6f1097de508.zip
Remove training dummies from some vaults
These shouldn't be used outside the tutorial, since they're treated as real monsters rather than firewood (autofight targets them, they prevent autoexplore/travel, etc).
Diffstat (limited to 'crawl-ref/source/dat/des')
-rw-r--r--crawl-ref/source/dat/des/altar/overflow.des5
-rw-r--r--crawl-ref/source/dat/des/builder/shops.des11
-rw-r--r--crawl-ref/source/dat/des/variable/grated_community.des7
3 files changed, 4 insertions, 19 deletions
diff --git a/crawl-ref/source/dat/des/altar/overflow.des b/crawl-ref/source/dat/des/altar/overflow.des
index 0f017a7083..fa9cd011f7 100644
--- a/crawl-ref/source/dat/des/altar/overflow.des
+++ b/crawl-ref/source/dat/des/altar/overflow.des
@@ -1176,15 +1176,14 @@ NAME: okawaru_gym_becter
TAGS: uniq_altar_okawaru temple_overflow_1 temple_overflow_okawaru
DEPTH: 2-9
TAGS: transparent mini_float
-MONS: training dummy ; club
KFEAT: _ = altar_okawaru
MAP
.....
.........
.vv...vv.
-..v1...1v..
+..v.....v..
....._.....
-..v1...1v..
+..v.....v..
.vv...vv.
.........
.....
diff --git a/crawl-ref/source/dat/des/builder/shops.des b/crawl-ref/source/dat/des/builder/shops.des
index 1b76045fcd..cd7b1ade2d 100644
--- a/crawl-ref/source/dat/des/builder/shops.des
+++ b/crawl-ref/source/dat/des/builder/shops.des
@@ -162,17 +162,6 @@ MAP
.....
ENDMAP
-NAME: nicolae_shop_with_dummies
-TAGS: allow_dup extra shop transparent
-WEIGHT: 5
-KFEAT: O = weapon shop / antique weapon shop w:5
-MONS: training dummy
-MAP
-1.1
-.O.
-1.1
-ENDMAP
-
# A shop owner has copied a temple entry for their shop. Is nothing sacred?
# (minmay_temple_entry_statues_fountains)
NAME: nicolae_shop_temple_entry_statues_fountains
diff --git a/crawl-ref/source/dat/des/variable/grated_community.des b/crawl-ref/source/dat/des/variable/grated_community.des
index cc81f3ee31..ae808e3254 100644
--- a/crawl-ref/source/dat/des/variable/grated_community.des
+++ b/crawl-ref/source/dat/des/variable/grated_community.des
@@ -332,16 +332,14 @@ ENDMAP
#### taur, entrace w/feature, shooting range, closets
NAME: grated_community_mu_taur_home
TAGS: grated_community_mu_home grated_community_mu_home6 unrand
-FTILE: 123.c'+%$W8n~ = floor_grass_dirt_mix
+FTILE: 12.c'+%$W8n~ = floor_grass_dirt_mix
: if crawl.coinflip() then
MONS: patrolling centaur warrior, plant
-KITEM: 3 = q:5 arrow
KITEM: ' = q:1 arrow
KITEM: $ = centaur barding / nothing, q:30 arrow /\
q:30 arrow ego:flame, any good_item
: else
MONS: patrolling yaktaur captain, plant
-KITEM: 3 = q:5 bolt
KITEM: ' = q:1 bolt
KITEM: $ = centaur barding / nothing, q:30 bolt /\
q:30 bolt ego:flame, any good_item
@@ -349,7 +347,6 @@ KITEM: $ = centaur barding / nothing, q:30 bolt /\
SHUFFLE: %$
SUBST: % = %W
KITEM: % = q:2 meat ration
-KMONS: 3 = generate_awake training dummy
SUBST: 8 = 82
KFEAT: 8 = granite_statue / floor
MARKER: + = lua:restrict_door()
@@ -358,7 +355,7 @@ KFEAT: = = floor
TILE: c = wall_brick_vines
MAP
ccccccc
-c3''..c
+c'''..c
ccccc+c
c%+.1.c
ccc.8.c