technology and updated filter icon

better-air-filtering/control.lua

@@ -457,8 +457,6 @@ function onEntityRemoved(event)
         game.print("Dispersing " .. pollution .. " pollution back")
         event.entity.surface.pollute(event.entity.position, pollution)
     end
-
-    -- TODO disperse contents when recipe changes
 end
 
 function preEntityRemoved(event)
@@ -542,4 +540,3 @@ script.on_configuration_changed(init)
 
 
 
-

better-air-filtering/locale/en/air-filtering.cfg

@@ -3,8 +3,14 @@ air-filter-machine-1=Air filter machine 1
 air-filter-machine-2=Air filter machine 2
 air-filter-machine-3=Air filter machine 3
 
+[entity-description]
+air-filter-machine-1=Passive air filter that reduces pollution in the current chunk using air filters.
+air-filter-machine-2=A stronger air filter that uses electricity to pull pollution towards it from a 2 chunk radius.
+air-filter-machine-3=An even stronger air filter, capable of cleaning pollution in a 3 chunk radius.
+
+
 [item-name]
-expendable-air-filter=Expendable air FIlter
+expendable-air-filter=Expendable air filter
 air-filter=Air filter
 used-air-filter=Used air filter
 liquid-filter=Liquid filter
@@ -15,20 +21,20 @@ used-liquid-filter=Used liquid filter
 pollution=Pollution
 polluted-water=Polluted Water
 
+
 [recipe-name]
 filter-air=Filter air
 filter-air2=Filter air
-liquid-pollution="Condense pollution"
+liquid-pollution=Condense pollution
 air-filter-recycling=Recycle used air filter
 
+
 [technology-name]
-air-filtering=Air filtering 1
+air-filtering=Air filtering
-air-filtering-2=Air filtering 2
+air-filter-recycling=Recycle used air filters
-air-filtering-3=Air filtering 3
-air-filter-recycling=Recycle used air filter
 
 [technology-description]
-air-filtering=Enables the crafting of Air Filter Machines to improve air quality by reducing pollution
+air-filtering-1=Enables the crafting of passive Air Filter Machines to improve air quality by reducing pollution.
-air-filtering-2=Improved versions of the Air Filter Machines can filter the air better. Has increased power and air filter consumption.
+air-filtering-2=A stronger air filter that uses electricity to pull pollution towards it from a 2 chunk radius.
-air-filtering-3=The fastest alternative for cleaning the air but at the cost of a high amount of power. It also uses air filters much more quickly.
+air-filtering-3=An even stronger air filter, capable of cleaning pollution in a 3 chunk radius.
 air-filter-recycling=Used air filters can be reused after being recycled by using a bit of coal to refill them.

better-air-filtering/prototypes/entity.lua

