Remove the hidden special cost of some skills, adjust aptitudes.

Spellcasting was cost 130%, Stealth, Evocations and Invocations 80%. All
species had their aptitudes adjusted to compensate (-1 Spc, +1 Sth, +1 Inv,
+1 Evo). The only significant balance change is Naga staying at +5 Sth.

1 files changed, 130 insertions, 130 deletions

diff --git a/crawl-ref/source/aptitudes.h b/crawl-ref/source/aptitudes.h
index 317d987522..e8fa1cf2b4 100644
--- a/crawl-ref/source/aptitudes.h
+++ b/crawl-ref/source/aptitudes.h
@@ -26,12 +26,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_HUMAN,           SK_THROWING,        0),
     APT(SP_HUMAN,           SK_ARMOUR,          0),
     APT(SP_HUMAN,           SK_DODGING,         0),
-    APT(SP_HUMAN,           SK_STEALTH,         0),
+    APT(SP_HUMAN,           SK_STEALTH,         1),
     APT(SP_HUMAN,           SK_STABBING,        0),
     APT(SP_HUMAN,           SK_SHIELDS,         0),
     APT(SP_HUMAN,           SK_TRAPS_DOORS,     0),
     APT(SP_HUMAN,           SK_UNARMED_COMBAT,  0),
-    APT(SP_HUMAN,           SK_SPELLCASTING,    0),
+    APT(SP_HUMAN,           SK_SPELLCASTING,   -1),
     APT(SP_HUMAN,           SK_CONJURATIONS,    0),
     APT(SP_HUMAN,           SK_HEXES,           0),
     APT(SP_HUMAN,           SK_CHARMS,          0),
@@ -44,8 +44,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_HUMAN,           SK_AIR_MAGIC,       0),
     APT(SP_HUMAN,           SK_EARTH_MAGIC,     0),
     APT(SP_HUMAN,           SK_POISON_MAGIC,    0),
-    APT(SP_HUMAN,           SK_INVOCATIONS,     0),
-    APT(SP_HUMAN,           SK_EVOCATIONS,      0),
+    APT(SP_HUMAN,           SK_INVOCATIONS,     1),
+    APT(SP_HUMAN,           SK_EVOCATIONS,      1),
 
     // SP_HIGH_ELF
     APT(SP_HIGH_ELF,        SK_FIGHTING,        0),
@@ -61,12 +61,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_HIGH_ELF,        SK_THROWING,        1),
     APT(SP_HIGH_ELF,        SK_ARMOUR,         -1),
     APT(SP_HIGH_ELF,        SK_DODGING,         1),
-    APT(SP_HIGH_ELF,        SK_STEALTH,         1),
+    APT(SP_HIGH_ELF,        SK_STEALTH,         2),
     APT(SP_HIGH_ELF,        SK_STABBING,       -1),
     APT(SP_HIGH_ELF,        SK_SHIELDS,        -1),
     APT(SP_HIGH_ELF,        SK_TRAPS_DOORS,     0),
     APT(SP_HIGH_ELF,        SK_UNARMED_COMBAT, -2),
-    APT(SP_HIGH_ELF,        SK_SPELLCASTING,    2),
+    APT(SP_HIGH_ELF,        SK_SPELLCASTING,    1),
     APT(SP_HIGH_ELF,        SK_CONJURATIONS,    1),
     APT(SP_HIGH_ELF,        SK_HEXES,           0),
     APT(SP_HIGH_ELF,        SK_CHARMS,          2),
@@ -79,8 +79,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_HIGH_ELF,        SK_AIR_MAGIC,       2),
     APT(SP_HIGH_ELF,        SK_EARTH_MAGIC,    -2),
     APT(SP_HIGH_ELF,        SK_POISON_MAGIC,   -2),
-    APT(SP_HIGH_ELF,        SK_INVOCATIONS,     0),
-    APT(SP_HIGH_ELF,        SK_EVOCATIONS,      0),
+    APT(SP_HIGH_ELF,        SK_INVOCATIONS,     1),
+    APT(SP_HIGH_ELF,        SK_EVOCATIONS,      1),
 
     // SP_DEEP_ELF
     APT(SP_DEEP_ELF,        SK_FIGHTING,       -2),
@@ -96,12 +96,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_DEEP_ELF,        SK_THROWING,        1),
     APT(SP_DEEP_ELF,        SK_ARMOUR,         -2),
     APT(SP_DEEP_ELF,        SK_DODGING,         2),
-    APT(SP_DEEP_ELF,        SK_STEALTH,         2),
+    APT(SP_DEEP_ELF,        SK_STEALTH,         3),
     APT(SP_DEEP_ELF,        SK_STABBING,        1),
     APT(SP_DEEP_ELF,        SK_SHIELDS,        -2),
     APT(SP_DEEP_ELF,        SK_TRAPS_DOORS,     0),
     APT(SP_DEEP_ELF,        SK_UNARMED_COMBAT, -2),
-    APT(SP_DEEP_ELF,        SK_SPELLCASTING,    4),
+    APT(SP_DEEP_ELF,        SK_SPELLCASTING,    3),
     APT(SP_DEEP_ELF,        SK_CONJURATIONS,    1),
     APT(SP_DEEP_ELF,        SK_HEXES,           3),
     APT(SP_DEEP_ELF,        SK_CHARMS,          4),
@@ -114,8 +114,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_DEEP_ELF,        SK_AIR_MAGIC,       1),
     APT(SP_DEEP_ELF,        SK_EARTH_MAGIC,     0),
     APT(SP_DEEP_ELF,        SK_POISON_MAGIC,    1),
-    APT(SP_DEEP_ELF,        SK_INVOCATIONS,     0),
-    APT(SP_DEEP_ELF,        SK_EVOCATIONS,      1),
+    APT(SP_DEEP_ELF,        SK_INVOCATIONS,     1),
+    APT(SP_DEEP_ELF,        SK_EVOCATIONS,      2),
 
     // SP_SLUDGE_ELF
     APT(SP_SLUDGE_ELF,      SK_FIGHTING,        1),
@@ -131,12 +131,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_SLUDGE_ELF,      SK_THROWING,        2),
     APT(SP_SLUDGE_ELF,      SK_ARMOUR,         -2),
     APT(SP_SLUDGE_ELF,      SK_DODGING,         2),
-    APT(SP_SLUDGE_ELF,      SK_STEALTH,         1),
+    APT(SP_SLUDGE_ELF,      SK_STEALTH,         2),
     APT(SP_SLUDGE_ELF,      SK_STABBING,        0),
     APT(SP_SLUDGE_ELF,      SK_SHIELDS,        -2),
     APT(SP_SLUDGE_ELF,      SK_TRAPS_DOORS,     0),
     APT(SP_SLUDGE_ELF,      SK_UNARMED_COMBAT,  1),
-    APT(SP_SLUDGE_ELF,      SK_SPELLCASTING,    2),
+    APT(SP_SLUDGE_ELF,      SK_SPELLCASTING,    1),
     APT(SP_SLUDGE_ELF,      SK_CONJURATIONS,   -2),
     APT(SP_SLUDGE_ELF,      SK_HEXES,           0),
     APT(SP_SLUDGE_ELF,      SK_CHARMS,         -2),
@@ -149,8 +149,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_SLUDGE_ELF,      SK_AIR_MAGIC,       1),
     APT(SP_SLUDGE_ELF,      SK_EARTH_MAGIC,     1),
     APT(SP_SLUDGE_ELF,      SK_POISON_MAGIC,    1),
-    APT(SP_SLUDGE_ELF,      SK_INVOCATIONS,     0),
-    APT(SP_SLUDGE_ELF,      SK_EVOCATIONS,      0),
+    APT(SP_SLUDGE_ELF,      SK_INVOCATIONS,     1),
+    APT(SP_SLUDGE_ELF,      SK_EVOCATIONS,      1),
 
     // SP_HALFLING
     APT(SP_HALFLING,        SK_FIGHTING,       -1),
@@ -166,12 +166,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_HALFLING,        SK_THROWING,        3),
     APT(SP_HALFLING,        SK_ARMOUR,         -2),
     APT(SP_HALFLING,        SK_DODGING,         2),
-    APT(SP_HALFLING,        SK_STEALTH,         3),
+    APT(SP_HALFLING,        SK_STEALTH,         4),
     APT(SP_HALFLING,        SK_STABBING,        0),
     APT(SP_HALFLING,        SK_SHIELDS,         1),
     APT(SP_HALFLING,        SK_TRAPS_DOORS,     0),
     APT(SP_HALFLING,        SK_UNARMED_COMBAT, -2),
-    APT(SP_HALFLING,        SK_SPELLCASTING,   -2),
+    APT(SP_HALFLING,        SK_SPELLCASTING,   -3),
     APT(SP_HALFLING,        SK_CONJURATIONS,   -2),
     APT(SP_HALFLING,        SK_HEXES,          -1),
     APT(SP_HALFLING,        SK_CHARMS,          1),
@@ -184,8 +184,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_HALFLING,        SK_AIR_MAGIC,       1),
     APT(SP_HALFLING,        SK_EARTH_MAGIC,     0),
     APT(SP_HALFLING,        SK_POISON_MAGIC,   -1),
-    APT(SP_HALFLING,        SK_INVOCATIONS,     0),
-    APT(SP_HALFLING,        SK_EVOCATIONS,      1),
+    APT(SP_HALFLING,        SK_INVOCATIONS,     1),
+    APT(SP_HALFLING,        SK_EVOCATIONS,      2),
 
     // SP_HILL_ORC
     APT(SP_HILL_ORC,        SK_FIGHTING,        2),
@@ -201,12 +201,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_HILL_ORC,        SK_THROWING,        0),
     APT(SP_HILL_ORC,        SK_ARMOUR,          1),
     APT(SP_HILL_ORC,        SK_DODGING,        -2),
-    APT(SP_HILL_ORC,        SK_STEALTH,        -2),
+    APT(SP_HILL_ORC,        SK_STEALTH,        -1),
     APT(SP_HILL_ORC,        SK_STABBING,        2),
     APT(SP_HILL_ORC,        SK_SHIELDS,         1),
     APT(SP_HILL_ORC,        SK_TRAPS_DOORS,     0),
     APT(SP_HILL_ORC,        SK_UNARMED_COMBAT,  1),
-    APT(SP_HILL_ORC,        SK_SPELLCASTING,   -2),
+    APT(SP_HILL_ORC,        SK_SPELLCASTING,   -3),
     APT(SP_HILL_ORC,        SK_CONJURATIONS,    0),
     APT(SP_HILL_ORC,        SK_HEXES,           0),
     APT(SP_HILL_ORC,        SK_CHARMS,         -1),
@@ -219,8 +219,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_HILL_ORC,        SK_AIR_MAGIC,      -2),
     APT(SP_HILL_ORC,        SK_EARTH_MAGIC,     0),
     APT(SP_HILL_ORC,        SK_POISON_MAGIC,   -1),
-    APT(SP_HILL_ORC,        SK_INVOCATIONS,     2),
-    APT(SP_HILL_ORC,        SK_EVOCATIONS,      0),
+    APT(SP_HILL_ORC,        SK_INVOCATIONS,     3),
+    APT(SP_HILL_ORC,        SK_EVOCATIONS,      1),
 
     // SP_KOBOLD
     APT(SP_KOBOLD,          SK_FIGHTING,        1),
@@ -236,12 +236,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_KOBOLD,          SK_THROWING,        3),
     APT(SP_KOBOLD,          SK_ARMOUR,         -2),
     APT(SP_KOBOLD,          SK_DODGING,         2),
-    APT(SP_KOBOLD,          SK_STEALTH,         3),
+    APT(SP_KOBOLD,          SK_STEALTH,         4),
     APT(SP_KOBOLD,          SK_STABBING,        2),
     APT(SP_KOBOLD,          SK_SHIELDS,        -2),
     APT(SP_KOBOLD,          SK_TRAPS_DOORS,     0),
     APT(SP_KOBOLD,          SK_UNARMED_COMBAT,  0),
-    APT(SP_KOBOLD,          SK_SPELLCASTING,    0),
+    APT(SP_KOBOLD,          SK_SPELLCASTING,   -1),
     APT(SP_KOBOLD,          SK_CONJURATIONS,   -1),
     APT(SP_KOBOLD,          SK_HEXES,           0),
     APT(SP_KOBOLD,          SK_CHARMS,         -2),
@@ -254,8 +254,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_KOBOLD,          SK_AIR_MAGIC,       0),
     APT(SP_KOBOLD,          SK_EARTH_MAGIC,     0),
     APT(SP_KOBOLD,          SK_POISON_MAGIC,    0),
-    APT(SP_KOBOLD,          SK_INVOCATIONS,     0),
-    APT(SP_KOBOLD,          SK_EVOCATIONS,      2),
+    APT(SP_KOBOLD,          SK_INVOCATIONS,     1),
+    APT(SP_KOBOLD,          SK_EVOCATIONS,      3),
 
     // SP_MUMMY
     APT(SP_MUMMY,           SK_FIGHTING,        0),
@@ -271,12 +271,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_MUMMY,           SK_THROWING,       -2),
     APT(SP_MUMMY,           SK_ARMOUR,         -2),
     APT(SP_MUMMY,           SK_DODGING,        -2),
-    APT(SP_MUMMY,           SK_STEALTH,        -2),
+    APT(SP_MUMMY,           SK_STEALTH,        -1),
     APT(SP_MUMMY,           SK_STABBING,       -2),
     APT(SP_MUMMY,           SK_SHIELDS,        -2),
     APT(SP_MUMMY,           SK_TRAPS_DOORS,    -2),
     APT(SP_MUMMY,           SK_UNARMED_COMBAT, -2),
-    APT(SP_MUMMY,           SK_SPELLCASTING,    0),
+    APT(SP_MUMMY,           SK_SPELLCASTING,   -1),
     APT(SP_MUMMY,           SK_CONJURATIONS,   -2),
     APT(SP_MUMMY,           SK_HEXES,          -1),
     APT(SP_MUMMY,           SK_CHARMS,         -2),
@@ -289,8 +289,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_MUMMY,           SK_AIR_MAGIC,      -2),
     APT(SP_MUMMY,           SK_EARTH_MAGIC,    -2),
     APT(SP_MUMMY,           SK_POISON_MAGIC,   -2),
-    APT(SP_MUMMY,           SK_INVOCATIONS,    -2),
-    APT(SP_MUMMY,           SK_EVOCATIONS,     -2),
+    APT(SP_MUMMY,           SK_INVOCATIONS,    -1),
+    APT(SP_MUMMY,           SK_EVOCATIONS,     -1),
 
     // SP_NAGA
     APT(SP_NAGA,            SK_FIGHTING,        0),
@@ -311,7 +311,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_NAGA,            SK_SHIELDS,        -2),
     APT(SP_NAGA,            SK_TRAPS_DOORS,     0),
     APT(SP_NAGA,            SK_UNARMED_COMBAT,  0),
