diff --git a/changelog.txt b/changelog.txt index a0f9f72..0f2ee75 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,18 @@ +--------------------------------------------------------------------------------------------------- +Version: 0.1.12 +Date: 2020-07-15 + + Fixes: + - Fixed algorithm for recipes where both expensive and normal + ingredients or results have been added. + +--------------------------------------------------------------------------------------------------- +Version: 0.1.11 +Date: 2020-07-08 + + Fixes: + - Added locale key for sulfur fuel category. + --------------------------------------------------------------------------------------------------- Version: 0.1.10 Date: 2020-02-22 diff --git a/data-final-fixes.lua b/data-final-fixes.lua index bda9b86..c8d8228 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -1,5 +1,8 @@ require("factsheet") +adamo.opts.debugging = true +adamo.opts.logging = true + local binding_time_mult = 1 local binding_prod_mult = 5 local separation_time_mult = 1/2 @@ -238,11 +241,11 @@ local calcinate_recipe = function(recipe,mult) if type(mult) ~= "number" or mult <= 0 then mult = ore_norm end local calcined_recipe = util.table.deepcopy(recipe) + calcined_recipe.name = calcined_recipe.name.."-calcined" mult_recipe_energy( calcined_recipe,mult*time_norm/ore_norm ) mult_recipe_io(calcined_recipe,mult) - calcined_recipe.name = calcined_recipe.name.."-calcined" calcined_recipe.category = "adamo-chemical-firing" calcined_recipe.subgroup = "adamo-chemical-firing" if uses_ingredient(recipe,"iron-plate") then @@ -259,12 +262,11 @@ local calcinate_recipe = function(recipe,mult) "copper-ore" ) end - local toss,ore_count,toss = + local toss,iron_ore_count,toss = get_ingredient(calcined_recipe,"iron-ore") - if ore_count == 0 then - toss,ore_count,toss = - get_ingredient(calcined_recipe,"copper-ore") - end + local toss,copper_ore_count,toss = + get_ingredient(calcined_recipe,"copper-ore") + local ore_count = (iron_ore_count or 0) + (copper_ore_count or 0) if ore_count == 0 then toss,stone_count,toss = get_ingredient(calcined_recipe,"stone") diff --git a/factsheet.lua b/factsheet.lua index 1d66bcc..4371df9 120000 --- a/factsheet.lua +++ b/factsheet.lua @@ -1 +1 @@ -../factsheet.lua \ No newline at end of file +../../../factsheet.lua \ No newline at end of file diff --git a/locale/en/base.cfg b/locale/en/base.cfg index 7989b9e..c3193a0 100644 --- a/locale/en/base.cfg +++ b/locale/en/base.cfg @@ -39,4 +39,7 @@ adamo-chemical-screener=Name of screener entity adamo-chemical-still=Name of still entity adamo-chemical-kiln=Name of kiln entity adamo-chemical-reactor=Name of reactor entity -adamo-chemical-mixer=Name of mixer entity \ No newline at end of file +adamo-chemical-mixer=Name of mixer entity + +[fuel-category-name] +sulfur=Sulfur \ No newline at end of file