Skip to content
Closed
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
3 changes: 2 additions & 1 deletion changelog.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
---------------------------------------------------------------------------------------------------
Version: 3.0.17
Version: 4.0.0
Date: ???
Changes:
- Linearilized Dependencies.
- Remade tech tree with autotech 2.0. Science pack cost comparasion:
- automation: n/a -> trigger
- py1: 100 -> 100
Expand Down
4 changes: 4 additions & 0 deletions data-updates.lua
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
if not mods["pyalienlife"] then
table.insert(data.raw["assembling-machine"]["crash-site-assembling-machine-1-repaired"].minable.results, {type = "item", name = "duralumin", amount = 50})
end

require "prototypes/updates/base-updates"
require "prototypes/updates/pycoalprocessing-updates"
require "prototypes/updates/pyfusionenergy-updates"
Expand Down
1 change: 1 addition & 0 deletions data.lua
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ require "prototypes/ore/rare-earth-bolide"
--(( RECIPES ))--
require "prototypes/recipes/recipes"
require "prototypes/recipes/recipes-particle"
require "prototypes/recipes/pyrawores-recipes"

--(( ITEMS ))--
require "prototypes/items/items"
Expand Down
10 changes: 4 additions & 6 deletions info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pyhightech",
"version": "3.0.16",
"version": "4.0.0",
"factorio_version": "2.0",
"title": "Pyanodons HighTech",
"author": "Pyanodon, Nexela, Kingarthur, notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple, przemo1232",
Expand All @@ -9,10 +9,8 @@
"description": "Rebuilds the entire circuits and high tech production chain. Uncover technological secrets that perhaps should have been left in science fiction.",
"dependencies": [
"base >= 2.0.48",
"pyfusionenergy >= 2.0.5",
"~ pyhightechgraphics >= 3.0.2",
"pyindustry >= 1.5.3",
"? pyrawores"
"pyrawores >= 4.0.0",
"~ pyhightechgraphics >= 3.0.2"
],
"package": {
"ignore": [],
Expand All @@ -23,4 +21,4 @@
"spoiling_required": false,
"freezing_required": false,
"segmented_units_required": false
}
}
3 changes: 2 additions & 1 deletion prototypes/buildings/chipshooter-mk02.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ RECIPE {
{type = "item", name = "engine-unit", amount = 4},
{type = "item", name = "nexelit-plate", amount = 20},
{type = "item", name = "advanced-circuit", amount = 15},
{type = "item", name = "chipshooter-mk01", amount = 1}
{type = "item", name = "chipshooter-mk01", amount = 1},
{type = "item", name = "glass", amount = 40}
},
results = {
{type = "item", name = "chipshooter-mk02", amount = 1}
Expand Down
3 changes: 2 additions & 1 deletion prototypes/buildings/electronics-factory-mk02.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ RECIPE {
{type = "item", name = "plastic-bar", amount = 40},
{type = "item", name = "niobium-plate", amount = 20},
{type = "item", name = "engine-unit", amount = 10},
{type = "item", name = "steel-plate", amount = 40}
{type = "item", name = "steel-plate", amount = 40},
{type = "item", name = "glass", amount = 40}
},
results = {
{type = "item", name = "electronics-factory-mk02", amount = 1}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ RECIPE {
energy_required = 0.5,
enabled = false,
ingredients = {
{type = "item", name = "steel-plate", amount = 50},
{type = "item", name = "aluminium-plate", amount = 50},
{type = "item", name = "plastic-bar", amount = 50},
{type = "item", name = "nbfe-alloy", amount = 20},
{type = "item", name = "nexelit-plate", amount = 30},
{type = "item", name = "iron-gear-wheel", amount = 100},
{type = "item", name = "nichrome", amount = 15},
{type = "item", name = "glass", amount = 20},
{type = "item", name = "nickel-plate", amount = 10}
},
results = {
{type = "item", name = "ht-generic-fluid-wagon", amount = 1}
Expand Down
4 changes: 3 additions & 1 deletion prototypes/buildings/ht-locomotive/ht-generic-wagon.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ RECIPE {
energy_required = 0.5,
enabled = false,
ingredients = {
{type = "item", name = "steel-plate", amount = 50},
{type = "item", name = "aluminium-plate", amount = 50},
{type = "item", name = "plastic-bar", amount = 50},
{type = "item", name = "nbfe-alloy", amount = 20},
{type = "item", name = "nexelit-plate", amount = 30},
{type = "item", name = "iron-gear-wheel", amount = 100},
{type = "item", name = "nichrome", amount = 15},
{type = "item", name = "glass", amount = 20},
{type = "item", name = "nickel-plate", amount = 10}
},
results = {
{type = "item", name = "ht-generic-wagon", amount = 1}
Expand Down
4 changes: 3 additions & 1 deletion prototypes/buildings/ht-locomotive/ht-locomotive.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RECIPE {
energy_required = 0.5,
enabled = false,
ingredients = {
{type = "item", name = "steel-plate", amount = 60},
{type = "item", name = "aluminium-plate", amount = 60},
{type = "item", name = "evaporator", amount = 1},
{type = "item", name = "plastic-bar", amount = 100},
{type = "item", name = "advanced-circuit", amount = 20},
Expand All @@ -15,6 +15,8 @@ RECIPE {
{type = "item", name = "iron-gear-wheel", amount = 100},
{type = "item", name = "nichrome", amount = 10},
{type = "item", name = "electric-engine-unit", amount = 6},
{type = "item", name = "glass", amount = 60},
{type = "item", name = "nickel-plate", amount = 50}
},
results = {
{type = "item", name = "ht-locomotive", amount = 1}
Expand Down
2 changes: 1 addition & 1 deletion prototypes/buildings/kicalk-plantation.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RECIPE {
enabled = false,
ingredients = {
{type = "item", name = "botanical-nursery", amount = 2},
{type = "item", name = "storage-tank", amount = 1}, --replace py-tank-5
{type = "item", name = "py-tank-5", amount = 1}, --replace py-tank-5
{type = "item", name = "classifier", amount = 1},

},
Expand Down
1 change: 1 addition & 0 deletions prototypes/buildings/moondrop-greenhouse-mk01.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ RECIPE {
{type = "item", name = "pipe", amount = 15},
{type = "item", name = "iron-plate", amount = 100},
{type = "item", name = "iron-gear-wheel", amount = 40},
{type = "item", name = "glass", amount = 40},
},
results = {
{type = "item", name = "moondrop-greenhouse-mk01", amount = 1}
Expand Down
1 change: 1 addition & 0 deletions prototypes/buildings/nano-assembler-mk01.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ RECIPE {
{type = "item", name = "advanced-circuit", amount = 10},
{type = "item", name = "iron-gear-wheel", amount = 30},
{type = "item", name = "steam-engine", amount = 3},
{type = "item", name = "glass", amount = 40},
},
results = {
{type = "item", name = "nano-assembler-mk01", amount = 1}
Expand Down
1 change: 1 addition & 0 deletions prototypes/buildings/nano-assembler-mk02.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ RECIPE {
{type = "item", name = "engine-unit", amount = 4},
{type = "item", name = "niobium-plate", amount = 10},
{type = "item", name = "low-density-structure", amount = 15},
{type = "item", name = "glass", amount = 40}
},
results = {
{type = "item", name = "nano-assembler-mk02", amount = 1}
Expand Down
2 changes: 1 addition & 1 deletion prototypes/buildings/pulp-mill-mk03.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RECIPE {
{type = "item", name = "pulp-mill-mk02", amount = 1},
{type = "item", name = "graphene-roll", amount = 20},
{type = "item", name = "processing-unit", amount = 10},
{type = "item", name = "pipe", amount = 20},
{type = "item", name = "niobium-pipe", amount = 20},
{type = "item", name = "low-density-structure", amount = 15},
{type = "item", name = "electric-engine-unit", amount = 10},
},
Expand Down
1 change: 1 addition & 0 deletions prototypes/fluids/acrolein.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ RECIPE {
energy_required = 15,
ingredients = {
{type = "fluid", name = "glycerol", amount = 80},
{type = "fluid", name = "oxygen", amount = 80},
},
results = {
{type = "fluid", name = "acrolein", amount = 50}
Expand Down
4 changes: 2 additions & 2 deletions prototypes/fluids/chloromethane.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ RECIPE {
enabled = false,
energy_required = 10,
ingredients = {
{type = "fluid", name = "methanol", amount = 100},
{type = "fluid", name = "sulfuric-acid", amount = 50},
{type = "fluid", name = "methanol", amount = 100},
{type = "fluid", name = "hydrogen-chloride", amount = 50},
},
results = {
{type = "fluid", name = "chloromethane", amount = 30}
Expand Down
2 changes: 1 addition & 1 deletion prototypes/fluids/dimethyldichlorosilane.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RECIPE {
ingredients = {
{type = "fluid", name = "chloromethane", amount = 100},
{type = "item", name = "silicon", amount = 5},
{type = "item", name = "crushed-copper", amount = 10},
{type = "item", name = "grade-4-copper", amount = 10},
},
results = {
{type = "fluid", name = "dimethyldichlorosilane", amount = 50}
Expand Down
5 changes: 3 additions & 2 deletions prototypes/fluids/ech.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ RECIPE {
enabled = false,
energy_required = 10,
ingredients = {
{type = "fluid", name = "oleochemicals", amount = 10},
{type = "fluid", name = "glycerol", amount = 30},
{type = "fluid", name = "oleochemicals", amount = 10},
{type = "fluid", name = "glycerol", amount = 30},
{type = "fluid", name = "hydrogen-chloride", amount = 150},
},
results = {
{type = "fluid", name = "ech", amount = 30}
Expand Down
6 changes: 3 additions & 3 deletions prototypes/fluids/msa.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ RECIPE {
enabled = false,
energy_required = 6,
ingredients = {
{type = "fluid", name = "dms", amount = 50},
{type = "fluid", name = "hydrogen-peroxide", amount = 100},
{type = "fluid", name = "industrial-solvent", amount = 100},
{type = "fluid", name = "dms", amount = 50},
{type = "fluid", name = "hydrogen-peroxide", amount = 100},
{type = "fluid", name = "chlorine", amount = 100},
},
results = {
{type = "fluid", name = "msa", amount = 100}
Expand Down
2 changes: 1 addition & 1 deletion prototypes/fluids/propene.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RECIPE {
ingredients = {
{type = "fluid", name = "syngas", amount = 60},
{type = "fluid", name = "steam", amount = 200},
{type = "item", name = "iron-plate", amount = 4}
{type = "item", name = "lead-plate", amount = 4}
},
results = {
{type = "fluid", name = "propene", amount = 60},
Expand Down
20 changes: 10 additions & 10 deletions prototypes/item-groups.lua
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,13 @@ data:extend {
},
}

if not mods["pyindustry"] then
data:extend {
{
type = "item-subgroup",
name = "py-trains",
group = "py-hightech",
order = "u"
}
}
end
-- if not mods["pyindustry"] then
-- data:extend {
-- {
-- type = "item-subgroup",
-- name = "py-trains",
-- group = "py-hightech",
-- order = "u"
-- }
-- }
-- end
Loading