From 39aa2406296c99a33d978bc6d8b0d8785be815b4 Mon Sep 17 00:00:00 2001
From: Joey De Pauw <joeydepauw@gmail.com>
Date: Thu, 3 Oct 2019 12:06:47 +0200
Subject: [PATCH] recipe ideas

---
 better-air-filtering/data.lua                 |   1 +
 .../graphics/icons/fluid/pollution-gas.png    | Bin 0 -> 2077 bytes
 .../graphics/icons/fluid/pollution.png        | Bin 0 -> 1472 bytes
 better-air-filtering/prototypes/entity.lua    | 361 +++++++++---------
 better-air-filtering/prototypes/fluid.lua     |  27 ++
 better-air-filtering/prototypes/item.lua      |   2 +-
 better-air-filtering/prototypes/recipe.lua    | 233 ++++++-----
 7 files changed, 349 insertions(+), 275 deletions(-)
 create mode 100755 better-air-filtering/graphics/icons/fluid/pollution-gas.png
 create mode 100755 better-air-filtering/graphics/icons/fluid/pollution.png
 create mode 100644 better-air-filtering/prototypes/fluid.lua

diff --git a/better-air-filtering/data.lua b/better-air-filtering/data.lua
index 97d4fd6..3b86937 100644
--- a/better-air-filtering/data.lua
+++ b/better-air-filtering/data.lua
@@ -1,4 +1,5 @@
 require("prototypes.entity")
 require("prototypes.item")
+require("prototypes.fluid")
 require("prototypes.recipe")
 require("prototypes.technology")
diff --git a/better-air-filtering/graphics/icons/fluid/pollution-gas.png b/better-air-filtering/graphics/icons/fluid/pollution-gas.png
new file mode 100755
index 0000000000000000000000000000000000000000..801ae52d3ce8c531b77b1504b9e8ff67fec67719
GIT binary patch
literal 2077
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
Hu0mjf&1&p0

literal 0
HcmV?d00001

