Remove the Traps skill.

1 files changed, 72 insertions, 0 deletions

diff --git a/crawl-ref/source/aptitudes.h b/crawl-ref/source/aptitudes.h
index 08a88fd842..6d3b6242ff 100644
--- a/crawl-ref/source/aptitudes.h
+++ b/crawl-ref/source/aptitudes.h
@@ -31,7 +31,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_HUMAN,           SK_STABBING,        0),
 #endif
     APT(SP_HUMAN,           SK_SHIELDS,         0),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_HUMAN,           SK_TRAPS,           0),
+#endif
     APT(SP_HUMAN,           SK_UNARMED_COMBAT,  0),
     APT(SP_HUMAN,           SK_SPELLCASTING,   -1),
     APT(SP_HUMAN,           SK_CONJURATIONS,    0),
@@ -68,7 +70,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_HIGH_ELF,        SK_STABBING,       -1),
 #endif
     APT(SP_HIGH_ELF,        SK_SHIELDS,        -1),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_HIGH_ELF,        SK_TRAPS,           0),
+#endif
     APT(SP_HIGH_ELF,        SK_UNARMED_COMBAT, -2),
     APT(SP_HIGH_ELF,        SK_SPELLCASTING,    1),
     APT(SP_HIGH_ELF,        SK_CONJURATIONS,    1),
@@ -105,7 +109,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_DEEP_ELF,        SK_STABBING,        1),
 #endif
     APT(SP_DEEP_ELF,        SK_SHIELDS,        -2),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_DEEP_ELF,        SK_TRAPS,           0),
+#endif
     APT(SP_DEEP_ELF,        SK_UNARMED_COMBAT, -2),
     APT(SP_DEEP_ELF,        SK_SPELLCASTING,    3),
     APT(SP_DEEP_ELF,        SK_CONJURATIONS,    1),
@@ -142,7 +148,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_SLUDGE_ELF,      SK_STABBING,        0),
 #endif
     APT(SP_SLUDGE_ELF,      SK_SHIELDS,        -2),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_SLUDGE_ELF,      SK_TRAPS,           0),
+#endif
     APT(SP_SLUDGE_ELF,      SK_UNARMED_COMBAT,  1),
     APT(SP_SLUDGE_ELF,      SK_SPELLCASTING,    1),
     APT(SP_SLUDGE_ELF,      SK_CONJURATIONS,   -2),
@@ -179,7 +187,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_HALFLING,        SK_STABBING,        0),
 #endif
     APT(SP_HALFLING,        SK_SHIELDS,         1),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_HALFLING,        SK_TRAPS,           0),
+#endif
     APT(SP_HALFLING,        SK_UNARMED_COMBAT, -2),
     APT(SP_HALFLING,        SK_SPELLCASTING,   -3),
     APT(SP_HALFLING,        SK_CONJURATIONS,   -2),
@@ -216,7 +226,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_HILL_ORC,        SK_STABBING,        2),
 #endif
     APT(SP_HILL_ORC,        SK_SHIELDS,         1),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_HILL_ORC,        SK_TRAPS,           0),
+#endif
     APT(SP_HILL_ORC,        SK_UNARMED_COMBAT,  1),
     APT(SP_HILL_ORC,        SK_SPELLCASTING,   -3),
     APT(SP_HILL_ORC,        SK_CONJURATIONS,    0),
@@ -253,7 +265,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_KOBOLD,          SK_STABBING,        2),
 #endif
     APT(SP_KOBOLD,          SK_SHIELDS,        -2),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_KOBOLD,          SK_TRAPS,           0),
+#endif
     APT(SP_KOBOLD,          SK_UNARMED_COMBAT,  0),
     APT(SP_KOBOLD,          SK_SPELLCASTING,   -1),
     APT(SP_KOBOLD,          SK_CONJURATIONS,   -1),
@@ -290,7 +304,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_MUMMY,           SK_STABBING,       -2),
 #endif
     APT(SP_MUMMY,           SK_SHIELDS,        -2),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_MUMMY,           SK_TRAPS,          -2),
+#endif
     APT(SP_MUMMY,           SK_UNARMED_COMBAT, -2),
     APT(SP_MUMMY,           SK_SPELLCASTING,   -1),
     APT(SP_MUMMY,           SK_CONJURATIONS,   -2),
@@ -327,7 +343,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_NAGA,            SK_STABBING,        0),
 #endif
     APT(SP_NAGA,            SK_SHIELDS,        -2),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_NAGA,            SK_TRAPS,           0),
+#endif
     APT(SP_NAGA,            SK_UNARMED_COMBAT,  0),
     APT(SP_NAGA,            SK_SPELLCASTING,   -1),
     APT(SP_NAGA,            SK_CONJURATIONS,    0),
