diff options
| author | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2009-11-04 20:09:46 +0530 |
|---|---|---|
| committer | Darshan Shaligram <dshaligram@users.sourceforge.net> | 2009-11-04 20:15:34 +0530 |
| commit | 9ad85435681ad82c7ef07d2083e40e525e2b0f55 (patch) | |
| tree | 3b16cb1129c004ad90cce5c81486373557d5f272 /crawl-ref/source/mon-act.cc | |
| parent | f7c29d55ca91d539d64de5e120a5b2c301ccb938 (diff) | |
| download | crawl-ref-9ad85435681ad82c7ef07d2083e40e525e2b0f55.tar.gz crawl-ref-9ad85435681ad82c7ef07d2083e40e525e2b0f55.zip | |
Allow vaults to override monster spells with spells:<xyz>
Vaults can now override monster spell sets, or give non-casting monsters
spells, and mark monsters as wizard or priest types.
The M_ACTUAL_SPELLS, M_SPELLCASTER and M_PRIEST monster class flags are
converted into MF_* flags at monster creation/polymorph time, and only the
per-monster flags are checked when determining wizard/priestliness. See caveats
in level_design.txt.
Diffstat (limited to 'crawl-ref/source/mon-act.cc')
| -rw-r--r-- | crawl-ref/source/mon-act.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc index d6ed4632a8..daa4a50577 100644 --- a/crawl-ref/source/mon-act.cc +++ b/crawl-ref/source/mon-act.cc @@ -167,8 +167,7 @@ static bool _swap_monsters(monsters* mover, monsters* moved) static bool _do_mon_spell(monsters *monster, bolt &beem) { // Shapeshifters don't get spells. - if (!mons_is_shapeshifter(monster) - || !mons_class_flag(monster->type, M_ACTUAL_SPELLS)) + if (!mons_is_shapeshifter(monster) || !monster->is_actual_spellcaster()) { if (handle_mon_spell(monster, beem)) { @@ -3634,4 +3633,3 @@ static spell_type _map_wand_to_mspell(int wand_type) default: return SPELL_NO_SPELL; } } - |