@@ -68,7 +68,7 @@ data:extend({
             fuel_inventory_size = 1,
             burnt_inventory_size = 1,
         },
-        energy_usage = "100kW",
+        energy_usage = "50kW",
         fixed_recipe = "filter-air",
         ingredient_count = 1,
         return_ingredients_on_change = true,
@@ -160,6 +160,7 @@ data:extend({
             drain="100kW",
         },
         energy_usage = "50kW",
+        fixed_recipe = "filter-air2",
         ingredient_count = 2,
         return_ingredients_on_change = true,
         module_slots = 0,
@@ -248,6 +249,7 @@ data:extend({
             drain="200kW",
         },
         energy_usage = "100kW",
+        fixed_recipe = "filter-air2",
         ingredient_count = 2,
         return_ingredients_on_change = true,
         module_slots = 0,

better-air-filtering/prototypes/item.lua

@@ -47,7 +47,7 @@ data:extend({
         stack_size = 10,
         fuel_category = "pollution-filter",
         burnt_result = nil,
-        fuel_value = "60MW",
+        fuel_value = "30MW",
     },
     {
         type = "item",
@@ -60,7 +60,7 @@ data:extend({
         stack_size = 50,
         fuel_category = "pollution-filter",
         burnt_result = "used-air-filter",
-        fuel_value = "120MW",
+        fuel_value = "60MW",
     },
     {
         type = "item",

better-air-filtering/prototypes/recipe.lua

@@ -14,9 +14,8 @@ data:extend({
         enabled = false,
         ingredients =
         {
-            { "assembling-machine-2", 1 },
+            { "assembling-machine-1", 1 },
-            { "electronic-circuit", 5 },
+            { "electronic-circuit", 5 }
-            { "steel-plate", 10 }
         },
         result = "air-filter-machine-1"
     },
@@ -28,6 +27,7 @@ data:extend({
         ingredients =
         {
             { "air-filter-machine-1", 2 },
+            { "steel-plate", 10 },
             { "advanced-circuit", 10 }
         },
         result = "air-filter-machine-2"
@@ -49,9 +49,9 @@ data:extend({
         name = "expendable-air-filter",
         category = "crafting",
         subgroup = "raw-material",
-        order = "f[plastic-bar]-f[expendable-air-filter]",
+        order = "f[plastic-bar]-a[expendable-air-filter]",
         energy_required = 2,
-        enabled = true,
+        enabled = false,
         ingredients =
         {
             { "coal", 5 },
@@ -64,9 +64,9 @@ data:extend({
         name = "air-filter",
         category = "crafting",
         subgroup = "raw-material",
-        order = "f[plastic-bar]-f[air-filter]",
+        order = "f[plastic-bar]-b[air-filter]",
         energy_required = 5,
-        enabled = true,
+        enabled = false,
         ingredients =
         {
             { "coal", 10 },
@@ -94,15 +94,16 @@ data:extend({
         icon_size = 32,
         category = "crafting",
         subgroup = "raw-material",
-        order = "f[air-filter]-f[air-filter-recycling]",
+        order = "f[plastic-bar]-c[air-filter-recycling]",
         energy_required = 2,
-        enabled = true,
+        enabled = false,
         ingredients =
         {
             { "used-air-filter", 1 },
             { "coal", 5 }
         },
-        result = "air-filter"
+        result = "air-filter",
+        main_product = ""
     },
     {
         type = "recipe",
@@ -121,9 +122,9 @@ data:extend({
         icon_size = 32,
         category = "air-filtering-basic",
         subgroup = "raw-material",
-        order = "f[plastic-bar]-f[filter-air]",
+        order = "a[filter-air]",
         energy_required = 1,
-        enabled = true,
+        enabled = false,
         ingredients =
         {
             { type = "fluid", name = "pollution", amount = 2, fluidbox_index = 1 }
@@ -147,15 +148,16 @@ data:extend({
         icon_size = 32,
         category = "air-filtering-advanced",
         subgroup = "raw-material",
-        order = "f[plastic-bar]-f[filter-air]",
+        order = "b[filter-air]",
         energy_required = 5,
-        enabled = true,
+        enabled = false,
         ingredients =
         {
             { type = "fluid", name = "pollution", amount = 20, fluidbox_index = 1 },
             { type = "item", name = "air-filter", amount = 1 },
         },
-        results = { { type = "item", name = "used-air-filter", amount = 1 } }
+        results = { { type = "item", name = "used-air-filter", amount = 1 } },
+        main_product = ""
     },
     {
         type = "recipe",
@@ -163,9 +165,9 @@ data:extend({
         hide_from_player_crafting = true,
         category = "air-filtering-advanced",
         subgroup = "raw-material",
-        order = "f[plastic-bar]-f[filter-air]",
+        order = "c[filter-air]",
         energy_required = 1,
-        enabled = true,
+        enabled = false,
         ingredients =
         {
             { type = "fluid", name = "pollution", amount = 6, fluidbox_index = 1 },

better-air-filtering/prototypes/technology.lua

@@ -1,110 +1,132 @@
 data:extend({
-  {
-    type = "technology",
-    name = "air-filtering-1",
-    icon = "__better-air-filtering__/graphics/technology/air-filtering-1.png",
-    icon_size = "64",
-    prerequisites = {"plastics", "steel-processing", "advanced-electronics"},
-    effects =
     {
-      {
+        type = "technology",
-        type = "unlock-recipe",
+        name = "air-filtering-1",
-        recipe = "air-filter-machine-1"
+        localised_description = {"technology-description.air-filtering-1"},
-      },
+        icon = "__better-air-filtering__/graphics/technology/air-filtering-1.png",
-      {
+        icon_size = "64",
-        type = "unlock-recipe",
+        prerequisites = { "automation", "electronics" },
-        recipe = "filter-air"
+        effects = {
-      },
+            {
-      {
+                type = "unlock-recipe",
-        type = "unlock-recipe",
+                recipe = "air-filter-machine-1"
-        recipe = "air-filter"
+            },
-      }
+            {
+                type = "unlock-recipe",
+                recipe = "expendable-air-filter"
+            },
+            {
+                type = "unlock-recipe",
+                recipe = "filter-air"
+            }
+        },
+        unit = {
+            count = 100,
+            ingredients = {
+                { "automation-science-pack", 1 },
+                { "logistic-science-pack", 1 }
+            },
+            time = 30
+        },
+        order = "d-a-a"
     },
-    unit =
     {
-      count = 100,
+        type = "technology",
-      ingredients = {
+        name = "reusable-air-filters",
-        {"automation-science-pack", 1},
+        icon = "__better-air-filtering__/graphics/technology/reusable-air-filters.png",
-        {"logistic-science-pack", 1}
+        icon_size = "64",
-      },
+        prerequisites = { "air-filtering-1", "plastics", "steel-processing" },
-      time = 30
+        effects = {
+            {
+                type = "unlock-recipe",
+                recipe = "air-filter"
+            }
+        },
+        unit = {
+            count = 200,
+            ingredients = {
+                { "automation-science-pack", 1 },
+                { "logistic-science-pack", 1 },
+            },
+            time = 30
+        },
+        order = "d-a-b"
     },
-    order = "d-a-a"
-  },
-  {
-    type = "technology",
-    name = "air-filtering-2",
-    icon = "__better-air-filtering__/graphics/technology/air-filtering-2.png",
-    icon_size = "64",
-    prerequisites = {"air-filtering-1"},
-    effects =
     {
-      {
+        type = "technology",
-        type = "unlock-recipe",
+        name = "air-filter-recycling",
-        recipe = "air-filter-machine-2"
+        icon = "__better-air-filtering__/graphics/technology/air-filter-recycling.png",
-      }
+        icon_size = "64",
+        prerequisites = { "reusable-air-filters" },
+        effects = {
+            {
+                type = "unlock-recipe",
+                recipe = "air-filter-recycling"
+            }
+        },
+        unit = {
+            count = 200,
+            ingredients = {
+                { "automation-science-pack", 1 },
+                { "logistic-science-pack", 1 },
+                { "chemical-science-pack", 1 },
+            },
+            time = 30
+        },
+        order = "d-a-c"
     },
-    unit =
     {
-      count = 300,
+        type = "technology",
-      ingredients = {
+        name = "air-filtering-2",
-        {"automation-science-pack", 1},
+        localised_description = {"technology-description.air-filtering-2"},
-        {"logistic-science-pack", 1},
+        icon = "__better-air-filtering__/graphics/technology/air-filtering-2.png",
-        {"chemical-science-pack", 1}
+        icon_size = "64",
-      },
+        prerequisites = { "air-filtering-1", "reusable-air-filters", "advanced-electronics" },
-      time = 60
+        effects = {
+            {
+                type = "unlock-recipe",
+                recipe = "air-filter-machine-2"
+            },
+
+            {
+                type = "unlock-recipe",
+                recipe = "filter-air2"
+            }
+        },
+        unit = {
+            count = 300,
+            ingredients = {
+                { "automation-science-pack", 1 },
+                { "logistic-science-pack", 1 },
+                { "chemical-science-pack", 1 }
+            },
+            time = 60
+        },
+        order = "d-a-d"
     },
-    order = "d-a-a"
-  },
-  {
-    type = "technology",
-    name = "air-filtering-3",
-    icon = "__better-air-filtering__/graphics/technology/air-filtering-3.png",
-    icon_size = "64",
-    prerequisites = {"air-filtering-2"},
-    effects =
     {
-      {
+        type = "technology",
-        type = "unlock-recipe",
+        name = "air-filtering-3",
-        recipe = "air-filter-machine-3"
+        localised_description = {"technology-description.air-filtering-3"},
-      }
+        icon = "__better-air-filtering__/graphics/technology/air-filtering-3.png",
-    },
+        icon_size = "64",
-    unit =
+        prerequisites = { "air-filtering-2" },
-    {
+        effects = {
-      count = 500,
+            {
-      ingredients = {
+                type = "unlock-recipe",
-        {"automation-science-pack", 1},
+                recipe = "air-filter-machine-3"
-        {"logistic-science-pack", 1},
+            }
-        {"chemical-science-pack", 2},
+        },
-        {"production-science-pack", 1}
+        unit = {
-      },
+            count = 500,
-      time = 60
+            ingredients = {
-    },
+                { "automation-science-pack", 1 },
-    order = "d-a-a"
+                { "logistic-science-pack", 1 },
-  },
+                { "chemical-science-pack", 2 },
-  {
+                { "production-science-pack", 1 }
-    type = "technology",
+            },
-    name = "air-filter-recycling",
+            time = 60
-    icon = "__better-air-filtering__/graphics/technology/air-filter-recycling.png",
+        },
-    icon_size = "64",
+        order = "d-a-e"
-    prerequisites = {"air-filtering-1"},
+    }
-    effects =
-    {
-      {
-        type = "unlock-recipe",
-        recipe = "air-filter-recycling"
-      }
-    },
-    unit =
-    {
-      count = 150,
-      ingredients = {
-        {"automation-science-pack", 1},
-        {"logistic-science-pack", 1},
-        {"chemical-science-pack", 1}
-      },
-      time = 30
-    },
-    order = "d-a-a"
-  }
 })