@@ -364,7 +382,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_OGRE,            SK_STABBING,       -2),
 #endif
     APT(SP_OGRE,            SK_SHIELDS,        -1),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_OGRE,            SK_TRAPS,          -2),
+#endif
     APT(SP_OGRE,            SK_UNARMED_COMBAT, -1),
     APT(SP_OGRE,            SK_SPELLCASTING,    1),
     APT(SP_OGRE,            SK_CONJURATIONS,   -3),
@@ -401,7 +421,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_TROLL,           SK_STABBING,       -2),
 #endif
     APT(SP_TROLL,           SK_SHIELDS,        -2),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_TROLL,           SK_TRAPS,          -4),
+#endif
     APT(SP_TROLL,           SK_UNARMED_COMBAT,  0),
     APT(SP_TROLL,           SK_SPELLCASTING,   -5),
     APT(SP_TROLL,           SK_CONJURATIONS,   -3),
@@ -438,7 +460,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_RED_DRACONIAN,   SK_STABBING,        0),
 #endif
     APT(SP_RED_DRACONIAN,   SK_SHIELDS,         0),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_RED_DRACONIAN,   SK_TRAPS,           0),
+#endif
     APT(SP_RED_DRACONIAN,   SK_UNARMED_COMBAT,  0),
     APT(SP_RED_DRACONIAN,   SK_SPELLCASTING,   -1),
     APT(SP_RED_DRACONIAN,   SK_CONJURATIONS,    0),
@@ -475,7 +499,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_WHITE_DRACONIAN, SK_STABBING,        0),
 #endif
     APT(SP_WHITE_DRACONIAN, SK_SHIELDS,         0),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_WHITE_DRACONIAN, SK_TRAPS,           0),
+#endif
     APT(SP_WHITE_DRACONIAN, SK_UNARMED_COMBAT,  0),
     APT(SP_WHITE_DRACONIAN, SK_SPELLCASTING,   -1),
     APT(SP_WHITE_DRACONIAN, SK_CONJURATIONS,    0),
@@ -512,7 +538,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_GREEN_DRACONIAN, SK_STABBING,        0),
 #endif
     APT(SP_GREEN_DRACONIAN, SK_SHIELDS,         0),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_GREEN_DRACONIAN, SK_TRAPS,           0),
+#endif
     APT(SP_GREEN_DRACONIAN, SK_UNARMED_COMBAT,  0),
     APT(SP_GREEN_DRACONIAN, SK_SPELLCASTING,   -1),
     APT(SP_GREEN_DRACONIAN, SK_CONJURATIONS,    0),
@@ -549,7 +577,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_YELLOW_DRACONIAN,SK_STABBING,        0),
 #endif
     APT(SP_YELLOW_DRACONIAN,SK_SHIELDS,         0),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_YELLOW_DRACONIAN,SK_TRAPS,           0),
+#endif
     APT(SP_YELLOW_DRACONIAN,SK_UNARMED_COMBAT,  0),
     APT(SP_YELLOW_DRACONIAN,SK_SPELLCASTING,   -1),
     APT(SP_YELLOW_DRACONIAN,SK_CONJURATIONS,    0),
@@ -586,7 +616,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_GREY_DRACONIAN,  SK_STABBING,        0),
 #endif
     APT(SP_GREY_DRACONIAN,  SK_SHIELDS,         0),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_GREY_DRACONIAN,  SK_TRAPS,           0),
+#endif
     APT(SP_GREY_DRACONIAN,  SK_UNARMED_COMBAT,  0),
     APT(SP_GREY_DRACONIAN,  SK_SPELLCASTING,   -1),
     APT(SP_GREY_DRACONIAN,  SK_CONJURATIONS,    0),
@@ -623,7 +655,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_BLACK_DRACONIAN, SK_STABBING,        0),
 #endif
     APT(SP_BLACK_DRACONIAN, SK_SHIELDS,         0),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_BLACK_DRACONIAN, SK_TRAPS,           0),
+#endif
     APT(SP_BLACK_DRACONIAN, SK_UNARMED_COMBAT,  0),
     APT(SP_BLACK_DRACONIAN, SK_SPELLCASTING,   -1),
     APT(SP_BLACK_DRACONIAN, SK_CONJURATIONS,    0),
@@ -660,7 +694,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_PURPLE_DRACONIAN,SK_STABBING,        0),
 #endif
     APT(SP_PURPLE_DRACONIAN,SK_SHIELDS,         0),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_PURPLE_DRACONIAN,SK_TRAPS,           0),
