up

data-util.lua

@@ -65,9 +65,11 @@ function util.fe_plus(sub)
 end
 
 function util.get_stack_size(default) 
-  if mods["Krastorio2"] then
+  if mods.Krastorio2 then
-    size = tonumber(krastorio.general.getSafeSettingValue("kr-stack-size"))
+    local size = get_setting("kr-stack-size")
-    return size or default
+    if size then
+      return tonumber(size)
+    end
   end
   return default
 end
@@ -312,7 +314,7 @@ function util.add_unlock(technology_name, recipe)
 end
 
 -- Check if a tech unlocks a recipe
-function util.check_unlock(technology_name, recipe)
+function util.check_unlock(technology_name, recipe_name)
   local technology = data.raw.technology[technology_name]
   if technology and technology.effects then
     for i, effect in pairs(technology.effects) do
@@ -630,6 +632,40 @@ function remove_ingredient(recipe, old)
   end
 end
 
+-- Replace an amount of a product, leaving at least 1 of old
+function util.replace_some_product(recipe_name, old, old_amount, new, new_amount, options)
+  if not should_force(options) and bypass(recipe_name) then return end
+  local is_fluid = not not data.raw.fluid[new]  -- NOTE CURRENTLY UNUSUED
+  if data.raw.recipe[recipe_name] and (data.raw.item[new] or is_fluid) then
+    me.add_modified(recipe_name)
+    replace_some_product(data.raw.recipe[recipe_name], old, old_amount, new, new_amount, is_fluid)
+    replace_some_product(data.raw.recipe[recipe_name].normal, old, old_amount, new, new_amount, is_fluid)
+    replace_some_product(data.raw.recipe[recipe_name].expensive, old, old_amount, new, new_amount, is_fluid)
+  end
+end
+
+function replace_some_product(recipe, old, old_amount, new, new_amount)
+	if recipe ~= nil then
+    if recipe.result == new then return end
+    if recipe.results then
+      for i, existing in pairs(recipe.results) do
+        if existing[1] == new or existing.name == new then
+          return
+        end
+      end
+    end
+    add_product(recipe, {new, new_amount})
+		for i, product in pairs(recipe.results) do 
+			if product.name == old then
+        product.amount = math.max(1, product.amount - old_amount)
+      end
+			if product[1] == old then
+        product[2] = math.max(1, product[2] - old_amount)
+      end
+		end
+	end
+end
+
 -- Replace an amount of an ingredient in a recipe. Keep at least 1 of old.
 function util.replace_some_ingredient(recipe_name, old, old_amount, new, new_amount, options)
   if not should_force(options) and bypass(recipe_name) then return end
@@ -716,6 +752,8 @@ function multiply_recipe(recipe, multiple)
   if recipe then
     if recipe.energy_required then
       recipe.energy_required = recipe.energy_required * multiple
+    else
+      recipe.energy_required = 0.5 * multiple  -- 0.5 is factorio default
     end
     if recipe.result_count then
       recipe.result_count = recipe.result_count * multiple
@@ -819,13 +857,13 @@ end
 function util.replace_product(recipe_name, old, new, options)
   if not should_force(options) and bypass(recipe_name) then return end
   if data.raw.recipe[recipe_name] then
-    replace_product(data.raw.recipe[recipe_name], old, new)
+    replace_product(data.raw.recipe[recipe_name], old, new, options)
-    replace_product(data.raw.recipe[recipe_name].normal, old, new)
+    replace_product(data.raw.recipe[recipe_name].normal, old, new, options)
-    replace_product(data.raw.recipe[recipe_name].expensive, old, new)
+    replace_product(data.raw.recipe[recipe_name].expensive, old, new, options)
   end
 end
 
-function replace_product(recipe, old, new)
+function replace_product(recipe, old, new, options)
   if recipe then
     if recipe.main_product == old then
       recipe.main_product = new
@@ -947,11 +985,27 @@ function util.add_icon(recipe_name, icon, options)
   if data.raw.recipe[recipe_name] then
     me.add_modified(recipe_name)
     if not (data.raw.recipe[recipe_name].icons and #(data.raw.recipe[recipe_name].icons) > 0) then
-      data.raw.recipe[recipe_name].icons = {{
+      log("BZZN")
-        icon=data.raw.recipe[recipe_name].icon,
+      log(serpent.dump(data.raw.recipe[recipe_name]))
-        icon_size=data.raw.recipe[recipe_name].icon_size,
+      if data.raw.recipe[recipe_name].icon then
-        icon_mipmaps=data.raw.recipe[recipe_name].icon_mipmaps,
+        data.raw.recipe[recipe_name].icons = {{
-      }}
+          icon=data.raw.recipe[recipe_name].icon,
+          icon_size=data.raw.recipe[recipe_name].icon_size,
+          icon_mipmaps=data.raw.recipe[recipe_name].icon_mipmaps,
+        }}
+      elseif data.raw.item[data.raw.recipe[recipe_name].main_product] then
+        data.raw.recipe[recipe_name].icons = {{
+          icon=data.raw.item[data.raw.recipe[recipe_name].main_product].icon,
+          icon_size=data.raw.item[data.raw.recipe[recipe_name].main_product].icon_size,
+          icon_mipmaps=data.raw.item[data.raw.recipe[recipe_name].main_product].icon_mipmaps,
+        }}
+      elseif data.raw.item[data.raw.recipe[recipe_name].result] then
+        data.raw.recipe[recipe_name].icons = {{
+          icon=data.raw.item[data.raw.recipe[recipe_name].result].icon,
+          icon_size=data.raw.item[data.raw.recipe[recipe_name].result].icon_size,
+          icon_mipmaps=data.raw.item[data.raw.recipe[recipe_name].result].icon_mipmaps,
+        }}
+      end
       data.raw.recipe[recipe_name].icon = nil
       data.raw.recipe[recipe_name].icon_size = nil
     end
@@ -1161,7 +1215,7 @@ function remove_prior_unlocks(tech, recipe)
     util.remove_recipe_effect(tech, recipe)
     if technology.prerequisites then
       for i, prerequisite in pairs(technology.prerequisites) do
-        -- log("BZZZ removing prior unlocks for " .. tech ..", checking " .. prerequisite) -- Handy Debug :|
+        log("BZZZ removing prior unlocks for " .. recipe .. " from " .. tech ..", checking " .. prerequisite) -- Handy Debug :|
         remove_prior_unlocks(prerequisite, recipe)
       end
     end