Traps&Doors -> Traps.

The only relevant use left, silently opening doors, is now 100% Stealth
(and DEX), rather than 50% Stealth 50% T&D.

1 files changed, 33 insertions, 33 deletions

diff --git a/crawl-ref/source/aptitudes.h b/crawl-ref/source/aptitudes.h
index 317d987522..374e4c1e56 100644
--- a/crawl-ref/source/aptitudes.h
+++ b/crawl-ref/source/aptitudes.h
@@ -29,7 +29,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_HUMAN,           SK_STEALTH,         0),
     APT(SP_HUMAN,           SK_STABBING,        0),
     APT(SP_HUMAN,           SK_SHIELDS,         0),
-    APT(SP_HUMAN,           SK_TRAPS_DOORS,     0),
+    APT(SP_HUMAN,           SK_TRAPS,           0),
     APT(SP_HUMAN,           SK_UNARMED_COMBAT,  0),
     APT(SP_HUMAN,           SK_SPELLCASTING,    0),
     APT(SP_HUMAN,           SK_CONJURATIONS,    0),
@@ -64,7 +64,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_HIGH_ELF,        SK_STEALTH,         1),
     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_TRAPS,           0),
     APT(SP_HIGH_ELF,        SK_UNARMED_COMBAT, -2),
     APT(SP_HIGH_ELF,        SK_SPELLCASTING,    2),
     APT(SP_HIGH_ELF,        SK_CONJURATIONS,    1),
@@ -99,7 +99,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_DEEP_ELF,        SK_STEALTH,         2),
     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_TRAPS,           0),
     APT(SP_DEEP_ELF,        SK_UNARMED_COMBAT, -2),
     APT(SP_DEEP_ELF,        SK_SPELLCASTING,    4),
     APT(SP_DEEP_ELF,        SK_CONJURATIONS,    1),
@@ -134,7 +134,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_SLUDGE_ELF,      SK_STEALTH,         1),
     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_TRAPS,           0),
     APT(SP_SLUDGE_ELF,      SK_UNARMED_COMBAT,  1),
     APT(SP_SLUDGE_ELF,      SK_SPELLCASTING,    2),
     APT(SP_SLUDGE_ELF,      SK_CONJURATIONS,   -2),
@@ -169,7 +169,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_HALFLING,        SK_STEALTH,         3),
     APT(SP_HALFLING,        SK_STABBING,        0),
     APT(SP_HALFLING,        SK_SHIELDS,         1),
-    APT(SP_HALFLING,        SK_TRAPS_DOORS,     0),
+    APT(SP_HALFLING,        SK_TRAPS,           0),
     APT(SP_HALFLING,        SK_UNARMED_COMBAT, -2),
     APT(SP_HALFLING,        SK_SPELLCASTING,   -2),
     APT(SP_HALFLING,        SK_CONJURATIONS,   -2),
@@ -204,7 +204,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_HILL_ORC,        SK_STEALTH,        -2),
     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_TRAPS,           0),
     APT(SP_HILL_ORC,        SK_UNARMED_COMBAT,  1),
     APT(SP_HILL_ORC,        SK_SPELLCASTING,   -2),
     APT(SP_HILL_ORC,        SK_CONJURATIONS,    0),
@@ -239,7 +239,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_KOBOLD,          SK_STEALTH,         3),
     APT(SP_KOBOLD,          SK_STABBING,        2),
     APT(SP_KOBOLD,          SK_SHIELDS,        -2),
-    APT(SP_KOBOLD,          SK_TRAPS_DOORS,     0),
+    APT(SP_KOBOLD,          SK_TRAPS,           0),
     APT(SP_KOBOLD,          SK_UNARMED_COMBAT,  0),
     APT(SP_KOBOLD,          SK_SPELLCASTING,    0),
     APT(SP_KOBOLD,          SK_CONJURATIONS,   -1),
@@ -274,7 +274,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_MUMMY,           SK_STEALTH,        -2),
     APT(SP_MUMMY,           SK_STABBING,       -2),
     APT(SP_MUMMY,           SK_SHIELDS,        -2),
-    APT(SP_MUMMY,           SK_TRAPS_DOORS,    -2),
+    APT(SP_MUMMY,           SK_TRAPS,          -2),
     APT(SP_MUMMY,           SK_UNARMED_COMBAT, -2),
     APT(SP_MUMMY,           SK_SPELLCASTING,    0),
     APT(SP_MUMMY,           SK_CONJURATIONS,   -2),
