Move feature name data to feature-data.h.

1 files changed, 8 insertions, 295 deletions

diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index be8ac949ff..35dc8732f6 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -2959,302 +2959,15 @@ static string _base_feature_desc(dungeon_feature_type grid, trap_type trap)
     if (feat_is_trap(grid) && trap != NUM_TRAPS)
         return full_trap_name(trap);
 
-    switch (grid)
-    {
-    case DNGN_STONE_WALL:
-        return "stone wall";
-    case DNGN_ROCK_WALL:
-        if (player_in_branch(BRANCH_PANDEMONIUM))
-            return "wall of the weird stuff which makes up Pandemonium";
-        else
-            return "rock wall";
-    case DNGN_SLIMY_WALL:
-        return "slime covered rock wall";
-    case DNGN_PERMAROCK_WALL:
-        return "unnaturally hard rock wall";
-    case DNGN_OPEN_SEA:
-        return "the open sea";
-    case DNGN_LAVA_SEA:
-        return "the endless lava";
-    case DNGN_CLOSED_DOOR:
-        return "closed door";
-    case DNGN_RUNED_DOOR:
-        return "runed door";
-    case DNGN_SEALED_DOOR:
-        return "sealed door";
-    case DNGN_METAL_WALL:
-        return "metal wall";
-    case DNGN_GREEN_CRYSTAL_WALL:
-        return "wall of green crystal";
-    case DNGN_CLEAR_ROCK_WALL:
-        return "translucent rock wall";
-    case DNGN_CLEAR_STONE_WALL:
-        return "translucent stone wall";
-    case DNGN_CLEAR_PERMAROCK_WALL:
-        return "translucent unnaturally hard rock wall";
-    case DNGN_GRATE:
-        return "iron grate";
-    case DNGN_TREE:
-        return "tree";
-    case DNGN_ORCISH_IDOL:
-        if (player_genus(GENPC_ORCISH))
-            return "idol of Beogh";
-        else
-            return "orcish idol";
-    case DNGN_GRANITE_STATUE:
-        return "granite statue";
-    case DNGN_LAVA:
-        return "some lava";
-    case DNGN_DEEP_WATER:
-        return "some deep water";
-    case DNGN_SHALLOW_WATER:
-        return "some shallow water";
-    case DNGN_UNDISCOVERED_TRAP:
-    case DNGN_FLOOR:
-        return "floor";
-    case DNGN_OPEN_DOOR:
-        return "open door";
-    case DNGN_ESCAPE_HATCH_DOWN:
-        return "escape hatch in the floor";
-    case DNGN_ESCAPE_HATCH_UP:
-    case DNGN_EXIT_LABYRINTH:
-        return "escape hatch in the ceiling";
-    case DNGN_STONE_STAIRS_DOWN_I:
-    case DNGN_STONE_STAIRS_DOWN_II:
-    case DNGN_STONE_STAIRS_DOWN_III:
-        return "stone staircase leading down";
-    case DNGN_STONE_STAIRS_UP_I:
-    case DNGN_STONE_STAIRS_UP_II:
-    case DNGN_STONE_STAIRS_UP_III:
-        return "stone staircase leading up";
-    case DNGN_SEALED_STAIRS_DOWN:
-        return "sealed passage leading down";
-    case DNGN_SEALED_STAIRS_UP:
-        return "sealed passage leading up";
-    case DNGN_EXIT_DUNGEON:
-        return "staircase leading out of the dungeon";
-    case DNGN_ENTER_HELL:
-        return "gateway to Hell";
-    case DNGN_EXIT_HELL:
-        return "gateway back into the Dungeon";
-    case DNGN_TELEPORTER:
-        return "short-range portal";
-    case DNGN_TRAP_MECHANICAL:
-        return "mechanical trap";
-    case DNGN_TRAP_TELEPORT:
-        return "teleport trap";
-    case DNGN_TRAP_ALARM:
-        return "alarm trap";
-    case DNGN_TRAP_ZOT:
-        return "Zot trap";
-    case DNGN_TRAP_SHAFT:
-        return "shaft";
-    case DNGN_TRAP_WEB:
-        return "web";
-    case DNGN_ENTER_SHOP:
-        return "shop";
-    case DNGN_ABANDONED_SHOP:
-        return "abandoned shop";
-    case DNGN_ENTER_LABYRINTH:
-        return "labyrinth entrance";
-    case DNGN_ENTER_DIS:
-        return "gateway to the Iron City of Dis";
-    case DNGN_ENTER_GEHENNA:
-        return "gateway to the ashen valley of Gehenna";
-    case DNGN_ENTER_COCYTUS:
-        return "gateway to the freezing wastes of Cocytus";
-    case DNGN_ENTER_TARTARUS:
-        return "gateway to the decaying netherworld of Tartarus";
-    case DNGN_ENTER_ABYSS:
-        return "one-way gate to the infinite horrors of the Abyss";
-    case DNGN_EXIT_ABYSS:
-        return "gateway leading out of the Abyss";
-    case DNGN_ABYSSAL_STAIR:
-        return "gateway leading deeper into the Abyss";
-    case DNGN_EXIT_THROUGH_ABYSS:
-        return "exit through the horrors of the Abyss";
-    case DNGN_STONE_ARCH:
-        return "empty arch of ancient stone";
-    case DNGN_ENTER_PANDEMONIUM:
-        return "one-way gate leading to the halls of Pandemonium";
-    case DNGN_EXIT_PANDEMONIUM:
-        return "gate leading out of Pandemonium";
-    case DNGN_TRANSIT_PANDEMONIUM:
-        return "gate leading to another region of Pandemonium";
-#if TAG_MAJOR_VERSION == 34
-    case DNGN_ENTER_DWARF:
-        return "staircase to the Dwarven Hall";
-    case DNGN_ENTER_BLADE:
-        return "staircase to the Hall of Blades";
-#endif
-    case DNGN_ENTER_ORC:
-        return "staircase to the Orcish Mines";
-    case DNGN_ENTER_LAIR:
-        return "staircase to the Lair";
-    case DNGN_ENTER_SLIME:
-        return "staircase to the Slime Pits";
-    case DNGN_ENTER_VAULTS:
-        return "gate to the Vaults";
-    case DNGN_ENTER_CRYPT:
-        return "staircase to the Crypt";
-    case DNGN_ENTER_ZOT:
-        return "gate to the Realm of Zot";
-    case DNGN_ENTER_TEMPLE:
-        return "staircase to the Ecumenical Temple";
-    case DNGN_ENTER_SNAKE:
-        return "staircase to the Snake Pit";
-    case DNGN_ENTER_ELF:
-        return "staircase to the Elven Halls";
-    case DNGN_ENTER_TOMB:
-        return "staircase to the Tomb";
-    case DNGN_ENTER_SWAMP:
-        return "staircase to the Swamp";
-    case DNGN_ENTER_SHOALS:
-        return "staircase to the Shoals";
-    case DNGN_ENTER_SPIDER:
-        return "hole to the Spider Nest";
-#if TAG_MAJOR_VERSION == 34
-    case DNGN_ENTER_FOREST:
-        return "staircase to the Enchanted Forest";
-#endif
-    case DNGN_ENTER_DEPTHS:
-        return "staircase to the Depths";
-    case DNGN_ENTER_ZIGGURAT:
-        return "gateway to a ziggurat";
-    case DNGN_ENTER_BAZAAR:
-        return "gateway to a bazaar"; // "flickering $_" if timed
-    case DNGN_ENTER_TROVE:
-        return "portal to a secret trove of treasure";
-    case DNGN_ENTER_SEWER:
-        return "glowing drain";
-    case DNGN_ENTER_OSSUARY:
-        return "sand-covered staircase";
-    case DNGN_ENTER_BAILEY:
-        return "flagged portal";
-    case DNGN_ENTER_ICE_CAVE:
-        return "frozen archway";
-    case DNGN_ENTER_VOLCANO:
-        return "dark tunnel";
-    case DNGN_ENTER_WIZLAB:
-        return "magical portal";
-#if TAG_MAJOR_VERSION == 34
-    case DNGN_ENTER_PORTAL_VAULT:
-        return "gate leading to a distant place";
-#endif
-    case DNGN_MALIGN_GATEWAY:
-        return "portal to somewhere";
-    case DNGN_EXPIRED_PORTAL:
-        // should be set whenever used
-        return "collapsed entrance";
-#if TAG_MAJOR_VERSION == 34
-    case DNGN_RETURN_FROM_DWARF:
-#endif
-    case DNGN_RETURN_FROM_ORC:
-    case DNGN_RETURN_FROM_LAIR:
-    case DNGN_RETURN_FROM_TEMPLE:
-    case DNGN_RETURN_FROM_DEPTHS:
-        return "staircase back to the Dungeon";
-    case DNGN_RETURN_FROM_SLIME:
-    case DNGN_RETURN_FROM_SNAKE:
-    case DNGN_RETURN_FROM_SWAMP:
-    case DNGN_RETURN_FROM_SHOALS:
-        return "staircase back to the Lair";
-    case DNGN_RETURN_FROM_SPIDER:
-        return "crawl-hole back to the Lair";
-    case DNGN_RETURN_FROM_CRYPT:
-#if TAG_MAJOR_VERSION == 34
-    case DNGN_RETURN_FROM_BLADE:
-    case DNGN_RETURN_FROM_FOREST:
-#endif
-        return "staircase back to the Vaults";
-    case DNGN_RETURN_FROM_ELF:
-        return "staircase back to the Mines";
-    case DNGN_RETURN_FROM_TOMB:
-        return "staircase back to the Crypt";
-    case DNGN_RETURN_FROM_VAULTS:
-    case DNGN_RETURN_FROM_ZOT:
-        return "gate leading back out of this place";
-    case DNGN_EXIT_ICE_CAVE:
-        return "ice covered gate leading back out of here";
-    case DNGN_EXIT_VOLCANO:
-        return "rocky tunnel leading out of this place";
-    case DNGN_EXIT_WIZLAB:
-        return "portal leading out of here";
-    case DNGN_EXIT_ZIGGURAT:
-    case DNGN_EXIT_BAZAAR:
-    case DNGN_EXIT_TROVE:
-    case DNGN_EXIT_SEWER:
-    case DNGN_EXIT_OSSUARY:
-    case DNGN_EXIT_BAILEY:
-#if TAG_MAJOR_VERSION == 34
-    case DNGN_EXIT_PORTAL_VAULT:
-#endif
-        return "gate leading back out of here";
-
-    // altars
-    case DNGN_ALTAR_ZIN:
-        return "glowing silver altar of Zin";
-    case DNGN_ALTAR_SHINING_ONE:
-        return "glowing golden altar of the Shining One";
-    case DNGN_ALTAR_KIKUBAAQUDGHA:
-        return "ancient bone altar of Kikubaaqudgha";
-    case DNGN_ALTAR_YREDELEMNUL:
-        return "basalt altar of Yredelemnul";
-    case DNGN_ALTAR_XOM:
-        return "shimmering altar of Xom";
-    case DNGN_ALTAR_VEHUMET:
-        return "radiant altar of Vehumet";
-    case DNGN_ALTAR_OKAWARU:
-        return "iron altar of Okawaru";
-    case DNGN_ALTAR_MAKHLEB:
-        return "burning altar of Makhleb";
-    case DNGN_ALTAR_SIF_MUNA:
-        return "deep blue altar of Sif Muna";
-    case DNGN_ALTAR_TROG:
-        return "bloodstained altar of Trog";
-    case DNGN_ALTAR_NEMELEX_XOBEH:
-        return "sparkling altar of Nemelex Xobeh";
-    case DNGN_ALTAR_ELYVILON:
-        return "white marble altar of Elyvilon";
-    case DNGN_ALTAR_LUGONU:
-        return "corrupted altar of Lugonu";
-    case DNGN_ALTAR_BEOGH:
-        return "roughly hewn altar of Beogh";
-    case DNGN_ALTAR_JIYVA:
-        return "viscous altar of Jiyva";
-    case DNGN_ALTAR_FEDHAS:
-        return "blossoming altar of Fedhas";
-    case DNGN_ALTAR_CHEIBRIADOS:
-        return "snail-covered altar of Cheibriados";
-    case DNGN_ALTAR_ASHENZARI:
-        return "shattered altar of Ashenzari";
-    case DNGN_ALTAR_DITHMENOS:
-        return "shadowy altar of Dithmenos";
-    case DNGN_ALTAR_GOZAG:
-        return "opulent altar of Gozag";
-    case DNGN_ALTAR_QAZLAL:
-        return "stormy altar of Qazlal";
-
-    case DNGN_FOUNTAIN_BLUE:
-        return "fountain of clear blue water";
-    case DNGN_FOUNTAIN_SPARKLING:
-        return "fountain of sparkling water";
-    case DNGN_FOUNTAIN_BLOOD:
-        return "fountain of blood";
-    case DNGN_DRY_FOUNTAIN:
-        return "dry fountain";
-    case DNGN_PASSAGE_OF_GOLUBRIA:
-        return "passage of Golubria";
-
-    case DNGN_EXPLORE_HORIZON:
-        return "explore horizon";
-    case DNGN_UNKNOWN_ALTAR:
-        return "detected altar";
-    case DNGN_UNKNOWN_PORTAL:
-        return "detected shop or portal";
-    default:
+    if (grid == DNGN_ROCK_WALL && player_in_branch(BRANCH_PANDEMONIUM))
+        return "wall of the weird stuff which makes up Pandemonium";
+    else if (grid == DNGN_ORCISH_IDOL && player_genus(GENPC_ORCISH))
+        return "idol of Beogh";
+    else if (!is_valid_feature_type(grid))
         return "";
-    }
+    else
+        return get_feature_def(grid).name;
+
 }
 
 string feature_description(dungeon_feature_type grid, trap_type trap,