TakeV
/
Factorio-Better-Air-Filtering
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

three tiers

This commit is contained in:
Joey De Pauw 2019-10-03 20:31:43 +02:00
parent 39aa240629
commit 36b25d6340
12 changed files with 162 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
better-air-filtering/graphics/icons/air-filter-recycling-copy.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.6 KiB

BIN
better-air-filtering/graphics/icons/expendable-air-filter.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
better-air-filtering/graphics/icons/fluid/pollution.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

25
better-air-filtering/locale/de/air-filtering.cfg
View File

@ -1,25 +0,0 @@
[entity-name]
old-air-filter-machine=Luftfiltermaschine (Ersetz mich)
air-filter-machine=Luftfiltermaschine
air-filter-machine-mk2=Luftfiltermaschine MK2
air-filter-machine-mk3=Luftfiltermaschine MK3
[item-name]
unused-air-filter=Luftfilter
used-air-filter=Benutzer Luftfilter
[recipe-name]
filter-air=Luft filtern
air-filter-recycling=Benutzten Luftfilter recyclen
[technology-name]
air-filtering=Luftfilterung
air-filtering-mk2=Luftfilterung MK2
air-filtering-mk3=Luftfilterung MK3
air-filtering-recycling=Luftfilter recyclen
[technology-description]
air-filtering=Ermöglicht das Herstellen von Luftfiltermaschinen um die Luftverschmutzung in der näheren Umgebung zu reduzieren.
air-filtering-mk2=Verbesserte Luftfiltermaschinen ermöglichen besseres filtern der Luft. Sie benötigen mehr Strom und Luftfilter.
air-filtering-mk3=Die stärkste Luftfiltermaschine kann mit stark erhöhtem Stromverbrauch auch stark verschmutzte Luft filtern.
air-filter-recycling=Verbrauchte Luftfilter können mit etwas neuer Kohle wiederverwendet werden.

22
better-air-filtering/locale/en/air-filtering.cfg
View File

@ -1,21 +1,27 @@
[entity-name]
old-air-filter-machine=Air filter machine (REPLACE ME)
air-filter-machine=Air filter machine
air-filter-machine-mk2=Air filter machine MK2
air-filter-machine-mk3=Air filter machine MK3
air-filter-machine=Air filter machine 1
air-filter-machine-mk2=Air filter machine 2
air-filter-machine-mk3=Air filter machine 3
[item-name]
unused-air-filter=Unused Air filter
expendable-air-filter=Expendable air FIlter
unused-air-filter=Unused air filter
used-air-filter=Used air filter
[fluid-name]
pollution=Pollution
polluted-water=Polluted Water
[recipe-name]
filter-air=Filter air
filter-air2=Filter air
liquid-pollution="Condense pollution"
air-filter-recycling=Recycle used air filter
[technology-name]
air-filtering=Air filtering
air-filtering-mk2=Air filtering MK2
air-filtering-mk3=Air filtering MK3
air-filtering=Air filtering 1
air-filtering-mk2=Air filtering 2
air-filtering-mk3=Air filtering 3
air-filter-recycling=Recycle used air filter
[technology-description]

13
better-air-filtering/locale/pl/air-filtering.cfg
View File

@ -1,13 +0,0 @@
[entity-name]
old-air-filter-machine=Maszyna filtrujaca powietrze (Znisz i postaw mnie)
air-filter-machine=Maszyna filtrujaca powietrze
air-filter-machine-mk2=Maszyna filtrujaca powietrze MK2
air-filter-machine-mk3=Maszyna filtrujaca powietrze MK3
[item-name]
unused-air-filter=Filtr Powietrza
used-air-filter=Zuzyty Filtr Powietrza
[recipe-name]
filter-air=Filtruj Powietrze
air-filter-recycling=Odnawiaj Zuzyte Filtry Powietrza

19
better-air-filtering/locale/ru/air-filtering.cfg
View File

