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

remember default max quality for each item

develop
Myk Taylor 2023-03-05 23:04:03 -08:00
parent efb307ed25
commit 80addc92d1
No known key found for this signature in database
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/buildingplan/buildingplan.cpp
Unescape Escape View File

@ -705,7 +705,9 @@ static void clearFilter(color_ostream &out, df::building_type type, int16_t subt
auto &filters = get_item_filters(out, key);
if (index < 0 || filters.getItemFilters().size() <= (size_t)index)
return;
filters.setItemFilter(out, ItemFilter(), index);
ItemFilter filter = filters.getItemFilters()[index];
filter.clear();
filters.setItemFilter(out, filter, index);
call_buildingplan_lua(&out, "signal_reset");
}

2
plugins/buildingplan/defaultitemfilters.cpp
Unescape Escape View File

@ -41,7 +41,7 @@ DefaultItemFilters::DefaultItemFilters(color_ostream &out, BuildingTypeKey key,
set_config_val(filter_config, FILTER_CONFIG_CUSTOM, std::get<2>(key));
item_filters.resize(jitems.size());
for (size_t idx = 0; idx < jitems.size(); ++idx) {
item_filters[idx].setMaxQuality(get_max_quality(jitems[idx]));
item_filters[idx].setMaxQuality(get_max_quality(jitems[idx]), true);
}
filter_config.val() = serialize_item_filters(item_filters);
}

20
plugins/buildingplan/itemfilter.cpp
Unescape Escape View File

@ -14,13 +14,13 @@ using std::vector;
using namespace DFHack;
ItemFilter::ItemFilter() {
ItemFilter::ItemFilter() : default_max_quality(df::item_quality::Masterful) {
clear();
}
void ItemFilter::clear() {
min_quality = df::item_quality::Ordinary;
max_quality = df::item_quality::Masterful;
max_quality = default_max_quality;
decorated_only = false;
mat_mask.whole = 0;
materials.clear();
@ -28,7 +28,7 @@ void ItemFilter::clear() {
bool ItemFilter::isEmpty() const {
return min_quality == df::item_quality::Ordinary
&& max_quality == df::item_quality::Masterful
&& max_quality == default_max_quality
&& !decorated_only
&& !mat_mask.whole
&& materials.empty();
@ -62,12 +62,10 @@ static bool deserializeMaterials(string ser, set<DFHack::MaterialInfo> &material
return true;
}
ItemFilter::ItemFilter(color_ostream &out, string serialized) {
clear();
ItemFilter::ItemFilter(color_ostream &out, string serialized) : ItemFilter() {
vector<string> tokens;
split_string(&tokens, serialized, "/");
if (tokens.size() != 5) {
if (tokens.size() < 5) {
DEBUG(status,out).print("invalid ItemFilter serialization: '%s'", serialized.c_str());
return;
}
@ -78,6 +76,9 @@ ItemFilter::ItemFilter(color_ostream &out, string serialized) {
setMinQuality(atoi(tokens[2].c_str()));
setMaxQuality(atoi(tokens[3].c_str()));
decorated_only = static_cast<bool>(atoi(tokens[4].c_str()));
if (tokens.size() >= 6)
default_max_quality = static_cast<df::item_quality>(atoi(tokens[5].c_str()));
}
// format: mat,mask,elements/materials,list/minq/maxq/decorated
@ -93,6 +94,7 @@ string ItemFilter::serialize() const {
ser << "/" << static_cast<int>(min_quality);
ser << "/" << static_cast<int>(max_quality);
ser << "/" << static_cast<int>(decorated_only);
ser << "/" << static_cast<int>(default_max_quality);
return ser.str();
}
@ -114,11 +116,13 @@ void ItemFilter::setMinQuality(int quality) {
max_quality = min_quality;
}
void ItemFilter::setMaxQuality(int quality) {
void ItemFilter::setMaxQuality(int quality, bool is_default) {
max_quality = static_cast<df::item_quality>(quality);
clampItemQuality(&max_quality);
if (max_quality < min_quality)
min_quality = max_quality;
if (is_default)
default_max_quality = max_quality;
}
void ItemFilter::setDecoratedOnly(bool decorated) {

3
plugins/buildingplan/itemfilter.h
Unescape Escape View File

@ -15,7 +15,7 @@ public:
std::string serialize() const;
void setMinQuality(int quality);
void setMaxQuality(int quality);
void setMaxQuality(int quality, bool is_default = false);
void setDecoratedOnly(bool decorated);
void setMaterialMask(uint32_t mask);
void setMaterials(const std::set<DFHack::MaterialInfo> &materials);
@ -33,6 +33,7 @@ public:
private:
df::item_quality min_quality;
df::item_quality max_quality;
df::item_quality default_max_quality;
bool decorated_only;
df::dfhack_material_category mat_mask;
std::set<DFHack::MaterialInfo> materials;