Revert "generalize dfhack.items.isRequestedTradeGood"

This reverts commit aa6d28b.
DFHack · Jul 6, 2023 · 9849885 · 9849885
1 parent aa6d28b
commit 9849885
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 515 deletions.
diff --git a/docs/dev/Lua API.rst b/docs/dev/Lua API.rst
@@ -1770,22 +1770,7 @@ Items module
 
 * ``dfhack.items.getValue(item)``
 
-<<<<<<< Updated upstream
   Calculates the Basic Value of an item, as seen in the View Item screen.
-=======
-  Calculates the value of an item. If a ``df.caravan_state`` object is given
-  (from ``df.global.plotinfo.caravans`` or
-  ``df.global.main_interface.trade.mer``), then the value is modified by civ
-  properties and any trade agreements that might be in effect. In this case,
-  specify ``caravan_buying`` as ``true`` to get the price the caravan will pay
-  for the item and ``false`` to get the price that the caravan will sell the
-  item for.
-
-* ``dfhack.items.isRequestedTradeGood(item[, caravan_state])``
-
-  Returns whether a caravan will pay extra for the given item. If caravan_state
-  is not given, checks all active caravans.
->>>>>>> Stashed changes
 
 * ``dfhack.items.createItem(item_type, item_subtype, mat_type, mat_index, unit)``
 

diff --git a/library/include/modules/Items.h b/library/include/modules/Items.h
@@ -202,11 +202,6 @@ DFHACK_EXPORT bool canTrade(df::item *item);
 DFHACK_EXPORT bool canTradeWithContents(df::item *item);
 /// marks the given item for trade at the given depot
 DFHACK_EXPORT bool markForTrade(df::item *item, df::building_tradedepotst *depot);
-<<<<<<< Updated upstream
-=======
-/// Returns true if an active caravan will pay extra for the given item
-DFHACK_EXPORT bool isRequestedTradeGood(df::item *item, df::caravan_state *caravan = NULL);
->>>>>>> Stashed changes
 
 /// Checks whether the item is an assigned hauling vehicle
 DFHACK_EXPORT bool isRouteVehicle(df::item *item);