Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
---------------------------------------------------------------------------------------------------
Version: 3.3.0
Date: 2026-07-30
Changes:
- Updated for 2.1
- Updated shunt inserter graphics. Thank you Talander!
- Removed steam engine minimum steam temperature as a stopgap fix until wube fixed fluid temp 'mixing'
Bugfixes:
- Fixed that alt names were concatenated instead of chosen. Resolves https://github.com/pyanodon/pybugreports/issues/1497
---------------------------------------------------------------------------------------------------
Version: 3.2.18
Date: 2026-03-08
Changes:
Expand Down
4 changes: 2 additions & 2 deletions control.lua
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ script.on_event(defines.events.on_player_created, function(event)
local nauvis = game.surfaces["nauvis"]
if not nauvis then return end
local elevation = game.surfaces["nauvis"].map_gen_settings.property_expression_names.elevation
if elevation ~= "pyblock_classic" and elevation ~= "pyblock_island" and elevation ~= "pyblock_archipeligo" then
player.print {"messages.pyblock-warning-no-preset"}
if elevation ~= "pyblock_classic" and elevation ~= "pyblock_island" and elevation ~= "pyblock_archipeligo" then
player.print {"messages.pyblock-warning-no-preset"}
end
player.print {"messages.pyblock-intro"}
end)
Expand Down
47 changes: 21 additions & 26 deletions data-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ require("prototypes/updates/pypetroleumhandling-updates")
require("prototypes/updates/pyrawores-updates")
require("prototypes/updates/pyalienlife-updates")
require("prototypes/updates/pyalternativeenergy-updates")
require("prototypes/updates/pyhardmode-updates")

--mapgen--
require("prototypes/mapgen")
Expand Down Expand Up @@ -67,7 +68,7 @@ end
data.raw.technology["excavation-1"].unit.ingredients = {{"automation-science-pack", 1}, {"py-science-pack-1", 1}}
data.raw.technology["excavation-1"].prerequisites = nil

table.insert(RECIPE("soot-separation").results, {type = "item", name = "ore-nickel", amount = 1, probability = 0.1})
RECIPE("soot-separation"):add_result{type = "item", name = "ore-nickel", amount = 1, independent_probability = 0.1}

RECIPE("soot-separation").unlock_results = true

Expand Down Expand Up @@ -127,15 +128,15 @@ for o, ore in pairs(ores) do
},
results = {
{type = "item", name = o, amount = ore.amount},
{type = "item", name = "ash", amount = 1, probability = 0.3}
{type = "item", name = "ash", amount = 1, independent_probability = 0.3}
},
result = nil,
main_product = o,
ignore_in_pypp = false
}
for s, secondary_ore in pairs(ores) do
if s ~= o then
table.insert(data.raw.recipe["soot-to-" .. ore.recipe_extension].results, {type = "item", name = s, amount = 1, probability = secondary_ore.byproduct_probability})
RECIPE("soot-to-" .. ore.recipe_extension):add_result{type = "item", name = s, amount = 1, independent_probability = secondary_ore.byproduct_probability}
end
end
end
Expand Down Expand Up @@ -214,21 +215,15 @@ RECIPE("automated-screener-mk01"):add_ingredient {type = "item", name = "automat

RECIPE("distilator"):add_ingredient {type = "item", name = "ddc-mk00", amount = 1}

-- data.raw.technology["mega-farm"].unit.ingredients = {{"automation-science-pack", 1},{"py-science-pack-1",1}}
-- TECHNOLOGY("mega-farm"):set_fields{prerequisites = {}}

-- RECIPE("mega-farm"):set_fields{ingredients = {}}:add_ingredient({"concrete", 200}):add_ingredient({"treated-wood", 50})

-- RECIPE("replicator-bioreserve"):set_fields{ingredients = {}}

-- data.raw.technology["mega-farm-bioreserve"].unit.ingredients = {{"automation-science-pack", 1},{"py-science-pack-1",1}}

RECIPE("earth-generic-sample"):remove_unlock("xenobiology"):add_unlock("biotech-mk01")

RECIPE("data-array"):remove_ingredient("titanium-plate")

RECIPE("molten-zinc-01"):replace_ingredient("heavy-oil", "heavy-oil", 40)

-- remove min temp, stopgap fix until wube fixes fluid temp 'mixing'
ENTITY("steam-engine").fluid_box.minimum_temperature = nil

-- create pumping productivity techs
for i = 1, 12 do
local tech = table.deepcopy(data.raw.technology["mining-productivity-" .. i])
Expand All @@ -251,32 +246,32 @@ for i = 1, 12 do
end

drilling_categories = {
clay = true,
["soil-extraction"] = true,
["ground-borer"] = true,
["sand-extractor"] = true
"clay",
"soil-extraction",
"ground-borer",
"sand-extractor"
}

pumping_categories = {
coalbed = true,
fracking = true,
pumpjack = true
"coalbed",
"fracking",
"pumpjack"
}

for r, recipe in pairs(data.raw.recipe) do
if drilling_categories[recipe.category] then
for recipe in pairs(data.raw.recipe) do
if RECIPE(recipe):has_categories(drilling_categories) then
for i = 1, 12 do
data.raw.technology["mining-productivity-" .. i].effects[#data.raw.technology["mining-productivity-" .. i].effects + 1] = {
type = "change-recipe-productivity",
recipe = r,
recipe = recipe,
change = 0.1
}
end
elseif pumping_categories[recipe.category] then
elseif RECIPE(recipe):has_categories(pumping_categories) then
for i = 1, 12 do
data.raw.technology["pumping-productivity-" .. i].effects[#data.raw.technology["pumping-productivity-" .. i].effects + 1] = {
type = "change-recipe-productivity",
recipe = r,
recipe = recipe,
change = 0.1
}
end
Expand All @@ -294,9 +289,9 @@ if settings.startup["disable-pyblock-fun-names"].value then
"wpu-mk00",
"solid-separator-mk00"
}) do
data.raw["assembling-machine"][entity].localised_name = { "", "entity-name-alt." .. entity, "entity-name." .. entity }
data.raw["assembling-machine"][entity].localised_name = { "?", "entity-name-alt." .. entity, "entity-name." .. entity }
end
data.raw["furnace"]["compost-plant-mk00"].localised_name = { "", "entity-name-alt.compost-plant-mk00", "entity-name-alt.compost-plant-mk00" }
data.raw["furnace"]["compost-plant-mk00"].localised_name = { "?", "entity-name-alt.compost-plant-mk00", "entity-name-alt.compost-plant-mk00" }
end

if register_cache_file ~= nil then
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions info.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "PyBlock",
"version": "3.2.18",
"factorio_version": "2.0",
"version": "3.3.0",
"factorio_version": "2.1",
"title": "PyBlock",
"author": "KingArthur",
"author": "KingArthur, protocol_1903",
"contact": "PM on the Factorio Forums",
"homepage": "",
"description": "Pymod edition of a Sea Block style game",
"dependencies": [
"base >= 2.0",
"pyalternativeenergy >= 3.1.34",
"base >= 2.1",
"pyalternativeenergy >= 3.2.0",
"? aai-loaders",
"! pystellarexpedition"
]
Expand Down
2 changes: 1 addition & 1 deletion prototypes/buildings/mega-farm-thing.lua
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ ENTITY {
filename = "__base__/sound/silo-rocket.ogg",
volume = 1.0
}
]] --
]] --
}

data:extend {{
Expand Down
Loading