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
476 changes: 232 additions & 244 deletions cached-configs/pycoalprocessing.lua

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@
Version: 3.0.43
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
- Tuned down the exponential ramping on worker robot speed from 2^N to 1.5^N.
- Many typos fixed and some new translations in DE locale including the py codex.
- Fix lockup trying to calculate spoilage possibilities of hidden items.
- Improved generator autofill to evenly distribute stacks of fuels. Resolves https://github.com/pyanodon/pybugreports/issues/1085
Expand Down
3 changes: 1 addition & 2 deletions data-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,9 @@ local recipes_list =
"tpa",
"wood-to-coal",
"zinc-chloride",
"niobium-plate"
}

table.insert(recipes_list, "niobium-plate")

--adding to module limitation list
py.allow_productivity(recipes_list)

Expand Down
6 changes: 3 additions & 3 deletions prototypes/buildings/diet-beacon.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ TECHNOLOGY {
unit = {
count = 2100,
ingredients = {
{type = "item", name = "automation-science-pack", amount = 6},
{type = "item", name = "logistic-science-pack", amount = 2},
{type = "item", name = "chemical-science-pack", amount = 1}
{"automation-science-pack", 6},
{"logistic-science-pack", 2},
{"chemical-science-pack", 1}
},
time = 90,
},
Expand Down
4 changes: 2 additions & 2 deletions prototypes/fluids/refsyngas.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RECIPE {
},
results = {
{type = "fluid", name = "refsyngas", amount = 70}
}
},
}:add_unlock("filtration")

RECIPE {
Expand Down Expand Up @@ -43,7 +43,7 @@ RECIPE {
{type = "item", name = "methanol-gas-canister", amount = 1}
},
results = {
{type = "fluid", name = "refsyngas", amount = 100},
{type = "fluid", name = "refsyngas", amount = 100, autotech_is_not_primary_source = true},
{type = "fluid", name = "water", amount = 30}, --bob hydrogen
{type = "fluid", name = "carbon-dioxide", amount = 20},
{type = "fluid", name = "acidgas", amount = 60},
Expand Down
4 changes: 2 additions & 2 deletions prototypes/recipes/coal-processing-recipes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -290,15 +290,15 @@ RECIPE {
},
results = {
{type = "fluid", name = "flue-gas", amount = 500},
{type = "fluid", name = "carbon-dioxide", amount = 100},
{type = "fluid", name = "carbon-dioxide", amount = 100, autotech_is_not_primary_source = not not mods.pyalienlife},
{type = "fluid", name = "aromatics", amount = 100},
{type = "item", name = "rich-clay", amount = 1}
},
main_product = "carbon-dioxide",
icon = "__pycoalprocessinggraphics__/graphics/icons/tar-distilation.png",
icon_size = 32,
subgroup = "py-items",
order = "t"
order = "t",
}:add_unlock("tar-processing")

RECIPE {
Expand Down
18 changes: 3 additions & 15 deletions prototypes/recipes/fuel-canister-recipes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ for f, fluid in pairs(data.raw.fluid) do
fuel_category = "jerry",
burnt_result = "empty-fuel-canister",
stack_size = 20,
ignore_for_dependencies = true,
autotech_ignore = true,
unlock_results = false
}

Expand All @@ -85,7 +85,7 @@ for f, fluid in pairs(data.raw.fluid) do
results = {
{type = "item", name = fluid.name .. "-canister", amount = 1}
},
ignore_for_dependencies = true
autotech_ignore = true
}:add_unlock("plastics")


Expand All @@ -104,23 +104,11 @@ for f, fluid in pairs(data.raw.fluid) do
{type = "fluid", name = fluid.name, amount = fuel_amount},
{type = "item", name = "empty-fuel-canister", amount = 1}
},
ignore_for_dependencies = true,
autotech_ignore = true,
unlock_results = false,
--icon = "__pycoalprocessinggraphics__/graphics/icons/canister.png",
--icon_size = 32,
main_product = fluid.name,
subgroup = "py-items",
order = "canister-b-[empty-methanol-gas-canister]"
}:add_unlock("plastics")
end

