diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-26 14:20:52 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-26 14:20:52 +0000 |
| commit | 3436bd49da7371d47a2cf0075c0a2527e405fdb5 (patch) | |
| tree | a55fb14cda74ef90206d025bdd5acb7ea9830321 /crawl-ref/source | |
| parent | 7341a7d51c8437d5a5edff6df6a3604c28358f6f (diff) | |
| download | crawl-ref-3436bd49da7371d47a2cf0075c0a2527e405fdb5.tar.gz crawl-ref-3436bd49da7371d47a2cf0075c0a2527e405fdb5.zip | |
The royal jelly can no longer regenerate (dpeg).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4665 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/mon-data.h | 3 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.h | 1 | ||||
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 86ea5fcd0f..dda352b661 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -2191,7 +2191,8 @@ { MONS_ROYAL_JELLY, 'J', YELLOW, "royal jelly", - M_NO_SKELETON | M_SENSE_INVIS | M_SPECIAL_ABILITY | M_ACID_SPLASH, + M_NO_SKELETON | M_SENSE_INVIS | M_SPECIAL_ABILITY | M_ACID_SPLASH + | M_NO_REGEN, MR_RES_POISON | MR_RES_ASPHYX | MR_RES_ACID, 0, 20, MONS_JELLY, MONS_ROYAL_JELLY, MH_NATURAL, -7, { {AT_HIT, AF_ACID, 50}, {AT_HIT, AF_ACID, 30}, AT_NO_ATK, AT_NO_ATK }, diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h index b5e67283d2..34089fd724 100644 --- a/crawl-ref/source/mon-util.h +++ b/crawl-ref/source/mon-util.h @@ -121,6 +121,7 @@ enum mons_class_flags M_TWOWEAPON = (1<<25), // wields two weapons at once M_SPECIAL_ABILITY = (1<<26), // XXX: eventually make these spells? + M_NO_REGEN = (1<<27), // cannot regenerate M_NO_SKELETON = (1<<29), // boneless corpses M_NO_EXP_GAIN = (1<<31) // worth 0 xp diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 63b14af650..c8e3c8b05c 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -4617,7 +4617,8 @@ static inline bool _mons_natural_regen_roll(monsters *monster) // Do natural regeneration for monster. static void _monster_regenerate(monsters *monster) { - if (monster->has_ench(ENCH_SICK)) + if (monster->has_ench(ENCH_SICK) + || mons_class_flag(monster->type, M_NO_REGEN)) return; // Non-land creatures out of their element cannot regenerate. |