diff --git a/docs/plugins/stockpiles.rst b/docs/plugins/stockpiles.rst index 0fed3e25f..da9b77dc5 100644 --- a/docs/plugins/stockpiles.rst +++ b/docs/plugins/stockpiles.rst @@ -2,7 +2,7 @@ stockpiles ========== .. dfhack-tool:: - :summary: Import, export, or modify stockpile settings and features. + :summary: Import, export, or modify stockpile settings. :tags: fort design productivity stockpiles Commands act upon the stockpile selected in the UI unless another stockpile @@ -94,7 +94,6 @@ file are: :types: The elements below the categories, which include the sub-categories, the specific item types, and any toggles the category might have (like Prepared meals for the Food category). -:features: DFHack `logistics` features. .. _stockpiles-library: diff --git a/plugins/lua/stockpiles.lua b/plugins/lua/stockpiles.lua index b5fd72745..8e5359dc9 100644 --- a/plugins/lua/stockpiles.lua +++ b/plugins/lua/stockpiles.lua @@ -80,7 +80,7 @@ local function get_sp_id(opts) return nil end -local included_elements = {containers=1, general=2, categories=4, types=8, features=16} +local included_elements = {containers=1, general=2, categories=4, types=8} function export_stockpile(name, opts) assert_safe_name(name) @@ -207,15 +207,6 @@ function parse_commandline(args) return true end -function get_stockpile_features(stockpile_number) - local config = logistics.logistics_getStockpileConfigs(stockpile_number)[1] - return config.melt, config.trade, config.dump, config.train -end - -function set_stockpile_features(stockpile_number, melt, trade, dump, train) - logistics.logistics_setStockpileConfig(stockpile_number, melt, trade, dump, train) -end - -------------------- -- dialogs -------------------- @@ -240,7 +231,6 @@ function StockpilesExport:init() initial_option=false, }, widgets.ToggleHotkeyLabel{frame={t=6, l=0}, label='Categories', initial_option=true}, widgets.ToggleHotkeyLabel{frame={t=7, l=0}, label='Subtypes', initial_option=true}, - widgets.ToggleHotkeyLabel{frame={t=8, l=0}, label='DFHack features', initial_option=true}, widgets.HotkeyLabel{ frame={t=10, l=0}, label='export', diff --git a/plugins/stockpiles/StockpileSerializer.cpp b/plugins/stockpiles/StockpileSerializer.cpp index ebee71520..4e2806e22 100644 --- a/plugins/stockpiles/StockpileSerializer.cpp +++ b/plugins/stockpiles/StockpileSerializer.cpp @@ -770,8 +770,6 @@ void StockpileSettingsSerializer::write(color_ostream& out, uint32_t includedEle } void StockpileSerializer::write(color_ostream& out, uint32_t includedElements) { - if (includedElements & INCLUDED_ELEMENTS_FEATURES) - write_features(out); if (includedElements & INCLUDED_ELEMENTS_CONTAINERS) write_containers(out); @@ -808,7 +806,6 @@ void StockpileSettingsSerializer::read(color_ostream &out, DeserializeMode mode, } void StockpileSerializer::read(color_ostream &out, DeserializeMode mode, const vector& filters) { - read_features(out, mode); read_containers(out, mode); StockpileSettingsSerializer::read(out, mode, filters); } @@ -911,56 +908,6 @@ void StockpileSerializer::read_general(color_ostream& out, DeserializeMode mode) mPile->use_links_only); } -void StockpileSerializer::write_features(color_ostream& out) { - DEBUG(log, out).print("writing feature settings\n"); - if (!call_stockpiles_lua(&out, "get_stockpile_features", 1, 4, - [&](lua_State* L) { - Lua::Push(L, mPile->stockpile_number); - }, - [&](lua_State* L) { - mBuffer.set_melt(0 != lua_toboolean(L, -1)); - mBuffer.set_trade(0 != lua_toboolean(L, -2)); - mBuffer.set_dump(0 != lua_toboolean(L, -3)); - mBuffer.set_train(0 != lua_toboolean(L, -4)); - })) { - - WARN(log, out).print("failed to get logistics features of stockpile number %d\n", mPile->stockpile_number); - } -} - -void StockpileSerializer::read_features(color_ostream &out, DeserializeMode mode) { - int32_t melt = -1, trade = -1, dump = -1, train = -1; - read_elem(out, "melt", mode, - std::bind(&StockpileSettings::has_melt, mBuffer), - std::bind(&StockpileSettings::melt, mBuffer), - melt); - read_elem(out, "trade", mode, - std::bind(&StockpileSettings::has_trade, mBuffer), - std::bind(&StockpileSettings::trade, mBuffer), - trade); - read_elem(out, "dump", mode, - std::bind(&StockpileSettings::has_dump, mBuffer), - std::bind(&StockpileSettings::dump, mBuffer), - dump); - read_elem(out, "train", mode, - std::bind(&StockpileSettings::has_train, mBuffer), - std::bind(&StockpileSettings::train, mBuffer), - train); - - if (melt != -1 || trade != -1 || dump != -1 || train != -1) { - if (!call_stockpiles_lua(&out, "set_stockpile_features", 4, 0, - [&](lua_State* L) { - Lua::Push(L, mPile->stockpile_number); - Lua::Push(L, melt == 1); - Lua::Push(L, trade == 1); - Lua::Push(L, dump == 1); - Lua::Push(L, train == 1); - })) { - WARN(log, out).print("failed to set logistics features of stockpile number %d\n", mPile->stockpile_number); - } - } -} - static bool ammo_mat_is_allowed(const MaterialInfo& mi) { return mi.isValid() && mi.material && mi.material->flags.is_set(material_flags::IS_METAL); } diff --git a/plugins/stockpiles/StockpileSerializer.h b/plugins/stockpiles/StockpileSerializer.h index c707eab85..a29fe3906 100644 --- a/plugins/stockpiles/StockpileSerializer.h +++ b/plugins/stockpiles/StockpileSerializer.h @@ -21,7 +21,6 @@ enum IncludedElements { INCLUDED_ELEMENTS_GENERAL = 0x02, INCLUDED_ELEMENTS_CATEGORIES = 0x04, INCLUDED_ELEMENTS_TYPES = 0x08, - INCLUDED_ELEMENTS_FEATURES = 0x10, }; enum DeserializeMode { @@ -169,6 +168,4 @@ private: void write_containers(DFHack::color_ostream& out); void read_containers(DFHack::color_ostream& out, DeserializeMode mode); - void write_features(DFHack::color_ostream& out); - void read_features(DFHack::color_ostream &out, DeserializeMode mode); }; diff --git a/plugins/stockpiles/proto/stockpiles.proto b/plugins/stockpiles/proto/stockpiles.proto index 4030de0cd..681e7d927 100644 --- a/plugins/stockpiles/proto/stockpiles.proto +++ b/plugins/stockpiles/proto/stockpiles.proto @@ -183,12 +183,6 @@ message StockpileSettings { optional WeaponsSet weapons = 16; optional WoodSet wood = 15; - // DFHack features - optional bool melt = 27; - optional bool trade = 28; - optional bool dump = 29; - optional bool train = 30; - // deprecated optional bool corpses = 24; // not marked as deprecated since we still read it optional OreSet ore = 7 [deprecated=true]; diff --git a/plugins/stockpiles/stockpiles.cpp b/plugins/stockpiles/stockpiles.cpp index 6e3caa61d..840e4adc7 100644 --- a/plugins/stockpiles/stockpiles.cpp +++ b/plugins/stockpiles/stockpiles.cpp @@ -32,7 +32,7 @@ DFhackCExport command_result plugin_init(color_ostream &out, vector