Skip to content

Commit

Permalink
burner and steampowered entities etc
Browse files Browse the repository at this point in the history
  • Loading branch information
protocol-1903 committed Oct 20, 2024
1 parent 343f226 commit edcfbd5
Show file tree
Hide file tree
Showing 10 changed files with 205 additions and 147 deletions.

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,24 @@ Date: ????
Bugfixes:
- Crude DDC shows pipes when no fluid recipe is selected
- Fixed the game not loading because of stupid naming conventions
Features:
- Added steampowered compost plant to composting
- Added steampowered soil extractor
- Added steampowered wood processing unit to soil washing
Changes:
- Added new fluid connections to crude DDC
- Moved wood processing unit mk01 to wood processing
- Moved soil extractor mk01 to soil washing
- Moved washer mk01 from soil washing to latex
- Moved compost plant mk01 from composting to fertilizer mk01
- Reverted compost plant mk01 to original recipe
- Added air core inductor (12) and steampowered wood processing unit (1) to wood processing unit mk01 recipe
- Changed burner mining drill to steampowered soil extractor in soil extractor mk01 recipe
- Changed steam engine to steampowered washer in washer mk01 recipe
- Added simple circuit board (3) to washer mk01 recipe
- Moved ddc mk01 from coal processing 1 to tar processing
- Added crude ddc to ddc mk01 recipe
- Changed spore collector from electrical to steam powered
---------------------------------------------------------------------------------------------------
Version: 2.0.6
Date: 2024-10-08
Expand Down
15 changes: 13 additions & 2 deletions data-updates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,19 @@ for o, ore in pairs(ores) do
end
end

-- soot separation recipes
RECIPE("soot-to-aluminium"):remove_unlock("oil-sands"):add_unlock("mining-with-fluid")
-- burner/steam mk00 recipe adjustments
RECIPE("wpu"):add_ingredient("inductor1", 12):add_ingredient("burner-wpu", 1):add_unlock("wood-processing"):set_fields{enabled = false}

RECIPE("soil-extractormk01"):remove_ingredient("burner-mining-drill"):add_ingredient("burner-soil-extractor", 1):add_unlock("soil-washing"):set_fields{enabled = false}

RECIPE("washer"):remove_ingredient("steam-engine"):add_ingredient("burner-washer", 1):add_ingredient("electronic-circuit"):add_unlock("latex"):remove_unlock("soil-washing")

RECIPE("distilator"):add_ingredient("basic-ddc"):remove_unlock("coal-processing-1"):add_unlock("tar-processing")

RECIPE("collector"):remove_ingredient("soil-extractormk01"):add_ingredient("burner-soil-extractor", 1)
RECIPE("cultivator-mk01"):remove_ingredient("soil-extractormk01"):add_ingredient("burner-soil-extractor", 1)

RECIPE("compost-plant-mk01"):add_ingredient("compost-plant-mk00", 1):remove_unlock("compost"):add_unlock("fertilizer-mk01")

