Artefacts no longer provide tele or mapping

Evokable teleporataion and evokable mapping are gone from artefacts.

1 files changed, 256 insertions, 256 deletions

diff --git a/crawl-ref/source/art-data.h b/crawl-ref/source/art-data.h
index dcc47ed32d..5492febd6a 100644
--- a/crawl-ref/source/art-data.h
+++ b/crawl-ref/source/art-data.h
@@ -31,10 +31,10 @@
     {
         0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -50,10 +50,10 @@
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        1, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 1, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "", 
     "This blessed weapon loves nothing more than to sing to its owner, whether they want it to or not.", 
@@ -69,10 +69,10 @@
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "", 
     "This was the favourite weapon of the old god Trog, before it was lost one day. It induces a bloodthirsty berserker rage in anyone who uses it to strike another.", 
@@ -88,10 +88,10 @@
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "", 
     "It is rather unreliable.", 
@@ -107,10 +107,10 @@
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "", 
     "It is the creation of a mad god, and carries a curse which transforms anyone possessing it into a prune. Fortunately, the curse works very slowly, and one can use it briefly with no consequences worse than slightly purple skin and a few wrinkles.", 
@@ -126,10 +126,10 @@
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "", 
     "It rewards the powerful with power and the meek with weakness.", 
@@ -145,10 +145,10 @@
     {
         SPWPN_VENOM, 0, 0, 0, 0, 0, 
         0, 0, 0, 1, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "", 
     "It was the magical weapon wielded by the mighty wizard Olgreb before he met his fate somewhere within these dungeons. It increases the ability of its wielder to use venomous magic, and carries magical powers which can be evoked.", 
@@ -164,10 +164,10 @@
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "", 
     "Its power varies in proportion to its wielder's intelligence. Using it can be a bit risky.", 
@@ -183,10 +183,10 @@
     {
         SPWPN_VAMPIRICISM, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "", 
     "It is lethally vampiric.", 
@@ -202,10 +202,10 @@
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        3, 0, 0, 0, 
+        0, 0, 0, 3, 0, 0, 
+        0, 
     },
     "", 
     "This weapon carries a terrible and highly irritating curse.", 
@@ -221,10 +221,10 @@
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "", 
     "This truly accursed weapon is an instrument of Hell.", 
@@ -240,10 +240,10 @@
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "", 
     "This dreadful weapon is used at the user's peril.", 
@@ -259,10 +259,10 @@
     {
         SPWPN_FLAMING, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        -1, 0, 0, 0, 
+        0, 0, 0, -1, 0, 0, 
+        0, 
     },
     "Eerie flames cover its twisted blade.", 
     "", 
@@ -278,10 +278,10 @@
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "", 
     "This legendary item can unleash the fury of Hell.", 
@@ -297,10 +297,10 @@
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "", 
     "It carries some of the powers of the arch-fiend Asmodeus.", 
@@ -316,10 +316,10 @@
     {
         SPWPN_VORPAL, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 
-        1, 0, 0, 0, 0, 
-        0, -20, 0, 0, 
+        0, 0, 0, 0, 0, 1, 0, 
+        0, 0, 0, 0, 1, 0, 
+        0, 0, 0, 0, -20, 0, 
+        0, 
     },
     "", 
     "", 
@@ -335,10 +335,10 @@
     {
         SPWPN_FLAMING, 0, 0, 0, 0, 0, 
         2, -1, 0, 1, 0, 20, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -354,10 +354,10 @@
     {
         SPWPN_HOLY_WRATH, 5, 0, 0, 5, 0, 
         0, 0, 0, 0, 1, 0, 
-        1, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, -20, 0, 0, 
+        1, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, -20, 0, 
+        0, 
     },
     "", 
     "", 
@@ -373,10 +373,10 @@
     {
         SPWPN_VAMPIRICISM, 0, -1, -1, -1, -1, 
         0, 0, 0, 0, 1, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        4, 0, 0, 0, 
+        0, 0, 0, 4, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -392,10 +392,10 @@
     {
         SPWPN_FREEZING, 0, 0, 0, 0, 0, 
         -1, 2, 0, 1, 0, 20, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "A dagger made of one huge piece of sapphire.", 
     "", 
@@ -411,10 +411,10 @@
     {
         SPWPN_PAIN, 0, 0, 0, 5, 0, 
         0, 0, 0, 0, 0, 30, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "An ugly rusty dagger.", 
     "", 
@@ -430,10 +430,10 @@
     {
         SPWPN_SPEED, 0, 0, 3, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        -1, 0, 0, 0, 
+        0, 0, 0, -1, 0, 0, 
+        0, 
     },
     "A long and sharp scythe, specially modified for combat purposes.", 
     "", 
@@ -449,10 +449,10 @@
     {
         SPWPN_FROST, 0, 0, 0, 0, 0, 
         0, 1, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "A sling made of weird blue leather.", 
     "", 
@@ -468,10 +468,10 @@
     {
         SPWPN_SPEED, 0, 0, 0, 0, 3, 
         0, 0, 0, 0, 0, 0, 
-        1, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        1, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "A wonderful golden bow.", 
     "", 
@@ -487,10 +487,10 @@
     {
         SPWPN_SPEED, 0, 0, 5, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -506,10 +506,10 @@
     {
         SPWPN_ELECTROCUTION, 5, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        1, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        1, 0, 0, 0, 0, 1, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -525,10 +525,10 @@
     {
         SPWPN_HOLY_WRATH, 0, 3, 0, 0, 0, 
         0, 0, 0, 0, 1, 20, 
-        0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        1, 0, 0, 0, 0, 
-        0, -50, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 1, 0, 
+        0, 0, 0, 0, -50, 0, 
+        0, 
     },
     "A long sword made of one huge piece of crystal.", 
     "", 
@@ -544,10 +544,10 @@
     {
         SPWPN_FLAME, 0, 0, 0, 0, 0, 
         2, -1, 0, 0, 0, 40, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "A flaming crossbow, forged in the fires of the Hells.", 
     "", 
@@ -563,10 +563,10 @@
     {
         SPWPN_PAIN, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 50, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "An adamantine great sword.", 
     "", 
@@ -582,10 +582,10 @@
     {
         SPWPN_ELECTROCUTION, 0, 0, 0, 0, 0, 
         0, 0, 1, 0, 0, 0, 
-        1, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        1, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 1, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -601,10 +601,10 @@
     {
         SPWPN_VAMPIRICISM, 0, 0, 0, 0, 0, 
         0, 0, 0, 1, 1, 0, 
-        0, 0, 0, 0, 0, 0, 
-        0, 1, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, -30, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        1, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, -30, 0, 
+        0, 
     },
     "", 
     "", 
@@ -620,10 +620,10 @@
     {
         SPWPN_VENOM, 0, 0, 0, 0, 0, 
         0, 0, 1, 1, 0, 50, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -639,10 +639,10 @@
     {
         SPWPN_SPEED, 0, 0, 2, 0, 0, 
         0, 0, 0, 0, 0, 30, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "A beautiful mithril axe, probably lost by some dwarven hero.", 
     "", 
@@ -658,10 +658,10 @@
     {
         SPWPN_PROTECTION, 0, 0, 0, 0, 0, 
         2, 2, 0, 0, 0, 60, 
+        0, 0, 0, 0, 0, 0, 0, 
+        1, 0, 0, 0, 0, 2, 
         0, 0, 0, 0, 0, 0, 
-        0, 1, 0, 0, 0, 
-        0, 2, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -677,10 +677,10 @@
     {
         SPWPN_VENOM, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        1, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        1, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "A hand crossbow made of some black material.", 
     "", 
@@ -696,10 +696,10 @@
     {
         SPWPN_VORPAL, 0, -2, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "An exceptionally large metal longbow.", 
     "", 
@@ -715,10 +715,10 @@
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 1, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 60, 0, 0, 
+        0, 1, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 60, 0, 
+        0, 
     },
     "It is designed for easy concealment, but still packs a nasty punch.", 
     "", 
@@ -734,10 +734,10 @@
     {
         SPWPN_DRAGON_SLAYING, 5, 0, 0, 0, 0, 
         1, 0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 1, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -753,10 +753,10 @@
     {
         SPWPN_NORMAL, 0, 4, 0, 0, 4, 
         0, 0, 0, 0, 0, 20, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 50, 0, 0, 
+        0, 0, 0, 0, 50, 0, 
+        0, 
     },
     "A dainty little knife.", 
     "", 
@@ -772,10 +772,10 @@
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 6, 0, 0, 
-        1, -20, 0, 0, 
+        6, 0, 0, 1, -20, 0, 
+        0, 
     },
     "A long sword made of weird glowing metal.", 
     "", 
@@ -791,10 +791,10 @@
     {
         SPWPN_HOLY_WRATH, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -810,10 +810,10 @@
     {
         SPWPN_VENOM, 0, 0, 0, 0, 0, 
         0, 0, 0, 1, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "", 
     "A double-ended whip made from the cured hides of the Lair of Beasts' deadly grey snakes.", 
@@ -829,10 +829,10 @@
     {
         SPWPN_NORMAL, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -848,10 +848,10 @@
     {
         SPWPN_NORMAL, 0, 0, 0, 3, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -867,10 +867,10 @@
     {
         SPARM_NORMAL, 2, 2, 0, -6, 0, 
         0, 0, 0, 0, 1, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        3, 0, 0, 0, 
+        0, 0, 0, 3, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -886,10 +886,10 @@
     {
         SPARM_NORMAL, 0, 0, 2, 2, 2, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "A robe made of the finest silk.", 
     "", 
@@ -905,10 +905,10 @@
     {
         SPARM_NORMAL, 0, 2, 0, 0, 2, 
         0, 0, 0, 0, 0, 0, 
-        1, 1, 1, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, -3, 
-        0, 60, 0, 0, 
+        1, 1, 1, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 0, -3, 0, 60, 0, 
+        0, 
     },
     "", 
     "", 
@@ -924,10 +924,10 @@
     {
         SPARM_NORMAL, 0, -5, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -943,10 +943,10 @@
     {
         SPARM_NORMAL, 0, 0, 0, 2, 0, 
         0, 0, 1, 0, 0, 0, 
-        1, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 1, 0, 0, 0, 
-        0, 0, 0, 0, 
+        1, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 1, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "A large crown of dull bronze, set with a dazzling array of gemstones.", 
     "", 
@@ -962,10 +962,10 @@
     {
         SPARM_NORMAL, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 50, 
-        0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 1, 
+        0, 0, 0, 0, 0, 1, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        1, 
     },
     "", 
     "", 
@@ -981,10 +981,10 @@
     {
         SPARM_NORMAL, 0, -4, -2, -2, -2, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 
-        0, 0, 1, 1, 0, 
-        0, 0, 5, 0, 0, 
-        1, -80, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 1, 1, 0, 0, 0, 
+        5, 0, 0, 1, -80, 0, 
+        0, 
     },
     "A splendid flowing robe of fur and silk.", 
     "", 
@@ -1000,10 +1000,10 @@
     {
         SPARM_NORMAL, 0, 4, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 1, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 0, 1, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "A vibrating cloak.", 
     "", 
@@ -1019,10 +1019,10 @@
     {
         SPARM_NORMAL, 0, 0, 0, 0, 3, 
         0, 0, 0, 0, 0, 0, 
-        0, 1, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 80, 0, 0, 
+        0, 1, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 80, 0, 
+        0, 
     },
     "Some soft boots.", 
     "", 
@@ -1038,10 +1038,10 @@
     {
         SPARM_NORMAL, 0, 0, 0, 0, -3, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 
-        0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 
-        -1, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 1, 0, 0, 0, 0, 
+        0, 0, 0, -1, 0, 0, 
+        0, 
     },
     "A chain mail made of pure gold.", 
     "", 
@@ -1057,10 +1057,10 @@
     {
         SPARM_NORMAL, 0, 0, 0, 0, 0, 
         0, 2, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "The skin of some strange animal.", 
     "", 
@@ -1076,10 +1076,10 @@
     {
         SPARM_NORMAL, 0, 0, 0, 0, 0, 
         2, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 1, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 1, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "A leather armour made of a salamander's skin.", 
     "", 
@@ -1095,10 +1095,10 @@
     {
         SPARM_NORMAL, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 3, 3, 
-        0, 0, 0, 0, 
+        0, 3, 3, 0, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -1114,10 +1114,10 @@
     {
         SPARM_NORMAL, 0, 0, 0, 0, 0, 
         1, 1, 0, 0, 0, 40, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "A bronze shield.", 
     "", 
@@ -1133,10 +1133,10 @@
     {
         SPARM_NORMAL, 0, 0, 0, -5, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 
-        0, 0, 1, 0, 0, 
-        0, 0, 0, 0, 0, 
-        2, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 1, 0, 0, 0, 0, 
+        0, 0, 0, 2, 0, 0, 
+        0, 
     },
     "A dull grey robe.", 
     "", 
@@ -1152,10 +1152,10 @@
     {
         SPARM_NORMAL, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 
-        0, 0, 1, 0, 1, 
-        0, 0, 0, 0, 0, 
-        -1, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 1, 0, 1, 0, 0, 
+        0, 0, 0, -1, 0, 0, 
+        0, 
     },
     "A weird-looking armour.", 
     "", 
@@ -1171,10 +1171,10 @@
     {
         SPARM_NORMAL, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 40, 
-        1, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 2, 2, 
-        0, 0, 0, 0, 
+        1, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 2, 2, 0, 0, 0, 
+        0, 
     },
     "A blue mask.", 
     "", 
@@ -1190,10 +1190,10 @@
     {
         SPARM_NORMAL, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 30, 
-        1, 1, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 50, 0, 0, 
+        1, 1, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 50, 0, 
+        0, 
     },
     "A long black robe made of strange glossy material.", 
     "", 
@@ -1209,10 +1209,10 @@
     {
         SPARM_NORMAL, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 50, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -1228,10 +1228,10 @@
     {
         SPARM_NORMAL, 0, 0, 0, 0, 0, 
         1, 1, 1, 0, 0, 30, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "A dirty hat.", 
     "", 
@@ -1247,10 +1247,10 @@
     {
         SPARM_NORMAL, 0, 3, 0, 0, 3, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 5, 0, 
-        0, 0, 0, 0, 
+        0, 5, 0, 0, 0, 0, 
+        0, 
     },
     "A pair of gloves made of white silk.", 
     "", 
@@ -1266,10 +1266,10 @@
     {
         SPARM_NORMAL, 0, 4, 0, 0, 0, 
         0, 1, 1, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, -30, 0, 0, 
+        0, 0, 0, 0, -30, 0, 
+        0, 
     },
     "A phosphorescent cloak.", 
     "", 
@@ -1285,10 +1285,10 @@
     {
         SPARM_NORMAL, 0, 0, 0, -1, -1, 
         0, 0, 0, 1, 1, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -1304,10 +1304,10 @@
     {
         0, 0, 3, 0, 0, 0, 
         0, 0, 1, 0, 0, 0, 
-        0, 0, 1, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 50, 0, 0, 
+        0, 0, 1, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 50, 0, 
+        0, 
     },
     "A sky-blue amulet.", 
     "", 
@@ -1323,10 +1323,10 @@
     {
         0, 0, 4, 0, 0, 0, 
         0, 0, 0, 0, 1, 0, 
-        1, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, -3, 0, 
-        0, 40, 0, 0, 
+        1, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, -3, 0, 0, 40, 0, 
+        0, 
     },
     "", 
     "", 
@@ -1342,10 +1342,10 @@
     {
         0, 1, 1, 0, 0, 0, 
         0, 0, 1, 1, 1, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 1, 0, 2, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 1, 
-        0, 2, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -1361,10 +1361,10 @@
     {
         0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 1, 100, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -1380,10 +1380,10 @@
     {
         0, 0, 0, 2, -2, 0, 
         0, 0, 0, 0, 0, 30, 
-        0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        1, 0, 0, 0, 3, 
-        3, -20, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 1, 0, 
+        0, 0, 3, 3, -20, 0, 
+        0, 
     },
     "", 
     "", 
@@ -1399,10 +1399,10 @@
     {
         0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -1418,10 +1418,10 @@
     {
         0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -1437,10 +1437,10 @@
     {
         0, 0, 0, 0, 3, 0, 
         0, 0, 0, 0, 0, 50, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "", 
     "", 
@@ -1456,10 +1456,10 @@
     {
         0, 4, 4, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
+        0, 
     },
     "A shield-shaped amulet.", 
     "", 
@@ -1475,10 +1475,10 @@
     {
         0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 
+        0, 
     },
     "", 
     "",