updates to deadlock stacking

changelog.txt

@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.4.1
+Date: 2021-02-28
+  Features:
+    - Deadlock stacking and crating, with thanks to GeneralTank
+---------------------------------------------------------------------------------------------------
 Version: 0.4.0
 Date: 2021-02-27
   Features:

data-final-fixes.lua

@@ -1 +1 @@
--- require("silicon-recipe-final")
+require("deadlock-stacking")

deadlock-stacking.lua

@@ -1,13 +1,15 @@
 -- Deadlock stacking recipes
+local util = require("__bzsilicon__.util");
+
 if deadlock then
-  deadlock.add_stack("silica",  nil, "deadlock-stacking-1", 64)
-  deadlock.add_stack("optical-fiber", nil, "deadlock-stacking-2", 64)
+  deadlock.add_stack("silica", "__bzsilicon__/graphics/icons/silica-stacked.png" , "deadlock-stacking-1", 64)
+  deadlock.add_stack("optical-fiber", "__bzsilicon__/graphics/icons/optical-fiber-stacked.png" , "deadlock-stacking-2", 32)
   if not mods["Krastorio2"] then
-    deadlock.add_stack("silicon", nil, "deadlock-stacking-2", 64)
+    deadlock.add_stack("silicon", "__bzsilicon__/graphics/icons/silicon-stacked.png" , "deadlock-stacking-2", 64)
   end
-  if settings.startup["bzsilicon-more-intermediates"].value  == "yes" then
-    deadlock.add_stack("silicon-wafer", nil, "deadlock-stacking-2", 64)
-    deadlock.add_stack("solar-cell", nil, "deadlock-stacking-2", 64)
+  if util.more_intermediates() then
+    deadlock.add_stack("silicon-wafer", "__bzsilicon__/graphics/icons/silicon-wafer-stacked.png" , "deadlock-stacking-2", 64)
+    deadlock.add_stack("solar-cell", "__bzsilicon__/graphics/icons/solar-cell-stacked.png" , "deadlock-stacking-2", 64)
   end
 end
 
@@ -18,7 +20,7 @@ if deadlock_crating then
   if not mods["Krastorio2"] then
     deadlock_crating.add_crate("silicon", "deadlock-crating-2")
   end
-   if settings.startup["bzsilicon-more-intermediates"].value  == "yes" then
+  if util.more_intermediates() then
     deadlock_crating.add_crate("silicon-wafer", "deadlock-crating-2", 64)
     deadlock_crating.add_crate("solar-cell", "deadlock-crating-2", 64)
   end

info.json

@@ -1,6 +1,6 @@
 {
     "name": "bzsilicon",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "factorio_version": "1.1",
     "title": "Silica & Silicon",
     "author": "Brevven",