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

Skip ice and brook floors.

develop
Japa 2013-04-06 17:07:46 +05:30
parent 660ce50542
commit 3b921feb61
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/isoworld

@ -1 +1 @@
Subproject commit c53ade8b997afbe33783aaa4aadfd39c9786fc51 Subproject commit 91ce0f4e1d3e8c2dd407f5a406057f6e205dc842

11
plugins/isoworldremote.cpp
Unescape Escape View File

@ -53,7 +53,7 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
{ {
//// Fill the command list with your commands. //// Fill the command list with your commands.
//commands.push_back(PluginCommand( //commands.push_back(PluginCommand(
// "isoworldremote", "Do nothing, look pretty.", // "isoworldremote", "Dump north-west embark tile to text file for debug purposes.",
// isoWorldRemote, false, /* true means that the command can't be used from non-interactive user interface */ // isoWorldRemote, false, /* true means that the command can't be used from non-interactive user interface */
// // Extended help string. Used by CR_WRONG_USAGE and the help command: // // Extended help string. Used by CR_WRONG_USAGE and the help command:
// " This command does nothing at all.\n" // " This command does nothing at all.\n"
@ -163,8 +163,6 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
// } // }
// debug_text << std::endl; // debug_text << std::endl;
// } // }
// //clean everything up.
// google::protobuf::ShutdownProtobufLibrary();
// // Give control back to DF. // // Give control back to DF.
// return CR_OK; // return CR_OK;
//} //}
@ -270,15 +268,18 @@ bool gather_embark_tile_layer(int EmbX, int EmbY, int EmbZ, EmbarkTileLayer * ti
} }
df::tile_designation designation = b->DesignationAt(block_coord); df::tile_designation designation = b->DesignationAt(block_coord);
DFHack::t_matpair actual_mat; DFHack::t_matpair actual_mat;
if(tileShapeBasic(tileShape(upper_tile)) == tiletype_shape_basic::Floor) { //if the upper tile is a floor, use that material instead. if(tileShapeBasic(tileShape(upper_tile)) == tiletype_shape_basic::Floor && (tileMaterial(tile_type) != tiletype_material::FROZEN_LIQUID) && (tileMaterial(tile_type) != tiletype_material::BROOK)) { //if the upper tile is a floor, use that material instead. Unless it's ice.
actual_mat = b_upper->staticMaterialAt(block_coord); actual_mat = b_upper->staticMaterialAt(block_coord);
} }
else { else {
actual_mat = b->staticMaterialAt(block_coord); actual_mat = b->staticMaterialAt(block_coord);
} }
if(((tileMaterial(tile_type) == tiletype_material::FROZEN_LIQUID) || (tileMaterial(tile_type) == tiletype_material::BROOK)) && (tileShapeBasic(tileShape(tile_type)) == tiletype_shape_basic::Floor)) {
tile_type = tiletype::OpenSpace;
}
unsigned int array_index = coord_to_index_48(xx*16+block_x, yy*16+block_y); unsigned int array_index = coord_to_index_48(xx*16+block_x, yy*16+block_y);
//make a new fake material at the given index //make a new fake material at the given index
if(tileMaterial(tile_type) == tiletype_material::FROZEN_LIQUID && (tileShapeBasic(tileShape(upper_tile)) != tiletype_shape_basic::Floor)) { //Ice. if(tileMaterial(tile_type) == tiletype_material::FROZEN_LIQUID && !((tileShapeBasic(tileShape(upper_tile)) == tiletype_shape_basic::Floor) && (tileMaterial(upper_tile) != tiletype_material::FROZEN_LIQUID))) { //Ice.
tile->set_mat_type_table(array_index, BasicMaterial::LIQUID); //Ice is totally a liquid, shut up. tile->set_mat_type_table(array_index, BasicMaterial::LIQUID); //Ice is totally a liquid, shut up.
tile->set_mat_subtype_table(array_index, LiquidType::ICE); tile->set_mat_subtype_table(array_index, LiquidType::ICE);
num_valid_blocks++; num_valid_blocks++;