-- data.raw.technology["mega-farm"].unit.ingredients = {{"automation-science-pack", 1},{"py-science-pack-1",1}}
-- TECHNOLOGY("mega-farm"):set_fields{prerequisites = {}}
Expand Down
6 changes: 3 additions & 3 deletions data.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ require('prototypes/buildings/atomizer-mk00')
require('prototypes/buildings/basic-ddc')
require('prototypes/buildings/burner-washer')
require('prototypes/buildings/automated-screener-mk00')
-- require('prototypes/buildings/compost-plant-mk00')
-- require('prototypes/buildings/burner-soil-extractor')
-- require('prototypes/buildings/burner-wpu')
require('prototypes/buildings/compost-plant-mk00')
require('prototypes/buildings/burner-soil-extractor')
require('prototypes/buildings/burner-wpu')
require("prototypes/buildings/geothermal-plant-mk01")
require("prototypes/buildings/cultivator-mk01")
require("prototypes/buildings/cultivator-mk02")
Expand Down
2 changes: 2 additions & 0 deletions prototypes/buildings/basic-ddc.lua
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ ENTITY {
pipe_connections =
{
{type = "output", position = {-1, -2} },
{type = "output", position = {-2, -1} },
--{ position = {2, 1} },
}
},
Expand All @@ -131,6 +132,7 @@ ENTITY {
pipe_connections =
{
{type = "output", position = {1, 2} },
{type = "output", position = {2, 1} },
--{ position = {-2, -1} }
}
},
Expand Down
20 changes: 17 additions & 3 deletions prototypes/buildings/burner-soil-extractor.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ITEM {
icon = "__PyBlock__/graphics/icons/soil-extractormk00.png",
icon_size = 64,
flags = {},
subgroup = "coal-processing",
subgroup = "py-cp-buildings-mk00",
order = "g",
place_result = "burner-soil-extractor",
stack_size = 10
Expand All @@ -45,7 +45,7 @@ ENTITY {
},
allowed_effects = {"consumption", "speed", "productivity", "pollution"},
crafting_categories = {"soil-extraction"},
crafting_speed = 0.3,
crafting_speed = 0.5,
energy_source = {
type = "fluid",
effectivity = 1,
Expand All @@ -54,7 +54,21 @@ ENTITY {
base_area = 1,
height = 2,
base_level = -1,
pipe_covers = pipecoverspictures(),
pipe_covers = DATA.Pipes.covers(true, true, true, true),
pipe_picture = DATA.Pipes.pictures("assembling-machine-3", {0, 1}, {0, -1}, nil, nil, {
north = {
filename = "__pycoalprocessinggraphics__/graphics/entity/soil-extractormk01/long-pipe-north.png",
priority = "low",
width = 30,
height = 44
},
south = {
filename = "__pycoalprocessinggraphics__/graphics/entity/soil-extractormk01/pipe-south.png",
priority = "extra-high",
width = 40,
height = 45
}
}),
pipe_connections = {
{type = "input-output", position = {0, 4}},
{type = "input-output", position = {0, -4}},
Expand Down
26 changes: 14 additions & 12 deletions prototypes/buildings/burner-washer.lua
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@

RECIPE {
type = "recipe",
name = "burner-washer",
energy_required = 4,
enabled = true,
ingredients = {
{"iron-plate", 10},
{"pipe", 25},
{"stone-brick", 30}
},
results = {
{"burner-washer", 1}
}
type = "recipe",
name = "burner-washer",
energy_required = 4,
enabled = true,
ingredients = {
{"steam-engine", 2},
{"iron-plate", 10},
{"pipe", 25},
{"iron-gear-wheel", 10},
{"stone-brick", 20}
},
results = {
{"burner-washer", 1}
}
}

ITEM {
Expand Down
180 changes: 89 additions & 91 deletions prototypes/buildings/burner-wpu.lua
Original file line number Diff line number Diff line change
@@ -1,101 +1,99 @@

RECIPE {
type = "recipe",
name = "burner-wpu",
energy_required = 5,
enabled = true,
ingredients = {
--{"wood", 20},
{"iron-plate", 20},
{"iron-gear-wheel", 15},
{"burner-mining-drill", 2},
{"copper-cable", 5}
},
results = {
{"burner-wpu", 1}
}
type = "recipe",
name = "burner-wpu",
energy_required = 5,
enabled = true,
ingredients = {
{"log", 12},
{"iron-plate", 20},
{"iron-gear-wheel", 15},
{"steam-engine", 1},
{"stone-furnace", 1},
{"copper-cable", 30}
},
results = {
{"burner-wpu", 1}
}
}

ITEM {
type = "item",
name = "burner-wpu",
icon = "__PyBlock__/graphics/icons/wpu-mk00.png",
icon_size = 64,
flags = {},
subgroup = "coal-processing",
order = "c",
place_result = "burner-wpu",
stack_size = 10
}
type = "item",
name = "burner-wpu",
icon = "__PyBlock__/graphics/icons/wpu-mk00.png",
icon_size = 64,
flags = {},
subgroup = "py-cp-buildings-mk00",
order = "c",
place_result = "burner-wpu",
stack_size = 10
}

ENTITY {
type = "assembling-machine",
name = "burner-wpu",
icon = "__PyBlock__/graphics/icons/wpu-mk00.png",
icon_size = 64,
flags = {"placeable-neutral", "player-creation"},
minable = {mining_time = 1, result = "burner-wpu"},
fast_replaceable_group = "wpu",
max_health = 800,
corpse = "medium-remnants",
dying_explosion = "medium-explosion",
collision_box = {{-2.8, -2.8}, {2.8, 2.8}},
selection_box = {{-3.0, -3.0}, {3.0, 3.0}},
module_specification = {
module_slots = 0
},
allowed_effects = {"consumption", "speed", "productivity", "pollution"},
crafting_categories = {"wpu"},
crafting_speed = 1,
energy_source =
{
type = "fluid",
effectivity = 1,
emissions = 1,
fluid_box =
{
base_area = 1,
height = 2,
base_level = -1,
pipe_covers = pipecoverspictures(),
pipe_connections =
{
{type = "input-output", position = {-3.5,0.5}},
{type = "input-output", position = {3.5, 0.5} },
{type = "input-output", position = {0.5, 3.5} },
},
filter = "steam",
production_type = "input-output",
},
scale_fluid_usage = true,
},
energy_usage = "150kW",
animation = {
layers = {
{
filename = "__pycoalprocessinggraphics__/graphics/entity/wpu/left.png",
width = 96,
height = 277,
line_length = 21,
frame_count = 130,
shift = {-1.5, -1.328},
animation_speed = 0.4
},
{
filename = "__pycoalprocessinggraphics__/graphics/entity/wpu/right.png",
width = 96,
height = 277,
line_length = 21,
frame_count = 130,
shift = {1.5, -1.328},
animation_speed = 0.4
}
}
type = "assembling-machine",
name = "burner-wpu",
icon = "__PyBlock__/graphics/icons/wpu-mk00.png",
icon_size = 64,
flags = {"placeable-neutral", "player-creation"},
minable = {mining_time = 1, result = "burner-wpu"},
fast_replaceable_group = "wpu",
max_health = 800,
corpse = "medium-remnants",
dying_explosion = "medium-explosion",
collision_box = {{-2.8, -2.8}, {2.8, 2.8}},
selection_box = {{-3.0, -3.0}, {3.0, 3.0}},
module_specification = {
module_slots = 0
},
allowed_effects = {"consumption", "speed", "productivity", "pollution"},
crafting_categories = {"wpu", "wpu-handcrafting"},
crafting_speed = 0.5,
energy_source = {
type = "fluid",
effectivity = 1,
emissions = 1,
fluid_box = {
base_area = 1,
height = 2,
base_level = -1,
pipe_covers = pipecoverspictures(),
pipe_connections = {
{type = "input-output", position = {-3.5,0.5}},
{type = "input-output", position = {3.5, 0.5}}
},
filter = "steam",
production_type = "input-output",
},
vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65},
working_sound = {
sound = {filename = "__pycoalprocessinggraphics__/sounds/wpu.ogg", volume = 1.0},
idle_sound = {filename = "__pycoalprocessinggraphics__/sounds/wpu.ogg", volume = 0.6},
apparent_volume = 2.5
scale_fluid_usage = true,
},
energy_usage = "150kW",
animation = {
layers = {
{
filename = "__pycoalprocessinggraphics__/graphics/entity/wpu/left.png",
width = 96,
height = 277,
line_length = 21,
frame_count = 130,
shift = {-1.5, -1.328},
animation_speed = 0.4
},
{
filename = "__pycoalprocessinggraphics__/graphics/entity/wpu/right.png",
width = 96,
height = 277,
line_length = 21,
frame_count = 130,
shift = {1.5, -1.328},
animation_speed = 0.4
}
}
},
vehicle_impact_sound = {filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65},
working_sound = {
sound = {filename = "__pycoalprocessinggraphics__/sounds/wpu.ogg", volume = 1.0},
idle_sound = {filename = "__pycoalprocessinggraphics__/sounds/wpu.ogg", volume = 0.6},
apparent_volume = 2.5
},
next_upgrade = "wpu"
}
6 changes: 3 additions & 3 deletions prototypes/buildings/compost-plant-mk00.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ RECIPE {
type = "recipe",
name = "compost-plant-mk00",
energy_required = 0.5,
enabled = true,
enabled = false,
ingredients = {
{"boiler", 10},
{"steel-plate", 50},
Expand All @@ -11,7 +11,7 @@ RECIPE {
results = {
{"compost-plant-mk00", 1}
}
}
}:add_unlock("compost")

ITEM {
type = "item",
Expand Down Expand Up @@ -69,7 +69,7 @@ ENTITY {
},
scale_fluid_usage = true,
},
energy_usage = "400kW",
energy_usage = "300kW",
animation = {
layers = {
{
Expand Down
Loading

0 comments on commit edcfbd5

Please sign in to comment.