Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Frozen #64

Merged
merged 3 commits into from
May 28, 2024
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
9 changes: 9 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
Version: 2.0.14
Date: When it's done
Changes:
- Added circuit connectivity to Diamond and Regolite mines (credit: JStMorgan)
---------------------------------------------------------------------------------------------------
Version: 2.0.13
Date: 2024-4-30
Changes:
- Fixed that vacuum pump passthrough fluidbox couldn't pass fluid to pipes but for really real this time.
---------------------------------------------------------------------------------------------------
Version: 2.0.12
Date: 2024-4-25
Expand Down
2 changes: 1 addition & 1 deletion info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pyfusionenergy",
"version": "2.0.12",
"version": "2.0.13",
"factorio_version": "1.1",
"title": "Pyanodons Fusion Energy",
"author": "Pyanodon, Nexela, Kingarthur, notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple",
Expand Down
3 changes: 3 additions & 0 deletions prototypes/buildings/diamond-mine.lua
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ ENTITY {
width = 12,
height = 12
},
circuit_wire_connection_points = circuit_connector_definitions["diamond-mine"].points,
circuit_connector_sprites = circuit_connector_definitions["diamond-mine"].sprites,
circuit_wire_max_distance = default_circuit_wire_max_distance,
animations = {
layers = {
{
Expand Down
3 changes: 3 additions & 0 deletions prototypes/buildings/regolite-mine.lua
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ ENTITY {
width = 12,
height = 12
},
circuit_wire_connection_points = circuit_connector_definitions["regolite-mine"].points,
circuit_connector_sprites = circuit_connector_definitions["regolite-mine"].sprites,
circuit_wire_max_distance = default_circuit_wire_max_distance,
animations = {
layers = {
{
Expand Down
2 changes: 1 addition & 1 deletion prototypes/buildings/vacuum-pump-mk01.lua
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ ENTITY {
pipe_covers = py.pipe_covers(false, true, false, false),
base_area = 10,
base_level = -1,
height = 2,
height = 2,
pipe_connections = {{type = "input-output", position = {-2.0, -0}},{type = "input-output", position = {2.0, -0}}}
},
{
Expand Down
2 changes: 1 addition & 1 deletion prototypes/buildings/vacuum-pump-mk02.lua
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ ENTITY {
pipe_covers = py.pipe_covers(false, true, false, false),
base_area = 10,
base_level = -1,
height = 2,
height = 2,
pipe_connections = {{type = "input-output", position = {-2.0, -0}},{type = "input-output", position = {2.0, -0}}}
},
{
Expand Down
2 changes: 1 addition & 1 deletion prototypes/buildings/vacuum-pump-mk03.lua
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ ENTITY {
pipe_covers = py.pipe_covers(false, true, false, false),
base_area = 10,
base_level = -1,
height = 2,
height = 2,
pipe_connections = {{type = "input-output", position = {-2.0, -0}},{type = "input-output", position = {2.0, -0}}}
},
{
Expand Down
2 changes: 1 addition & 1 deletion prototypes/buildings/vacuum-pump-mk04.lua
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ ENTITY {
pipe_covers = py.pipe_covers(false, true, false, false),
base_area = 10,
base_level = -1,
height = 2,
height = 2,
pipe_connections = {{type = "input-output", position = {-2.0, -0}},{type = "input-output", position = {2.0, -0}}}
},
{
Expand Down
22 changes: 22 additions & 0 deletions prototypes/circuit-connector-definitions.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
-- Holds circuit connection definitions for PyFE entities.
-- variation counts from 0 (Python-like).

circuit_connector_definitions["diamond-mine"] = circuit_connector_definitions.create
(
universal_connector_template,
{--Directions are up, right, down, left.
{ variation = 2, main_offset = util.by_pixel(60, 65), shadow_offset = util.by_pixel(57, 77), show_shadow = false },
{ variation = 2, main_offset = util.by_pixel(60, 65), shadow_offset = util.by_pixel(57, 77), show_shadow = false },
{ variation = 2, main_offset = util.by_pixel(60, 65), shadow_offset = util.by_pixel(57, 77), show_shadow = false },
{ variation = 2, main_offset = util.by_pixel(60, 65), shadow_offset = util.by_pixel(57, 77), show_shadow = false }
}
)

circuit_connector_definitions["molybdenum-mine"] = circuit_connector_definitions.create
(
universal_connector_template,
Expand All @@ -11,3 +22,14 @@ circuit_connector_definitions["molybdenum-mine"] = circuit_connector_definitions
{ variation = 26, main_offset = util.by_pixel(72, -35), shadow_offset = util.by_pixel(69, -23), show_shadow = false }
}
)

circuit_connector_definitions["regolite-mine"] = circuit_connector_definitions.create
(
universal_connector_template,
{--Directions are up, right, down, left.
{ variation = 2, main_offset = util.by_pixel(-85, 82), shadow_offset = util.by_pixel(84, 60), show_shadow = false },
{ variation = 2, main_offset = util.by_pixel(-85, 82), shadow_offset = util.by_pixel(84, 60), show_shadow = false },
{ variation = 2, main_offset = util.by_pixel(-85, 82), shadow_offset = util.by_pixel(84, 60), show_shadow = false },
{ variation = 2, main_offset = util.by_pixel(-85, 82), shadow_offset = util.by_pixel(84, 60), show_shadow = false }
}
)
Loading