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
6 changes: 3 additions & 3 deletions data-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ RECIPE("medium-electric-pole"):add_ingredient {type = "item", name = "niobium-pl

RECIPE("big-electric-pole"):remove_ingredient("steel-plate"):remove_ingredient("copper-plate"):add_ingredient {type = "item", name = "niobium-plate", amount = 2}:add_ingredient {type = "item", name = "copper-cable", amount = 15}:replace_ingredient("iron-stick", {type = "item", name = "steel-plate", amount = 6})

RECIPE("chemical-plant"):remove_unlock("oil-processing"):set_fields {hidden = true}
ENTITY("chemical-plant"):set_fields {hidden = true}
ITEM("chemical-plant"):set_fields {hidden = true}
RECIPE("chemical-plant"):remove_unlock("oil-processing"):hide()
ENTITY("chemical-plant"):hide()
ITEM("chemical-plant"):hide()

RECIPE("pump"):remove_unlock("fluid-handling"):add_unlock("engine")

Expand Down
20 changes: 7 additions & 13 deletions prototypes/equipment/armor-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,13 @@ data.raw.armor["power-armor-mk2"].inventory_size_bonus = 100

-- This should fix this issue https://github.com/pyanodon/pybugreports/issues/1050
-- IF IF IF IF pyindustry and or pycoalprocessing are enabled only
if mods.pyhightech then
data.raw.technology["battery-equipment"].hidden = true
data.raw.technology["battery-equipment"].enabled = false
data.raw.recipe["battery-equipment"].hidden = true
data.raw.item["battery-equipment"].hidden = true
data.raw.item["battery-equipment"].place_as_equipment_result = nil
data.raw.item["battery-equipment"].localised_name = {"equipment-name.battery-equipment"}
data.raw.technology["battery-mk2-equipment"].hidden = true
data.raw.technology["battery-mk2-equipment"].enabled = false
data.raw.recipe["battery-mk2-equipment"].hidden = true
data.raw.item["battery-mk2-equipment"].hidden = true
data.raw.item["battery-mk2-equipment"].place_as_equipment_result = nil
data.raw.item["battery-mk2-equipment"].localised_name = {"equipment-name.battery-mk2-equipment"}
if mods.pyhightech then -- TODO move to updates in pyhightech and remove duplicate in pyindustry
TECHNOLOGY("battery-equipment"):hide().enabled = false
RECIPE("battery-equipment"):hide()
ITEM("battery-equipment"):hide().place_as_equipment_result = nil
TECHNOLOGY("battery-mk2-equipment"):hide().enabled = false
RECIPE("battery-mk2-equipment"):hide()
ITEM("battery-mk2-equipment"):hide().place_as_equipment_result = nil
end

data:extend {{
Expand Down
2 changes: 1 addition & 1 deletion prototypes/fluids/molten-glass.lua
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RECIPE {
}

if mods.pyrawores then
RECIPE("glass"):set_fields {enabled = false}:set_fields {hidden = true}
RECIPE("glass"):set_fields {enabled = false}:hide()
end

RECIPE {
Expand Down
4 changes: 2 additions & 2 deletions prototypes/items/items.lua
Original file line number Diff line number Diff line change
Expand Up @@ -798,8 +798,8 @@ ITEM {
}

if mods.pyrawores then
ITEM("crushed-copper").hidden = true
ITEM("crushed-iron").hidden = true
ITEM("crushed-copper"):hide()
ITEM("crushed-iron"):hide()
end

ITEM {
Expand Down
26 changes: 13 additions & 13 deletions prototypes/updates/base-oil.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,40 @@ if data.raw.resource["crude-oil"] then
data.raw.resource["crude-oil"].infinite = false
end

RECIPE("basic-oil-processing"):remove_unlock("oil-processing"):set_fields {hidden = true}
RECIPE("basic-oil-processing"):remove_unlock("oil-processing"):hide()

RECIPE("advanced-oil-processing"):remove_unlock("advanced-oil-processing"):set_fields {hidden = true}
RECIPE("advanced-oil-processing"):remove_unlock("advanced-oil-processing"):hide()

RECIPE("heavy-oil-cracking"):remove_unlock("advanced-oil-processing"):set_fields {hidden = true}
RECIPE("heavy-oil-cracking"):remove_unlock("advanced-oil-processing"):hide()

RECIPE("light-oil-cracking"):remove_unlock("advanced-oil-processing"):set_fields {hidden = true}
RECIPE("light-oil-cracking"):remove_unlock("advanced-oil-processing"):hide()

RECIPE("coal-liquefaction"):remove_unlock("coal-liquefaction"):set_fields {hidden = true}
RECIPE("coal-liquefaction"):remove_unlock("coal-liquefaction"):hide()

TECHNOLOGY("oil-processing"):set("research_trigger", nil)

TECHNOLOGY("flammables"):set_fields {enabled = false}:set_fields {hidden = true}
TECHNOLOGY("flammables"):set_fields {enabled = false}:hide()

TECHNOLOGY("coal-liquefaction"):set_fields {enabled = false}:set_fields {hidden = true}
TECHNOLOGY("coal-liquefaction"):set_fields {enabled = false}:hide()

TECHNOLOGY("lubricant"):remove_pack("chemical-science-pack"):remove_prereq("advanced-oil-processing")

TECHNOLOGY("advanced-oil-processing"):add_pack("production-science-pack")

RECIPE("oil-refinery"):remove_unlock("oil-processing"):add_unlock("plastics")

RECIPE("plastic-bar"):remove_unlock("plastics"):set_fields {hidden = true}
RECIPE("plastic-bar"):remove_unlock("plastics"):hide()

--moving solid fuels
RECIPE("solid-fuel-from-petroleum-gas"):remove_unlock("oil-processing"):set_fields {hidden = true}
RECIPE("solid-fuel-from-petroleum-gas"):remove_unlock("oil-processing"):hide()

RECIPE("solid-fuel-from-heavy-oil"):remove_unlock("advanced-oil-processing"):set_fields {hidden = true}
RECIPE("solid-fuel-from-heavy-oil"):remove_unlock("advanced-oil-processing"):hide()

RECIPE("solid-fuel-from-light-oil"):remove_unlock("advanced-oil-processing"):set_fields {hidden = true}
RECIPE("solid-fuel-from-light-oil"):remove_unlock("advanced-oil-processing"):hide()

RECIPE("sulfur"):remove_unlock("sulfur-processing"):set_fields {hidden = true}
RECIPE("sulfur"):remove_unlock("sulfur-processing"):hide()

ITEM("solid-fuel"):set_fields {hidden = true}
ITEM("solid-fuel"):hide()

if not (mods["pyrawores"]) then
TECHNOLOGY("sulfur-processing"):add_pack("chemical-science-pack")
Expand Down
8 changes: 4 additions & 4 deletions prototypes/updates/base-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ data.raw.technology["uranium-ammo"].prerequisites = {"military-2", "uranium-proc
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}
TECHNOLOGY("laser"):hide().enabled = false
TECHNOLOGY("distractor"):set_fields {prerequisites = {}}
TECHNOLOGY("modules"):set_fields {enabled = false, hidden = true}
TECHNOLOGY("modules"):hide().enabled = false
TECHNOLOGY("speed-module"):set_fields {prerequisites = {}}
TECHNOLOGY("productivity-module"):set_fields {prerequisites = {}}
TECHNOLOGY("efficiency-module"):set_fields {prerequisites = {}}
Expand Down Expand Up @@ -150,8 +150,8 @@ end

-- Recipe unlocks
RECIPE("lubricant"):remove_unlock("lubricant")
RECIPE("explosives"):remove_unlock("explosives"):set_fields {hidden = true}
RECIPE("battery"):remove_unlock("battery"):set_fields {hidden = true}
RECIPE("explosives"):remove_unlock("explosives"):hide()
RECIPE("battery"):remove_unlock("battery"):hide()

-- Recipe updates
RECIPE("flying-robot-frame"):remove_ingredient("electronic-circuit"):add_ingredient {type = "item", name = "advanced-circuit", amount = 1}
Expand Down