A completely reworked version of Zin as per the lengthy

discussion in October/November.

Zin effects:
- protection from harm (like all good gods)
- feeding when starving (as before)
- mutation resistance (chance of piety/200)

Zin restrictions:
- no cannibalism (like all good gods)
- no attacking friends
- no eating of intelligent beings' corpses
- no deliberate mutating

Zin invocations:
- Smiting (general priestly ability?)
- Revitalisation (Minor Healing + 5 mp)
- Sanctuary (protection from attacks)


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3164 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 10 insertions, 0 deletions

diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index 1f5c9c6cca..656b2a640f 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -1574,6 +1574,7 @@ static void tag_construct_level(tagHeader &th)
             marshallShort(th, env.map[count_x][count_y].object);
             marshallShort(th, env.map[count_x][count_y].colour);            
             marshallShort(th, env.map[count_x][count_y].flags);
+            marshallShort(th, env.map[count_x][count_y].property);
             marshallShort(th, env.cgrid[count_x][count_y]);
         }
     }
@@ -1608,6 +1609,10 @@ static void tag_construct_level(tagHeader &th)
         marshallByte(th, env.shop[i].level);
     }
 
+    marshallByte(th, env.sanctuary_x);
+    marshallByte(th, env.sanctuary_y);
+    marshallByte(th, env.sanctuary_time);
+
     env.markers.write(th);
 }
 
@@ -1806,6 +1811,7 @@ static void tag_read_level( tagHeader &th, char minorVersion )
             env.map[i][j].object = unmarshallShort(th);
             env.map[i][j].colour = unmarshallShort(th);
             env.map[i][j].flags  = unmarshallShort(th);
+            env.map[i][j].property = unmarshallShort(th);
 
             mgrd[i][j] = NON_MONSTER;
             env.cgrid[i][j] = (unsigned short) unmarshallShort(th);
@@ -1844,6 +1850,10 @@ static void tag_read_level( tagHeader &th, char minorVersion )
         env.shop[i].level = unmarshallByte(th);
     }
 
+    env.sanctuary_x    = unmarshallByte(th);
+    env.sanctuary_y    = unmarshallByte(th);
+    env.sanctuary_time = unmarshallByte(th);
+
     env.markers.read(th);
 }