summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/source/dat/database/quotes.txt9
-rw-r--r--crawl-ref/source/dungeon.cc7
-rw-r--r--crawl-ref/source/monplace.cc9
-rw-r--r--crawl-ref/source/monplace.h1
4 files changed, 25 insertions, 1 deletions
diff --git a/crawl-ref/source/dat/database/quotes.txt b/crawl-ref/source/dat/database/quotes.txt
index c99dd35037..0bd7e9391a 100644
--- a/crawl-ref/source/dat/database/quotes.txt
+++ b/crawl-ref/source/dat/database/quotes.txt
@@ -707,6 +707,15 @@ jelly
A splotch, a blotch..."
-Burt Bacharach, "Beware of the Blob"
%%%%
+Khufu
+
+"And then I looked farther, beyond the pallid line of the sands,
+ and I saw a Pyramid of gold, the wonder Khufu had built. As a
+ golden wonder it saluted me, as a golden thing it greeted me,
+ as a golden miracle I shall remember it."
+
+ -Robert Hichens, _The Spell of Egypt_
+%%%%
kraken
"... Kraken, also called the Crab-fish, which [according to the pilots of
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 5fe5d766ec..8f8cee0e81 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -3287,7 +3287,7 @@ static bool _make_room(int sx,int sy,int ex,int ey,int max_doors, int doorlevel)
}
// Doesn't include Polyphemus or Ilsuiw (only appear in the Shoals),
-// Dissolution (Slime), Murray (Hell), or Tiamat (Zot).
+// Dissolution (Slime), Murray (Hell), Khufu(Tomb/Crypt) or Tiamat (Zot).
// NOTE: The Lernaean hydra should *never* be randomly generated.
// The Royal jelly likewise is only placed via Slime end vault.
// Dowan is automatically placed together with Duvessa.
@@ -3387,6 +3387,11 @@ static monster_type _pick_unique(int lev)
else if (player_branch_depth() > 2 && coinflip())
which_unique = MONS_ILSUIW;
}
+ else if (player_in_branch(BRANCH_TOMB) || player_in_branch(BRANCH_CRYPT))
+ {
+ if (one_chance_in(10))
+ which_unique = MONS_KHUFU;
+ }
return static_cast<monster_type>(which_unique);
}
diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc
index 1c9d16edd8..f300baa4ce 100644
--- a/crawl-ref/source/monplace.cc
+++ b/crawl-ref/source/monplace.cc
@@ -1895,6 +1895,11 @@ static band_type _choose_band(int mon_type, int power, int &band_size)
band = BAND_DUVESSA;
band_size = 1;
break;
+
+ case MONS_KHUFU:
+ band = BAND_KHUFU;
+ band_size = 3;
+ break;
} // end switch
if (band != BAND_NO_BAND && band_size == 0)
@@ -2197,6 +2202,10 @@ static monster_type _band_member(band_type band, int power)
mon_type = MONS_DOWAN;
break;
+ case BAND_KHUFU:
+ mon_type = coinflip()? MONS_GREATER_MUMMY : MONS_MUMMY;
+ break;
+
default:
break;
}
diff --git a/crawl-ref/source/monplace.h b/crawl-ref/source/monplace.h
index 9c22d30530..b7c348bd00 100644
--- a/crawl-ref/source/monplace.h
+++ b/crawl-ref/source/monplace.h
@@ -65,6 +65,7 @@ enum band_type
BAND_ILSUIW,
BAND_AZRAEL,
BAND_DUVESSA, // 50
+ BAND_KHUFU,
NUM_BANDS // always last
};