Most important changes:
* Portal entry vaults are in general more consistent between each entry vault.
* Sewer entry water matches the colours of the waters inside sewers themselves.
* Enable ice caves, wizlabs for Vaults again, lost in further Vaults overhauls.
Due to the nature of V wall materials, only using floor-bordered vaults.
* Labs don't spawn in Elf or V (too weak, bazaars are fine time limit gimmick),
and cut off on D:18 instead of D:21.
* Bazaar entries have explicit entry default-depth:
D:11-, Orc:4, Elf, Snake, Shoals, Vaults:1-4. No spawns technically limited.
* Convert some newV ice cave entry vaults into regular entries.
* Give wizlabs back their chances to spawn (whoops!)"
0001-Portal-mostly-entry-vault-edits.patch [^] (48,607 bytes) 2013-03-09 00:40 [Show Content] [Hide Content]From 7021600d8e92ad9139ef544b85058de5570373aa Mon Sep 17 00:00:00 2001
From: Jason Van <mwclaws@gmail.com>
Date: Fri, 8 Mar 2013 18:36:45 -0500
Subject: [PATCH] Portal (mostly) entry vault edits
Mostly making the entries more consistent.
Most important changes:
* Portal entry vaults are in general more consistent between each entry vault.
* Sewer entry water matches the colours of the waters inside sewers themselves.
* Enable ice caves, wizlabs for Vaults again, lost in further Vaults overhauls.
Due to the nature of V wall materials, only using floor-bordered vaults.
* Labs don't spawn in Elf or V (too weak, bazaars are fine time limit gimmick),
and cut off on D:18 instead of D:21.
* Bazaar entries have explicit entry default-depth:
D:11-, Orc:4, Elf, Snake, Shoals, Vaults:1-4. No spawns technically limited.
* Convert some newV ice cave entry vaults into regular entries.
* Give wizlabs back their chances to spawn (whoops!)
---
crawl-ref/source/dat/des/portals/bailey.des | 54 ++-----
crawl-ref/source/dat/des/portals/bazaar.des | 59 +++----
crawl-ref/source/dat/des/portals/icecave.des | 213 +++++++++++---------------
crawl-ref/source/dat/des/portals/lab.des | 9 +-
crawl-ref/source/dat/des/portals/ossuary.des | 63 +++-----
crawl-ref/source/dat/des/portals/sewer.des | 82 +++-------
crawl-ref/source/dat/des/portals/trove.des | 48 ++----
crawl-ref/source/dat/des/portals/volcano.des | 27 +---
crawl-ref/source/dat/des/portals/wizlab.des | 175 ++-------------------
crawl-ref/source/dat/des/portals/ziggurat.des | 36 ++---
crawl-ref/source/dat/dlua/ziggurat.lua | 19 ++-
11 files changed, 240 insertions(+), 545 deletions(-)
diff --git a/crawl-ref/source/dat/des/portals/bailey.des b/crawl-ref/source/dat/des/portals/bailey.des
index d4a736b..658b5aa 100644
--- a/crawl-ref/source/dat/des/portals/bailey.des
+++ b/crawl-ref/source/dat/des/portals/bailey.des
@@ -12,7 +12,7 @@
##############################################################################
{{
-function bailey_portal(e, ptype)
+function bailey_portal(e, ptype, trowel)
local timeout_turns_long = crawl.random_range(2700, 3300)
local timeout_turns_short = timeout_turns_long/10;
@@ -43,18 +43,23 @@ function bailey_portal(e, ptype)
floor = "stone_arch",
feat_tile = "dngn_portal_bailey_gone",
msg = messager })
+ if not trowel then
+ e.tags("uniq_bailey chance_bailey")
+ e.chance("5%")
+ end
+
e.kfeat("O = enter_portal_vault")
e.colour("O = lightred")
e.tile("O = dngn_portal_bailey")
e.tile("c = wall_stone_brick")
end
-function bailey_portal_axe(e)
- bailey_portal(e, 'axe')
+function bailey_portal_axe(e, trowel)
+ bailey_portal(e, 'axe', trowel)
end
function bailey_portal_polearm(e)
- bailey_portal(e, 'polearm')
+ bailey_portal(e, 'polearm', trowel)
end
-- colours
@@ -144,40 +149,25 @@ end
}}
-
# Basic bailey entries ##########################################
default-depth: D:7-16, Orc
-NAME: bailey_entry_dummy
-TAGS: bailey_entry transparent chance_bailey
-CHANCE: 5%
-: local rnd = crawl.random2(2)
-: if rnd == 0 then
-: bailey_portal_axe(_G)
-: elseif rnd == 1 then
-: bailey_portal_polearm(_G)
-: end
-MAP
-O
-ENDMAP
-
NAME: bailey_entry_trowel
TAGS: transparent trowel_portal unrand can_overwrite
DEPTH: *, !Bailey
veto {{ return you.is_level_on_stack("Bailey") }}
: local rnd = crawl.random2(2)
: if rnd == 0 then
-: bailey_portal_axe(_G)
+: bailey_portal_axe(_G, true)
: elseif rnd == 1 then
-: bailey_portal_polearm(_G)
+: bailey_portal_polearm(_G, true)
: end
MAP
O
ENDMAP
-NAME: enter_bailey_1
-TAGS: uniq_bailey chance_bailey
-CHANCE: 5%
+NAME: enter_bailey_1
+TAGS: transparent
WEIGHT: 1
: local rnd = crawl.random2(2)
: if rnd == 0 then
@@ -190,8 +180,6 @@ O
ENDMAP
NAME: enter_bailey_2
-TAGS: uniq_bailey chance_bailey
-CHANCE: 5%
: local rnd = crawl.random2(2)
: if rnd == 0 then
ITEM: hand axe
@@ -209,8 +197,6 @@ MAP
ENDMAP
NAME: enter_bailey_3
-TAGS: uniq_bailey chance_bailey
-CHANCE: 5%
: local rnd = crawl.random2(2)
: if rnd == 0 then
MONS: goblin ; hand axe
@@ -232,8 +218,6 @@ MAP
ENDMAP
NAME: enter_bailey_4
-TAGS: uniq_bailey chance_bailey
-CHANCE: 5%
WEIGHT: 5
: local rnd = crawl.random2(2)
: if rnd == 0 then
@@ -261,8 +245,6 @@ MAP
ENDMAP
NAME: enter_bailey_5
-TAGS: uniq_bailey chance_bailey
-CHANCE: 5%
: local rnd = crawl.random2(2)
: if rnd == 0 then
MONS: goblin ; hand axe ego:returning
@@ -285,8 +267,6 @@ NAME: enter_bailey_6
WEIGHT: 3
COLOUR: ; : red / lightred
SUBST: ; = .
-TAGS: uniq_bailey no_rotate chance_bailey
-CHANCE: 5%
KMASK: d = no_item_gen
KPROP: d = no_rtele_into
: local rnd = crawl.random2(2)
@@ -315,8 +295,6 @@ ENDMAP
# They were just having a party.
NAME: enter_bailey_7
-TAGS: uniq_bailey no_rotate chance_bailey
-CHANCE: 5%
WEIGHT: 3
: local rnd = crawl.random2(2)
: if rnd == 0 then
@@ -328,7 +306,7 @@ MONS: gnoll ; spear / goblin ; spear
: end
SUBST: . = ...;!
COLOUR: ; = red
-KITEM: ! = potion of confusion w:2
+KITEM: ! = potion of confusion w:2 ident:type
KFEAT: ! = floor
SUBST: ; = .
MAP
@@ -342,8 +320,6 @@ x@x xxxxxxx
ENDMAP
NAME: enter_bailey_8
-TAGS: uniq_bailey no_rotate chance_bailey
-CHANCE: 5%
WEIGHT: 3
COLOUR: n = red
KMASK: d = no_item_gen
@@ -976,4 +952,4 @@ c..........12c.$$.c.....13+.!!!.+.....14+.......???..c
c..........12cccccc.....13c.....c.....14+....5......5c
cc.<.......1cccccccc....1ccccccccc....1ccc..........cc
cccccccccccccccccccccccccccccccccccccccccccccccccccccc
-ENDMAP
+ENDMAP
\ No newline at end of file
diff --git a/crawl-ref/source/dat/des/portals/bazaar.des b/crawl-ref/source/dat/des/portals/bazaar.des
index 4572a25..2587460 100644
--- a/crawl-ref/source/dat/des/portals/bazaar.des
+++ b/crawl-ref/source/dat/des/portals/bazaar.des
@@ -15,7 +15,10 @@
lua {{
-function place_bazaar_portal(e, perm)
+function place_bazaar_portal(e, perm, trowel)
+ if not trowel then
+ e.tags("bzr_entry")
+ end
e.kfeat("O = enter_portal_vault")
if perm then
e.lua_marker('O', bazaar_portal(false))
@@ -90,13 +93,15 @@ dgn.set_branch_epilogue("Bazaar", "fixup_bazaar")
}}
-default-depth: 10-27
+default-depth: D:11-27, Orc:4, Elf, Snake, Shoals, Vaults:1-4
###############################################################################
-# Dummy entry
+# Entries.
+# The chance for a bazaar entry is branch and absdepth dependent,
+# and resides in des/builder/shops.des.
NAME: bzr_entry_dummy
-TAGS: bzr_entry transparent zotdef_bazaar allow_dup
+TAGS: transparent zotdef_bazaar allow_dup
veto {{ return you.is_level_on_stack("Bazaar") }}
: place_bazaar_portal(_G)
MAP
@@ -107,15 +112,14 @@ NAME: bzr_entry_trowel
TAGS: transparent trowel_portal unrand can_overwrite
DEPTH: *, !Bazaar
veto {{ return you.is_level_on_stack("Bazaar") }}
-: place_bazaar_portal(_G)
+: place_bazaar_portal(_G, false, true)
MAP
O
ENDMAP
-###############################################################################
# A simple water entry.
-NAME: bzr_entry_001
-TAGS: bzr_entry no_pool_fixup allow_dup
+NAME: bzr_entry_water
+TAGS: no_pool_fixup
SHUFFLE: wwl
: place_bazaar_portal(_G)
MAP
@@ -126,10 +130,8 @@ w.w.w
www
ENDMAP
-###############################################################################
# Some coins to shop with.
-NAME: bzr_entry_002
-TAGS: bzr_entry allow_dup
+NAME: bzr_entry_gold
SUBST: $=$.
: place_bazaar_portal(_G)
MAP
@@ -140,10 +142,8 @@ x$$$x
xx.xx
ENDMAP
-###############################################################################
# Many customers
-NAME: bzr_entry_003
-TAGS: bzr_entry allow_dup
+NAME: bzr_entry_customers
MONS: human, orc, goblin, kobold
SUBST: . = .:150 1
SHUFFLE: 1234
@@ -156,10 +156,8 @@ MAP
.....
ENDMAP
-###############################################################################
# Safe
-NAME: bzr_entry_004
-TAGS: bzr_entry allow_dup
+NAME: bzr_entry_safe
: place_bazaar_portal(_G)
MAP
xxxxx
@@ -169,10 +167,8 @@ xx...xx
xxxxx
ENDMAP
-###############################################################################
# Safe 2
-NAME: bzr_entry_005
-TAGS: bzr_entry allow_dup
+NAME: bzr_entry_islet
SHUFFLE: wwlW
: place_bazaar_portal(_G)
MAP
@@ -183,11 +179,8 @@ wwwwwww
wwwww
ENDMAP
-###############################################################################
# Portal along the road
-NAME: bzr_entry_006
-TAGS: bzr_entry allow_dup
-ORIENT: float
+NAME: bzr_entry_road
SHUFFLE: XU, TUV
SUBST: X=.
: place_bazaar_portal(_G)
@@ -195,14 +188,13 @@ MAP
xxx
xxOxx
xxx.X.xxx
-.U.....U.
+@U.....U@
xxxxxxxxx
ENDMAP
-#########################################
# Portal by the lakeside (jpeg)
-NAME: bzr_entry_007
-TAGS: bzr_entry allow_dup no_rotate
+NAME: bzr_entry_lakeside
+TAGS: no_rotate
MONS: plant
SHUFFLE: XY
SUBST: a = W .
@@ -217,10 +209,8 @@ wwwwwwaaaX.Y.
wwwwwWa.
ENDMAP
-#########################################
# Bazaar entry with statue (Lemuel)
NAME: statue_bzr
-TAGS: bzr_entry
KPROP: O = no_rtele_into
SUBST: G = G111
MONS: orange crystal statue / silver statue / ice statue
@@ -232,10 +222,8 @@ cOc
ccc
ENDMAP
-#########################################
# Freezing bazaar (Lemuel)
NAME: freezing_bzr
-TAGS: bzr_entry
MARKER: W = lua:fog_machine { cloud_type = "freezing vapour", \
pow_min = 1, pow_max = 5, delay_min = 20, delay_max = 30, \
size = 2, walk_dist = 3, spread_rate= 20 }
@@ -248,10 +236,8 @@ WwOwW
W
ENDMAP
-#########################################
# Bazaar in the mist (Lemuel)
NAME: bzr_in_the_mist
-TAGS: bzr_entry
MARKER: O = lua:fog_machine { cloud_type= "thin mist", \
pow_min = 6, pow_max = 12, delay_min = 15, delay_max = 35, \
size = 2, walk_dist = 2, spread_rate= 35 }
@@ -260,10 +246,9 @@ MAP
O
ENDMAP
-#########################################
# Firewalk (Lemuel)
NAME: bzr_firewalk
-TAGS: bzr_entry uniq_firewalk no_item_gen
+TAGS: uniq_firewalk no_item_gen
SUBST: $ : $ .
MARKER: * = lua:fog_machine { cloud_type = "flame", \
pow_min = 2, pow_max = 4, delay_min = 5, delay_max = 10, \
@@ -1832,4 +1817,4 @@ WEIGHT: 50
subst('X = x')
kfeat('C = any shop')
bazaar_setup(_G)
-}}
+}}
\ No newline at end of file
diff --git a/crawl-ref/source/dat/des/portals/icecave.des b/crawl-ref/source/dat/des/portals/icecave.des
index c0dcb4b..28cb49f 100644
--- a/crawl-ref/source/dat/des/portals/icecave.des
+++ b/crawl-ref/source/dat/des/portals/icecave.des
@@ -45,6 +45,8 @@ function ice_cave_portal(e)
floor = "expired_portal",
feat_tile = "dngn_portal_ice_cave_gone",
msg = messager })
+ e.tags("uniq_ice_cave chance_icecave")
+ e.chance("5%")
e.kfeat("O = enter_portal_vault")
e.colour("O = white")
e.tile("O = dngn_portal_ice_cave")
@@ -60,8 +62,8 @@ end
{{
-- Figure out if an easy or a hard ice cave should be used. Players
-- that enter the portal deeper in the dungeon end up in the hard ones.
--- Possible depths for easy ice caves are D:11-14, Lair:1-8, Orc:1-4.
--- Hard ice caves are in D:14-19 and Elf:1-5. Those depths are
+-- Possible depths for easy ice caves are D:11-14, Lair, Orc.
+-- Hard ice caves are in D:14-19, Elf, and Vaults. Those depths are
-- set in the entry vault default-depth.
function ice_cave_difficulty()
@@ -69,13 +71,12 @@ function ice_cave_difficulty()
local hard = false
-- Handle overlapping depths for easy and hard maps with a coinflip.
- if you.branch() == "D" and you.depth() == 14 or
- you.branch() == "Elf" and you.depth() < 3 then
+ if you.branch() == "D" and you.depth() == 14 then
hard = crawl.coinflip()
end
if you.branch() == "D" and you.depth() >= 15 or
- you.branch() == "Elf" then
+ you.branch() == "Elf" or you.branch() == "Vaults" then
hard = true
end
@@ -227,11 +228,9 @@ end
# Entries ##########################################
-default-depth: D:11-19, Lair:1-8, Orc:1-4, Elf:1-5
+default-depth: D:11-19, Lair, Orc, Elf, Vaults:1-4
NAME: portal_ice_cave_entry_pillars_01
-TAGS: uniq_ice_cave patrolling no_monster_gen chance_icecave
-CHANCE: 5%
WEIGHT: 4
: ice_cave_portal(_G)
MAP
@@ -245,8 +244,6 @@ MAP
ENDMAP
NAME: portal_ice_cave_entry_pillars_02
-TAGS: uniq_ice_cave patrolling no_monster_gen chance_icecave
-CHANCE: 5%
WEIGHT: 4
: ice_cave_portal(_G)
MAP
@@ -260,8 +257,6 @@ MAP
ENDMAP
NAME: portal_ice_cave_entry_pillars_03
-TAGS: uniq_ice_cave patrolling no_monster_gen chance_icecave
-CHANCE: 5%
WEIGHT: 2
: ice_cave_portal(_G)
MAP
@@ -277,9 +272,8 @@ MAP
ENDMAP
NAME: portal_ice_cave_entry_imps
-TAGS: uniq_ice_cave patrolling no_monster_gen chance_icecave
-CHANCE: 5%
-DEPTH: D:11-14, Lair:1-7, Orc:1-4, Elf:1-2
+TAGS: patrolling no_monster_gen
+DEPTH: D:11-14, Lair:1-6, Orc
: ice_cave_portal(_G)
MONS: white imp
MAP
@@ -291,9 +285,8 @@ MAP
ENDMAP
NAME: portal_ice_cave_entry_ice_beasts
-TAGS: uniq_ice_cave patrolling no_monster_gen chance_icecave
-CHANCE: 5%
-DEPTH: D:11-14, Lair:1-7, Orc:1-4, Elf:1-2
+TAGS: patrolling no_monster_gen
+DEPTH: D:11-14, Lair:1-6, Orc
: ice_cave_portal(_G)
MONS: ice beast
MAP
@@ -305,9 +298,8 @@ MAP
ENDMAP
NAME: portal_ice_cave_entry_animals_and_master
-TAGS: uniq_ice_cave patrolling no_monster_gen chance_icecave
-CHANCE: 5%
-DEPTH: D:14-19, Lair:4-8, Orc:3-4
+TAGS: patrolling no_monster_gen
+DEPTH: D:14-19, Lair:6-8, Orc:4, Elf
: ice_cave_portal(_G)
MONS: wolf / yak w:5 / nothing w:1
MONS: yak / polar bear w:5 / nothing w:1
@@ -331,9 +323,8 @@ xXX@XXxx
ENDMAP
NAME: portal_ice_cave_entry_horrid_things
-TAGS: uniq_ice_cave patrolling no_monster_gen chance_icecave
-CHANCE: 5%
-DEPTH: D:14-19, Elf:3-5
+TAGS: patrolling no_monster_gen
+DEPTH: D:14-19, Elf
: ice_cave_portal(_G)
MONS: ice beast / freezing wraith w:2 / nothing w:2
MONS: freezing wraith / nothing w:3
@@ -351,49 +342,46 @@ xxxxxxxxxxxxxxxxxxxxxxxx
ENDMAP
NAME: portal_ice_cave_demonic_guard
-TAGS: uniq_ice_cave patrolling no_monster_gen chance_icecave
-CHANCE: 5%
-DEPTH: D:14-19, Elf:3-5
+TAGS: patrolling no_monster_gen
+DEPTH: D:14-19, Elf
: ice_cave_portal(_G)
MONS: ice devil
MAP
-XXXXXXX
-X..O..X
-X.....X
-X.1.1.X
-X.....X
-XXX.XXX
-XXX.XXX
-XXX.XXX
-XXX.XXX
-XXX+XXX
+xxxxxxxxx
+xXXXXXXXx
+xX..O..Xx
+xX.....Xx
+xX.1.1.Xx
+xX.....Xx
+xXXX.XXXx
+xXXX.XXXx
+xXXX.XXXx
+xXXX.XXXx
+xxxx+xxxx
ENDMAP
NAME: portal_ice_cave_entry_ice_statue_01
-TAGS: uniq_ice_cave chance_icecave
-CHANCE: 5%
WEIGHT: 5
-DEPTH: D:11-19, Elf:1-5
+DEPTH: D:11-19, Elf
: ice_cave_portal(_G)
MONS: ice statue
MAP
-XXXXXXX
-X.....X
-X..O..X
-X.....X
-X..1..X
-X.....X
-X.....X
-XXX+XXX
+xxxxxxxxx
+xXXXXXXXx
+xX.....Xx
+xX..O..Xx
+xX.....Xx
+xX..1..Xx
+xX.....Xx
+xX.....Xx
+xXXX+XXXx
ENDMAP
NAME: portal_ice_cave_entry_ice_statue_02
-TAGS: uniq_ice_cave chance_icecave
-CHANCE: 5%
WEIGHT: 5
-DEPTH: D:14-19, Elf:3-5
+DEPTH: D:14-19, Elf:2-, Vaults:1-4
: ice_cave_portal(_G)
-MONS: ice statue
+MONS: ice statue, ice statue w:9 / patrolling ice dragon w:1
MAP
.....
.........
@@ -406,90 +394,69 @@ MAP
.....
ENDMAP
-# Vaults Entries #################################
-# - these are placed by tag, not be CHANCE:
-
-default-depth:
-
-NAME: vaults_room_1_spin_icecave_default
-TAGS: vaults_room_1_spin_icecave allow_dup uniq_ice_cave unrand
-TAGS: no_monster_gen no_item_gen
-: ice_cave_portal(_G)
-MAP
-O
-ENDMAP
-
-NAME: vaults_room_4_spin_icecave_dragon
-TAGS: vaults_room_4_spin_icecave allow_dup uniq_ice_cave unrand
-TAGS: no_monster_gen no_item_gen
-MONS: ice dragon
+NAME: portal_ice_cave_entry_dragon
+TAGS: no_monster_gen
+WEIGHT: 4
+DEPTH: D:14-19, Elf
+MONS: ice dragon
: ice_cave_portal(_G)
MAP
-O..X
-..X.
-.X..
-X..1
+xxxxxxxx
+xXXXXXxx
+xXO..XXx
+xX.1X.Xx
+xX.X..X@
+xXX..X..
+xxXXX...
+xxxx@...
ENDMAP
-NAME: vaults_room_7_spin_icecave_devil_box
-TAGS: vaults_room_7_spin_icecave allow_dup uniq_ice_cave unrand
-TAGS: no_monster_gen no_item_gen
-MONS: ice devil
+NAME: portal_ice_cave_entry_frozen_things
+TAGS: no_monster_gen
+WEIGHT: 4
+DEPTH: D:14-19, Elf:2-, Vaults:1-4
+MONS: freezing wraith
+MONS: azure jelly / freezing wraith / nothing
: ice_cave_portal(_G)
MAP
-_______
-_XXXXX_
-_X.1.X_
-_XO..+_
-_X.1.X_
-_XXXXX_
-_______
+ '''''
+ ''XXX''
+''XXOXX''
+'XX.2.XX'
+'X.....X'
+'X.1.1.X'
+'XXX.XXX'
+'XXX.XXX'
+'XXX+XXX'
+'''''''''
ENDMAP
-NAME: vaults_room_10_spin_icecave_wraiths
-TAGS: vaults_room_10_spin_icecave allow_dup uniq_ice_cave unrand
+NAME: portal_ice_cave_entry_ugly_swarm
TAGS: no_monster_gen no_item_gen
-MONS: freezing wraith
-MONS: azure jelly / freezing wraith / nothing
-: ice_cave_portal(_G)
-MAP
-xx______xx
-x__XXX___x
-__XXOXX___
-_XX.2.XX__
-_X.....X__
-_X.1.1.X__
-_XXX.XXX__
-_XXX.XXX__
-_XXX+XXX__
-__________
-ENDMAP
-
-NAME: vaults_room_15_spin_icecave_ugly_swarm
-TAGS: vaults_room_15_spin_icecave allow_dup uniq_ice_cave
-TAGS: no_monster_gen no_item_gen unrand
+DEPTH: D:14-19, Elf, Vaults:1-4
+WEIGHT: 2
SUBST: : = 1.
-NSUBST: 2 = 1:2 / 1:12 / *:1
-NSUBST: 1 = 8:1 / *:.
+NSUBST: 2 = 1:2 / 1:12 / * = 1.
+NSUBST: 1 = 7:1 / 1:1. / *:.
MONS: white ugly thing
MONS: white very ugly thing
: ice_cave_portal(_G)
MAP
-_______________
-_______________
-_____....._____
-____.......____
-___...:::...___
-__...:111:...__
-__..:12221:..__
-__..:12O21:..__
-__..:12221:..__
-__...:111:...__
-___...:::...___
-____.......____
-_____....._____
-_______________
-_______________
+ '''''''
+ '''''''''
+ '''.....'''
+ '''..:.:..'''
+'''.:..:..:.'''
+''....111....''
+''.:.12221.:.''
+''..:12O21:..''
+''.:.12221.:.''
+''....111....''
+'''.:..:..:.'''
+ '''..:.:..'''
+ '''.....'''
+ '''''''''
+ '''''''
ENDMAP
# The destination vaults ############
@@ -1212,4 +1179,4 @@ x.........x
x....<....x
x.........x
xxxxxxxxxxx
-ENDMAP
+ENDMAP
\ No newline at end of file
diff --git a/crawl-ref/source/dat/des/portals/lab.des b/crawl-ref/source/dat/des/portals/lab.des
index 2311737..111391d 100644
--- a/crawl-ref/source/dat/des/portals/lab.des
+++ b/crawl-ref/source/dat/des/portals/lab.des
@@ -42,8 +42,11 @@ TAGS: transparent extra uniq_lab
# Labyrinth was (1-285/10^4)^24 = ~49%. Increasing chance to 5% gives you
# (1-500/10^4)^24 = ~29% chance of NOT placing a Labyrinth, ~71% chance
# of getting a Labyrinth every game, skewed towards earlier depths.
-CHANCE: 500
-DEPTH: D:11-21, Elf, Dwarf, Lair, Vaults:1-5
+# (Mar 2013) A long while later, there is general agreement that something
+# should be changed about labyrinths to address percieved tedium.
+# For now, trimming spawning depths to keep the minotaur more dangerous.
+CHANCE: 5%
+DEPTH: D:11-18, Orc:4, Dwarf, Lair
: lab_portal(_G)
MAP
O
@@ -777,4 +780,4 @@ x.. .x.
. .x.
.x.
.x.
-ENDMAP
+ENDMAP
\ No newline at end of file
diff --git a/crawl-ref/source/dat/des/portals/ossuary.des b/crawl-ref/source/dat/des/portals/ossuary.des
index 1de9505..e1c7166 100644
--- a/crawl-ref/source/dat/des/portals/ossuary.des
+++ b/crawl-ref/source/dat/des/portals/ossuary.des
@@ -40,9 +40,14 @@ function ossuary_portal(e)
floor = "expired_portal",
feat_tile = "dngn_portal_ossuary_gone",
msg = messager })
+ e.tags("uniq_ossuary no_monster_gen chance_ossuary")
+ e.chance("5%")
e.kfeat("O = enter_portal_vault")
e.colour("O = brown")
+ e.colour("' = yellow")
+ e.ftile("' = floor_sandstone")
e.tile("O = dngn_portal_ossuary")
+ e.tile("c = wall_tomb")
end
-- Use the following line in destination maps after all SUBSTs
@@ -58,12 +63,7 @@ end
default-depth: D:4-8
NAME: enter_ossuary_1
-TAGS: uniq_ossuary no_monster_gen chance_ossuary
-CHANCE: 5%
SUBST: . = . ':7
-COLOUR: ' = yellow
-FTILE: ' = floor_sandstone
-SUBST: ' = .
: ossuary_portal(_G)
MAP
.....
@@ -74,20 +74,12 @@ MAP
ENDMAP
NAME: enter_ossuary_2
-TAGS: uniq_ossuary no_monster_gen chance_ossuary
-CHANCE: 5%
-SHUFFLE: CD / c+
-COLOUR: ' = yellow
-COLOUR: C = yellow
-COLOUR: D = yellow
-SUBST: D = +
+SHUFFLE: C+
SUBST: C = c
-FTILE: ' = floor_sandstone
-SUBST: ' = .
: ossuary_portal(_G)
MAP
.......
-.ccDcc.
+.cc+cc.
.c'''c.
.C'O'C.
.c'''c.
@@ -96,12 +88,7 @@ MAP
ENDMAP
NAME: enter_ossuary_3
-TAGS: uniq_ossuary no_monster_gen chance_ossuary
-CHANCE: 5%
-SUBST: . = Y .
-COLOUR: Y = yellow
-FTILE: Y = floor_sandstone
-SUBST: Y = .
+SUBST: . = ' .
MONS: rat zombie / jackal zombie / worm zombie
MONS: kobold zombie / goblin zombie / hobgoblin zombie
MONS: orc zombie / gnoll zombie / human zombie
@@ -114,31 +101,23 @@ MAP
ENDMAP
NAME: enter_ossuary_4
-TAGS: uniq_ossuary no_monster_gen chance_ossuary
-CHANCE: 5%
-COLOUR: 1 = yellow, ' = yellow, x = white
+COLOUR: 1 = yellow, x = white
MONS: rat zombie / quokka zombie / goblin zombie
-FTILE: 1 = floor_sandstone, ' = floor_sandstone, x = floor_sandstone, O = floor_sandstone
-RTILE: x = wall_tomb
+FTILE: 1 = floor_sandstone, x = floor_sandstone, O = floor_sandstone
: ossuary_portal(_G)
MAP
.........
-.xxxxxxx.
-.x''O''x.
-.x'''''x.
-.x'x'x'x.
-.x1x'x1x.
-.xxx'xxx.
+.ccccccc.
+.c''O''c.
+.c'''''c.
+.c'c'c'c.
+.c1c'c1c.
+.ccc'ccc.
....'....
ENDMAP
NAME: enter_ossuary_5
-TAGS: uniq_ossuary no_monster_gen chance_ossuary
-CHANCE: 5%
COLOUR: c = white, + = white, ' = yellow
-RTILE: c = wall_tomb
-FTILE: ' = floor_sandstone
-SUBST: c : cx
: ossuary_portal(_G)
MAP
...
@@ -153,12 +132,8 @@ MAP
ENDMAP
NAME: gup_ossuary_entry_pyramid
-TAGS: uniq_ossuary no_monster_gen chance_ossuary mini_float
-CHANCE: 5%
+TAGS: mini_float
KMONS: O = mummy
-COLOUR: ' = yellow
-TILE: c = dngn_stone_wall_yellow
-FTILE: ' = floor_sandstone
NSUBST: ' = 3:~ / *:'
: ossuary_portal(_G)
MAP
@@ -923,7 +898,7 @@ ENDMAP
# loot, and escape out before waking anyone up. Whereas someone with 0 stealth
# skill will wake up the mummies immediately.
#
-# XXX: Should be looked at when noise/stealth is redone.
+# XXX: Should be looked at with messy runed door use, stealth changes.
#
NAME: ossuary_due_cavern
WEIGHT: 10
@@ -1063,4 +1038,4 @@ c2..A.<.+.............+~<~c
cc......c.............c~~~c
c2.cccccccc1ccc1ccc1ccccccc
cccc ccc ccc ccc
-ENDMAP
+ENDMAP
\ No newline at end of file
diff --git a/crawl-ref/source/dat/des/portals/sewer.des b/crawl-ref/source/dat/des/portals/sewer.des
index 1201fd4..5a981d1 100644
--- a/crawl-ref/source/dat/des/portals/sewer.des
+++ b/crawl-ref/source/dat/des/portals/sewer.des
@@ -40,8 +40,13 @@ function sewer_portal(e)
floor = "expired_portal",
feat_tile = "dngn_portal_sewer_rusted",
msg = messager })
+ e.tags("uniq_sewer no_monster_gen chance_sewer")
+ e.chance("8%")
e.kfeat("O = enter_portal_vault")
+ e.kfeat("1 = W")
e.colour("O = lightgreen")
+ e.colour("1W = lightgreen / cyan w:5")
+ e.colour("w = green")
e.tile("O = dngn_portal_sewer")
end
@@ -57,15 +62,13 @@ end
default-depth: D:3-6
NAME: portal_sewer_entry_a
-TAGS: uniq_sewer no_monster_gen mini_float chance_sewer
-CHANCE: 8%
+TAGS: mini_float
: sewer_portal(_G)
-COLOUR: W = green / cyan w:5
-SUBST: 1 = 11234444444444
+SUBST: 1 = 2234..........
+MONS: nothing
MONS: rat / grey rat / green rat w:5
MONS: ball python / adder w:2
MONS: giant cockroach / giant mite / worm w:3
-MONS: nothing
MAP
.........
...111...
@@ -79,15 +82,11 @@ MAP
ENDMAP
NAME: portal_sewer_entry_b
-TAGS: uniq_sewer no_monster_gen chance_sewer
-CHANCE: 8%
ORIENT: float
: sewer_portal(_G)
SUBST: '=W. , W=WW1
KMONS: 1 = rat w:20 / grey rat w:20 / green rat/ ball python / adder w:2 / \
giant cockroach / giant mite / worm w:3
-KFEAT: 1 = W
-COLOUR: W = green
MAP
xxxxxx
xOWWW'
@@ -98,17 +97,12 @@ xW'...
ENDMAP
NAME: portal_sewer_entry_c
-TAGS: uniq_sewer no_monster_gen chance_sewer
-CHANCE: 8%
WEIGHT: 4
: sewer_portal(_G)
NSUBST: c = 1:+ / 2:n / *:c
-NSUBST: W = 8:1 / *:W
-SUBST: 1 = 111W
+NSUBST: W = 8 = 111W / *:W
KMONS: 1 = rat w:20 / grey rat w:20 / green rat/ ball python / adder w:2 / \
- giant cockroach / giant mite / worm w:3
-KFEAT: 1 = W
-COLOUR: W = green / cyan w:5
+ giant cockroach / giant mite / worm w:3
MAP
.........
.ccccccc.
@@ -121,12 +115,8 @@ MAP
ENDMAP
NAME: portal_sewer_entry_d
-TAGS: uniq_sewer no_monster_gen chance_sewer
-CHANCE: 8%
: sewer_portal(_G)
KMONS: 1 = big fish
-KFEAT: 1 = W
-COLOUR: W = green / cyan w:5
MAP
xxxxxxxxxx
xWOW1WWWWW@
@@ -134,18 +124,13 @@ xxxxxxxxxx
ENDMAP
NAME: portal_sewer_entry_e
-TAGS: uniq_sewer no_monster_gen chance_sewer
-CHANCE: 8%
: sewer_portal(_G)
ORIENT: northwest
NSUBST: X = 2:+ / *:x
SUBST: w = WW.
-NSUBST: W = 8:1 / *:W
-SUBST: 1 = 111W
+NSUBST: W = 8:111W / *:W
KMONS: 1 = rat w:20 / grey rat w:20 / green rat/ ball python / adder w:2 / \
giant cockroach / giant mite / worm w:3
-KFEAT: 1 = W
-COLOUR: W = green / cyan w:5
MAP
xxxxxxxxx
xWWWXWww.
@@ -159,12 +144,9 @@ x........
ENDMAP
NAME: portal_sewer_entry_f
-TAGS: uniq_sewer no_monster_gen chance_sewer
-CHANCE: 8%
: sewer_portal(_G)
+KMONS: 1 = giant gecko / giant mite / giant cockroach / nothing w:5
NSUBST: W = 6:1 / *:W
-KMONS: 1 = nothing w:5 / giant gecko / giant mite / giant cockroach
-KFEAT: 1 = W
COLOUR: W = green / cyan w:5
MAP
xxxxxxxxxxx
@@ -175,37 +157,30 @@ xxxxxxxxxxx
ENDMAP
NAME: gup_sewer_entry_pipe
-TAGS: uniq_sewer no_monster_gen chance_sewer patrolling no_pool_fixup
-CHANCE: 8%
+TAGS: patrolling no_pool_fixup
: sewer_portal(_G)
-KMONS: 1 = giant cockroach / giant mite / giant gecko / nothing
-KFEAT: 1 = W
+KMONS: 2 = giant cockroach / giant mite / giant gecko / nothing
SUBST: W = WW.
-COLOUR: 1W = lightgreen
-COLOUR: w = green
MAP
@Wxxxxxxxxx
WWWWWWWWWWxx
xWWwwwwwwWWx
-xxxxxxxxx11x
- xxwwwwww11x
-xxWWW1O1WWxx
-x11wwwwwwxx
-x11xxxxxxxxx
+xxxxxxxxx22x
+ xxwwwwww22x
+xxWWW2O2WWxx
+x22wwwwwwxx
+x22xxxxxxxxx
xWWwwwwwwWWx
xxWWWWWWWWWW
xxxxxxxxWW@
ENDMAP
NAME: gup_sewer_entry_spiral
-TAGS: uniq_sewer no_monster_gen mini_float chance_sewer patrolling
-CHANCE: 8%
+TAGS: patrolling
: sewer_portal(_G)
KMONS: 1 = rat / grey rat / green rat w:5 / giant centipede w:5 / \
giant cockroach / giant mite / giant gecko / worm w:5 / nothing
-KFEAT: 1 = W
NSUBST: - : 8:1 / 8:. / *:W
-COLOUR: 1W = green
MAP
xxxxxxxxxx
x--------xx
@@ -221,13 +196,10 @@ xx-------xx
ENDMAP
NAME: gup_sewer_entry_bubbles
-TAGS: uniq_sewer no_monster_gen mini_float chance_sewer patrolling
-CHANCE: 8%
+TAGS: mini_float patrolling
: sewer_portal(_G)
-COLOUR: 1W = green
KMONS: 1 = rat / grey rat / green rat w:5 / giant centipede w:5 / \
giant cockroach / giant mite / giant gecko / worm w:5 / nothing
-KFEAT: 1 = W
NSUBST: - = 8:1 / *:W
MAP
.xxx....xxx.
@@ -245,13 +217,10 @@ xx-xxxxxx-xx
ENDMAP
NAME: gup_sewer_entry_bowl
-TAGS: uniq_sewer no_monster_gen mini_float chance_sewer
-CHANCE: 8%
+TAGS: mini_float
: sewer_portal(_G)
-COLOUR: 1W = green
KMONS: 1 = rat / grey rat / green rat w:5 / \
giant cockroach / giant mite / giant gecko / worm w:3 / nothing
-KFEAT: 1 = W
MAP
..........
.xxx.xxxx..
@@ -264,12 +233,9 @@ MAP
ENDMAP
NAME: gup_sewer_entry_glass
-TAGS: uniq_sewer no_monster_gen mini_float chance_sewer
-CHANCE: 8%
+TAGS: mini_float
: sewer_portal(_G)
-COLOUR: 1W = green
KMONS: 1 = giant centipede / giant cockroach / nothing
-KFEAT: 1 = W
MAP
..........
.mmmmmmm.
@@ -1240,4 +1206,4 @@ xxxxxwwwwwwwwwwwwwwwwwwwwwwxxxxxX..PB.2.Xxxx
xxxxxYwwwwwwwwwwwwwwwwwwwwYxxxxxX.2..e..Xxxx
xxxxxxYwwwwwwYYYYwwwYYYwwYxxxxxxxX.....Xxxxx
xxxxxxxYYYxYYxxxxYYYxxxYYxxxxxxxxxxXXXxxxxxx
-ENDMAP
+ENDMAP
\ No newline at end of file
diff --git a/crawl-ref/source/dat/des/portals/trove.des b/crawl-ref/source/dat/des/portals/trove.des
index 34e13d5..cbaee77 100644
--- a/crawl-ref/source/dat/des/portals/trove.des
+++ b/crawl-ref/source/dat/des/portals/trove.des
@@ -166,10 +166,14 @@ function trove.portal(e)
feat_tile = "dngn_portal_trove_gone",
}
end
+ e.tags("uniq_trove no_monster_gen chance_trove")
+ e.chance("5%")
e.lua_marker("O", stair)
e.kfeat("O = enter_portal_vault")
- e.colour("O = blue")
+ e.colour(".O = blue")
+ e.ftile(".OcG+ = floor_marble")
e.tile("O = dngn_portal_trove")
+ e.tile("c = wall_stone_dark")
end
-- Use the following line in destination maps after all SUBSTs
@@ -225,7 +229,7 @@ function trove.spell_skills (e)
end
}}
-default-depth: D:10-, Elf:1-, Vaults
+default-depth: D:10-, Elf, Vaults
##############################################################################
#
@@ -234,18 +238,13 @@ default-depth: D:10-, Elf:1-, Vaults
##############################################################################
NAME: enter_trove_0
-TAGS: uniq_trove no_monster_gen chance_trove
-CHANCE: 5%
: trove.portal(_G)
MAP
O
ENDMAP
NAME: enter_trove_1
-TAGS: uniq_trove no_monster_gen chance_trove
-CHANCE: 5%
: trove.portal(_G)
-COLOUR: . = blue
MAP
...
.O.
@@ -253,11 +252,7 @@ MAP
ENDMAP
NAME: enter_trove_2
-TAGS: uniq_trove no_monster_gen chance_trove
-CHANCE: 5%
: trove.portal(_G)
-COLOUR: . = blue
-COLOUR: G = blue
MAP
@G@
@G.G@
@@ -271,7 +266,6 @@ TAGS: uniq_trove no_monster_gen no_wall_fixup chance_trove
CHANCE: 5%
: trove.portal(_G)
COLOUR: .c = blue
-TILE: c = wall_stone_dark
FTILE: .cO = floor_marble
MAP
ccccc
@@ -283,11 +277,7 @@ ENDMAP
# Of course, not everyone is willing for you to take their treasure...
NAME: enter_trove_5
-TAGS: uniq_trove no_monster_gen chance_trove
-CHANCE: 5%
: trove.portal(_G)
-COLOUR: . = blue
-COLOUR: c = blue
: if you.absdepth() <= 15 then
# Got drafted in from Vaults:$, while the mages try and close the portal down.
KMONS: e = vault guard
@@ -296,10 +286,6 @@ KMONS: e = vault guard
KMONS: e = vault guard
KMONS: l = vault guard
: end
-KFEAT: e = .
-COLOUR: e = blue
-KFEAT: l = .
-COLOUR: l = blue
MAP
ccccc
c...c
@@ -315,12 +301,10 @@ ENDMAP
# Someone left some gold behind for you!
NAME: enter_trove_6
-TAGS: uniq_trove no_monster_gen no_wall_fixup chance_trove
-CHANCE: 5%
: trove.portal(_G)
+KFEAT: X = +
MARKER: X = lua: props_marker { connected_exclude="true" }
-SUBST: X = +
-COLOUR: + = blue
+COLOUR: $X = blue
MAP
ccccccc
c$$$$$c
@@ -591,7 +575,7 @@ ENDMAP
NAME: trove_armour_1
WEIGHT: 15
ORIENT: encompass
-TAGS: no_item_gen no_monster_gen allow_dup no_species_fe no_species_op no_species_oc
+TAGS: no_item_gen no_monster_gen allow_dup no_species_fe no_species_op
# Loot: once again, 16 items.
ITEM: acquire armour / any useful armour good_item / any armour w:2
: trove.setup_features(_G)
@@ -616,7 +600,7 @@ ENDMAP
NAME: trove_armour_2
WEIGHT: 15
ORIENT: encompass
-TAGS: no_item_gen no_monster_gen allow_dup no_species_fe no_species_op no_species_oc
+TAGS: no_item_gen no_monster_gen allow_dup no_species_fe no_species_op
# Loot: 15 items.
COLOUR: x = blue
ITEM: acquire armour / any useful armour good_item / any armour w:2
@@ -635,7 +619,7 @@ ENDMAP
NAME: trove_hunter_1
WEIGHT: 5
ORIENT: encompass
-TAGS: no_item_gen no_monster_gen allow_dup no_species_fe no_species_op no_species_oc
+TAGS: no_item_gen no_monster_gen allow_dup no_species_fe no_species_op
# Loot: 15 items, this time.
COLOUR: x = blue
MONS: storm dragon zombie
@@ -672,7 +656,7 @@ COLOUR: = = blue
NSUBST: " = 1:+ / *:x
NSUBST: ' = 1:+ / *:x
# Rock is actually diggable for those people driven mad by hatred.
-MONS: vampire
+MONS: deep elf summoner
# 24 items, just because we're feeling generous.
ITEM: any useful good_item w:10 / any
ITEM: any useful jewellery good_item / any useful good_item
@@ -798,7 +782,7 @@ ITEM: dagger unrand:vampires_tooth / dagger unrand:dagger_of_chilly_death /\
great sword unrand:sword_of_power / demon blade unrand:bloodbane /\
scimitar unrand:scimitar_of_flaming_death / war axe unrand:arga /\
dagger unrand:knife_of_accuracy / broad axe unrand:obsidian_axe /\
- triple sword unrand:plutonium_sword /\
+ triple sword unrand:plutonium_sword /\
demon blade unrand:leech / long sword unrand:sword_of_zonguldrok /\
staff of poison unrand:staff_of_olgreb / scythe unrand:finisher /\
quarterstaff unrand:elemental_staff / mace unrand:devastator /\
@@ -868,7 +852,7 @@ ITEM: acquire armour / any useful armour good_item / any armour w:2
ITEM: acquire weapon / any useful weapon good_item / any weapon w:2
ITEM: acquire jewellery / any useful jewellery good_item / any jewellery w:2
: trove.good_scroll(_G)
-ITEM: wand of digging ident:type
+ITEM: wand of digging
SHUFFLE: defg
: trove.setup_features(_G)
MAP
@@ -899,7 +883,7 @@ ENDMAP
# 16 pieces of armour
NAME: trove_armour_six_rooms
-TAGS: no_item_gen no_monster_gen allow_dup no_species_fe no_species_op no_species_oc
+TAGS: no_item_gen no_monster_gen allow_dup no_species_fe no_species_op
ORIENT: encompass
ITEM: acquire armour / any useful armour good_item / any armour w:2
: trove.setup_features(_G)
@@ -1018,4 +1002,4 @@ xxxxeee.x.eeexxxx
xxxxeee.<.x
xxxx...x
xxxxx
-ENDMAP
+ENDMAP
\ No newline at end of file
diff --git a/crawl-ref/source/dat/des/portals/volcano.des b/crawl-ref/source/dat/des/portals/volcano.des
index bb1c984..a015ca9 100644
--- a/crawl-ref/source/dat/des/portals/volcano.des
+++ b/crawl-ref/source/dat/des/portals/volcano.des
@@ -72,10 +72,12 @@ function volcano_portal (e)
floor = "expired_portal",
feat_tile = "dngn_portal_volcano_gone",
msg = messager })
+ e.tags("uniq_volcano chance_volcano")
+ e.chance("5%")
e.kfeat("O = enter_portal_vault")
e.tile("O = dngn_portal_volcano")
e.kfeat("S = .")
- e.colour("O = red")
+ e.colour("XOS = red")
e.rtile("X = wall_volcanic")
e.ftile("OS = floor_rough_red")
end
@@ -470,11 +472,6 @@ MAP
ENDMAP
NAME: enter_volcano_1
-TAGS: uniq_volcano chance_volcano
-CHANCE: 5%
-ORIENT: float
-COLOUR: X = red
-COLOUR: S = red
: volcano_portal(_G)
MAP
xx
@@ -487,11 +484,6 @@ xXXx.xx
ENDMAP
NAME: enter_volcano_2
-TAGS: uniq_volcano chance_volcano
-CHANCE: 5%
-ORIENT: float
-COLOUR: X = red
-COLOUR: S = red
: volcano_portal(_G)
MAP
xxxxx
@@ -504,13 +496,8 @@ xx.Sxx
ENDMAP
NAME: enter_volcano_3
-TAGS: uniq_volcano chance_volcano
-CHANCE: 5%
-ORIENT: float
MONS: patrolling fire drake
# His name is Robby.
-COLOUR: X = red
-COLOUR: S = red
: volcano_portal(_G)
MAP
xxxxx
@@ -526,12 +513,7 @@ ENDMAP
# This is the "large" one. You might get a clear path, but then again...
NAME: enter_volcano_4
-TAGS: uniq_volcano chance_volcano
KPROP: .SLO = no_rtele_into
-CHANCE: 5%
-ORIENT: float
-COLOUR: X = red
-COLOUR: S = red
NSUBST: L = 8:. / *:l
: volcano_portal(_G)
MAP
@@ -550,6 +532,7 @@ xxxSxxx
xxLlLxx
x.@.x
ENDMAP
+
###############################################################################
default-depth: Volcano
@@ -1340,4 +1323,4 @@ xx3321llllllllllllllllllllllllllllllllllll11233321111ll123xx
xxxx xxx xxx3xxx xxxx
xxx
ENDMAP
-###############################################################################
+###############################################################################
\ No newline at end of file
diff --git a/crawl-ref/source/dat/des/portals/wizlab.des b/crawl-ref/source/dat/des/portals/wizlab.des
index 6c989f1..1bb4f60 100644
--- a/crawl-ref/source/dat/des/portals/wizlab.des
+++ b/crawl-ref/source/dat/des/portals/wizlab.des
@@ -116,6 +116,7 @@ function wizlab_portal (e)
e.kfeat("O = enter_portal_vault")
e.tile("O = no_random dngn_portal_wizard_lab")
e.tags("uniq_wizlab no_item_gen no_monster_gen chance_wizlab")
+ e.chance("5%")
end
-- Destinations:
@@ -408,14 +409,13 @@ end
}}
-default-depth: Crypt, D:22-27, Elf:3-5
+default-depth: D:22-27, Elf, Crypt, Vaults:1-4
###############################################################################
# Portal entrances.
#
# Todo: more, and better.
NAME: mu_enter_wizlab_1
-ORIENT: float
TILE: m = dngn_transparent_wall_green
COLOUR: m = lightgreen
: wizlab_portal(_G)
@@ -432,7 +432,7 @@ wwbm..O..mbww
ENDMAP
NAME: mu_enter_wizlab_2
-ORIENT: float
+DEPTH: D:22-27, Elf, Crypt, Vaults:1-4
SHUFFLE: tU
TILE: m = dngn_transparent_wall_green
COLOUR: m = lightgreen
@@ -456,7 +456,6 @@ MAP
ENDMAP
NAME: mu_enter_wizlab_3
-ORIENT: float
MARKER: ! = lua:fog_machine { \
pow_max = 10, delay_min = 10, delay_max = 40, \
size = 2, size_buildup_amnt = 5, \
@@ -510,7 +509,6 @@ w..www
ENDMAP
NAME: mu_enter_wizlab_5
-ORIENT: float
COLOUR: U = random
COLOUR: W = mutagenic
KFEAT: o = granite_statue
@@ -582,6 +580,7 @@ xxxxxxxxxxxxx
ENDMAP
NAME: infiniplex_enter_wizlab_glasses
+DEPTH: D:22-27, Elf, Crypt, Vaults:1-4
FTILE: GO_ = floor_rough_magenta
TILE: m = dngn_transparent_wall_green
COLOUR: m = lightgreen
@@ -599,6 +598,7 @@ MAP
ENDMAP
NAME: infiniplex_enter_wizlab_water
+DEPTH: D:22-27, Elf, Crypt, Vaults:1-4
FTILE: cnO_ = floor_rough_magenta
TILE: n = dngn_transparent_stone_magenta
COLOUR: n = lightmagenta
@@ -619,6 +619,7 @@ ww......ww
ENDMAP
NAME: infiniplex_enter_wizlab_spiral
+DEPTH: D:22-27, Elf, Crypt, Vaults:1-4
SUBST: G : xG.
SUBST: x : xx.
MARKER: ! = lua:fog_machine { \
@@ -1916,11 +1917,11 @@ MARKER: f = lua:fog_machine { \
size_buildup_time = 25, cloud_type = "flame", \
excl_rad = -1 }
KMONS: 2 = w:1 Lorocyproca / hell beast / reaper /\
- w:20 ice devil / w:20 sun demon / hellion
-KMONS: 3 = blue devil / iron devil / soul eater / neqoxec /\
+ w:20 blizzard demon / w:20 sun demon / hellion
+KMONS: 3 = ice devil / iron devil / soul eater / neqoxec /\
w:5 tormentor / ynoxinul
KMONS: 4 = kobold demonologist / deep elf demonologist
-KMONS: 5 = blizzard demon / green death / cacodemon
+KMONS: 5 = balrug / green death / cacodemon
{{
wizname = crawl.make_name()
@@ -2010,6 +2011,11 @@ ENDMAP
#
# See git history for previous versions of Ozocubu, Alistair.
#
+# March 2013 note: there isn't the greatest of interest in making
+# the majority of these potential portals, as nice as that would be,
+# and the portal is effectively "finished".
+# More effort should be put into editing above vaults anyway.
+#
# PLANNING AREA:
#
# From spells:
@@ -2042,153 +2048,6 @@ ENDMAP
# wooden walls set in a forest (more "earthy" than Eringya's Garden)
# The Alchemist's Tower: gold turned into things, things turned into gold.
#
-
-###############################################################################
-# Alistair's Brewery
-#
-# TODO: Do.
-NAME: wizlab_alistair
-ORIENT: encompass
-TAGS: no_item_gen no_monster_gen no_rotate allow_dup
-WEIGHT: 0
-: wizlab_setup(_G, "Alistair's Brewery")
-epilogue{{
- wizlab_milestone(_G, "Alistair's Brewery")
-}}
-MAP
-ENDMAP
-
-###############################################################################
-# Lee's Rapid Deconstructor
-#
-# TODO: Do.
-NAME: wizlab_lee
-ORIENT: encompass
-TAGS: no_item_gen no_monster_gen no_rotate allow_dup
-WEIGHT: 0
-: wizlab_setup(_G, "Lee's Rapid Deconstructor")
-epilogue{{
- wizlab_milestone(_G, "Lee's Rapid Deconstructor")
-}}
-MAP
-ENDMAP
-
-###############################################################################
-# Lehudib's Crystal Spire
-#
-# TODO: Do.
-NAME: wizlab_lehudib
-ORIENT: encompass
-TAGS: no_item_gen no_monster_gen no_rotate allow_dup
-WEIGHT: 0
-: wizlab_setup(_G, "Lehudib's Crystal Spire")
-epilogue{{
- wizlab_milestone(_G, "Lehudib's Crystal Spire")
-}}
-MAP
-ENDMAP
-
-###############################################################################
-# Maxwell's Forge
-#
-# TODO: Do.
-NAME: wizlab_maxwell
-ORIENT: encompass
-TAGS: no_item_gen no_monster_gen no_rotate allow_dup
-WEIGHT: 0
-: wizlab_setup(_G, "Maxwell's Forge")
-epilogue{{
- wizlab_milestone(_G, "Maxwell's Forge")
-}}
-MAP
-ENDMAP
-
-###############################################################################
-# Olgreb's Toxic Laboratory
-#
-# TODO: Do.
-NAME: wizlab_olgreb
-ORIENT: encompass
-TAGS: no_item_gen no_monster_gen no_rotate allow_dup
-WEIGHT: 0
-: wizlab_setup(_G, "Olgreb's Toxic Laboratory")
-epilogue{{
- wizlab_milestone(_G, "Olgreb's Toxic Laboratory")
-}}
-MAP
-ENDMAP
-
-###############################################################################
-# Ozocubu's Refrigerator
-#
-# TODO: Do.
-NAME: wizlab_ozocubu
-ORIENT: encompass
-TAGS: no_item_gen no_monster_gen no_rotate allow_dup
-WEIGHT: 0
-: wizlab_setup(_G, "Ozocubu's Refrigerator")
-epilogue{{
- wizlab_milestone(_G, "Ozocubu's Refrigerator")
-}}
-MAP
-ENDMAP
-
-###############################################################################
-# Cekugob's Oubliette
-#
-# TODO: Do.
-NAME: wizlab_cekugob
-ORIENT: encompass
-TAGS: no_item_gen no_monster_gen no_rotate allow_dup
-WEIGHT: 0
-: wizlab_setup(_G, "Cekugob's Oubliette")
-epilogue{{
- wizlab_milestone(_G, "Cekugob's Oubliette")
-}}
-MAP
-ENDMAP
-
-###############################################################################
-# Botono's Bayou
-#
-# TODO: Do.
-NAME: wizlab_botono
-ORIENT: encompass
-TAGS: no_item_gen no_monster_gen no_rotate allow_dup
-WEIGHT: 0
-: wizlab_setup(_G, "Botono's Bayou")
-epilogue{{
- wizlab_milestone(_G, "Botono's Bayou")
-}}
-MAP
-ENDMAP
-
-###############################################################################
-# Ukta's Hut
-#
-# TODO: Do.
-NAME: wizlab_ukta
-ORIENT: encompass
-TAGS: no_item_gen no_monster_gen no_rotate allow_dup
-WEIGHT: 0
-: wizlab_setup(_G, "Ukta's Hut")
-epilogue{{
- wizlab_milestone(_G, "Ukta's Hut")
-}}
-MAP
-ENDMAP
-
-###############################################################################
-# The Alchemist's Tower
-#
-# TODO: Do.
-NAME: wizlab_alchemist
-ORIENT: encompass
-TAGS: no_item_gen no_monster_gen no_rotate allow_dup
-WEIGHT: 0
-: wizlab_setup(_G, "The Alchemist's Tower")
-epilogue{{
- wizlab_milestone(_G, "The Alchemist's Tower")
-}}
-MAP
-ENDMAP
+# Other mages that could use representation, not yet expounded upon:
+# Borgnjor, Leda, Doom Knight, Octopus King, The Captain, Zhor.
+#
\ No newline at end of file
diff --git a/crawl-ref/source/dat/des/portals/ziggurat.des b/crawl-ref/source/dat/des/portals/ziggurat.des
index 9d68808..09a4520 100644
--- a/crawl-ref/source/dat/des/portals/ziggurat.des
+++ b/crawl-ref/source/dat/des/portals/ziggurat.des
@@ -14,7 +14,6 @@
# among D:21-27 -- 5%
# in a Pan level -- 8%
-
# Dummy for the trowel card
NAME: enter_the_ziggurat
TAGS: trowel_portal unrand can_overwrite
@@ -36,14 +35,12 @@ ENDMAP
default-depth: D:21-27
NAME: enter_ziggurat_a
-CHANCE: 5%
-TAGS: chance_zig extra allow_dup luniq_zig
COLOUR: ; : cyan / lightblue
COLOUR: ' = blue
FTILE: ; = floor_hall
SUBST: ' = .
SUBST: ; = .
-: ziggurat_portal(_G)
+: ziggurat_portal(_G, "deep")
MAP
.......
.;;;;;.
@@ -55,15 +52,14 @@ MAP
ENDMAP
NAME: enter_ziggurat_b
-CHANCE: 5%
-TAGS: chance_zig extra allow_dup luniq_zig no_pool_fixup
+TAGS: no_pool_fixup
SHUFFLE: wW' / l;_
COLOUR: ; = red
COLOUR: _ : blue / lightred
COLOUR: ' = cyan
FTILE: ' = floor_hall, _ = floor_hall, ; = floor_hall, O = floor_hall
SUBST: '=. , ;=. , _=.
-: ziggurat_portal(_G)
+: ziggurat_portal(_G, "deep")
MAP
..'..
..'W'..
@@ -77,8 +73,6 @@ MAP
ENDMAP
NAME: enter_ziggurat_c
-CHANCE: 5%
-TAGS: chance_zig extra allow_dup luniq_zig
MONS: lich / ancient lich
MONS: angel / daeva
MONS: eye of draining / eye of devastation / giant eyeball / \
@@ -87,7 +81,7 @@ KPROP: 1Om = no_rtele_into
SHUFFLE: 123x
SUBST: 1=1..., 2=2., x=.
KFEAT: m = iron_grate
-: ziggurat_portal(_G)
+: ziggurat_portal(_G, "deep")
MAP
...
..m..
@@ -102,8 +96,6 @@ ENDMAP
# XXX: Undiggable glass has been converted to grates.
NAME: enter_ziggurat_d
-CHANCE: 5%
-TAGS: chance_zig extra allow_dup luniq_zig
MONS: lich / ancient lich
MONS: angel / daeva
MONS: eye of draining / eye of devastation / giant eyeball / \
@@ -113,7 +105,7 @@ SHUFFLE: 123x
SUBST: 1=1..., 2=2., x=.
SUBST: ;=.
KFEAT: n = iron_grate
-: ziggurat_portal(_G)
+: ziggurat_portal(_G, "deep")
MAP
...
..n..
@@ -130,14 +122,12 @@ ENDMAP
default-depth: D:3-20
NAME: enter_shallow_ziggurat_a
-CHANCE: 1%
-TAGS: chance_shallow_zig extra luniq_zig
COLOUR: ; : cyan / lightblue
COLOUR: ' = blue
FTILE: ; = floor_hall
SUBST: ' = .
SUBST: ; = .
-: ziggurat_portal(_G)
+: ziggurat_portal(_G, "shallow")
MAP
.......
.;;;;;.
@@ -154,7 +144,7 @@ TAGS: chance_shallow_zig extra luniq_zig no_trap_gen
MONS: angel / nothing w:20
KPROP: 1Om; = no_rtele_into
SUBST: ;=.
-: ziggurat_portal(_G)
+: ziggurat_portal(_G, "shallow")
MAP
...
..m..
@@ -173,7 +163,7 @@ TAGS: chance_shallow_zig extra luniq_zig no_trap_gen
MONS: angel / nothing w:20
KPROP: 1On; = no_rtele_into
SUBST: ;=.
-: ziggurat_portal(_G)
+: ziggurat_portal(_G, "shallow")
MAP
...
..n..
@@ -200,7 +190,7 @@ COLOUR: ' = blue
FTILE: ; = floor_hall
SUBST: ' = .
SUBST: ; = .
-: ziggurat_portal(_G)
+: ziggurat_portal(_G, "pan")
MAP
.......
.;;;;;.
@@ -220,7 +210,7 @@ COLOUR: _ : blue / lightred
COLOUR: ' = cyan
FTILE: ' = floor_hall, _ = floor_hall, ; = floor_hall, O = floor_hall
SUBST: '=. , ;=. , _=.
-: ziggurat_portal(_G)
+: ziggurat_portal(_G, "pan")
MAP
..'..
..'W'..
@@ -243,7 +233,7 @@ MONS: eye of draining / eye of devastation / giant eyeball / \
SHUFFLE: 123
SUBST: 1=1, 2=22.
KFEAT: m = iron_grate
-: ziggurat_portal(_G)
+: ziggurat_portal(_G, "pan")
MAP
...
..m..
@@ -267,7 +257,7 @@ MONS: eye of draining / eye of devastation / giant eyeball / \
SHUFFLE: 123
SUBST: 1=1.., 2=2., 3=33.
KFEAT: n = iron_grate
-: ziggurat_portal(_G)
+: ziggurat_portal(_G, "pan")
MAP
...
..n..
@@ -505,4 +495,4 @@ NAME: ziggurat1
PLACE: Zig
: ziggurat_level(_G)
MAP
-ENDMAP
+ENDMAP
\ No newline at end of file
diff --git a/crawl-ref/source/dat/dlua/ziggurat.lua b/crawl-ref/source/dat/dlua/ziggurat.lua
index aefa92f..f83bfa6 100644
--- a/crawl-ref/source/dat/dlua/ziggurat.lua
+++ b/crawl-ref/source/dat/dlua/ziggurat.lua
@@ -57,7 +57,7 @@ function callback.ziggurat_initialiser(portal)
end
-- Common setup for ziggurat entry vaults.
-function ziggurat_portal(e, portal_only)
+function ziggurat_portal(e, spawnrange)
local d = crawl.roll_dice
local entry_fee =
10 * math.floor(200 + d(3,200) / 3 + d(10) * d(10) * d(10))
@@ -76,11 +76,18 @@ function ziggurat_portal(e, portal_only)
onclimb = "callback.ziggurat_initialiser"
}
end
-
- if portal_only ~= nil then
- return stair()
- end
-
+
+ if spawnrange == "shallow" then
+ e.tags("chance_shallow_zig extra")
+ e.chance("1%")
+ elseif spawnrange == "deep" then
+ e.tags("chance_zig extra allow_dup luniq_zig")
+ e.chance("5%")
+ elseif spawnrange == "pan" then
+ e.tags("chance_pan_zig extra allow_dup")
+ e.chance("8%")
+ end
+
e.lua_marker("O", stair)
e.kfeat("O = enter_portal_vault")
e.tile("O = dngn_portal_ziggurat")
--
1.7.11.msysgit.1
