Revert "Reduce everyone's Stealth and Short Blades aptitudes by 1."

This reverts commit 338d957016b8cd57877d58ad8051c252b310c68b.

I'd say the stabbing changes were a *nerf* to stabbers, not a buff... sure,
in the long run you use somewhat less xp, but in the long run there's plenty
of xp anyway. In the early game, which is where xp is tight, you need to
train two skills instead of one to stab things now.

In addition, plenty of non-stabbers use short blades early on... let's not
mess up general weapon category balance for no reason. If a change is needed,
it would make more sense to make it in the stabbing formulas, not in these
more generally relevant aptitudes.

1 files changed, 64 insertions, 64 deletions

diff --git a/crawl-ref/source/aptitudes.h b/crawl-ref/source/aptitudes.h
index c6064373c0..24523e2fbd 100644
--- a/crawl-ref/source/aptitudes.h
+++ b/crawl-ref/source/aptitudes.h
@@ -14,7 +14,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 {
     // SP_HUMAN
     APT(SP_HUMAN,           SK_FIGHTING,        0),
-    APT(SP_HUMAN,           SK_SHORT_BLADES,   -1),
+    APT(SP_HUMAN,           SK_SHORT_BLADES,    0),
     APT(SP_HUMAN,           SK_LONG_BLADES,     0),
     APT(SP_HUMAN,           SK_AXES,            0),
     APT(SP_HUMAN,           SK_MACES_FLAILS,    0),
@@ -26,7 +26,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_HUMAN,           SK_STABBING,        0),
 #endif
@@ -51,7 +51,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_HIGH_ELF
     APT(SP_HIGH_ELF,        SK_FIGHTING,        0),
-    APT(SP_HIGH_ELF,        SK_SHORT_BLADES,    1),
+    APT(SP_HIGH_ELF,        SK_SHORT_BLADES,    2),
     APT(SP_HIGH_ELF,        SK_LONG_BLADES,     2),
     APT(SP_HIGH_ELF,        SK_AXES,           -2),
     APT(SP_HIGH_ELF,        SK_MACES_FLAILS,   -2),
@@ -63,7 +63,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_HIGH_ELF,        SK_STABBING,       -1),
 #endif
@@ -88,7 +88,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_DEEP_ELF
     APT(SP_DEEP_ELF,        SK_FIGHTING,       -2),
-    APT(SP_DEEP_ELF,        SK_SHORT_BLADES,   -1),
+    APT(SP_DEEP_ELF,        SK_SHORT_BLADES,    0),
     APT(SP_DEEP_ELF,        SK_LONG_BLADES,    -1),
     APT(SP_DEEP_ELF,        SK_AXES,           -2),
     APT(SP_DEEP_ELF,        SK_MACES_FLAILS,   -3),
@@ -100,7 +100,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_DEEP_ELF,        SK_STABBING,        1),
 #endif
@@ -125,7 +125,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_SLUDGE_ELF
     APT(SP_SLUDGE_ELF,      SK_FIGHTING,        1),
-    APT(SP_SLUDGE_ELF,      SK_SHORT_BLADES,   -2),
+    APT(SP_SLUDGE_ELF,      SK_SHORT_BLADES,   -1),
     APT(SP_SLUDGE_ELF,      SK_LONG_BLADES,    -1),
     APT(SP_SLUDGE_ELF,      SK_AXES,           -2),
     APT(SP_SLUDGE_ELF,      SK_MACES_FLAILS,   -2),
@@ -137,7 +137,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_SLUDGE_ELF,      SK_STABBING,        0),
 #endif
@@ -162,7 +162,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_HALFLING
     APT(SP_HALFLING,        SK_FIGHTING,       -1),
-    APT(SP_HALFLING,        SK_SHORT_BLADES,    2),
+    APT(SP_HALFLING,        SK_SHORT_BLADES,    3),
     APT(SP_HALFLING,        SK_LONG_BLADES,     0),
     APT(SP_HALFLING,        SK_AXES,           -1),
     APT(SP_HALFLING,        SK_MACES_FLAILS,   -2),
@@ -174,7 +174,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_HALFLING,        SK_STABBING,        0),
 #endif
@@ -199,7 +199,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_HILL_ORC
     APT(SP_HILL_ORC,        SK_FIGHTING,        2),
