Added allow_dup to all bazaar and lab maps.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2225 c06c8d41-db1a-0410-9941-cceddc491573

4 files changed, 49 insertions, 52 deletions

diff --git a/crawl-ref/source/dat/bazaar.des b/crawl-ref/source/dat/bazaar.des
index b21e519a60..c833208cdf 100644
--- a/crawl-ref/source/dat/bazaar.des
+++ b/crawl-ref/source/dat/bazaar.des
@@ -36,7 +36,7 @@ default-depth: D:10-27
 # Dummy entry
 
 NAME: bzr_entry_dummy
-TAGS: bzr_entry transparent
+TAGS: bzr_entry transparent allow_dup
 ORIENT: float
 MARKER: O = lua:bazaar_portal()
 MAP
@@ -46,7 +46,7 @@ ENDMAP
 ###############################################################################
 # A simple water entry.
 NAME: bzr_entry_001
-TAGS: bzr_entry no_pool_fixup
+TAGS: bzr_entry no_pool_fixup allow_dup
 ORIENT: float
 SHUFFLE: wwl
 MARKER: O = lua:bazaar_portal()
@@ -61,7 +61,7 @@ ENDMAP
 ###############################################################################
 # Some coins to shop with.
 NAME: bzr_entry_002
-TAGS: bzr_entry 
+TAGS: bzr_entry allow_dup
 ORIENT: float
 SUBST: $=$.
 MARKER: O = lua:bazaar_portal()
@@ -76,7 +76,7 @@ ENDMAP
 ###############################################################################
 # Many customers
 NAME:    bzr_entry_003
-TAGS:    bzr_entry 
+TAGS:    bzr_entry allow_dup
 ORIENT:  float
 MONS:    human, orc, goblin, kobold
 SUBST:   . = .:150 1
@@ -93,7 +93,7 @@ ENDMAP
 ###############################################################################
 # Safe
 NAME:    bzr_entry_004
-TAGS:    bzr_entry 
+TAGS:    bzr_entry allow_dup
 ORIENT:  float
 MARKER: O = lua:bazaar_portal()
 MAP
@@ -107,7 +107,7 @@ ENDMAP
 ###############################################################################
 # Safe 2
 NAME:    bzr_entry_005
-TAGS:    bzr_entry 
+TAGS:    bzr_entry allow_dup
 ORIENT:  float
 SHUFFLE: wlW
 MARKER: O = lua:bazaar_portal()
@@ -122,7 +122,7 @@ ENDMAP
 ###############################################################################
 # Portal along the road
 NAME:    bzr_entry_006
-TAGS:    bzr_entry 
+TAGS:    bzr_entry allow_dup
 ORIENT:  float
 SHUFFLE: XU, TUV
 SUBST:   X=.
@@ -138,7 +138,7 @@ ENDMAP
 #########################################
 # Portal by the lakeside (jpeg)
 NAME:    bzr_entry_007
-TAGS:    bzr_entry 
+TAGS:    bzr_entry allow_dup
 ORIENT:  float
 FLAGS:   no_rotate
 MONS:    plant
@@ -171,7 +171,7 @@ ENDMAP
 # will arrive on a random square.
 
 NAME:   bazaar_general_marketplace
-TAGS:   bazaar
+TAGS:   bazaar allow_dup
 FLAGS:  no_rotate
 ORIENT: encompass
 KFEAT:  A = any shop
@@ -195,7 +195,7 @@ xxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_outfitter
-TAGS:    bazaar
+TAGS:    bazaar allow_dup
 ORIENT:  encompass
 KFEAT:   A = any shop
 SHUFFLE: ABC, de
@@ -220,7 +220,7 @@ ENDMAP
 ########################################
 # Another simple one (jpeg)
 NAME:    bazaar_oval
-TAGS:    bazaar
+TAGS:    bazaar allow_dup
 ORIENT:  encompass
 FLAGS:   no_rotate
 SUBST:   A = TVBG
