Skip to content

Commit

Permalink
Update Assembling Machines for 2.0 (#203)
Browse files Browse the repository at this point in the history
* Delete bobassembly/graphics/entity/assembling-machine-4 directory

Removing old low-res graphics. The relevant prototype now uses the same color mask graphics as the rest of the assembling machines in both old and new color schemes.

* Add new hr assembling machine color mask

* Delete bobassembly/graphics/entity/assembling-machine/assembling-machine-0.png

* Delete bobassembly/graphics/entity/assembling-machine/assembling-machine-1-shadow.png

* Delete bobassembly/graphics/entity/assembling-machine/assembling-machine-1.png

* Delete bobassembly/graphics/entity/assembling-machine/assembling-machine-2-shadow.png

* Delete bobassembly/graphics/entity/assembling-machine/assembling-machine-2.png

* Delete bobassembly/graphics/entity/assembling-machine/assembling-machine-3-shadow.png

* Delete bobassembly/graphics/entity/assembling-machine/assembling-machine-3.png

* Delete bobassembly/graphics/entity/assembling-machine/assembling-machine-mask.png

* Delete bobassembly/graphics/entity/chemical-plant/remnants/chemical-plant-remnants-mask.png

* Delete bobassembly/graphics/entity/chemical-plant/remnants/chemical-plant-remnants.png

* Delete bobassembly/graphics/entity/chemical-plant/chemical-plant-highlights.png

* Delete bobassembly/graphics/entity/chemical-plant/chemical-plant-mask.png

* Delete bobassembly/graphics/entity/chemical-plant/chemical-plant-shadow.png

* Delete bobassembly/graphics/entity/chemical-plant/chemical-plant.png

* Delete bobassembly/graphics/entity/electric-furnace/electric-furnace.png

* Delete bobassembly/graphics/entity/electric-furnace/electric-furnace-heater.png

* Delete bobassembly/graphics/entity/electric-furnace/electric-furnace-propeller-1.png

* Delete bobassembly/graphics/entity/electric-furnace/electric-furnace-propeller-2.png

* Delete bobassembly/graphics/entity/electric-furnace/electric-furnace-shadow.png

* Delete bobassembly/graphics/entity/electrolyser/electrolyser-2-base.png

* Delete bobassembly/graphics/entity/electrolyser/electrolyser-2-highlights.png

* Delete bobassembly/graphics/entity/electrolyser/electrolyser-2-mask.png

* Delete bobassembly/graphics/entity/electrolyser/electrolyser-2-shadow.png

* Delete bobassembly/graphics/entity/electrolyser/electrolyser-3-base.png

* Delete bobassembly/graphics/entity/electrolyser/electrolyser-3-highlights.png

* Delete bobassembly/graphics/entity/electrolyser/electrolyser-3-mask.png

* Delete bobassembly/graphics/entity/electrolyser/electrolyser-3-shadow.png

* Delete bobassembly/graphics/entity/electrolyser/electrolyser-4-base.png

* Delete bobassembly/graphics/entity/electrolyser/electrolyser-4-highlights.png

* Delete bobassembly/graphics/entity/electrolyser/electrolyser-4-mask.png

* Delete bobassembly/graphics/entity/electrolyser/electrolyser-4-shadow.png

* Delete bobassembly/graphics/entity/electrolyser/electrolyser-5-base.png

* Delete bobassembly/graphics/entity/electrolyser/electrolyser-5-highlights.png

* Delete bobassembly/graphics/entity/electrolyser/electrolyser-5-mask.png

* Delete bobassembly/graphics/entity/electrolyser/electrolyser-5-shadow.png

* Update assembly-burner.lua

Updating fluid boxes, emissions_per_minute, color masks, and circuit connections.

* Update assembly-electronics.lua

Updating fluid boxes, pollution, color masks, and circuit connections.

* Removing reference to removed recipes

Removing reference to red/green wire recipes that no longer exist.

* Update assembly.lua

Update fluid boxes, color masks, graphics, and circuit connections. Also replace removed techs and items from assem 4 tech and assem 6 recipe.

* Revert accidental pipe_pictures change

* Update assembly-updates.lua

Add assem 6 replacement for processing unit -> APU
Fix automation 3 prereq
Update color masks
Add check for AAI loaders size change

* Update pollution and replace changed prereq

* Update chemical-mixing-furnace.lua

Updated graphics, fluid boxes, and circuit connections. Replaced name-changed tech prereq

* Update chemical-plant.lua

Updated fluid boxes, pollution, changed tech prereqs, graphics, and circuit connections.

* Add graphics_set_flipped and adjust energy_usage and mining_time

* Fix leftover changes from testing

* Update electric-furnace.lua

Updated graphics, pollution, and renamed tech prereqs.

* Update electrolyser.lua

Updated graphics, fluid boxes, pollution, circuit connections, and renamed tech prereqs.

* Update fluid box and pollution

* Update pollution and renamed tech prereqs

* Update distillery.lua

Added graphics_set_flipped, updated fluid boxes and pollution, adjusted energy usage and mining time.

* Update entities.lua

Updated all fluid boxes and pollution. Removed low res graphics. Added and updated circuit connections. Fixed graphics pointer for steel furnaces. Added graphics_set_flipped to stone chemical furnace.

* Update changelog.txt

* Delete bobplates/graphics/entity/electric-furnace/electric-furnace-heater.png

* Delete bobplates/graphics/entity/electric-furnace/electric-furnace-propeller-1.png

* Delete bobplates/graphics/entity/electric-furnace/electric-furnace-propeller-2.png

* Update changelog.txt

* Updating directions to use defines constants

* Fix overlooked change made for testing

* Add missing comma

* Additional fixes for small storage tank

* Move small storage tank subgroup

The old subgroup put the small storage tanks a separate recipe group entirely alone if boblogistics is not active, which is obviously nonsensical. This will place them with the other storage tank.

* Move small storage tank subgroup

* Vanilla item name changed

* Update nuclear.lua

* Update pumps.lua

Add flipped graphics set (shifting the entity graphics over by one tile, since they only actually fill half of the square, allows them to align with the flipped location of the fluid connections)

Updated fluid boxes and pollution.

* Add impact_category

* Add impact_category

* Add impact_category

* Add impact_category

* Replace impact_sound to impact_category

* Add impact_category

* Replace impact_sound with impact_category

* Replace impact_sound with impact_category

* Add impact_category

* Remove lowres graphics

* Add circuit connections and impact_category

* Delete centrifuge-A-light.png

* Delete centrifuge-B-light.png

* Delete centrifuge-C-light.png

* Delete electrolyser-1-base.png

* Delete electrolyser-1-highlights.png

* Delete electrolyser-1-mask.png

* Delete electrolyser-1-shadow.png

* Add new item sounds and weight

* Add new item sounds and weight

* Add new item sounds and weight

* Add new item sounds

* Add new item sounds

* Add new item sounds and weight

* Add new item sounds

* Add new item sounds and weight

* Add new item sounds and weight

* Add new item sounds

* Add new item sounds

* Add new item sounds and weight

* Add new item sounds and weight

* Renaming hr graphics (bobassembly)

* Renaming hr graphics (bobplates)

* Don't link to the same table instance

---------

Co-authored-by: KiwiHawk <[email protected]>
  • Loading branch information
Qatavin and KiwiHawk authored Nov 12, 2024
1 parent 0774bbb commit 04facfe
Show file tree
Hide file tree
Showing 120 changed files with 1,636 additions and 1,551 deletions.
9 changes: 8 additions & 1 deletion bobassembly/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
---------------------------------------------------------------------------------------------------
Version: 1.3.0
Date: ???
Info:
- Update for Factorio 2.0 #189
Changes:
- Code tidy: Remove unnecessary global variables #178
- Improved Assembling Machine tier progression #179
- Update for Factorio 2.0 #189
- Updated fluid boxes so that various 2x2-sized machines can be mirrored freely #166
- Removed some old low-resolution graphics #200
- Updated Assembling Machine color mask #200
- Added circuit connections to relevant machines #200
Bugfixes:
- Fixed Assembling Machine scaling with AAI loaders' rescale setting #167
---------------------------------------------------------------------------------------------------
Version: 1.2.2
Date: 21. 02. 2024
Expand Down
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Binary file modified bobassembly/graphics/entity/chemical-plant/chemical-plant.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file modified bobassembly/graphics/entity/electrolyser/electrolyser-2-mask.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
150 changes: 73 additions & 77 deletions bobassembly/prototypes/assembly-burner.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
if not mods["aai-industry"] and settings.startup["bobmods-assembly-burner"].value == true then

circuit_connector_definitions["small-assembling-machine"] = circuit_connector_definitions.create_vector(universal_connector_template,
{
{ variation = 18, main_offset = util.by_pixel(8, 16.25), shadow_offset = util.by_pixel(13.25, 20.75), show_shadow = true },
{ variation = 18, main_offset = util.by_pixel(8, 16.25), shadow_offset = util.by_pixel(13.25, 20.75), show_shadow = true },
{ variation = 31, main_offset = util.by_pixel(22, -10), shadow_offset = util.by_pixel(26, -2.5), show_shadow = true },
{ variation = 18, main_offset = util.by_pixel(8, 16.25), shadow_offset = util.by_pixel(13.25, 20.75), show_shadow = true }
}
)

data:extend({
{
type = "item",
Expand All @@ -9,6 +19,19 @@ if not mods["aai-industry"] and settings.startup["bobmods-assembly-burner"].valu
order = "1[burner-assembling-machine]",
place_result = "burner-assembling-machine",
stack_size = 50,
drop_sound = {
filename = "__base__/sound/item/mechanical-inventory-move.ogg",
volume = 0.7
},
inventory_move_sound = {
filename = "__base__/sound/item/mechanical-inventory-move.ogg",
volume = 0.7
},
pick_sound = {
filename = "__base__/sound/item/mechanical-inventory-pickup.ogg",
volume = 0.8
},
weight = 10000
},

{
Expand All @@ -30,6 +53,8 @@ if not mods["aai-industry"] and settings.startup["bobmods-assembly-burner"].valu
flags = { "placeable-neutral", "placeable-player", "player-creation" },
minable = { mining_time = 0.2, result = "burner-assembling-machine" },
max_health = 200,
circuit_wire_max_distance = assembling_machine_circuit_wire_max_distance,
circuit_connector = circuit_connector_definitions["small-assembling-machine"],
corpse = "medium-remnants",
dying_explosion = "medium-explosion",
resistances = {
Expand All @@ -47,62 +72,40 @@ if not mods["aai-industry"] and settings.startup["bobmods-assembly-burner"].valu
{
filename = "__bobassembly__/graphics/entity/assembling-machine/assembling-machine-1.png",
priority = "high",
width = 108,
height = 114,
width = 214,
height = 226,
frame_count = 32,
line_length = 8,
shift = util.by_pixel(0, 2 * 2 / 3),
scale = 2 / 3,
hr_version = {
filename = "__bobassembly__/graphics/entity/assembling-machine/hr-assembling-machine-1.png",
priority = "high",
width = 214,
height = 226,
frame_count = 32,
line_length = 8,
shift = util.by_pixel(0, 2 * 2 / 3),
scale = 1 / 3,
},
scale = 1 / 3,
},
{
filename = "__bobassembly__/graphics/entity/assembling-machine/assembling-machine-mask.png",
priority = "high",
width = 142,
height = 113,
width = 214,
height = 237,
repeat_count = 32,
shift = { 0.84 * 2 / 3, -0.09 * 2 / 3 },
scale = 2 / 3,
scale = 1 / 3,
tint = { r = 0.2, g = 0.2, b = 0.2 },
},
{
filename = "__bobassembly__/graphics/entity/assembling-machine/assembling-machine-1-shadow.png",
priority = "high",
width = 95,
height = 83,
width = 190,
height = 165,
frame_count = 1,
line_length = 1,
repeat_count = 32,
draw_as_shadow = true,
shift = util.by_pixel(8.5 * 2 / 3, 5.5 * 2 / 3),
scale = 2 / 3,
hr_version = {
filename = "__bobassembly__/graphics/entity/assembling-machine/hr-assembling-machine-1-shadow.png",
priority = "high",
width = 190,
height = 165,
frame_count = 1,
line_length = 1,
repeat_count = 32,
draw_as_shadow = true,
shift = util.by_pixel(8.5 * 2 / 3, 5 * 2 / 3),
scale = 1 / 3,
},
shift = util.by_pixel(8.5 * 2 / 3, 5 * 2 / 3),
scale = 1 / 3,
},
},
},
},
open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 },
close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 },
impact_category = "metal",
working_sound = {
sound = {
{
Expand All @@ -124,7 +127,7 @@ if not mods["aai-industry"] and settings.startup["bobmods-assembly-burner"].valu
fuel_categories = { "chemical" },
effectivity = 1,
fuel_inventory_size = 1,
emissions_per_minute = 4,
emissions_per_minute = { pollution = 4 },
smoke = {
{
name = "smoke",
Expand All @@ -149,6 +152,19 @@ if not mods["aai-industry"] and settings.startup["bobmods-assembly-burner"].valu
order = "1[steam-assembling-machine]",
place_result = "steam-assembling-machine",
stack_size = 50,
drop_sound = {
filename = "__base__/sound/item/mechanical-inventory-move.ogg",
volume = 0.7
},
inventory_move_sound = {
filename = "__base__/sound/item/mechanical-inventory-move.ogg",
volume = 0.7
},
pick_sound = {
filename = "__base__/sound/item/mechanical-inventory-pickup.ogg",
volume = 0.8
},
weight = 40000
},

{
Expand All @@ -171,6 +187,8 @@ if not mods["aai-industry"] and settings.startup["bobmods-assembly-burner"].valu
flags = { "placeable-neutral", "placeable-player", "player-creation" },
minable = { mining_time = 0.2, result = "steam-assembling-machine" },
max_health = 300,
circuit_wire_max_distance = assembling_machine_circuit_wire_max_distance,
circuit_connector = circuit_connector_definitions["assembling-machine"],
corpse = "medium-remnants",
dying_explosion = "medium-explosion",
resistances = {
Expand All @@ -184,22 +202,20 @@ if not mods["aai-industry"] and settings.startup["bobmods-assembly-burner"].valu
production_type = "input",
pipe_picture = assembler2pipepictures(),
pipe_covers = pipecoverspictures(),
base_area = 10,
base_level = -1,
pipe_connections = { { type = "input", position = { 0, -2 } } },
pipe_connections = { { flow_direction = "input", direction = defines.direction.north, position = { 0, -1 } } },
secondary_draw_orders = { north = -1 },
volume = 1000
},
{
production_type = "output",
pipe_picture = assembler2pipepictures(),
pipe_covers = pipecoverspictures(),
base_area = 10,
base_level = 1,
pipe_connections = { { type = "output", position = { 0, 2 } } },
pipe_connections = { { flow_direction = "output", direction = defines.direction.south, position = { 0, 1 } } },
secondary_draw_orders = { north = -1 },
volume = 1000
},
off_when_no_fluid_recipe = true,
},
fluid_boxes_off_when_no_fluid_recipe = true,
collision_box = { { -1.2, -1.2 }, { 1.2, 1.2 } },
selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
fast_replaceable_group = "assembling-machine",
Expand All @@ -209,59 +225,41 @@ if not mods["aai-industry"] and settings.startup["bobmods-assembly-burner"].valu
{
filename = "__bobassembly__/graphics/entity/assembling-machine/assembling-machine-1.png",
priority = "high",
width = 108,
height = 114,
width = 214,
height = 226,
frame_count = 32,
line_length = 8,
shift = util.by_pixel(0, 2),
hr_version = {
filename = "__bobassembly__/graphics/entity/assembling-machine/hr-assembling-machine-1.png",
priority = "high",
width = 214,
height = 226,
frame_count = 32,
line_length = 8,
shift = util.by_pixel(0, 2),
scale = 0.5,
},
scale = 0.5,
},
{
filename = "__bobassembly__/graphics/entity/assembling-machine/assembling-machine-mask.png",
priority = "high",
width = 142,
height = 113,
width = 214,
height = 237,
repeat_count = 32,
shift = { 0.84, -0.09 },
shift = util.by_pixel(0, -0.75),
scale = 0.5,
tint = { r = 1, g = 1, b = 1 },
},
{
filename = "__bobassembly__/graphics/entity/assembling-machine/assembling-machine-1-shadow.png",
priority = "high",
width = 95,
height = 83,
width = 190,
height = 165,
frame_count = 1,
line_length = 1,
repeat_count = 32,
draw_as_shadow = true,
shift = util.by_pixel(8.5, 5.5),
hr_version = {
filename = "__bobassembly__/graphics/entity/assembling-machine/hr-assembling-machine-1-shadow.png",
priority = "high",
width = 190,
height = 165,
frame_count = 1,
line_length = 1,
repeat_count = 32,
draw_as_shadow = true,
shift = util.by_pixel(8.5, 5),
scale = 0.5,
},
shift = util.by_pixel(8.5, 5),
scale = 0.5,
},
},
},
},
open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 },
close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 },
impact_category = "metal",
working_sound = {
sound = {
{
Expand All @@ -281,19 +279,17 @@ if not mods["aai-industry"] and settings.startup["bobmods-assembly-burner"].valu
energy_source = {
type = "fluid",
effectivity = 1,
emissions_per_minute = 5, --fairly sure this scales, so it would be 1 at level 1 speed.
emissions_per_minute = { pollution = 5 }, --fairly sure this scales, so it would be 1 at level 1 speed.
fluid_box = {
base_area = 1,
height = 2,
base_level = -1,
pipe_connections = {
{ type = "input-output", position = { 2, 0 } },
{ type = "input-output", position = { -2, 0 } },
{ flow_direction = "input-output", direction = defines.direction.east, position = { 1, 0 } },
{ flow_direction = "input-output", direction = defines.direction.west, position = { -1, 0 } },
},
pipe_covers = pipecoverspictures(),
pipe_picture = assembler2pipepictures(),
production_type = "input-output",
filter = "steam",
volume = 10
},
burns_fluid = false,
scale_fluid_usage = false,
Expand Down
Loading

0 comments on commit 04facfe

Please sign in to comment.