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

Change item improvement type to bare ints.

develop
JapaMala 2020-05-02 14:38:55 -07:00
parent 60853a543d
commit 63c7b69b5b
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -963,30 +963,13 @@ message Language
repeated ShapeDescriptior shapes = 1; repeated ShapeDescriptior shapes = 1;
} }
enum ImprovementType
{
ART_IMAGE = 0;
COVERED = 1;
RINGS_HANGING = 2;
BANDS = 3;
SPIKES = 4;
ITEMSPECIFIC = 5;
THREAD = 6;
CLOTH = 7;
SEWN_IMAGE = 8;
PAGES = 9;
ILLUSTRATION = 10;
INSTRUMENT_PIECE = 11;
WRITING = 12;
}
message ItemImprovement message ItemImprovement
{ {
optional MatPair material = 1; optional MatPair material = 1;
optional ImprovementType type = 2;
optional int32 shape = 3; optional int32 shape = 3;
optional int32 specific_type= 4; optional int32 specific_type= 4;
optional ArtImage image = 5; optional ArtImage image = 5;
optional int32 type = 6;
} }
enum ArtImageElementType enum ArtImageElementType

2
plugins/remotefortressreader/item_reader.cpp
Unescape Escape View File

@ -450,7 +450,7 @@ void CopyItem(RemoteFortressReader::Item * NetItem, df::item * DfItem)
auto netImp = NetItem->add_improvements(); auto netImp = NetItem->add_improvements();
netImp->set_type((ImprovementType)impType); netImp->set_type(impType);
auto mat = netImp->mutable_material(); auto mat = netImp->mutable_material();
mat->set_mat_type(improvement->mat_type); mat->set_mat_type(improvement->mat_type);