Skip to content

Commit

Permalink
Allowed pumpjacks to be flippable once again.
Browse files Browse the repository at this point in the history
  • Loading branch information
@notnotmelon
notnotmelon committed Jan 20, 2025
1 parent 48c12dd commit 912ad5a
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 31 deletions.
6 changes: 6 additions & 0 deletions changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
---------------------------------------------------------------------------------------------------
Version: 3.0.12
Date: 2024-1-20
Changes:
- Allowed pumpjacks to be flippable once again.
- Updated pumpjack pipe connections to prevent floating connector graphics in certain rotations.
---------------------------------------------------------------------------------------------------
Version: 3.0.11
Date: 2024-1-20
Changes:
Expand Down
32 changes: 13 additions & 19 deletions prototypes/buildings/pumpjack-mk01.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ ENTITY {
dying_explosion = "big-explosion",
collision_box = {{-2.9, -2.9}, {2.9, 2.9}},
selection_box = {{-3.0, -3.0}, {3.0, 3.0}},
forced_symmetry = "diagonal-pos",
module_slots = 1,
allowed_effects = {"speed", "consumption"},
crafting_categories = {"pumpjack"},
Expand All @@ -56,24 +57,13 @@ ENTITY {
animation = {
layers = {
{
filename = "__pypetroleumhandlinggraphics__/graphics/entity/pumpjack-mk01/right.png",
width = 96,
height = 214,
priority = "extra-high",
filename = "__pypetroleumhandlinggraphics__/graphics/entity/pumpjack-mk01/small-pumpjack.png",
width = 1770 / 10,
height = 1070 / 5,
line_length = 10,
frame_count = 50,
shift = {-0.2, -0.3},
animation_speed = 0.4,
shift = util.by_pixel(48, -20)
},
{
filename = "__pypetroleumhandlinggraphics__/graphics/entity/pumpjack-mk01/left.png",
width = 96,
height = 214,
priority = "very-low",
line_length = 10,
frame_count = 50,
animation_speed = 0.4,
shift = util.by_pixel(-48, -20)
},
{
filename = "__pypetroleumhandlinggraphics__/graphics/entity/pumpjack-mk01/small-pumpjack-sh.png",
Expand All @@ -94,15 +84,19 @@ ENTITY {
--1
{
production_type = "output",
pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
pipe_covers = py.pipe_covers(false, true, true, true),
pipe_picture = py.sexy_pipe_pictures(),
pipe_picture_frozen = py.sexy_pipe_pictures_frozen(),
pipe_covers = pipecoverspictures(),
secondary_draw_orders = {north = -1, east = -1, west = -1},
volume = 100,
pipe_connections = {{flow_direction = "output", position = {-0.5, 2.5}, direction = defines.direction.south}}
},
{
production_type = "input",
pipe_covers = py.pipe_covers(true, true, true, true),
pipe_picture = py.pipe_pictures("assembling-machine-3", nil, {0, -0.88}, nil, nil),
pipe_picture = py.sexy_pipe_pictures(),
pipe_picture_frozen = py.sexy_pipe_pictures_frozen(),
pipe_covers = pipecoverspictures(),
secondary_draw_orders = {north = -1, east = -1, west = -1},
volume = 1000,
pipe_connections = {{flow_direction = "input", position = {0.5, -2.5}, direction = defines.direction.north}}
},
Expand Down
13 changes: 9 additions & 4 deletions prototypes/buildings/pumpjack-mk02.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ ENTITY {
dying_explosion = "big-explosion",
collision_box = {{-3.4, -3.4}, {3.4, 3.4}},
selection_box = {{-3.5, -3.5}, {3.5, 3.5}},
forced_symmetry = "diagonal-pos",
module_slots = 2,
allowed_effects = {"speed", "consumption"},
crafting_categories = {"pumpjack"},
Expand Down Expand Up @@ -82,15 +83,19 @@ ENTITY {
--1
{
production_type = "output",
pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
pipe_covers = py.pipe_covers(false, true, true, true),
pipe_picture = py.sexy_pipe_pictures(),
pipe_picture_frozen = py.sexy_pipe_pictures_frozen(),
pipe_covers = pipecoverspictures(),
secondary_draw_orders = {north = -1, east = -1, west = -1},
volume = 100,
pipe_connections = {{flow_direction = "output", position = {-1.0, 3.0}, direction = defines.direction.south}}
},
{
production_type = "input",
pipe_covers = py.pipe_covers(true, true, true, true),
pipe_picture = py.pipe_pictures("assembling-machine-3", nil, {0, -0.88}, nil, nil),
pipe_picture = py.sexy_pipe_pictures(),
pipe_picture_frozen = py.sexy_pipe_pictures_frozen(),
pipe_covers = pipecoverspictures(),
secondary_draw_orders = {north = -1, east = -1, west = -1},
volume = 1000,
pipe_connections = {{flow_direction = "input", position = {1.0, -3.0}, direction = defines.direction.north}}
},
Expand Down
13 changes: 9 additions & 4 deletions prototypes/buildings/pumpjack-mk03.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ ENTITY {
dying_explosion = "big-explosion",
collision_box = {{-4.4, -4.4}, {4.4, 4.4}},
selection_box = {{-4.5, -4.5}, {4.5, 4.5}},
forced_symmetry = "diagonal-pos",
module_slots = 3,
allowed_effects = {"speed", "consumption"},
crafting_categories = {"pumpjack"},
Expand Down Expand Up @@ -100,15 +101,19 @@ ENTITY {
--1
{
production_type = "output",
pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
pipe_covers = py.pipe_covers(false, true, true, true),
pipe_picture = py.sexy_pipe_pictures(),
pipe_picture_frozen = py.sexy_pipe_pictures_frozen(),
pipe_covers = pipecoverspictures(),
secondary_draw_orders = {north = -1, east = -1, west = -1},
volume = 100,
pipe_connections = {{flow_direction = "output", position = {-3.0, 4.0}, direction = defines.direction.south}}
},
{
production_type = "input",
pipe_covers = py.pipe_covers(true, true, true, true),
pipe_picture = py.pipe_pictures("assembling-machine-3", nil, {0, -0.88}, nil, nil),
pipe_picture = py.sexy_pipe_pictures(),
pipe_picture_frozen = py.sexy_pipe_pictures_frozen(),
pipe_covers = pipecoverspictures(),
secondary_draw_orders = {north = -1, east = -1, west = -1},
volume = 1000,
pipe_connections = {{flow_direction = "input", position = {3.0, -4.0}, direction = defines.direction.north}}
},
Expand Down
13 changes: 9 additions & 4 deletions prototypes/buildings/pumpjack-mk04.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ ENTITY {
dying_explosion = "big-explosion",
collision_box = {{-5.4, -5.4}, {5.4, 5.4}},
selection_box = {{-5.5, -5.5}, {5.5, 5.5}},
forced_symmetry = "diagonal-pos",
module_slots = 4,
allowed_effects = {"speed", "consumption"},
crafting_categories = {"pumpjack"},
Expand All @@ -57,15 +58,19 @@ ENTITY {
--1
{
production_type = "output",
pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
pipe_covers = py.pipe_covers(false, true, true, true),
pipe_picture = py.sexy_pipe_pictures(),
pipe_picture_frozen = py.sexy_pipe_pictures_frozen(),
pipe_covers = pipecoverspictures(),
secondary_draw_orders = {north = -1, east = -1, west = -1},
volume = 100,
pipe_connections = {{flow_direction = "output", position = {-3.0, 5.0}, direction = defines.direction.south}}
},
{
production_type = "input",
pipe_covers = py.pipe_covers(true, true, true, true),
pipe_picture = py.pipe_pictures("assembling-machine-3", nil, {0, -0.88}, nil, nil),
pipe_picture = py.sexy_pipe_pictures(),
pipe_picture_frozen = py.sexy_pipe_pictures_frozen(),
pipe_covers = pipecoverspictures(),
secondary_draw_orders = {north = -1, east = -1, west = -1},
volume = 1000,
pipe_connections = {{flow_direction = "input", position = {3.0, -5.0}, direction = defines.direction.north}}
},
Expand Down

0 comments on commit 912ad5a

Please sign in to comment.