Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
45b900f
New voiding and heating recipes for geothermal (#383)
oorzkws Aug 12, 2025
b3f0862
Update changelog.txt
lemonlambda Aug 18, 2025
be23e0f
Update changelog.txt
lemonlambda Aug 18, 2025
d2a73cc
Update info.json
lemonlambda Aug 18, 2025
29838c0
buff fluid drills
limelou Aug 26, 2025
b35d190
Merge branch 'master' into breaking-changes
oorzkws Aug 26, 2025
13012bb
Merge branch 'master' into breaking-changes
oorzkws Aug 28, 2025
5cef3f4
caravans: fix missing padding in interrupt target list
oorzkws Aug 29, 2025
f16e3ad
Merge branch 'master' into breaking-changes
oorzkws Sep 3, 2025
4c2abda
Merge pull request #452 from limelou/buff_fluid_drills
adoubrovsky Sep 6, 2025
2bda1e1
Merge branch 'master' into breaking-changes
oorzkws Sep 7, 2025
e096823
Fix fluid output postions of tuuphra-plantation-mk02/mk03/mk04 (#473)
Lynnatic Sep 14, 2025
f43ca5f
Rebase master (#480)
notnotmelon Sep 15, 2025
15ef235
Merge remote-tracking branch 'origin/master' into rebase-master
notnotmelon Sep 17, 2025
73c893f
Merge pull request #491 from pyanodon/rebase-master
notnotmelon Sep 17, 2025
c98c201
Storage tank rewrite
notnotmelon Sep 16, 2025
c357ed9
Decopule py tank internal names from their fluid values.
notnotmelon Oct 2, 2025
c3dba13
Merge pull request #488 from pyanodon/Storage-tank-rewrite
notnotmelon Oct 3, 2025
056c20f
Merge commit 'cf61e7dd170dc1b781368cd5b6ed1a66f4b4f0e4'
protocol-1903 Oct 28, 2025
4ec6d8a
Revert "Merge commit 'cf61e7dd170dc1b781368cd5b6ed1a66f4b4f0e4'"
protocol-1903 Oct 28, 2025
d8e8813
Fixed certain phytomining recipes taking muddy sludge instead of tail…
protocol-1903 Oct 28, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
---------------------------------------------------------------------------------------------------
Version: 4.0.0
Date: ???
Changes:
- Chitin to geothermal water recipe now returns 15C fluid instead of 3000C fluid.
- New recipe to convert bonemeal into geothermal water.
- New recipe for heating geothermal water.
- Change fluid output positions of tuuphra-platation-mk02/mk03/mk04 to be the same position as mk01
- Fixed certain phytomining recipes taking muddy sludge instead of tailings. Resolves https://github.com/pyanodon/pybugreports/issues/1242
---------------------------------------------------------------------------------------------------
Version: 3.0.60
Date: ????
Changes:
Expand Down Expand Up @@ -63,6 +72,7 @@ Date: 2025-08-23
- When selecting view on map with an outpost selected, the map view now centers on the outpost rather than the caravan. Resolves https://github.com/pyanodon/pybugreports/issues/1170
- Reduce actual vatbrain radius by one tile match visible vatbrain radius. See https://github.com/pyanodon/pybugreports/issues/1062
- Fix actual vatbrain radius being offset by one tile to the east and south. See https://github.com/pyanodon/pybugreports/issues/1062
- Buff fluid mining drills to have larger mining area and lower resource drain at higher tiers
- Caravans: when selecting view on map with an outpost selected, the map view now centers on the outpost rather than the caravan. Resolves https://github.com/pyanodon/pybugreports/issues/1170
- Caravans: fixed that ESC/E wouldn't close a caravan menu when opened from a caravan outpost.
- Caravans: fixed scroll pane overlapping buttons in outpost's caravan view
Expand Down
2 changes: 1 addition & 1 deletion info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pyalienlife",
"version": "3.0.60",
"version": "4.0.0",
"factorio_version": "2.0",
"title": "Pyanodons AlienLife",
"author": "Pyanodon, Nexela, Kingarthur, notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple, przemo1232",
Expand Down
3 changes: 2 additions & 1 deletion prototypes/buildings/fluid-drill-mk02.lua
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ ENTITY {
usage_priority = "secondary-input"
},
energy_usage = "900kW",
resource_searching_radius = 3.49,
resource_searching_radius = 4.49,
resource_drain_rate_percent = 50,
vector_to_place_result = {0, -2.65},
radius_visualisation_picture = {
filename = "__base__/graphics/entity/electric-mining-drill/electric-mining-drill-radius-visualization.png",
Expand Down
3 changes: 2 additions & 1 deletion prototypes/buildings/fluid-drill-mk03.lua
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ ENTITY {
usage_priority = "secondary-input"
},
energy_usage = "1200kW",
resource_searching_radius = 3.49,
resource_searching_radius = 5.49,
resource_drain_rate_percent = 25,
vector_to_place_result = {0, -2.65},
radius_visualisation_picture = {
filename = "__base__/graphics/entity/electric-mining-drill/electric-mining-drill-radius-visualization.png",
Expand Down
3 changes: 2 additions & 1 deletion prototypes/buildings/fluid-drill-mk04.lua
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ ENTITY {
usage_priority = "secondary-input"
},
energy_usage = "1400kW",
resource_searching_radius = 3.49,
resource_searching_radius = 6.49,
resource_drain_rate_percent = 12.5,
vector_to_place_result = {0, -2.65},
radius_visualisation_picture = {
filename = "__base__/graphics/entity/electric-mining-drill/electric-mining-drill-radius-visualization.png",
Expand Down
2 changes: 1 addition & 1 deletion prototypes/buildings/genlab-mk01.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RECIPE {
ingredients = {
{type = "item", name = "biofactory-mk01", amount = 1},
{type = "item", name = "plastic-bar", amount = 20},
{type = "item", name = "py-tank-3000", amount = 2},
{type = "item", name = "py-tank-3", amount = 2},
{type = "item", name = "steel-plate", amount = 15},
{type = "item", name = "electronic-circuit", amount = 15},
{type = "item", name = "glass", amount = 50},
Expand Down
4 changes: 2 additions & 2 deletions prototypes/buildings/outpost-fluid.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RECIPE {
{type = "item", name = "small-parts-01", amount = 50},
{type = "item", name = "concrete", amount = 20},
{type = "item", name = "glass", amount = 5},
{type = "item", name = "py-tank-4000", amount = 1}
{type = "item", name = "py-tank-4", amount = 1}
},
results = {{type = "item", name = "outpost-fluid", amount = 1}}
}:add_unlock("zoology")
Expand Down Expand Up @@ -79,7 +79,7 @@ data:extend {{
icon_size = 64,
fluid_box = {
-- don't hardcode so that volume gets adjusted when "realistic" setting is on.
volume = data.raw["storage-tank"]["py-tank-4000"].fluid_box.volume,
volume = data.raw["storage-tank"]["py-tank-4"].fluid_box.volume,
pipe_picture = {
north = {
layers = {
Expand Down
4 changes: 2 additions & 2 deletions prototypes/buildings/tuuphra-plantation-mk02.lua
Original file line number Diff line number Diff line change
Expand Up @@ -197,14 +197,14 @@ ENTITY {
pipe_covers = py.pipe_covers(false, true, true, true),
pipe_picture = py.pipe_pictures("assembling-machine-3", nil, {0.0, -0.88}, nil, nil),
volume = 100,
pipe_connections = {{flow_direction = "output", position = {2.0, 4.0}, direction = defines.direction.south}}
pipe_connections = {{flow_direction = "output", position = {3.0, 4.0}, direction = defines.direction.south}}
},
{
production_type = "output",
pipe_covers = py.pipe_covers(false, true, true, true),
pipe_picture = py.pipe_pictures("assembling-machine-3", nil, {0.0, -0.88}, nil, nil),
volume = 100,
pipe_connections = {{flow_direction = "output", position = {-2.0, 4.0}, direction = defines.direction.south}}
pipe_connections = {{flow_direction = "output", position = {-3.0, 4.0}, direction = defines.direction.south}}
},
},
impact_category = "metal-large",
Expand Down
4 changes: 2 additions & 2 deletions prototypes/buildings/tuuphra-plantation-mk03.lua
Original file line number Diff line number Diff line change
Expand Up @@ -196,14 +196,14 @@ ENTITY {
pipe_covers = py.pipe_covers(false, true, true, true),
pipe_picture = py.pipe_pictures("assembling-machine-3", nil, {0.0, -0.88}, nil, nil),
volume = 100,
pipe_connections = {{flow_direction = "output", position = {2.0, 4.0}, direction = defines.direction.south}}
pipe_connections = {{flow_direction = "output", position = {3.0, 4.0}, direction = defines.direction.south}}
},
{
production_type = "output",
pipe_covers = py.pipe_covers(false, true, true, true),
pipe_picture = py.pipe_pictures("assembling-machine-3", nil, {0.0, -0.88}, nil, nil),
volume = 100,
pipe_connections = {{flow_direction = "output", position = {-2.0, 4.0}, direction = defines.direction.south}}
pipe_connections = {{flow_direction = "output", position = {-3.0, 4.0}, direction = defines.direction.south}}
},
},
impact_category = "metal-large",
Expand Down
4 changes: 2 additions & 2 deletions prototypes/buildings/tuuphra-plantation-mk04.lua
Original file line number Diff line number Diff line change
Expand Up @@ -195,14 +195,14 @@ ENTITY {
pipe_covers = py.pipe_covers(false, true, true, true),
pipe_picture = py.pipe_pictures("assembling-machine-3", nil, {0.0, -0.88}, nil, nil),
volume = 100,
pipe_connections = {{flow_direction = "output", position = {2.0, 4.0}, direction = defines.direction.south}}
pipe_connections = {{flow_direction = "output", position = {3.0, 4.0}, direction = defines.direction.south}}
},
{
production_type = "output",
pipe_covers = py.pipe_covers(false, true, true, true),
pipe_picture = py.pipe_pictures("assembling-machine-3", nil, {0.0, -0.88}, nil, nil),
volume = 100,
pipe_connections = {{flow_direction = "output", position = {-2.0, 4.0}, direction = defines.direction.south}}
pipe_connections = {{flow_direction = "output", position = {-3.0, 4.0}, direction = defines.direction.south}}
},
},
impact_category = "metal-large",
Expand Down
2 changes: 1 addition & 1 deletion prototypes/creatures/fluid-caravan.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RECIPE {
{type = "item", name = "moss-gen", amount = 15},
{type = "item", name = "earth-generic-sample", amount = 1},
{type = "fluid", name = "water-saline", amount = 100},
{type = "item", name = "py-tank-4000", amount = 1},
{type = "item", name = "py-tank-4", amount = 1},
{type = "item", name = "pump", amount = 2}
},
results = {{type = "item", name = "fluidavan", amount = 1}}
Expand Down
48 changes: 46 additions & 2 deletions prototypes/recipes/recipes-atomizer.lua
Original file line number Diff line number Diff line change
Expand Up @@ -616,13 +616,13 @@ RECIPE {
}:add_unlock("molecular-decohesion-mk03")

if mods.pyalternativeenergy then
-- DEPRECATE: probably deprecate this in next major py update in favor of chain in breaking changes branch
-- DEPRECATE: probably deprecate this in next major py update
RECIPE {
type = "recipe",
name = "chitin-to-geothermal-water",
category = "atomizer",
enabled = false,
hidden = false,
hidden = true,
energy_required = 10,
ingredients = {
{type = "item", name = "chitin", amount = 2},
Expand All @@ -631,4 +631,48 @@ if mods.pyalternativeenergy then
{type = "fluid", name = "geothermal-water", amount = 50, temperature = 3000},
},
}:add_unlock("molecular-decohesion")

RECIPE {
type = "recipe",
name = "chitin-to-geothermal-water-new",
category = "atomizer",
enabled = false,
energy_required = 10,
ingredients = {
{type = "item", name = "chitin", amount = 2},
},
results = {
{type = "fluid", name = "geothermal-water", amount = 50, temperature = 15},
},
}:add_unlock("molecular-decohesion")

RECIPE {
type = "recipe",
name = "bonemeal-to-geothermal-water",
category = "atomizer",
enabled = false,
energy_requred = 10,
ingredients = {
{type = "item", name = "bonemeal", amount = 5},
},
results = {
{type = "fluid", name = "geothermal-water", amount = 60, temperature = 15}
},
main_product = "geothermal-water"
}:add_unlock("molecular-decohesion")

RECIPE {
type = "recipe",
name = "heat-geothermal-water-to-3000",
category = "rhe",
enabled = false,
energy_required = 10, -- I chose this number for fun :)
ingredients = {
{type = "fluid", name = "geothermal-water", amount = 240, temperature = 15}
},
results = {
{type = "fluid", name = "geothermal-water", amount = 220, temperature = 3000}
},
main_product = "geothermal-water"
}:add_unlock("molecular-decohesion")
end
12 changes: 6 additions & 6 deletions prototypes/updates/pyhightech-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1168,7 +1168,7 @@ RECIPE {
enabled = false,
energy_required = 100,
ingredients = {
{type = "fluid", name = "muddy-sludge", amount = 200, fluidbox_index = 2},
{type = "fluid", name = "tailings", amount = 200, fluidbox_index = 2},
{type = "item", name = "cadaveric-arum", amount = 1},
},
results = {
Expand All @@ -1187,7 +1187,7 @@ RECIPE {
enabled = false,
energy_required = 60,
ingredients = {
{type = "fluid", name = "muddy-sludge", amount = 200, fluidbox_index = 2},
{type = "fluid", name = "tailings", amount = 200, fluidbox_index = 2},
{type = "item", name = "cadaveric-arum", amount = 1},
{type = "fluid", name = "chelator", amount = 50, fluidbox_index = 3},
},
Expand All @@ -1207,7 +1207,7 @@ RECIPE {
enabled = false,
energy_required = 40,
ingredients = {
{type = "fluid", name = "muddy-sludge", amount = 200, fluidbox_index = 2},
{type = "fluid", name = "tailings", amount = 200, fluidbox_index = 2},
{type = "item", name = "hmas", amount = 1},
{type = "item", name = "cadaveric-arum", amount = 1},
{type = "fluid", name = "chelator", amount = 50, fluidbox_index = 3},
Expand All @@ -1228,7 +1228,7 @@ RECIPE {
enabled = false,
energy_required = 100,
ingredients = {
{type = "fluid", name = "muddy-sludge", amount = 200, fluidbox_index = 1},
{type = "fluid", name = "tailings", amount = 200, fluidbox_index = 1},
{type = "item", name = "kicalk", amount = 1},
},
results = {
Expand All @@ -1247,7 +1247,7 @@ RECIPE {
enabled = false,
energy_required = 60,
ingredients = {
{type = "fluid", name = "muddy-sludge", amount = 200, fluidbox_index = 1},
{type = "fluid", name = "tailings", amount = 200, fluidbox_index = 1},
{type = "item", name = "kicalk", amount = 1},
{type = "fluid", name = "chelator", amount = 50, fluidbox_index = 2},
},
Expand All @@ -1267,7 +1267,7 @@ RECIPE {
enabled = false,
energy_required = 40,
ingredients = {
{type = "fluid", name = "muddy-sludge", amount = 200, fluidbox_index = 1},
{type = "fluid", name = "tailings", amount = 200, fluidbox_index = 1},
{type = "item", name = "kicalk", amount = 1},
{type = "item", name = "hmas", amount = 1},
{type = "fluid", name = "chelator", amount = 50, fluidbox_index = 2},
Expand Down
6 changes: 3 additions & 3 deletions prototypes/updates/pypetroleumhandling-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ RECIPE {
enabled = false,
energy_required = 50,
ingredients = {
{type = "fluid", name = "muddy-sludge", amount = 200, fluidbox_index = 1},
{type = "fluid", name = "tailings", amount = 200, fluidbox_index = 1},
{type = "item", name = "guar-seeds", amount = 40},
},
results = {
Expand All @@ -165,7 +165,7 @@ RECIPE {
enabled = false,
energy_required = 40,
ingredients = {
{type = "fluid", name = "muddy-sludge", amount = 200, fluidbox_index = 1},
{type = "fluid", name = "tailings", amount = 200, fluidbox_index = 1},
{type = "item", name = "guar-seeds", amount = 40},
{type = "fluid", name = "chelator", amount = 50, fluidbox_index = 2},
},
Expand All @@ -185,7 +185,7 @@ RECIPE {
enabled = false,
energy_required = 30,
ingredients = {
{type = "fluid", name = "muddy-sludge", amount = 200, fluidbox_index = 1},
{type = "fluid", name = "tailings", amount = 200, fluidbox_index = 1},
{type = "item", name = "guar-seeds", amount = 40},
{type = "fluid", name = "chelator", amount = 50, fluidbox_index = 2},
{type = "item", name = "hmas", amount = 1},
Expand Down
2 changes: 1 addition & 1 deletion scripts/caravan/caravan-prototypes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ local caravan_prototypes = {
},
fluidavan = {
opens_player_inventory = true,
max_volume = prototypes.entity["py-tank-4000"].fluid_capacity,
max_volume = prototypes.entity["py-tank-4"].fluid_capacity,
fuel_size = 2,
destructible = false,
outpost = "outpost-fluid",
Expand Down