@@ -309,7 +309,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_NAGA,            SK_STEALTH,         5),
     APT(SP_NAGA,            SK_STABBING,        0),
     APT(SP_NAGA,            SK_SHIELDS,        -2),
-    APT(SP_NAGA,            SK_TRAPS_DOORS,     0),
+    APT(SP_NAGA,            SK_TRAPS,           0),
     APT(SP_NAGA,            SK_UNARMED_COMBAT,  0),
     APT(SP_NAGA,            SK_SPELLCASTING,    0),
     APT(SP_NAGA,            SK_CONJURATIONS,    0),
@@ -344,7 +344,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_OGRE,            SK_STEALTH,        -2),
     APT(SP_OGRE,            SK_STABBING,       -2),
     APT(SP_OGRE,            SK_SHIELDS,        -1),
-    APT(SP_OGRE,            SK_TRAPS_DOORS,    -2),
+    APT(SP_OGRE,            SK_TRAPS,          -2),
     APT(SP_OGRE,            SK_UNARMED_COMBAT, -1),
     APT(SP_OGRE,            SK_SPELLCASTING,    2),
     APT(SP_OGRE,            SK_CONJURATIONS,   -3),
@@ -379,7 +379,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_TROLL,           SK_STEALTH,        -5),
     APT(SP_TROLL,           SK_STABBING,       -2),
     APT(SP_TROLL,           SK_SHIELDS,        -2),
-    APT(SP_TROLL,           SK_TRAPS_DOORS,    -4),
+    APT(SP_TROLL,           SK_TRAPS,          -4),
     APT(SP_TROLL,           SK_UNARMED_COMBAT,  0),
     APT(SP_TROLL,           SK_SPELLCASTING,   -4),
     APT(SP_TROLL,           SK_CONJURATIONS,   -3),
@@ -414,7 +414,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_RED_DRACONIAN,   SK_STEALTH,        -1),
     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_TRAPS,           0),
     APT(SP_RED_DRACONIAN,   SK_UNARMED_COMBAT,  0),
     APT(SP_RED_DRACONIAN,   SK_SPELLCASTING,    0),
     APT(SP_RED_DRACONIAN,   SK_CONJURATIONS,    0),
@@ -449,7 +449,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_WHITE_DRACONIAN, SK_STEALTH,        -1),
     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_TRAPS,           0),
     APT(SP_WHITE_DRACONIAN, SK_UNARMED_COMBAT,  0),
     APT(SP_WHITE_DRACONIAN, SK_SPELLCASTING,    0),
     APT(SP_WHITE_DRACONIAN, SK_CONJURATIONS,    0),
@@ -484,7 +484,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_GREEN_DRACONIAN, SK_STEALTH,        -1),
     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_TRAPS,           0),
     APT(SP_GREEN_DRACONIAN, SK_UNARMED_COMBAT,  0),
     APT(SP_GREEN_DRACONIAN, SK_SPELLCASTING,    0),
     APT(SP_GREEN_DRACONIAN, SK_CONJURATIONS,    0),
@@ -519,7 +519,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_YELLOW_DRACONIAN,SK_STEALTH,        -1),
     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_TRAPS,           0),
     APT(SP_YELLOW_DRACONIAN,SK_UNARMED_COMBAT,  0),
     APT(SP_YELLOW_DRACONIAN,SK_SPELLCASTING,    0),
     APT(SP_YELLOW_DRACONIAN,SK_CONJURATIONS,    0),
@@ -554,7 +554,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_GREY_DRACONIAN,  SK_STEALTH,        -1),
     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_TRAPS,           0),
     APT(SP_GREY_DRACONIAN,  SK_UNARMED_COMBAT,  0),
     APT(SP_GREY_DRACONIAN,  SK_SPELLCASTING,    0),
     APT(SP_GREY_DRACONIAN,  SK_CONJURATIONS,    0),
@@ -589,7 +589,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_BLACK_DRACONIAN, SK_STEALTH,        -1),
     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_TRAPS,           0),
     APT(SP_BLACK_DRACONIAN, SK_UNARMED_COMBAT,  0),
     APT(SP_BLACK_DRACONIAN, SK_SPELLCASTING,    0),
     APT(SP_BLACK_DRACONIAN, SK_CONJURATIONS,    0),