-    APT(SP_NAGA,            SK_SPELLCASTING,    0),
+    APT(SP_NAGA,            SK_SPELLCASTING,   -1),
     APT(SP_NAGA,            SK_CONJURATIONS,    0),
     APT(SP_NAGA,            SK_HEXES,           0),
     APT(SP_NAGA,            SK_CHARMS,          0),
@@ -324,8 +324,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_NAGA,            SK_AIR_MAGIC,       0),
     APT(SP_NAGA,            SK_EARTH_MAGIC,     0),
     APT(SP_NAGA,            SK_POISON_MAGIC,    3),
-    APT(SP_NAGA,            SK_INVOCATIONS,     0),
-    APT(SP_NAGA,            SK_EVOCATIONS,      0),
+    APT(SP_NAGA,            SK_INVOCATIONS,     1),
+    APT(SP_NAGA,            SK_EVOCATIONS,      1),
 
     // SP_OGRE
     APT(SP_OGRE,            SK_FIGHTING,        3),
@@ -341,12 +341,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_OGRE,            SK_THROWING,        1),
     APT(SP_OGRE,            SK_ARMOUR,         -2),
     APT(SP_OGRE,            SK_DODGING,        -1),
-    APT(SP_OGRE,            SK_STEALTH,        -2),
+    APT(SP_OGRE,            SK_STEALTH,        -1),
     APT(SP_OGRE,            SK_STABBING,       -2),
     APT(SP_OGRE,            SK_SHIELDS,        -1),
     APT(SP_OGRE,            SK_TRAPS_DOORS,    -2),
     APT(SP_OGRE,            SK_UNARMED_COMBAT, -1),
-    APT(SP_OGRE,            SK_SPELLCASTING,    2),
+    APT(SP_OGRE,            SK_SPELLCASTING,    1),
     APT(SP_OGRE,            SK_CONJURATIONS,   -3),
     APT(SP_OGRE,            SK_HEXES,          -3),
     APT(SP_OGRE,            SK_CHARMS,         -3),
@@ -359,8 +359,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_OGRE,            SK_AIR_MAGIC,      -3),
     APT(SP_OGRE,            SK_EARTH_MAGIC,    -3),
     APT(SP_OGRE,            SK_POISON_MAGIC,   -3),
-    APT(SP_OGRE,            SK_INVOCATIONS,     0),
-    APT(SP_OGRE,            SK_EVOCATIONS,     -2),
+    APT(SP_OGRE,            SK_INVOCATIONS,     1),
+    APT(SP_OGRE,            SK_EVOCATIONS,     -1),
 
     // SP_TROLL
     APT(SP_TROLL,           SK_FIGHTING,       -2),
@@ -376,12 +376,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_TROLL,           SK_THROWING,       -1),
     APT(SP_TROLL,           SK_ARMOUR,         -2),
     APT(SP_TROLL,           SK_DODGING,        -2),
-    APT(SP_TROLL,           SK_STEALTH,        -5),
+    APT(SP_TROLL,           SK_STEALTH,        -4),
     APT(SP_TROLL,           SK_STABBING,       -2),
     APT(SP_TROLL,           SK_SHIELDS,        -2),
     APT(SP_TROLL,           SK_TRAPS_DOORS,    -4),
     APT(SP_TROLL,           SK_UNARMED_COMBAT,  0),
-    APT(SP_TROLL,           SK_SPELLCASTING,   -4),
+    APT(SP_TROLL,           SK_SPELLCASTING,   -5),
     APT(SP_TROLL,           SK_CONJURATIONS,   -3),
     APT(SP_TROLL,           SK_HEXES,          -4),
     APT(SP_TROLL,           SK_CHARMS,         -4),
@@ -394,8 +394,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_TROLL,           SK_AIR_MAGIC,      -4),
     APT(SP_TROLL,           SK_EARTH_MAGIC,    -1),
     APT(SP_TROLL,           SK_POISON_MAGIC,   -3),
-    APT(SP_TROLL,           SK_INVOCATIONS,    -2),
-    APT(SP_TROLL,           SK_EVOCATIONS,     -3),
+    APT(SP_TROLL,           SK_INVOCATIONS,    -1),
+    APT(SP_TROLL,           SK_EVOCATIONS,     -2),
 
     // SP_RED_DRACONIAN
     APT(SP_RED_DRACONIAN,   SK_FIGHTING,        1),
@@ -411,12 +411,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_RED_DRACONIAN,   SK_THROWING,       -1),
     APT(SP_RED_DRACONIAN,   SK_ARMOUR,        -99),
     APT(SP_RED_DRACONIAN,   SK_DODGING,        -1),
-    APT(SP_RED_DRACONIAN,   SK_STEALTH,        -1),
+    APT(SP_RED_DRACONIAN,   SK_STEALTH,         0),
     APT(SP_RED_DRACONIAN,   SK_STABBING,        0),
     APT(SP_RED_DRACONIAN,   SK_SHIELDS,         0),
     APT(SP_RED_DRACONIAN,   SK_TRAPS_DOORS,     0),
     APT(SP_RED_DRACONIAN,   SK_UNARMED_COMBAT,  0),
-    APT(SP_RED_DRACONIAN,   SK_SPELLCASTING,    0),
+    APT(SP_RED_DRACONIAN,   SK_SPELLCASTING,   -1),
     APT(SP_RED_DRACONIAN,   SK_CONJURATIONS,    0),
     APT(SP_RED_DRACONIAN,   SK_HEXES,          -1),
     APT(SP_RED_DRACONIAN,   SK_CHARMS,         -1),
@@ -429,8 +429,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_RED_DRACONIAN,   SK_AIR_MAGIC,       0),
     APT(SP_RED_DRACONIAN,   SK_EARTH_MAGIC,     0),
     APT(SP_RED_DRACONIAN,   SK_POISON_MAGIC,    0),
-    APT(SP_RED_DRACONIAN,   SK_INVOCATIONS,     0),
-    APT(SP_RED_DRACONIAN,   SK_EVOCATIONS,      0),
+    APT(SP_RED_DRACONIAN,   SK_INVOCATIONS,     1),
+    APT(SP_RED_DRACONIAN,   SK_EVOCATIONS,      1),
 
     // SP_WHITE_DRACONIAN
     APT(SP_WHITE_DRACONIAN, SK_FIGHTING,        1),
@@ -446,12 +446,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_WHITE_DRACONIAN, SK_THROWING,       -1),
     APT(SP_WHITE_DRACONIAN, SK_ARMOUR,        -99),
     APT(SP_WHITE_DRACONIAN, SK_DODGING,        -1),
-    APT(SP_WHITE_DRACONIAN, SK_STEALTH,        -1),
+    APT(SP_WHITE_DRACONIAN, SK_STEALTH,         0),
     APT(SP_WHITE_DRACONIAN, SK_STABBING,        0),
     APT(SP_WHITE_DRACONIAN, SK_SHIELDS,         0),
     APT(SP_WHITE_DRACONIAN, SK_TRAPS_DOORS,     0),
     APT(SP_WHITE_DRACONIAN, SK_UNARMED_COMBAT,  0),
-    APT(SP_WHITE_DRACONIAN, SK_SPELLCASTING,    0),
+    APT(SP_WHITE_DRACONIAN, SK_SPELLCASTING,   -1),
     APT(SP_WHITE_DRACONIAN, SK_CONJURATIONS,    0),
     APT(SP_WHITE_DRACONIAN, SK_HEXES,          -1),
     APT(SP_WHITE_DRACONIAN, SK_CHARMS,         -1),
@@ -464,8 +464,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_WHITE_DRACONIAN, SK_AIR_MAGIC,       0),
     APT(SP_WHITE_DRACONIAN, SK_EARTH_MAGIC,     0),
     APT(SP_WHITE_DRACONIAN, SK_POISON_MAGIC,    0),
