summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/enum.h
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-07-03 17:59:49 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-07-03 17:59:49 +0000
commit718202ee6b6445890db808f4420073e2cce506c2 (patch)
tree2640787ddfef39aca363946a32a05df0ae62c62e /crawl-ref/source/enum.h
parent589e206de3965240ac0475dcc98b339914ace70b (diff)
downloadcrawl-ref-718202ee6b6445890db808f4420073e2cce506c2.tar.gz
crawl-ref-718202ee6b6445890db808f4420073e2cce506c2.zip
Manual update (David).
Added javelins and sling bullets. Only Urug gets javelins at the moment. No monster gets sling bullets, but they can be randomly generated. Added deep elf blademasters and master archers to provide Silence-users some entertainment on Elf:7. I've adjusted the non-rogue-layout Elf:7s to use blademasters. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1732 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/enum.h')
-rw-r--r--crawl-ref/source/enum.h14
1 files changed, 12 insertions, 2 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index af60786a08..fe69a86ab6 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -1310,6 +1310,7 @@ enum fire_type
FIRE_DART,
FIRE_STONE,
FIRE_DAGGER,
+ FIRE_JAVELIN,
FIRE_SPEAR,
FIRE_HAND_AXE,
FIRE_CLUB,
@@ -1873,7 +1874,9 @@ enum missile_type
MI_BOLT,
MI_DART,
MI_NEEDLE,
- MI_LARGE_ROCK, //jmf: it'd be nice to move MI_LARGE_ROCK to DEBRIS_ROCK
+ MI_LARGE_ROCK,
+ MI_SLING_BULLET,
+ MI_JAVELIN,
NUM_MISSILES,
MI_NONE // was MI_EGGPLANT... used for launch type detection
};
@@ -1909,6 +1912,8 @@ enum mons_class_flags
M_UNIQUE = (1<<21), // monster is a unique
M_ACID_SPLASH = (1<<22), // Passive acid splash when hit.
+ M_ARCHER = (1<<23), // gets various archery boosts
+
M_SPECIAL_ABILITY = (1<<26), // XXX: eventually make these spells?
M_NO_SKELETON = (1<<29), // boneless corpses
@@ -2260,6 +2265,9 @@ enum monster_type // (int) menv[].type
MONS_MURRAY,
MONS_TIAMAT,
+ MONS_DEEP_ELF_BLADEMASTER,
+ MONS_DEEP_ELF_MASTER_ARCHER,
+
// The Lords of Hell:
MONS_GERYON = 340, // 340
MONS_DISPATER,
@@ -2372,7 +2380,9 @@ enum mon_attack_type
AT_ENGULF,
AT_CLAW,
AT_TAIL_SLAP,
- AT_BUTT
+ AT_BUTT,
+
+ AT_SHOOT // attack representing missile damage for M_ARCHER
};
enum mon_attack_flavour