-    APT(SP_HILL_ORC,        SK_SHORT_BLADES,   -1),
+    APT(SP_HILL_ORC,        SK_SHORT_BLADES,    0),
     APT(SP_HILL_ORC,        SK_LONG_BLADES,     1),
     APT(SP_HILL_ORC,        SK_AXES,            3),
     APT(SP_HILL_ORC,        SK_MACES_FLAILS,    1),
@@ -211,7 +211,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_HILL_ORC,        SK_STABBING,        2),
 #endif
@@ -236,7 +236,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_KOBOLD
     APT(SP_KOBOLD,          SK_FIGHTING,        1),
-    APT(SP_KOBOLD,          SK_SHORT_BLADES,    2),
+    APT(SP_KOBOLD,          SK_SHORT_BLADES,    3),
     APT(SP_KOBOLD,          SK_LONG_BLADES,    -2),
     APT(SP_KOBOLD,          SK_AXES,           -1),
     APT(SP_KOBOLD,          SK_MACES_FLAILS,    0),
@@ -248,7 +248,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_KOBOLD,          SK_STABBING,        2),
 #endif
@@ -273,7 +273,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_MUMMY
     APT(SP_MUMMY,           SK_FIGHTING,        0),
-    APT(SP_MUMMY,           SK_SHORT_BLADES,   -3),
+    APT(SP_MUMMY,           SK_SHORT_BLADES,   -2),
     APT(SP_MUMMY,           SK_LONG_BLADES,    -2),
     APT(SP_MUMMY,           SK_AXES,           -2),
     APT(SP_MUMMY,           SK_MACES_FLAILS,   -2),
@@ -285,7 +285,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_MUMMY,           SK_STABBING,       -2),
 #endif
@@ -310,7 +310,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_NAGA
     APT(SP_NAGA,            SK_FIGHTING,        0),
-    APT(SP_NAGA,            SK_SHORT_BLADES,   -1),
+    APT(SP_NAGA,            SK_SHORT_BLADES,    0),
     APT(SP_NAGA,            SK_LONG_BLADES,     0),
     APT(SP_NAGA,            SK_AXES,            0),
     APT(SP_NAGA,            SK_MACES_FLAILS,    0),
@@ -347,7 +347,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_OGRE
     APT(SP_OGRE,            SK_FIGHTING,        3),
-    APT(SP_OGRE,            SK_SHORT_BLADES,   -5),
+    APT(SP_OGRE,            SK_SHORT_BLADES,   -4),
     APT(SP_OGRE,            SK_LONG_BLADES,    -3),
     APT(SP_OGRE,            SK_AXES,           -3),
     APT(SP_OGRE,            SK_MACES_FLAILS,    3),
@@ -359,7 +359,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_OGRE,            SK_STABBING,       -2),
 #endif
@@ -384,7 +384,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_TROLL
     APT(SP_TROLL,           SK_FIGHTING,       -2),
-    APT(SP_TROLL,           SK_SHORT_BLADES,   -3),
+    APT(SP_TROLL,           SK_SHORT_BLADES,   -2),
     APT(SP_TROLL,           SK_LONG_BLADES,    -2),
     APT(SP_TROLL,           SK_AXES,           -2),
     APT(SP_TROLL,           SK_MACES_FLAILS,   -1),
@@ -396,7 +396,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_TROLL,           SK_STABBING,       -2),
 #endif
@@ -421,7 +421,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_RED_DRACONIAN
     APT(SP_RED_DRACONIAN,   SK_FIGHTING,        1),
-    APT(SP_RED_DRACONIAN,   SK_SHORT_BLADES,   -1),
+    APT(SP_RED_DRACONIAN,   SK_SHORT_BLADES,    0),
     APT(SP_RED_DRACONIAN,   SK_LONG_BLADES,     0),
     APT(SP_RED_DRACONIAN,   SK_AXES,            0),
     APT(SP_RED_DRACONIAN,   SK_MACES_FLAILS,    0),
@@ -433,7 +433,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_RED_DRACONIAN,   SK_STABBING,        0),
 #endif
@@ -458,7 +458,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_WHITE_DRACONIAN
     APT(SP_WHITE_DRACONIAN, SK_FIGHTING,        1),
-    APT(SP_WHITE_DRACONIAN, SK_SHORT_BLADES,   -1),
+    APT(SP_WHITE_DRACONIAN, SK_SHORT_BLADES,    0),
     APT(SP_WHITE_DRACONIAN, SK_LONG_BLADES,     0),
     APT(SP_WHITE_DRACONIAN, SK_AXES,            0),
     APT(SP_WHITE_DRACONIAN, SK_MACES_FLAILS,    0),
