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

Added armor raw info.

develop
JapaMala 2018-08-05 21:29:40 +05:30
parent f2664f7926
commit 4b8cf7f65e
2 changed files with 81 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,6 +201,14 @@ enum InventoryMode
Strapped = 10; Strapped = 10;
} }
enum ArmorLayer
{
LAYER_UNDER = 0;
LAYER_OVER = 1;
LAYER_ARMOR = 2;
LAYER_COVER = 3;
}
message Coord message Coord
{ {
optional int32 x = 1; optional int32 x = 1;
@ -371,6 +379,9 @@ message MaterialDefinition{
optional string name = 3; optional string name = 3;
optional ColorDefinition state_color = 4; //Simplifying colors to assume room temperature. optional ColorDefinition state_color = 4; //Simplifying colors to assume room temperature.
optional ItemdefInstrument.InstrumentDef instrument = 5; optional ItemdefInstrument.InstrumentDef instrument = 5;
optional int32 up_step = 6;
optional int32 down_step = 7;
optional ArmorLayer layer = 8;
} }
message BuildingType message BuildingType

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

@ -26,7 +26,13 @@
#include "df/item_statuest.h" #include "df/item_statuest.h"
#include "df/item_threadst.h" #include "df/item_threadst.h"
#include "df/item_toolst.h" #include "df/item_toolst.h"
#include "df/itemdef_armorst.h"
#include "df/itemdef_glovesst.h"
#include "df/itemdef_helmst.h"
#include "df/itemdef_instrumentst.h" #include "df/itemdef_instrumentst.h"
#include "df/itemdef_pantsst.h"
#include "df/itemdef_shieldst.h"
#include "df/itemdef_shoesst.h"
#include "df/itemdef_toolst.h" #include "df/itemdef_toolst.h"
#include "df/itemimprovement.h" #include "df/itemimprovement.h"
#include "df/itemimprovement_art_imagest.h" #include "df/itemimprovement_art_imagest.h"
@ -658,13 +664,76 @@ DFHack::command_result GetItemList(DFHack::color_ostream &stream, const DFHack::
reg->set_pitch_range_max(instrument->registers[j]->pitch_range_max); reg->set_pitch_range_max(instrument->registers[j]->pitch_range_max);
} }
send_instrument->set_description(DF2UTF(instrument->description)); send_instrument->set_description(DF2UTF(instrument->description));
break;
} }
break;
case df::enums::item_type::TOOL: case df::enums::item_type::TOOL:
{ {
VIRTUAL_CAST_VAR(tool, df::itemdef_toolst, item); VIRTUAL_CAST_VAR(tool, df::itemdef_toolst, item);
mat_def->set_name(DF2UTF(tool->name)); mat_def->set_name(DF2UTF(tool->name));
} }
break;
case df::enums::item_type::ARMOR:
{
VIRTUAL_CAST_VAR(armor, df::itemdef_armorst, item);
if (armor)
{
mat_def->set_up_step(armor->ubstep);
mat_def->set_down_step(armor->lbstep);
mat_def->set_layer((ArmorLayer)armor->props.layer);
}
}
break;
case df::enums::item_type::SHOES:
{
VIRTUAL_CAST_VAR(armor, df::itemdef_shoesst, item);
if (armor)
{
mat_def->set_up_step(armor->upstep);
mat_def->set_down_step(10000);
mat_def->set_layer((ArmorLayer)armor->props.layer);
}
}
break;
case df::enums::item_type::SHIELD:
{
VIRTUAL_CAST_VAR(armor, df::itemdef_shieldst, item);
if (armor)
{
mat_def->set_up_step(armor->upstep);
mat_def->set_down_step(10000);
}
}
break;
case df::enums::item_type::HELM:
{
VIRTUAL_CAST_VAR(armor, df::itemdef_helmst, item);
if (armor)
{
mat_def->set_layer((ArmorLayer)armor->props.layer);
}
}
break;
case df::enums::item_type::GLOVES:
{
VIRTUAL_CAST_VAR(armor, df::itemdef_glovesst, item);
if (armor)
{
mat_def->set_up_step(armor->upstep);
mat_def->set_down_step(10000);
mat_def->set_layer((ArmorLayer)armor->props.layer);
}
}
break;
case df::enums::item_type::PANTS:
{
VIRTUAL_CAST_VAR(armor, df::itemdef_pantsst, item);
if (armor)
{
mat_def->set_down_step(armor->lbstep);
mat_def->set_layer((ArmorLayer)armor->props.layer);
}
}
break;
default: default:
break; break;
} }