From a784f275ff49ac54ea7129d857ab910ae883cf7d Mon Sep 17 00:00:00 2001
From: Andrew Miner <andrewminer@mac.com>
Date: Sun, 11 Jan 2015 16:01:51 -0800
Subject: [PATCH] Add back the "include tools" option

* Rewrite the crafting algorithm to recursively find all the steps
  involved and then resolve how many times each needs to be run.
* Update the base controller to debounce calls to refresh
* Fix a few erroneous recipes for IC2-Classic
---
 src/css/templates/item_page.scss              |   5 +
 src/data/ic2_classic/recipes.json             |   4 +-
 .../controllers/base_controller.coffee        |   2 +
 .../controllers/item_page_controller.coffee   |  20 +++
 src/scripts/models/crafting_plan.coffee       | 120 ++++++++++--------
 src/scripts/models/crafting_table.coffee      |  39 ++----
 src/scripts/models/inventory.coffee           |  29 +++--
 src/scripts/models/recipe.coffee              |   4 +-
 8 files changed, 125 insertions(+), 98 deletions(-)

diff --git a/src/css/templates/item_page.scss b/src/css/templates/item_page.scss
index d7f53ea9a..6aee8e1fe 100644
--- a/src/css/templates/item_page.scss
+++ b/src/css/templates/item_page.scss
@@ -20,4 +20,9 @@ All rights reserved.
     .view__crafting_table { width: 50%; height: 26em; }
 
     .view__mod_pack { margin-top: 2em; width: 100%; }
+
+    .want label {
+        position: absolute; top: 50%; left: 0.5em;
+        @include transform(translateY(-50%));
+    }
 }
