v0.15.3

Fixes

#28

Enhancement

#27

data-final-fixes.lua

@@ -160,6 +160,7 @@ local function build_groups()
 			local newgroup = {
 								type = "item-group",
 								icon = newicon,
+                                icon_size = 64,
 								inventory_order = group.inventory_order,
 								hidden = false,
 								name = group.name,

info.json

@@ -1,11 +1,11 @@
 {
 	"name": "ZRecycling",
-	"version": "0.15.2",
+	"version": "0.15.3",
 	"title": "Recycling Machines",
 	"author": "DRY411S",
 	"contact": "https://forums.factorio.com/ucp.php?i=pm&mode=compose&u=15698",
 	"homepage": "https://github.com/DRY411S/Recycling-Machines",
-	"description": "Recycling Machines that disassemble most items back into 100% of their recipe ingredients. Optionally, can be used with a Recycling Return trigger mod to reduce the percentage recycling return.",
+	"description": "Recycling Machines that disassemble most items back into their recipe ingredients. The percentage of ingredients returned from Recycling is a mod setting. Default is 100%.",
 	"factorio_version":"0.15",
-	"dependencies": ["base >= 0.15.5"]
+	"dependencies": ["base >= 0.15.11"]
 }

prototypes/entities.lua

@@ -1,4 +1,4 @@
--- Recycling Machine Entities based on 0.15.3
+-- Recycling Machine Entities based on factorio 0.15.3
 -- This is essentially a copy of the assembling machine entities
 -- Ingredients is always 1, so crafting categories are added to ensure that...
 -- If you can make it only in a level X machine, you can recycle it only at that level of recycling-machine
@@ -7,7 +7,6 @@
 --       instead of recycling only one type of a item at a time
 --       reverse-factory mod has this pretty much covered though
 
--- We need a special south facing pipe with a recycling logo on it for recycling-machine 2
 require ("prototypes.recyclingpipes")
 
 data:extend(
@@ -36,18 +35,17 @@ data:extend(
       layers =
       {
         {
-          -- filename = "__ZRecycling__/graphics/entity/recycling-machine-1/recycling-machine-1.png", -- a change from assembling machine
-          filename = "__base__/graphics/entity/assembling-machine-1/assembling-machine-1.png",
+          filename = "__ZRecycling__/graphics/entity/recycling-machine-1/recycling-machine-1.png", -- a change from assembling machine
+          -- filename = "__base__/graphics/entity/assembling-machine-1/assembling-machine-1.png",
           priority="high",
           width = 108,
           height = 114,
           frame_count = 32,
           line_length = 8,
           shift = util.by_pixel(0, 2),
           hr_version = {
-            -- TODO: HIGH RES GRAPHICS NEEDED
-            --filename = "__ZRecycling__/graphics/entity/recycling-machine-1/recycling-machine-1.png", -- a change from assembling machine
-            filename = "__base__/graphics/entity/assembling-machine-1/hr-assembling-machine-1.png",
+            filename = "__ZRecycling__/graphics/entity/recycling-machine-1/hr-recycling-machine-1.png", -- a change from assembling machine
+            --filename = "__base__/graphics/entity/assembling-machine-1/hr-assembling-machine-1.png",
             priority="high",
             width = 214,
             height = 226,
@@ -57,7 +55,6 @@ data:extend(
             scale = 0.5
           }
         },
-        -- TO DO: Need versions of these shadow graphics
         {
           filename = "__base__/graphics/entity/assembling-machine-1/assembling-machine-1-shadow.png",
           priority="high",
@@ -157,18 +154,17 @@ data:extend(
       layers =
       {
         {
-          -- filename = "__ZRecycling__/graphics/entity/recycling-machine-2/recycling-machine-2.png", -- a change from assembling machine
-          filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2.png",
+          filename = "__ZRecycling__/graphics/entity/recycling-machine-2/recycling-machine-2.png", -- a change from assembling machine
+          -- filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2.png",
           priority = "high",
           width = 108,
           height = 110,
           frame_count = 32,
           line_length = 8,
           shift = util.by_pixel(0, 4),
           hr_version = {
-            -- TO DO: Need high resolution graphics
-            --filename = "__ZRecycling__/graphics/entity/recycling-machine-2/recycling-machine-2.png", -- a change from assembling machine
-            filename = "__base__/graphics/entity/assembling-machine-2/hr-assembling-machine-2.png",
+            filename = "__ZRecycling__/graphics/entity/recycling-machine-2/hr-recycling-machine-2.png", -- a change from assembling machine
+            -- filename = "__base__/graphics/entity/assembling-machine-2/hr-assembling-machine-2.png",
             priority = "high",
             width = 214,
             height = 218,
@@ -179,7 +175,6 @@ data:extend(
           }
         },
         {
-          -- TO DO: Need shadow graphics
           filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-shadow.png",
           priority = "high",
           width = 98,
@@ -301,18 +296,17 @@ data:extend(
       layers =
       {
         {
-          --filename = "__ZRecycling__/graphics/entity/recycling-machine-3/recycling-machine-3.png", -- a change from assembling machine
-          filename = "__base__/graphics/entity/assembling-machine-3/assembling-machine-3.png",
+          filename = "__ZRecycling__/graphics/entity/recycling-machine-3/recycling-machine-3.png", -- a change from assembling machine
+          -- filename = "__base__/graphics/entity/assembling-machine-3/assembling-machine-3.png",
           priority = "high",
           width = 108,
           height = 119,
           frame_count = 32,
           line_length = 8,
           shift = util.by_pixel(0, -0.5),
           hr_version = {
-            -- TO DO: Need a high-res version
-            --filename = "__ZRecycling__/graphics/entity/recycling-machine-3/recycling-machine-3.png", -- a change from assembling machine
-            filename = "__base__/graphics/entity/assembling-machine-3/hr-assembling-machine-3.png",
+            filename = "__ZRecycling__/graphics/entity/recycling-machine-3/hr-recycling-machine-3.png", -- a change from assembling machine
+            -- filename = "__base__/graphics/entity/assembling-machine-3/hr-assembling-machine-3.png",
             priority = "high",
             width = 214,
             height = 237,
@@ -322,7 +316,7 @@ data:extend(
             scale = 0.5
           }
         },
-        {-- TO DO: Need shadow graphics
+        {
           filename = "__base__/graphics/entity/assembling-machine-3/assembling-machine-3-shadow.png",
           priority = "high",
           width = 130,

prototypes/item-groups.lua

@@ -5,6 +5,7 @@ data:extend(
     hidden = true,
 	name = "Recycling",
     icon = "__ZRecycling__/graphics/item-group/recycling.png",
+    icon_size = 64,
     inventory_order = "e",
     order = "e"
   },

prototypes/recyclingpipes.lua

@@ -1,37 +1,72 @@
+-- Copy of factorio 0.15.11 data\base\prototypes\entity\assemblerpipes.lua
+-- With changes commented
+
 function assembler2pipepictures()
   return
   {
     north =
     {
       filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-N.png",
       priority = "extra-high",
-      width = 41,
-      height = 40,
-      shift = {0.09375, 0.4375}
+      width = 35,
+      height = 18,
+      shift = util.by_pixel(2.5, 14),
+      hr_version = {
+        filename = "__base__/graphics/entity/assembling-machine-2/hr-assembling-machine-2-pipe-N.png",
+        priority = "extra-high",
+        width = 71,
+        height = 38,
+        shift = util.by_pixel(2.25, 13.5),
+        scale = 0.5,
+      }
     },
     east =
     {
       filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-E.png",
       priority = "extra-high",
-      width = 41,
-      height = 40,
-      shift = {-0.71875, 0}
+      width = 20,
+      height = 38,
+      shift = util.by_pixel(-25, 1),
+      hr_version = {
+        filename = "__base__/graphics/entity/assembling-machine-2/hr-assembling-machine-2-pipe-E.png",
+        priority = "extra-high",
+        width = 42,
+        height = 76,
+        shift = util.by_pixel(-24.5, 1),
+        scale = 0.5,
+      }
     },
     south =
     {
       filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-S.png",
       priority = "extra-high",
-      width = 41,
-      height = 40,
-      shift = {0.0625, -1}
+      width = 44,
+      height = 31,
+      shift = util.by_pixel(0, -31.5),
+      hr_version = {
+        filename = "__base__/graphics/entity/assembling-machine-2/hr-assembling-machine-2-pipe-S.png",
+        priority = "extra-high",
+        width = 88,
+        height = 61,
+        shift = util.by_pixel(0, -31.25),
+        scale = 0.5,
+      }
     },
     west =
     {
       filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-W.png",
       priority = "extra-high",
-      width = 41,
-      height = 40,
-      shift = {0.78125, 0.03125}
+      width = 19,
+      height = 37,
+      shift = util.by_pixel(25.5, 1.5),
+      hr_version = {
+        filename = "__base__/graphics/entity/assembling-machine-2/hr-assembling-machine-2-pipe-W.png",
+        priority = "extra-high",
+        width = 39,
+        height = 73,
+        shift = util.by_pixel(25.75, 1.25),
+        scale = 0.5,
+      }
     }
   }
 end
@@ -43,35 +78,67 @@ function assembler3pipepictures()
     {
       filename = "__base__/graphics/entity/assembling-machine-3/assembling-machine-3-pipe-N.png",
       priority = "extra-high",
-      width = 40,
-      height = 45,
-      shift = {0.03125, 0.3125}
+      width = 35,
+      height = 18,
+      shift = util.by_pixel(2.5, 14),
+      hr_version = {
+        filename = "__base__/graphics/entity/assembling-machine-3/hr-assembling-machine-3-pipe-N.png",
+        priority = "extra-high",
+        width = 71,
+        height = 38,
+        shift = util.by_pixel(2.25, 13.5),
+        scale = 0.5,
+      }
     },
     east =
     {
       filename = "__base__/graphics/entity/assembling-machine-3/assembling-machine-3-pipe-E.png",
       priority = "extra-high",
-      width = 40,
-      height = 45,
-      shift = {-0.78125, 0.15625}
+      width = 20,
+      height = 38,
+      shift = util.by_pixel(-25, 1),
+      hr_version = {
+        filename = "__base__/graphics/entity/assembling-machine-3/hr-assembling-machine-3-pipe-E.png",
+        priority = "extra-high",
+        width = 42,
+        height = 76,
+        shift = util.by_pixel(-24.5, 1),
+        scale = 0.5,
+      }
     },
     south =
     {
-      filename = "__ZRecycling__/graphics/entity/recycling-machine-3/pipe-south.png",
+      filename = "__ZRecycling__/graphics/entity/recycling-machine-3/recycling-machine-3-pipe-S.png",
+      -- Replaced filename = "__base__/graphics/entity/assembling-machine-3/assembling-machine-3-pipe-S.png",
       priority = "extra-high",
-      width = 40,
-      height = 45,
-      shift = {0.03125, -1.0625}
+      width = 44,
+      height = 31,
+      shift = util.by_pixel(0, -31.5),
+      hr_version = {
+        filename = "__ZRecycling__/graphics/entity/recycling-machine-3/hr-recycling-machine-3-pipe-S.png",
+        -- filename = "__base__/graphics/entity/assembling-machine-3/hr-assembling-machine-3-pipe-S.png",
+        priority = "extra-high",
+        width = 88,
+        height = 61,
+        shift = util.by_pixel(0, -31.25),
+        scale = 0.5,
+      }
     },
     west =
     {
       filename = "__base__/graphics/entity/assembling-machine-3/assembling-machine-3-pipe-W.png",
       priority = "extra-high",
-      width = 40,
-      height = 45,
-      shift = {0.8125, 0}
+      width = 19,
+      height = 37,
+      shift = util.by_pixel(25.5, 1.5),
+      hr_version = {
+        filename = "__base__/graphics/entity/assembling-machine-3/hr-assembling-machine-3-pipe-W.png",
+        priority = "extra-high",
+        width = 39,
+        height = 73,
+        shift = util.by_pixel(25.75, 1.25),
+        scale = 0.5,
+      }
     }
   }
-end
-
-
+end