diff --git a/library/include/dfhack/modules/Materials.h b/library/include/dfhack/modules/Materials.h index 78531a2bc..9adf7613f 100644 --- a/library/include/dfhack/modules/Materials.h +++ b/library/include/dfhack/modules/Materials.h @@ -668,6 +668,29 @@ namespace DFHack ~Materials(); bool Finish(); + enum base_material + { + INORGANIC, + AMBER, + CORAL, + GLASS_GREEN, + GLASS_CLEAR, + GLASS_CRYSTAL, + WATER, + COAL, + POTASH, + ASH, + PEARLASH, + LYE, + MUD, + VOMIT, + SALT, + FILTH_B, + FILTH_Y, + UNKNOWN_SUBSTANCE, + GRIME + }; + std::vector* df_inorganic; std::vector inorganic; std::vector* df_organic; diff --git a/plugins/drybuckets.cpp b/plugins/drybuckets.cpp index 1041cb7a6..245661736 100644 --- a/plugins/drybuckets.cpp +++ b/plugins/drybuckets.cpp @@ -64,7 +64,7 @@ DFhackCExport command_result df_drybuckets (Core * c, vector & paramete for (std::size_t i = 0; i < numItems; i++) { df_item *item = p_items[i]; - if ((item->getType() == 72) && (item->getMaterial() == 6)) + if ((item->getType() == Items::LIQUID_MISC) && (item->getMaterial() == Materials::WATER)) { item->flags.garbage_colect = 1; dried_total++;