-    APT(SP_WHITE_DRACONIAN, SK_INVOCATIONS,     0),
-    APT(SP_WHITE_DRACONIAN, SK_EVOCATIONS,      0),
+    APT(SP_WHITE_DRACONIAN, SK_INVOCATIONS,     1),
+    APT(SP_WHITE_DRACONIAN, SK_EVOCATIONS,      1),
 
     // SP_GREEN_DRACONIAN
     APT(SP_GREEN_DRACONIAN, SK_FIGHTING,        1),
@@ -481,12 +481,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_GREEN_DRACONIAN, SK_THROWING,       -1),
     APT(SP_GREEN_DRACONIAN, SK_ARMOUR,        -99),
     APT(SP_GREEN_DRACONIAN, SK_DODGING,        -1),
-    APT(SP_GREEN_DRACONIAN, SK_STEALTH,        -1),
+    APT(SP_GREEN_DRACONIAN, SK_STEALTH,         0),
     APT(SP_GREEN_DRACONIAN, SK_STABBING,        0),
     APT(SP_GREEN_DRACONIAN, SK_SHIELDS,         0),
     APT(SP_GREEN_DRACONIAN, SK_TRAPS_DOORS,     0),
     APT(SP_GREEN_DRACONIAN, SK_UNARMED_COMBAT,  0),
-    APT(SP_GREEN_DRACONIAN, SK_SPELLCASTING,    0),
+    APT(SP_GREEN_DRACONIAN, SK_SPELLCASTING,   -1),
     APT(SP_GREEN_DRACONIAN, SK_CONJURATIONS,    0),
     APT(SP_GREEN_DRACONIAN, SK_HEXES,          -1),
     APT(SP_GREEN_DRACONIAN, SK_CHARMS,         -1),
@@ -499,8 +499,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_GREEN_DRACONIAN, SK_AIR_MAGIC,       0),
     APT(SP_GREEN_DRACONIAN, SK_EARTH_MAGIC,     0),
     APT(SP_GREEN_DRACONIAN, SK_POISON_MAGIC,    2),
-    APT(SP_GREEN_DRACONIAN, SK_INVOCATIONS,     0),
-    APT(SP_GREEN_DRACONIAN, SK_EVOCATIONS,      0),
+    APT(SP_GREEN_DRACONIAN, SK_INVOCATIONS,     1),
+    APT(SP_GREEN_DRACONIAN, SK_EVOCATIONS,      1),
 
     // SP_YELLOW_DRACONIAN
     APT(SP_YELLOW_DRACONIAN,SK_FIGHTING,        1),
@@ -516,12 +516,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_YELLOW_DRACONIAN,SK_THROWING,       -1),
     APT(SP_YELLOW_DRACONIAN,SK_ARMOUR,        -99),
     APT(SP_YELLOW_DRACONIAN,SK_DODGING,        -1),
-    APT(SP_YELLOW_DRACONIAN,SK_STEALTH,        -1),
+    APT(SP_YELLOW_DRACONIAN,SK_STEALTH,         0),
     APT(SP_YELLOW_DRACONIAN,SK_STABBING,        0),
     APT(SP_YELLOW_DRACONIAN,SK_SHIELDS,         0),
     APT(SP_YELLOW_DRACONIAN,SK_TRAPS_DOORS,     0),
     APT(SP_YELLOW_DRACONIAN,SK_UNARMED_COMBAT,  0),
-    APT(SP_YELLOW_DRACONIAN,SK_SPELLCASTING,    0),
+    APT(SP_YELLOW_DRACONIAN,SK_SPELLCASTING,   -1),
     APT(SP_YELLOW_DRACONIAN,SK_CONJURATIONS,    0),
     APT(SP_YELLOW_DRACONIAN,SK_HEXES,          -1),
     APT(SP_YELLOW_DRACONIAN,SK_CHARMS,         -1),
@@ -534,8 +534,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_YELLOW_DRACONIAN,SK_AIR_MAGIC,       0),
     APT(SP_YELLOW_DRACONIAN,SK_EARTH_MAGIC,     0),
     APT(SP_YELLOW_DRACONIAN,SK_POISON_MAGIC,    0),
-    APT(SP_YELLOW_DRACONIAN,SK_INVOCATIONS,     0),
-    APT(SP_YELLOW_DRACONIAN,SK_EVOCATIONS,      0),
+    APT(SP_YELLOW_DRACONIAN,SK_INVOCATIONS,     1),
+    APT(SP_YELLOW_DRACONIAN,SK_EVOCATIONS,      1),
 
     // SP_GREY_DRACONIAN
     APT(SP_GREY_DRACONIAN,  SK_FIGHTING,        1),
@@ -551,12 +551,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_GREY_DRACONIAN,  SK_THROWING,       -1),
     APT(SP_GREY_DRACONIAN,  SK_ARMOUR,        -99),
     APT(SP_GREY_DRACONIAN,  SK_DODGING,        -1),
-    APT(SP_GREY_DRACONIAN,  SK_STEALTH,        -1),
+    APT(SP_GREY_DRACONIAN,  SK_STEALTH,         0),
     APT(SP_GREY_DRACONIAN,  SK_STABBING,        0),
     APT(SP_GREY_DRACONIAN,  SK_SHIELDS,         0),
     APT(SP_GREY_DRACONIAN,  SK_TRAPS_DOORS,     0),
     APT(SP_GREY_DRACONIAN,  SK_UNARMED_COMBAT,  0),
-    APT(SP_GREY_DRACONIAN,  SK_SPELLCASTING,    0),
+    APT(SP_GREY_DRACONIAN,  SK_SPELLCASTING,   -1),
     APT(SP_GREY_DRACONIAN,  SK_CONJURATIONS,    0),
     APT(SP_GREY_DRACONIAN,  SK_HEXES,          -1),
     APT(SP_GREY_DRACONIAN,  SK_CHARMS,         -1),
@@ -569,8 +569,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_GREY_DRACONIAN,  SK_AIR_MAGIC,      -2),
     APT(SP_GREY_DRACONIAN,  SK_EARTH_MAGIC,     2),
     APT(SP_GREY_DRACONIAN,  SK_POISON_MAGIC,    0),
-    APT(SP_GREY_DRACONIAN,  SK_INVOCATIONS,     0),
-    APT(SP_GREY_DRACONIAN,  SK_EVOCATIONS,      0),
+    APT(SP_GREY_DRACONIAN,  SK_INVOCATIONS,     1),
+    APT(SP_GREY_DRACONIAN,  SK_EVOCATIONS,      1),
 
     // SP_BLACK_DRACONIAN
     APT(SP_BLACK_DRACONIAN, SK_FIGHTING,        1),
@@ -586,12 +586,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_BLACK_DRACONIAN, SK_THROWING,       -1),
     APT(SP_BLACK_DRACONIAN, SK_ARMOUR,        -99),
     APT(SP_BLACK_DRACONIAN, SK_DODGING,        -1),
-    APT(SP_BLACK_DRACONIAN, SK_STEALTH,        -1),
+    APT(SP_BLACK_DRACONIAN, SK_STEALTH,         0),
     APT(SP_BLACK_DRACONIAN, SK_STABBING,        0),
     APT(SP_BLACK_DRACONIAN, SK_SHIELDS,         0),
     APT(SP_BLACK_DRACONIAN, SK_TRAPS_DOORS,     0),
     APT(SP_BLACK_DRACONIAN, SK_UNARMED_COMBAT,  0),