@ -1,19 +0,0 @@
[entity-name]
old-air-filter-machine=Воздушный фильтр (ЗАМЕНИ МЕНЯ)
air-filter-machine=Воздушный фильтр
air-filter-machine-mk2=Воздушный фильтр MK2
air-filter-machine-mk3=Воздушный фильтр MK3
[item-name]
unused-air-filter=Воздушный фильтр
used-air-filter=Использовать воздушный фильтр
[recipe-name]
filter-air=Воздушный фильтр
air-filter-recycling=Утилизация использованных воздушный фильтр
[technology-name]
air-filtering=Воздушный фильтр
air-filtering-mk2=Воздушный фильтр MK2
air-filtering-mk3=Воздушный фильтр MK3
air-filter-recycling=Утилизация использованных воздушный фильтр

18
better-air-filtering/locale/uk/air-filtering.cfg
View File

@ -1,18 +0,0 @@
[entity-name]
air-filter-machine=Завод очистки повітря
air-filter-machine-mk2=Завод очистки повітря-2
air-filter-machine-mk3=Завод очистки повітря-3
[item-name]
unused-air-filter=Повітряний фільтр
used-air-filter=Використаний повітряний фільтр
[recipe-name]
filter-air=Очистка повітря
air-filter-recycling=Переробка використаного повітряного фільтра
[technology-name]
air-filtering=Очистка повітря
air-filtering-mk2=Очистка повітря 2
air-filtering-mk3=Очистка повітря 3
air-filter-recycling=Переробка використаних повітряних фільтрів

53
better-air-filtering/prototypes/entity.lua
View File

