Skip to content
Draft
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
536 changes: 258 additions & 278 deletions cached-configs/pycoalprocessing+pyfusionenergy+pyindustry.lua

Large diffs are not rendered by default.

492 changes: 239 additions & 253 deletions cached-configs/pycoalprocessing+pyindustry.lua

Large diffs are not rendered by default.

204 changes: 204 additions & 0 deletions cached-configs/pyindustry.lua

Large diffs are not rendered by default.

30 changes: 30 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,34 @@
---------------------------------------------------------------------------------------------------
Version: 4.0.0
Date: ???
Changes:
- Removed startup setting "fluid tank rebalance".
- Rebalanced fluid tank volumes per tier to the following values: 5k, 10k, 15k, 27.5k, 65k, 70k, 75k, 125k, 180k, 250k.
- The 180k and 250k fluid tanks are no longer located within pypetrolemhandling. All tanks are now stored inside pyindustry.
- New entity graphics for all updated fluid tanks. Huge thanks to JigSaW_3 for providing these!
- Rebalanced recipes for all py storage tanks.
- Upscaled all fluid tank item icons from 32p to 64p.
- Linearilized dependencies.
- Removed niobium pipes from hydrocyclone recipe. Resolves https://github.com/pyanodon/pybugreports/issues/851
---------------------------------------------------------------------------------------------------
Version: 3.0.19
Date: ???
Changes:
- Remade tech tree with autotech 2.0. Science pack cost comparasion:
- automation: n/a -> trigger
- py1: 100 -> 100
- logi: 360 -> 300
- py2: 1300 -> 800
- chem: 2000 -> 1400
- py3: 2250 -> 1750
- prod: 1750 -> 2250
- py4: 2250 -> 3000
- utility: 1500 -> 3300
- space: 1000 -> 3600
- phyrric: 3000 -> 8000
- Added Dutch locale (thanks, QatSquirrel!)
- Added Spanish locale (thanks, Starl1ght5!)
---------------------------------------------------------------------------------------------------
Version: 3.0.18
Date: 2025-08-12
Changes:
Expand Down
20 changes: 20 additions & 0 deletions data-final-fixes.lua
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
for f, _ in pairs(data.raw.fluid) do
for i, recipe_name in pairs {
"empty-" .. f .. "-canister",
"empty-" .. f .. "-barrel",
"fill-" .. f .. "-canister",
f .. "-barrel"
} do
local recipe = data.raw.recipe[recipe_name] and RECIPE(recipe_name)
if recipe ~= nil then
recipe:set_fields {hide_from_player_crafting = true, hide_from_stats = true}
-- This is backwards, I blame king
if recipe_name:match("^empty") then
recipe.category = "py-barreling"
else
recipe.category = "py-unbarreling"
end
end
end
end

require "prototypes/void-recipes/fluid-void"
require "prototypes/void-recipes/item-void"

Expand Down
28 changes: 3 additions & 25 deletions data-updates.lua
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
if settings.startup["py-tank-adjust"].value then
if mods["pypetroleumhandling"] then
data.raw["storage-tank"]["py-tank-9000"].fluid_box.volume = 180000
data.raw["storage-tank"]["py-tank-9000"].localised_name = {"entity-name.py-tank-9000-adjust"}
data.raw["storage-tank"]["py-tank-10000"].fluid_box.volume = 250000
data.raw["storage-tank"]["py-tank-10000"].localised_name = {"entity-name.py-tank-10000-adjust"}
end
end

require "prototypes/buildings/megadar"
--Tiles
require "prototypes/tiles/py-asphalt"
require "prototypes/tiles/py-limestone"
Expand All @@ -22,20 +14,6 @@ end

require "prototypes/updates/base-updates"

if mods["pycoalprocessing"] then
require "prototypes/updates/pycoalprocessing-updates"
require "prototypes/tiles/py-iron-oxide"
require "prototypes/tiles/py-nexelit"
end

if mods["pyfusionenergy"] then
require "prototypes/updates/pyfusionenergy-updates"
end

if mods["pyrawores"] then
require "prototypes/updates/pyrawores-updates"
end

