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

Merge pull request #1065 from JapaMala/unitProfession 

Unit profession
develop
Japa 2017-02-03 10:14:26 +05:30 committed by GitHub
parent e2fc7d3e00 c8e6845a7f
commit 8313b7768a
2 changed files with 16 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

@ -322,6 +322,8 @@ message UnitDefinition
optional int32 blood_max = 14; optional int32 blood_max = 14;
optional int32 blood_count = 15; optional int32 blood_count = 15;
optional UnitAppearance appearance = 16; optional UnitAppearance appearance = 16;
optional int32 profession_id = 17;
repeated string noble_positions = 18;
} }
message UnitList message UnitList

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

@ -96,6 +96,7 @@
#include "df/world_region_details.h" #include "df/world_region_details.h"
#include "df/world_site.h" #include "df/world_site.h"
#include "df/world_site_realization.h" #include "df/world_site_realization.h"
#include "df/entity_position.h"
#if DF_VERSION > 40001 #if DF_VERSION > 40001
#include "df/plant_growth.h" #include "df/plant_growth.h"
@ -1800,6 +1801,19 @@ static command_result GetUnitList(color_ostream &stream, const EmptyMessage *in,
for (int j = 0; j < unit->appearance.colors.size(); j++) for (int j = 0; j < unit->appearance.colors.size(); j++)
appearance->add_colors(unit->appearance.colors[j]); appearance->add_colors(unit->appearance.colors[j]);
appearance->set_size_modifier(unit->appearance.size_modifier); appearance->set_size_modifier(unit->appearance.size_modifier);
send_unit->set_profession_id(unit->profession);
std::vector<Units::NoblePosition> pvec;
if (Units::getNoblePositions(&pvec, unit))
{
for (int j = 0; j < pvec.size(); j++)
{
auto noble_positon = pvec[j];
send_unit->add_noble_positions(noble_positon.position->code);
}
}
} }
return CR_OK; return CR_OK;
} }