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

Merge pull request #3069 from ab9rf/5007-tailor 

update tailor
develop
Myk 2023-03-22 18:43:39 -07:00 committed by GitHub
parent 5ed1e4ece7 959b4b3171
commit 6af4f4b8c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.txt
Unescape Escape View File

@ -37,6 +37,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
- `prospector`: prospector tool in fort mode is now available. embark prospect is not yet available and is disabled at this time.
## Fixes
- `tailor` now properly discriminates between dyed and undyed cloth and no longer defaults to using adamantine
## Misc Improvements

7
plugins/tailor.cpp
Unescape Escape View File

@ -124,7 +124,8 @@ static const MatType
M_ADAMANTINE = MatType("adamantine", df::job_material_category::mask_strand, df::armor_general_flags::SOFT);
static const std::list<MatType> all_materials = { M_SILK, M_CLOTH, M_YARN, M_LEATHER, M_ADAMANTINE };
static std::list<MatType> material_order = { M_SILK, M_CLOTH, M_YARN, M_LEATHER }; // M_ADAMANTINE is not included by default
static const std::list<MatType> default_materials = { M_SILK, M_CLOTH, M_YARN, M_LEATHER }; // adamantine not included by default
static std::list<MatType> material_order = default_materials;
static struct BadFlags {
uint32_t whole;
@ -191,7 +192,7 @@ public:
if (i->flags.whole & badFlags.whole)
continue;
if (require_dyed && !i->hasImprovements())
if (require_dyed && (!i->isDyed()))
{
// only count dyed
std::string d;
@ -589,7 +590,7 @@ static void set_material_order() {
material_order.push_back(M_ADAMANTINE);
}
if (!material_order.size())
std::copy(all_materials.begin(), all_materials.end(), std::back_inserter(material_order));
std::copy(default_materials.begin(), default_materials.end(), std::back_inserter(material_order));
}
DFhackCExport command_result plugin_load_data (color_ostream &out) {