-    APT(SP_BLACK_DRACONIAN, SK_SPELLCASTING,    0),
+    APT(SP_BLACK_DRACONIAN, SK_SPELLCASTING,   -1),
     APT(SP_BLACK_DRACONIAN, SK_CONJURATIONS,    0),
     APT(SP_BLACK_DRACONIAN, SK_HEXES,          -1),
     APT(SP_BLACK_DRACONIAN, SK_CHARMS,         -1),
@@ -604,8 +604,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_BLACK_DRACONIAN, SK_AIR_MAGIC,       2),
     APT(SP_BLACK_DRACONIAN, SK_EARTH_MAGIC,    -2),
     APT(SP_BLACK_DRACONIAN, SK_POISON_MAGIC,    0),
-    APT(SP_BLACK_DRACONIAN, SK_INVOCATIONS,     0),
-    APT(SP_BLACK_DRACONIAN, SK_EVOCATIONS,      0),
+    APT(SP_BLACK_DRACONIAN, SK_INVOCATIONS,     1),
+    APT(SP_BLACK_DRACONIAN, SK_EVOCATIONS,      1),
 
     // SP_PURPLE_DRACONIAN
     APT(SP_PURPLE_DRACONIAN,SK_FIGHTING,        1),
@@ -621,12 +621,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_PURPLE_DRACONIAN,SK_THROWING,       -1),
     APT(SP_PURPLE_DRACONIAN,SK_ARMOUR,        -99),
     APT(SP_PURPLE_DRACONIAN,SK_DODGING,        -1),
-    APT(SP_PURPLE_DRACONIAN,SK_STEALTH,        -1),
+    APT(SP_PURPLE_DRACONIAN,SK_STEALTH,         0),
     APT(SP_PURPLE_DRACONIAN,SK_STABBING,        0),
     APT(SP_PURPLE_DRACONIAN,SK_SHIELDS,         0),
     APT(SP_PURPLE_DRACONIAN,SK_TRAPS_DOORS,     0),
     APT(SP_PURPLE_DRACONIAN,SK_UNARMED_COMBAT,  0),
-    APT(SP_PURPLE_DRACONIAN,SK_SPELLCASTING,    2),
+    APT(SP_PURPLE_DRACONIAN,SK_SPELLCASTING,    1),
     APT(SP_PURPLE_DRACONIAN,SK_CONJURATIONS,    0),
     APT(SP_PURPLE_DRACONIAN,SK_HEXES,           1),
     APT(SP_PURPLE_DRACONIAN,SK_CHARMS,          1),
@@ -639,8 +639,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_PURPLE_DRACONIAN,SK_AIR_MAGIC,       0),
     APT(SP_PURPLE_DRACONIAN,SK_EARTH_MAGIC,     0),
     APT(SP_PURPLE_DRACONIAN,SK_POISON_MAGIC,    0),
-    APT(SP_PURPLE_DRACONIAN,SK_INVOCATIONS,     0),
-    APT(SP_PURPLE_DRACONIAN,SK_EVOCATIONS,      1),
+    APT(SP_PURPLE_DRACONIAN,SK_INVOCATIONS,     1),
+    APT(SP_PURPLE_DRACONIAN,SK_EVOCATIONS,      2),
 
     // SP_MOTTLED_DRACONIAN
     APT(SP_MOTTLED_DRACONIAN,SK_FIGHTING,        1),
@@ -656,12 +656,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_MOTTLED_DRACONIAN,SK_THROWING,       -1),
     APT(SP_MOTTLED_DRACONIAN,SK_ARMOUR,        -99),
     APT(SP_MOTTLED_DRACONIAN,SK_DODGING,        -1),
-    APT(SP_MOTTLED_DRACONIAN,SK_STEALTH,        -1),
+    APT(SP_MOTTLED_DRACONIAN,SK_STEALTH,         0),
     APT(SP_MOTTLED_DRACONIAN,SK_STABBING,        0),
     APT(SP_MOTTLED_DRACONIAN,SK_SHIELDS,         0),
     APT(SP_MOTTLED_DRACONIAN,SK_TRAPS_DOORS,     0),
     APT(SP_MOTTLED_DRACONIAN,SK_UNARMED_COMBAT,  0),
-    APT(SP_MOTTLED_DRACONIAN,SK_SPELLCASTING,    0),
+    APT(SP_MOTTLED_DRACONIAN,SK_SPELLCASTING,   -1),
     APT(SP_MOTTLED_DRACONIAN,SK_CONJURATIONS,    0),
     APT(SP_MOTTLED_DRACONIAN,SK_HEXES,          -1),
     APT(SP_MOTTLED_DRACONIAN,SK_CHARMS,         -1),
@@ -674,8 +674,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_MOTTLED_DRACONIAN,SK_AIR_MAGIC,       0),
     APT(SP_MOTTLED_DRACONIAN,SK_EARTH_MAGIC,     0),
     APT(SP_MOTTLED_DRACONIAN,SK_POISON_MAGIC,    0),
-    APT(SP_MOTTLED_DRACONIAN,SK_INVOCATIONS,     0),
-    APT(SP_MOTTLED_DRACONIAN,SK_EVOCATIONS,      0),
+    APT(SP_MOTTLED_DRACONIAN,SK_INVOCATIONS,     1),
+    APT(SP_MOTTLED_DRACONIAN,SK_EVOCATIONS,      1),
 
     // SP_PALE_DRACONIAN
     APT(SP_PALE_DRACONIAN,  SK_FIGHTING,        1),
@@ -691,12 +691,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_PALE_DRACONIAN,  SK_THROWING,       -1),
     APT(SP_PALE_DRACONIAN,  SK_ARMOUR,        -99),
     APT(SP_PALE_DRACONIAN,  SK_DODGING,        -1),
-    APT(SP_PALE_DRACONIAN,  SK_STEALTH,        -1),
+    APT(SP_PALE_DRACONIAN,  SK_STEALTH,         0),
     APT(SP_PALE_DRACONIAN,  SK_STABBING,        0),
     APT(SP_PALE_DRACONIAN,  SK_SHIELDS,         0),
     APT(SP_PALE_DRACONIAN,  SK_TRAPS_DOORS,     0),
     APT(SP_PALE_DRACONIAN,  SK_UNARMED_COMBAT,  0),
-    APT(SP_PALE_DRACONIAN,  SK_SPELLCASTING,    0),
+    APT(SP_PALE_DRACONIAN,  SK_SPELLCASTING,   -1),
     APT(SP_PALE_DRACONIAN,  SK_CONJURATIONS,    0),
     APT(SP_PALE_DRACONIAN,  SK_HEXES,          -1),
     APT(SP_PALE_DRACONIAN,  SK_CHARMS,         -1),
@@ -709,8 +709,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_PALE_DRACONIAN,  SK_AIR_MAGIC,       1),
     APT(SP_PALE_DRACONIAN,  SK_EARTH_MAGIC,     0),
     APT(SP_PALE_DRACONIAN,  SK_POISON_MAGIC,    0),
-    APT(SP_PALE_DRACONIAN,  SK_INVOCATIONS,     0),
-    APT(SP_PALE_DRACONIAN,  SK_EVOCATIONS,      1),
+    APT(SP_PALE_DRACONIAN,  SK_INVOCATIONS,     1),
+    APT(SP_PALE_DRACONIAN,  SK_EVOCATIONS,      2),
 
     // SP_BASE_DRACONIAN
     APT(SP_BASE_DRACONIAN,  SK_FIGHTING,        1),
@@ -726,12 +726,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_BASE_DRACONIAN,  SK_THROWING,       -1),
     APT(SP_BASE_DRACONIAN,  SK_ARMOUR,        -99),
     APT(SP_BASE_DRACONIAN,  SK_DODGING,        -1),
