MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

generate random time variants where applicable

develop
myk002 2021-08-01 07:02:00 -07:00
parent 92701d6da7
commit 98fd6effdc
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/dig-now.cpp
Unescape Escape View File

@ -193,9 +193,13 @@ static void dig_type(MapExtras::MapCache &map, const DFCoord &pos,
map.setTiletypeAt(pos, tt); map.setTiletypeAt(pos, tt);
} }
static df::tiletype get_target_type(df::tiletype tt, df::tiletype_shape shape) {
return findRandomVariant(findSimilarTileType(tt, shape));
}
static void dig_shape(MapExtras::MapCache &map, const DFCoord &pos, static void dig_shape(MapExtras::MapCache &map, const DFCoord &pos,
df::tiletype tt, df::tiletype_shape shape) { df::tiletype tt, df::tiletype_shape shape) {
dig_type(map, pos, findSimilarTileType(tt, shape)); dig_type(map, pos, get_target_type(tt, shape));
} }
static void remove_ramp_top(MapExtras::MapCache &map, const DFCoord &pos) { static void remove_ramp_top(MapExtras::MapCache &map, const DFCoord &pos) {
@ -331,7 +335,7 @@ static bool dig_tile(color_ostream &out, MapExtras::MapCache &map,
target_shape = df::tiletype_shape::STAIR_DOWN; target_shape = df::tiletype_shape::STAIR_DOWN;
else if (shape == df::tiletype_shape::RAMP) else if (shape == df::tiletype_shape::RAMP)
remove_ramp_top(map, DFCoord(pos.x, pos.y, pos.z+1)); remove_ramp_top(map, DFCoord(pos.x, pos.y, pos.z+1));
target_type = findSimilarTileType(tt, target_shape); target_type = get_target_type(tt, target_shape);
} }
break; break;
case df::tile_dig_designation::Channel: case df::tile_dig_designation::Channel:
@ -355,27 +359,25 @@ static bool dig_tile(color_ostream &out, MapExtras::MapCache &map,
} }
case df::tile_dig_designation::UpStair: case df::tile_dig_designation::UpStair:
if (can_dig_up_stair(tt)) if (can_dig_up_stair(tt))
target_type = target_type = get_target_type(tt, df::tiletype_shape::STAIR_UP);
findSimilarTileType(tt, df::tiletype_shape::STAIR_UP);
break; break;
case df::tile_dig_designation::DownStair: case df::tile_dig_designation::DownStair:
if (can_dig_down_stair(tt)) { if (can_dig_down_stair(tt)) {
target_type = target_type =
findSimilarTileType(tt, df::tiletype_shape::STAIR_DOWN); get_target_type(tt, df::tiletype_shape::STAIR_DOWN);
} }
break; break;
case df::tile_dig_designation::UpDownStair: case df::tile_dig_designation::UpDownStair:
if (can_dig_up_down_stair(tt)) { if (can_dig_up_down_stair(tt)) {
target_type = target_type =
findSimilarTileType(tt, get_target_type(tt, df::tiletype_shape::STAIR_UPDOWN);
df::tiletype_shape::STAIR_UPDOWN);
} }
break; break;
case df::tile_dig_designation::Ramp: case df::tile_dig_designation::Ramp:
{ {
if (can_dig_ramp(tt)) { if (can_dig_ramp(tt)) {
target_type = findSimilarTileType(tt, df::tiletype_shape::RAMP); target_type = get_target_type(tt, df::tiletype_shape::RAMP);
DFCoord pos_above(pos.x, pos.y, pos.z+1); DFCoord pos_above(pos.x, pos.y, pos.z+1);
if (target_type != tt && map.ensureBlockAt(pos_above) if (target_type != tt && map.ensureBlockAt(pos_above)
&& is_diggable(map, pos, map.tiletypeAt(pos_above))) { && is_diggable(map, pos, map.tiletypeAt(pos_above))) {
@ -388,7 +390,7 @@ static bool dig_tile(color_ostream &out, MapExtras::MapCache &map,
// because we need to use *this* tile's material, not the // because we need to use *this* tile's material, not the
// material of the tile above // material of the tile above
map.setTiletypeAt(pos_above, map.setTiletypeAt(pos_above,
findSimilarTileType(tt, df::tiletype_shape::RAMP_TOP)); get_target_type(tt, df::tiletype_shape::RAMP_TOP));
remove_ramp_top(map, DFCoord(pos.x, pos.y, pos.z+2)); remove_ramp_top(map, DFCoord(pos.x, pos.y, pos.z+2));
} }
} }