@@ -238,7 +238,7 @@ ENDMAP
 
 
 NAME:    bazaar_mystics
-TAGS:    bazaar 
+TAGS:    bazaar allow_dup
 ORIENT:  encompass
 SUBST:   w : wlx
 SHUFFLE: AB, def
@@ -270,7 +270,7 @@ xxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_wands
-TAGS:    bazaar 
+TAGS:    bazaar allow_dup
 FLAGS:   no_rotate
 ORIENT:  encompass
 KFEAT:   A = wand shop
@@ -313,7 +313,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_row
-TAGS:    bazaar 
+TAGS:    bazaar allow_dup
 FLAGS:   no_rotate
 ORIENT:  encompass
 SHUFFLE: Aa/Bb/Cc/Dd/Ee/Ff
@@ -356,7 +356,7 @@ ENDMAP
 
 NAME:    bazaar_circle_1
 CHANCE:  2
-TAGS:    bazaar 
+TAGS:    bazaar allow_dup
 FLAGS:   no_rotate
 ORIENT:  encompass
 SHUFFLE: ABCD, EFGH
@@ -397,7 +397,7 @@ ENDMAP
 
 NAME:    bazaar_circle_2
 CHANCE:  2
-TAGS:    bazaar 
+TAGS:    bazaar allow_dup
 FLAGS:   no_rotate
 ORIENT:  encompass
 SHUFFLE: EFGH
@@ -438,7 +438,7 @@ ENDMAP
 
 NAME:    bazaar_circle_3
 CHANCE:  2
-TAGS:    bazaar 
+TAGS:    bazaar allow_dup
 FLAGS:   no_rotate
 ORIENT:  encompass
 SHUFFLE: EFGH
@@ -479,7 +479,7 @@ ENDMAP
 
 NAME:    bazaar_circle_4
 CHANCE:  1
-TAGS:    bazaar 
+TAGS:    bazaar allow_dup
 FLAGS:   no_rotate
 ORIENT:  encompass
 SHUFFLE: ABCDEF
@@ -519,7 +519,7 @@ ENDMAP
 
 NAME:    bazaar_circle_5
 CHANCE:  2
-TAGS:    bazaar 
+TAGS:    bazaar allow_dup
 FLAGS:   no_rotate
 ORIENT:  encompass
 KFEAT:   C = any shop
@@ -558,7 +558,7 @@ ENDMAP
 
 NAME:    bazaar_circle_6
 CHANCE:  3
-TAGS:    bazaar 
+TAGS:    bazaar allow_dup
 FLAGS:   no_rotate
 ORIENT:  encompass
 KFEAT:   A = any shop / antique armour shop
@@ -598,7 +598,7 @@ ENDMAP
 # bazaar in honeycomb form (jpeg)
 #
 NAME:    bazaar_honeycomb
-TAGS:    bazaar
+TAGS:    bazaar allow_dup
 ORIENT:  encompass
 FLAGS:   no_rotate
 MONS:    plant
@@ -638,7 +638,7 @@ ENDMAP
 ##########################################
 # bazaar lakeside with goldfish (jpeg)
 NAME:    bazaar_lake
-TAGS:    bazaar
+TAGS:    bazaar allow_dup
 ORIENT:  encompass
 FLAGS:   no_rotate
 MONS:    giant goldfish
@@ -703,7 +703,7 @@ ENDMAP
 # Bazaars in cross form (jpeg)
 #
 NAME:    bazaar_cross1
-TAGS:    bazaar 
+TAGS:    bazaar allow_dup
 CHANCE:  5
 FLAGS:   no_rotate
 ORIENT:  encompass
@@ -735,7 +735,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_cross2
-TAGS:    bazaar 
+TAGS:    bazaar allow_dup
 CHANCE:  5
 FLAGS:   no_rotate
 ORIENT:  encompass
@@ -771,7 +771,7 @@ ENDMAP
 # strange pattern (jpeg) 
 #
 NAME:    bazaar_ribbon