-    APT(SP_BASE_DRACONIAN,  SK_STEALTH,        -1),
+    APT(SP_BASE_DRACONIAN,  SK_STEALTH,         0),
     APT(SP_BASE_DRACONIAN,  SK_STABBING,        0),
     APT(SP_BASE_DRACONIAN,  SK_SHIELDS,         0),
     APT(SP_BASE_DRACONIAN,  SK_TRAPS_DOORS,     0),
     APT(SP_BASE_DRACONIAN,  SK_UNARMED_COMBAT,  0),
-    APT(SP_BASE_DRACONIAN,  SK_SPELLCASTING,    0),
+    APT(SP_BASE_DRACONIAN,  SK_SPELLCASTING,   -1),
     APT(SP_BASE_DRACONIAN,  SK_CONJURATIONS,    0),
     APT(SP_BASE_DRACONIAN,  SK_HEXES,          -1),
     APT(SP_BASE_DRACONIAN,  SK_CHARMS,         -1),
@@ -744,8 +744,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_BASE_DRACONIAN,  SK_AIR_MAGIC,       0),
     APT(SP_BASE_DRACONIAN,  SK_EARTH_MAGIC,     0),
     APT(SP_BASE_DRACONIAN,  SK_POISON_MAGIC,    0),
-    APT(SP_BASE_DRACONIAN,  SK_INVOCATIONS,     0),
-    APT(SP_BASE_DRACONIAN,  SK_EVOCATIONS,      0),
+    APT(SP_BASE_DRACONIAN,  SK_INVOCATIONS,     1),
+    APT(SP_BASE_DRACONIAN,  SK_EVOCATIONS,      1),
 
     // SP_CENTAUR
     APT(SP_CENTAUR,         SK_FIGHTING,        0),
@@ -761,12 +761,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_CENTAUR,         SK_THROWING,        3),
     APT(SP_CENTAUR,         SK_ARMOUR,         -3),
     APT(SP_CENTAUR,         SK_DODGING,        -3),
-    APT(SP_CENTAUR,         SK_STEALTH,        -4),
+    APT(SP_CENTAUR,         SK_STEALTH,        -3),
     APT(SP_CENTAUR,         SK_STABBING,       -3),
     APT(SP_CENTAUR,         SK_SHIELDS,        -3),
     APT(SP_CENTAUR,         SK_TRAPS_DOORS,    -2),
     APT(SP_CENTAUR,         SK_UNARMED_COMBAT,  0),
-    APT(SP_CENTAUR,         SK_SPELLCASTING,   -2),
+    APT(SP_CENTAUR,         SK_SPELLCASTING,   -3),
     APT(SP_CENTAUR,         SK_CONJURATIONS,   -1),
     APT(SP_CENTAUR,         SK_HEXES,          -1),
     APT(SP_CENTAUR,         SK_CHARMS,         -1),
@@ -779,8 +779,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_CENTAUR,         SK_AIR_MAGIC,      -1),
     APT(SP_CENTAUR,         SK_EARTH_MAGIC,    -1),
     APT(SP_CENTAUR,         SK_POISON_MAGIC,   -2),
-    APT(SP_CENTAUR,         SK_INVOCATIONS,     0),
-    APT(SP_CENTAUR,         SK_EVOCATIONS,     -1),
+    APT(SP_CENTAUR,         SK_INVOCATIONS,     1),
+    APT(SP_CENTAUR,         SK_EVOCATIONS,      0),
 
     // SP_DEMIGOD
     APT(SP_DEMIGOD,         SK_FIGHTING,       -1),
@@ -796,12 +796,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_DEMIGOD,         SK_THROWING,       -1),
     APT(SP_DEMIGOD,         SK_ARMOUR,         -1),
     APT(SP_DEMIGOD,         SK_DODGING,        -1),
-    APT(SP_DEMIGOD,         SK_STEALTH,        -1),
+    APT(SP_DEMIGOD,         SK_STEALTH,         0),
     APT(SP_DEMIGOD,         SK_STABBING,       -1),
     APT(SP_DEMIGOD,         SK_SHIELDS,        -1),
     APT(SP_DEMIGOD,         SK_TRAPS_DOORS,    -1),
     APT(SP_DEMIGOD,         SK_UNARMED_COMBAT, -1),
-    APT(SP_DEMIGOD,         SK_SPELLCASTING,   -1),
+    APT(SP_DEMIGOD,         SK_SPELLCASTING,   -2),
     APT(SP_DEMIGOD,         SK_CONJURATIONS,   -1),
     APT(SP_DEMIGOD,         SK_HEXES,          -1),
     APT(SP_DEMIGOD,         SK_CHARMS,         -1),
@@ -815,7 +815,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_DEMIGOD,         SK_EARTH_MAGIC,    -1),
     APT(SP_DEMIGOD,         SK_POISON_MAGIC,   -1),
     APT(SP_DEMIGOD,         SK_INVOCATIONS,   -99),
-    APT(SP_DEMIGOD,         SK_EVOCATIONS,     -1),
+    APT(SP_DEMIGOD,         SK_EVOCATIONS,      0),
 
     // SP_SPRIGGAN
     APT(SP_SPRIGGAN,        SK_FIGHTING,       -2),
@@ -831,12 +831,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_SPRIGGAN,        SK_THROWING,        1),
     APT(SP_SPRIGGAN,        SK_ARMOUR,         -3),
     APT(SP_SPRIGGAN,        SK_DODGING,         4),
-    APT(SP_SPRIGGAN,        SK_STEALTH,         4),
+    APT(SP_SPRIGGAN,        SK_STEALTH,         5),
     APT(SP_SPRIGGAN,        SK_STABBING,        4),
     APT(SP_SPRIGGAN,        SK_SHIELDS,        -3),
     APT(SP_SPRIGGAN,        SK_TRAPS_DOORS,     3),
     APT(SP_SPRIGGAN,        SK_UNARMED_COMBAT, -2),
-    APT(SP_SPRIGGAN,        SK_SPELLCASTING,    3),
+    APT(SP_SPRIGGAN,        SK_SPELLCASTING,    2),
     APT(SP_SPRIGGAN,        SK_CONJURATIONS,   -3),
     APT(SP_SPRIGGAN,        SK_HEXES,           2),
     APT(SP_SPRIGGAN,        SK_CHARMS,          4),
@@ -849,8 +849,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_SPRIGGAN,        SK_AIR_MAGIC,      -1),
     APT(SP_SPRIGGAN,        SK_EARTH_MAGIC,    -1),
     APT(SP_SPRIGGAN,        SK_POISON_MAGIC,    0),
-    APT(SP_SPRIGGAN,        SK_INVOCATIONS,    -1),
-    APT(SP_SPRIGGAN,        SK_EVOCATIONS,      3),
+    APT(SP_SPRIGGAN,        SK_INVOCATIONS,     0),
+    APT(SP_SPRIGGAN,        SK_EVOCATIONS,      4),
 
     // SP_MINOTAUR
     APT(SP_MINOTAUR,        SK_FIGHTING,        2),
@@ -866,12 +866,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_MINOTAUR,        SK_THROWING,        0),
     APT(SP_MINOTAUR,        SK_ARMOUR,          2),
     APT(SP_MINOTAUR,        SK_DODGING,         1),
-    APT(SP_MINOTAUR,        SK_STEALTH,        -2),
+    APT(SP_MINOTAUR,        SK_STEALTH,        -1),
     APT(SP_MINOTAUR,        SK_STABBING,       -1),
     APT(SP_MINOTAUR,        SK_SHIELDS,         2),
     APT(SP_MINOTAUR,        SK_TRAPS_DOORS,     0),
     APT(SP_MINOTAUR,        SK_UNARMED_COMBAT,  1),