if mods["pyalternativeenergy"] then
require "prototypes/updates/pyalternativeenergy-updates"
end
Expand All @@ -44,7 +22,7 @@ if mods.pyrawores then
RECIPE("accumulator-mk02"):replace_ingredient("copper-cable", "tinned-cable"):replace_ingredient("iron-plate", "stainless-steel")
end

for f, _ in pairs(data.raw.fluid) do
--[[for f, _ in pairs(data.raw.fluid) do
for i, recipe_name in pairs {
"empty-" .. f .. "-canister",
"empty-" .. f .. "-barrel",
Expand All @@ -62,7 +40,7 @@ for f, _ in pairs(data.raw.fluid) do
end
end
end
end
end]] --

if mods["valves"] then
data.raw.valve["valves-top_up"].next_upgrade = "py-underflow-valve"
Expand Down
39 changes: 10 additions & 29 deletions data.lua
Original file line number Diff line number Diff line change
Expand Up @@ -29,44 +29,25 @@ require "prototypes/buildings/containers/warehouse"
require "prototypes/buildings/containers/deposit"

--Storage Tanks
require "prototypes/buildings/fluid-tanks/tanks-1000"
require "prototypes/buildings/fluid-tanks/tanks-1500"
require "prototypes/buildings/fluid-tanks/tanks-3000"
require "prototypes/buildings/fluid-tanks/tanks-4000"
require "prototypes/buildings/fluid-tanks/tanks-5000"
require "prototypes/buildings/fluid-tanks/tanks-7000"
require "prototypes/buildings/fluid-tanks/tanks-6500"
require "prototypes/buildings/fluid-tanks/tanks-8000"
require "prototypes/buildings/fluid-tanks/py-tank-1"
require "prototypes/buildings/fluid-tanks/py-tank-2"
require "prototypes/buildings/fluid-tanks/py-tank-3"
require "prototypes/buildings/fluid-tanks/py-tank-4"
require "prototypes/buildings/fluid-tanks/py-tank-5"
require "prototypes/buildings/fluid-tanks/py-tank-6"
require "prototypes/buildings/fluid-tanks/py-tank-7"
require "prototypes/buildings/fluid-tanks/py-tank-8"
require "prototypes/buildings/fluid-tanks/py-tank-9"
require "prototypes/buildings/fluid-tanks/py-tank-10"

require "prototypes/buildings/valves/check-valve"
require "prototypes/buildings/valves/overflow-valve"
require "prototypes/buildings/valves/underflow-valve"

--tank size settings check
if settings.startup["py-tank-adjust"].value then
data.raw["storage-tank"]["py-tank-3000"].fluid_box.volume = 10000
data.raw["storage-tank"]["py-tank-3000"].localised_name = {"entity-name.py-tank-3000-adjust"}
data.raw["storage-tank"]["py-tank-4000"].fluid_box.volume = 27500
data.raw["storage-tank"]["py-tank-4000"].localised_name = {"entity-name.py-tank-4000-adjust"}
data.raw["storage-tank"]["py-tank-5000"].fluid_box.volume = 65000
data.raw["storage-tank"]["py-tank-5000"].localised_name = {"entity-name.py-tank-5000-adjust"}
data.raw["storage-tank"]["py-tank-6500"].fluid_box.volume = 75000
data.raw["storage-tank"]["py-tank-6500"].localised_name = {"entity-name.py-tank-6500-adjust"}
data.raw["storage-tank"]["py-tank-8000"].fluid_box.volume = 125000
data.raw["storage-tank"]["py-tank-8000"].localised_name = {"entity-name.py-tank-8000-adjust"}
end

-- Armor
if mods["pycoalprocessing"] then
require "prototypes/equipment/armor-updates"
require "prototypes/equipment/portable-gasoline-generator"
end

--Other
require "prototypes/buildings/accumulator-mk01"
require "prototypes/buildings/accumulator-mk02"
require "prototypes/buildings/radar"
require "prototypes/buildings/megadar"
require "prototypes/buildings/barrel-machine"

require "prototypes/buildings/py-roboport-mk01"
Expand Down
7 changes: 3 additions & 4 deletions info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pyindustry",
"version": "3.0.18",
"version": "4.0.0",
"factorio_version": "2.0",
"title": "Pyanodons Industry",
"author": "Pyanodon, Nexela, Kingarthur, notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple, przemo1232",
Expand All @@ -9,10 +9,9 @@
"description": "Control the means of production with new logistic and storage structures. Works either as a standalone mod or alongside the rest of the pY modpack.",
"dependencies": [
"base >= 2.0.48",
"pyindustrygraphics >= 4.0.0",
"(?) quality >= 2.0",
"~ pypostprocessing >= 3.0.35",
"~ pyindustrygraphics >= 3.0.0",
"? pycoalprocessing >= 1.0.6",
"? pyfusionenergy >= 1.0.3",
"! wret-beacon-rebalance-mod",
"! BigBags",
"! ResearchFog",
Expand Down
46 changes: 20 additions & 26 deletions locale/de/locale.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,16 @@ personal-fusion-cell=Ein Wunder der Technik. Die Kraft der Fusion in Ihrer Hand.
personal-fusion-cell-used=Die Deuterium-Tritium-Fusionszelle ist erschöpft.

[entity-name]
py-tank-1000=PyTank 10.000L
py-tank-1500=PyTank 15.000L
py-tank-3000=PyTank 30.000L
py-tank-4000=PyTank 40.000L
py-tank-5000=PyTank 50.000L
py-tank-6500=PyTank 65.000L
py-tank-7000=PyTank 70.000L
py-tank-8000=PyTank 80.000L

py-tank-3000-adjust=PyTank 10.000L
py-tank-4000-adjust=PyTank 27.500L
py-tank-5000-adjust=PyTank 65.000L
py-tank-6500-adjust=PyTank 75.000L
py-tank-8000-adjust=PyTank 125.000L
py-tank-1=PyTank 5.000L
py-tank-2=PyTank 10.000L
py-tank-3=PyTank 15.000L
py-tank-4=PyTank 27.500L
py-tank-5=PyTank 65.000L
py-tank-6=PyTank 70.000L
py-tank-7=PyTank 75.000L
py-tank-8=PyTank 125.000L
py-tank-9=PyTank 180.000L
py-tank-10=PyTank 250.000L

py-check-valve=Prüf-Ventil
py-overflow-valve=Überfluss-Ventil
Expand Down Expand Up @@ -109,16 +105,16 @@ mk02-wagon=Fortschrittliche Güterwaggon
mk02-fluid-wagon=Fortschrittliche Tankwaggon

[entity-description]
py-tank-1000=Manchmal muss man nicht so viel lagern.
py-tank-1500=Günstiger Tank mit niedriegem Fassungsvermögen.
py-tank-3000=Compact, low-capacity tank.
py-tank-4000=Normales Fassungsvermögen.
py-tank-5000=Etwas höheres Fassungsvermögen.
py-tank-6500=Gutes Fassungsvermögen.
py-tank-7000=Langer Tank.
py-tank-8000=Tank mit großem Fassungsvermögen.
py-tank-9000=Tank mit sehr großem Fassungsvermögen.
py-tank-10000=Für diejenigen, die das Problem lieber auf die lange Bank schieben, anstatt es zu lösen.
py-tank-1=Manchmal muss man nicht so viel lagern.
py-tank-2=Günstiger Tank mit niedriegem Fassungsvermögen.
py-tank-3=Compact, low-capacity tank.
py-tank-4=Normales Fassungsvermögen.
py-tank-5=Etwas höheres Fassungsvermögen.
py-tank-6=Langer Tank.
py-tank-7=Gutes Fassungsvermögen.
py-tank-8=Tank mit großem Fassungsvermögen.
py-tank-9=Tank mit sehr großem Fassungsvermögen.
py-tank-10=Für diejenigen, die das Problem lieber auf die lange Bank schieben, anstatt es zu lösen.

py-check-valve=Ermöglicht das Ablesen des Flüssigkeitsstands in einer Rohrleitung durch das Schaltungssnetz.
py-overflow-valve=Erlaubt Durchfluss bei einem Füllstand des Eingangsrohrs über 80%.
Expand Down Expand Up @@ -212,11 +208,9 @@ py-nexelit=Nexelit Kachel
poorman-wood-fence=Billiger Holzzaun

[mod-setting-name]
py-tank-adjust=Passt das Fassungsvermögen der PyTanks an.
py-braided-pipes=Ermöglicht verschachtelte Rohre

[mod-setting-description]
py-tank-adjust=Macht das Fassungsvermögen der Tanks mit ihrer physischen Größe konsistent
py-braided-pipes=Diese Einstellung bewirkt, dass Vanille-Rohre, Niob-Rohre und Mehrzweck-Rohre sich nicht miteinander verbinden. Gleiches gilt für ihre unterirdischen Varianten, so dass unterirdische Rohre verschachtelt werden können.

[recipe-name]
Expand Down
46 changes: 20 additions & 26 deletions locale/en/locale.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,16 @@ personal-fusion-cell=A miracle of technology. The power of fusion in the palm of
personal-fusion-cell-used=The deuterium tritium fusion fuel has been exhausted.

[entity-name]
py-tank-1000=PyTank (10 kL)
py-tank-1500=PyTank (15 kL)
py-tank-3000=PyTank (30 kL)
py-tank-4000=PyTank (40 kL)
py-tank-5000=PyTank (50 kL)
py-tank-6500=PyTank (65 kL)
py-tank-7000=PyTank (70 kL)
py-tank-8000=PyTank (80 kL)

py-tank-3000-adjust=PyTank (10 kL)
py-tank-4000-adjust=PyTank (27.5 kL)
py-tank-5000-adjust=PyTank (65 kL)
py-tank-6500-adjust=PyTank (75 kL)
py-tank-8000-adjust=PyTank (125 kL)
py-tank-1=PyTank (5 kL)
py-tank-2=PyTank (10 kL)
py-tank-3=PyTank (15 kL)
py-tank-4=PyTank (27.5 kL)
py-tank-5=PyTank (65 kL)
py-tank-6=PyTank (70 kL)
py-tank-7=PyTank (75 kL)
py-tank-8=PyTank (125 kL)
py-tank-9=PyTank (180 kL)
py-tank-10=PyTank (250 kL)

py-check-valve=Check valve
py-overflow-valve=Overflow valve
Expand Down Expand Up @@ -109,16 +105,16 @@ mk02-wagon=Advanced cargo wagon
mk02-fluid-wagon=Advanced fluid wagon

[entity-description]
py-tank-1000=Sometimes you don't want to store that much.
py-tank-1500=Cheap, low-capacity tank.
py-tank-3000=Compact, low-capacity tank.
py-tank-4000=Medium capacity tank.
py-tank-5000=Medium capacity tank.
py-tank-6500=Good capacity tank.
py-tank-7000=Long tank.
py-tank-8000=High capacity tank.
py-tank-9000=Very high capacity tank.
py-tank-10000=For those who would rather kick the problem down the road instead of solving it.
py-tank-1=Sometimes you don't want to store that much.
py-tank-2=Cheap, low-capacity tank.
py-tank-3=Compact, low-capacity tank.
py-tank-4=Medium capacity tank.
py-tank-5=Medium capacity tank.
py-tank-6=Long tank.
py-tank-7=Good capacity tank.
py-tank-8=High capacity tank.
py-tank-9=Very high capacity tank.
py-tank-10=For those who would rather kick the problem down the road instead of solving it.

py-check-valve=Allows the circuit network to read the level of fluid in a pipeline.
py-overflow-valve=Allows flow when input is over 80%.
Expand Down Expand Up @@ -212,11 +208,9 @@ py-nexelit=Nexelit tile
poorman-wood-fence=Poor man's wooden fence

[mod-setting-name]
py-tank-adjust=Adjust Pymods' storage tanks capacity
py-braided-pipes=Enable braided pipes

[mod-setting-description]
py-tank-adjust=Makes tank capacity consistent with their physical size
py-braided-pipes=This setting makes vanilla pipes, niobium pipes, and multipurpose pipes not connect with each other. It also makes their underground versions not connect with each other, allowing for underground pipe braiding.

[recipe-name]
Expand Down
Loading