Skip to content

Commit

Permalink
Document that search now works in the stockpile settings screen.
Browse files Browse the repository at this point in the history
  • Loading branch information
angavrilov committed Dec 1, 2012
1 parent fd5b19f commit df2e9f0
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 13 deletions.
20 changes: 10 additions & 10 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@ DFHack future
New GUI scripts:
- gui/guide-path: displays the cached path for minecart Guide orders.
- gui/workshop-job: displays inputs of a workshop job and allows tweaking them.
- gui/workflow: a front-end for the workflow plugin.
- gui/workflow: a front-end for the workflow plugin (part inspired by falconne).
- gui/assign-rack: works together with a binary patch to fix weapon racks.
- gui/gm-editor: an universal editor for lots of dfhack things.
- gui/companion-order: a adventure mode command interface for your companions.
New binary patches:
- armorstand-capacity
- custom-reagent-size
- deconstruct-heapfall
- deconstruct-teleport
- hospital-overstocking
- training-ammo
- weaponrack-unassign
New binary patches (for use with binpatch):
- armorstand-capacity: doubles the capacity of armor stands.
- custom-reagent-size: lets custom reactions use small amounts of inputs.
- deconstruct-heapfall: stops some items still falling on head when deconstructing.
- deconstruct-teleport: stops items from 16x16 block teleporting when deconstructing.
- hospital-overstocking: stops hospital overstocking with supplies.
- training-ammo: lets dwarves with quiver full of combat-only ammo train.
- weaponrack-unassign: fixes bug that negates work done by gui/assign-rack.
Workflow plugin:
- properly considers minecarts assigned to routes busy.
- code for deducing job outputs rewritten in lua for flexibility.
Expand All @@ -48,7 +48,7 @@ DFHack future
this plugin makes weapon racks, armor stands, chests and cabinets in
properly designated barracks be used again for storage of squad equipment.
New Search plugin by falconne:
Adds an incremental search function to the Stocks, Trading and Unit List screens.
Adds an incremental search function to the Stocks, Trading, Stockpile and Unit List screens.
New AutoMaterial plugin by falconne:
Makes building constructions (walls, floors, fortifications, etc) a little bit easier by
saving you from having to trawl through long lists of materials each time you place one.
Expand Down
9 changes: 8 additions & 1 deletion Readme.html
Original file line number Diff line number Diff line change
Expand Up @@ -2873,7 +2873,7 @@ <h2><a class="toc-backref" href="#id135">Dwarf Manipulator</a></h2>
</div>
<div class="section" id="search">
<h2><a class="toc-backref" href="#id136">Search</a></h2>
<p>The search plugin adds search to the Stocks, Trading and Unit List screens.</p>
<p>The search plugin adds search to the Stocks, Trading, Stockpile and Unit List screens.</p>
<img alt="images/search.png" src="images/search.png" />
<p>Searching works the same way as the search option in &quot;Move to Depot&quot; does.
You will see the Search option displayed on screen with a hotkey (usually 's').
Expand All @@ -2890,6 +2890,13 @@ <h2><a class="toc-backref" href="#id136">Search</a></h2>
are actually visible in the list; the same effect applies to the Trade
Value numbers displayed by the screen. Because of this, pressing the 't'
key while search is active clears the search instead of executing the trade.</p>
<p>In the stockpile screen the option only appears if the cursor is in the
rightmost list:</p>
<img alt="images/search-stockpile.png" src="images/search-stockpile.png" />
<p>Note that the 'Permit XXX'/'Forbid XXX' keys conveniently operate only
on items actually shown in the rightmost list, so it is possible to select
only fat or tallow by forbidding fats, then searching for fat/tallow, and
using Permit Fats again while the list is filtered.</p>
</div>
<div class="section" id="automaterial">
<h2><a class="toc-backref" href="#id137">AutoMaterial</a></h2>
Expand Down
12 changes: 11 additions & 1 deletion Readme.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2074,7 +2074,7 @@ directly to the main dwarf mode screen.
Search
======

The search plugin adds search to the Stocks, Trading and Unit List screens.
The search plugin adds search to the Stocks, Trading, Stockpile and Unit List screens.

.. image:: images/search.png

Expand All @@ -2097,6 +2097,16 @@ are actually visible in the list; the same effect applies to the Trade
Value numbers displayed by the screen. Because of this, pressing the 't'
key while search is active clears the search instead of executing the trade.

In the stockpile screen the option only appears if the cursor is in the
rightmost list:

.. image:: images/search-stockpile.png

Note that the 'Permit XXX'/'Forbid XXX' keys conveniently operate only
on items actually shown in the rightmost list, so it is possible to select
only fat or tallow by forbidding fats, then searching for fat/tallow, and
using Permit Fats again while the list is filtered.


AutoMaterial
============
Expand Down
Binary file added images/search-stockpile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion plugins/search.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ class stockpile_search : public search_parent<df::viewscreen_layer_stockpilest,

void render() const
{
print_search_option(2, 25);
print_search_option(51, 23);
}

static df::layer_object_listst *getLayerList(const df::viewscreen_layer *layer, int idx)
Expand Down

0 comments on commit df2e9f0

Please sign in to comment.