@@ -470,7 +470,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_WHITE_DRACONIAN, SK_STABBING,        0),
 #endif
@@ -495,7 +495,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_GREEN_DRACONIAN
     APT(SP_GREEN_DRACONIAN, SK_FIGHTING,        1),
-    APT(SP_GREEN_DRACONIAN, SK_SHORT_BLADES,   -1),
+    APT(SP_GREEN_DRACONIAN, SK_SHORT_BLADES,    0),
     APT(SP_GREEN_DRACONIAN, SK_LONG_BLADES,     0),
     APT(SP_GREEN_DRACONIAN, SK_AXES,            0),
     APT(SP_GREEN_DRACONIAN, SK_MACES_FLAILS,    0),
@@ -507,7 +507,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_GREEN_DRACONIAN, SK_STABBING,        0),
 #endif
@@ -532,7 +532,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_YELLOW_DRACONIAN
     APT(SP_YELLOW_DRACONIAN,SK_FIGHTING,        1),
-    APT(SP_YELLOW_DRACONIAN,SK_SHORT_BLADES,   -1),
+    APT(SP_YELLOW_DRACONIAN,SK_SHORT_BLADES,    0),
     APT(SP_YELLOW_DRACONIAN,SK_LONG_BLADES,     0),
     APT(SP_YELLOW_DRACONIAN,SK_AXES,            0),
     APT(SP_YELLOW_DRACONIAN,SK_MACES_FLAILS,    0),
@@ -544,7 +544,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_YELLOW_DRACONIAN,SK_STABBING,        0),
 #endif
@@ -569,7 +569,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_GREY_DRACONIAN
     APT(SP_GREY_DRACONIAN,  SK_FIGHTING,        1),
-    APT(SP_GREY_DRACONIAN,  SK_SHORT_BLADES,   -1),
+    APT(SP_GREY_DRACONIAN,  SK_SHORT_BLADES,    0),
     APT(SP_GREY_DRACONIAN,  SK_LONG_BLADES,     0),
     APT(SP_GREY_DRACONIAN,  SK_AXES,            0),
     APT(SP_GREY_DRACONIAN,  SK_MACES_FLAILS,    0),
@@ -581,7 +581,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_GREY_DRACONIAN,  SK_STABBING,        0),
 #endif
@@ -606,7 +606,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_BLACK_DRACONIAN
     APT(SP_BLACK_DRACONIAN, SK_FIGHTING,        1),
-    APT(SP_BLACK_DRACONIAN, SK_SHORT_BLADES,   -1),
+    APT(SP_BLACK_DRACONIAN, SK_SHORT_BLADES,    0),
     APT(SP_BLACK_DRACONIAN, SK_LONG_BLADES,     0),
     APT(SP_BLACK_DRACONIAN, SK_AXES,            0),
     APT(SP_BLACK_DRACONIAN, SK_MACES_FLAILS,    0),
@@ -618,7 +618,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_BLACK_DRACONIAN, SK_STABBING,        0),
 #endif
@@ -643,7 +643,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_PURPLE_DRACONIAN
     APT(SP_PURPLE_DRACONIAN,SK_FIGHTING,        1),
-    APT(SP_PURPLE_DRACONIAN,SK_SHORT_BLADES,   -1),
+    APT(SP_PURPLE_DRACONIAN,SK_SHORT_BLADES,    0),
     APT(SP_PURPLE_DRACONIAN,SK_LONG_BLADES,     0),
     APT(SP_PURPLE_DRACONIAN,SK_AXES,            0),
     APT(SP_PURPLE_DRACONIAN,SK_MACES_FLAILS,    0),
@@ -655,7 +655,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_PURPLE_DRACONIAN,SK_STABBING,        0),
 #endif
@@ -680,7 +680,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_MOTTLED_DRACONIAN
     APT(SP_MOTTLED_DRACONIAN,SK_FIGHTING,        1),
-    APT(SP_MOTTLED_DRACONIAN,SK_SHORT_BLADES,   -1),
+    APT(SP_MOTTLED_DRACONIAN,SK_SHORT_BLADES,    0),
     APT(SP_MOTTLED_DRACONIAN,SK_LONG_BLADES,     0),
     APT(SP_MOTTLED_DRACONIAN,SK_AXES,            0),
     APT(SP_MOTTLED_DRACONIAN,SK_MACES_FLAILS,    0),
