diff --git a/better-air-filtering/graphics/icons/air-filter-recycling.png b/better-air-filtering/graphics/icons/air-filter-recycling.png deleted file mode 100644 index 3b9207e..0000000 Binary files a/better-air-filtering/graphics/icons/air-filter-recycling.png and /dev/null differ diff --git a/better-air-filtering/graphics/icons/fluid/pollution.png b/better-air-filtering/graphics/icons/fluid/pollution.png index bcf0db0..628432e 100755 Binary files a/better-air-filtering/graphics/icons/fluid/pollution.png and b/better-air-filtering/graphics/icons/fluid/pollution.png differ diff --git a/better-air-filtering/graphics/icons/fluid/pollution2.png b/better-air-filtering/graphics/icons/fluid/pollution2.png new file mode 100755 index 0000000..bcf0db0 Binary files /dev/null and b/better-air-filtering/graphics/icons/fluid/pollution2.png differ diff --git a/better-air-filtering/graphics/icons/filter-air.png b/better-air-filtering/graphics/icons/recipe/filter-air.png similarity index 100% rename from better-air-filtering/graphics/icons/filter-air.png rename to better-air-filtering/graphics/icons/recipe/filter-air.png diff --git a/better-air-filtering/graphics/icons/recipe/recycle.png b/better-air-filtering/graphics/icons/recipe/recycle.png new file mode 100644 index 0000000..ce4e3b8 Binary files /dev/null and b/better-air-filtering/graphics/icons/recipe/recycle.png differ diff --git a/better-air-filtering/graphics/icons/unused-liquid-filter.png b/better-air-filtering/graphics/icons/unused-liquid-filter.png new file mode 100644 index 0000000..87084c7 Binary files /dev/null and b/better-air-filtering/graphics/icons/unused-liquid-filter.png differ diff --git a/better-air-filtering/graphics/icons/used-liquid-filter.png b/better-air-filtering/graphics/icons/used-liquid-filter.png new file mode 100644 index 0000000..a584519 Binary files /dev/null and b/better-air-filtering/graphics/icons/used-liquid-filter.png differ diff --git a/better-air-filtering/prototypes/item.lua b/better-air-filtering/prototypes/item.lua index f778303..335aaa0 100644 --- a/better-air-filtering/prototypes/item.lua +++ b/better-air-filtering/prototypes/item.lua @@ -69,7 +69,27 @@ data:extend({ icon_size = 32, flags = {}, subgroup = "raw-material", - order = "h[unused-air-filter]-i[used-air-filter]", + order = "g[plastic-bar]-i[used-air-filter]", + stack_size = 50 + }, + { + type = "item", + name = "unused-liquid-filter", + icon = "__better-air-filtering__/graphics/icons/unused-liquid-filter.png", + icon_size = 32, + flags = {}, + subgroup = "raw-material", + order = "g[plastic-bar]-j[unused-liquid-filter]", + stack_size = 50 + }, + { + type = "item", + name = "used-liquid-filter", + icon = "__better-air-filtering__/graphics/icons/used-liquid-filter.png", + icon_size = 32, + flags = {}, + subgroup = "raw-material", + order = "g[plastic-bar]-k[used-liquid-filter]", stack_size = 50 } }) diff --git a/better-air-filtering/prototypes/recipe.lua b/better-air-filtering/prototypes/recipe.lua index 9b7ff0e..6d3cf6f 100644 --- a/better-air-filtering/prototypes/recipe.lua +++ b/better-air-filtering/prototypes/recipe.lua @@ -78,8 +78,8 @@ data:extend({ { type = "recipe", name = "filter-air", - hide_from_player_crafting=true, - icon = "__better-air-filtering__/graphics/icons/filter-air.png", + hide_from_player_crafting = true, + icon = "__better-air-filtering__/graphics/icons/recipe/filter-air.png", icon_size = 32, category = "air-filtering-basic", subgroup = "raw-material", @@ -88,15 +88,15 @@ data:extend({ enabled = "true", ingredients = { - {type="fluid", name="pollution", amount=2, fluidbox_index=1} + { type = "fluid", name = "pollution", amount = 2, fluidbox_index = 1 } }, results = {} }, { type = "recipe", name = "filter-air2", - hide_from_player_crafting=true, - icon = "__better-air-filtering__/graphics/icons/filter-air.png", + hide_from_player_crafting = true, + icon = "__better-air-filtering__/graphics/icons/recipe/filter-air.png", icon_size = 32, category = "air-filtering-advanced", subgroup = "raw-material", @@ -105,15 +105,15 @@ data:extend({ enabled = "true", ingredients = { - {type="fluid", name="pollution", amount=25, fluidbox_index=1}, - {type="item", name="unused-air-filter", amount=1}, + { type = "fluid", name = "pollution", amount = 25, fluidbox_index = 1 }, + { type = "item", name = "unused-air-filter", amount = 1 }, }, - results = {{type="item", name="used-air-filter", amount=1}} + results = { { type = "item", name = "used-air-filter", amount = 1 } } }, { type = "recipe", name = "liquid-pollution", - hide_from_player_crafting=true, + hide_from_player_crafting = true, category = "air-filtering-advanced", subgroup = "raw-material", order = "f[plastic-bar]-f[filter-air]", @@ -121,14 +121,25 @@ data:extend({ enabled = "true", ingredients = { - {type="fluid", name="pollution", amount=6, fluidbox_index=1}, - {type="fluid", name="water", amount=10, fluidbox_index=2} + { type = "fluid", name = "pollution", amount = 6, fluidbox_index = 1 }, + { type = "fluid", name = "water", amount = 10, fluidbox_index = 2 } }, - results = {{type="fluid", name="polluted-water", amount=10}} + results = { { type = "fluid", name = "polluted-water", amount = 10 } } }, { type = "recipe", name = "air-filter-recycling", + icons = { + { + icon = "__better-air-filtering__/graphics/icons/used-air-filter.png" + }, + { + icon = "__better-air-filtering__/graphics/icons/recipe/recycle.png", + scale = 0.6, + shift = { 6, 6 } + }, + }, + icon_size = 32, category = "crafting", subgroup = "raw-material", order = "f[unused-air-filter]-f[air-filter-recycling]",