Skip to content

Autoclothing fix #5840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LightHardt wants to merge 2 commits into
base: develop
Choose a base branch
from
+9 −8
Open

Autoclothing fix #5840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
824f328
Modified validation check to pass material_category that is specified by
LightHardt Jul 6, 2026
5d7b91a
update changelog
LightHardt Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Template for new versions:
## New Features

## Fixes
- `autoclothing`: Fix incorrect invalid material type error

## Misc Improvements

Expand Down
16 changes: 8 additions & 8 deletions plugins/autoclothing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ enum ConfigValues {
struct ClothingRequirement;
command_result autoclothing(color_ostream &out, vector<string> &parameters);
static void do_autoclothing();
static bool validateMaterialCategory(ClothingRequirement& requirement);
static bool validateMaterialCategory(ClothingRequirement& requirement, df::job_material_category& material_category);
static std::optional<ClothingRequirement> setItem(string name);
static void generate_control(color_ostream &out);
static bool isAvailableItem(df::item *item);
Expand Down Expand Up @@ -151,7 +151,7 @@ struct ClothingRequirement {
return std::nullopt;
}

else if (!validateMaterialCategory(*req)) {
else if (!validateMaterialCategory(*req, material_category)) {
out << parameters[idx] << " is not a valid material category for " << parameters[idx+1] << endl;
return std::nullopt;
}
Expand Down Expand Up @@ -387,29 +387,29 @@ static bool armorFlagsMatch(BitArray<df::armor_general_flags>& flags, df::job_ma
return flags.is_set(df::armor_general_flags::LEATHER) && category.bits.leather;
}

static bool validateMaterialCategory(ClothingRequirement& requirement) {
static bool validateMaterialCategory(ClothingRequirement& requirement, df::job_material_category& material_category) {
auto itemDef = Items::getSubtypeDef(requirement.itemType, requirement.item_subtype);
switch (requirement.itemType)
{
case item_type::ARMOR:
if (STRICT_VIRTUAL_CAST_VAR(armor, df::itemdef_armorst, itemDef))
return armorFlagsMatch(armor->props.flags, requirement.material_category);
return armorFlagsMatch(armor->props.flags, material_category);
break;
case item_type::GLOVES:
if (STRICT_VIRTUAL_CAST_VAR(armor, df::itemdef_glovesst, itemDef))
return armorFlagsMatch(armor->props.flags, requirement.material_category);
return armorFlagsMatch(armor->props.flags, material_category);
break;
case item_type::SHOES:
if (STRICT_VIRTUAL_CAST_VAR(armor, df::itemdef_shoesst, itemDef))
return armorFlagsMatch(armor->props.flags, requirement.material_category);
return armorFlagsMatch(armor->props.flags, material_category);
break;
case item_type::HELM:
if (STRICT_VIRTUAL_CAST_VAR(armor, df::itemdef_helmst, itemDef))
return armorFlagsMatch(armor->props.flags, requirement.material_category);
return armorFlagsMatch(armor->props.flags, material_category);
break;
case item_type::PANTS:
if (STRICT_VIRTUAL_CAST_VAR(armor, df::itemdef_pantsst, itemDef))
return armorFlagsMatch(armor->props.flags, requirement.material_category);
return armorFlagsMatch(armor->props.flags, material_category);
break;
default:
break;
Expand Down
Loading