Apply n78291's patch in [2877049], with a few tweaks, to expand Jiyva's

wrath, allow uncancelable transformations as part of it, and adjust his
Slimify power.

1 files changed, 4 insertions, 0 deletions

diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index 4729730a1f..da5980878b 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -837,6 +837,7 @@ static void tag_construct_you(writer &th)
     marshallByte(th, you.char_direction);
     marshallByte(th, you.opened_zot);
     marshallByte(th, you.royal_jelly_dead);
+    marshallByte(th, you.transform_cancellable);
     marshallByte(th, you.your_level);
     marshallByte(th, you.is_undead);
     marshallShort(th, you.unrand_reacts);
@@ -1261,6 +1262,9 @@ static void tag_read_you(reader &th, char minorVersion)
     if (minorVersion >= TAG_MINOR_JELLY)
         you.royal_jelly_dead = (bool) unmarshallByte(th);
 
+     if (minorVersion >= TAG_MINOR_TRANS)
+         you.transform_cancellable = (bool) unmarshallByte(th);
+
     you.your_level        = unmarshallByte(th);
     you.is_undead         = static_cast<undead_state_type>(unmarshallByte(th));
     you.unrand_reacts     = unmarshallShort(th);