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

Added tile and material to growths in remotefortressreader.cpp

develop
Japa 2016-02-01 00:41:13 +05:30
parent 7f3191352c
commit e49745d338
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -418,6 +418,7 @@ message GrowthPrint
optional int32 color = 2; optional int32 color = 2;
optional int32 timing_start = 3; optional int32 timing_start = 3;
optional int32 timing_end = 4; optional int32 timing_end = 4;
optional int32 tile = 5;
} }
message TreeGrowth message TreeGrowth
@ -446,6 +447,7 @@ message PlantRaw
optional string id = 2; optional string id = 2;
optional string name = 3; optional string name = 3;
repeated TreeGrowth growths = 4; repeated TreeGrowth growths = 4;
optional int32 tile = 5;
} }
message PlantRawList message PlantRawList

9
plugins/remotefortressreader.cpp
Unescape Escape View File

@ -24,6 +24,7 @@
#include "df/builtin_mats.h" #include "df/builtin_mats.h"
#include "df/map_block_column.h" #include "df/map_block_column.h"
#include "df/plant.h" #include "df/plant.h"
#include "df/plant_raw_flags.h"
#if DF_VERSION > 40001 #if DF_VERSION > 40001
#include "df/plant_tree_info.h" #include "df/plant_tree_info.h"
#include "df/plant_tree_tile.h" #include "df/plant_tree_tile.h"
@ -1961,6 +1962,10 @@ static command_result GetPlantRaws(color_ostream &stream, const EmptyMessage *in
plant_remote->set_index(i); plant_remote->set_index(i);
plant_remote->set_id(plant_local->id); plant_remote->set_id(plant_local->id);
plant_remote->set_name(plant_local->name); plant_remote->set_name(plant_local->name);
if (!plant_local->flags.is_set(df::plant_raw_flags::TREE))
plant_remote->set_tile(plant_local->tiles.shrub_tile);
else
plant_remote->set_tile(plant_local->tiles.tree_tile);
for (int j = 0; j < plant_local->growths.size(); j++) for (int j = 0; j < plant_local->growths.size(); j++)
{ {
df::plant_growth* growth_local = plant_local->growths[j]; df::plant_growth* growth_local = plant_local->growths[j];
@ -1976,6 +1981,7 @@ static command_result GetPlantRaws(color_ostream &stream, const EmptyMessage *in
print_remote->set_color(print_local->color[0] + (print_local->color[1] * 8)); print_remote->set_color(print_local->color[0] + (print_local->color[1] * 8));
print_remote->set_timing_start(print_local->timing_start); print_remote->set_timing_start(print_local->timing_start);
print_remote->set_timing_end(print_local->timing_end); print_remote->set_timing_end(print_local->timing_end);
print_remote->set_tile(print_local->tile_growth);
} }
growth_remote->set_timing_start(growth_local->timing_1); growth_remote->set_timing_start(growth_local->timing_1);
growth_remote->set_timing_end(growth_local->timing_2); growth_remote->set_timing_end(growth_local->timing_2);
@ -1990,6 +1996,9 @@ static command_result GetPlantRaws(color_ostream &stream, const EmptyMessage *in
growth_remote->set_timing_end(growth_local->timing_2); growth_remote->set_timing_end(growth_local->timing_2);
growth_remote->set_trunk_height_start(growth_local->trunk_height_perc_1); growth_remote->set_trunk_height_start(growth_local->trunk_height_perc_1);
growth_remote->set_trunk_height_end(growth_local->trunk_height_perc_2); growth_remote->set_trunk_height_end(growth_local->trunk_height_perc_2);
auto growthMat = growth_remote->mutable_mat();
growthMat->set_mat_index(growth_local->mat_index);
growthMat->set_mat_type(growth_local->mat_type);
} }
} }
return CR_OK; return CR_OK;