diff --git a/plugins/proto/RemoteFortressReader.proto b/plugins/proto/RemoteFortressReader.proto index 0cdb41110..73f75792f 100644 --- a/plugins/proto/RemoteFortressReader.proto +++ b/plugins/proto/RemoteFortressReader.proto @@ -882,6 +882,7 @@ message Status message ShapeDescriptior { optional string id = 1; + optional int32 tile = 2; } message Language @@ -936,4 +937,5 @@ message ArtImageElement message ArtImage { repeated ArtImageElement elements = 1; + optional MatPair id = 2; } \ No newline at end of file diff --git a/plugins/remotefortressreader/item_reader.cpp b/plugins/remotefortressreader/item_reader.cpp index 933abc501..2eef1ad67 100644 --- a/plugins/remotefortressreader/item_reader.cpp +++ b/plugins/remotefortressreader/item_reader.cpp @@ -49,6 +49,9 @@ using namespace df::global; void CopyImage(const df::art_image * image, ArtImage * netImage) { + auto id = netImage->mutable_id(); + id->set_mat_type(image->id); + id->set_mat_index(image->subid); for (int i = 0; i < image->elements.size(); i++) { auto element = image->elements[i]; diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp index c64238a14..427fc4334 100644 --- a/plugins/remotefortressreader/remotefortressreader.cpp +++ b/plugins/remotefortressreader/remotefortressreader.cpp @@ -53,8 +53,6 @@ #include "df/creature_raw.h" #include "df/creature_raw.h" #include "df/descriptor_color.h" -#include "df/descriptor_color.h" -#include "df/descriptor_pattern.h" #include "df/descriptor_pattern.h" #include "df/descriptor_shape.h" #include "df/dfhack_material_category.h" @@ -2919,6 +2917,7 @@ static command_result GetLanguage(color_ostream & stream, const EmptyMessage * i auto shape = world->raws.language.shapes[i]; auto netShape = out->add_shapes(); netShape->set_id(shape->id); + netShape->set_tile(shape->tile); } return CR_OK; } \ No newline at end of file