diff options
| author | Shmuale Mark <shm.mark@gmail.com> | 2014-06-11 09:54:49 -0400 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-06-11 09:54:49 -0400 |
| commit | 2cf48292452445b275df5d685341c721aadafa5e (patch) | |
| tree | 1c4fce0323717e30e26e89d2eeeb17e9f5c35eb7 /crawl-ref/source/enum.h | |
| parent | 3208b8c6f14b47ebc069ae040432dc5f15435bfb (diff) | |
| parent | e9415a749937a864f07066d4fd07b66b538b3f5c (diff) | |
| download | crawl-ref-2cf48292452445b275df5d685341c721aadafa5e.tar.gz crawl-ref-2cf48292452445b275df5d685341c721aadafa5e.zip | |
Merge branch 'mon-pickup'
The problem with monster pickup of the type that this branch removes
is that it encourages tedious behaviour to achieve the optimum result.
While in general people don't bother to pick up every weapon and armour
and stuff it upstairs, that would be a way to prevent monsters from ever
picking up items you've seen. With Apportation, you don't even have to
reach the item, and on a mummy, say, you don't even have to worry about
the infintesimal food cost. People do already do this for chaos and
distortion weapons, and it is not a very good thing.
Not allowing allies to pick up items is related, in that it means that the
code can be simpler, but it also has problems of micromanagement,
weirdnesses with the ctrl-T command, and allies already have their share
of problems. I hope that the compensations for Beogh and mercenaries make
up for what is lost in terms of fun.
Conflicts:
crawl-ref/source/tag-version.h
Diffstat (limited to 'crawl-ref/source/enum.h')
| -rw-r--r-- | crawl-ref/source/enum.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index f5f531bd43..4b4c30b0c0 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -163,6 +163,7 @@ enum ability_type // Beogh ABIL_BEOGH_SMITING = 1120, ABIL_BEOGH_RECALL_ORCISH_FOLLOWERS, + ABIL_BEOGH_GIFT_ITEM, // Jiyva ABIL_JIYVA_CALL_JELLY = 1130, ABIL_JIYVA_JELLY_PARALYSE, @@ -751,7 +752,6 @@ enum command_type CMD_GO_UPSTAIRS, CMD_GO_DOWNSTAIRS, CMD_TOGGLE_AUTOPICKUP, - CMD_TOGGLE_FRIENDLY_PICKUP, CMD_TOGGLE_VIEWPORT_MONSTER_HP, CMD_TOGGLE_TRAVEL_SPEED, CMD_PICKUP, @@ -2069,9 +2069,7 @@ enum item_status_flag_type // per item flags: ie. ident status, cursed status ISFLAG_NOTED_ID = 0x08000000, ISFLAG_NOTED_GET = 0x10000000, -#if TAG_MAJOR_VERSION == 34 - ISFLAG_UNUSED = 0x20000000, // was ISFLAG_BEEN_IN_INV -#endif + ISFLAG_SEEN = 0x20000000, // has it been seen ISFLAG_SUMMONED = 0x40000000, // Item generated on a summon ISFLAG_DROPPED_BY_ALLY = 0x80000000, // Item was dropped by an ally }; @@ -4263,14 +4261,6 @@ enum unique_item_status_type UNIQ_LOST_IN_ABYSS = 2, }; -enum friendly_pickup_type -{ - FRIENDLY_PICKUP_NONE = 0, - FRIENDLY_PICKUP_FRIEND, - FRIENDLY_PICKUP_PLAYER, - FRIENDLY_PICKUP_ALL, -}; - enum zap_type { ZAP_THROW_FLAME, |