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

stockpiles: make gem other mats more robust

develop
Casey Link 2014-11-21 17:57:18 +01:00
parent eb3a71c739
commit e525b47815
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/stockpiles.cpp
Unescape Escape View File

@ -1976,20 +1976,23 @@ private:
{ {
return mi.isValid() && mi.material && ( mi.material->flags.is_set ( material_flags::IS_GEM ) || mi.material->flags.is_set ( material_flags::IS_STONE ) ) ; return mi.isValid() && mi.material && ( mi.material->flags.is_set ( material_flags::IS_GEM ) || mi.material->flags.is_set ( material_flags::IS_STONE ) ) ;
} }
bool gem_other_mat_is_allowed(MaterialInfo &mi ) {
return mi.isValid() && (mi.getToken() == "GLASS_GREEN" || mi.getToken() == "GLASS_CLEAR" || mi.getToken() == "GLASS_CRYSTAL");
}
void write_gems() void write_gems()
{ {
StockpileSettings::GemsSet *gems = mBuffer.mutable_gems(); StockpileSettings::GemsSet *gems = mBuffer.mutable_gems();
MaterialInfo mi; MaterialInfo mi;
// rough mats // rough mats
FuncMaterialAllowed filter = std::bind ( &StockpileSerializer::gem_mat_is_allowed, this, _1 ); FuncMaterialAllowed filter_rough = std::bind ( &StockpileSerializer::gem_mat_is_allowed, this, _1 );
serialize_list_material ( filter, [=] ( const std::string &token ) serialize_list_material ( filter_rough, [=] ( const std::string &token )
{ {
gems->add_rough_mats ( token ); gems->add_rough_mats ( token );
}, mPile->settings.gems.rough_mats ); }, mPile->settings.gems.rough_mats );
// cut mats // cut mats
filter = std::bind ( &StockpileSerializer::gem_cut_mat_is_allowed, this, _1 ); FuncMaterialAllowed filter_cut = std::bind ( &StockpileSerializer::gem_cut_mat_is_allowed, this, _1 );
serialize_list_material ( filter, [=] ( const std::string &token ) serialize_list_material ( filter_cut, [=] ( const std::string &token )
{ {
gems->add_cut_mats ( token ); gems->add_cut_mats ( token );
}, mPile->settings.gems.cut_mats ); }, mPile->settings.gems.cut_mats );
@ -1999,7 +2002,7 @@ private:
if ( mPile->settings.gems.rough_other_mats.at ( i ) ) if ( mPile->settings.gems.rough_other_mats.at ( i ) )
{ {
mi.decode ( i, -1 ); mi.decode ( i, -1 );
if ( !mi.isValid() ) continue; if ( !gem_other_mat_is_allowed(mi) ) continue;
debug() << " gem rough_other mat" << i << " is " << mi.getToken() << endl; debug() << " gem rough_other mat" << i << " is " << mi.getToken() << endl;
gems->add_rough_other_mats ( mi.getToken() ); gems->add_rough_other_mats ( mi.getToken() );
} }
@ -2011,7 +2014,7 @@ private:
{ {
mi.decode ( i, -1 ); mi.decode ( i, -1 );
if ( !mi.isValid() ) mi.decode ( 0, i ); if ( !mi.isValid() ) mi.decode ( 0, i );
if ( !mi.isValid() ) continue; if ( !gem_other_mat_is_allowed(mi) ) continue;
debug() << " gem cut_other mat" << i << " is " << mi.getToken() << endl; debug() << " gem cut_other mat" << i << " is " << mi.getToken() << endl;
gems->add_cut_other_mats ( mi.getToken() ); gems->add_cut_other_mats ( mi.getToken() );
} }
@ -2026,18 +2029,18 @@ private:
const StockpileSettings::GemsSet gems = mBuffer.gems(); const StockpileSettings::GemsSet gems = mBuffer.gems();
debug() << "gems: " <<endl; debug() << "gems: " <<endl;
// rough // rough
FuncMaterialAllowed filter = std::bind ( &StockpileSerializer::gem_mat_is_allowed, this, _1 ); FuncMaterialAllowed filter_rough = std::bind ( &StockpileSerializer::gem_mat_is_allowed, this, _1 );
unserialize_list_material ( filter, [=] ( const size_t & idx ) -> const std::string& unserialize_list_material ( filter_rough, [=] ( const size_t & idx ) -> const std::string&
{ {
return gems.rough_mats ( idx ); return gems.rough_mats ( idx );
}, gems.rough_mats_size(), &mPile->settings.gems.rough_mats ); }, gems.rough_mats_size(), &mPile->settings.gems.rough_mats );
// cut // cut
filter = std::bind ( &StockpileSerializer::gem_cut_mat_is_allowed, this, _1 ); FuncMaterialAllowed filter_cut = std::bind ( &StockpileSerializer::gem_cut_mat_is_allowed, this, _1 );
unserialize_list_material ( filter, [=] ( const size_t & idx ) -> const std::string& unserialize_list_material ( filter_cut, [=] ( const size_t & idx ) -> const std::string&
{ {
return gems.cut_mats ( idx ); return gems.cut_mats ( idx );
}, gems.cut_mats_size(), &mPile->settings.gems.rough_mats ); }, gems.cut_mats_size(), &mPile->settings.gems.cut_mats );
const size_t builtin_size = std::extent<decltype ( world->raws.mat_table.builtin ) >::value; const size_t builtin_size = std::extent<decltype ( world->raws.mat_table.builtin ) >::value;
// rough other // rough other
@ -2186,6 +2189,7 @@ private:
{ {
finished_goods->add_quality_core ( token ); finished_goods->add_quality_core ( token );
}, mPile->settings.finished_goods.quality_core ); }, mPile->settings.finished_goods.quality_core );
// quality total // quality total
serialize_list_quality ( [=] ( const std::string &token ) serialize_list_quality ( [=] ( const std::string &token )
{ {