@ -1,8 +1,4 @@
data:extend({
{
type = "fuel-category",
name = "pollution-filter"
},
{
type = "assembling-machine",
name = "air-filter-machine",
@ -26,6 +22,7 @@ data:extend({
line_length = 8,
shift = { 0.4, -0.06 }
},
match_animation_speed_to_activity = true,
open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 },
close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 },
working_sound =
@ -38,17 +35,15 @@ data:extend({
{
{
production_type = "input",
pipe_picture = assembler3pipepictures(),
pipe_covers = pipecoverspictures(),
filter = "pollution",
base_area = 10,
base_level = -1,
pipe_connections = { { type = "input", position = { 0, -2 } } },
secondary_draw_orders = { north = -1 }
pipe_connections = {},
},
off_when_no_fluid_recipe = true
},
crafting_categories = { "crafting-air-filter" },
crafting_speed = 1.0,
crafting_categories = { "air-filtering-basic" },
crafting_speed = 0.5,
energy_source =
{
type = "burner",
@ -56,9 +51,8 @@ data:extend({
usage_priority = "secondary-input",
fuel_inventory_size = 1,
burnt_inventory_size = 1,
emissions = -0.06
},
energy_usage = "1MW",
energy_usage = "0.5MW",
fixed_recipe = "filter-air",
ingredient_count = 1,
module_slots = 0,
@ -87,6 +81,7 @@ data:extend({
line_length = 8,
shift = { 0.4, -0.06 }
},
match_animation_speed_to_activity = true,
open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 },
close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 },
working_sound =
@ -97,9 +92,26 @@ data:extend({
},
fluid_boxes =
{
{
production_type = "input",
filter = "pollution",
base_area = 10,
base_level = -1,
pipe_connections= {}
},
{
production_type = "input",
filter="water",
pipe_picture = assembler2pipepictures(),
pipe_covers = pipecoverspictures(),
base_area = 10,
base_level = -1,
pipe_connections = {{ type="input", position = {0, -2} }}
},
{
production_type = "output",
pipe_picture = assembler3pipepictures(),
filter = "polluted-water",
pipe_picture = assembler2pipepictures(),
pipe_covers = pipecoverspictures(),
base_area = 10,
base_level = 1,
@ -108,16 +120,14 @@ data:extend({
},
off_when_no_fluid_recipe = true
},
crafting_categories = { "suck-air" },
crafting_categories = { "air-filtering-advanced" },
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
@ -144,6 +154,7 @@ data:extend({
line_length = 8,
shift = { 0.4, -0.06 }
},
match_animation_speed_to_activity = true,
open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 },
close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 },
working_sound =
@ -156,13 +167,15 @@ data:extend({
{
{
production_type = "input",
pipe_covers = pipecoverspictures(),
filter = "pollution",
base_area = 10,
base_level = -1,
pipe_connections= {}
},
{
production_type = "input",
filter="water",
pipe_picture = assembler3pipepictures(),
pipe_covers = pipecoverspictures(),
base_area = 10,
base_level = -1,
@ -170,6 +183,7 @@ data:extend({
},
{
production_type = "output",
filter = "polluted-water",
pipe_picture = assembler3pipepictures(),
pipe_covers = pipecoverspictures(),
base_area = 10,
@ -179,13 +193,12 @@ data:extend({
},
off_when_no_fluid_recipe = true
},
crafting_categories = { "suck-air" },
crafting_speed = 5.0,
crafting_categories = { "air-filtering-advanced" },
crafting_speed = 1.25,
energy_source =
{
type = "electric",
usage_priority = "secondary-input",
emissions = -0.3
},
energy_usage = "1MW",
ingredient_count = 1,

18
better-air-filtering/prototypes/fluid.lua
View File

@ -2,26 +2,26 @@ 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
default_temperature = 15,
max_temperature = 100,
gas_temperature = 0,
base_color = {r=0.7, g=0.7, b=0.7},
flow_color = {r=0.7, g=0.7, b=0.7},
icon = "__better-air-filtering__/graphics/icons/fluid/pollution.png",
icon = "__base__/graphics/icons/fluid/pollution.png",
icon_size = 32,
order = "a[fluid]-z[water]",
auto_barrel="false"
},
{
type = "fluid",
name = "pollution-gas",
name = "polluted-water",
default_temperature = 15,
max_temperature = 100,
gas_temperature = 15,
base_color = {r=0.38, g=0.27, b=0.53}, -- 97, 69, 135
base_color = {r=0.7, g=0.7, b=0.7},
flow_color = {r=0.7, g=0.7, b=0.7},
icon = "__base__/graphics/icons/fluid/pollution.png",
icon = "__better-air-filtering__/graphics/icons/fluid/pollution.png",
icon_size = 32,
order = "a[fluid]-z[water]",
order = "a[fluid]-z[pollution]",
auto_barrel="false"
}
})

129
better-air-filtering/prototypes/item.lua
View File

@ -1,58 +1,75 @@
data:extend({
{
type = "item",
name = "air-filter-machine",
icon = "__better-air-filtering__/graphics/icons/air-filter-machine.png",
icon_size = 32,
flags = {},
subgroup = "production-machine",
order = "f[air-filter-machine]",
place_result = "air-filter-machine",
stack_size = 10,
},
{
type = "item",
name = "air-filter-machine-mk2",
icon = "__better-air-filtering__/graphics/icons/air-filter-machine-mk2.png",
icon_size = 32,
flags = {},
subgroup = "production-machine",
order = "f[air-filter-machine]-g[air-filter-machine-mk2]",
place_result = "air-filter-machine-mk2",
stack_size = 10
},
{
type = "item",
name = "air-filter-machine-mk3",
icon = "__better-air-filtering__/graphics/icons/air-filter-machine-mk3.png",
icon_size = 32,
flags = {},
subgroup = "production-machine",
order = "g[air-filter-machine-mk2]-h[air-filter-machine-mk3]",
place_result = "air-filter-machine-mk3",
stack_size = 10
},
{
type = "item",
name = "unused-air-filter",
icon = "__better-air-filtering__/graphics/icons/unused-air-filter.png",
icon_size = 32,
flags = {},
subgroup = "raw-material",
order = "g[plastic-bar]-h[unused-air-filter]",
stack_size = 50,
fuel_category = "pollution-filter",
burnt_result = "used-air-filter",
fuel_value = "300MW",
},
{
type = "item",
name = "used-air-filter",
icon = "__better-air-filtering__/graphics/icons/used-air-filter.png",
icon_size = 32,
flags = {},
subgroup = "raw-material",
order = "h[unused-air-filter]-i[used-air-filter]",
stack_size = 50
}
{
type = "fuel-category",
name = "pollution-filter"
},
{
type = "item",
name = "air-filter-machine",
icon = "__better-air-filtering__/graphics/icons/air-filter-machine.png",
icon_size = 32,
flags = {},
subgroup = "production-machine",
order = "f[air-filter-machine]",
place_result = "air-filter-machine",
stack_size = 10,
},
{
type = "item",
name = "air-filter-machine-mk2",
icon = "__better-air-filtering__/graphics/icons/air-filter-machine-mk2.png",
icon_size = 32,
flags = {},
subgroup = "production-machine",
order = "f[air-filter-machine]-g[air-filter-machine-mk2]",
place_result = "air-filter-machine-mk2",
stack_size = 10
},
{
type = "item",
name = "air-filter-machine-mk3",
icon = "__better-air-filtering__/graphics/icons/air-filter-machine-mk3.png",
icon_size = 32,
flags = {},
subgroup = "production-machine",
order = "g[air-filter-machine-mk2]-h[air-filter-machine-mk3]",
place_result = "air-filter-machine-mk3",
stack_size = 10
},
{
type = "item",
name = "expendable-air-filter",
icon = "__better-air-filtering__/graphics/icons/expendable-air-filter.png",
icon_size = 32,
flags = {},
subgroup = "raw-material",
order = "g[plastic-bar]-g[unused-air-filter]",
stack_size = 10,
fuel_category = "pollution-filter",
burnt_result = nill,
fuel_value = "120MW",
},
{
type = "item",
name = "unused-air-filter",
icon = "__better-air-filtering__/graphics/icons/unused-air-filter.png",
icon_size = 32,
flags = {},
subgroup = "raw-material",
order = "g[plastic-bar]-h[unused-air-filter]",
stack_size = 50,
fuel_category = "pollution-filter",
burnt_result = "used-air-filter",
fuel_value = "400MW",
},
{
type = "item",
name = "used-air-filter",
icon = "__better-air-filtering__/graphics/icons/used-air-filter.png",
icon_size = 32,
flags = {},
subgroup = "raw-material",
order = "h[unused-air-filter]-i[used-air-filter]",
stack_size = 50
}
})

72
better-air-filtering/prototypes/recipe.lua
View File

@ -1,17 +1,15 @@
data:extend({
{
type = "recipe-category",
name = "crafting-air-filter"
name = "air-filtering-basic"
},
{
type = "recipe-category",
name = "suck-air"
name = "air-filtering-advanced"
},
{
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 =
@ -25,8 +23,6 @@ data:extend({
{
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 =
@ -39,8 +35,6 @@ data:extend({
{
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 =
@ -50,11 +44,24 @@ data:extend({
},
result = "air-filter-machine-mk3"
},
{
type = "recipe",
name = "expendable-air-filter",
category = "crafting",
subgroup = "raw-material",
order = "f[plastic-bar]-f[expendable-air-filter]",
energy_required = 2,
enabled = "true",
ingredients =
{
{ "coal", 5 },
{ "iron-plate", 2 },
},
result = "expendable-air-filter"
},
{
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]",
@ -71,70 +78,57 @@ data:extend({
{
type = "recipe",
name = "filter-air",
hide_from_player_crafting=true,
icon = "__better-air-filtering__/graphics/icons/filter-air.png",
icon_size = 32,
category = "crafting-air-filter",
category = "air-filtering-basic",
subgroup = "raw-material",
order = "f[plastic-bar]-f[filter-air]",
energy_required = 0.5,
enabled = "true",
ingredients =
{
{type="fluid", name="pollution-gas", amount=2}
{type="fluid", name="pollution", amount=2, fluidbox_index=1}
},
results = {}
},
{
type = "recipe",
name = "suck-pollution",
category = "suck-air",
name = "filter-air2",
hide_from_player_crafting=true,
icon = "__better-air-filtering__/graphics/icons/filter-air.png",
icon_size = 32,
category = "air-filtering-advanced",
subgroup = "raw-material",
order = "f[plastic-bar]-f[filter-air]",
energy_required = 0.5,
energy_required = 5,
enabled = "true",
ingredients =
{
{type="fluid", name="pollution", amount=25, fluidbox_index=1},
{type="item", name="unused-air-filter", amount=1},
},
results = {{type="fluid", name="pollution-gas", amount=4}}
results = {{type="item", name="used-air-filter", amount=1}}
},
{
type = "recipe",
name = "liquid-pollution",
-- icon = "__better-air-filtering__/graphics/icons/filter-air.png",
-- icon_size = 32,
category = "suck-air",
hide_from_player_crafting=true,
category = "air-filtering-advanced",
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="pollution", amount=6, fluidbox_index=1},
{type="fluid", name="water", amount=10, fluidbox_index=2}
},
results = {{type="fluid", name="pollution", amount=10}}
results = {{type="fluid", name="polluted-water", 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]",