From d5fdd587187ff1b53bcc9cedf2ae867107243d5c Mon Sep 17 00:00:00 2001 From: Eino Keskitalo Date: Mon, 22 Feb 2010 09:22:29 +0200 Subject: [PATCH 1/2] Use epilogues for portal vault milestones and welcome messages. Signed-off-by: Eino Keskitalo --- crawl-ref/source/dat/des/portals/bailey.des | 35 +++++++++++- crawl-ref/source/dat/des/portals/bazaar.des | 78 +++++++++++++++++++++++++- crawl-ref/source/dat/des/portals/icecave.des | 18 ++++++ crawl-ref/source/dat/des/portals/ossuary.des | 28 +++++++++ crawl-ref/source/dat/des/portals/sewer.des | 31 ++++++++++ crawl-ref/source/dat/des/portals/trove.des | 36 ++++++++++++ crawl-ref/source/dat/des/portals/volcano.des | 30 ++++++++++ crawl-ref/source/dat/des/portals/wizlab.des | 66 +++++++++++++++++++++- 8 files changed, 318 insertions(+), 4 deletions(-) diff --git a/crawl-ref/source/dat/des/portals/bailey.des b/crawl-ref/source/dat/des/portals/bailey.des index a9ddf2e..814c07c 100644 --- a/crawl-ref/source/dat/des/portals/bailey.des +++ b/crawl-ref/source/dat/des/portals/bailey.des @@ -60,12 +60,15 @@ function bailey_portal_polearm(e) bailey_portal(e, 'polearm') end --- colours and milestone +-- colours function bailey_setup(e) e.kfeat("< = exit_portal_vault") e.colour("< = darkgrey") e.lrockcol("lightgrey") e.lfloorcol("white") +end + +function bailey_milestoone(e) crawl.mark_milestone("br.enter", "entered a Bailey.") end @@ -392,6 +395,9 @@ NSUBST: s = 1:T / *:. NSUBST: t = 1:T / *:. KFEAT: T = teleport trap : bailey_setup(_G) +epilogue{{ + : bailey_milestone(_G) +}} MAP ccccccccc ccccZcccc @@ -450,6 +456,9 @@ ITEM: potion of experience q:2 w:30 / potion of cure mutation q:3 w:30 /\ potion of gain intelligence q:8 / potion of gain strength q:8 /\ potion of gain dexterity q:8 : bailey_setup(_G) +epilogue{{ +: bailey_milestone(_G) +}} MAP ccc ccc ccccc ccc ccc cAccc1ccc2+2ccc1ccc1c @@ -497,6 +506,9 @@ KFEAT: T = teleport trap : hard_axe_fighter(_G) # : bailey_setup(_G) +epilogue{{ +: bailey_milestone(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxx.....xxxxxxxxxxx @@ -575,6 +587,9 @@ SUBST: N = nc SUBST: 2 = 223 # : bailey_setup(_G) +epilogue{{ +: bailey_milestone(_G) +}} MAP ccccccccccccccccccccccccccccccccccccccccccccccccccc cccccccccccccccccccccccccc..??.d.??dxxxxxxx @@ -699,7 +717,9 @@ KFEAT: B = antique weapon shop / weapon shop KFEAT: C = antique armour shop / armour shop ITEM: any weapon / w:2 good_item any weapon ITEM: any armour / w:2 good_item any armour +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxx xxxx>xxxx @@ -719,7 +739,9 @@ WEIGHT: 5 ORIENT: encompass SUBST: A = TVBG KFEAT: B = any shop +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxxxxxx xxxB.....Bxxx @@ -753,7 +775,9 @@ SUBST: w = l : end : end # +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxwwwwwxxxxxx @@ -786,7 +810,9 @@ SUBST: w = l : end : end # +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxx......>......xxxxxxxxxx @@ -819,7 +845,9 @@ ORIENT: encompass SHUFFLE: ABCD, EFGH SUBST: H=>, A=T, B=T KFEAT: CDEFG = any shop +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xx...xxxxxxxxxxxxxxxxxxxxxxxxx...xx @@ -855,7 +883,9 @@ ORIENT: encompass SHUFFLE: EFGH SUBST: H=>, D=T, C=T KFEAT: ABEFG = any shop +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xx...xxxxxxxxxxxxxxxxxxxxxxxxx...xx @@ -891,7 +921,9 @@ ORIENT: encompass SHUFFLE: EFGH SUBST: A=>, D=T, C=T KFEAT: BHEFG = any shop +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xx...xxxxxxxxxxxxxxxxxxxxxxxxx...xx @@ -927,7 +959,9 @@ ORIENT: encompass SHUFFLE: ABCDEF KFEAT: ABCDE = any shop SUBST: F = T +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xx...xxxxxxxxxxxxxxxxxxxxxxxxx...xx @@ -961,7 +995,9 @@ WEIGHT: 1 TAGS: bazaar no_rotate ORIENT: encompass KFEAT: CDEFG = any shop +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xx...xxxxxxxxxxxxxxxxxxxxxxxxx...xx @@ -1003,7 +1039,9 @@ KFEAT: C = any shop / distillery shop KFEAT: D = any shop / wand shop / food shop KFEAT: E = any shop / weapon shop / armour shop KFEAT: F = any shop / book shop / scroll shop +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @@ -1051,7 +1089,9 @@ SUBST: X = <, A = > SUBST: B : T G KFEAT: C = any shop KFEAT: D = weapon shop / book shop / jewellery shop +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x.xxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxxx.x @@ -1081,7 +1121,9 @@ SUBST: k : . x NSUBST: A = 2=T:30 V / *:C NSUBST: B = 1:< / > KFEAT: C = any shop +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xk.......kxxxxxxxxxk.......kxxxxxxxxxk.......kx @@ -1118,7 +1160,9 @@ SUBST: k : . x NSUBST: A = 2=T:30 V / *:C NSUBST: B = 1:< / > KFEAT: C = any shop +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xk.......kxxxxxxxxxk.......kxxxxxxxxxk.......kx @@ -1156,7 +1200,9 @@ SUBST: k : . x NSUBST: A = 1:< / 1= / 1=C> KFEAT: C = any shop +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xk.......kxxxxxxxxxk.......kxxxxxxxxxk.......kx @@ -1194,7 +1240,9 @@ SUBST: k : . x NSUBST: A = 1:< / 1= / 1=C> KFEAT: C = any shop +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xk.......kxxxxxxxxxk.......kxxxxxxxxxk.......kx @@ -1231,7 +1279,9 @@ SUBST: k : . x NSUBST: A = 1:< / 1:> / 1:T C / 3=T:30 V / *:C SUBST: B = > C:20 KFEAT: C = any shop +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xk.......kxxxxxxxxxk.......kxxxxxxxxxk.......kx @@ -1266,7 +1316,9 @@ WEIGHT: 5 ORIENT: encompass KFEAT: ! = any shop KFEAT: ? = any shop / T +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxx x.......x @@ -1294,7 +1346,9 @@ SUBST: "=l , '=. , A=l , B=! SUBST: "=. , '=l , A=! , B=l : end KFEAT: ! = jewellery shop / jewellery shop / wand shop / scroll shop / book shop +epilogue{{ : bazaar_message(_G) +}} : set_border_fill_type("lava") MAP lllllllllllllllllllllllllllllllllllll @@ -1374,7 +1428,9 @@ MONS: bush KFEAT: ! = any shop KFEAT: ? = any shop / . LFLOORCOL: green +epilogue{{ : bazaar_message(_G) +}} MAP ttttttttttttttt ttttttttttttttt @@ -1399,7 +1455,9 @@ WEIGHT: 5 ORIENT: encompass KFEAT: A = antique weapon shop KFEAT: B = antique armour shop +epilogue{{ : bazaar_message(_G) +}} MAP xxxxx xx...xx @@ -1438,7 +1496,9 @@ WEIGHT: 5 ORIENT: encompass KFEAT: ! = food shop KFEAT: ? = any shop / T +epilogue{{ : bazaar_message(_G) +}} MAP xxxxx xxxxx xxxxx xx...xxxxxxxxxxx...xxxxxxxxxxx...xx @@ -1485,7 +1545,9 @@ MONS: plant / bush w:5 KFEAT: ! = any shop LFLOORCOL: green SUBST: " = ....111t +epilogue{{ : bazaar_message(_G) +}} MAP """""""""""""""""""""""""""""""""< """""""""""""""""""""""""""""""""" @@ -1537,7 +1599,9 @@ SUBST: A = < KFEAT: B = any shop / antique armour shop / jewellery shop SUBST: C = > SUBST: D = T +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxAxxxC............+...xxxxxxxxx @@ -1587,7 +1651,9 @@ WEIGHT: 1 SHUFFLE: ABC SUBST: A = <, B = > KFEAT: C = any shop +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxCxxxxxxxxxxxxxx @@ -1618,7 +1684,9 @@ KFEAT: B = general shop / food shop KFEAT: C = scroll shop / book shop / distillery shop SHUFFLE: '" SUBST: '=+, "== +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx xE..xxxxxxx...xx.......xx...xxxxxxx..Ex @@ -1662,7 +1730,9 @@ SUBST: T = V T U:1 SHUFFLE: XY SUBST: X = T NSUBST: Y = 1:< / *:> +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxx'''...'''xxxxxxxx @@ -1700,7 +1770,9 @@ SUBST: . = 2 .:200 SUBST: ' = . SUBST: 3 = 2. MONS: oklob plant, plant +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxxxxxxx xxxxxxxxx.........xxxxxxxxx @@ -1736,7 +1808,9 @@ MARKER: d = lua:fog_machine { cloud_type = "mutagenic fog", \ size = 16, walk_dist = 0, spread_rate= 0 } ITEM: nothing NSUBST: < = 1:< / *:. +epilogue{{ : bazaar_message(_G) +}} MAP xxxxxxxxx xxxxxxxxx x.......x x.......x @@ -1770,7 +1844,9 @@ ORIENT: encompass WEIGHT: 1 KFEAT: ! = distillery shop / scroll shop / general shop KFEAT: ~ = teleport trap +epilogue{{ : bazaar_message(_G) +}} MAP xxxxx x...xxx @@ -1790,4 +1866,4 @@ xxxxx xx.xx xx.xx x...xxx x~x xxxxx xxx -ENDMAP \ No newline at end of file +ENDMAP diff --git a/crawl-ref/source/dat/des/portals/icecave.des b/crawl-ref/source/dat/des/portals/icecave.des index dfcf047..22c2246 100644 --- a/crawl-ref/source/dat/des/portals/icecave.des +++ b/crawl-ref/source/dat/des/portals/icecave.des @@ -306,7 +306,9 @@ SHUFFLE: "' SUBST: "=. , ':x .:1 : ice_cave_colours(_G) : ice_cave_random_monster_list_natural_giant(_G) +epilogue{{ : ice_cave_milestone(_G) +}} MONS: yak / wolf / polar bear w:4 MONS: polar bear MONS: frost giant @@ -387,7 +389,9 @@ SHUFFLE: "' SUBST: "=. , ':x .:1 : ice_cave_colours(_G) : dgn.set_random_mon_list("ice beast w:90 / ice dragon / nothing") +epilogue{{ : ice_cave_milestone(_G) +}} MONS: ice beast MONS: ice dragon MONS: ice beast generate_awake @@ -448,7 +452,9 @@ SUBST: - = ........- KFEAT: - = alarm trap : ice_cave_colours(_G) : ice_cave_random_monster_list_undead_necromancer(_G) +epilogue{{ : ice_cave_milestone(_G) +}} MONS: ice beast MONS: white imp MONS: freezing wraith @@ -624,7 +630,9 @@ MONS: ice fiend w:2 / necromancer ITEM: any potion / any scroll / any weapon good_item / any armour good_item KFEAT: ' = alarm trap / net trap / arrow trap / bolt trap w:5 / floor w:5 : ice_cave_colours(_G) +epilogue{{ : ice_cave_milestone(_G) +}} : ice_cave_random_monster_list_undead_demon(_G) MAP xxxxx @@ -698,7 +706,9 @@ SUBST: - = x SUBST: _ = w : end : ice_cave_colours(_G) +epilogue{{ : ice_cave_milestone(_G) +}} # Two different populations: undead/demon and natural/giant. : if crawl.coinflip() then : ice_cave_random_monster_list_undead_demon(_G) @@ -805,7 +815,9 @@ SUBST: '=x , -=. SUBST: '=. , -=x : end : ice_cave_colours(_G) +epilogue{{ : ice_cave_milestone(_G) +}} MAP xxxxxxxxxx xxxxxxxxxxxxxxxxxxxxx xxxxxxxxx xxxxxxxx xxxxxxxx x::xxwwwwxxx.x.'x-;x5;;5xxwwwwwxxx1;;;x;Wxxxxxx15415;xx xx......xx @@ -887,7 +899,9 @@ SUBST: '=x , -=. SUBST: '=. , -=x : end : ice_cave_colours(_G) +epilogue{{ : ice_cave_milestone(_G) +}} MAP xxxxx xx.x.xx xxxxxxxxxx @@ -970,7 +984,9 @@ SUBST: M = . SUBST: m = . : dgn.set_random_mon_list("ice beast w:90 / nothing") : ice_cave_colours(_G) +epilogue{{ : ice_cave_milestone(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxxxccccccccccccccccccccccccc xxx.........xxxxxxxxxxxccccccccccccc.........ccc @@ -996,7 +1012,9 @@ ORIENT: encompass MONS: ice beast, ice statue : dgn.set_random_mon_list("ice beast w:90 / nothing") : ice_cave_colours(_G) +epilogue{{ : ice_cave_milestone(_G) +}} MAP ccccccccccc c|*.....*|c diff --git a/crawl-ref/source/dat/des/portals/ossuary.des b/crawl-ref/source/dat/des/portals/ossuary.des index 6e89035..29b1a9b 100644 --- a/crawl-ref/source/dat/des/portals/ossuary.des +++ b/crawl-ref/source/dat/des/portals/ossuary.des @@ -191,7 +191,9 @@ MONS: rat zombie / jackal zombie / snake zombie / goblin zombie / \ human zombie / elf zombie / centaur zombie MONS: kobold zombie / orc zombie / hobgoblin zombie : ossuary_setup_features(_G) +epilogue{{ : ossuary_milestone(_G) +}} MAP xxxxxxxxxxxxxxxxxxxxxx x.........