@@ -692,7 +692,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_MOTTLED_DRACONIAN,SK_STABBING,        0),
 #endif
@@ -717,7 +717,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_PALE_DRACONIAN
     APT(SP_PALE_DRACONIAN,  SK_FIGHTING,        1),
-    APT(SP_PALE_DRACONIAN,  SK_SHORT_BLADES,   -1),
+    APT(SP_PALE_DRACONIAN,  SK_SHORT_BLADES,    0),
     APT(SP_PALE_DRACONIAN,  SK_LONG_BLADES,     0),
     APT(SP_PALE_DRACONIAN,  SK_AXES,            0),
     APT(SP_PALE_DRACONIAN,  SK_MACES_FLAILS,    0),
@@ -729,7 +729,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_PALE_DRACONIAN,  SK_STABBING,        0),
 #endif
@@ -754,7 +754,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_BASE_DRACONIAN
     APT(SP_BASE_DRACONIAN,  SK_FIGHTING,        1),
-    APT(SP_BASE_DRACONIAN,  SK_SHORT_BLADES,   -1),
+    APT(SP_BASE_DRACONIAN,  SK_SHORT_BLADES,    0),
     APT(SP_BASE_DRACONIAN,  SK_LONG_BLADES,     0),
     APT(SP_BASE_DRACONIAN,  SK_AXES,            0),
     APT(SP_BASE_DRACONIAN,  SK_MACES_FLAILS,    0),
@@ -766,7 +766,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_BASE_DRACONIAN,  SK_STABBING,        0),
 #endif
@@ -791,7 +791,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_CENTAUR
     APT(SP_CENTAUR,         SK_FIGHTING,        0),
-    APT(SP_CENTAUR,         SK_SHORT_BLADES,   -2),
+    APT(SP_CENTAUR,         SK_SHORT_BLADES,   -1),
     APT(SP_CENTAUR,         SK_LONG_BLADES,    -1),
     APT(SP_CENTAUR,         SK_AXES,           -1),
     APT(SP_CENTAUR,         SK_MACES_FLAILS,   -1),
@@ -803,7 +803,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_CENTAUR,         SK_STABBING,       -3),
 #endif
@@ -828,7 +828,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_DEMIGOD
     APT(SP_DEMIGOD,         SK_FIGHTING,       -1),
-    APT(SP_DEMIGOD,         SK_SHORT_BLADES,   -2),
+    APT(SP_DEMIGOD,         SK_SHORT_BLADES,   -1),
     APT(SP_DEMIGOD,         SK_LONG_BLADES,    -1),
     APT(SP_DEMIGOD,         SK_AXES,           -1),
     APT(SP_DEMIGOD,         SK_MACES_FLAILS,   -1),
@@ -840,7 +840,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_DEMIGOD,         SK_STABBING,       -1),
 #endif
@@ -865,7 +865,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_SPRIGGAN
     APT(SP_SPRIGGAN,        SK_FIGHTING,       -2),
-    APT(SP_SPRIGGAN,        SK_SHORT_BLADES,    0),
+    APT(SP_SPRIGGAN,        SK_SHORT_BLADES,    1),
     APT(SP_SPRIGGAN,        SK_LONG_BLADES,    -2),
     APT(SP_SPRIGGAN,        SK_AXES,           -2),
     APT(SP_SPRIGGAN,        SK_MACES_FLAILS,   -3),
@@ -877,7 +877,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_SPRIGGAN,        SK_STABBING,        4),
 #endif
@@ -902,7 +902,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_MINOTAUR
     APT(SP_MINOTAUR,        SK_FIGHTING,        2),
-    APT(SP_MINOTAUR,        SK_SHORT_BLADES,    0),
+    APT(SP_MINOTAUR,        SK_SHORT_BLADES,    1),
     APT(SP_MINOTAUR,        SK_LONG_BLADES,     2),
     APT(SP_MINOTAUR,        SK_AXES,            2),
     APT(SP_MINOTAUR,        SK_MACES_FLAILS,    2),
@@ -914,7 +914,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_MINOTAUR,        SK_STABBING,       -1),
 #endif
@@ -939,7 +939,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_DEMONSPAWN
     APT(SP_DEMONSPAWN,      SK_FIGHTING,        0),
