Remove a few placeholders from enum.h

1 files changed, 105 insertions, 105 deletions

diff --git a/crawl-ref/source/art-data.h b/crawl-ref/source/art-data.h
index 5492febd6a..665c5149ab 100644
--- a/crawl-ref/source/art-data.h
+++ b/crawl-ref/source/art-data.h
@@ -31,8 +31,8 @@
     {
         0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 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,8 +50,8 @@
     {
         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, 1, 
+        0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
         0, 
     },
@@ -69,8 +69,8 @@
     {
         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, 
     },
@@ -88,8 +88,8 @@
     {
         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, 
     },
@@ -107,8 +107,8 @@
     {
         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, 
     },
@@ -126,8 +126,8 @@
     {
         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, 
     },
@@ -145,8 +145,8 @@
     {
         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, 
     },
@@ -164,8 +164,8 @@
     {
         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, 
     },
@@ -183,8 +183,8 @@
     {
         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, 
     },
@@ -202,8 +202,8 @@
     {
         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, 3, 0, 0, 
         0, 
     },
@@ -221,8 +221,8 @@
     {
         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, 
     },
@@ -240,8 +240,8 @@
     {
         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, 
     },
@@ -259,8 +259,8 @@
     {
         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, -1, 0, 0, 
         0, 
     },
@@ -278,8 +278,8 @@
     {
         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, 
     },
@@ -297,8 +297,8 @@
     {
         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, 
     },
@@ -316,8 +316,8 @@
     {
         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, 1, 0, 
         0, 0, 0, 0, -20, 0, 
         0, 
     },
@@ -335,8 +335,8 @@
     {
         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, 
     },
@@ -354,8 +354,8 @@
     {
         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, 
+        1, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 
         0, 0, 0, 0, -20, 0, 
         0, 
     },
@@ -373,8 +373,8 @@
     {
         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, 4, 0, 0, 
         0, 
     },
@@ -392,8 +392,8 @@
     {
         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, 
     },
@@ -411,8 +411,8 @@
     {
         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, 
     },
@@ -430,8 +430,8 @@
     {
         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, -1, 0, 0, 
         0, 
     },
@@ -449,8 +449,8 @@
     {
         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, 
     },
@@ -468,8 +468,8 @@
     {
         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, 
+        1, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
         0, 
     },
@@ -487,8 +487,8 @@
     {
         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, 
     },
@@ -506,8 +506,8 @@
     {
         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, 
+        1, 0, 0, 0, 1, 0, 
+        0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
         0, 
     },
@@ -525,8 +525,8 @@
     {
         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, 0, 0, 
+        0, 0, 0, 1, 0, 
         0, 0, 0, 0, -50, 0, 
         0, 
     },
@@ -544,8 +544,8 @@
     {
         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, 
     },
@@ -563,8 +563,8 @@
     {
         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, 
+        1, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
         0, 
     },
@@ -582,8 +582,8 @@
     {
         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, 
+        1, 0, 0, 0, 0, 0, 
+        0, 0, 1, 0, 0, 
         0, 0, 0, 0, 0, 0, 
         0, 
     },
@@ -601,8 +601,8 @@
     {
         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, 0, 1, 
+        0, 0, 0, 0, 0, 
         0, 0, 0, 0, -30, 0, 
         0, 
     },
@@ -620,8 +620,8 @@
     {
         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, 
     },
@@ -639,8 +639,8 @@
     {
         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, 
     },
@@ -658,8 +658,8 @@
     {
         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, 1, 
+        0, 0, 0, 0, 2, 
         0, 0, 0, 0, 0, 0, 
         0, 
     },
@@ -677,8 +677,8 @@
     {
         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, 
+        1, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
         0, 
     },
@@ -696,8 +696,8 @@
     {
         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, 
     },
@@ -715,8 +715,8 @@
     {
         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, 1, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 
         0, 0, 0, 0, 60, 0, 
         0, 
     },
@@ -734,8 +734,8 @@
     {
         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, 1, 0, 
+        0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
         0, 
     },
@@ -753,8 +753,8 @@
     {
         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, 50, 0, 
         0, 
     },
@@ -772,8 +772,8 @@
     {
         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, 
         6, 0, 0, 1, -20, 0, 
         0, 
     },
@@ -791,8 +791,8 @@
     {
         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, 
     },
@@ -810,8 +810,8 @@
     {
         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, 
     },
@@ -829,8 +829,8 @@
     {
         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, 
     },
@@ -848,8 +848,8 @@
     {
         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, 
     },
@@ -867,8 +867,8 @@
     {
         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, 3, 0, 0, 
         0, 
     },
@@ -886,8 +886,8 @@
     {
         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, 
     },
@@ -905,8 +905,8 @@
     {
         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, 
+        1, 1, 1, 0, 0, 0, 
+        0, 0, 0, 0, 0, 
         0, 0, -3, 0, 60, 0, 
         0, 
     },
@@ -924,8 +924,8 @@
     {
         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, 
     },
@@ -943,8 +943,8 @@
     {
         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, 
+        1, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 1, 
         0, 0, 0, 0, 0, 0, 
         0, 
     },
@@ -962,8 +962,8 @@
     {
         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, 1, 0, 
+        0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
         1, 
     },
@@ -981,8 +981,8 @@
     {
         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, 
+        0, 0, 0, 0, 0, 0, 
+        1, 1, 0, 0, 0, 
         5, 0, 0, 1, -80, 0, 
         0, 
     },
@@ -1000,8 +1000,8 @@
     {
         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, 1, 0, 0, 0, 
+        0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
         0, 
     },
@@ -1019,8 +1019,8 @@
     {
         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, 1, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 
         0, 0, 0, 0, 80, 0, 
         0, 
     },
@@ -1038,8 +1038,8 @@
     {
         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, 0, 0, 0, 
+        1, 0, 0, 0, 0, 
         0, 0, 0, -1, 0, 0, 
         0, 
     },
@@ -1057,8 +1057,8 @@
     {
         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, 
     },
@@ -1076,8 +1076,8 @@
     {
         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, 1, 0, 
+        0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
         0, 
     },
@@ -1095,8 +1095,8 @@
     {
         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, 3, 3, 0, 0, 0, 
         0, 
     },
@@ -1114,8 +1114,8 @@
     {
         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, 
     },
@@ -1133,8 +1133,8 @@
     {
         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, 0, 0, 0, 
+        1, 0, 0, 0, 0, 
         0, 0, 0, 2, 0, 0, 
         0, 
     },
@@ -1152,8 +1152,8 @@
     {
         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, 0, 0, 0, 
+        1, 0, 1, 0, 0, 
         0, 0, 0, -1, 0, 0, 
         0, 
     },
@@ -1171,8 +1171,8 @@
     {
         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, 
+        1, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 
         0, 2, 2, 0, 0, 0, 
         0, 
     },
@@ -1190,8 +1190,8 @@
     {
         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, 
+        1, 1, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 
         0, 0, 0, 0, 50, 0, 
         0, 
     },
@@ -1209,8 +1209,8 @@
     {
         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, 
     },
@@ -1228,8 +1228,8 @@
     {
         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, 
     },
@@ -1247,8 +1247,8 @@
     {
         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, 5, 0, 0, 0, 0, 
         0, 
     },
@@ -1266,8 +1266,8 @@
     {
         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, -30, 0, 
         0, 
     },
@@ -1285,8 +1285,8 @@
     {
         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, 
     },
@@ -1304,8 +1304,8 @@
     {
         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, 1, 0, 0, 0, 
+        0, 0, 0, 0, 0, 
         0, 0, 0, 0, 50, 0, 
         0, 
     },
@@ -1323,8 +1323,8 @@
     {
         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, 
+        1, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 
         0, -3, 0, 0, 40, 0, 
         0, 
     },
@@ -1342,8 +1342,8 @@
     {
         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, 1, 0, 2, 
         0, 0, 0, 0, 0, 0, 
         0, 
     },
@@ -1361,8 +1361,8 @@
     {
         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, 
     },
@@ -1380,8 +1380,8 @@
     {
         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, 0, 0, 0, 0, 
+        0, 0, 0, 1, 0, 
         0, 0, 3, 3, -20, 0, 
         0, 
     },
@@ -1399,8 +1399,8 @@
     {
         0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 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,8 +1418,8 @@
     {
         0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 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,8 +1437,8 @@
     {
         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, 
     },
@@ -1456,8 +1456,8 @@
     {
         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, 
     },
@@ -1475,8 +1475,8 @@
     {
         0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
-        0, 0, 0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
+        0, 0, 0, 0, 0, 
         0, 0, 0, 0, 0, 0, 
         0, 
     },