Skip to content

Battery equipment 3 fix #572

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.

Sign up for GitHub

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

Open
Qatavin wants to merge 13 commits into
base: dev
Choose a base branch
from
+33 −14
Open

Battery equipment 3 fix #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d95ed35
Update functions.lua
Qatavin Apr 2, 2026
9d47910
Update functions.lua
Qatavin Apr 5, 2026
d280b7e
Add files via upload
Qatavin Apr 6, 2026
3e5c271
Update bobequipment_2.0.0.json
Qatavin Apr 6, 2026
697a86d
Update info.json
Qatavin Apr 6, 2026
900fe3e
Update info.json
Qatavin Apr 6, 2026
d533b9a
Update equipment.lua
Qatavin Apr 6, 2026
116e2c6
Update data-updates.lua
Qatavin Apr 6, 2026
bde8601
Update equipment.lua
Qatavin Apr 6, 2026
fcc4f13
Update equipment.lua
Qatavin Apr 6, 2026
d5f147f
Update updates.lua
Qatavin Apr 6, 2026
1eaec9a
Update equipment.lua
Qatavin Apr 6, 2026
0b2f148
Update technology-updates.lua
Qatavin Apr 6, 2026
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
2 changes: 1 addition & 1 deletion bobequipment/data-updates.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions bobequipment/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "bobequipment",
"version": "2.0.3",
"version": "2.0.4",
"factorio_version": "2.0",
"title": "Bob's Personal Equipment mod",
"author": "Bobingabout",
"contact": "",
"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"
Expand Down
3 changes: 0 additions & 3 deletions bobequipment/migrations/bobequipment_2.0.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down
14 changes: 14 additions & 0 deletions bobequipment/migrations/bobequipment_2.0.4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
]
}
3 changes: 2 additions & 1 deletion bobequipment/prototypes/equipment/equipment.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 3 additions & 2 deletions bobequipment/prototypes/item/equipment.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions bobequipment/prototypes/recipe/equipment.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,22 +67,22 @@ 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",
name = "bob-battery-mk4-equipment",
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 } },
Expand Down
2 changes: 1 addition & 1 deletion bobequipment/prototypes/recipe/updates.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion bobequipment/prototypes/technology/equipment.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ data:extend({
effects = {
{
type = "unlock-recipe",
recipe = "bob-battery-mk3-equipment",
recipe = "battery-mk3-equipment",
},
},
},
Expand Down
6 changes: 6 additions & 0 deletions bobequipment/prototypes/technology/technology-updates.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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