-TAGS:    bazaar 
+TAGS:    bazaar allow_dup
 FLAGS:   no_rotate
 ORIENT:  encompass
 SHUFFLE: zZ
@@ -817,7 +817,7 @@ ENDMAP
 # Five bazaars in nine rooms (jpeg)
 #
 NAME:    bazaar_ninerooms1
-TAGS:    bazaar 
+TAGS:    bazaar allow_dup
 CHANCE:  2
 FLAGS:   no_rotate
 ORIENT:  encompass
@@ -855,7 +855,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_ninerooms2
-TAGS:    bazaar 
+TAGS:    bazaar allow_dup
 CHANCE:  2
 FLAGS:   no_rotate
 ORIENT:  encompass
@@ -893,7 +893,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_ninerooms3
-TAGS:    bazaar 
+TAGS:    bazaar allow_dup
 CHANCE:  2
 FLAGS:   no_rotate
 ORIENT:  encompass
@@ -932,7 +932,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_ninerooms4
-TAGS:    bazaar 
+TAGS:    bazaar allow_dup
 CHANCE:  2
 FLAGS:   no_rotate
 ORIENT:  encompass
@@ -971,7 +971,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_ninerooms5
-TAGS:    bazaar 
+TAGS:    bazaar allow_dup
 CHANCE:  2
 FLAGS:   no_rotate
 ORIENT:  encompass
@@ -1012,7 +1012,7 @@ ENDMAP
 # some more bazaars based on triangles (jpeg)
 
 NAME:    bazaar_triangles
-TAGS:    bazaar
+TAGS:    bazaar allow_dup
 ORIENT:  encompass
 FLAGS:   no_rotate
 SHUFFLE: ACD
@@ -1034,7 +1034,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_hexagon
-TAGS:    bazaar
+TAGS:    bazaar allow_dup
 ORIENT:  encompass
 FLAGS:   no_rotate
 SHUFFLE: AC, BD
@@ -1064,7 +1064,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_triangle_bulge
-TAGS:    bazaar
+TAGS:    bazaar allow_dup
 ORIENT:  encompass
 FLAGS:   no_rotate
 SHUFFLE: ABC
@@ -1087,5 +1087,3 @@ xxxxxxxxxxx...A...xxxxxxxxxxx
 xxxxxxxxxxxx.....xxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
-
-
diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index 1b866f3b9f..6a15baf56b 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -445,4 +445,3 @@ xxxxxxxxxxxxxxxw1Xxxxxbbxxxx
 xxxxxxxxxxxxxXww1Xxxxxxbxxxx
 xxxxxxxxxxxXwwww111@...Xxxxx
 ENDMAP
-
diff --git a/crawl-ref/source/dat/lab.des b/crawl-ref/source/dat/lab.des
index cfceb81c2b..0b337f9204 100644
--- a/crawl-ref/source/dat/lab.des
+++ b/crawl-ref/source/dat/lab.des
@@ -50,7 +50,7 @@ ENDMAP
 #############################################################################
 # Watery exit 
 NAME: labyrinth_watery
-TAGS: minotaur generate_loot no_pool_fixup
+TAGS: minotaur generate_loot no_pool_fixup allow_dup
 MONS: minotaur
 SHUFFLE: def
 SUBST: d=~, e=~, f=.
@@ -69,7 +69,7 @@ ENDMAP
 #############################################################################
 # Green exit
 NAME: labyrinth_green
-TAGS: minotaur generate_loot
+TAGS: minotaur generate_loot allow_dup
 MONS: minotaur
 MAP
 ........
@@ -82,7 +82,7 @@ ENDMAP
 #############################################################################
 # Spiral exit
 NAME: labyrinth_spiral
-TAGS: minotaur generate_loot
+TAGS: minotaur generate_loot allow_dup
 MONS: minotaur
 SUBST: c : cvz, z = vc
 MAP
