diff options
author | Steve Melenchuk <smelenchuk@gmail.com> | 2014-01-28 12:52:55 -0700 |
---|---|---|
committer | Steve Melenchuk <smelenchuk@gmail.com> | 2014-01-28 12:52:55 -0700 |
commit | dab6825aa234e9b898c620ce05327b67264fedaf (patch) | |
tree | 6238bc89ec8b90e98f063969f5ef3a668a173567 /crawl-ref/source/mutation-data.h | |
parent | 7ad9fedfe6f1e7b45d9f49b8369ed327c58aec27 (diff) | |
parent | 1437299f7f3f6ffcd2f4fcd5b787d84df729bb69 (diff) | |
download | crawl-ref-dab6825aa234e9b898c620ce05327b67264fedaf.tar.gz crawl-ref-dab6825aa234e9b898c620ce05327b67264fedaf.zip |
Merge branch 'demonspawn-enemies'
With the forest dispersal work done, and with everything working up to
the original designer's standards, this is ready for trunk.
Conflicts:
crawl-ref/source/beam.cc
crawl-ref/source/dat/des/branches/pan.des
crawl-ref/source/enum.h
crawl-ref/source/hiscores.cc
crawl-ref/source/melee_attack.cc
crawl-ref/source/mgen_enum.h
crawl-ref/source/mon-cast.cc
crawl-ref/source/mon-data.h
crawl-ref/source/mon-ench.cc
crawl-ref/source/mon-info.cc
crawl-ref/source/mon-info.h
crawl-ref/source/mon-place.cc
crawl-ref/source/mon-spll.h
crawl-ref/source/mon-stuff.cc
crawl-ref/source/mon-util.cc
crawl-ref/source/mutation.cc
crawl-ref/source/output.cc
crawl-ref/source/player.cc
crawl-ref/source/spl-data.h
crawl-ref/source/status.cc
crawl-ref/source/wiz-you.cc
Diffstat (limited to 'crawl-ref/source/mutation-data.h')
-rw-r--r-- | crawl-ref/source/mutation-data.h | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/crawl-ref/source/mutation-data.h b/crawl-ref/source/mutation-data.h index a866c67b0f..2bc233615b 100644 --- a/crawl-ref/source/mutation-data.h +++ b/crawl-ref/source/mutation-data.h @@ -144,6 +144,42 @@ "cold resistance" }, +{ MUT_HEAT_VULNERABILITY, 0, 3, true, false, true, + "heat vulnerability", + + {"You are vulnerable to heat.", + "You are very vulnerable to heat.", + "You are extremely vulnerable to heat."}, + + {"You feel hot for a moment.", + "You feel hot for a moment.", + "You feel hot for a moment."}, + + {"You feel a sudden chill.", + "You feel a sudden chill.", + "You feel a sudden chill."}, + + "heat vulnerability" +}, + +{ MUT_COLD_VULNERABILITY, 0, 3, true, false, true, + "cold vulnerability", + + {"You are vulnerable to cold.", + "You are very vulnerable to cold.", + "You are extremely vulnerable to cold."}, + + {"You feel a sudden chill.", + "You feel a sudden chill.", + "You feel a sudden chill."}, + + {"You feel hot for a moment.", + "You feel hot for a moment.", + "You feel hot for a moment."}, + + "cold vulnerability" +}, + { MUT_DEMONIC_GUARDIAN, 0, 3, false, false, false, "demonic guardian", |