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).

1 files changed, 0 insertions, 1 deletions

diff --git a/crawl-ref/source/ouch.h b/crawl-ref/source/ouch.h
index e5b3bb2500..60c586f88e 100644
--- a/crawl-ref/source/ouch.h
+++ b/crawl-ref/source/ouch.h
@@ -64,7 +64,6 @@ int check_your_resists(int hurted, beam_type flavour, string source,
                        bolt *beam = 0, bool doEffects = true);
 void splash_with_acid(int acid_strength, bool corrode_items = true,
                       string hurt_msg = "");
-void weapon_acid(int acid_strength);
 
 class actor;
 int actor_to_death_source(const actor* agent);