diff options
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/art-data.h | 210 | ||||
-rw-r--r-- | crawl-ref/source/debug.cc | 6 | ||||
-rw-r--r-- | crawl-ref/source/enum.h | 60 | ||||
-rw-r--r-- | crawl-ref/source/mutation.cc | 38 | ||||
-rwxr-xr-x | crawl-ref/source/util/art-data.pl | 4 |
5 files changed, 150 insertions, 168 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, }, diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc index 5d9cfe4bfb..0f2fb2f966 100644 --- a/crawl-ref/source/debug.cc +++ b/crawl-ref/source/debug.cc @@ -1694,9 +1694,7 @@ const char* _prop_name[ARTP_NUM_PROPERTIES] = { "Inv", "Lev", "Blnk", - "UNUSED", "Bers", - "UNUSED", "Nois", "NoSpl", "RndTl", @@ -1733,9 +1731,7 @@ char _prop_type[ARTP_NUM_PROPERTIES] = { ARTP_VAL_BOOL, //INVISIBLE ARTP_VAL_BOOL, //LEVITATE ARTP_VAL_BOOL, //BLINK - ARTP_VAL_BOOL, //UNUSED_2 ARTP_VAL_BOOL, //BERSERK - ARTP_VAL_BOOL, //UNUSED_1 ARTP_VAL_POS, //NOISES ARTP_VAL_BOOL, //PREVENT_SPELLCASTING ARTP_VAL_BOOL, //CAUSE_TELEPORTATION @@ -3673,9 +3669,7 @@ static void _debug_rap_stats(FILE *ostat) "ARTP_INVISIBLE", "ARTP_LEVITATE", "ARTP_BLINK", - "ARTP_UNUSED_2", "ARTP_BERSERK", - "ARTP_UNUSED_1", "ARTP_NOISES", "ARTP_PREVENT_SPELLCASTING", "ARTP_CAUSE_TELEPORTATION", diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index f8604c0c67..8a269abacd 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -12,37 +12,35 @@ enum ability_type { ABIL_NON_ABILITY = -1, ABIL_SPIT_POISON = 1, // 1 - // was Mapping - ABIL_TELEPORTATION = 3, + ABIL_TELEPORTATION, ABIL_BREATHE_FIRE, - ABIL_BLINK, // 5 - ABIL_BREATHE_FROST, + ABIL_BLINK, + ABIL_BREATHE_FROST, // 5 ABIL_BREATHE_POISON, ABIL_BREATHE_LIGHTNING, ABIL_SPIT_ACID, - ABIL_BREATHE_POWER, // 10 - ABIL_EVOKE_BERSERK, + ABIL_BREATHE_POWER, + ABIL_EVOKE_BERSERK, // 10 ABIL_BREATHE_STICKY_FLAME, ABIL_BREATHE_STEAM, ABIL_FLY, - ABIL_SUMMON_MINOR_DEMON, // 15 - ABIL_SUMMON_DEMON, + ABIL_SUMMON_MINOR_DEMON, + ABIL_SUMMON_DEMON, // 15 ABIL_HELLFIRE, ABIL_TORMENT, ABIL_RAISE_DEAD, - ABIL_CONTROL_DEMON, // 20 - ABIL_CHANNELING, + ABIL_CONTROL_DEMON, + ABIL_CHANNELING, // 20 ABIL_THROW_FLAME, ABIL_THROW_FROST, ABIL_BOLT_OF_DRAINING, - ABIL_FLY_II, // 25 - ABIL_DELAYED_FIREBALL, + ABIL_FLY_II, + ABIL_DELAYED_FIREBALL, // 25 ABIL_MUMMY_RESTORATION, - // Was evoke mapping - ABIL_EVOKE_TELEPORTATION = 29, - ABIL_EVOKE_BLINK, // 30 - ABIL_RECHARGING, // 31 - // 32 - 50 unused + ABIL_EVOKE_TELEPORTATION, + ABIL_EVOKE_BLINK, + ABIL_RECHARGING, + // 30 - 50 unused ABIL_EVOKE_TURN_INVISIBLE = 51, // 51 ABIL_EVOKE_TURN_VISIBLE, ABIL_EVOKE_LEVITATE, @@ -157,7 +155,6 @@ enum attribute_type ATTR_DIVINE_DEATH_CHANNEL, ATTR_TRANSFORMATION, ATTR_CARD_COUNTDOWN, - ATTR_NUM_DEMONIC_POWERS, // No longer used - for 0.5 demonspawn ATTR_WAS_SILENCED, //jmf: added for silenced messages ATTR_GOD_GIFT_COUNT, //jmf: added to help manage god gift giving ATTR_DELAYED_FIREBALL, // bwr: reserve fireballs @@ -2319,6 +2316,7 @@ enum mutation_type MUT_GREY_SCALES, MUT_BONEY_PLATES, MUT_REPULSION_FIELD, + MUT_PASSIVE_MAPPING, MUT_POISON_RESISTANCE, MUT_CARNIVOROUS, MUT_HERBIVOROUS, @@ -2340,7 +2338,6 @@ enum mutation_type MUT_DEFORMED, MUT_TELEPORT_AT_WILL, MUT_SPIT_POISON, - MUT_UNUSED_1, MUT_BREATHE_FLAMES, MUT_BLINK, MUT_HORNS, @@ -2357,6 +2354,11 @@ enum mutation_type MUT_ROBUST, MUT_TORMENT_RESISTANCE, MUT_NEGATIVE_ENERGY_RESISTANCE, + MUT_STOCHASTIC_TORMENT_RESISTANCE, + MUT_ICEMAIL, + MUT_CONSERVE_SCROLLS, + MUT_CONSERVE_POTIONS, + MUT_PASSIVE_FREEZE, MUT_SUMMON_MINOR_DEMONS, MUT_SUMMON_DEMONS, MUT_HURL_HELLFIRE, @@ -2401,12 +2403,6 @@ enum mutation_type MUT_IRIDESCENT_SCALES, MUT_PATTERNED_SCALES, - MUT_STOCHASTIC_TORMENT_RESISTANCE, - MUT_PASSIVE_MAPPING, - MUT_ICEMAIL, - MUT_CONSERVE_SCROLLS, - MUT_CONSERVE_POTIONS, - MUT_PASSIVE_FREEZE, NUM_MUTATIONS, RANDOM_MUTATION = 100, @@ -2537,23 +2533,21 @@ enum artefact_prop_type ARTP_INVISIBLE, ARTP_LEVITATE, ARTP_BLINK, // 15 - ARTP_UNUSED_2, ARTP_BERSERK, - ARTP_UNUSED_1, ARTP_NOISES, - ARTP_PREVENT_SPELLCASTING, // 20 + ARTP_PREVENT_SPELLCASTING, ARTP_CAUSE_TELEPORTATION, - ARTP_PREVENT_TELEPORTATION, + ARTP_PREVENT_TELEPORTATION, // 20 ARTP_ANGRY, ARTP_METABOLISM, - ARTP_MUTAGENIC, // 25 + ARTP_MUTAGENIC, ARTP_ACCURACY, - ARTP_DAMAGE, + ARTP_DAMAGE, // 25 ARTP_CURSED, ARTP_STEALTH, - ARTP_MAGICAL_POWER, // 30 + ARTP_MAGICAL_POWER, ARTP_SPIRIT_SHIELD, - ARTP_NUM_PROPERTIES + ARTP_NUM_PROPERTIES // 30 }; enum score_format_type diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index 3e8c10536f..c105cb585a 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -929,13 +929,6 @@ mutation_def mutation_defs[] = { "" }, - { MUT_UNUSED_1, 0, 3, false, false, - {"", "", ""}, - {"", "", ""}, - {"", "", ""}, - "" - }, - // Scales of various colours and effects { MUT_RED_SCALES, 2, 3, false, true, {"You are partially covered in red scales (AC +1).", @@ -1162,21 +1155,6 @@ mutation_def mutation_defs[] = { "iridescent scales" }, - { MUT_PATTERNED_SCALES, 1, 3, false, true, - {"You are partially covered in patterned scales (AC +1).", - "You are mostly covered in patterned scales (AC +2).", - "You are completely covered in patterned scales (AC +3)."}, - - {"Patterned scales grow over part of your body.", - "Patterned scales spread over more of your body.", - "Patterned scales cover you completely."}, - - {"Your patterned scales disappear.", - "Your patterned scales recede somewhat.", - "Your patterned scales recede somewhat."}, - - "patterned scales" - }, { MUT_STOCHASTIC_TORMENT_RESISTANCE, 0, 3, false, false, {"You are somewhat able to resist unholy torments (1 in 5 success).", "You are decently able to resist unholy torments (2 in 5 success).", @@ -1232,6 +1210,22 @@ mutation_def mutation_defs[] = { {"", "", ""}, "passive freeze", }, + // Anything after PATTERNED SCALES will be ignored by the debug code + { MUT_PATTERNED_SCALES, 1, 3, false, true, + {"You are partially covered in patterned scales (AC +1).", + "You are mostly covered in patterned scales (AC +2).", + "You are completely covered in patterned scales (AC +3)."}, + + {"Patterned scales grow over part of your body.", + "Patterned scales spread over more of your body.", + "Patterned scales cover you completely."}, + + {"Your patterned scales disappear.", + "Your patterned scales recede somewhat.", + "Your patterned scales recede somewhat."}, + + "patterned scales" + }, }; const mutation_def& get_mutation_def(mutation_type mut) diff --git a/crawl-ref/source/util/art-data.pl b/crawl-ref/source/util/art-data.pl index a03c03ec0b..05f6dcdf9b 100755 --- a/crawl-ref/source/util/art-data.pl +++ b/crawl-ref/source/util/art-data.pl @@ -472,8 +472,8 @@ my @art_order = ( "{", "BRAND", "AC", "EV", "STR", "INT", "DEX", "\n", "FIRE", "COLD", "ELEC", "POISON", "LIFE", "MAGIC", "\n", - "SEEINV", "INV", "LEV", "BLINK", "UNUSED", "BERSERK", "UNUSED", "\n", - "NOISES", "NOSPELL", "RND_TELE", "NOTELEP", "ANGRY", "METAB", "\n", + "SEEINV", "INV", "LEV", "BLINK", "BERSERK", "NOISES", "\n", + "NOSPELL", "RND_TELE", "NOTELEP", "ANGRY", "METAB", "\n", "MUTATE", "ACC", "DAM", "CURSED", "STEALTH", "MP", "\n", "SPIRIT", "}", |