Skip to content

Commit

Permalink
Assembly 2.0 polish (#233)
Browse files Browse the repository at this point in the history
* Delete technology/multi-purpose-furnace.png

This icon is no longer used

* Fix multi furnace tech icons

Icons fixed to have correct proportions and to use the electric furnace graphic instead of steel furnace, to match the machine they unlock.

* Clean up fluid_boxes and use forced_symmetry for flipping

* Clean up fluid boxes and use forced_symmetry for flipping
  • Loading branch information
Qatavin authored Nov 18, 2024
1 parent bcafff8 commit 95d5604
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 41 deletions.
Binary file not shown.
17 changes: 2 additions & 15 deletions bobassembly/prototypes/assembly-electronics.lua
Original file line number Diff line number Diff line change
Expand Up @@ -246,16 +246,9 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
secondary_draw_orders = { north = -1 },
volume = 1000,
},
{
production_type = "output",
pipe_connections = {
{ flow_direction = "output", direction = defines.direction.south, position = { 0.5, 0.5 } },
},
secondary_draw_orders = { north = -1 },
volume = 1,
},
},
fluid_boxes_off_when_no_fluid_recipe = true,
forced_symmetry = "vertical",
collision_box = { { -0.7, -0.7 }, { 0.7, 0.7 } },
selection_box = { { -1, -1 }, { 1, 1 } },
fast_replaceable_group = "assembling-machine",
Expand Down Expand Up @@ -427,15 +420,9 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
},
volume = 1000,
},
{
production_type = "output",
pipe_connections = {
{ flow_direction = "output", direction = defines.direction.south, position = { 0.5, 0.5 } },
},
volume = 1,
},
},
fluid_boxes_off_when_no_fluid_recipe = true,
forced_symmetry = "vertical",
collision_box = { { -0.7, -0.7 }, { 0.7, 0.7 } },
selection_box = { { -1, -1 }, { 1, 1 } },
fast_replaceable_group = "assembling-machine",
Expand Down
24 changes: 12 additions & 12 deletions bobassembly/prototypes/chemical-mixing-furnace.lua
Original file line number Diff line number Diff line change
Expand Up @@ -285,24 +285,23 @@ then
type = "technology",
name = "multi-purpose-furnace-1",
icon_size = 128,
-- icon = "__bobassembly__/graphics/icons/technology/multi-purpose-furnace.png",
icons = {
{
icon_size = 256,
scale = 0.25,
icon = "__base__/graphics/technology/advanced-material-processing.png",
scale = 0.5,
icon = "__base__/graphics/technology/advanced-material-processing-2.png",
},
{
icon = "__bobassembly__/graphics/icons/technology/chemistry.png",
icon_size = 64,
scale = 0.5,
shift = { -16, -16 },
scale = 1,
shift = { -32, -32 },
},
{
icon = "__bobassembly__/graphics/icons/technology/alloy-processing.png",
icon_size = 128,
scale = 0.25,
shift = { 16, -16 },
scale = 0.5,
shift = { 32, -32 },
},
},
order = "c-c-b-1",
Expand Down Expand Up @@ -332,22 +331,23 @@ then
type = "technology",
name = "multi-purpose-furnace-2",
icon_size = 128,
-- icon = "__bobassembly__/graphics/icons/technology/multi-purpose-furnace.png",
icons = {
{
icon_size = 256,
icon = "__base__/graphics/technology/advanced-material-processing.png",
scale = 0.5,
icon = "__base__/graphics/technology/advanced-material-processing-2.png",
},
{
icon = "__bobassembly__/graphics/icons/technology/chemistry.png",
icon_size = 64,
scale = 2,
shift = { -64, -64 },
scale = 1,
shift = { -32, -32 },
},
{
icon = "__bobassembly__/graphics/icons/technology/alloy-processing.png",
icon_size = 128,
shift = { 64, -64 },
scale = 0.5,
shift = { 32, -32 },
},
},
order = "c-c-b-2",
Expand Down
16 changes: 2 additions & 14 deletions bobplates/prototypes/entity/entities.lua
Original file line number Diff line number Diff line change
Expand Up @@ -182,14 +182,8 @@ data:extend({
secondary_draw_orders = { north = -1, east = -1, west = -1 },
volume = 1000,
},
{
production_type = "output",
pipe_connections = {
{ flow_direction = "output", direction = defines.direction.south, position = { 0.5, 0.5 } },
},
volume = 1,
},
},
forced_symmetry = "vertical",
collision_box = { { -0.7, -0.7 }, { 0.7, 0.7 } },
selection_box = { { -1, -1 }, { 1, 1 } },
crafting_categories = { "chemical-furnace" },
Expand Down Expand Up @@ -359,15 +353,9 @@ data:extend({
secondary_draw_orders = { north = -1, east = -1, west = -1 },
volume = 1000,
},
{
production_type = "output",
pipe_connections = {
{ flow_direction = "output", direction = defines.direction.south, position = { 0.5, 0.5 } },
},
volume = 1,
},
},
fluid_boxes_off_when_no_fluid_recipe = true,
forced_symmetry = "vertical",
collision_box = { { -0.7, -0.7 }, { 0.7, 0.7 } },
selection_box = { { -1, -1 }, { 1, 1 } },
crafting_categories = { "chemical-furnace" },
Expand Down

0 comments on commit 95d5604

Please sign in to comment.