@@ -102,7 +102,7 @@ ENDMAP
 #############################################################################
 # Hidden exit, and trapped loot
 NAME: labyrinth_hidden_loot
-TAGS: minotaur generate_loot
+TAGS: minotaur generate_loot allow_dup
 MONS: minotaur
 SHUFFLE: def
 SUBST: d = 1, e = 1
@@ -127,7 +127,7 @@ ENDMAP
 #############################################################################
 # Mini labyrinth exit
 NAME: labyrinth_mini_lab
-TAGS: minotaur generate_loot
+TAGS: minotaur generate_loot allow_dup
 MONS: minotaur
 SHUFFLE: def, gh, ij, klm
 SUBST: d = c, e = ., f = c.
@@ -180,7 +180,7 @@ ENDMAP
 #############################################################################
 # Trapped exits - this is evil!
 NAME: labyrinth_trapped
-TAGS: minotaur generate_loot
+TAGS: minotaur generate_loot allow_dup
 SHUFFLE: dD/eE/fF, ghi
 MONS: minotaur
 SUBST: g = c, h = c, i = .
@@ -206,7 +206,7 @@ ENDMAP
 #############################################################################
 # Another trapped exit - most evil again! 
 NAME: labyrinth_trapped_2
-TAGS: lab
+TAGS: lab allow_dup
 MONS: minotaur
 ITEM: potion of porridge
 SHUFFLE: xX / yY / zZ
@@ -260,7 +260,7 @@ ENDMAP
 ############################################################################
 # Labyrinth furniture
 NAME: lab_block
-TAGS: lab
+TAGS: lab allow_dup
 MAP
 .....
 .xxx.
@@ -272,7 +272,7 @@ ENDMAP
 ############################################################################
 # Labyrinth furniture II
 NAME: lab_fountain
-TAGS: lab
+TAGS: lab allow_dup
 MAP
 .......
 ..b.b..
@@ -286,7 +286,7 @@ ENDMAP
 ############################################################################
 # Labyrinth hedge
 NAME: lab_hedge
-TAGS: lab
+TAGS: lab allow_dup
 SHUFFLE: 1l
 MONS: plant
 MAP
@@ -304,7 +304,7 @@ ENDMAP
 ############################################################################
 # Teaser: inaccessible loot
 NAME: labyrinth_statues
-TAGS: lab
+TAGS: lab allow_dup
 MAP
 ......
 .GGGG.
@@ -317,7 +317,7 @@ ENDMAP
 ############################################################################
 # The other minotaur's lava lair
 NAME: labyrinth_lava_lair
-TAGS: lab
+TAGS: lab allow_dup
 MONS: minotaur zombie
 MAP
 .......
@@ -332,7 +332,7 @@ ENDMAP
 ############################################################################
 # Baited teleport trap - this is evil!
 NAME: labyrinth_baited_teleportation_trap
-TAGS: lab
+TAGS: lab allow_dup
 SHUFFLE: XY / !! / !! / !!
 SUBST: !=x
 SUBST: X==
@@ -349,7 +349,7 @@ ENDMAP
 ############################################################################
 # Teaser: fake exit
 NAME: labyrinth_fake_exit
-TAGS: lab
+TAGS: lab allow_dup
 KFEAT: X = enter_abyss
 MAP
 ........
diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des
index 3e516e49ee..73e2379593 100644
--- a/crawl-ref/source/dat/lair.des
+++ b/crawl-ref/source/dat/lair.des
@@ -251,8 +251,8 @@ ENDMAP
 # a pointless little "vault" by Lemuel
 #
 # edited and varied by Eino. Placing into Lair only because of the floor colour.
-# would be nice to have in the main dungeon, if it once becomes possible to change
-# the floor colour (to green/brown)
+# would be nice to have in the main dungeon, if it once becomes possible to
+# change the floor colour (to green/brown)
 #
 NAME: strawberry_fields_big
 ORIENT: float