diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-03-22 18:14:01 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-03-22 18:14:01 +0000 |
| commit | 9ca6585bfe5e91e0687ef4c792e11e36373bb3cd (patch) | |
| tree | 6f5b6f14ae4eec6d0e9c90e6c3e45fab9a077a04 | |
| parent | 61de58e39630e30997d53b562bf94b4f8386796d (diff) | |
| download | crawl-ref-9ca6585bfe5e91e0687ef4c792e11e36373bb3cd.tar.gz crawl-ref-9ca6585bfe5e91e0687ef4c792e11e36373bb3cd.zip | |
Added island Lair entry (Erik).
Changed orc sorcerers in Orc entries to wargs.
The dungeon builder did not check whether a unique requested by a map was
already generated, fixed.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1078 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/dat/splev.des | 31 | ||||
| -rw-r--r-- | crawl-ref/source/dungeon.cc | 3 |
2 files changed, 32 insertions, 2 deletions
diff --git a/crawl-ref/source/dat/splev.des b/crawl-ref/source/dat/splev.des index 0aecc530c6..5a2719f486 100644 --- a/crawl-ref/source/dat/splev.des +++ b/crawl-ref/source/dat/splev.des @@ -2517,7 +2517,7 @@ ENDMAP NAME: david_orc_1_choice TAGS: orc_entry -MONS: orc, orc sorcerer / orc priest / orc warrior, orc warrior / orc +MONS: orc, warg / orc priest / orc warrior, orc warrior / orc ITEM: scroll of blinking / scroll of recharging / scroll of fear ITEM: scroll of teleport / scroll of remove curse / scroll of identify ORIENT: float @@ -2570,7 +2570,7 @@ ENDMAP NAME: david_orc_3 TAGS: orc_entry MONS: weight:80 nothing / weight:50 orc / orc priest / orc wizard / orc warrior -MONS: nothing / orc warrior / orc sorcerer / orc priest +MONS: nothing / orc warrior / warg / orc priest ORIENT: float CHANCE: 30 MAP @@ -2780,6 +2780,33 @@ x?xxxx?xxxxx?x xxxxxxxxx?xxxx ENDMAP +######################################################################## +# Welcome to Lair Island. We make great pancakes. + +NAME: erik_lair_3 +TAGS: lair_entry +MONS: weight:50 troll / Snorg, weight:30 hound / jackal / weight:20 war dog +ORIENT: float +SUBST: ? = w. + +MAP +.@........ww?www?..... +..?.?.?..wwwwwww.?..?. +..??w..wwwwwwwww?.??.. +...??w.wwwwwww??www?.. +...wwwwwwwwwwwwwww??.. +..wwwwww?wwwww2wwww..@ +..wwwwwwww....wwww???. +......1..2.2O2.wwww... +..?wwwww???2.2www.ww?. +.....wwww2..w.2www.... +..wwwwwwwww?.wwww???.. +@..wwwwwwwwwwwwwww.... +....?ww..ww?www..w.... +....?......??.w..???.. +...........?...@...... +ENDMAP + ############################################################################## # Hive entries ############################################################################## diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index 5a888473f9..959aa7d6ff 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -6036,6 +6036,9 @@ static void dngn_place_monster( if (mid != RANDOM_MONSTER && mid < NUM_MONSTERS) { + if (mons_is_unique(mid) && you.unique_creatures[mid]) + return; + const int habitat = monster_habitat(mid); if (habitat != DNGN_FLOOR) grd[vx][vy] = habitat; |