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

support non-rectangular extent-based buildings

develop
myk002 2021-10-03 07:36:52 -07:00 committed by Myk
parent 438f030221
commit 089de5f422
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/blueprints/library/test/ecosystem/in/allbuildings-spec.csv
Unescape Escape View File

@ -1,5 +1,8 @@
#notes
description=all the buildings
description=all the underground buildings
width=24
height=37
depth=2
#ignore
does not include (p) farm plots or (oO) dirt/paved roads, since they are built
on dirt and the ecosystem harness only chooses rock areas.

1 #notes
2 description=all the buildings description=all the underground buildings
3 width=24
4 height=37
5 depth=2
6 #ignore
7 does not include (p) farm plots or (oO) dirt/paved roads, since they are built
8 on dirt and the ecosystem harness only chooses rock areas.

16
plugins/blueprint.cpp
Unescape Escape View File

@ -213,6 +213,16 @@ static const char * do_block_building(const tile_context &ctx, const char *s,
return s;
}
static const char * do_extent_building(const tile_context &ctx, const char *s,
bool at_target_pos,
bool *add_size = NULL) {
// use expansion syntax for rectangular or one-tile buildings
if (is_rectangular(ctx))
return do_block_building(ctx, s, at_target_pos, add_size);
return s;
}
static const char * get_bridge_str(df::building *b) {
df::building_bridgest *bridge = virtual_cast<df::building_bridgest>(b);
if (!bridge)
@ -473,7 +483,7 @@ static const char * get_build_keys(const df::coord &pos,
case building_type::Box:
return "h";
case building_type::FarmPlot:
return do_block_building(ctx, "p", at_nw_corner, &add_size);
return do_extent_building(ctx, "p", at_nw_corner, &add_size);
case building_type::Weaponrack:
return "r";
case building_type::Statue:
@ -483,9 +493,9 @@ static const char * get_build_keys(const df::coord &pos,
case building_type::Coffin:
return "n";
case building_type::RoadPaved:
return do_block_building(ctx, "o", at_nw_corner, &add_size);
return do_extent_building(ctx, "o", at_nw_corner, &add_size);
case building_type::RoadDirt:
return do_block_building(ctx, "O", at_nw_corner, &add_size);
return do_extent_building(ctx, "O", at_nw_corner, &add_size);
case building_type::Bridge:
return do_block_building(ctx, get_bridge_str(ctx.b), at_nw_corner,
&add_size);