diff --git a/better-air-filtering/graphics/icons/fluid/pollution.png b/better-air-filtering/graphics/icons/fluid/pollution.png
new file mode 100755
index 0000000000000000000000000000000000000000..2bbc003f2ea6778de382dc0d497fc1bed191534f
GIT binary patch
literal 1472
zcmV;x1wZ<UP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;|c=_01y^uUnl?o1x-mr
zK~z}7)z{05WLF))@$Y%uN8PHrRn?EG>CQ~g7$daflPr7$;v<<5aN}kaF(IRppivwU
z5dsF(Ra7vzbRmKWuGD`(5l2wN;4CDPEX<h9IMuJ|p6aUV>iak^7d`8kRQCit`+Lsk
z{?70I?(YZ3Sl{~8@ATvRB0J6=YMzHe2x9;0YI5U>{&CLg53+dqk3;vjJM-)%=Y)&D
z|7G~qC~019HaZWwV1D(P!S|Z)2q1(Yo;d&FnMk?kyNgPS-UykPkB+C)FNF}qI}rh~
zw>|qttCK9Z`YC#`LN}Zc)_(huh3E2n3b_0B1FyoRZm+{)KO@UMQ4}!~#kuLE{@gu}
zz}{Z*MB0+et1AO~{fwj~QIQ~sN;q$yeTe7Ndj@#s;h(g;_fPlwu~=Q}(^+oN$TYEP
zP>2GL{ZPT~!}kObLJ+UNI=v95`aRu2oBm*tMms`ji9(};!&9q(zP!#wdE$WQKK*+o
zYc8j4AqUGnT6sp0P}d%71TGjnB?13v%+h;L9B}38pFe0NA4^-3W~W0lOOZifO9)1R
zmpDo)>V`&s?L+|=_?gI@`eu}<w9`q*^BlCMc7cQ1V@)6gg$V|Y$Kt=R&eNw(3}DlZ
zwF>*$xFN_o4ce_7r4(2YwMTeO?LA<zl%%kf5I=ch09V^Ddo6ouQ;;v@v|AZcD5~0H
zYmak|6ivVbH4`krGw<gstz!c|$@lXE{8LF3NOMiE+oh3aNGTDur#2NTxT7xxkD(^Q
zqTm6EzHn?nP~x#viL+4(NglJ1cZuT|=@h{PYFAK%f+83Ko<NPG=8#%~e0H7B%eeuM
z@<U;L{Zt~QR7oIfr6g&F5E0G@s@f84NgZZH!V&OzERK>$1b~kRT4(15jM!ST*oP`%
z@WK#D30C8#f@&0)PAjHnO64b*qZ$Ar5VS|e9;bafg2#??1s?zw2?p;f%4x-Tw`6;}
zV7NJDbbG|X;RNds3Bh4SKx&ARK)aXF$zrtDkH6Ug`pw&=_`?b-Dp%nT3N|*k>7}<=
zYzoS;VRPdq#lbGMEwLgHOF__*v>7p2%NcK2rlmc9o-f9)@ay_*10pzG28VTq!`T==
ztP!(>EZ!oNmRsZ3*_jO~Tty@VT5Ck4Xm>Nt+~3ES`^-i~H?-1}JG^~BK`8)ya2R74
zO=c8Dfflc!TwrSVsoV?=2nj+7nrY0+=_S_QJ>br*k{#jXK`>&jE0E|7g~b3e2nuH?
z{fJ2HLlD%#p$G^ekW!+xChxX5`@kxBw}lphTDVExaTTMva=>1z@m?UM6^d9WjI;;=
zA$XzyaCCT_L^RtCdV@uJ3th%{4%r*cFt&Vo`;Coit_TR^wFti%qwg~!fyfYRb+_c+
zEmWSP#A~H2Ep<7!c8XvG*Z(zScXKZoSN-NDe+qNW1w&q{PV->T!6%fGM2RGBD2NnE
z5|N|{jVz_pZL+em#F=v|EG{gtJ)H8|KQ`If-MT)mC*PTHeZB}BC8GVQfs08{>(Zt~
zLecF-^p=}+`(1k77AlTOV~w}4d1Ie9UfJQsaNE@N{&#Qjhw-ug1uygSJxzVdId|LF
zl2FFz(4d*++_y4d?f%o88Z3fSY~7sj?|*JF91fkScV9eY^4tH}<G<C;<$XN)5rO=r
zRAN1AM`X(l`u!HF5m8Q#60RB-?2T^EN;7+*<nTv3T(u_#09fbZ0`PSqxfI2EElJ~8
zs6bg2{;)nAm9DrVop~YPul<L=hPO23%rnoui$@v(xh7M+67Wj6YTuaZW(B)DycGC<
aTK@$<{%N|fyYFfM0000<MNUMnLSTZ_`nPfb

literal 0
HcmV?d00001

diff --git a/better-air-filtering/prototypes/entity.lua b/better-air-filtering/prototypes/entity.lua
index d1194fd..470133c 100644
--- a/better-air-filtering/prototypes/entity.lua
+++ b/better-air-filtering/prototypes/entity.lua
@@ -1,184 +1,195 @@
 data:extend({
-  {
-    type = "fuel-category",
-    name = "pollution-filter"
-  },
-  {
-    type = "assembling-machine",
-    name = "air-filter-machine",
-    icon = "__better-air-filtering__/graphics/icons/air-filter-machine.png",
-    icon_size = 32,
-    flags = {"placeable-neutral", "placeable-player", "player-creation"},
-    minable = {hardness = 0.2, mining_time = 0.5, result = "air-filter-machine"},
-    fast_replaceable_group = "air-filter-machine",
-    max_health = 150,
-    corpse = "big-remnants",
-    collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
-    selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
-    animation =
     {
-      filename = "__better-air-filtering__/graphics/entity/air-filter-machine.png",
-      priority = "high",
-      width = 99,
-      height = 102,
-      frame_count = 32,
-      line_length = 8,
-      shift = {0.4, -0.06}
+        type = "fuel-category",
+        name = "pollution-filter"
     },
-    open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 },
-    close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 },
-    working_sound =
     {
-      sound = { { filename = "__base__/sound/electric-furnace.ogg", volume = 0.7 } },
-      idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 },
-      apparent_volume = 1.5,
+        type = "assembling-machine",
+        name = "air-filter-machine",
+        icon = "__better-air-filtering__/graphics/icons/air-filter-machine.png",
+        icon_size = 32,
+        flags = { "placeable-neutral", "placeable-player", "player-creation" },
+        minable = { hardness = 0.2, mining_time = 0.5, result = "air-filter-machine" },
+        fast_replaceable_group = "air-filter-machine",
+        max_health = 150,
+        corpse = "medium-remnants",
+        alert_icon_shift = util.by_pixel(-3, -12),
+        collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } },
+        selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
+        animation =
+        {
+            filename = "__better-air-filtering__/graphics/entity/air-filter-machine.png",
+            priority = "high",
+            width = 99,
+            height = 102,
+            frame_count = 32,
+            line_length = 8,
+            shift = { 0.4, -0.06 }
+        },
+        open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 },
+        close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 },
+        working_sound =
+        {
+            sound = { { filename = "__base__/sound/electric-furnace.ogg", volume = 0.7 } },
+            idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 },
+            apparent_volume = 1.5,
+        },
+        fluid_boxes =
+        {
+            {
+                production_type = "input",
+                pipe_picture = assembler3pipepictures(),
+                pipe_covers = pipecoverspictures(),
+                base_area = 10,
+                base_level = -1,
+                pipe_connections = { { type = "input", position = { 0, -2 } } },
+                secondary_draw_orders = { north = -1 }
+            },
+            off_when_no_fluid_recipe = true
+        },
+        crafting_categories = { "crafting-air-filter" },
+        crafting_speed = 1.0,
+        energy_source =
+        {
+            type = "burner",
+            fuel_category = "pollution-filter",
+            usage_priority = "secondary-input",
+            fuel_inventory_size = 1,
+            burnt_inventory_size = 1,
+            emissions = -0.06
+        },
+        energy_usage = "1MW",
+        fixed_recipe = "filter-air",
+        ingredient_count = 1,
+        module_slots = 0,
+        allowed_effects=nill
     },
-    crafting_categories = {"crafting-air-filter"},
-    crafting_speed = 1.0,
-    energy_source =
     {
-      type = "burner",
-      fuel_category = "pollution-filter",
-      usage_priority = "secondary-input",
-      fuel_inventory_size = 1,
---      burnt_inventory_size = 1,
-      emissions = -0.06
+        type = "assembling-machine",
+        name = "air-filter-machine-mk2",
+        icon = "__better-air-filtering__/graphics/icons/air-filter-machine-mk2.png",
+        icon_size = 32,
+        flags = { "placeable-neutral", "placeable-player", "player-creation" },
+        minable = { hardness = 0.2, mining_time = 0.5, result = "air-filter-machine" },
+        fast_replaceable_group = "air-filter-machine",
+        max_health = 150,
+        corpse = "medium-remnants",
+        alert_icon_shift = util.by_pixel(-3, -12),
+        collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } },
+        selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
+        animation =
+        {
+            filename = "__better-air-filtering__/graphics/entity/air-filter-machine-mk2.png",
+            priority = "high",
+            width = 99,
+            height = 102,
+            frame_count = 32,
+            line_length = 8,
+            shift = { 0.4, -0.06 }
+        },
+        open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 },
+        close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 },
+        working_sound =
+        {
+            sound = { { filename = "__base__/sound/electric-furnace.ogg", volume = 0.7 } },
+            idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 },
+            apparent_volume = 1.5,
+        },
+        fluid_boxes =
+        {
+            {
+                production_type = "output",
+                pipe_picture = assembler3pipepictures(),
+                pipe_covers = pipecoverspictures(),
+                base_area = 10,
+                base_level = 1,
+                pipe_connections = { { type = "output", position = { 0, 2 } } },
+                secondary_draw_orders = { north = -1 }
+            },
+            off_when_no_fluid_recipe = true
+        },
+        crafting_categories = { "suck-air" },
+        crafting_speed = 1.0,
+        energy_source =
+        {
+            type = "electric",
+            usage_priority = "secondary-input",
+            emissions = -0.06
+        },
+        energy_usage = "1MW",
+        fixed_recipe = "suck-pollution",
+        ingredient_count = 1,
+        module_slots = 0,
+        allowed_effects=nill
     },
-    energy_usage = "1MW",
-    fixed_recipe="filter-air2",
-    ingredient_count = 1,
-    module_slots = 0
-  },
---  {
---    type = "furnace",
---    name = "air-filter-machine",
---    icon = "__better-air-filtering__/graphics/icons/air-filter-machine.png",
---    icon_size = 32,
---    flags = {"placeable-neutral", "placeable-player", "player-creation"},
---    minable = {hardness = 0.2, mining_time = 0.5, result = "air-filter-machine"},
---    fast_replaceable_group = "air-filter-machine",
---    max_health = 150,
---    corpse = "big-remnants",
---    collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
---    selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
---    animation =
---    {
---      filename = "__better-air-filtering__/graphics/entity/air-filter-machine.png",
---      priority = "high",
---      width = 99,
---      height = 102,
---      frame_count = 32,
---      line_length = 8,
---      shift = {0.4, -0.06}
---    },
---    open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 },
---    close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 },
---    working_sound =
---    {
---      sound = { { filename = "__base__/sound/electric-furnace.ogg", volume = 0.7 } },
---      idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 },
---      apparent_volume = 1.5,
---    },
---    crafting_categories = {"crafting-air-filter"},
---    source_inventory_size = 1,
---    result_inventory_size = 1,
---    crafting_speed = 1.0,
---    energy_source =
---    {
---      type = "electric",
---      usage_priority = "secondary-input",
---      emissions = -0.06
---    },
---    energy_usage = "200kW",
---    ingredient_count = 1,
---    module_slots = 0
---  },
-  {
-    type = "furnace",
-    name = "air-filter-machine-mk2",
-    icon = "__better-air-filtering__/graphics/icons/air-filter-machine-mk2.png",
-    icon_size = 32,
-    flags = {"placeable-neutral", "placeable-player", "player-creation"},
-    minable = {hardness = 0.2, mining_time = 0.5, result = "air-filter-machine-mk2"},
-    fast_replaceable_group = "air-filter-machine",
-    max_health = 150,
-    corpse = "big-remnants",
-    collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
-    selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
-    animation =
     {
-      filename = "__better-air-filtering__/graphics/entity/air-filter-machine-mk2.png",
-      priority = "high",
-      width = 99,
-      height = 102,
-      frame_count = 32,
-      line_length = 8,
-      shift = {0.4, -0.06}
-    },
-    open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 },
-    close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 },
-    working_sound =
-    {
-      sound = { { filename = "__base__/sound/electric-furnace.ogg", volume = 0.7 } },
-      idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 },
-      apparent_volume = 1.5,
-    },
-    crafting_categories = {"crafting-air-filter"},
-    source_inventory_size = 1,
-    result_inventory_size = 1,
-    crafting_speed = 2.0,
-    energy_source =
-    {
-      type = "electric",
-      usage_priority = "secondary-input",
-      emissions = -0.12
-    },
-    energy_usage = "350kW",
-    ingredient_count = 1,
-    module_slots = 0
-  },
-  {
-    type = "furnace",
-    name = "air-filter-machine-mk3",
-    icon = "__better-air-filtering__/graphics/icons/air-filter-machine-mk3.png",
-    icon_size = 32,
-    flags = {"placeable-neutral", "placeable-player", "player-creation"},
-    minable = {hardness = 0.2, mining_time = 0.5, result = "air-filter-machine-mk3"},
-    fast_replaceable_group = "air-filter-machine",
-    max_health = 150,
-    corpse = "big-remnants",
-    collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
-    selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
-    animation =
-    {
-      filename = "__better-air-filtering__/graphics/entity/air-filter-machine-mk3.png",
-      priority = "high",
-      width = 99,
-      height = 102,
-      frame_count = 32,
-      line_length = 8,
-      shift = {0.4, -0.06}
-    },
-    open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 },
-    close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 },
-    working_sound =
-    {
-      sound = { { filename = "__base__/sound/electric-furnace.ogg", volume = 0.7 } },
-      idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 },
-      apparent_volume = 1.5,
-    },
-    crafting_categories = {"crafting-air-filter"},
-    source_inventory_size = 1,
-    result_inventory_size = 1,
-    crafting_speed = 5.0,
-    energy_source =
-    {
-      type = "electric",
-      usage_priority = "secondary-input",
-      emissions = -0.3
-    },
-    energy_usage = "1MW",
-    ingredient_count = 1,
-    module_slots = 0
-  }
+        type = "assembling-machine",
+        name = "air-filter-machine-mk3",
+        icon = "__better-air-filtering__/graphics/icons/air-filter-machine-mk3.png",
+        icon_size = 32,
+        flags = { "placeable-neutral", "placeable-player", "player-creation" },
+        minable = { hardness = 0.2, mining_time = 0.5, result = "air-filter-machine-mk3" },
+        fast_replaceable_group = "air-filter-machine",
+        max_health = 150,
+        corpse = "medium-remnants",
+        collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } },
+        selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
+        animation =
+        {
+            filename = "__better-air-filtering__/graphics/entity/air-filter-machine-mk3.png",
+            priority = "high",
+            width = 99,
+            height = 102,
+            frame_count = 32,
+            line_length = 8,
+            shift = { 0.4, -0.06 }
+        },
+        open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 },
+        close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 },
+        working_sound =
+        {
+            sound = { { filename = "__base__/sound/electric-furnace.ogg", volume = 0.7 } },
+            idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 },
+            apparent_volume = 1.5,
+        },
+        fluid_boxes =
+        {
+            {
+                production_type = "input",
+                pipe_covers = pipecoverspictures(),
+                base_area = 10,
+                base_level = -1,
+                pipe_connections= {}
+            },
+            {
+                production_type = "input",
+                pipe_covers = pipecoverspictures(),
+                base_area = 10,
+                base_level = -1,
+                pipe_connections = {{ type="input", position = {0, -2} }}
+            },
+            {
+                production_type = "output",
+                pipe_picture = assembler3pipepictures(),
+                pipe_covers = pipecoverspictures(),
+                base_area = 10,
+                base_level = 1,
+                pipe_connections = { { type = "output", position = { 0, 2 } } },
+                secondary_draw_orders = { north = -1 }
+            },
+            off_when_no_fluid_recipe = true
+        },
+        crafting_categories = { "suck-air" },
+        crafting_speed = 5.0,
+        energy_source =
+        {
+            type = "electric",
+            usage_priority = "secondary-input",
+            emissions = -0.3
+        },
+        energy_usage = "1MW",
+        ingredient_count = 1,
+        module_slots = 0,
+        allowed_effects=nill
+    }
 })
diff --git a/better-air-filtering/prototypes/fluid.lua b/better-air-filtering/prototypes/fluid.lua
new file mode 100644
index 0000000..9ffbb09
--- /dev/null
+++ b/better-air-filtering/prototypes/fluid.lua
@@ -0,0 +1,27 @@
+data:extend({
+    {
+        type = "fluid",
+        name = "pollution",
+        default_temperature = 5,
+        max_temperature = 15,
+        base_color = {r=0.38, g=0.27, b=0.53},  -- 97, 69, 135
+        flow_color = {r=0.7, g=0.7, b=0.7},
+        icon = "__better-air-filtering__/graphics/icons/fluid/pollution.png",
+        icon_size = 32,
+        order = "a[fluid]-z[water]",
+        auto_barrel="false"
+    },
+    {
+        type = "fluid",
+        name = "pollution-gas",
+        default_temperature = 15,
+        max_temperature = 100,
+        gas_temperature = 15,
+        base_color = {r=0.38, g=0.27, b=0.53},  -- 97, 69, 135
+        flow_color = {r=0.7, g=0.7, b=0.7},
+        icon = "__base__/graphics/icons/fluid/pollution.png",
+        icon_size = 32,
+        order = "a[fluid]-z[water]",
+        auto_barrel="false"
+    }
+})
\ No newline at end of file
diff --git a/better-air-filtering/prototypes/item.lua b/better-air-filtering/prototypes/item.lua
index d1fca28..5612628 100644
--- a/better-air-filtering/prototypes/item.lua
+++ b/better-air-filtering/prototypes/item.lua
@@ -42,7 +42,7 @@ data:extend({
     order = "g[plastic-bar]-h[unused-air-filter]",
     stack_size = 50,
     fuel_category = "pollution-filter",
---    burnt_result = "used-air-filter",
+    burnt_result = "used-air-filter",
     fuel_value = "300MW",
   },
   {
diff --git a/better-air-filtering/prototypes/recipe.lua b/better-air-filtering/prototypes/recipe.lua
index cae67f5..32d50a4 100644
--- a/better-air-filtering/prototypes/recipe.lua
+++ b/better-air-filtering/prototypes/recipe.lua
@@ -1,115 +1,150 @@
 data:extend({
-  {
-    type = "recipe-category",
-    name = "crafting-air-filter"
-  },
-  {
-    type = "recipe",
-    name = "air-filter-machine",
-    icon = "__better-air-filtering__/graphics/icons/air-filter-machine.png",
-    icon_size = 32,
-    energy_required = 10.0,
-    enabled = "false",
-    ingredients =
     {
-      {"assembling-machine-2", 1},
-      {"electronic-circuit", 5},
-      {"steel-plate", 10}
+        type = "recipe-category",
+        name = "crafting-air-filter"
     },
-    result = "air-filter-machine"
-  },
-  {
-    type = "recipe",
-    name = "air-filter-machine-mk2",
-    icon = "__better-air-filtering__/graphics/icons/air-filter-machine-mk2.png",
-    icon_size = 32,
-    energy_required = 10.0,
-    enabled = "false",
-    ingredients =
     {
-      {"air-filter-machine", 2},
-      {"advanced-circuit", 10}
+        type = "recipe-category",
+        name = "suck-air"
     },
-    result = "air-filter-machine-mk2"
-  },
-  {
-    type = "recipe",
-    name = "air-filter-machine-mk3",
-    icon = "__better-air-filtering__/graphics/icons/air-filter-machine-mk3.png",
-    icon_size = 32,
-    energy_required = 10.0,
-    enabled = "false",
-    ingredients =
     {
-      {"air-filter-machine-mk2", 2},
-      {"processing-unit", 10}
+        type = "recipe",
+        name = "air-filter-machine",
+        icon = "__better-air-filtering__/graphics/icons/air-filter-machine.png",
+        icon_size = 32,
+        energy_required = 10.0,
+        enabled = "false",
+        ingredients =
+        {
+            { "assembling-machine-2", 1 },
+            { "electronic-circuit", 5 },
+            { "steel-plate", 10 }
+        },
+        result = "air-filter-machine"
     },
-    result = "air-filter-machine-mk3"
-  },
-  {
-    type = "recipe",
-    name = "unused-air-filter",
-    icon = "__better-air-filtering__/graphics/icons/unused-air-filter.png",
-    icon_size = 32,
-    category = "crafting",
-    subgroup = "raw-material",
-    order = "f[plastic-bar]-f[unused-air-filter]",
-    energy_required = 5,
-    enabled = "false",
-    ingredients =
     {
-      {"coal", 10},
-      {"plastic-bar", 4},
-      {"steel-plate", 2}
+        type = "recipe",
+        name = "air-filter-machine-mk2",
+        icon = "__better-air-filtering__/graphics/icons/air-filter-machine-mk2.png",
+        icon_size = 32,
+        energy_required = 10.0,
+        enabled = "false",
+        ingredients =
+        {
+            { "air-filter-machine", 2 },
+            { "advanced-circuit", 10 }
+        },
+        result = "air-filter-machine-mk2"
     },
-    result = "unused-air-filter"
-  },
-  {
-    type = "recipe",
-    name = "filter-air",
-    icon = "__better-air-filtering__/graphics/icons/filter-air.png",
-    icon_size = 32,
-    category = "crafting-air-filter",
-    order = "f[plastic-bar]-f[filter-air]",
-    energy_required = 100,
-    enabled = "false",
-    ingredients =
     {
-      {"unused-air-filter", 1}
+        type = "recipe",
+        name = "air-filter-machine-mk3",
+        icon = "__better-air-filtering__/graphics/icons/air-filter-machine-mk3.png",
+        icon_size = 32,
+        energy_required = 10.0,
+        enabled = "false",
+        ingredients =
+        {
+            { "air-filter-machine-mk2", 2 },
+            { "processing-unit", 10 }
+        },
+        result = "air-filter-machine-mk3"
     },
-    result = "used-air-filter"
-  },
-  {
-    type = "recipe",
-    name = "filter-air2",
-    icon = "__better-air-filtering__/graphics/icons/filter-air.png",
-    icon_size = 32,
-    category = "crafting-air-filter",
-    subgroup = "raw-material",
-    order = "f[plastic-bar]-f[filter-air]",
-    energy_required = 5,
-    enabled = "true",
-    ingredients =
     {
-
+        type = "recipe",
+        name = "unused-air-filter",
+        icon = "__better-air-filtering__/graphics/icons/unused-air-filter.png",
+        icon_size = 32,
+        category = "crafting",
+        subgroup = "raw-material",
+        order = "f[plastic-bar]-f[unused-air-filter]",
+        energy_required = 5,
+        enabled = "false",
+        ingredients =
+        {
+            { "coal", 10 },
+            { "plastic-bar", 4 },
+            { "steel-plate", 2 }
+        },
+        result = "unused-air-filter"
     },
-    result = "used-air-filter"
-  },
-  {
-    type = "recipe",
-    name = "air-filter-recycling",
-    icon = "__better-air-filtering__/graphics/icons/air-filter-recycling.png",
-    icon_size = 32,
-    category = "crafting",
-    subgroup = "raw-material",
-    order = "f[unused-air-filter]-f[air-filter-recycling]",
-    energy_required = 5,
-    enabled = "false",
-    ingredients =
     {
-      {"used-air-filter", 1},
-      {"coal", 5}
+        type = "recipe",
+        name = "filter-air",
+        icon = "__better-air-filtering__/graphics/icons/filter-air.png",
+        icon_size = 32,
+        category = "crafting-air-filter",
+        subgroup = "raw-material",
+        order = "f[plastic-bar]-f[filter-air]",
+        energy_required = 0.5,
+        enabled = "true",
+        ingredients =
+        {
+            {type="fluid", name="pollution-gas", amount=2}
+        },
+        results = {}
     },
-    result = "unused-air-filter"
-  }
+    {
+        type = "recipe",
+        name = "suck-pollution",
+        category = "suck-air",
+        subgroup = "raw-material",
+        order = "f[plastic-bar]-f[filter-air]",
+        energy_required = 0.5,
+        enabled = "true",
+        ingredients =
+        {
+        },
+        results = {{type="fluid", name="pollution-gas", amount=4}}
+    },
+    {
+        type = "recipe",
+        name = "liquid-pollution",
+--        icon = "__better-air-filtering__/graphics/icons/filter-air.png",
+--        icon_size = 32,
+        category = "suck-air",
+        subgroup = "raw-material",
+        order = "f[plastic-bar]-f[filter-air]",
+        energy_required = 0.5,
+        enabled = "true",
+        ingredients =
+        {
+            {type="fluid", name="pollution-gas", amount=6, fluidbox_index=1},
+            {type="fluid", name="water", amount=10, fluidbox_index=2}
+        },
+        results = {{type="fluid", name="pollution", amount=10}}
+    },
+--    {
+--        type = "recipe",
+--        name = "debug-pollution",
+----        icon = "__base__/graphics/icons/pollution.png",
+----        icon_size = 32,
+--        category = "crafting-with-fluid",
+--        subgroup = "raw-material",
+--        order = "f[plastic-bar]-f[filter-air]",
+--        energy_required = 1,
+--        enabled = "true",
+--        ingredients =
+--        {
+--
+--        },
+--        results = {{type="fluid", name="pollution-gas", amount=10}}
+--    },
+    {
+        type = "recipe",
+        name = "air-filter-recycling",
+        icon = "__better-air-filtering__/graphics/icons/air-filter-recycling.png",
+        icon_size = 32,
+        category = "crafting",
+        subgroup = "raw-material",
+        order = "f[unused-air-filter]-f[air-filter-recycling]",
+        energy_required = 5,
+        enabled = "false",
+        ingredients =
+        {
+            { "used-air-filter", 1 },
+            { "coal", 5 }
+        },
+        result = "unused-air-filter"
+    }
 })