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

Remove tabs.

develop
Japa Mala Illo 2017-11-25 11:37:54 +05:30
parent 69a88e1641
commit 4a52f322c3
2 changed files with 127 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -397,9 +397,9 @@ message UnitDefinition
repeated string noble_positions = 18; repeated string noble_positions = 18;
optional int32 rider_id = 19; optional int32 rider_id = 19;
repeated InventoryItem inventory = 20; repeated InventoryItem inventory = 20;
optional float subpos_x = 21; optional float subpos_x = 21;
optional float subpos_y = 22; optional float subpos_y = 22;
optional float subpos_z = 23; optional float subpos_z = 23;
} }
message UnitList message UnitList

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

@ -263,9 +263,9 @@ DFhackCExport RPCService *plugin_rpcconnect(color_ostream &)
svc->addFunction("CheckHashes", CheckHashes, SF_ALLOW_REMOTE); svc->addFunction("CheckHashes", CheckHashes, SF_ALLOW_REMOTE);
svc->addFunction("GetTiletypeList", GetTiletypeList, SF_ALLOW_REMOTE); svc->addFunction("GetTiletypeList", GetTiletypeList, SF_ALLOW_REMOTE);
svc->addFunction("GetPlantList", GetPlantList, SF_ALLOW_REMOTE); svc->addFunction("GetPlantList", GetPlantList, SF_ALLOW_REMOTE);
svc->addFunction("GetUnitList", GetUnitList, SF_ALLOW_REMOTE); svc->addFunction("GetUnitList", GetUnitList, SF_ALLOW_REMOTE);
svc->addFunction("GetUnitListInside", GetUnitListInside, SF_ALLOW_REMOTE); svc->addFunction("GetUnitListInside", GetUnitListInside, SF_ALLOW_REMOTE);
svc->addFunction("GetViewInfo", GetViewInfo, SF_ALLOW_REMOTE); svc->addFunction("GetViewInfo", GetViewInfo, SF_ALLOW_REMOTE);
svc->addFunction("GetMapInfo", GetMapInfo, SF_ALLOW_REMOTE); svc->addFunction("GetMapInfo", GetMapInfo, SF_ALLOW_REMOTE);
svc->addFunction("ResetMapHashes", ResetMapHashes, SF_ALLOW_REMOTE); svc->addFunction("ResetMapHashes", ResetMapHashes, SF_ALLOW_REMOTE);
svc->addFunction("GetItemList", GetItemList, SF_ALLOW_REMOTE); svc->addFunction("GetItemList", GetItemList, SF_ALLOW_REMOTE);
@ -1553,127 +1553,127 @@ static command_result GetUnitList(color_ostream &stream, const EmptyMessage *in,
static command_result GetUnitListInside(color_ostream &stream, const BlockRequest *in, UnitList *out) static command_result GetUnitListInside(color_ostream &stream, const BlockRequest *in, UnitList *out)
{ {
auto world = df::global::world; auto world = df::global::world;
for (int i = 0; i < world->units.all.size(); i++) for (int i = 0; i < world->units.all.size(); i++)
{ {
df::unit * unit = world->units.all[i]; df::unit * unit = world->units.all[i];
auto send_unit = out->add_creature_list(); auto send_unit = out->add_creature_list();
send_unit->set_id(unit->id); send_unit->set_id(unit->id);
send_unit->set_pos_x(unit->pos.x); send_unit->set_pos_x(unit->pos.x);
send_unit->set_pos_y(unit->pos.y); send_unit->set_pos_y(unit->pos.y);
send_unit->set_pos_z(unit->pos.z); send_unit->set_pos_z(unit->pos.z);
send_unit->mutable_race()->set_mat_type(unit->race); send_unit->mutable_race()->set_mat_type(unit->race);
send_unit->mutable_race()->set_mat_index(unit->caste); send_unit->mutable_race()->set_mat_index(unit->caste);
if (in != NULL) if (in != NULL)
{ {
if (unit->pos.z < in->min_z() || unit->pos.z >= in->max_z()) if (unit->pos.z < in->min_z() || unit->pos.z >= in->max_z())
continue; continue;
if (unit->pos.x < in->min_x() * 16 || unit->pos.x >= in->max_x() * 16) if (unit->pos.x < in->min_x() * 16 || unit->pos.x >= in->max_x() * 16)
continue; continue;
if (unit->pos.y < in->min_y() * 16 || unit->pos.y >= in->max_y() * 16) if (unit->pos.y < in->min_y() * 16 || unit->pos.y >= in->max_y() * 16)
continue; continue;
} }
ConvertDfColor(Units::getProfessionColor(unit), send_unit->mutable_profession_color()); ConvertDfColor(Units::getProfessionColor(unit), send_unit->mutable_profession_color());
send_unit->set_flags1(unit->flags1.whole); send_unit->set_flags1(unit->flags1.whole);
send_unit->set_flags2(unit->flags2.whole); send_unit->set_flags2(unit->flags2.whole);
send_unit->set_flags3(unit->flags3.whole); send_unit->set_flags3(unit->flags3.whole);
send_unit->set_is_soldier(ENUM_ATTR(profession, military, unit->profession)); send_unit->set_is_soldier(ENUM_ATTR(profession, military, unit->profession));
auto size_info = send_unit->mutable_size_info(); auto size_info = send_unit->mutable_size_info();
size_info->set_size_cur(unit->body.size_info.size_cur); size_info->set_size_cur(unit->body.size_info.size_cur);
size_info->set_size_base(unit->body.size_info.size_base); size_info->set_size_base(unit->body.size_info.size_base);
size_info->set_area_cur(unit->body.size_info.area_cur); size_info->set_area_cur(unit->body.size_info.area_cur);
size_info->set_area_base(unit->body.size_info.area_base); size_info->set_area_base(unit->body.size_info.area_base);
size_info->set_length_cur(unit->body.size_info.length_cur); size_info->set_length_cur(unit->body.size_info.length_cur);
size_info->set_length_base(unit->body.size_info.length_base); size_info->set_length_base(unit->body.size_info.length_base);
if (unit->name.has_name) if (unit->name.has_name)
{ {
send_unit->set_name(DF2UTF(Translation::TranslateName(Units::getVisibleName(unit)))); send_unit->set_name(DF2UTF(Translation::TranslateName(Units::getVisibleName(unit))));
} }
auto appearance = send_unit->mutable_appearance(); auto appearance = send_unit->mutable_appearance();
for (int j = 0; j < unit->appearance.body_modifiers.size(); j++) for (int j = 0; j < unit->appearance.body_modifiers.size(); j++)
appearance->add_body_modifiers(unit->appearance.body_modifiers[j]); appearance->add_body_modifiers(unit->appearance.body_modifiers[j]);
for (int j = 0; j < unit->appearance.bp_modifiers.size(); j++) for (int j = 0; j < unit->appearance.bp_modifiers.size(); j++)
appearance->add_bp_modifiers(unit->appearance.bp_modifiers[j]); appearance->add_bp_modifiers(unit->appearance.bp_modifiers[j]);
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); send_unit->set_profession_id(unit->profession);
std::vector<Units::NoblePosition> pvec; std::vector<Units::NoblePosition> pvec;
if (Units::getNoblePositions(&pvec, unit)) if (Units::getNoblePositions(&pvec, unit))
{ {
for (int j = 0; j < pvec.size(); j++) for (int j = 0; j < pvec.size(); j++)
{ {
auto noble_positon = pvec[j]; auto noble_positon = pvec[j];
send_unit->add_noble_positions(noble_positon.position->code); send_unit->add_noble_positions(noble_positon.position->code);
} }
} }
send_unit->set_rider_id(unit->relationship_ids[df::unit_relationship_type::RiderMount]); send_unit->set_rider_id(unit->relationship_ids[df::unit_relationship_type::RiderMount]);
auto creatureRaw = world->raws.creatures.all[unit->race]; auto creatureRaw = world->raws.creatures.all[unit->race];
auto casteRaw = creatureRaw->caste[unit->caste]; auto casteRaw = creatureRaw->caste[unit->caste];
for (int j = 0; j < unit->appearance.tissue_style_type.size(); j++) for (int j = 0; j < unit->appearance.tissue_style_type.size(); j++)
{ {
auto type = unit->appearance.tissue_style_type[j]; auto type = unit->appearance.tissue_style_type[j];
if (type < 0) if (type < 0)
continue; continue;
int style_raw_index = binsearch_index(casteRaw->tissue_styles, &df::tissue_style_raw::id, type); int style_raw_index = binsearch_index(casteRaw->tissue_styles, &df::tissue_style_raw::id, type);
auto styleRaw = casteRaw->tissue_styles[style_raw_index]; auto styleRaw = casteRaw->tissue_styles[style_raw_index];
if (styleRaw->token == "HAIR") if (styleRaw->token == "HAIR")
{ {
auto send_style = appearance->mutable_hair(); auto send_style = appearance->mutable_hair();
send_style->set_length(unit->appearance.tissue_length[j]); send_style->set_length(unit->appearance.tissue_length[j]);
send_style->set_style((HairStyle)unit->appearance.tissue_style[j]); send_style->set_style((HairStyle)unit->appearance.tissue_style[j]);
} }
else if (styleRaw->token == "BEARD") else if (styleRaw->token == "BEARD")
{ {
auto send_style = appearance->mutable_beard(); auto send_style = appearance->mutable_beard();
send_style->set_length(unit->appearance.tissue_length[j]); send_style->set_length(unit->appearance.tissue_length[j]);
send_style->set_style((HairStyle)unit->appearance.tissue_style[j]); send_style->set_style((HairStyle)unit->appearance.tissue_style[j]);
} }
else if (styleRaw->token == "MOUSTACHE") else if (styleRaw->token == "MOUSTACHE")
{ {
auto send_style = appearance->mutable_moustache(); auto send_style = appearance->mutable_moustache();
send_style->set_length(unit->appearance.tissue_length[j]); send_style->set_length(unit->appearance.tissue_length[j]);
send_style->set_style((HairStyle)unit->appearance.tissue_style[j]); send_style->set_style((HairStyle)unit->appearance.tissue_style[j]);
} }
else if (styleRaw->token == "SIDEBURNS") else if (styleRaw->token == "SIDEBURNS")
{ {
auto send_style = appearance->mutable_sideburns(); auto send_style = appearance->mutable_sideburns();
send_style->set_length(unit->appearance.tissue_length[j]); send_style->set_length(unit->appearance.tissue_length[j]);
send_style->set_style((HairStyle)unit->appearance.tissue_style[j]); send_style->set_style((HairStyle)unit->appearance.tissue_style[j]);
} }
} }
for (int j = 0; j < unit->inventory.size(); j++) for (int j = 0; j < unit->inventory.size(); j++)
{ {
auto inventory_item = unit->inventory[j]; auto inventory_item = unit->inventory[j];
auto sent_item = send_unit->add_inventory(); auto sent_item = send_unit->add_inventory();
sent_item->set_mode((InventoryMode)inventory_item->mode); sent_item->set_mode((InventoryMode)inventory_item->mode);
CopyItem(sent_item->mutable_item(), inventory_item->item); CopyItem(sent_item->mutable_item(), inventory_item->item);
} }
if (unit->flags1.bits.projectile) if (unit->flags1.bits.projectile)
{ {
for (auto proj = world->proj_list.next; proj != NULL; proj = proj->next) for (auto proj = world->proj_list.next; proj != NULL; proj = proj->next)
{ {
STRICT_VIRTUAL_CAST_VAR(item, df::proj_unitst, proj->item); STRICT_VIRTUAL_CAST_VAR(item, df::proj_unitst, proj->item);
if (item == NULL) if (item == NULL)
continue; continue;
if (item->unit != unit) if (item->unit != unit)
continue; continue;
send_unit->set_subpos_x(item->pos_x / 100000.0); send_unit->set_subpos_x(item->pos_x / 100000.0);
send_unit->set_subpos_y(item->pos_y / 100000.0); send_unit->set_subpos_y(item->pos_y / 100000.0);
send_unit->set_subpos_z(item->pos_z / 140000.0); send_unit->set_subpos_z(item->pos_z / 140000.0);
} }
} }
} }
return CR_OK; return CR_OK;
} }
static command_result GetViewInfo(color_ostream &stream, const EmptyMessage *in, ViewInfo *out) static command_result GetViewInfo(color_ostream &stream, const EmptyMessage *in, ViewInfo *out)