craftingguide/website
1
0
Fork 0
Code Pull Requests Actions Activity

Fix algo. for new Agricraft version

Browse Source
This commit is contained in:
Andrew Miner
2016-12-28 18:14:34 -08:00
parent c0472b268d
commit 5d8251bebb
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/models/crafting/crafting_step.coffee
+1 -1
View File
@@ -68,6 +68,6 @@ module.exports = class CraftingStep
@_inventory = new SimpleInventory @_inventory = new SimpleInventory
for stack in @_recipe.input for stack in @_recipe.input
qualifiedSlug = @_modPack.qualifySlug stack.itemSlug qualifiedSlug = @_modPack.qualifySlug stack.itemSlug
required = @_recipe.getQuantityRequired(stack.itemSlug) - @_recipe.getQuantityProduced(stack.itemSlug) required = @_recipe.getQuantityRequired(stack.itemSlug)
required = if required > 0 then required * @multiplier else 1 required = if required > 0 then required * @multiplier else 1
@_inventory.add qualifiedSlug, required @_inventory.add qualifiedSlug, required
src/client/models/game/mod_version.coffee
+2 -1
View File
@@ -152,7 +152,8 @@ module.exports = class ModVersion extends BaseModel
if recipe.itemSlug.matches itemSlug if recipe.itemSlug.matches itemSlug
primaryRecipes.push recipe primaryRecipes.push recipe
else if recipe.produces itemSlug else if recipe.produces itemSlug
otherRecipes.push recipe if not recipe.requires itemSlug
otherRecipes.push recipe
for recipe in primaryRecipes for recipe in primaryRecipes
result.push recipe result.push recipe
src/client/models/game/recipe.coffee
+1 -1
View File
@@ -111,7 +111,7 @@ module.exports = class Recipe extends BaseModel
return result return result
isPassThroughFor: (itemSlug)-> isPassThroughFor: (itemSlug)->
return @getQuantityProduced(itemSlug) is @getQuantityRequired(itemSlug) return @getQuantityProduced(itemSlug) > 0 and @getQuantityRequired(itemSlug) > 0
produces: (itemSlug)-> produces: (itemSlug)->
if not @_produces? if not @_produces?
src/common/constants.coffee
+1 -1
View File
@@ -33,7 +33,7 @@ exports.defaultMods = defaultMods = {}
defaultMods.minecraft = { defaultVersion: '1.7.10' } # Minecraft must be first defaultMods.minecraft = { defaultVersion: '1.7.10' } # Minecraft must be first
defaultMods.advanced_solar_panels = { defaultVersion: '3.5.1' } defaultMods.advanced_solar_panels = { defaultVersion: '3.5.1' }
defaultMods.agricraft = { defaultVersion: '1.4.6' } defaultMods.agricraft = { defaultVersion: '1.7.10_1.5.0' }
defaultMods.applied_energistics_2 = { defaultVersion: 'rv1-stable-1' } defaultMods.applied_energistics_2 = { defaultVersion: 'rv1-stable-1' }
defaultMods.big_reactors = { defaultVersion: '0.4.2A2' } defaultMods.big_reactors = { defaultVersion: '0.4.2A2' }
defaultMods.buildcraft = { defaultVersion: '1.7.18' } defaultMods.buildcraft = { defaultVersion: '1.7.18' }