From d95ed353498a1fc96b3013804df33e1be475ba10 Mon Sep 17 00:00:00 2001 From: Qatavin <108201496+Qatavin@users.noreply.github.com> Date: Wed, 1 Apr 2026 20:18:55 -0700 Subject: [PATCH 01/13] Update functions.lua --- bobenemies/prototypes/functions.lua | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/bobenemies/prototypes/functions.lua b/bobenemies/prototypes/functions.lua index 74b9c8fdb..45013ce55 100644 --- a/bobenemies/prototypes/functions.lua +++ b/bobenemies/prototypes/functions.lua @@ -693,6 +693,11 @@ function bobmods.enemies.new_biter(inputs) flags = { "placeable-neutral", "placeable-off-grid", "building-direction-8-way", "not-on-map" }, }) + table.remove(corpse_prototype.animation.layers) + corpse_prototype.animation_render_layer = "corpse" + corpse_prototype.final_render_layer = "corpse" + corpse_prototype.use_decay_layer = false + data:extend({ biter_prototype, corpse_prototype }) end @@ -1342,6 +1347,11 @@ function bobmods.enemies.new_spitter(inputs) flags = { "placeable-neutral", "placeable-off-grid", "building-direction-8-way", "not-on-map" }, }) + table.remove(corpse_prototype.animation.layers) + corpse_prototype.animation_render_layer = "corpse" + corpse_prototype.final_render_layer = "corpse" + corpse_prototype.use_decay_layer = false + if not inputs.no_acid_stream == true then bobmods.enemies.acid_stream(inputs, final_scale) end @@ -2815,6 +2825,10 @@ function bobmods.enemies.new_worm(inputs) worm_corpse_2.icon = "__base__/graphics/icons/big-worm-corpse.png" worm_corpse_1.localised_name = { "entity-name.bob-enemies-corpse" } worm_corpse_2.localised_name = { "entity-name.bob-enemies-corpse" } + worm_corpse_1.animation_render_layer = "corpse" + worm_corpse_2.animation_render_layer = "corpse" + worm_corpse_1.final_render_layer = "corpse" + worm_corpse_2.final_render_layer = "corpse" if inputs.tint2 then table.insert( @@ -3170,9 +3184,19 @@ function bobmods.enemies.new_spawner(inputs) spawner_decay_animation(3, inputs.tint), }, decay_frame_transition_duration = 360, - final_render_layer = "lower-object-above-shadow", + animation_render_layer = "corpse", + final_render_layer = "corpse", } + table.remove(spawner_corpse.animation[1].layers) + table.remove(spawner_corpse.animation[2].layers) + table.remove(spawner_corpse.animation[3].layers) + table.remove(spawner_corpse.animation[4].layers) + table.remove(spawner_corpse.decay_animation[1].layers) + table.remove(spawner_corpse.decay_animation[2].layers) + table.remove(spawner_corpse.decay_animation[3].layers) + table.remove(spawner_corpse.decay_animation[4].layers) + if inputs.tint2 then table.insert( spawner_prototype.graphics_set.animations[1].layers, From 9d479102326efc8cad104d59731a754f3121c150 Mon Sep 17 00:00:00 2001 From: Qatavin <108201496+Qatavin@users.noreply.github.com> Date: Sun, 5 Apr 2026 11:48:46 -0700 Subject: [PATCH 02/13] Update functions.lua --- bobenemies/prototypes/functions.lua | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/bobenemies/prototypes/functions.lua b/bobenemies/prototypes/functions.lua index 45013ce55..74b9c8fdb 100644 --- a/bobenemies/prototypes/functions.lua +++ b/bobenemies/prototypes/functions.lua @@ -693,11 +693,6 @@ function bobmods.enemies.new_biter(inputs) flags = { "placeable-neutral", "placeable-off-grid", "building-direction-8-way", "not-on-map" }, }) - table.remove(corpse_prototype.animation.layers) - corpse_prototype.animation_render_layer = "corpse" - corpse_prototype.final_render_layer = "corpse" - corpse_prototype.use_decay_layer = false - data:extend({ biter_prototype, corpse_prototype }) end @@ -1347,11 +1342,6 @@ function bobmods.enemies.new_spitter(inputs) flags = { "placeable-neutral", "placeable-off-grid", "building-direction-8-way", "not-on-map" }, }) - table.remove(corpse_prototype.animation.layers) - corpse_prototype.animation_render_layer = "corpse" - corpse_prototype.final_render_layer = "corpse" - corpse_prototype.use_decay_layer = false - if not inputs.no_acid_stream == true then bobmods.enemies.acid_stream(inputs, final_scale) end @@ -2825,10 +2815,6 @@ function bobmods.enemies.new_worm(inputs) worm_corpse_2.icon = "__base__/graphics/icons/big-worm-corpse.png" worm_corpse_1.localised_name = { "entity-name.bob-enemies-corpse" } worm_corpse_2.localised_name = { "entity-name.bob-enemies-corpse" } - worm_corpse_1.animation_render_layer = "corpse" - worm_corpse_2.animation_render_layer = "corpse" - worm_corpse_1.final_render_layer = "corpse" - worm_corpse_2.final_render_layer = "corpse" if inputs.tint2 then table.insert( @@ -3184,19 +3170,9 @@ function bobmods.enemies.new_spawner(inputs) spawner_decay_animation(3, inputs.tint), }, decay_frame_transition_duration = 360, - animation_render_layer = "corpse", - final_render_layer = "corpse", + final_render_layer = "lower-object-above-shadow", } - table.remove(spawner_corpse.animation[1].layers) - table.remove(spawner_corpse.animation[2].layers) - table.remove(spawner_corpse.animation[3].layers) - table.remove(spawner_corpse.animation[4].layers) - table.remove(spawner_corpse.decay_animation[1].layers) - table.remove(spawner_corpse.decay_animation[2].layers) - table.remove(spawner_corpse.decay_animation[3].layers) - table.remove(spawner_corpse.decay_animation[4].layers) - if inputs.tint2 then table.insert( spawner_prototype.graphics_set.animations[1].layers, From d280b7ef13fd612a67095f116a3b03289a9e6b26 Mon Sep 17 00:00:00 2001 From: Qatavin <108201496+Qatavin@users.noreply.github.com> Date: Sun, 5 Apr 2026 18:18:38 -0700 Subject: [PATCH 03/13] Add files via upload --- bobequipment/migrations/bobequipment_2.0.4.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 bobequipment/migrations/bobequipment_2.0.4.json diff --git a/bobequipment/migrations/bobequipment_2.0.4.json b/bobequipment/migrations/bobequipment_2.0.4.json new file mode 100644 index 000000000..e600f6c12 --- /dev/null +++ b/bobequipment/migrations/bobequipment_2.0.4.json @@ -0,0 +1,14 @@ +{ + "item": + [ + ["bob-battery-mk3-equipment", "battery-mk3-equipment"] + ], + "equipment": + [ + ["bob-battery-mk3-equipment", "battery-mk3-equipment"] + ], + "recipe": + [ + ["bob-battery-mk3-equipment", "battery-mk3-equipment"] + ] +} \ No newline at end of file From 3e5c27180154594430f072a7a8894ca85218fd6e Mon Sep 17 00:00:00 2001 From: Qatavin <108201496+Qatavin@users.noreply.github.com> Date: Sun, 5 Apr 2026 18:20:55 -0700 Subject: [PATCH 04/13] Update bobequipment_2.0.0.json --- bobequipment/migrations/bobequipment_2.0.0.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/bobequipment/migrations/bobequipment_2.0.0.json b/bobequipment/migrations/bobequipment_2.0.0.json index d69cce2e2..5b85261e0 100644 --- a/bobequipment/migrations/bobequipment_2.0.0.json +++ b/bobequipment/migrations/bobequipment_2.0.0.json @@ -1,7 +1,6 @@ { "item": [ - ["battery-mk3-equipment", "bob-battery-mk3-equipment"], ["battery-mk4-equipment", "bob-battery-mk4-equipment"], ["battery-mk5-equipment", "bob-battery-mk5-equipment"], ["battery-mk6-equipment", "bob-battery-mk6-equipment"], @@ -41,7 +40,6 @@ ], "equipment": [ - ["battery-mk3-equipment", "bob-battery-mk3-equipment"], ["battery-mk4-equipment", "bob-battery-mk4-equipment"], ["battery-mk5-equipment", "bob-battery-mk5-equipment"], ["battery-mk6-equipment", "bob-battery-mk6-equipment"], @@ -81,7 +79,6 @@ ], "recipe": [ - ["battery-mk3-equipment", "bob-battery-mk3-equipment"], ["battery-mk4-equipment", "bob-battery-mk4-equipment"], ["battery-mk5-equipment", "bob-battery-mk5-equipment"], ["battery-mk6-equipment", "bob-battery-mk6-equipment"], From 697a86deba0c3853938582d8bffdd337caf79f7f Mon Sep 17 00:00:00 2001 From: Qatavin <108201496+Qatavin@users.noreply.github.com> Date: Sun, 5 Apr 2026 18:21:28 -0700 Subject: [PATCH 05/13] Update info.json --- bobequipment/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bobequipment/info.json b/bobequipment/info.json index 1ec0520c0..6025d4cc8 100644 --- a/bobequipment/info.json +++ b/bobequipment/info.json @@ -1,6 +1,6 @@ { "name": "bobequipment", - "version": "2.0.3", + "version": "2.0.4", "factorio_version": "2.0", "title": "Bob's Personal Equipment mod", "author": "Bobingabout", From 900fe3e0ad616329d78e7fac95cdc42a079d3f38 Mon Sep 17 00:00:00 2001 From: Qatavin <108201496+Qatavin@users.noreply.github.com> Date: Sun, 5 Apr 2026 18:23:16 -0700 Subject: [PATCH 06/13] Update info.json --- bobequipment/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bobequipment/info.json b/bobequipment/info.json index 6025d4cc8..e63aef078 100644 --- a/bobequipment/info.json +++ b/bobequipment/info.json @@ -8,7 +8,7 @@ "homepage": "https://forums.factorio.com/viewforum.php?f=51", "dependencies": [ "base >= 2.0.33", - "boblibrary >= 2.0.0", + "boblibrary >= 2.0.4", "? bobenemies >= 2.0.0", "? bobplates >= 2.0.0", "? boblogistics >= 2.0.0" From d533b9ab66c1610bdfa41ce39af2a5a8479a5fd9 Mon Sep 17 00:00:00 2001 From: Qatavin <108201496+Qatavin@users.noreply.github.com> Date: Sun, 5 Apr 2026 18:25:56 -0700 Subject: [PATCH 07/13] Update equipment.lua --- bobequipment/prototypes/equipment/equipment.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bobequipment/prototypes/equipment/equipment.lua b/bobequipment/prototypes/equipment/equipment.lua index d41ebc93b..90bd048d2 100644 --- a/bobequipment/prototypes/equipment/equipment.lua +++ b/bobequipment/prototypes/equipment/equipment.lua @@ -211,7 +211,8 @@ data.raw["battery-equipment"]["battery-mk2-equipment"].energy_source.buffer_capa data:extend({ { type = "battery-equipment", - name = "bob-battery-mk3-equipment", + name = "battery-mk3-equipment", + localised_name = { "equipment-name.bob-battery-mk3-equipment" }, sprite = { filename = "__bobequipment__/graphics/equipment/battery-mk3-equipment.png", width = 32, From 116e2c6050109cf0f502e5f934f2ea2ce7721fca Mon Sep 17 00:00:00 2001 From: Qatavin <108201496+Qatavin@users.noreply.github.com> Date: Sun, 5 Apr 2026 18:26:15 -0700 Subject: [PATCH 08/13] Update data-updates.lua --- bobequipment/data-updates.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bobequipment/data-updates.lua b/bobequipment/data-updates.lua index db738a899..b99bbd445 100644 --- a/bobequipment/data-updates.lua +++ b/bobequipment/data-updates.lua @@ -11,7 +11,7 @@ if mods["quality"] then "bob-energy-shield-mk6-equipment", "battery-equipment", "battery-mk2-equipment", - "bob-battery-mk3-equipment", + "battery-mk3-equipment", "bob-battery-mk4-equipment", "bob-battery-mk5-equipment", "bob-battery-mk6-equipment", From bde86019e93dc60c006bdec6908491990c730fdd Mon Sep 17 00:00:00 2001 From: Qatavin <108201496+Qatavin@users.noreply.github.com> Date: Sun, 5 Apr 2026 18:28:42 -0700 Subject: [PATCH 09/13] Update equipment.lua --- bobequipment/prototypes/item/equipment.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bobequipment/prototypes/item/equipment.lua b/bobequipment/prototypes/item/equipment.lua index 4d10e2abf..774656bc4 100644 --- a/bobequipment/prototypes/item/equipment.lua +++ b/bobequipment/prototypes/item/equipment.lua @@ -120,10 +120,11 @@ data.raw.item["battery-mk2-equipment"].icon_size = 64 data:extend({ { type = "item", - name = "bob-battery-mk3-equipment", + name = "battery-mk3-equipment", + localised_name = { "item-name.bob-battery-mk3-equipment" }, icon = "__bobequipment__/graphics/icons/technology/battery-mk3-equipment.png", icon_size = 64, - place_as_equipment_result = "bob-battery-mk3-equipment", + place_as_equipment_result = "battery-mk3-equipment", subgroup = "equipment", order = "c[battery]-c[battery-mk3-equipment]", stack_size = 50, From fcc4f133ab88a7f6f915f18d165a47765de034c2 Mon Sep 17 00:00:00 2001 From: Qatavin <108201496+Qatavin@users.noreply.github.com> Date: Sun, 5 Apr 2026 18:30:39 -0700 Subject: [PATCH 10/13] Update equipment.lua --- bobequipment/prototypes/recipe/equipment.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bobequipment/prototypes/recipe/equipment.lua b/bobequipment/prototypes/recipe/equipment.lua index ed4666b35..0db99e965 100644 --- a/bobequipment/prototypes/recipe/equipment.lua +++ b/bobequipment/prototypes/recipe/equipment.lua @@ -67,14 +67,14 @@ data.raw.recipe["battery-mk2-equipment"].ingredients = { data:extend({ { type = "recipe", - name = "bob-battery-mk3-equipment", + name = "battery-mk3-equipment", enabled = false, energy_required = 10, ingredients = { { type = "item", name = "battery-mk2-equipment", amount = 2 }, { type = "item", name = "battery", amount = 10 }, }, - results = { { type = "item", name = "bob-battery-mk3-equipment", amount = 1 } }, + results = { { type = "item", name = "battery-mk3-equipment", amount = 1 } }, }, { type = "recipe", @@ -82,7 +82,7 @@ data:extend({ enabled = false, energy_required = 10, ingredients = { - { type = "item", name = "bob-battery-mk3-equipment", amount = 2 }, + { type = "item", name = "battery-mk3-equipment", amount = 2 }, { type = "item", name = "processing-unit", amount = 5 }, }, results = { { type = "item", name = "bob-battery-mk4-equipment", amount = 1 } }, From d5f147ff1d650996175f7d92a2b03534ef7fd87a Mon Sep 17 00:00:00 2001 From: Qatavin <108201496+Qatavin@users.noreply.github.com> Date: Sun, 5 Apr 2026 18:30:58 -0700 Subject: [PATCH 11/13] Update updates.lua --- bobequipment/prototypes/recipe/updates.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bobequipment/prototypes/recipe/updates.lua b/bobequipment/prototypes/recipe/updates.lua index 6c613ed3a..8159deb4d 100644 --- a/bobequipment/prototypes/recipe/updates.lua +++ b/bobequipment/prototypes/recipe/updates.lua @@ -450,7 +450,7 @@ if data.raw.item["bob-gilded-copper-cable"] then end if data.raw.item["bob-lithium-ion-battery"] then - bobmods.lib.recipe.replace_ingredient("bob-battery-mk3-equipment", "battery", "bob-lithium-ion-battery") + bobmods.lib.recipe.replace_ingredient("battery-mk3-equipment", "battery", "bob-lithium-ion-battery") bobmods.lib.tech.add_prerequisite("bob-battery-equipment-3", "bob-battery-2") bobmods.lib.recipe.remove_ingredient("bob-personal-laser-defense-equipment-3", "battery") From 1eaec9a1a64c81bc0f3489b111c00fed85585c06 Mon Sep 17 00:00:00 2001 From: Qatavin <108201496+Qatavin@users.noreply.github.com> Date: Sun, 5 Apr 2026 18:32:28 -0700 Subject: [PATCH 12/13] Update equipment.lua --- bobequipment/prototypes/technology/equipment.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bobequipment/prototypes/technology/equipment.lua b/bobequipment/prototypes/technology/equipment.lua index 181162d91..6289d08e0 100644 --- a/bobequipment/prototypes/technology/equipment.lua +++ b/bobequipment/prototypes/technology/equipment.lua @@ -166,7 +166,7 @@ data:extend({ effects = { { type = "unlock-recipe", - recipe = "bob-battery-mk3-equipment", + recipe = "battery-mk3-equipment", }, }, }, From 0b2f14889d02436551f840f3cb6b8d1f5330f7cb Mon Sep 17 00:00:00 2001 From: Qatavin <108201496+Qatavin@users.noreply.github.com> Date: Sun, 5 Apr 2026 18:32:50 -0700 Subject: [PATCH 13/13] Update technology-updates.lua --- bobequipment/prototypes/technology/technology-updates.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bobequipment/prototypes/technology/technology-updates.lua b/bobequipment/prototypes/technology/technology-updates.lua index 8986d8d6d..cf1c69afb 100644 --- a/bobequipment/prototypes/technology/technology-updates.lua +++ b/bobequipment/prototypes/technology/technology-updates.lua @@ -109,3 +109,9 @@ end if data.raw.technology["bob-productivity-module-5"] then bobmods.lib.tech.add_prerequisite("bob-energy-shield-equipment-6", "bob-productivity-module-5") end + +if mods["space-age"] then + bobmods.lib.tech.hide("battery-mk3-equipment") + data.raw.technology["battery-mk3-equipment"].effects = nil + bobmods.lib.tech.replace_prerequisite_in_all("battery-mk3-equipment", "bob-battery-equipment-3") +end