[crawl-ref-commits] master branch updated: 0.10-a0-1602-g03a7e9c

[<gi...@cr...>]

       via  03a7e9caa1cd2e0dd10f39d36b0b59228f3387b9 (commit)
       via  3f6e89c32902e3d0fcb741d9e4b83b720f77adf6 (commit)
       via  b5d04e099809c80e6ae1a680ca713d8390480605 (commit)
      from  1a5a63f3aa1f7411ae80b929575800377b25d03c (commit)

-----------------------------------------------------------------------
commit 03a7e9caa1cd2e0dd10f39d36b0b59228f3387b9
Author: Frank Benkstein <fr...@be...>
Date:   Sat Oct 29 09:12:26 2011 +0200

    show the item's name if you're throwing stuff at yourself

commit 3f6e89c32902e3d0fcb741d9e4b83b720f77adf6
Author: Michael Gagno <evi...@gm...>
Date:   Sat Oct 29 19:28:16 2011 -0700

    Buff door vaults.
    
    They were good in D and Vaults but fairly wimpy elsewhere. This makes it so the
    monsters are always a bit scary. Also, the weight of a variant door vault is
    reduced.

commit b5d04e099809c80e6ae1a680ca713d8390480605
Author: Chris Campbell <chr...@gm...>
Date:   Sun Oct 30 12:21:22 2011 +0000

    Improve the description for Enter the Abyss

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/beam.cc                           |    6 ++-
 .../source/dat/des/variable/mini_monsters.des      |   30 ++++++++++++++++++-
 crawl-ref/source/dat/descript/ability.txt          |    2 +-
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 1f47f9a..f9f8a80 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -3065,8 +3065,10 @@ void bolt::tracer_affect_player()
         // Don't ask if we're aiming at ourselves.
         if (!dont_stop_player && !harmless_to_player())
         {
-            if (yesno("That beam is likely to hit you. Continue anyway?",
-                      false, 'n'))
+            std::string prompt = make_stringf("That %s is likely to hit you. Continue anyway?",
+                                              item ? name.c_str() : "beam");
+
+            if (yesno(prompt.c_str(), false, 'n'))
             {
                 friend_info.count++;
                 friend_info.power += you.experience_level;
diff --git a/crawl-ref/source/dat/des/variable/mini_monsters.des b/crawl-ref/source/dat/des/variable/mini_monsters.des
index 849b6cc..b59a263 100644
--- a/crawl-ref/source/dat/des/variable/mini_monsters.des
+++ b/crawl-ref/source/dat/des/variable/mini_monsters.des
@@ -2720,9 +2720,34 @@ ENDMAP
 # gate that opens all at once.
 NAME:   minivault_9
 TAGS:   allow_dup
-DEPTH:  D:15-27, Elf, Vault, Crypt, Dis, Geh, Tar, Coc
+DEPTH:  D:15-27, Elf, Vault, Crypt, Dis, Geh, Tar, Coc, Zot
 MARKER: X = lua: props_marker { connected_exclude="true" }
 SUBST:  X = =
+# Pick interesting monsters for dungeon branches. Vaults and D get normal OOD.
+: if you.branch() == "Elf" then
+KMONS:  8 = deep elf annihilator / deep elf blademaster / deep elf master archer / \
+            deep elf sorcerer / deep elf death mage / deep elf demonologist / \
+            deep elf high priest / w:20 place:Elf
+: elseif you.branch() == "Crypt" then
+KMONS:  8 = bone dragon / lich / ancient lich / w:5 death cob / w:5 curse toe / \
+            w:5 large zombie / w:5 large skeleton / eidolon / w:20 reaper / \
+            soul eater / w:30 place:Crypt
+: elseif you.branch() == "Dis" then
+KMONS:  8 = w:5 shadow fiend / w:5 ice fiend / w:5 brimstone fiend / w:5 pit fiend / \
+            iron dragon / tormentor / iron golem / place:Dis
+: elseif you.branch() == "Geh" then
+KMONS:  8 = brimstone fiend / w:5 pit fiend / hellion / balrug / fire giant / \
+            place:Geh
+: elseif you.branch() == "Tar" then
+KMONS:  8 = w:15 shadow fiend / reaper / w:5 soul eater / shadow dragon / lich / \
+            ancient lich / w:15 place:Tar
+: elseif you.branch() == "Coc" then
+KMONS:  8 = w:15 blizzard demon / frost giant / w:5 titan / w:15 ice fiend / \
+            w:5 large simulacrum / place:Coc
+: elseif you.branch() == "Zot" then
+KMONS:  8 = w:35 nonbase draconian / orb of fire / electric golem / killer klown / \
+            death cob / w:5 curse toe / w:5 ancient lich
+: end
 MAP
 XXXXXXXXXX
 XXXXXXXXXX
@@ -2738,7 +2763,8 @@ ENDMAP
 
 # No, John. You are the door vault
 NAME:   reverse_minivault_9
-DEPTH:  D:15-27, Elf, Vault, Crypt, Dis, Geh, Tar, Coc
+DEPTH:  D:15-27, Vault
+WEIGHT: 4
 MARKER: X = lua: props_marker { connected_exclude="true" }
 SUBST:  X = =
 MAP
diff --git a/crawl-ref/source/dat/descript/ability.txt b/crawl-ref/source/dat/descript/ability.txt
index 2f697bc..308d4cf 100644
--- a/crawl-ref/source/dat/descript/ability.txt
+++ b/crawl-ref/source/dat/descript/ability.txt
@@ -304,7 +304,7 @@ Corrupt the current level by unleashing Abyssal energies on it. This will cause
 %%%%
 Enter the Abyss
 
-Transfer yourself to Lugonu's realm instantly... at a cost.
+Transfer yourself to Lugonu's realm instantly... at the cost of permanently reducing your maximum health and magic. The effort of even using the ability will leave your health and magic depleted.
 %%%%
 # Nemelex Xobeh
 Draw One


-- 
Dungeon Crawl Stone Soup