diff --git a/src/data/ic2_classic/recipes.json b/src/data/ic2_classic/recipes.json
index 18fabbd16..e93ea24c2 100644
--- a/src/data/ic2_classic/recipes.json
+++ b/src/data/ic2_classic/recipes.json
@@ -436,7 +436,7 @@
             "pattern": ".1. 020 .1."
         }, {
             "output": "Extractor",
-            "input": [[4, "Tree Tap"], "Electronic Circuit", "Machine Block"],
+            "input": [[4, "Treetap"], "Electronic Circuit", "Machine Block"],
             "pattern": "... 020 010",
             "tools": "Crafting Table"
         }, {
@@ -1108,7 +1108,7 @@
             "tools": "Crafting Table"
         }, {
             "output": "Wind Mill",
-            "input": [[4, "Iron"], "Generator"],
+            "input": [[4, "Iron Ingot"], "Generator"],
             "pattern": "0.0 .1. 0.0",
             "tools": "Crafting Table"
         }, {
diff --git a/src/scripts/controllers/base_controller.coffee b/src/scripts/controllers/base_controller.coffee
index e856af802..134436d59 100644
--- a/src/scripts/controllers/base_controller.coffee
+++ b/src/scripts/controllers/base_controller.coffee
@@ -23,6 +23,8 @@ module.exports = class BaseController extends Backbone.View
         @_loadTemplate options.templateName
         super options
 
+        @_tryRefresh = _.debounce @_tryRefresh, 100
+
     # Public Methods ###############################################################################
 
     addChild: (Controller, atSelector, options={})->
diff --git a/src/scripts/controllers/item_page_controller.coffee b/src/scripts/controllers/item_page_controller.coffee
index cf7b4d86a..ce091303d 100644
--- a/src/scripts/controllers/item_page_controller.coffee
+++ b/src/scripts/controllers/item_page_controller.coffee
@@ -22,6 +22,11 @@ module.exports = class ItemPageController extends BaseController
         options.templateName  = 'item_page'
         super options
 
+    # Event Methods ################################################################################
+
+    onToolsBoxToggled: ->
+        @model.plan.includingTools = @$('.includeTools:checked').length isnt 0
+
     # BaseController Overrides #####################################################################
 
     onDidRender: ->
@@ -54,4 +59,19 @@ module.exports = class ItemPageController extends BaseController
             modPack: @model.modPack
 
         @modPackController = @addChild ModPackController, '.view__mod_pack', model:@model.modPack
+
+        @$('.want .toolbar').append '<label><input class="includeTools" type="checkbox"> include tools</label'
+        @$includeToolsBox = @$('.includeTools')
+
         super
+
+    refresh: ->
+        if @model.plan.includingTools
+            @$includeToolsBox.attr 'checked', 'checked'
+        else
+            @$includeToolsBox.removeAttr 'checked'
+
+    # Backbone.View Overrides ######################################################################
+
+    events:
+        'change .includeTools': 'onToolsBoxToggled'
diff --git a/src/scripts/models/crafting_plan.coffee b/src/scripts/models/crafting_plan.coffee
index 28bc5d511..6b54ecbf1 100644
--- a/src/scripts/models/crafting_plan.coffee
+++ b/src/scripts/models/crafting_plan.coffee
@@ -25,16 +25,14 @@ module.exports = class CraftingPlan extends BaseModel
         @have.on 'change', => @craft()
         @want.on 'change', => @craft()
         @modPack.on 'change', => @craft()
+        @on 'change:includingTools', => @craft()
 
         @clear()
 
     # Public Methods ###############################################################################
 
     clear: ->
-        @steps     = []
-        @_expected = new Inventory
-        @_pending  = null
-
+        @steps = []
         @need.clear()
         @result.clear()
 
@@ -42,22 +40,18 @@ module.exports = class CraftingPlan extends BaseModel
         return this
 
     craft: ->
-        logger.trace "starting crafting plan for: #{@want} starting with #{@have}"
         @clear()
-        return if @want.isEmpty
-
-        @want.each (stack)=>
-            @_expected = @want.clone()
-            @_pending = @want.clone()
-
         @result.addInventory @have
 
-        @_need = new Inventory
-        while not @_pending.isEmpty
-            @_processPending()
+        @steps = {}
+        @want.each (stack)=>
+            @_findSteps stack.itemSlug
+            @need.add stack.itemSlug, stack.quantity
 
-        @need.addInventory @_need
-        @steps.reverse()
+        @steps = _.values @steps
+        @_resolveNeeds()
+        @_removeExtraSteps()
+        @result.addInventory @want
 
         @trigger 'change', this
 
@@ -74,53 +68,67 @@ module.exports = class CraftingPlan extends BaseModel
 
     # Private Methods ##############################################################################
 
-    _processPending: ->
-        targetStack = @_pending.pop()
-        targetItem = @modPack.findItem targetStack.itemSlug
-        logger.verbose "processing item: #{targetStack}"
-        return unless targetItem?
-        return if (not targetItem.isCraftable) or targetItem.isGatherable
+    _addStep: (recipe)->
+        return if @_hasStep recipe.slug
+        logger.verbose "adding step: #{recipe.slug}"
+        @steps[recipe.slug] = recipe:recipe
 
-        recipe = targetItem.recipes[0]
-        logger.verbose "recipe: #{recipe}"
+    _chooseRecipe: (item)->
+        return item.recipes[0]
+
+    _findSteps: (itemSlug)->
+        item = @modPack.findItem itemSlug
+        return unless item?
+        return unless item.isCraftable
+        return if item.isGatherable
+
+        recipe = @_chooseRecipe item
 
         if @includingTools
             for toolStack in recipe.tools
-                slug = toolStack.itemSlug
-                totalExpected = @result.quantityOf(slug) + @_expected.quantityOf(slug)
-                if totalExpected < 1
-                    @_pending.add slug
-                    @_expected.add slug
+                if not @_hasStep toolStack.itemSlug
+                    @_findSteps toolStack.itemSlug
 
-        while @_totalQuantityOf(targetItem.slug) < @_expected.quantityOf(targetItem.slug)
-            @steps.push recipe
+        for inputStack in recipe.input
+            @_findSteps inputStack.itemSlug
+
+        @_addStep recipe
+
+    _hasStep: (itemSlug)->
+        return @steps[itemSlug]?
+
+    _removeExtraSteps: ->
+        result = (step for step in @steps when step.multiplier > 0)
+        @steps = result
+
+    _resolveNeeds: ->
+        for i in [@steps.length-1..0] by -1
+            step   = @steps[i]
+            recipe = step.recipe
+
+            step.multiplier = Math.ceil(@need.quantityOf(recipe.slug) / step.recipe.output[0].quantity)
+
+            if @includingTools
+                for stack in recipe.tools
+                    slug      = stack.itemSlug
+                    available = @result.quantityOf(slug) + @need.quantityOf(slug)
+                    needed    = Math.max 0, stack.quantity - available
+
+                    @need.add stack.itemSlug, needed
+                    @result.add stack.itemSlug, needed
 
             for stack in recipe.input
-                @_processInputStack stack
+                needed    = step.multiplier * stack.quantity
+                consumed  = Math.min needed, @result.quantityOf(stack.itemSlug)
+                remaining = needed - consumed
+
+                @result.remove stack.itemSlug, consumed
+                @need.add stack.itemSlug, remaining
 
             for stack in recipe.output
-                @_processOutputStack stack
+                created   = stack.quantity * step.multiplier
+                consumed  = Math.min created, @need.quantityOf stack.itemSlug
+                remaining = created - consumed
 
-    _processInputStack: (stack)->
-        quantityAvailable = @result.quantityOf stack.itemSlug
-        quantityUsed      = Math.min quantityAvailable, stack.quantity
-        quantityNeeded    = stack.quantity - quantityUsed
-        logger.trace "processing input:#{stack.itemSlug},
-            a:#{quantityAvailable}, u:#{quantityUsed}, n:#{quantityNeeded}"
-
-        @result.remove stack.itemSlug, quantityUsed
-        @_pending.add stack.itemSlug, quantityNeeded
-        @_need.add stack.itemSlug, quantityNeeded
-
-    _processOutputStack: (stack)->
-        quantityMissing = @_need.quantityOf stack.itemSlug
-        quantityUsed    = Math.min quantityMissing, stack.quantity
-        quantityLeft    = stack.quantity - quantityUsed
-        logger.trace "processing output:#{stack.itemSlug},
-            m:#{quantityMissing}, u:#{quantityUsed}, l:#{quantityLeft}"
-
-        @_need.remove stack.itemSlug, quantityUsed
-        @result.add stack.itemSlug, quantityLeft
-
-    _totalQuantityOf: (itemSlug)->
-        return @result.quantityOf(itemSlug) - @_need.quantityOf(itemSlug)
+                @result.add stack.itemSlug, remaining
+                @need.remove stack.itemSlug, consumed
diff --git a/src/scripts/models/crafting_table.coffee b/src/scripts/models/crafting_table.coffee
index 429ee694d..1693d9005 100644
--- a/src/scripts/models/crafting_table.coffee
+++ b/src/scripts/models/crafting_table.coffee
@@ -20,7 +20,6 @@ module.exports = class CraftingTable extends BaseModel
 
         @plan.on 'change', => @reset()
         @_step = 0
-        @_steps = []
 
         Object.defineProperties this, {
             hasNextStep: { get:@hasNextStep           }
@@ -36,29 +35,27 @@ module.exports = class CraftingTable extends BaseModel
     # Public Methods ###############################################################################
 
     reset: ->
-        @_compactSteps()
         @step = 0
-
         return this
 
     # Property Methods #############################################################################
 
     hasNextStep: ->
-        return @_step + 1 < @_steps.length
+        return @_step + 1 < @plan.steps.length
 
     hasPrevStep: ->
         return @_step > 0
 
     hasSteps: ->
-        return @_steps.length > 0
+        return @plan.steps.length > 0
 
     getMultiplier: ->
-        step = @_steps[@_step]
+        step = @plan.steps[@_step]
         return unless step?
         return step.multiplier
 
     getOutput: ->
-        step = @_steps[@_step]
+        step = @plan.steps[@_step]
         return unless step?
         return step.recipe.output[0]
 
@@ -66,20 +63,23 @@ module.exports = class CraftingTable extends BaseModel
         return @_step
 
     setStep: (newStep)->
-        newStep = Math.max 0, Math.min @_steps.length - 1, newStep
+        oldStep = @_step
+        newStep = Math.max 0, Math.min @plan.steps.length - 1, newStep
 
         @_step = newStep
-        @grid.recipe = @_steps[@_step]?.recipe
+        @grid.recipe = @plan.steps[@_step]?.recipe
+
+        @trigger 'change:step', this, oldStep, newStep
         @trigger 'change', this
 
         return this
 
     getStepCount: ->
-        return 0 unless @_steps?
-        return @_steps.length
+        return 0 unless @plan.steps?
+        return @plan.steps.length
 
     getToolNames: ->
-        recipe = @_steps[@_step]?.recipe
+        recipe = @plan.steps[@_step]?.recipe
         return '' unless recipe?
         toolSlugs = (stack.itemSlug for stack in recipe.tools)
         toolNames = (@modPack.findName(slug) for slug in toolSlugs).join ', '
@@ -89,18 +89,3 @@ module.exports = class CraftingTable extends BaseModel
 
     toString: ->
         return "#{@constructor.name} (#{@cid}) { plan:#{@plan}, step:#{@_step} }"
-
-    # Private Methods ##############################################################################
-
-    _compactSteps: ->
-        steps = {}
-
-        for recipe in @plan.steps
-            step = steps[recipe.name]
-            if not step?
-                steps[recipe.name] = multiplier:1, recipe:recipe
-            else
-                step.multiplier += 1
-
-        @_steps = (step for name, step of steps)
-        return this
diff --git a/src/scripts/models/inventory.coffee b/src/scripts/models/inventory.coffee
index 9bd90f373..b6124583d 100644
--- a/src/scripts/models/inventory.coffee
+++ b/src/scripts/models/inventory.coffee
@@ -22,23 +22,14 @@ module.exports = class Inventory extends BaseModel
     # Public Methods ###############################################################################
 
     add: (itemSlug, quantity=1)->
-        return if quantity is 0
-
-        stack = @_stacks[itemSlug]
-        if not stack?
-            stack = new Stack itemSlug:itemSlug, quantity:quantity
-            @_stacks[itemSlug] = stack
-            @_slugs.push itemSlug
-            @_slugs.sort()
-        else
-            stack.quantity += quantity
-
+        @_add itemSlug, quantity
         @trigger Event.add, this, itemSlug, quantity
         @trigger Event.change, this
         return this
 
     addInventory: (inventory)->
-        inventory.each (stack)=> @add stack.itemSlug, stack.quantity
+        inventory.each (stack)=> @_add stack.itemSlug, stack.quantity
+        @trigger Event.change, this
         return this
 
     clear: ->
@@ -122,3 +113,17 @@ module.exports = class Inventory extends BaseModel
 
         result.push '}'
         return result.join ''
+
+    # Private Methods ##############################################################################
+
+    _add: (itemSlug, quantity=1)->
+        return if quantity is 0
+
+        stack = @_stacks[itemSlug]
+        if not stack?
+            stack = new Stack itemSlug:itemSlug, quantity:quantity
+            @_stacks[itemSlug] = stack
+            @_slugs.push itemSlug
+            @_slugs.sort()
+        else
+            stack.quantity += quantity
diff --git a/src/scripts/models/recipe.coffee b/src/scripts/models/recipe.coffee
index a882e1f40..928f1c32f 100644
--- a/src/scripts/models/recipe.coffee
+++ b/src/scripts/models/recipe.coffee
@@ -20,7 +20,9 @@ module.exports = class Recipe extends BaseModel
         attributes.tools   ?= []
         super attributes, options
 
-    Object.defineProperty @prototype, 'name', get:-> @item.name
+        Object.defineProperties this,
+            'name': { get: -> @item.name }
+            'slug': { get: -> @item.slug }
 
     # Public Methods ###############################################################################