@@ -7,6 +7,19 @@ local ORDERS = df.global.world.manager_orders.all
77local ITEMDEFS = df .global .world .raws .itemdefs
88local REACTIONS = df .global .world .raws .reactions .reactions
99
10+ local JOBTYPE_ITEMDEF = {
11+ [df .job_type .MakeArmor ] = ' armor' ,
12+ [df .job_type .MakeWeapon ] = ' weapons' ,
13+ [df .job_type .MakeShield ] = ' shields' ,
14+ [df .job_type .MakeAmmo ] = ' ammo' ,
15+ [df .job_type .MakeHelm ] = ' helms' ,
16+ [df .job_type .MakeGloves ] = ' gloves' ,
17+ [df .job_type .MakePants ] = ' pants' ,
18+ [df .job_type .MakeShoes ] = ' shoes' ,
19+ [df .job_type .MakeTool ] = ' tools' ,
20+ [df .job_type .MakeTrapComponent ] = ' trapcomps' ,
21+ }
22+
1023-- ------------------------------------------------------------
1124-- Matching
1225-- ------------------------------------------------------------
@@ -18,29 +31,9 @@ local function safe_name(vec, idx)
1831end
1932
2033local function get_item_subtype_name (order )
21- local jt = order .job_type
22- if jt == df .job_type .MakeArmor then
23- return safe_name (ITEMDEFS .armor , order .item_subtype )
24- elseif jt == df .job_type .MakeWeapon then
25- return safe_name (ITEMDEFS .weapons , order .item_subtype )
26- elseif jt == df .job_type .MakeShield then
27- return safe_name (ITEMDEFS .shields , order .item_subtype )
28- elseif jt == df .job_type .MakeAmmo then
29- return safe_name (ITEMDEFS .ammo , order .item_subtype )
30- elseif jt == df .job_type .MakeHelm then
31- return safe_name (ITEMDEFS .helms , order .item_subtype )
32- elseif jt == df .job_type .MakeGloves then
33- return safe_name (ITEMDEFS .gloves , order .item_subtype )
34- elseif jt == df .job_type .MakePants then
35- return safe_name (ITEMDEFS .pants , order .item_subtype )
36- elseif jt == df .job_type .MakeShoes then
37- return safe_name (ITEMDEFS .shoes , order .item_subtype )
38- elseif jt == df .job_type .MakeTool then
39- return safe_name (ITEMDEFS .tools , order .item_subtype )
40- elseif jt == df .job_type .MakeTrapComponent then
41- return safe_name (ITEMDEFS .trapcomps , order .item_subtype )
42- end
43- return ' '
34+ local key = JOBTYPE_ITEMDEF [order .job_type ]
35+ if not key then return ' ' end
36+ return safe_name (ITEMDEFS [key ], order .item_subtype )
4437end
4538
4639local function get_reaction_name (order )
@@ -296,6 +289,7 @@ function OrderSearchFilter:clear_filter()
296289 self .pending_clear = true
297290 end
298291 self .filter_text = nil
292+ self :restore_orders ()
299293end
300294
301295function OrderSearchFilter :overlay_ondisable ()
0 commit comments