-    APT(SP_MINOTAUR,        SK_SPELLCASTING,   -3),
+    APT(SP_MINOTAUR,        SK_SPELLCASTING,   -4),
     APT(SP_MINOTAUR,        SK_CONJURATIONS,   -3),
     APT(SP_MINOTAUR,        SK_HEXES,          -4),
     APT(SP_MINOTAUR,        SK_CHARMS,         -4),
@@ -884,8 +884,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_MINOTAUR,        SK_AIR_MAGIC,      -3),
     APT(SP_MINOTAUR,        SK_EARTH_MAGIC,    -2),
     APT(SP_MINOTAUR,        SK_POISON_MAGIC,   -3),
-    APT(SP_MINOTAUR,        SK_INVOCATIONS,    -1),
-    APT(SP_MINOTAUR,        SK_EVOCATIONS,     -1),
+    APT(SP_MINOTAUR,        SK_INVOCATIONS,     0),
+    APT(SP_MINOTAUR,        SK_EVOCATIONS,      0),
 
     // SP_DEMONSPAWN
     APT(SP_DEMONSPAWN,      SK_FIGHTING,        0),
@@ -901,12 +901,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_DEMONSPAWN,      SK_THROWING,       -1),
     APT(SP_DEMONSPAWN,      SK_ARMOUR,         -1),
     APT(SP_DEMONSPAWN,      SK_DODGING,        -1),
-    APT(SP_DEMONSPAWN,      SK_STEALTH,        -1),
+    APT(SP_DEMONSPAWN,      SK_STEALTH,         0),
     APT(SP_DEMONSPAWN,      SK_STABBING,       -1),
     APT(SP_DEMONSPAWN,      SK_SHIELDS,        -1),
     APT(SP_DEMONSPAWN,      SK_TRAPS_DOORS,    -1),
     APT(SP_DEMONSPAWN,      SK_UNARMED_COMBAT, -1),
-    APT(SP_DEMONSPAWN,      SK_SPELLCASTING,    0),
+    APT(SP_DEMONSPAWN,      SK_SPELLCASTING,   -1),
     APT(SP_DEMONSPAWN,      SK_CONJURATIONS,    0),
     APT(SP_DEMONSPAWN,      SK_HEXES,           0),
     APT(SP_DEMONSPAWN,      SK_CHARMS,         -1),
@@ -919,8 +919,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_DEMONSPAWN,      SK_AIR_MAGIC,      -1),
     APT(SP_DEMONSPAWN,      SK_EARTH_MAGIC,    -1),
     APT(SP_DEMONSPAWN,      SK_POISON_MAGIC,    0),
-    APT(SP_DEMONSPAWN,      SK_INVOCATIONS,     2),
-    APT(SP_DEMONSPAWN,      SK_EVOCATIONS,      0),
+    APT(SP_DEMONSPAWN,      SK_INVOCATIONS,     3),
+    APT(SP_DEMONSPAWN,      SK_EVOCATIONS,      1),
 
     // SP_GHOUL
     APT(SP_GHOUL,           SK_FIGHTING,        1),
@@ -936,12 +936,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_GHOUL,           SK_THROWING,       -1),
     APT(SP_GHOUL,           SK_ARMOUR,         -1),
     APT(SP_GHOUL,           SK_DODGING,        -1),
-    APT(SP_GHOUL,           SK_STEALTH,         1),
+    APT(SP_GHOUL,           SK_STEALTH,         2),
     APT(SP_GHOUL,           SK_STABBING,        0),
     APT(SP_GHOUL,           SK_SHIELDS,        -1),
     APT(SP_GHOUL,           SK_TRAPS_DOORS,    -1),
     APT(SP_GHOUL,           SK_UNARMED_COMBAT,  1),
-    APT(SP_GHOUL,           SK_SPELLCASTING,   -1),
+    APT(SP_GHOUL,           SK_SPELLCASTING,   -2),
     APT(SP_GHOUL,           SK_CONJURATIONS,   -2),
     APT(SP_GHOUL,           SK_HEXES,          -2),
     APT(SP_GHOUL,           SK_CHARMS,         -1),
@@ -954,8 +954,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_GHOUL,           SK_AIR_MAGIC,      -2),
     APT(SP_GHOUL,           SK_EARTH_MAGIC,     1),
     APT(SP_GHOUL,           SK_POISON_MAGIC,    0),
-    APT(SP_GHOUL,           SK_INVOCATIONS,     0),
-    APT(SP_GHOUL,           SK_EVOCATIONS,     -1),
+    APT(SP_GHOUL,           SK_INVOCATIONS,     1),
+    APT(SP_GHOUL,           SK_EVOCATIONS,      0),
 
     // SP_TENGU
     APT(SP_TENGU,           SK_FIGHTING,        0),
@@ -971,12 +971,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_TENGU,           SK_THROWING,        1),
     APT(SP_TENGU,           SK_ARMOUR,          1),
     APT(SP_TENGU,           SK_DODGING,         1),
-    APT(SP_TENGU,           SK_STEALTH,         0),
+    APT(SP_TENGU,           SK_STEALTH,         1),
     APT(SP_TENGU,           SK_STABBING,        1),
     APT(SP_TENGU,           SK_SHIELDS,         0),
     APT(SP_TENGU,           SK_TRAPS_DOORS,     0),
     APT(SP_TENGU,           SK_UNARMED_COMBAT,  1),
-    APT(SP_TENGU,           SK_SPELLCASTING,    0),
+    APT(SP_TENGU,           SK_SPELLCASTING,   -1),
     APT(SP_TENGU,           SK_CONJURATIONS,    3),
     APT(SP_TENGU,           SK_HEXES,          -3),
     APT(SP_TENGU,           SK_CHARMS,         -2),
@@ -989,8 +989,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_TENGU,           SK_AIR_MAGIC,       3),
     APT(SP_TENGU,           SK_EARTH_MAGIC,    -3),
     APT(SP_TENGU,           SK_POISON_MAGIC,    0),
-    APT(SP_TENGU,           SK_INVOCATIONS,    -2),
-    APT(SP_TENGU,           SK_EVOCATIONS,      0),
+    APT(SP_TENGU,           SK_INVOCATIONS,    -1),
+    APT(SP_TENGU,           SK_EVOCATIONS,      1),
 
     // SP_MERFOLK
     APT(SP_MERFOLK,         SK_FIGHTING,        1),
@@ -1006,12 +1006,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_MERFOLK,         SK_THROWING,        0),
     APT(SP_MERFOLK,         SK_ARMOUR,         -3),
     APT(SP_MERFOLK,         SK_DODGING,         3),
-    APT(SP_MERFOLK,         SK_STEALTH,         1),
+    APT(SP_MERFOLK,         SK_STEALTH,         2),
     APT(SP_MERFOLK,         SK_STABBING,        2),
     APT(SP_MERFOLK,         SK_SHIELDS,         0),
     APT(SP_MERFOLK,         SK_TRAPS_DOORS,    -1),
     APT(SP_MERFOLK,         SK_UNARMED_COMBAT,  1),
-    APT(SP_MERFOLK,         SK_SPELLCASTING,    0),
+    APT(SP_MERFOLK,         SK_SPELLCASTING,   -1),
     APT(SP_MERFOLK,         SK_CONJURATIONS,   -2),
     APT(SP_MERFOLK,         SK_HEXES,           0),
     APT(SP_MERFOLK,         SK_CHARMS,          1),
@@ -1024,8 +1024,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_MERFOLK,         SK_AIR_MAGIC,      -2),
     APT(SP_MERFOLK,         SK_EARTH_MAGIC,    -2),
     APT(SP_MERFOLK,         SK_POISON_MAGIC,    1),
-    APT(SP_MERFOLK,         SK_INVOCATIONS,     0),
-    APT(SP_MERFOLK,         SK_EVOCATIONS,      0),
+    APT(SP_MERFOLK,         SK_INVOCATIONS,     1),
+    APT(SP_MERFOLK,         SK_EVOCATIONS,      1),
 
     // SP_VAMPIRE
     APT(SP_VAMPIRE,         SK_FIGHTING,       -1),
@@ -1041,12 +1041,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_VAMPIRE,         SK_THROWING,       -2),
     APT(SP_VAMPIRE,         SK_ARMOUR,         -2),
     APT(SP_VAMPIRE,         SK_DODGING,         1),
-    APT(SP_VAMPIRE,         SK_STEALTH,         4),
+    APT(SP_VAMPIRE,         SK_STEALTH,         5),
     APT(SP_VAMPIRE,         SK_STABBING,        1),
     APT(SP_VAMPIRE,         SK_SHIELDS,        -1),
     APT(SP_VAMPIRE,         SK_TRAPS_DOORS,     0),
     APT(SP_VAMPIRE,         SK_UNARMED_COMBAT,  1),
-    APT(SP_VAMPIRE,         SK_SPELLCASTING,    0),
+    APT(SP_VAMPIRE,         SK_SPELLCASTING,   -1),
     APT(SP_VAMPIRE,         SK_CONJURATIONS,   -3),
     APT(SP_VAMPIRE,         SK_HEXES,           4),
     APT(SP_VAMPIRE,         SK_CHARMS,          1),
@@ -1059,8 +1059,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_VAMPIRE,         SK_AIR_MAGIC,       0),
     APT(SP_VAMPIRE,         SK_EARTH_MAGIC,     0),
     APT(SP_VAMPIRE,         SK_POISON_MAGIC,   -1),
-    APT(SP_VAMPIRE,         SK_INVOCATIONS,    -2),
-    APT(SP_VAMPIRE,         SK_EVOCATIONS,     -1),
+    APT(SP_VAMPIRE,         SK_INVOCATIONS,    -1),
+    APT(SP_VAMPIRE,         SK_EVOCATIONS,      0),
 
     // SP_DEEP_DWARF
     APT(SP_DEEP_DWARF,      SK_FIGHTING,       -1),
@@ -1076,12 +1076,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_DEEP_DWARF,      SK_THROWING,       -1),
     APT(SP_DEEP_DWARF,      SK_ARMOUR,          1),
     APT(SP_DEEP_DWARF,      SK_DODGING,         1),
-    APT(SP_DEEP_DWARF,      SK_STEALTH,         2),
+    APT(SP_DEEP_DWARF,      SK_STEALTH,         3),
     APT(SP_DEEP_DWARF,      SK_STABBING,       -1),
     APT(SP_DEEP_DWARF,      SK_SHIELDS,         1),
     APT(SP_DEEP_DWARF,      SK_TRAPS_DOORS,     1),
     APT(SP_DEEP_DWARF,      SK_UNARMED_COMBAT, -1),
-    APT(SP_DEEP_DWARF,      SK_SPELLCASTING,   -1),
+    APT(SP_DEEP_DWARF,      SK_SPELLCASTING,   -2),
     APT(SP_DEEP_DWARF,      SK_CONJURATIONS,   -1),
     APT(SP_DEEP_DWARF,      SK_HEXES,          -2),
     APT(SP_DEEP_DWARF,      SK_CHARMS,         -1),
@@ -1094,8 +1094,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_DEEP_DWARF,      SK_AIR_MAGIC,      -3),
     APT(SP_DEEP_DWARF,      SK_EARTH_MAGIC,     3),
     APT(SP_DEEP_DWARF,      SK_POISON_MAGIC,   -2),
-    APT(SP_DEEP_DWARF,      SK_INVOCATIONS,     2),
-    APT(SP_DEEP_DWARF,      SK_EVOCATIONS,      3),
+    APT(SP_DEEP_DWARF,      SK_INVOCATIONS,     3),
+    APT(SP_DEEP_DWARF,      SK_EVOCATIONS,      4),
 
     // SP_FELID
     APT(SP_FELID,           SK_FIGHTING,        0),
@@ -1111,12 +1111,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_FELID,           SK_THROWING,      -99),
     APT(SP_FELID,           SK_ARMOUR,        -99),
     APT(SP_FELID,           SK_DODGING,         3),
-    APT(SP_FELID,           SK_STEALTH,         3),
+    APT(SP_FELID,           SK_STEALTH,         4),
     APT(SP_FELID,           SK_STABBING,        3),
     APT(SP_FELID,           SK_SHIELDS,       -99),
     APT(SP_FELID,           SK_TRAPS_DOORS,     2),
     APT(SP_FELID,           SK_UNARMED_COMBAT,  0),
-    APT(SP_FELID,           SK_SPELLCASTING,    0),
+    APT(SP_FELID,           SK_SPELLCASTING,   -1),
     APT(SP_FELID,           SK_CONJURATIONS,   -1),
     APT(SP_FELID,           SK_HEXES,           4),
     APT(SP_FELID,           SK_CHARMS,          2),
@@ -1129,8 +1129,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_FELID,           SK_AIR_MAGIC,      -1),
     APT(SP_FELID,           SK_EARTH_MAGIC,    -2),
     APT(SP_FELID,           SK_POISON_MAGIC,   -1),
-    APT(SP_FELID,           SK_INVOCATIONS,    -1),
-    APT(SP_FELID,           SK_EVOCATIONS,      1),
+    APT(SP_FELID,           SK_INVOCATIONS,     0),
+    APT(SP_FELID,           SK_EVOCATIONS,      2),
 
     // SP_OCTOPODE
     APT(SP_OCTOPODE,        SK_FIGHTING,        0),
@@ -1146,12 +1146,12 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_OCTOPODE,        SK_THROWING,        0),
     APT(SP_OCTOPODE,        SK_ARMOUR,        -99),
     APT(SP_OCTOPODE,        SK_DODGING,         0),
-    APT(SP_OCTOPODE,        SK_STEALTH,         3),
+    APT(SP_OCTOPODE,        SK_STEALTH,         4),
     APT(SP_OCTOPODE,        SK_STABBING,        0),
     APT(SP_OCTOPODE,        SK_SHIELDS,         0),
     APT(SP_OCTOPODE,        SK_TRAPS_DOORS,     1),
     APT(SP_OCTOPODE,        SK_UNARMED_COMBAT,  0),
-    APT(SP_OCTOPODE,        SK_SPELLCASTING,    0),
+    APT(SP_OCTOPODE,        SK_SPELLCASTING,   -1),
     APT(SP_OCTOPODE,        SK_CONJURATIONS,    0),
     APT(SP_OCTOPODE,        SK_HEXES,           0),
     APT(SP_OCTOPODE,        SK_CHARMS,          0),
@@ -1164,8 +1164,8 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_OCTOPODE,        SK_AIR_MAGIC,       0),
     APT(SP_OCTOPODE,        SK_EARTH_MAGIC,     0),
     APT(SP_OCTOPODE,        SK_POISON_MAGIC,    2),
-    APT(SP_OCTOPODE,        SK_INVOCATIONS,     0),
-    APT(SP_OCTOPODE,        SK_EVOCATIONS,      1),
+    APT(SP_OCTOPODE,        SK_INVOCATIONS,     1),
+    APT(SP_OCTOPODE,        SK_EVOCATIONS,      2),
 };
 
 #endif