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

Send grass levels over RemoteFortressReader

develop
Japa 2017-07-25 08:31:02 +05:30
parent 1ee5debfba
commit 92a962a9c0
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/proto/RemoteFortressReader.proto
Unescape Escape View File

@ -256,6 +256,7 @@ message MapBlock
repeated Item items = 26; repeated Item items = 26;
repeated bool tile_dig_designation_marker = 27; repeated bool tile_dig_designation_marker = 27;
repeated bool tile_dig_designation_auto = 28; repeated bool tile_dig_designation_auto = 28;
repeated int32 grass_percent = 29;
} }
message MatPair { message MatPair {

12
plugins/remotefortressreader/remotefortressreader.cpp
Unescape Escape View File

@ -34,6 +34,7 @@
#include "df/army.h" #include "df/army.h"
#include "df/army_flags.h" #include "df/army_flags.h"
#include "df/block_square_event_item_spatterst.h" #include "df/block_square_event_item_spatterst.h"
#include "df/block_square_event_grassst.h"
#endif #endif
#include "df/block_square_event_material_spatterst.h" #include "df/block_square_event_material_spatterst.h"
#include "df/body_appearance_modifier.h" #include "df/body_appearance_modifier.h"
@ -1224,7 +1225,8 @@ void Copyspatters(df::map_block * DfBlock, RemoteFortressReader::MapBlock * NetB
std::vector<df::block_square_event_material_spatterst *> materials; std::vector<df::block_square_event_material_spatterst *> materials;
#if DF_VERSION_INT > 34011 #if DF_VERSION_INT > 34011
std::vector<df::block_square_event_item_spatterst *> items; std::vector<df::block_square_event_item_spatterst *> items;
if (!Maps::SortBlockEvents(DfBlock, NULL, NULL, &materials, NULL, NULL, NULL, &items)) std::vector<df::block_square_event_grassst *> grasses;
if (!Maps::SortBlockEvents(DfBlock, NULL, NULL, &materials, &grasses, NULL, NULL, &items))
return; return;
#else #else
if (!Maps::SortBlockEvents(DfBlock, NULL, NULL, &materials, NULL, NULL)) if (!Maps::SortBlockEvents(DfBlock, NULL, NULL, &materials, NULL, NULL))
@ -1257,6 +1259,14 @@ void Copyspatters(df::map_block * DfBlock, RemoteFortressReader::MapBlock * NetB
send_item->set_mat_type(item->item_type); send_item->set_mat_type(item->item_type);
send_item->set_mat_index(item->item_subtype); send_item->set_mat_index(item->item_subtype);
} }
int grassPercent = 0;
for (int i = 0; i < grasses.size(); i++)
{
auto grass = grasses[i];
if (grass->amount[xx][yy] > grassPercent)
grassPercent = grass->amount[xx][yy];
}
NetBlock->add_grass_percent(grassPercent);
#endif #endif
} }
} }