@@ -624,7 +624,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_PURPLE_DRACONIAN,SK_STEALTH,        -1),
     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_TRAPS,           0),
     APT(SP_PURPLE_DRACONIAN,SK_UNARMED_COMBAT,  0),
     APT(SP_PURPLE_DRACONIAN,SK_SPELLCASTING,    2),
     APT(SP_PURPLE_DRACONIAN,SK_CONJURATIONS,    0),
@@ -659,7 +659,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_MOTTLED_DRACONIAN,SK_STEALTH,        -1),
     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_TRAPS,           0),
     APT(SP_MOTTLED_DRACONIAN,SK_UNARMED_COMBAT,  0),
     APT(SP_MOTTLED_DRACONIAN,SK_SPELLCASTING,    0),
     APT(SP_MOTTLED_DRACONIAN,SK_CONJURATIONS,    0),
@@ -694,7 +694,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_PALE_DRACONIAN,  SK_STEALTH,        -1),
     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_TRAPS,           0),
     APT(SP_PALE_DRACONIAN,  SK_UNARMED_COMBAT,  0),
     APT(SP_PALE_DRACONIAN,  SK_SPELLCASTING,    0),
     APT(SP_PALE_DRACONIAN,  SK_CONJURATIONS,    0),
@@ -729,7 +729,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_BASE_DRACONIAN,  SK_STEALTH,        -1),
     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_TRAPS,           0),
     APT(SP_BASE_DRACONIAN,  SK_UNARMED_COMBAT,  0),
     APT(SP_BASE_DRACONIAN,  SK_SPELLCASTING,    0),
     APT(SP_BASE_DRACONIAN,  SK_CONJURATIONS,    0),
@@ -764,7 +764,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_CENTAUR,         SK_STEALTH,        -4),
     APT(SP_CENTAUR,         SK_STABBING,       -3),
     APT(SP_CENTAUR,         SK_SHIELDS,        -3),
-    APT(SP_CENTAUR,         SK_TRAPS_DOORS,    -2),
+    APT(SP_CENTAUR,         SK_TRAPS,          -2),
     APT(SP_CENTAUR,         SK_UNARMED_COMBAT,  0),
     APT(SP_CENTAUR,         SK_SPELLCASTING,   -2),
     APT(SP_CENTAUR,         SK_CONJURATIONS,   -1),
@@ -799,7 +799,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_DEMIGOD,         SK_STEALTH,        -1),
     APT(SP_DEMIGOD,         SK_STABBING,       -1),
     APT(SP_DEMIGOD,         SK_SHIELDS,        -1),
-    APT(SP_DEMIGOD,         SK_TRAPS_DOORS,    -1),
+    APT(SP_DEMIGOD,         SK_TRAPS,          -1),
     APT(SP_DEMIGOD,         SK_UNARMED_COMBAT, -1),
     APT(SP_DEMIGOD,         SK_SPELLCASTING,   -1),
     APT(SP_DEMIGOD,         SK_CONJURATIONS,   -1),
@@ -834,7 +834,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_SPRIGGAN,        SK_STEALTH,         4),
     APT(SP_SPRIGGAN,        SK_STABBING,        4),
     APT(SP_SPRIGGAN,        SK_SHIELDS,        -3),
-    APT(SP_SPRIGGAN,        SK_TRAPS_DOORS,     3),
+    APT(SP_SPRIGGAN,        SK_TRAPS,           3),
     APT(SP_SPRIGGAN,        SK_UNARMED_COMBAT, -2),
     APT(SP_SPRIGGAN,        SK_SPELLCASTING,    3),
     APT(SP_SPRIGGAN,        SK_CONJURATIONS,   -3),
@@ -869,7 +869,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_MINOTAUR,        SK_STEALTH,        -2),
     APT(SP_MINOTAUR,        SK_STABBING,       -1),
     APT(SP_MINOTAUR,        SK_SHIELDS,         2),
-    APT(SP_MINOTAUR,        SK_TRAPS_DOORS,     0),
+    APT(SP_MINOTAUR,        SK_TRAPS,           0),
     APT(SP_MINOTAUR,        SK_UNARMED_COMBAT,  1),
     APT(SP_MINOTAUR,        SK_SPELLCASTING,   -3),
     APT(SP_MINOTAUR,        SK_CONJURATIONS,   -3),
@@ -904,7 +904,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_DEMONSPAWN,      SK_STEALTH,        -1),
     APT(SP_DEMONSPAWN,      SK_STABBING,       -1),
     APT(SP_DEMONSPAWN,      SK_SHIELDS,        -1),
-    APT(SP_DEMONSPAWN,      SK_TRAPS_DOORS,    -1),
+    APT(SP_DEMONSPAWN,      SK_TRAPS,          -1),
     APT(SP_DEMONSPAWN,      SK_UNARMED_COMBAT, -1),
     APT(SP_DEMONSPAWN,      SK_SPELLCASTING,    0),
     APT(SP_DEMONSPAWN,      SK_CONJURATIONS,    0),
@@ -939,7 +939,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_GHOUL,           SK_STEALTH,         1),
     APT(SP_GHOUL,           SK_STABBING,        0),
     APT(SP_GHOUL,           SK_SHIELDS,        -1),
-    APT(SP_GHOUL,           SK_TRAPS_DOORS,    -1),
+    APT(SP_GHOUL,           SK_TRAPS,          -1),
     APT(SP_GHOUL,           SK_UNARMED_COMBAT,  1),
     APT(SP_GHOUL,           SK_SPELLCASTING,   -1),
     APT(SP_GHOUL,           SK_CONJURATIONS,   -2),
@@ -974,7 +974,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_TENGU,           SK_STEALTH,         0),
     APT(SP_TENGU,           SK_STABBING,        1),
     APT(SP_TENGU,           SK_SHIELDS,         0),
-    APT(SP_TENGU,           SK_TRAPS_DOORS,     0),
+    APT(SP_TENGU,           SK_TRAPS,           0),
     APT(SP_TENGU,           SK_UNARMED_COMBAT,  1),
     APT(SP_TENGU,           SK_SPELLCASTING,    0),
     APT(SP_TENGU,           SK_CONJURATIONS,    3),
@@ -1009,7 +1009,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_MERFOLK,         SK_STEALTH,         1),
     APT(SP_MERFOLK,         SK_STABBING,        2),
     APT(SP_MERFOLK,         SK_SHIELDS,         0),
-    APT(SP_MERFOLK,         SK_TRAPS_DOORS,    -1),
+    APT(SP_MERFOLK,         SK_TRAPS,          -1),
     APT(SP_MERFOLK,         SK_UNARMED_COMBAT,  1),
     APT(SP_MERFOLK,         SK_SPELLCASTING,    0),
     APT(SP_MERFOLK,         SK_CONJURATIONS,   -2),
@@ -1044,7 +1044,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_VAMPIRE,         SK_STEALTH,         4),
     APT(SP_VAMPIRE,         SK_STABBING,        1),
     APT(SP_VAMPIRE,         SK_SHIELDS,        -1),
-    APT(SP_VAMPIRE,         SK_TRAPS_DOORS,     0),
+    APT(SP_VAMPIRE,         SK_TRAPS,           0),
     APT(SP_VAMPIRE,         SK_UNARMED_COMBAT,  1),
     APT(SP_VAMPIRE,         SK_SPELLCASTING,    0),
     APT(SP_VAMPIRE,         SK_CONJURATIONS,   -3),
@@ -1079,7 +1079,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_DEEP_DWARF,      SK_STEALTH,         2),
     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_TRAPS,           1),
     APT(SP_DEEP_DWARF,      SK_UNARMED_COMBAT, -1),
     APT(SP_DEEP_DWARF,      SK_SPELLCASTING,   -1),
     APT(SP_DEEP_DWARF,      SK_CONJURATIONS,   -1),
@@ -1114,7 +1114,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_FELID,           SK_STEALTH,         3),
     APT(SP_FELID,           SK_STABBING,        3),
     APT(SP_FELID,           SK_SHIELDS,       -99),
-    APT(SP_FELID,           SK_TRAPS_DOORS,     2),
+    APT(SP_FELID,           SK_TRAPS,           2),
     APT(SP_FELID,           SK_UNARMED_COMBAT,  0),
     APT(SP_FELID,           SK_SPELLCASTING,    0),
     APT(SP_FELID,           SK_CONJURATIONS,   -1),
@@ -1149,7 +1149,7 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_OCTOPODE,        SK_STEALTH,         3),
     APT(SP_OCTOPODE,        SK_STABBING,        0),
     APT(SP_OCTOPODE,        SK_SHIELDS,         0),
-    APT(SP_OCTOPODE,        SK_TRAPS_DOORS,     1),
+    APT(SP_OCTOPODE,        SK_TRAPS,           1),
     APT(SP_OCTOPODE,        SK_UNARMED_COMBAT,  0),
     APT(SP_OCTOPODE,        SK_SPELLCASTING,    0),
     APT(SP_OCTOPODE,        SK_CONJURATIONS,    0),