-
Notifications
You must be signed in to change notification settings - Fork 192
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #808 from myk002/myk_trade
[caravan] make search field per-goods list
- Loading branch information
Showing
4 changed files
with
216 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| --@ module = true | ||
|
|
||
| local gui = require('gui') | ||
| local scriptmanager = require('script-manager') | ||
| local widgets = require('gui.widgets') | ||
|
|
||
| local function to_item_type_str(item_type) | ||
| return string.lower(df.item_type[item_type]):gsub('_', ' ') | ||
| end | ||
|
|
||
| local PREDICATE_LIBRARY = { | ||
| {name='weapons-grade metal', match=function(item) | ||
| if item:getMaterial() ~= 0 then return false end | ||
| local flags = df.global.world.raws.inorganics[item:getMaterialIndex()].material.flags | ||
| return flags.IS_METAL and | ||
| (flags.ITEMS_METAL or flags.ITEMS_WEAPON or flags.ITEMS_WEAPON_RANGED or flags.ITEMS_AMMO or flags.ITEMS_ARMOR) | ||
| end}, | ||
| } | ||
| for _,item_type in ipairs(df.item_type) do | ||
| table.insert(PREDICATE_LIBRARY, { | ||
| name=to_item_type_str(item_type), | ||
| group='item type', | ||
| match=function(item) return item_type == item:getType() end, | ||
| }) | ||
| end | ||
|
|
||
| local PREDICATES_VAR = 'ITEM_PREDICATES' | ||
|
|
||
| local function get_user_predicates() | ||
| local user_predicates = {} | ||
| local load_user_predicates = function(env_name, env) | ||
| local predicates = env[PREDICATES_VAR] | ||
| if not predicates then return end | ||
| if type(predicates) ~= 'table' then | ||
| dfhack.printerr( | ||
| ('error loading predicates from "%s": %s map is malformed') | ||
| :format(env_name, PREDICATES_VAR)) | ||
| return | ||
| end | ||
| for i,predicate in ipairs(predicates) do | ||
| if type(predicate) ~= 'table' then | ||
| dfhack.printerr(('error loading predicate %s:%d (must be a table)'):format(env_name, i)) | ||
| goto continue | ||
| end | ||
| if type(predicate.name) ~= 'string' or #predicate.name == 0 then | ||
| dfhack.printerr(('error loading predicate %s:%d (must have a string "name" field)'):format(env_name, i)) | ||
| goto continue | ||
| end | ||
| if type(predicate.match) ~= 'function' then | ||
| dfhack.printerr(('error loading predicate %s:%d (must have a function "match" field)'):format(env_name, i)) | ||
| goto continue | ||
| end | ||
| table.insert(user_predicates, {id=('%s:%s'):format(env_name, predicate.name), name=predicate.name, match=predicate.match}) | ||
| ::continue:: | ||
| end | ||
| end | ||
| scriptmanager.foreach_module_script(load_user_predicates) | ||
| return user_predicates | ||
| end | ||
|
|
||
| function make_predicate_str(context) | ||
| local preset, names = nil, {} | ||
| for name, predicate in pairs(context.predicates) do | ||
| if not preset then | ||
| preset = predicate.preset or '' | ||
| end | ||
| if #preset > 0 and preset ~= predicate.preset then | ||
| preset = '' | ||
| end | ||
| table.insert(names, name) | ||
| end | ||
| if preset and #preset > 0 then | ||
| return preset | ||
| end | ||
| if #names > 0 then | ||
| return table.concat(names, ', ') | ||
| end | ||
| return 'All' | ||
| end | ||
|
|
||
| function init_context_predicates(context) | ||
| -- TODO: init according to saved preferences associated with context.name | ||
| context.predicates = {} | ||
| end | ||
|
|
||
| function pass_predicates(context, item) | ||
| for _,predicate in pairs(context.predicates) do | ||
| local ok, matches = safecall(predicate.match, item) | ||
| if not ok then goto continue end | ||
| if matches ~= predicate.invert then return false end | ||
| ::continue:: | ||
| end | ||
| return true | ||
| end | ||
|
|
||
| AdvancedFilter = defclass(AdvancedFilter, widgets.Window) | ||
| AdvancedFilter.ATTRS { | ||
| frame_title='Advanced item filters', | ||
| frame={w=50, h=45}, | ||
| resizable=true, | ||
| resize_min={w=50, h=20}, | ||
| context=DEFAULT_NIL, | ||
| on_change=DEFAULT_NIL, | ||
| } | ||
|
|
||
| function AdvancedFilter:init() | ||
| self:addviews{ | ||
| } | ||
| end | ||
|
|
||
| AdvancedFilterScreen = defclass(AdvancedFilterScreen, gui.ZScreenModal) | ||
| AdvancedFilterScreen.ATTRS { | ||
| focus_path='advanced_item_filter', | ||
| context=DEFAULT_NIL, | ||
| on_change=DEFAULT_NIL, | ||
| } | ||
|
|
||
| function AdvancedFilterScreen:init() | ||
| self:addviews{AdvancedFilter{context=self.context, on_change=self.on_change}} | ||
| end | ||
|
|
||
| function customize_predicates(context, on_change) | ||
| context.user_predicates = context.user_predicates or get_user_predicates() | ||
| AdvancedFilterScreen{context=context, on_change=on_change}:show() | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters