diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-02-13 18:19:02 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-02-13 18:19:02 +0100 |
| commit | a7f467a29397dca00ce5ef95d5be74d2bfb0b896 (patch) | |
| tree | 30f6de5aed8749beabe7eb4d55ff1179ee8ff227 /crawl-ref/source/zap-data.h | |
| parent | 24951ff0ef931993c719ef12392555d9cb799cbb (diff) | |
| parent | 361a747743af421333998d240722d75a5020f4e0 (diff) | |
| download | crawl-ref-a7f467a29397dca00ce5ef95d5be74d2bfb0b896.tar.gz crawl-ref-a7f467a29397dca00ce5ef95d5be74d2bfb0b896.zip | |
Merge branch 'bad_forms'
It's not 100% ready, but should be functional enough, and 0.12 coming soon,
let's test it at least a bit. The numbers are probably totally out of
whack, but that's what trunk players are for. At least the code should be
sound.
This does include the jelly form that I'm strongly inclined to remove, yet
it's easy to axe without affecting save compat (as no player can be in that
form currently). All the code can be found by grepping for TRAN_JELLY,
except for one commit that's not bad to have (some refactoring of eating).
Generally, the jelly suffers from being abusable for nutrition, would need
some code for item [non-]use, and would make the player screwed as it can
neither take/deal damage (tree), avoid it (wisp) or run away (wisp, pig,
bat, porcupine).
Diffstat (limited to 'crawl-ref/source/zap-data.h')
| -rw-r--r-- | crawl-ref/source/zap-data.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/zap-data.h b/crawl-ref/source/zap-data.h index 514c0fc95e..eea0c09994 100644 --- a/crawl-ref/source/zap-data.h +++ b/crawl-ref/source/zap-data.h @@ -230,7 +230,7 @@ struct zap_info false, true, false, - 0 + 4 }, { @@ -282,7 +282,7 @@ struct zap_info }, { - ZAP_POLYMORPH_OTHER, + ZAP_POLYMORPH, "", 100, NULL, @@ -1021,7 +1021,7 @@ struct zap_info }, { - ZAP_BREATHE_STICKY_FLAME, // same data as spell but has different effects on hit + ZAP_BREATHE_STICKY_FLAME, "splash of liquid fire", 100, new dicedef_calculator<2, 3, 1, 12>, |