if data.raw.recipe["empty-" .. fluid.name .. "-barrel"] ~= nil then
RECIPE("empty-" .. fluid.name .. "-barrel"):set_fields {ignore_for_dependencies = true}
end
if data.raw.recipe[fluid.name .. "-barrel"] ~= nil then
RECIPE(fluid.name .. "-barrel"):set_fields {ignore_for_dependencies = true}
end
if data.raw.item[fluid.name .. "-barrel"] ~= nil then
ITEM(fluid.name .. "-barrel"):set_fields {ignore_for_dependencies = true}
end
end
2 changes: 1 addition & 1 deletion prototypes/recipes/olefin-plant-recipes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ RECIPE {
{type = "fluid", name = "carbon-dioxide", amount = 200}
},
results = {
{type = "fluid", name = "olefin", amount = 200}
{type = "fluid", name = "olefin", amount = 200, autotech_is_not_primary_source = true}
},
main_product = "olefin",
icon = "__pycoalprocessinggraphics__/graphics/icons/olefin.png",
Expand Down
2 changes: 1 addition & 1 deletion prototypes/recipes/seperation-recipes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RECIPE {
icon = "__pycoalprocessinggraphics__/graphics/icons/class-pure-sand.png",
icon_size = 32,
subgroup = "py-items-class",
order = "b"
order = "b",
}:add_unlock("separation")