+#endif
     APT(SP_PURPLE_DRACONIAN,SK_UNARMED_COMBAT,  0),
     APT(SP_PURPLE_DRACONIAN,SK_SPELLCASTING,    1),
     APT(SP_PURPLE_DRACONIAN,SK_CONJURATIONS,    0),
@@ -697,7 +733,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_MOTTLED_DRACONIAN,SK_STABBING,        0),
 #endif
     APT(SP_MOTTLED_DRACONIAN,SK_SHIELDS,         0),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_MOTTLED_DRACONIAN,SK_TRAPS,           0),
+#endif
     APT(SP_MOTTLED_DRACONIAN,SK_UNARMED_COMBAT,  0),
     APT(SP_MOTTLED_DRACONIAN,SK_SPELLCASTING,   -1),
     APT(SP_MOTTLED_DRACONIAN,SK_CONJURATIONS,    0),
@@ -734,7 +772,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_PALE_DRACONIAN,  SK_STABBING,        0),
 #endif
     APT(SP_PALE_DRACONIAN,  SK_SHIELDS,         0),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_PALE_DRACONIAN,  SK_TRAPS,           0),
+#endif
     APT(SP_PALE_DRACONIAN,  SK_UNARMED_COMBAT,  0),
     APT(SP_PALE_DRACONIAN,  SK_SPELLCASTING,   -1),
     APT(SP_PALE_DRACONIAN,  SK_CONJURATIONS,    0),
@@ -771,7 +811,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_BASE_DRACONIAN,  SK_STABBING,        0),
 #endif
     APT(SP_BASE_DRACONIAN,  SK_SHIELDS,         0),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_BASE_DRACONIAN,  SK_TRAPS,           0),
+#endif
     APT(SP_BASE_DRACONIAN,  SK_UNARMED_COMBAT,  0),
     APT(SP_BASE_DRACONIAN,  SK_SPELLCASTING,   -1),
     APT(SP_BASE_DRACONIAN,  SK_CONJURATIONS,    0),
@@ -808,7 +850,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_CENTAUR,         SK_STABBING,       -3),
 #endif
     APT(SP_CENTAUR,         SK_SHIELDS,        -3),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_CENTAUR,         SK_TRAPS,          -2),
+#endif
     APT(SP_CENTAUR,         SK_UNARMED_COMBAT,  0),
     APT(SP_CENTAUR,         SK_SPELLCASTING,   -3),
     APT(SP_CENTAUR,         SK_CONJURATIONS,   -1),
@@ -845,7 +889,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_DEMIGOD,         SK_STABBING,       -1),
 #endif
     APT(SP_DEMIGOD,         SK_SHIELDS,        -1),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_DEMIGOD,         SK_TRAPS,          -1),
+#endif
     APT(SP_DEMIGOD,         SK_UNARMED_COMBAT, -1),
     APT(SP_DEMIGOD,         SK_SPELLCASTING,   -2),
     APT(SP_DEMIGOD,         SK_CONJURATIONS,   -1),
@@ -882,7 +928,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_SPRIGGAN,        SK_STABBING,        4),
 #endif
     APT(SP_SPRIGGAN,        SK_SHIELDS,        -3),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_SPRIGGAN,        SK_TRAPS,           3),
+#endif
     APT(SP_SPRIGGAN,        SK_UNARMED_COMBAT, -2),
     APT(SP_SPRIGGAN,        SK_SPELLCASTING,    2),
     APT(SP_SPRIGGAN,        SK_CONJURATIONS,   -3),
@@ -919,7 +967,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_MINOTAUR,        SK_STABBING,       -1),
 #endif
     APT(SP_MINOTAUR,        SK_SHIELDS,         2),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_MINOTAUR,        SK_TRAPS,           0),
+#endif
     APT(SP_MINOTAUR,        SK_UNARMED_COMBAT,  1),
     APT(SP_MINOTAUR,        SK_SPELLCASTING,   -4),
     APT(SP_MINOTAUR,        SK_CONJURATIONS,   -3),
@@ -956,7 +1006,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_GARGOYLE,         SK_STABBING,        0),
 #endif
     APT(SP_GARGOYLE,         SK_SHIELDS,        +1),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_GARGOYLE,         SK_TRAPS,          -1),
+#endif
     APT(SP_GARGOYLE,         SK_UNARMED_COMBAT,  1),
     APT(SP_GARGOYLE,         SK_SPELLCASTING,   -1),
     APT(SP_GARGOYLE,         SK_CONJURATIONS,    1),
@@ -993,7 +1045,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_DEMONSPAWN,      SK_STABBING,       -1),
 #endif
     APT(SP_DEMONSPAWN,      SK_SHIELDS,        -1),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_DEMONSPAWN,      SK_TRAPS,          -1),
