summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-06 01:03:38 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-06 01:03:38 +0000
commita4e8c54ac5ddc996f16ff6f33ba1b486ada4f490 (patch)
treec90b0259978acac88bb89ada4b159895549cb32c
parentbadfa07bf589777a06a19e37568700e9f3c259e1 (diff)
downloadcrawl-ref-a4e8c54ac5ddc996f16ff6f33ba1b486ada4f490.tar.gz
crawl-ref-a4e8c54ac5ddc996f16ff6f33ba1b486ada4f490.zip
Backport part of trunk r9886 to 0.5.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@9901 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/dungeon.cc26
1 files changed, 13 insertions, 13 deletions
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index b33a6cccaf..711521ed83 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -3260,28 +3260,28 @@ static monster_type _choose_unique_by_depth(int step)
break;
case 3: // depth <= 13
ret = random_choose(MONS_PSYCHE, MONS_EROLCHA, MONS_DONALD, MONS_URUG,
- MONS_MICHAEL, MONS_EUSTACHIO, MONS_SONJA, -1);
+ MONS_MICHAEL, MONS_EUSTACHIO, MONS_SONJA,
+ MONS_JOSEPH, MONS_ERICA, MONS_JOSEPHINE,
+ MONS_HAROLD, MONS_NORBERT, MONS_JOZEF, -1);
break;
case 4: // depth <= 16
- ret = random_choose(MONS_URUG, MONS_MICHAEL, MONS_JOSEPH, MONS_SNORG,
- MONS_ERICA, MONS_JOSEPHINE, MONS_HAROLD,
- MONS_NORBERT, MONS_JOZEF, MONS_EUSTACHIO,
- MONS_SONJA, MONS_AZRAEL, MONS_NESSOS, -1);
+ ret = random_choose(MONS_URUG, MONS_MICHAEL, MONS_EUSTACHIO, MONS_SONJA,
+ MONS_SNORG, MONS_ERICA, MONS_JOSEPHINE, MONS_HAROLD,
+ MONS_ROXANNE, MONS_RUPERT, MONS_NORBERT, MONS_JOZEF,
+ MONS_AZRAEL, MONS_NESSOS, MONS_AGNES,
+ MONS_MAUD, MONS_LOUISE, MONS_NERGALLE, -1);
break;
case 5: // depth <= 19
- ret = random_choose(MONS_SNORG, MONS_ERICA, MONS_JOSEPHINE,
- MONS_HAROLD, MONS_NORBERT, MONS_JOZEF, MONS_AGNES,
- MONS_MAUD, MONS_LOUISE, MONS_FRANCIS, MONS_FRANCES,
+ ret = random_choose(MONS_SNORG, MONS_LOUISE, MONS_FRANCIS, MONS_FRANCES,
+ MONS_RUPERT, MONS_WAYNE, MONS_DUANE, MONS_NORRIS,
MONS_AZRAEL, MONS_NESSOS, MONS_NERGALLE,
MONS_ROXANNE, MONS_SAINT_ROKA, -1);
break;
case 6: // depth > 19
default:
- ret = random_choose(MONS_LOUISE, MONS_FRANCIS, MONS_FRANCES,
- MONS_RUPERT, MONS_WAYNE, MONS_DUANE, MONS_XTAHUA,
- MONS_NORRIS, MONS_FREDERICK, MONS_MARGERY,
- MONS_BORIS, MONS_NERGALLE, MONS_ROXANNE,
- MONS_SAINT_ROKA, -1);
+ ret = random_choose(MONS_FRANCIS, MONS_FRANCES, MONS_WAYNE, MONS_DUANE,
+ MONS_XTAHUA, MONS_NORRIS, MONS_FREDERICK,
+ MONS_MARGERY, MONS_BORIS, MONS_SAINT_ROKA, -1);
}
return static_cast<monster_type>(ret);