diff options
| author | Mikko Vepsalainen <mtvepsal@gmail.com> | 2014-06-07 15:24:58 +0300 |
|---|---|---|
| committer | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-06-22 18:26:45 -0700 |
| commit | 22f47d3353ec313679f8efc18aefff1c61a2ed5e (patch) | |
| tree | 022903bb04158ae79790833e998ef79b17fbc1b7 /crawl-ref/source/mon-death.h | |
| parent | 9a6eb5300318d0cb475c6a33798811d148014674 (diff) | |
| download | crawl-ref-22f47d3353ec313679f8efc18aefff1c61a2ed5e.tar.gz crawl-ref-22f47d3353ec313679f8efc18aefff1c61a2ed5e.zip | |
Duvessa and Dowan cleanup.
Avoid some code duplication, minor cleanup. Functional change: Dowan will haste
even when invisible, if he's near when Duvessa dies (consistent with Duvessa's
berserking).
[Committer's note: Exported some properties to mon-death.h &
added an attempt at save-compat... such as it is.]
Diffstat (limited to 'crawl-ref/source/mon-death.h')
| -rw-r--r-- | crawl-ref/source/mon-death.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crawl-ref/source/mon-death.h b/crawl-ref/source/mon-death.h index 37b66b2455..81a3f8392b 100644 --- a/crawl-ref/source/mon-death.h +++ b/crawl-ref/source/mon-death.h @@ -10,6 +10,11 @@ #define ROTTING_CORPSE 99 #define ORIG_MONSTER_KEY "orig_monster_key" +#define ELVEN_ENERGIZE_KEY "elven_twin_energize" +#if TAG_MAJOR_VERSION == 34 +#define OLD_DUVESSA_ENERGIZE_KEY "duvessa_berserk" +#define OLD_DOWAN_ENERGIZE_KEY "dowan_upgrade" +#endif #define YOU_KILL(x) ((x) == KILL_YOU || (x) == KILL_YOU_MISSILE \ || (x) == KILL_YOU_CONF) @@ -66,6 +71,7 @@ bool mons_is_duvessa(const monster* mons); bool mons_is_dowan(const monster* mons); bool mons_is_elven_twin(const monster* mons); void elven_twin_died(monster* twin, bool in_transit, killer_type killer, int killer_index); +void elven_twin_energize(monster* mons); void elven_twins_pacify(monster* twin); void elven_twins_unpacify(monster* twin); |