+#endif
     APT(SP_DEMONSPAWN,      SK_UNARMED_COMBAT, -1),
     APT(SP_DEMONSPAWN,      SK_SPELLCASTING,   -1),
     APT(SP_DEMONSPAWN,      SK_CONJURATIONS,    0),
@@ -1030,7 +1084,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_GHOUL,           SK_STABBING,        0),
 #endif
     APT(SP_GHOUL,           SK_SHIELDS,        -1),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_GHOUL,           SK_TRAPS,          -1),
+#endif
     APT(SP_GHOUL,           SK_UNARMED_COMBAT,  1),
     APT(SP_GHOUL,           SK_SPELLCASTING,   -2),
     APT(SP_GHOUL,           SK_CONJURATIONS,   -2),
@@ -1067,7 +1123,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_TENGU,           SK_STABBING,        1),
 #endif
     APT(SP_TENGU,           SK_SHIELDS,         0),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_TENGU,           SK_TRAPS,           0),
+#endif
     APT(SP_TENGU,           SK_UNARMED_COMBAT,  1),
     APT(SP_TENGU,           SK_SPELLCASTING,   -1),
     APT(SP_TENGU,           SK_CONJURATIONS,    3),
@@ -1104,7 +1162,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_MERFOLK,         SK_STABBING,        2),
 #endif
     APT(SP_MERFOLK,         SK_SHIELDS,         0),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_MERFOLK,         SK_TRAPS,          -1),
+#endif
     APT(SP_MERFOLK,         SK_UNARMED_COMBAT,  1),
     APT(SP_MERFOLK,         SK_SPELLCASTING,   -1),
     APT(SP_MERFOLK,         SK_CONJURATIONS,   -2),
@@ -1141,7 +1201,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_VAMPIRE,         SK_STABBING,        1),
 #endif
     APT(SP_VAMPIRE,         SK_SHIELDS,        -1),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_VAMPIRE,         SK_TRAPS,           0),
+#endif
     APT(SP_VAMPIRE,         SK_UNARMED_COMBAT,  1),
     APT(SP_VAMPIRE,         SK_SPELLCASTING,   -1),
     APT(SP_VAMPIRE,         SK_CONJURATIONS,   -3),
@@ -1178,7 +1240,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_DEEP_DWARF,      SK_STABBING,       -1),
 #endif
     APT(SP_DEEP_DWARF,      SK_SHIELDS,         1),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_DEEP_DWARF,      SK_TRAPS,           1),
+#endif
     APT(SP_DEEP_DWARF,      SK_UNARMED_COMBAT, -1),
     APT(SP_DEEP_DWARF,      SK_SPELLCASTING,   -2),
     APT(SP_DEEP_DWARF,      SK_CONJURATIONS,   -1),
@@ -1215,7 +1279,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_FELID,           SK_STABBING,        3),
 #endif
     APT(SP_FELID,           SK_SHIELDS,       -99),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_FELID,           SK_TRAPS,           2),
+#endif
     APT(SP_FELID,           SK_UNARMED_COMBAT,  0),
     APT(SP_FELID,           SK_SPELLCASTING,   -1),
     APT(SP_FELID,           SK_CONJURATIONS,   -1),
@@ -1252,7 +1318,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_OCTOPODE,        SK_STABBING,        0),
 #endif
     APT(SP_OCTOPODE,        SK_SHIELDS,         0),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_OCTOPODE,        SK_TRAPS,           1),
+#endif
     APT(SP_OCTOPODE,        SK_UNARMED_COMBAT,  0),
     APT(SP_OCTOPODE,        SK_SPELLCASTING,   -1),
     APT(SP_OCTOPODE,        SK_CONJURATIONS,    0),
@@ -1286,7 +1354,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_DJINNI,          SK_DODGING,        -1),
     APT(SP_DJINNI,          SK_STEALTH,        -1),
     APT(SP_DJINNI,          SK_SHIELDS,         0),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_DJINNI,          SK_TRAPS,          -1),
+#endif
     APT(SP_DJINNI,          SK_UNARMED_COMBAT, -1),
     APT(SP_DJINNI,          SK_SPELLCASTING,    1),
     APT(SP_DJINNI,          SK_CONJURATIONS,    1),
@@ -1323,7 +1393,9 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_LAVA_ORC,        SK_STABBING,        2),
 #endif
     APT(SP_LAVA_ORC,        SK_SHIELDS,         1),
+#if TAG_MAJOR_VERSION == 34
     APT(SP_LAVA_ORC,        SK_TRAPS,           0),
+#endif
     APT(SP_LAVA_ORC,        SK_UNARMED_COMBAT,  1),
     APT(SP_LAVA_ORC,        SK_SPELLCASTING,   -3),
     APT(SP_LAVA_ORC,        SK_CONJURATIONS,    0),