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

stockpiles: serialize through leather 

* more code reuse!
develop
Casey Link 2014-11-19 17:46:52 +01:00
parent e863df512b
commit d74ac1b3a6
2 changed files with 283 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/proto/stockpiles.proto
Unescape Escape View File

@ -86,8 +86,8 @@ message StockpileSettings {
repeated string type = 1; repeated string type = 1;
repeated string other_mats = 2; repeated string other_mats = 2;
repeated string mats = 3; repeated string mats = 3;
optional string quality_core = 4; repeated string quality_core = 4;
optional string quality_total = 5; repeated string quality_total = 5;
} }
message LeatherSet { message LeatherSet {
repeated string mats = 1; repeated string mats = 1;

523
plugins/stockpiles.cpp
Unescape Escape View File

@ -294,8 +294,10 @@ public:
StockpileSerializer ( color_ostream &out, building_stockpilest const * stockpile ) StockpileSerializer ( color_ostream &out, building_stockpilest const * stockpile )
: mOut ( &out ) : mOut ( &out )
, mPile ( stockpile ) { , mPile ( stockpile ) {
// build other mats indices
furniture_setup_other_mats(); furniture_setup_other_mats();
bars_blocks_setup_other_mats(); bars_blocks_setup_other_mats();
finished_goods_setup_other_mats();
} }
StockpileSettings write() { StockpileSettings write() {
// *mOut << "GROUP SET " << bitfield_to_string(mPile->settings.flags) << endl; // *mOut << "GROUP SET " << bitfield_to_string(mPile->settings.flags) << endl;
@ -363,7 +365,8 @@ private:
color_ostream * mOut; color_ostream * mOut;
building_stockpilest const * mPile; building_stockpilest const * mPile;
StockpileSettings mBuffer; StockpileSettings mBuffer;
std::map<int, std::string> mOtherMatsFurniture;; std::map<int, std::string> mOtherMatsFurniture;
std::map<int, std::string> mOtherMatsFinishedGoods;
std::map<int, std::string> mOtherMatsBars; std::map<int, std::string> mOtherMatsBars;
std::map<int, std::string> mOtherMatsBlocks; std::map<int, std::string> mOtherMatsBlocks;
/** /**
@ -389,14 +392,15 @@ private:
return -1; return -1;
} }
// read the token from the serailized list during import // read the token from the serailized list during import
typedef std::function<std::string ( const size_t& ) > FuncReadImport; typedef std::function<std::string ( const size_t& ) > FuncReadImport;
// add the token to the serialized list during export // add the token to the serialized list during export
typedef std::function<void ( const string & ) > FuncWriteExport; typedef std::function<void ( const string & ) > FuncWriteExport;
// are item's of item_type allowed? // are item's of item_type allowed?
typedef std::function<bool ( item_type::item_type ) > FuncItemAllowed; typedef std::function<bool ( item_type::item_type ) > FuncItemAllowed;
// is this material allowed?
typedef std::function<bool ( const MaterialInfo &) > FuncMaterialAllowed; typedef std::function<bool ( const MaterialInfo &) > FuncMaterialAllowed;
struct food_pair { struct food_pair {
// exporting // exporting
FuncWriteExport set_value; FuncWriteExport set_value;
@ -463,6 +467,71 @@ private:
} }
} }
void serialize_list_quality ( FuncWriteExport add_value, const bool (&quality_list)[7] ) {
using df::enums::item_quality::item_quality;
df::enum_traits<item_quality> quality_traits;
for ( size_t i = 0; i < 7; ++i ) {
if ( quality_list[i] ) {
const std::string f_type ( quality_traits.key_table[i] );
add_value( f_type );
*mOut << " quality: " << i << " is " << f_type <<endl;
}
}
}
void unserialize_list_quality( FuncReadImport read_value, int32_t list_size ) {
using df::enums::item_quality::item_quality;
df::enum_traits<item_quality> quality_traits;
for ( int i = 0; i < list_size; ++i ) {
const std::string quality = read_value( i );
df::enum_traits<item_quality>::base_type idx = linear_index ( *mOut, quality_traits, quality );
if ( idx < 0 ) {
*mOut << " invalid quality token " << quality << endl;
continue;
}
*mOut << " quality: " << idx << " is " << quality << endl;
}
}
void serialize_list_other_mats(const std::map<int, std::string> other_mats, FuncWriteExport add_value, std::vector<char> list) {
for ( size_t i = 0; i < list.size(); ++i ) {
if ( list.at ( i ) ) {
const std::string token = other_mats_index(other_mats, i);
if ( token.empty() ) {
*mOut << " invalid other material with index " << i << endl;
continue;
}
add_value(token);
*mOut << " other mats " << i << " is " << token << endl;
}
}
}
void unserialize_list_other_mats(const std::map<int, std::string> other_mats, FuncReadImport read_value, int32_t list_size ) {
for ( int i = 0; i < list_size; ++i ) {
const std::string token = read_value( i );
size_t idx = other_mats_token( other_mats, token );
if ( idx < 0 ) {
*mOut << "invalid other mat with token " << token;
continue;
}
*mOut << " other_mats " << idx << " is " << token << endl;
}
}
std::string other_mats_index( const std::map<int, std::string> other_mats, int idx ) {
auto it = other_mats.find ( idx );
if ( it == other_mats.end() )
return std::string();
return it->second;
}
int other_mats_token( const std::map<int, std::string> other_mats, const std::string & token) {
for ( auto it = other_mats.begin(); it != other_mats.end(); ++it ) {
if ( it->second == token )
return it->first;
}
return -1;
}
void write_general() { void write_general() {
mBuffer.set_max_bins ( mPile->max_barrels ); mBuffer.set_max_bins ( mPile->max_barrels );
mBuffer.set_max_wheelbarrows ( mPile->max_wheelbarrows ); mBuffer.set_max_wheelbarrows ( mPile->max_wheelbarrows );
@ -680,8 +749,6 @@ private:
void write_food() { void write_food() {
StockpileSettings::FoodSet *food = mBuffer.mutable_food(); StockpileSettings::FoodSet *food = mBuffer.mutable_food();
food->set_prepared_meals ( mPile->settings.food.prepared_meals ); food->set_prepared_meals ( mPile->settings.food.prepared_meals );
food_pair p = food_map ( organic_mat_category::Meat );
food_write_helper ( p.set_value, p.stockpile_values, organic_mat_category::Meat );
using df::enums::organic_mat_category::organic_mat_category; using df::enums::organic_mat_category::organic_mat_category;
df::enum_traits<organic_mat_category> traits; df::enum_traits<organic_mat_category> traits;
@ -733,7 +800,7 @@ private:
mOtherMatsFurniture.insert ( std::make_pair ( 14,"YARN" ) ); mOtherMatsFurniture.insert ( std::make_pair ( 14,"YARN" ) );
} }
std::string furn_other_mats ( int idx ) { std::string furn_other_mats_index ( int idx ) {
auto it = mOtherMatsFurniture.find ( idx ); auto it = mOtherMatsFurniture.find ( idx );
if ( it == mOtherMatsFurniture.end() ) if ( it == mOtherMatsFurniture.end() )
return std::string(); return std::string();
@ -773,38 +840,27 @@ private:
} }
} }
// other mats // other mats
for ( size_t i = 0; i < mPile->settings.furniture.other_mats.size(); ++i ) { serialize_list_other_mats(mOtherMatsFurniture, [=] ( const std::string &token ) {
if ( mPile->settings.furniture.other_mats.at ( i ) ) { furniture->add_other_mats( token );
const std::string token = furn_other_mats ( i ); }, mPile->settings.furniture.other_mats );
if ( token.empty() ) {
*mOut << " invalid other material with index " << i << endl; // for ( size_t i = 0; i < mPile->settings.furniture.other_mats.size(); ++i ) {
continue; // if ( mPile->settings.furniture.other_mats.at ( i ) ) {
} // const std::string token = furn_other_mats ( i );
furniture->add_other_mats ( token ); // if ( token.empty() ) {
*mOut << " other mats " << i << " is " << token << endl; // *mOut << " invalid other material with index " << i << endl;
} // continue;
} // }
// quality core // furniture->add_other_mats ( token );
using df::enums::item_quality::item_quality; // *mOut << " other mats " << i << " is " << token << endl;
df::enum_traits<item_quality> quality_traits; // }
size_t core_size = std::extent< decltype ( mPile->settings.furniture.quality_core ) >::value; // }
for ( size_t i = 0; i < core_size; ++i ) { serialize_list_quality([=] ( const std::string &token ) {
if ( mPile->settings.furniture.quality_core[i] ) { furniture->add_quality_core ( token );
const std::string f_type ( quality_traits.key_table[i] ); }, mPile->settings.furniture.quality_core);
furniture->add_quality_core ( f_type ); serialize_list_quality([=] ( const std::string &token ) {
*mOut << "quality_core " << i << " is " << f_type <<endl; furniture->add_quality_total( token );
} }, mPile->settings.furniture.quality_total);
}
// quality total
size_t total_size = std::extent< decltype ( mPile->settings.furniture.quality_total ) >::value;
for ( size_t i = 0; i < total_size; ++i ) {
if ( mPile->settings.furniture.quality_total[i] ) {
const std::string f_type ( quality_traits.key_table[i] );
furniture->add_quality_total ( f_type );
*mOut << "quality_total " << i << " is " << f_type <<endl;
}
}
} }
/* skip gems and non hard things /* skip gems and non hard things
@ -837,37 +893,19 @@ private:
*mOut << " mats " << mi.index << " is " << token << endl; *mOut << " mats " << mi.index << " is " << token << endl;
} }
// other materials // other materials
for ( int i = 0; i < furniture.other_mats_size(); ++i ) { unserialize_list_other_mats( mOtherMatsFurniture, [=] ( const size_t & idx ) -> const std::string& {
const std::string token = furniture.other_mats ( i ); return furniture.other_mats( idx );
int16_t idx = furn_other_mats ( token ); }, furniture.other_mats_size() );
if ( idx < 0 ) {
*mOut << "invalid other mat with token " << token;
continue;
}
*mOut << " other_mats" << idx << " is " << token << endl;
}
// core quality // core quality
using df::enums::item_quality::item_quality; unserialize_list_quality ( [=] ( const size_t & idx ) -> const std::string& {
df::enum_traits<item_quality> quality_traits; return furniture.quality_core ( idx );
for ( int i = 0; i < furniture.quality_core_size(); ++i ) { }, furniture.quality_core_size() );
const std::string quality = furniture.quality_core ( i );
df::enum_traits<item_quality>::base_type idx = linear_index ( *mOut, quality_traits, quality );
if ( idx < 0 ) {
*mOut << " invalid quality core token " << quality << endl;
continue;
}
*mOut << " quality_core" << idx << " is " << quality << endl;
}
// total quality // total quality
for ( int i = 0; i < furniture.quality_total_size(); ++i ) { unserialize_list_quality ( [=] ( const size_t & idx ) -> const std::string& {
const std::string quality = furniture.quality_total ( i ); return furniture.quality_total ( idx );
df::enum_traits<item_quality>::base_type idx = linear_index ( *mOut, quality_traits, quality ); }, furniture.quality_total_size() );
if ( idx < 0 ) {
*mOut << " invalid quality total token " << quality << endl;
continue;
}
*mOut << " quality_total" << idx << " is " << quality << endl;
}
} }
} }
@ -1116,28 +1154,13 @@ private:
} }
*mOut << "after other" << endl; *mOut << "after other" << endl;
// quality core // quality core
using df::enums::item_quality::item_quality; serialize_list_quality ( [=] ( const std::string &token ) {
df::enum_traits<item_quality> quality_traits; ammo->add_quality_core ( token );
size_t core_size = std::extent< decltype ( mPile->settings.ammo.quality_core ) >::value; }, mPile->settings.ammo.quality_core );
for ( size_t i = 0; i < core_size; ++i ) {
if ( mPile->settings.ammo.quality_core[i] ) {
const std::string f_type ( quality_traits.key_table[i] );
ammo->add_quality_core ( f_type );
*mOut << "quality_core " << i << " is " << f_type <<endl;
}
}
*mOut << "after core" << endl;
// quality total // quality total
size_t total_size = std::extent< decltype ( mPile->settings.ammo.quality_total ) >::value; serialize_list_quality ( [=] ( const std::string &token ) {
for ( size_t i = 0; i < total_size; ++i ) { ammo->add_quality_total( token );
if ( mPile->settings.ammo.quality_total[i] ) { }, mPile->settings.ammo.quality_total);
const std::string f_type ( quality_traits.key_table[i] );
ammo->add_quality_total ( f_type );
*mOut << "quality_total " << i << " is " << f_type <<endl;
}
}
*mOut << "after total" << endl;
} }
void read_ammo() { void read_ammo() {
@ -1166,27 +1189,13 @@ private:
*mOut << " other mats " << idx << " is " << token << endl; *mOut << " other mats " << idx << " is " << token << endl;
} }
// core quality // core quality
using df::enums::item_quality::item_quality; unserialize_list_quality ( [=] ( const size_t & idx ) -> const std::string& {
df::enum_traits<item_quality> quality_traits; return ammo.quality_core ( idx );
for ( int i = 0; i < ammo.quality_core_size(); ++i ) { }, ammo.quality_core_size() );
const std::string quality = ammo.quality_core ( i );
df::enum_traits<item_quality>::base_type idx = linear_index ( *mOut, quality_traits, quality );
if ( idx < 0 ) {
*mOut << " invalid quality core token " << quality << endl;
continue;
}
*mOut << " quality_core" << idx << " is " << quality << endl;
}
// total quality // total quality
for ( int i = 0; i < ammo.quality_total_size(); ++i ) { unserialize_list_quality ( [=] ( const size_t & idx ) -> const std::string& {
const std::string quality = ammo.quality_total ( i ); return ammo.quality_total ( idx );
df::enum_traits<item_quality>::base_type idx = linear_index ( *mOut, quality_traits, quality ); }, ammo.quality_total_size() );
if ( idx < 0 ) {
*mOut << " invalid quality total token " << quality << endl;
continue;
}
*mOut << " quality_total" << idx << " is " << quality << endl;
}
} }
} }
@ -1235,36 +1244,6 @@ private:
mOtherMatsBlocks.insert ( std::make_pair ( 3,"WOOD" ) ); mOtherMatsBlocks.insert ( std::make_pair ( 3,"WOOD" ) );
} }
std::string bars_other_mats ( int idx ) {
auto it = mOtherMatsBars.find ( idx );
if ( it == mOtherMatsBars.end() )
return std::string();
return it->second;
}
int bars_other_mats ( const std::string & token ) {
for ( auto it = mOtherMatsBars.begin(); it != mOtherMatsBars.end(); ++it ) {
if ( it->second == token )
return it->first;
}
return -1;
}
std::string blocks_other_mats ( int idx ) {
auto it = mOtherMatsBlocks.find ( idx );
if ( it == mOtherMatsBlocks.end() )
return std::string();
return it->second;
}
int blocks_other_mats ( const std::string & token ) {
for ( auto it = mOtherMatsBlocks.begin(); it != mOtherMatsBlocks.end(); ++it ) {
if ( it->second == token )
return it->first;
}
return -1;
}
bool bars_mat_is_allowed ( const MaterialInfo &mi ) { bool bars_mat_is_allowed ( const MaterialInfo &mi ) {
return mi.isValid() && mi.material && mi.material->flags.is_set ( material_flags::IS_METAL ); return mi.isValid() && mi.material && mi.material->flags.is_set ( material_flags::IS_METAL );
} }
@ -1277,15 +1256,6 @@ private:
void write_bars_blocks() { void write_bars_blocks() {
StockpileSettings::BarsBlocksSet *bars_blocks = mBuffer.mutable_barsblocks(); StockpileSettings::BarsBlocksSet *bars_blocks = mBuffer.mutable_barsblocks();
MaterialInfo mi; MaterialInfo mi;
// bars mats
// for ( size_t i = 0; i < mPile->settings.bars_blocks.bars_mats.size(); ++i ) {
// if ( mPile->settings.bars_blocks.bars_mats.at ( i ) ) {
// mi.decode ( 0, i );
// if ( !bars_mat_is_allowed ( mi ) ) continue;
// *mOut << " bars mat" << i << " is " << mi.getToken() << endl;
// }
// }
FuncMaterialAllowed filter = std::bind ( &StockpileSerializer::bars_mat_is_allowed, this, _1 ); FuncMaterialAllowed filter = std::bind ( &StockpileSerializer::bars_mat_is_allowed, this, _1 );
serialize_list_material( filter, [=] ( const std::string &token ) { serialize_list_material( filter, [=] ( const std::string &token ) {
bars_blocks->add_bars_mats ( token ); bars_blocks->add_bars_mats ( token );
@ -1296,40 +1266,16 @@ private:
serialize_list_material ( filter, [=] ( const std::string &token ) { serialize_list_material ( filter, [=] ( const std::string &token ) {
bars_blocks->add_blocks_mats ( token ); bars_blocks->add_blocks_mats ( token );
}, mPile->settings.bars_blocks.blocks_mats); }, mPile->settings.bars_blocks.blocks_mats);
// for ( size_t i = 0; i < mPile->settings.bars_blocks.blocks_mats.size(); ++i ) {
// if ( mPile->settings.bars_blocks.blocks_mats.at ( i ) ) {
// mi.decode ( 0, i );
// if ( !blocks_mat_is_allowed ( mi ) ) continue;
// *mOut << " blocks mat" << i << " is " << mi.getToken() << endl;
// bars_blocks->add_blocks_mats ( mi.getToken() );
// }
// }
// bars other mats // bars other mats
for ( size_t i = 0; i < mPile->settings.bars_blocks.bars_other_mats.size(); ++i ) { serialize_list_other_mats(mOtherMatsBars, [=] ( const std::string &token ) {
if ( mPile->settings.bars_blocks.bars_other_mats.at ( i ) ) { bars_blocks->add_bars_other_mats( token );
const std::string token = bars_other_mats ( i ); }, mPile->settings.bars_blocks.bars_other_mats );
if ( token.empty() ) {
*mOut << " invalid other bar material with index " << i << endl;
continue;
}
bars_blocks->add_bars_other_mats ( token );
*mOut << " bars other mats " << i << " is " << token << endl;
}
}
// blocks other mats
for ( size_t i = 0; i < mPile->settings.bars_blocks.blocks_other_mats.size(); ++i ) {
if ( mPile->settings.bars_blocks.blocks_other_mats.at ( i ) ) {
const std::string token = blocks_other_mats ( i );
if ( token.empty() ) {
*mOut << " invalid other block material with index " << i << endl;
continue;
}
bars_blocks->add_blocks_other_mats ( token );
*mOut << " blocks other mats " << i << " is " << token << endl;
}
}
// blocks other mats
serialize_list_other_mats(mOtherMatsBlocks, [=] ( const std::string &token ) {
bars_blocks->add_blocks_other_mats( token );
}, mPile->settings.bars_blocks.blocks_other_mats );
} }
void read_bars_blocks() { void read_bars_blocks() {
@ -1341,45 +1287,23 @@ private:
unserialize_list_material ( filter, [=] ( const size_t & idx ) -> const std::string& { unserialize_list_material ( filter, [=] ( const size_t & idx ) -> const std::string& {
return bars_blocks.bars_mats( idx ); return bars_blocks.bars_mats( idx );
}, bars_blocks.bars_mats_size()); }, bars_blocks.bars_mats_size());
// for ( int i = 0; i < bars_blocks.bars_mats_size(); ++i ) {
// const std::string token = bars_blocks.bars_mats ( i );
// MaterialInfo mi;
// mi.find ( token );
// if ( !bars_mat_is_allowed ( mi ) ) continue;
// *mOut << " bars mats " << mi.index << " is " << token << endl;
// }
// blocks // blocks
filter = std::bind ( &StockpileSerializer::blocks_mat_is_allowed, this, _1 ); filter = std::bind ( &StockpileSerializer::blocks_mat_is_allowed, this, _1 );
unserialize_list_material ( filter, [=] ( const size_t & idx ) -> const std::string& { unserialize_list_material ( filter, [=] ( const size_t & idx ) -> const std::string& {
return bars_blocks.blocks_mats( idx ); return bars_blocks.blocks_mats( idx );
}, bars_blocks.blocks_mats_size()); }, bars_blocks.blocks_mats_size());
// for ( int i = 0; i < bars_blocks.blocks_mats_size(); ++i ) {
// const std::string token = bars_blocks.blocks_mats ( i );
// MaterialInfo mi;
// mi.find ( token );
// if ( !blocks_mat_is_allowed ( mi ) ) continue;
// *mOut << " blocks mats " << mi.index << " is " << token << endl;
// }
// bars other mats // bars other mats
for ( int i = 0; i < bars_blocks.bars_other_mats_size(); ++i ) { unserialize_list_other_mats( mOtherMatsBars, [=] ( const size_t & idx ) -> const std::string& {
const std::string token = bars_blocks.bars_other_mats ( i ); return bars_blocks.bars_other_mats ( idx );
int16_t idx = bars_other_mats ( token ); }, bars_blocks.bars_other_mats_size() );
if ( idx < 0 ) {
*mOut << "invalid other bars mat with token " << token;
continue;
}
*mOut << " bars other mats " << idx << " is " << token << endl;
}
// blocks other mats // blocks other mats
for ( int i = 0; i < bars_blocks.blocks_other_mats_size(); ++i ) { unserialize_list_other_mats( mOtherMatsBlocks, [=] ( const size_t & idx ) -> const std::string& {
const std::string token = bars_blocks.blocks_other_mats ( i ); return bars_blocks.blocks_other_mats ( idx );
int16_t idx = blocks_other_mats ( token ); }, bars_blocks.blocks_other_mats_size() );
if ( idx < 0 ) {
*mOut << "invalid other blocks mat with token " << token;
continue;
}
*mOut << " blocks other mats " << idx << " is " << token << endl;
}
} }
} }
@ -1394,23 +1318,15 @@ private:
StockpileSettings::GemsSet *gems = mBuffer.mutable_gems(); StockpileSettings::GemsSet *gems = mBuffer.mutable_gems();
MaterialInfo mi; MaterialInfo mi;
// rough mats // rough mats
for ( size_t i = 0; i < mPile->settings.gems.rough_mats.size(); ++i ) { FuncMaterialAllowed filter = std::bind ( &StockpileSerializer::gem_mat_is_allowed, this, _1 );
if ( mPile->settings.gems.rough_mats.at ( i ) ) { serialize_list_material ( filter, [=] ( const std::string &token ) {
mi.decode ( 0, i ); gems->add_rough_mats( token );
if ( !gem_mat_is_allowed ( mi ) ) continue; }, mPile->settings.gems.rough_mats );
*mOut << " gem rough mat" << i << " is " << mi.getToken() << endl;
gems->add_rough_mats ( mi.getToken() );
}
}
// cut mats // cut mats
for ( size_t i = 0; i < mPile->settings.gems.cut_mats.size(); ++i ) { filter = std::bind ( &StockpileSerializer::gem_cut_mat_is_allowed, this, _1 );
if ( mPile->settings.gems.cut_mats.at ( i ) ) { serialize_list_material ( filter, [=] ( const std::string &token ) {
mi.decode ( 0, i ); gems->add_cut_mats( token );
if ( !gem_cut_mat_is_allowed ( mi ) ) continue; }, mPile->settings.gems.cut_mats);
*mOut << " gem cut mat" << i << " is " << mi.getToken() << endl;
gems->add_cut_mats ( mi.getToken() );
}
}
// rough other // rough other
for ( size_t i = 0; i < mPile->settings.gems.rough_other_mats.size(); ++i ) { for ( size_t i = 0; i < mPile->settings.gems.rough_other_mats.size(); ++i ) {
if ( mPile->settings.gems.rough_other_mats.at ( i ) ) { if ( mPile->settings.gems.rough_other_mats.at ( i ) ) {
@ -1436,21 +1352,17 @@ private:
const StockpileSettings::GemsSet gems = mBuffer.gems(); const StockpileSettings::GemsSet gems = mBuffer.gems();
*mOut << "gems: " <<endl; *mOut << "gems: " <<endl;
// rough // rough
for ( int i = 0; i < gems.rough_mats_size(); ++i ) { FuncMaterialAllowed filter = std::bind ( &StockpileSerializer::gem_mat_is_allowed, this, _1 );
const std::string token = gems.rough_mats ( i ); unserialize_list_material ( filter, [=] ( const size_t & idx ) -> const std::string& {
MaterialInfo mi; return gems.rough_mats ( idx );
mi.find ( token ); }, gems.rough_mats_size() );
if ( !gem_mat_is_allowed ( mi ) ) continue;
*mOut << " rough mats " << mi.index << " is " << token << endl;
}
// cut // cut
for ( int i = 0; i < gems.cut_mats_size(); ++i ) { filter = std::bind ( &StockpileSerializer::gem_cut_mat_is_allowed, this, _1 );
const std::string token = gems.cut_mats ( i ); unserialize_list_material ( filter, [=] ( const size_t & idx ) -> const std::string& {
MaterialInfo mi; return gems.cut_mats( idx );
mi.find ( token ); }, gems.cut_mats_size() );
if ( !gem_cut_mat_is_allowed ( mi ) ) continue;
*mOut << " cut mats " << mi.index << " is " << token << endl;
}
// rough other // rough other
for ( int i = 0; i < gems.rough_other_mats_size(); ++i ) { for ( int i = 0; i < gems.rough_other_mats_size(); ++i ) {
const std::string token = gems.rough_other_mats ( i ); const std::string token = gems.rough_other_mats ( i );
@ -1504,8 +1416,32 @@ private:
} }
bool finished_goods_mat_is_allowed(const MaterialInfo &mat) { void finished_goods_setup_other_mats() {
return mat.isValid(); mOtherMatsFinishedGoods.insert ( std::make_pair ( 0,"WOOD" ) );
mOtherMatsFinishedGoods.insert ( std::make_pair ( 1,"PLANT_CLOTH" ) );
mOtherMatsFinishedGoods.insert ( std::make_pair ( 2,"BONE" ) );
mOtherMatsFinishedGoods.insert ( std::make_pair ( 3,"TOOTH" ) );
mOtherMatsFinishedGoods.insert ( std::make_pair ( 4,"HORN" ) );
mOtherMatsFinishedGoods.insert ( std::make_pair ( 5,"PEARL" ) );
mOtherMatsFinishedGoods.insert ( std::make_pair ( 6,"SHELL" ) );
mOtherMatsFinishedGoods.insert ( std::make_pair ( 7,"LEATHER" ) );
mOtherMatsFinishedGoods.insert ( std::make_pair ( 8,"SILK" ) );
mOtherMatsFinishedGoods.insert ( std::make_pair ( 9,"AMBER" ) );
mOtherMatsFinishedGoods.insert ( std::make_pair ( 10,"CORAL" ) );
mOtherMatsFinishedGoods.insert ( std::make_pair ( 11,"GREEN_GLASS" ) );
mOtherMatsFinishedGoods.insert ( std::make_pair ( 12,"CLEAR_GLASS" ) );
mOtherMatsFinishedGoods.insert ( std::make_pair ( 13,"CRYSTAL_GLASS" ) );
mOtherMatsFinishedGoods.insert ( std::make_pair ( 14,"YARN" ) );
mOtherMatsFinishedGoods.insert ( std::make_pair ( 15,"WAX" ) );
}
bool finished_goods_mat_is_allowed(const MaterialInfo &mi) {
return mi.isValid()
&& mi.material
&& ( mi.material->flags.is_set ( material_flags::IS_GEM )
|| mi.material->flags.is_set ( material_flags::IS_METAL )
|| mi.material->flags.is_set ( material_flags::IS_STONE ) ) ;
} }
void write_finished_goods() { void write_finished_goods() {
@ -1523,6 +1459,19 @@ private:
finished_goods->add_mats ( token ); finished_goods->add_mats ( token );
}, mPile->settings.finished_goods.mats ); }, mPile->settings.finished_goods.mats );
// other mats
serialize_list_other_mats(mOtherMatsFinishedGoods, [=] ( const std::string &token ) {
finished_goods->add_other_mats( token );
}, mPile->settings.finished_goods.other_mats );
// quality core
serialize_list_quality ( [=] ( const std::string &token ) {
finished_goods->add_quality_core ( token );
}, mPile->settings.finished_goods.quality_core );
// quality total
serialize_list_quality ( [=] ( const std::string &token ) {
finished_goods->add_quality_total ( token );
}, mPile->settings.finished_goods.quality_total );
} }
void read_finished_goods() { void read_finished_goods() {
@ -1538,15 +1487,46 @@ private:
// materials // materials
FuncMaterialAllowed mat_filter = std::bind ( &StockpileSerializer::finished_goods_mat_is_allowed, this, _1 ); FuncMaterialAllowed mat_filter = std::bind ( &StockpileSerializer::finished_goods_mat_is_allowed, this, _1 );
unserialize_list_material( mat_filter, [=] ( const size_t & idx ) -> const std::string& { unserialize_list_material ( mat_filter, [=] ( const size_t & idx ) -> const std::string& {
return finished_goods.mats( idx ); return finished_goods.mats ( idx );
}, finished_goods.mats_size() ); }, finished_goods.mats_size() );
// other mats
unserialize_list_other_mats( mOtherMatsFinishedGoods, [=] ( const size_t & idx ) -> const std::string& {
return finished_goods.other_mats( idx );
}, finished_goods.other_mats_size() );
// core quality
unserialize_list_quality ( [=] ( const size_t & idx ) -> const std::string& {
return finished_goods.quality_core ( idx );
}, finished_goods.quality_core_size() );
// total quality
unserialize_list_quality ( [=] ( const size_t & idx ) -> const std::string& {
return finished_goods.quality_total ( idx );
}, finished_goods.quality_total_size() );
} }
} }
void write_leather() {} void write_leather() {
void read_leather() {} StockpileSettings::LeatherSet *leather = mBuffer.mutable_leather();
FuncWriteExport setter = [=] ( const std::string &id ) {
leather->add_mats( id );
};
food_write_helper ( setter, mPile->settings.leather.mats, organic_mat_category::Leather );
}
void read_leather() {
if ( mBuffer.has_leather() ) {
const StockpileSettings::LeatherSet leather = mBuffer.leather();
*mOut << "leather: " <<endl;
FuncReadImport getter = [=] ( size_t idx ) -> std::string {
return leather.mats( idx );
};
food_read_helper ( getter, leather.mats_size(), organic_mat_category::Leather );
}
}
void write_cloth() {} void write_cloth() {}
void read_cloth() {} void read_cloth() {}
@ -1554,11 +1534,60 @@ private:
void write_wood() {} void write_wood() {}
void read_wood() {} void read_wood() {}
bool weapons_mat_is_allowed(const MaterialInfo &mi) {
return mi.isValid();
}
void write_weapons() {} void write_weapons() {}
void read_weapons() {} void read_weapons() {
if ( mBuffer.has_weapons() ) {
const StockpileSettings::WeaponsSet weapons = mBuffer.weapons();
*mOut << "weapons: " <<endl;
// materials
FuncMaterialAllowed mat_filter = std::bind ( &StockpileSerializer::weapons_mat_is_allowed, this, _1 );
unserialize_list_material ( mat_filter, [=] ( const size_t & idx ) -> const std::string& {
return weapons.mats ( idx );
}, weapons.mats_size() );
// core quality
unserialize_list_quality ( [=] ( const size_t & idx ) -> const std::string& {
return weapons.quality_core ( idx );
}, weapons.quality_core_size() );
// total quality
unserialize_list_quality ( [=] ( const size_t & idx ) -> const std::string& {
return weapons.quality_total ( idx );
}, weapons.quality_total_size() );
}
}
bool armor_mat_is_allowed(const MaterialInfo &mi) {
return mi.isValid();
}
void write_armor() {} void write_armor() {}
void read_armor() {} void read_armor() {
if ( mBuffer.has_armor() ) {
const StockpileSettings::ArmorSet armor = mBuffer.armor();
*mOut << "armor: " <<endl;
// materials
FuncMaterialAllowed mat_filter = std::bind ( &StockpileSerializer::armor_mat_is_allowed, this, _1 );
unserialize_list_material ( mat_filter, [=] ( const size_t & idx ) -> const std::string& {
return armor.mats ( idx );
}, armor.mats_size() );
// core quality
unserialize_list_quality ( [=] ( const size_t & idx ) -> const std::string& {
return armor.quality_core ( idx );
}, armor.quality_core_size() );
// total quality
unserialize_list_quality ( [=] ( const size_t & idx ) -> const std::string& {
return armor.quality_total ( idx );
}, armor.quality_total_size() );
}
}
}; };
static command_result savestock ( color_ostream &out, vector <string> & parameters ) static command_result savestock ( color_ostream &out, vector <string> & parameters )