From 5c5ea861cc844413e8b79f69e0ee69b5eefe1cde Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Sun, 4 Jan 2015 15:18:00 -0800 Subject: [PATCH] Show list to make in order to be made --- src/images/chest_front.png | Bin 0 -> 1411 bytes .../controllers/crafting_table_controller.coffee | 10 +++++++++- src/scripts/models/inventory.coffee | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 src/images/chest_front.png diff --git a/src/images/chest_front.png b/src/images/chest_front.png new file mode 100644 index 0000000000000000000000000000000000000000..72973f7db960060173013934bd045c33427563d4 GIT binary patch literal 1411 zcmV-}1$_F6P)4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p z0e^e3tK5h z@J6AEe_$vGqIeM`=#3ys1VI$RClHA@zU=53nPhhbZ*<`!vop!$?3rye{$s6;hcsD^ zDzFF1c){A645NUo1|OFLdOX$@Z&`xs`r;cmA{ z(-n_FjJkk&H&C{MtHXB1%V|UxI{}qt$)E}H&tGbuj(SWl&~*cx6K7hAYx<$4q9_=| zlE-^M&v~|jd@rVKJK`ru*F(zloJkg&biUQCYQR#Ej3SozkcJi6hNg7lG5MylYS;VW zPY=Xt0Fy8Y(|rMZcw|ih9+)FEKQi+&LKtc_fCBRm?wyc(Az%tt19%|wb?5DZJbd`o z138APLX^M*YYJ$9qLUFY0` R-}L|h002ovPDHLkV1hAnu^9jW literal 0 HcmV?d00001 diff --git a/src/scripts/controllers/crafting_table_controller.coffee b/src/scripts/controllers/crafting_table_controller.coffee index 44558bd1c..fc3ab5d27 100644 --- a/src/scripts/controllers/crafting_table_controller.coffee +++ b/src/scripts/controllers/crafting_table_controller.coffee @@ -110,7 +110,15 @@ module.exports = class CraftingTableController extends BaseController if @model.plan? @_resetStackControllers() @model.plan.need.each (stack)=> makeController 'need', stack - @model.plan.make.each (stack)=> makeController 'make', stack + + slugs = {} + for recipe in @model.plan.steps + slug = recipe.item.slug + if not slugs[slug]? + slugs[slug] = true + stack = @model.plan.make.getStack slug + makeController 'make', stack + @model.plan.result.each (stack)=> makeController 'result', stack super diff --git a/src/scripts/models/inventory.coffee b/src/scripts/models/inventory.coffee index e72980028..e0ed0d604 100644 --- a/src/scripts/models/inventory.coffee +++ b/src/scripts/models/inventory.coffee @@ -55,6 +55,9 @@ module.exports = class Inventory extends BaseModel stack = @_stacks[itemSlug] onStack stack + getStack: (itemSlug)-> + return @_stacks[itemSlug] + hasAtLeast: (itemSlug, quantity=1)-> if quantity is 0 then return true