summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/enum.h
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-07-02 19:25:57 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-07-02 19:25:57 +0000
commita065b3c3384ff85750be7126ffbb3f2df5f2d375 (patch)
treed31917f236555906158fdeb77ae5c1665030dc8f /crawl-ref/source/enum.h
parent79b728ec3b58721a1cad10f26f3f1d8fb259a254 (diff)
downloadcrawl-ref-a065b3c3384ff85750be7126ffbb3f2df5f2d375.tar.gz
crawl-ref-a065b3c3384ff85750be7126ffbb3f2df5f2d375.zip
Experimental monster weapon swapping implementation. Allow monsters to use
throwing weapons (hand axes, spears, clubs, daggers). Give orcs and orc warriors a chance of being generated with throwing weapons (axes or spears). Throwing weapons are stacked in monster inventory, but unstack when dropped. We may want to consider fully stackable throwing weapons at some point. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1717 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/enum.h')
-rw-r--r--crawl-ref/source/enum.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 4cf476bef2..0dc20e6ff4 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -1907,7 +1907,6 @@ enum mons_class_flags
M_EVIL = (1<<20), // monster vulnerable to holy spells
M_UNIQUE = (1<<21), // monster is a unique
-
M_ACID_SPLASH = (1<<22), // Passive acid splash when hit.
M_SPECIAL_ABILITY = (1<<26), // XXX: eventually make these spells?
@@ -2480,17 +2479,20 @@ enum mon_holy_type // matches (char) H_foo in mon-util.h, see: monster_holiness(
MH_PLANT // plants
};
+// Adding slots breaks saves. YHBW.
enum mon_inv_type // (int) menv[].inv[]
{
- MSLOT_WEAPON,
- MSLOT_MISSILE, // although it is a second weapon for MONS_TWO_HEADED_OGRE - how to reconcile cleanly? {dlb}
+ MSLOT_WEAPON, // Primary weapon (melee)
+ MSLOT_ALT_WEAPON, // Alternate weapon, ranged or second melee weapon
+ // for monsters that can use two weapons.
+ MSLOT_MISSILE,
MSLOT_ARMOUR,
- MSLOT_MISCELLANY, //mv: used for misc. obj. (7 Aug 2001)
- MSLOT_POTION, // mv: now used only for potions (7 Aug 2001)
- MSLOT_WAND, //
+ MSLOT_MISCELLANY,
+ MSLOT_POTION,
+ MSLOT_WAND,
MSLOT_SCROLL,
- MSLOT_GOLD, //mv: used for money :) (7 Aug 2001)
- NUM_MONSTER_SLOTS = 8 // value must remain 8 for savefile compatibility {dlb}
+ MSLOT_GOLD,
+ NUM_MONSTER_SLOTS
};
// order of these is important: