diff --git a/library/DFTileTypes.cpp b/library/DFTileTypes.cpp index ad509612a..bf1347789 100644 --- a/library/DFTileTypes.cpp +++ b/library/DFTileTypes.cpp @@ -10,7 +10,7 @@ namespace DFHack // 0 {"void",EMPTY, AIR, VAR_1}, {"ramp top",RAMP_TOP, AIR, VAR_1}, - {"pool",FLOOR, SOIL, VAR_1, TILE_POOL}, + {"pool",POOL, SOIL, VAR_1}, {0, EMPTY, AIR, VAR_1}, {0, EMPTY, AIR, VAR_1}, {0, EMPTY, AIR, VAR_1}, @@ -49,7 +49,7 @@ namespace DFHack {"empty space",EMPTY, AIR, VAR_1}, {0 ,EMPTY, AIR, VAR_1}, {"shrub",SHRUB_OK, SOIL, VAR_1}, - {"chasm",FLOOR, AIR, VAR_1, TILE_ENDLESS }, + {"chasm",ENDLESS_PIT, AIR, VAR_1}, {"obsidian stair up/down",STAIR_UPDOWN, OBSIDIAN, VAR_1}, {"obsidian stair down",STAIR_DOWN, OBSIDIAN, VAR_1}, {"obsidian stair up",STAIR_UP, OBSIDIAN, VAR_1}, @@ -58,7 +58,7 @@ namespace DFHack // 40 {"soil stair down",STAIR_DOWN, SOIL, VAR_1}, {"soil stair up",STAIR_UP, SOIL, VAR_1}, - {"eerie pit",FLOOR, HFS, VAR_1, TILE_ENDLESS}, + {"eerie pit",ENDLESS_PIT, HFS, VAR_1}, {"smooth stone floor",FLOOR, STONE, VAR_1 , TILE_SMOOTH }, {"smooth obsidian floor",FLOOR, OBSIDIAN, VAR_1 , TILE_SMOOTH }, {"smooth featstone? floor",FLOOR, FEATSTONE, VAR_1 , TILE_SMOOTH }, @@ -406,10 +406,6 @@ namespace DFHack // 330 {"worn obsidian wall",WALL,OBSIDIAN,VAR_1}, {"obsidian wall",WALL,OBSIDIAN,VAR_1}, - /*MAPTILE_FEATSTONE_WALL_WORN1, - MAPTILE_FEATSTONE_WALL_WORN2, - MAPTILE_FEATSTONE_WALL_WORN3, - MAPTILE_FEATSTONE_WALL,*/ {"cracked featstone wall",WALL,FEATSTONE,VAR_1, TILE_CRACKED }, {"damaged featstone wall",WALL,FEATSTONE,VAR_1, TILE_DAMAGED }, {"worn featstone wall",WALL,FEATSTONE,VAR_1, TILE_WORN }, @@ -449,27 +445,27 @@ namespace DFHack {"damaged ice wall",WALL,ICE,VAR_1, TILE_DAMAGED}, {"worn ice wall",WALL,ICE,VAR_1, TILE_WORN }, {"ice wall",WALL,ICE,VAR_1}, - {"river N",FLOOR,SOIL,VAR_1, TILE_RIVER , "N" }, - {"river S",FLOOR,SOIL,VAR_1, TILE_RIVER , "S" }, - {"river E",FLOOR,SOIL,VAR_1, TILE_RIVER , "E" }, - {"river W",FLOOR,SOIL,VAR_1, TILE_RIVER , "W" }, - {"river NW",FLOOR,SOIL,VAR_1, TILE_RIVER, "NW"}, + {"river N",RIVER_BED,SOIL,VAR_1, TILE_NORMAL, "N" }, + {"river S",RIVER_BED,SOIL,VAR_1, TILE_NORMAL, "S" }, + {"river E",RIVER_BED,SOIL,VAR_1, TILE_NORMAL, "E" }, + {"river W",RIVER_BED,SOIL,VAR_1, TILE_NORMAL, "W" }, + {"river NW",RIVER_BED,SOIL,VAR_1,TILE_NORMAL, "NW"}, //370 - {"river NE",FLOOR,SOIL,VAR_1, TILE_RIVER , "NE" }, - {"river SW",FLOOR,SOIL,VAR_1, TILE_RIVER , "SW" }, - {"river SE",FLOOR,SOIL,VAR_1, TILE_RIVER , "SE" }, - {"stream bed N",FLOOR,SOIL,VAR_1, TILE_STREAM , "N" }, - {"stream bed S",FLOOR,SOIL,VAR_1, TILE_STREAM , "S" }, - {"stream bed E",FLOOR,SOIL,VAR_1, TILE_STREAM , "E" }, - {"stream bed W",FLOOR,SOIL,VAR_1, TILE_STREAM , "W" }, - {"stream bed NW",FLOOR,SOIL,VAR_1, TILE_STREAM, "NW" }, - {"stream bed NE",FLOOR,SOIL,VAR_1, TILE_STREAM, "NE" }, - {"stream bed SW",FLOOR,SOIL,VAR_1, TILE_STREAM, "SW" }, + {"river NE",RIVER_BED,SOIL,VAR_1, TILE_NORMAL , "NE" }, + {"river SW",RIVER_BED,SOIL,VAR_1, TILE_NORMAL , "SW" }, + {"river SE",RIVER_BED,SOIL,VAR_1, TILE_NORMAL , "SE" }, + {"brook bed N",BROOK_BED,SOIL,VAR_1, TILE_NORMAL , "N" }, + {"brook bed S",BROOK_BED,SOIL,VAR_1, TILE_NORMAL , "S" }, + {"brook bed E",BROOK_BED,SOIL,VAR_1, TILE_NORMAL , "E" }, + {"brook bed W",BROOK_BED,SOIL,VAR_1, TILE_NORMAL , "W" }, + {"brook bed NW",BROOK_BED,SOIL,VAR_1, TILE_NORMAL, "NW" }, + {"brook bed NE",BROOK_BED,SOIL,VAR_1, TILE_NORMAL, "NE" }, + {"brook bed SW",BROOK_BED,SOIL,VAR_1, TILE_NORMAL, "SW" }, // 380 - {"stream bed SE",FLOOR,SOIL,VAR_1, TILE_STREAM, "SE" }, - {"stream top",FLOOR,SOIL,VAR_1, TILE_STREAM_TOP }, + {"brook bed SE",BROOK_BED,SOIL,VAR_1, TILE_NORMAL, "SE" }, + {"brook top",BROOK_TOP,SOIL,VAR_1 }, {0 ,EMPTY, AIR, VAR_1}, {0 ,EMPTY, AIR, VAR_1}, {0 ,EMPTY, AIR, VAR_1}, diff --git a/library/include/dfhack/DFTileTypes.h b/library/include/dfhack/DFTileTypes.h index 9e2e79f5e..db21f3ab1 100644 --- a/library/include/dfhack/DFTileTypes.h +++ b/library/include/dfhack/DFTileTypes.h @@ -36,24 +36,29 @@ namespace DFHack // tile class -- determines the general shape of the tile // enum and lookup table for string names created using X macros #define TILESHAPE_MACRO \ - X(EMPTY, "") \ - X(WALL, "") \ - X(PILLAR, "") \ - X(FORTIFICATION, "") \ - X(STAIR_UP, "") \ - X(STAIR_DOWN, "") \ - X(STAIR_UPDOWN, "") \ - X(RAMP, "ramps have no direction" ) \ - X(RAMP_TOP, "used for pathing?" ) \ - X(FLOOR, "") \ - X(TREE_DEAD, "") \ - X(TREE_OK, "") \ - X(SAPLING_DEAD, "") \ - X(SAPLING_OK, "") \ - X(SHRUB_DEAD, "") \ - X(SHRUB_OK, "") \ - X(BOULDER, "") \ - X(PEBBLES, "") + X(EMPTY, "") \ + X(WALL, "") \ + X(PILLAR, "") \ + X(BROOK_BED, "mineable, water-passable rock on the bottom of brook") \ + X(FORTIFICATION, "") \ + X(STAIR_UP, "") \ + X(STAIR_DOWN, "") \ + X(STAIR_UPDOWN, "") \ + X(RAMP, "ramps have no direction" ) \ + X(RAMP_TOP, "used for pathing?" ) \ + X(FLOOR, "") \ + X(BROOK_TOP, "water-passable floor on top of BROOK_BED tiles") \ + X(RIVER_BED, "It's a riverbed. Basically a floor.'") \ + X(POOL, "A pool. Gathers water while it's raining.'") \ + X(TREE_DEAD, "") \ + X(TREE_OK, "") \ + X(SAPLING_DEAD, "") \ + X(SAPLING_OK, "") \ + X(SHRUB_DEAD, "") \ + X(SHRUB_OK, "") \ + X(BOULDER, "") \ + X(PEBBLES, "") \ + X(ENDLESS_PIT, "a fake endless pit") //end TILESHAPE_MACRO //define tile class enum @@ -106,14 +111,8 @@ namespace DFHack // When the TileType class gets created, everything should be re-thought. #define TILESPECIAL_MACRO \ X(NORMAL, "Default for all type, nothing present" ) \ - X(SPECIAL, "General purpose, for any unique tile which can not otherwise be differenciated" ) \ - X(POOL, "Murky Pool, will gather water from rain" ) \ - X(STREAM, "Streams (and brooks too? maybe?)" ) \ - X(STREAM_TOP, "The walkable surface of a stream/brook" ) \ X(RIVER_SOURCE, "Rivers Source, when it exists on a map" ) \ - X(RIVER, "Rivers, and their entering and exiting tiles" ) \ X(WATERFALL, "Special case for Waterfall Landing. How's this used?" ) \ - X(ENDLESS, "Eerie Pit and Old Chasm/Endless Pit" ) \ X(CRACKED, "Walls being dug" ) \ X(DAMAGED, "Walls being dug" ) \ X(WORN, "Walls being dug ??" ) \ @@ -289,6 +288,10 @@ namespace DFHack case DFHack::SHRUB_OK: case DFHack::BOULDER: case DFHack::PEBBLES: + case DFHack::RIVER_BED: + case DFHack::POOL: + case DFHack::ENDLESS_PIT: + case DFHack::BROOK_TOP: return true; default: return false; diff --git a/tools/playground/hellhole.cpp b/tools/playground/hellhole.cpp index 22599bc24..ac7781a7c 100644 --- a/tools/playground/hellhole.cpp +++ b/tools/playground/hellhole.cpp @@ -719,7 +719,7 @@ int main (void) tp = getTileRow(block.tiletypes[x][y]); d = &block.designation[x][y]; //Only modify this level if it's 'empty' - if ( EMPTY != tp->shape && RAMP_TOP != tp->shape && STAIR_DOWN != tp->shape && DFHack::TILE_STREAM_TOP != tp->special) + if ( EMPTY != tp->shape && RAMP_TOP != tp->shape && STAIR_DOWN != tp->shape && DFHack::BROOK_TOP != tp->shape) { continue; } diff --git a/tools/supported/unreveal.cpp b/tools/supported/unreveal.cpp index d5098ffdf..af98beb87 100644 --- a/tools/supported/unreveal.cpp +++ b/tools/supported/unreveal.cpp @@ -141,8 +141,7 @@ int main (int argc, char* argv[]) case RAMP_TOP: case STAIR_UPDOWN: case STAIR_DOWN: - case STREAM: - case STREAM_TOP: + case BROOK_TOP: above = below = sides = true; break; // has floor @@ -158,6 +157,10 @@ int main (int argc, char* argv[]) case SHRUB_OK: case BOULDER: case PEBBLES: + case BROOK_BED: + case RIVER_BED: + case ENDLESS_PIT: + case POOL: if(from_below) unhide = 0; above = sides = true;