-    APT(SP_DEMONSPAWN,      SK_SHORT_BLADES,   -2),
+    APT(SP_DEMONSPAWN,      SK_SHORT_BLADES,   -1),
     APT(SP_DEMONSPAWN,      SK_LONG_BLADES,    -1),
     APT(SP_DEMONSPAWN,      SK_AXES,           -1),
     APT(SP_DEMONSPAWN,      SK_MACES_FLAILS,   -1),
@@ -951,7 +951,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_DEMONSPAWN,      SK_STABBING,       -1),
 #endif
@@ -976,7 +976,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_GHOUL
     APT(SP_GHOUL,           SK_FIGHTING,        1),
-    APT(SP_GHOUL,           SK_SHORT_BLADES,   -2),
+    APT(SP_GHOUL,           SK_SHORT_BLADES,   -1),
     APT(SP_GHOUL,           SK_LONG_BLADES,    -1),
     APT(SP_GHOUL,           SK_AXES,           -1),
     APT(SP_GHOUL,           SK_MACES_FLAILS,   -1),
@@ -988,7 +988,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_GHOUL,           SK_STABBING,        0),
 #endif
@@ -1013,7 +1013,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_TENGU
     APT(SP_TENGU,           SK_FIGHTING,        0),
-    APT(SP_TENGU,           SK_SHORT_BLADES,    0),
+    APT(SP_TENGU,           SK_SHORT_BLADES,    1),
     APT(SP_TENGU,           SK_LONG_BLADES,     1),
     APT(SP_TENGU,           SK_AXES,            1),
     APT(SP_TENGU,           SK_MACES_FLAILS,    1),
@@ -1025,7 +1025,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_TENGU,           SK_STABBING,        1),
 #endif
@@ -1050,7 +1050,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_MERFOLK
     APT(SP_MERFOLK,         SK_FIGHTING,        1),
-    APT(SP_MERFOLK,         SK_SHORT_BLADES,    1),
+    APT(SP_MERFOLK,         SK_SHORT_BLADES,    2),
     APT(SP_MERFOLK,         SK_LONG_BLADES,     1),
     APT(SP_MERFOLK,         SK_AXES,           -2),
     APT(SP_MERFOLK,         SK_MACES_FLAILS,   -2),
@@ -1062,7 +1062,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_MERFOLK,         SK_STABBING,        2),
 #endif
@@ -1087,7 +1087,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_VAMPIRE
     APT(SP_VAMPIRE,         SK_FIGHTING,       -1),
-    APT(SP_VAMPIRE,         SK_SHORT_BLADES,    0),
+    APT(SP_VAMPIRE,         SK_SHORT_BLADES,    1),
     APT(SP_VAMPIRE,         SK_LONG_BLADES,     0),
     APT(SP_VAMPIRE,         SK_AXES,           -1),
     APT(SP_VAMPIRE,         SK_MACES_FLAILS,   -2),
@@ -1099,7 +1099,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_VAMPIRE,         SK_STABBING,        1),
 #endif
@@ -1124,7 +1124,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_DEEP_DWARF
     APT(SP_DEEP_DWARF,      SK_FIGHTING,       -1),
-    APT(SP_DEEP_DWARF,      SK_SHORT_BLADES,   -2),
+    APT(SP_DEEP_DWARF,      SK_SHORT_BLADES,   -1),
     APT(SP_DEEP_DWARF,      SK_LONG_BLADES,     0),
     APT(SP_DEEP_DWARF,      SK_AXES,            1),
     APT(SP_DEEP_DWARF,      SK_MACES_FLAILS,    0),
@@ -1136,7 +1136,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_DEEP_DWARF,      SK_STABBING,       -1),
 #endif
@@ -1173,7 +1173,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_FELID,           SK_STABBING,        3),
 #endif
@@ -1198,7 +1198,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
 
     // SP_OCTOPODE
     APT(SP_OCTOPODE,        SK_FIGHTING,        0),
-    APT(SP_OCTOPODE,        SK_SHORT_BLADES,   -1),
+    APT(SP_OCTOPODE,        SK_SHORT_BLADES,    0),
     APT(SP_OCTOPODE,        SK_LONG_BLADES,     0),
     APT(SP_OCTOPODE,        SK_AXES,            0),
     APT(SP_OCTOPODE,        SK_MACES_FLAILS,    0),
@@ -1210,7 +1210,7 @@ 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),
 #if TAG_MAJOR_VERSION == 34
     APT(SP_OCTOPODE,        SK_STABBING,        0),
 #endif