RECIPE {
Expand Down
3 changes: 1 addition & 2 deletions prototypes/technologies/coal-processing-2.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ TECHNOLOGY {
icon_size = 128,
order = "c-a",
--upgrade = true,
prerequisites = {},
dependencies = {"coal-processing-1"},
prerequisites = {"coal-processing-1"},
effects = {},
unit = {
count = 50,
Expand Down
3 changes: 1 addition & 2 deletions prototypes/technologies/coal-processing-3.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ TECHNOLOGY {
icon_size = 128,
order = "c-a",
--upgrade = true,
prerequisites = {},
dependencies = {"coal-processing-2"},
prerequisites = {"coal-processing-2"},
effects = {},
unit = {
count = 50,
Expand Down
3 changes: 1 addition & 2 deletions prototypes/technologies/cooling-tower-1.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ TECHNOLOGY {
icon_size = 128,
order = "c-a",
--upgrade = true,
prerequisites = {},
dependencies = {"energy-1"},
prerequisites = {"energy-1"},
effects = {},
unit = {
count = 25,
Expand Down
3 changes: 1 addition & 2 deletions prototypes/technologies/cooling-tower-2.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ TECHNOLOGY {
icon_size = 128,
order = "c-a",
--upgrade = true,
prerequisites = {},
dependencies = {"cooling-tower-1", "energy-2"},
prerequisites = {"cooling-tower-1", "energy-2"},
effects = {},
unit = {
count = 20,
Expand Down
3 changes: 1 addition & 2 deletions prototypes/technologies/energy-2.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ TECHNOLOGY {
icon_size = 128,
order = "c-a",
--upgrade = true,
prerequisites = {},
dependencies = {"energy-1"},
prerequisites = {"energy-1"},
effects = {},
unit = {
count = 100,
Expand Down
3 changes: 1 addition & 2 deletions prototypes/technologies/energy-3.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ TECHNOLOGY {
icon = "__pycoalprocessinggraphics__/graphics/technology/energy-3.png",
icon_size = 128,
order = "c-a",
prerequisites = {},
dependencies = {"energy-2"},
prerequisites = {"energy-2"},
--upgrade = true,
effects = {},
unit = {
Expand Down
6 changes: 2 additions & 4 deletions prototypes/technologies/excavation-2.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ TECHNOLOGY {
icon = "__pycoalprocessinggraphics__/graphics/technology/excavation-2.png",
icon_size = 128,
order = "c-a",
prerequisites = {},
dependencies = {"excavation-1"},
prerequisites = {"excavation-1"},
--upgrade = true,
effects = {},
unit = {
Expand All @@ -26,8 +25,7 @@ if mods["pypetroleumhandling"] then
icon = "__pycoalprocessinggraphics__/graphics/technology/excavation-3.png",
icon_size = 128,
order = "c-a",
prerequisites = {},
dependencies = {"excavation-2"},
prerequisites = {"excavation-2"},
--upgrade = true,
effects = {},
unit = {
Expand Down
3 changes: 1 addition & 2 deletions prototypes/technologies/filtration.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ TECHNOLOGY {
icon = "__pycoalprocessinggraphics__/graphics/technology/filtration-mk02.png",
icon_size = 128,
order = "c-b",
prerequisites = {},
dependencies = {"filtration"},
prerequisites = {"filtration"},
effects = {},
unit = {
count = 40,
Expand Down
3 changes: 1 addition & 2 deletions prototypes/technologies/fluid-processing-machines.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ if mods["pypetroleumhandling"] then
icon = "__pycoalprocessinggraphics__/graphics/technology/fluid-processing-machines-2.png",
icon_size = 128,
order = "c-a",
prerequisites = {},
dependencies = {"fluid-processing-machines-1"},
prerequisites = {"fluid-processing-machines-1"},
effects = {},
unit = {
count = 50,
Expand Down
2 changes: 1 addition & 1 deletion prototypes/technologies/fluid-separation.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ TECHNOLOGY {
icon = "__pycoalprocessinggraphics__/graphics/technology/fluid-separation.png",
icon_size = 128,
order = "c-a",
prerequisites = {},
prerequisites = {"organic-solvent"},
effects = {},
unit = {
count = 35,
Expand Down
3 changes: 1 addition & 2 deletions prototypes/technologies/kevlar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ if mods["pypetroleumhandling"] then
icon = "__pycoalprocessinggraphics__/graphics/technology/kevlar-2.png",
icon_size = 128,
order = "c-a",
prerequisites = {},
dependencies = {"kevlar"},
prerequisites = {"kevlar"},
effects = {},
unit = {
count = 50,
Expand Down
3 changes: 1 addition & 2 deletions prototypes/technologies/methanol-processing-2.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ TECHNOLOGY {
icon = "__pycoalprocessinggraphics__/graphics/technology/methanol-processing-2.png",
icon_size = 128,
order = "c-b",
prerequisites = {},
dependencies = {"methanol-processing-1"},
prerequisites = {"methanol-processing-1"},
--upgrade = true,
effects = {},
unit = {
Expand Down
2 changes: 1 addition & 1 deletion prototypes/technologies/niobium.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ TECHNOLOGY {
icon = "__pycoalprocessinggraphics__/graphics/technology/niobium.png",
icon_size = 128,
order = "c-a",
prerequisites = {},
prerequisites = {"organic-solvent"},
effects = {},
unit = {
count = 200,
Expand Down
2 changes: 1 addition & 1 deletion prototypes/technologies/organic-solvent.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ TECHNOLOGY {
icon = "__pycoalprocessinggraphics__/graphics/technology/organic-solvent.png",
icon_size = 128,
order = "c-a",
prerequisites = {},
prerequisites = {"coal-processing-2"},
effects = {},
unit = {
count = 50,
Expand Down
6 changes: 3 additions & 3 deletions prototypes/technologies/stacking-belts.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ end

local science_packs_that_unlock_belt_stacking = {
["logistic-science-pack"] = "logistic-science-pack",
["py-science-pack-mk02"] = "py-science-pack-2",
["py-science-pack-2"] = "py-science-pack-2",
["chemical-science-pack"] = "chemical-science-pack",
["py-science-pack-mk03"] = "py-science-pack-3",
["py-science-pack-3"] = "py-science-pack-3",
["production-science-pack"] = "production-science-pack",
["py-science-pack-mk04"] = "py-science-pack-4",
["py-science-pack-4"] = "py-science-pack-4",
["utility-science-pack"] = "utility-science-pack",
}

Expand Down
3 changes: 1 addition & 2 deletions prototypes/technologies/wood-processing-2.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ TECHNOLOGY {
icon_size = 128,
order = "c-a",
--upgrade = true,
prerequisites = {},
dependencies = {"wood-processing"},
prerequisites = {"wood-processing"},
effects = {},
unit = {
count = 30,
Expand Down
29 changes: 16 additions & 13 deletions prototypes/updates/base-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ RECIPE("refined-concrete"):multiply_ingredient_amount("concrete", 0.25)

-- https://github.com/pyanodon/pybugreports/issues/701
-- https://github.com/pyanodon/pybugreports/issues/713
TECHNOLOGY("fission-reactor-equipment"):remove_pack("utility-science-pack"):add_pack("production-science-pack")
TECHNOLOGY("fission-reactor-equipment"):remove_pack("utility-science-pack"):add_pack("production-science-pack"):remove_prereq("utility-science-pack")

-- (( TECHNOLOGY ))--
TECHNOLOGY("utility-science-pack"):add_pack("production-science-pack"):add_pack("military-science-pack")
TECHNOLOGY("destroyer"):remove_pack("utility-science-pack"):add_pack("production-science-pack")
TECHNOLOGY("military-4"):remove_pack("utility-science-pack")
TECHNOLOGY("military-4"):remove_pack("utility-science-pack"):remove_prereq("utility-science-pack")
--TODO:update fusion equipment/ fission equipment
TECHNOLOGY("rocket-fuel"):add_pack("military-science-pack"):remove_prereq("advanced-oil-processing"):remove_prereq("flammables")
TECHNOLOGY("kovarex-enrichment-process"):add_pack("military-science-pack")
Expand Down Expand Up @@ -53,7 +53,7 @@ TECHNOLOGY("rocket-silo"):add_pack("military-science-pack")
TECHNOLOGY("research-speed-6"):add_pack("military-science-pack")
TECHNOLOGY("logistic-system"):add_pack("military-science-pack"):add_pack("production-science-pack")
TECHNOLOGY("worker-robots-speed-5"):add_pack("military-science-pack")
TECHNOLOGY("worker-robots-speed-6"):add_pack("military-science-pack")
TECHNOLOGY("worker-robots-speed-6"):add_pack("military-science-pack").unit.count_formula = "1.5^(L-6)*1000"
TECHNOLOGY("worker-robots-storage-3"):add_pack("military-science-pack")
TECHNOLOGY("personal-roboport-mk2-equipment"):add_pack("military-science-pack"):add_pack("production-science-pack")
TECHNOLOGY("mining-productivity-3"):add_pack("military-science-pack")
Expand Down Expand Up @@ -92,7 +92,7 @@ data.raw.technology["uranium-ammo"].unit.ingredients = {
}
data.raw.technology["uranium-ammo"].prerequisites = {"military-2", "uranium-processing"}

TECHNOLOGY("concrete"):remove_prereq("automation-2")
TECHNOLOGY("concrete"):remove_prereq("automation-2"):remove_prereq("advanced-material-processing")
-- Remove empty vanilla techs
TECHNOLOGY("automation-2"):set_fields {prerequisites = {}}
TECHNOLOGY("laser"):set_fields {enabled = false, hidden = true}
Expand All @@ -103,17 +103,17 @@ TECHNOLOGY("productivity-module"):set_fields {prerequisites = {}}
TECHNOLOGY("efficiency-module"):set_fields {prerequisites = {}}

-- (( TECHNOLOGY DEPENDENCIES ))--
--TECHNOLOGY('steel-axe'):set_fields{dependencies = {'steel-processing'}}
TECHNOLOGY("fast-inserter"):set_fields {dependencies = {"automation"}}:set_fields {prerequisites = {}}
TECHNOLOGY("military-2"):set_fields {dependencies = {"military"}}
--TECHNOLOGY('steel-axe'):set_fields{prerequisites = {'steel-processing'}}
TECHNOLOGY("fast-inserter"):set_fields {prerequisites = {"automation"}}:set_fields {prerequisites = {}}
TECHNOLOGY("military-2"):set_fields {prerequisites = {"military"}}
TECHNOLOGY("gate"):set_fields {prerequisites = {"stone-wall"}}:remove_pack("logistic-science-pack")
TECHNOLOGY("automobilism"):remove_pack("logistic-science-pack"):set_fields {prerequisites = {}}
TECHNOLOGY("engine"):remove_pack("logistic-science-pack"):set_fields {prerequisites = {}}
TECHNOLOGY("heavy-armor"):set_fields {dependencies = {"military"}}
TECHNOLOGY("modular-armor"):set_fields {dependencies = {"heavy-armor"}}
TECHNOLOGY("power-armor"):set_fields {dependencies = {"modular-armor"}}
TECHNOLOGY("power-armor-mk2"):set_fields {dependencies = {"power-armor"}}
TECHNOLOGY("electric-energy-accumulators"):set_fields {dependencies = {"electric-energy-distribution-1"}}
TECHNOLOGY("heavy-armor"):set_fields {prerequisites = {"military"}}
TECHNOLOGY("modular-armor"):set_fields {prerequisites = {"heavy-armor"}}
TECHNOLOGY("power-armor"):set_fields {prerequisites = {"modular-armor"}}
TECHNOLOGY("power-armor-mk2"):set_fields {prerequisites = {"power-armor"}}
TECHNOLOGY("electric-energy-accumulators"):set_fields {prerequisites = {"electric-energy-distribution-1"}}

TECHNOLOGY("logistic-science-pack"):set_fields {prerequisites = {}}
TECHNOLOGY("chemical-science-pack"):set_fields {prerequisites = {}}
Expand Down Expand Up @@ -378,7 +378,10 @@ data.raw["utility-constants"]["default"].max_fluid_flow = math.max(data.raw["uti
data.raw["technology"]["efficiency-module"].prerequisites = {mods.pyalternativeenergy and "machine-components-mk02" or "productivity-module"}
data.raw["technology"]["bulk-inserter"].prerequisites = {mods.pyhightech and "basic-electronics" or "chemical-science-pack"}
if data.raw["technology"]["bulk-inserter-2"] then data.raw["technology"]["bulk-inserter-2"].prerequisites = {"bulk-inserter"} end
if mods["pypetroleumhandling"] then data.raw.technology["oil-gathering"] = nil end
if mods["pypetroleumhandling"] then
data.raw.technology["oil-gathering"] = nil
data.raw.technology["oil-processing"]:remove_prereq("oil-gathering")
end

RECIPE("grenade"):replace_ingredient("coal", "gunpowder")

Expand Down