diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-12 03:57:11 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-12 03:57:11 +0000 |
| commit | a6b399eae4cd72f6bc2f077a694ecf5ef6b75ffc (patch) | |
| tree | 5f9ce43c244881192bede86434a5e8382c85fb15 /crawl-ref/source/enum.h | |
| parent | 662e3cb4688c794cfb3294772cc49b96e5311bb8 (diff) | |
| download | crawl-ref-a6b399eae4cd72f6bc2f077a694ecf5ef6b75ffc.tar.gz crawl-ref-a6b399eae4cd72f6bc2f077a694ecf5ef6b75ffc.zip | |
Overhaul god gift handling again so that we can tell which god sent
which gift. There was an unused god parameter in the monsters struct,
which was probably intended to hold which god a monster worshipped.
I've used it as an indicator of which god sent the monster, under the
assumption that gods would send their own worshippers as gifts. (I hope
this isn't an abuse of it.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5748 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/enum.h')
| -rw-r--r-- | crawl-ref/source/enum.h | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 6dc9dca27e..09e084eb4b 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -1898,27 +1898,26 @@ enum mon_flight_type enum monster_flag_type { MF_CREATED_FRIENDLY = 0x01, // no benefit from killing - MF_GOD_GIFT = 0x02, // player not penalized by its death - MF_BATTY = 0x04, // flutters like a bat - MF_JUST_SUMMONED = 0x08, // monster skips next available action - MF_TAKING_STAIRS = 0x10, // is following player through stairs + MF_BATTY = 0x02, // flutters like a bat + MF_JUST_SUMMONED = 0x04, // monster skips next available action + MF_TAKING_STAIRS = 0x08, // is following player through stairs - MF_INTERESTING = 0x20, // Player finds monster interesting - MF_SEEN = 0x40, // Player already seen monster - MF_DIVINE_PROTECTION = 0x80, // Monster has divine protection. + MF_INTERESTING = 0x10, // Player finds monster interesting + MF_SEEN = 0x20, // Player already seen monster + MF_DIVINE_PROTECTION = 0x40, // Monster has divine protection. - MF_KNOWN_MIMIC = 0x100, // Mimic that has taken a swing at the PC, + MF_KNOWN_MIMIC = 0x80, // Mimic that has taken a swing at the PC, // or that the player has inspected with ? - MF_BANISHED = 0x200, // Monster that has been banished. - MF_HARD_RESET = 0x400, // Summoned, should not drop gear on reset - MF_WAS_NEUTRAL = 0x800, // mirror to CREATED_FRIENDLY for neutrals - MF_ATT_CHANGE_ATTEMPT = 0x1000, // Saw player and attitude changed (or + MF_BANISHED = 0x100, // Monster that has been banished. + MF_HARD_RESET = 0x200, // Summoned, should not drop gear on reset + MF_WAS_NEUTRAL = 0x400, // mirror to CREATED_FRIENDLY for neutrals + MF_ATT_CHANGE_ATTEMPT = 0x800, // Saw player and attitude changed (or // not); currently used for holy beings // (good god worshippers -> neutral) // and orcs (Beogh worshippers -> friendly) - MF_WAS_IN_VIEW = 0x2000, // Was in view during previous turn - MF_BAND_MEMBER = 0x4000, // Created as a member of a band - MF_GOT_HALF_XP = 0x8000 // Player already got half xp value earlier + MF_WAS_IN_VIEW = 0x1000, // Was in view during previous turn + MF_BAND_MEMBER = 0x2000, // Created as a member of a band + MF_GOT_HALF_XP = 0x4000 // Player already got half xp value earlier }; // Adding slots breaks saves. YHBW. |