diff --git a/bobassembly/prototypes/assembly.lua b/bobassembly/prototypes/assembly.lua index 4dbdff7f0..00ee2baa3 100644 --- a/bobassembly/prototypes/assembly.lua +++ b/bobassembly/prototypes/assembly.lua @@ -13,8 +13,12 @@ data:extend({ -- tint = {r = 0.7, g = 0.1, b = 0.7}, -- tint = {r = 0.1, g = 0.7, b = 0.1}, + +data.raw.item["assembling-machine-1"].weight = 20000 + data.raw.item["assembling-machine-2"].icon = "__bobassembly__/graphics/icons/assembling-machine-2.png" data.raw.item["assembling-machine-2"].icon_size = 32 +data.raw.item["assembling-machine-2"].weight = 20000 data.raw["assembling-machine"]["assembling-machine-2"].icon = "__bobassembly__/graphics/icons/assembling-machine-2.png" data.raw["assembling-machine"]["assembling-machine-2"].icon_size = 32 table.insert(data.raw["assembling-machine"]["assembling-machine-2"].graphics_set.animation.layers, { @@ -30,6 +34,7 @@ table.insert(data.raw["assembling-machine"]["assembling-machine-2"].graphics_set data.raw.item["assembling-machine-3"].icon = "__bobassembly__/graphics/icons/assembling-machine-3.png" data.raw.item["assembling-machine-3"].icon_size = 32 +data.raw.item["assembling-machine-3"].weight = 20000 data.raw["assembling-machine"]["assembling-machine-3"].icon = "__bobassembly__/graphics/icons/assembling-machine-3.png" data.raw["assembling-machine"]["assembling-machine-3"].icon_size = 32 table.insert(data.raw["assembling-machine"]["assembling-machine-3"].graphics_set.animation.layers, { @@ -65,7 +70,7 @@ data:extend({ filename = "__base__/sound/item/mechanical-inventory-pickup.ogg", volume = 0.8, }, - weight = 40000, + weight = 20000, }, { @@ -246,7 +251,7 @@ data:extend({ filename = "__base__/sound/item/mechanical-inventory-pickup.ogg", volume = 0.8, }, - weight = 40000, + weight = 20000, }, { @@ -435,7 +440,7 @@ data:extend({ filename = "__base__/sound/item/mechanical-inventory-pickup.ogg", volume = 0.8, }, - weight = 40000, + weight = 20000, }, { diff --git a/bobassembly/prototypes/centrifuge.lua b/bobassembly/prototypes/centrifuge.lua index f0023a69c..b1ed50087 100644 --- a/bobassembly/prototypes/centrifuge.lua +++ b/bobassembly/prototypes/centrifuge.lua @@ -1,6 +1,7 @@ if settings.startup["bobmods-assembly-centrifuge"].value == true then data.raw.item["centrifuge"].order = "g[centrifuge-1]" data.raw["assembling-machine"]["centrifuge"].fast_replaceable_group = "centrifuge" + data.raw["assembling-machine"]["centrifuge"].weight = 1000000 data:extend({ { @@ -24,6 +25,7 @@ if settings.startup["bobmods-assembly-centrifuge"].value == true then filename = "__base__/sound/item/mechanical-inventory-pickup.ogg", volume = 0.8, }, + weight = 1000000, }, { type = "item", @@ -46,6 +48,7 @@ if settings.startup["bobmods-assembly-centrifuge"].value == true then filename = "__base__/sound/item/mechanical-inventory-pickup.ogg", volume = 0.8, }, + weight = 1000000, }, { diff --git a/bobassembly/prototypes/chemical-plant.lua b/bobassembly/prototypes/chemical-plant.lua index 5f8fedb08..65ae3013d 100644 --- a/bobassembly/prototypes/chemical-plant.lua +++ b/bobassembly/prototypes/chemical-plant.lua @@ -1,4 +1,7 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then + + data.raw.item["chemical-plant"].weight = 40000 + data:extend({ { type = "item-subgroup", @@ -139,6 +142,7 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, + weight = 40000, }, { type = "item", @@ -161,6 +165,7 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, + weight = 40000, }, { type = "item", @@ -183,6 +188,7 @@ if settings.startup["bobmods-assembly-chemicalplants"].value == true then filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, + weight = 40000, }, { diff --git a/bobassembly/prototypes/electrolyser.lua b/bobassembly/prototypes/electrolyser.lua index 4fc36bdc0..15422bf10 100644 --- a/bobassembly/prototypes/electrolyser.lua +++ b/bobassembly/prototypes/electrolyser.lua @@ -125,6 +125,7 @@ then filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, + weight = 20000, }, { type = "item", @@ -147,6 +148,7 @@ then filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, + weight = 20000, }, { type = "item", @@ -169,6 +171,7 @@ then filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, + weight = 20000, }, { @@ -192,6 +195,7 @@ then filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, + weight = 20000, }, { diff --git a/bobassembly/prototypes/fluid-furnace.lua b/bobassembly/prototypes/fluid-furnace.lua index f1e9fe40d..27b22600b 100644 --- a/bobassembly/prototypes/fluid-furnace.lua +++ b/bobassembly/prototypes/fluid-furnace.lua @@ -57,6 +57,7 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.8, }, + weight = 10000, }, util.merge({ data.raw.furnace["steel-furnace"], @@ -145,6 +146,7 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.8, }, + weight = 10000, }, { type = "recipe", @@ -315,6 +317,7 @@ if settings.startup["bobmods-assembly-oilfurnaces"].value == true then filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.8, }, + weight = 10000, }, { type = "recipe", diff --git a/bobassembly/prototypes/oil-refinery.lua b/bobassembly/prototypes/oil-refinery.lua index f0f9bc910..8f768920e 100644 --- a/bobassembly/prototypes/oil-refinery.lua +++ b/bobassembly/prototypes/oil-refinery.lua @@ -1,4 +1,7 @@ if settings.startup["bobmods-assembly-oilrefineries"].value == true then + + data.raw.item["oil-refinery"].weight = 100000, + data:extend({ { type = "item-subgroup", @@ -41,6 +44,7 @@ if settings.startup["bobmods-assembly-oilrefineries"].value == true then filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, + weight = 100000, }, { @@ -126,6 +130,7 @@ if settings.startup["bobmods-assembly-oilrefineries"].value == true then filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, + weight = 100000, }, { @@ -212,6 +217,7 @@ if settings.startup["bobmods-assembly-oilrefineries"].value == true then filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, + weight = 100000, }, { diff --git a/bobclasses/prototypes/bodies.lua b/bobclasses/prototypes/bodies.lua index 9ebf17244..68153565b 100644 --- a/bobclasses/prototypes/bodies.lua +++ b/bobclasses/prototypes/bodies.lua @@ -21,6 +21,7 @@ data:extend({ drop_sound = body_drop_move, inventory_move_sound = body_drop_move, pick_sound = body_pick, + weight = 1000000, }, { type = "item", @@ -45,6 +46,7 @@ data:extend({ drop_sound = body_drop_move, inventory_move_sound = body_drop_move, pick_sound = body_pick, + weight = 1000000, }, { type = "item", @@ -69,6 +71,7 @@ data:extend({ drop_sound = body_drop_move, inventory_move_sound = body_drop_move, pick_sound = body_pick, + weight = 1000000, }, { type = "item", @@ -93,6 +96,7 @@ data:extend({ drop_sound = body_drop_move, inventory_move_sound = body_drop_move, pick_sound = body_pick, + weight = 1000000, }, { @@ -118,6 +122,7 @@ data:extend({ drop_sound = body_drop_move, inventory_move_sound = body_drop_move, pick_sound = body_pick, + weight = 1000000, }, { type = "item", @@ -148,6 +153,7 @@ data:extend({ drop_sound = body_drop_move, inventory_move_sound = body_drop_move, pick_sound = body_pick, + weight = 1000000, }, { type = "item", @@ -178,6 +184,7 @@ data:extend({ drop_sound = body_drop_move, inventory_move_sound = body_drop_move, pick_sound = body_pick, + weight = 1000000, }, { type = "item", @@ -208,6 +215,7 @@ data:extend({ drop_sound = body_drop_move, inventory_move_sound = body_drop_move, pick_sound = body_pick, + weight = 1000000, }, { @@ -233,6 +241,7 @@ data:extend({ drop_sound = body_drop_move, inventory_move_sound = body_drop_move, pick_sound = body_pick, + weight = 1000000, }, { type = "item", @@ -257,6 +266,7 @@ data:extend({ drop_sound = body_drop_move, inventory_move_sound = body_drop_move, pick_sound = body_pick, + weight = 1000000, }, }) diff --git a/bobclasses/prototypes/parts.lua b/bobclasses/prototypes/parts.lua index c55aea4bd..1defc52ad 100644 --- a/bobclasses/prototypes/parts.lua +++ b/bobclasses/prototypes/parts.lua @@ -28,6 +28,7 @@ data:extend({ filename = "__base__/sound/item/electric-small-inventory-pickup.ogg", volume = 0.7, }, + weight = 50000, }, { type = "item", @@ -40,6 +41,7 @@ data:extend({ drop_sound = bodypart_drop_move, inventory_move_sound = bodypart_drop_move, pick_sound = bodypart_pick, + weight = 50000, }, { type = "item", @@ -52,6 +54,7 @@ data:extend({ drop_sound = bodypart_drop_move, inventory_move_sound = bodypart_drop_move, pick_sound = bodypart_pick, + weight = 50000, }, { type = "item", @@ -64,6 +67,7 @@ data:extend({ drop_sound = bodypart_drop_move, inventory_move_sound = bodypart_drop_move, pick_sound = bodypart_pick, + weight = 50000, }, { type = "item", @@ -85,6 +89,7 @@ data:extend({ filename = "__base__/sound/item/reactor-inventory-pickup.ogg", volume = 0.6, }, + weight = 100000, }, { type = "item", @@ -106,6 +111,7 @@ data:extend({ filename = "__base__/sound/item/armor-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 1000000, }, { @@ -203,6 +209,7 @@ data:extend({ filename = "__base__/sound/item/electric-small-inventory-pickup.ogg", volume = 0.7, }, + weight = 100000, }, { type = "item", @@ -215,6 +222,7 @@ data:extend({ drop_sound = bodypart_drop_move, inventory_move_sound = bodypart_drop_move, pick_sound = bodypart_pick, + weight = 50000, }, { type = "item", @@ -227,6 +235,7 @@ data:extend({ drop_sound = bodypart_drop_move, inventory_move_sound = bodypart_drop_move, pick_sound = bodypart_pick, + weight = 50000, }, { type = "item", @@ -239,6 +248,7 @@ data:extend({ drop_sound = bodypart_drop_move, inventory_move_sound = bodypart_drop_move, pick_sound = bodypart_pick, + weight = 50000, }, { type = "item", @@ -260,6 +270,7 @@ data:extend({ filename = "__base__/sound/item/armor-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 1000000, }, { diff --git a/bobelectronics/data.lua b/bobelectronics/data.lua index b2484ed38..83373a9f7 100644 --- a/bobelectronics/data.lua +++ b/bobelectronics/data.lua @@ -14,3 +14,4 @@ require("prototypes.technology") require("prototypes.tips-and-tricks") data.raw.item["wood"].stack_size = 200 +data.raw.item["wood"].weight = 2500 diff --git a/bobelectronics/prototypes/electronics.lua b/bobelectronics/prototypes/electronics.lua index 6967214f2..dbeedf50b 100644 --- a/bobelectronics/prototypes/electronics.lua +++ b/bobelectronics/prototypes/electronics.lua @@ -28,6 +28,7 @@ if data.raw.item["bob-tin-plate"] then drop_sound = electronic_part_drop_move, inventory_move_sound = electronic_part_drop_move, pick_sound = electronic_part_pick, + weight = 312.5, }, { @@ -57,6 +58,7 @@ data:extend({ drop_sound = electronic_part_drop_move, inventory_move_sound = electronic_part_drop_move, pick_sound = electronic_part_pick, + weight = 500, }, { @@ -86,6 +88,7 @@ if data.raw.item["bob-gold-plate"] then drop_sound = electronic_part_drop_move, inventory_move_sound = electronic_part_drop_move, pick_sound = electronic_part_pick, + weight = 500, }, { @@ -117,6 +120,7 @@ if data.raw.item["bob-solder-alloy"] then drop_sound = electronic_part_drop_move, inventory_move_sound = electronic_part_drop_move, pick_sound = electronic_part_pick, + weight = 1000, }, { @@ -149,6 +153,7 @@ data:extend({ drop_sound = electronic_part_drop_move, inventory_move_sound = electronic_part_drop_move, pick_sound = electronic_part_pick, + weight = 250, }, { @@ -179,6 +184,7 @@ data:extend({ drop_sound = electronic_part_drop_move, inventory_move_sound = electronic_part_drop_move, pick_sound = electronic_part_pick, + weight = 250, }, { @@ -209,6 +215,7 @@ data:extend({ drop_sound = electronic_part_drop_move, inventory_move_sound = electronic_part_drop_move, pick_sound = electronic_part_pick, + weight = 250, }, { @@ -240,6 +247,7 @@ data:extend({ drop_sound = electronic_part_drop_move, inventory_move_sound = electronic_part_drop_move, pick_sound = electronic_part_pick, + weight = 500, }, { @@ -280,6 +288,7 @@ data:extend({ filename = "__base__/sound/item/wood-inventory-pickup.ogg", volume = 0.8, }, + weight = 250, }, { @@ -320,6 +329,7 @@ data:extend({ volume = 0.8, speed = 0.85, }, + weight = 250, }, { @@ -361,6 +371,7 @@ data:extend({ volume = 0.85, speed = 1.6, }, + weight = 250, }, { @@ -398,6 +409,7 @@ data:extend({ filename = "__base__/sound/item/wood-inventory-pickup.ogg", volume = 0.8, }, + weight = 500, }, { @@ -439,6 +451,7 @@ data:extend({ volume = 0.8, speed = 0.85, }, + weight = 1000, }, { @@ -482,6 +495,7 @@ data:extend({ volume = 0.85, speed = 1.6, }, + weight = 1000, }, { @@ -525,6 +539,7 @@ data:extend({ volume = 0.85, speed = 1.6, }, + weight = 2500, }, { @@ -556,6 +571,7 @@ data:extend({ drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 1000, }, { @@ -585,6 +601,7 @@ data:extend({ drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 1000, }, { @@ -615,6 +632,7 @@ data:extend({ drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 1000, }, { @@ -646,6 +664,7 @@ data:extend({ drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 2500, }, { diff --git a/bobelectronics/prototypes/resource.lua b/bobelectronics/prototypes/resource.lua index aaa019769..eada9dc13 100644 --- a/bobelectronics/prototypes/resource.lua +++ b/bobelectronics/prototypes/resource.lua @@ -19,6 +19,7 @@ data:extend({ filename = "__base__/sound/item/solid-fuel-inventory-pickup.ogg", volume = 0.7, }, + weight = 1000, }, { @@ -82,6 +83,7 @@ data:extend({ filename = "__base__/sound/item/solid-fuel-inventory-pickup.ogg", volume = 0.7, }, + weight = 1000, }, { @@ -149,6 +151,7 @@ if not data.raw.item["bob-silicon-wafer"] and data.raw.item["bob-silicon-plate"] filename = "__base__/sound/item/planner-inventory-pickup.ogg", volume = 0.5, }, + weight = 125, }, { @@ -188,6 +191,7 @@ if data.raw.item["bob-tin-plate"] then filename = "__base__/sound/item/wood-inventory-pickup.ogg", volume = 0.6, }, + weight = 1000, }, { diff --git a/bobenemies/prototypes/alien-artifact.lua b/bobenemies/prototypes/alien-artifact.lua index 2a9fca0cf..43d6d9530 100644 --- a/bobenemies/prototypes/alien-artifact.lua +++ b/bobenemies/prototypes/alien-artifact.lua @@ -24,6 +24,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then drop_sound = artifact_drop_move, inventory_move_sound = artifact_drop_move, pick_sound = artifact_pick, + weight = 2000, }, }) @@ -194,6 +195,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then drop_sound = artifact_drop_move, inventory_move_sound = artifact_drop_move, pick_sound = artifact_pick, + weight = 80, }, { type = "recipe", @@ -223,6 +225,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then drop_sound = artifact_drop_move, inventory_move_sound = artifact_drop_move, pick_sound = artifact_pick, + weight = 2000, }, { type = "recipe", @@ -257,6 +260,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then drop_sound = artifact_drop_move, inventory_move_sound = artifact_drop_move, pick_sound = artifact_pick, + weight = 2000, }, { type = "recipe", @@ -291,6 +295,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then drop_sound = artifact_drop_move, inventory_move_sound = artifact_drop_move, pick_sound = artifact_pick, + weight = 2000, }, { type = "recipe", @@ -325,6 +330,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then drop_sound = artifact_drop_move, inventory_move_sound = artifact_drop_move, pick_sound = artifact_pick, + weight = 2000, }, { type = "recipe", @@ -359,6 +365,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then drop_sound = artifact_drop_move, inventory_move_sound = artifact_drop_move, pick_sound = artifact_pick, + weight = 2000, }, { type = "recipe", @@ -393,6 +400,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then drop_sound = artifact_drop_move, inventory_move_sound = artifact_drop_move, pick_sound = artifact_pick, + weight = 2000, }, { type = "recipe", @@ -430,6 +438,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then drop_sound = artifact_drop_move, inventory_move_sound = artifact_drop_move, pick_sound = artifact_pick, + weight = 80, }, { type = "recipe", @@ -458,6 +467,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then drop_sound = artifact_drop_move, inventory_move_sound = artifact_drop_move, pick_sound = artifact_pick, + weight = 80, }, { type = "recipe", @@ -486,6 +496,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then drop_sound = artifact_drop_move, inventory_move_sound = artifact_drop_move, pick_sound = artifact_pick, + weight = 80, }, { type = "recipe", @@ -514,6 +525,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then drop_sound = artifact_drop_move, inventory_move_sound = artifact_drop_move, pick_sound = artifact_pick, + weight = 80, }, { type = "recipe", @@ -542,6 +554,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then drop_sound = artifact_drop_move, inventory_move_sound = artifact_drop_move, pick_sound = artifact_pick, + weight = 80, }, { type = "recipe", @@ -570,6 +583,7 @@ if settings.startup["bobmods-enemies-enableartifacts"].value == true then drop_sound = artifact_drop_move, inventory_move_sound = artifact_drop_move, pick_sound = artifact_pick, + weight = 80, }, { type = "recipe", diff --git a/bobenemies/prototypes/radar.lua b/bobenemies/prototypes/radar.lua index c813334c8..05c3c53ff 100644 --- a/bobenemies/prototypes/radar.lua +++ b/bobenemies/prototypes/radar.lua @@ -148,6 +148,7 @@ data:extend({ filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.8, }, + weight = 20000, }, { diff --git a/bobequipment/prototypes/armor.lua b/bobequipment/prototypes/armor.lua index beac1e326..abac00c6c 100644 --- a/bobequipment/prototypes/armor.lua +++ b/bobequipment/prototypes/armor.lua @@ -142,7 +142,7 @@ if not mods["bobwarfare"] then }, subgroup = "armor", infinite = true, - order = "f[power-armor-mk3]", + order = "e[power-armor-mk3]", stack_size = 1, equipment_grid = "power-armor-equipment-grid-mk3", open_sound = "__base__/sound/armor-open.ogg", @@ -160,6 +160,7 @@ if not mods["bobwarfare"] then volume = 0.7, }, inventory_size_bonus = 40, + weight = 1000000, }, { @@ -212,7 +213,7 @@ if not mods["bobwarfare"] then }, subgroup = "armor", infinite = true, - order = "g[power-armor-mk4]", + order = "e[power-armor-mk4]", stack_size = 1, equipment_grid = "power-armor-equipment-grid-mk4", open_sound = "__base__/sound/armor-open.ogg", @@ -230,6 +231,7 @@ if not mods["bobwarfare"] then volume = 0.7, }, inventory_size_bonus = 50, + weight = 1000000, }, { @@ -282,7 +284,7 @@ if not mods["bobwarfare"] then }, subgroup = "armor", infinite = true, - order = "h[power-armor-mk5]", + order = "e[power-armor-mk5]", stack_size = 1, equipment_grid = "power-armor-equipment-grid-mk5", open_sound = "__base__/sound/armor-open.ogg", @@ -300,6 +302,7 @@ if not mods["bobwarfare"] then volume = 0.7, }, inventory_size_bonus = 60, + weight = 1000000, }, { diff --git a/bobequipment/prototypes/item/equipment.lua b/bobequipment/prototypes/item/equipment.lua index 7b484c7df..6cac957fc 100644 --- a/bobequipment/prototypes/item/equipment.lua +++ b/bobequipment/prototypes/item/equipment.lua @@ -6,12 +6,18 @@ data.raw.item["personal-laser-defense-equipment"].order = "d[active-defense]-a[p data.raw.item["exoskeleton-equipment"].order = "e[exoskeleton]-a[exoskeleton-equipment-1]" data.raw.item["exoskeleton-equipment"].subgroup = "equipment" data.raw.item["belt-immunity-equipment"].subgroup = "equipment" +data.raw.item["belt-immunity-equipment"].weight = 50000 data.raw.item["energy-shield-equipment"].icon = "__bobequipment__/graphics/equipment/energy-shield-mk1-equipment.png" data.raw.item["energy-shield-equipment"].icon_size = 64 +data.raw.item["energy-shield-equipment"].stack_size = 50 +data.raw.item["energy-shield-equipment"].weight = 40000 data.raw.item["energy-shield-mk2-equipment"].icon = "__bobequipment__/graphics/equipment/energy-shield-mk2-equipment.png" data.raw.item["energy-shield-mk2-equipment"].icon_size = 64 +data.raw.item["energy-shield-mk2-equipment"].stack_size = 50 +data.raw.item["energy-shield-mk2-equipment"].weight = 40000 +data.raw.item["discharge-defense-equipment"].weight = 250000 data:extend({ { @@ -35,7 +41,7 @@ data:extend({ filename = "__base__/sound/item/energy-shield-inventory-pickup.ogg", volume = 0.4, }, - weight = 100000, + weight = 40000, }, { type = "item", @@ -58,7 +64,7 @@ data:extend({ filename = "__base__/sound/item/energy-shield-inventory-pickup.ogg", volume = 0.4, }, - weight = 100000, + weight = 40000, }, { type = "item", @@ -81,7 +87,7 @@ data:extend({ filename = "__base__/sound/item/energy-shield-inventory-pickup.ogg", volume = 0.4, }, - weight = 100000, + weight = 40000, }, { type = "item", @@ -104,14 +110,17 @@ data:extend({ filename = "__base__/sound/item/energy-shield-inventory-pickup.ogg", volume = 0.4, }, - weight = 100000, + weight = 40000, }, }) data.raw.item["battery-equipment"].icon = "__bobequipment__/graphics/icons/technology/battery-equipment.png" data.raw.item["battery-equipment"].icon_size = 64 +data.raw.item["battery-equipment"].stack_size = 50 +data.raw.item["battery-equipment"].weight = 100000 data.raw.item["battery-mk2-equipment"].icon = "__bobequipment__/graphics/icons/technology/battery-mk2-equipment.png" data.raw.item["battery-mk2-equipment"].icon_size = 64 +data.raw.item["battery-mk2-equipment"].stack_size = 50 data:extend({ { @@ -210,6 +219,8 @@ data:extend({ data.raw.item["fission-reactor-equipment"].icon = "__bobequipment__/graphics/icons/fission-reactor-equipment-1.png" +data.raw.item["night-vision-equipment"].weight = 50000 + data:extend({ { type = "item", @@ -299,6 +310,7 @@ data:extend({ filename = "__base__/sound/item/electric-small-inventory-pickup.ogg", volume = 0.7, }, + weight = 50000, }, { type = "item", @@ -321,11 +333,13 @@ data:extend({ filename = "__base__/sound/item/electric-small-inventory-pickup.ogg", volume = 0.7, }, + weight = 50000, }, }) data.raw.item["solar-panel-equipment"].icon = "__bobequipment__/graphics/icons/solar-panel-equipment-1.png" data.raw.item["solar-panel-equipment"].icon_size = 32 +data.raw.item["solar-panel-equipment"].weight = 50000 data:extend({ { @@ -349,6 +363,7 @@ data:extend({ filename = "__base__/sound/item/electric-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 50000, }, { type = "item", @@ -371,6 +386,7 @@ data:extend({ filename = "__base__/sound/item/electric-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 50000, }, { type = "item", @@ -393,12 +409,14 @@ data:extend({ filename = "__base__/sound/item/electric-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 50000, }, }) data.raw.item["personal-laser-defense-equipment"].icon = "__bobequipment__/graphics/icons/technology/personal-laser-defense-equipment-1.png" data.raw.item["personal-laser-defense-equipment"].icon_size = 128 +data.raw.item["exoskeleton-equipment"].weight = 50000 data:extend({ { @@ -538,6 +556,7 @@ data:extend({ filename = "__base__/sound/item/exoskeleton-inventory-pickup.ogg", volume = 0.6, }, + weight = 50000, }, { type = "item", @@ -560,5 +579,6 @@ data:extend({ filename = "__base__/sound/item/exoskeleton-inventory-pickup.ogg", volume = 0.6, }, + weight = 50000, }, }) diff --git a/bobequipment/prototypes/personal-roboport.lua b/bobequipment/prototypes/personal-roboport.lua index 1d40b0140..fb6d86d5c 100644 --- a/bobequipment/prototypes/personal-roboport.lua +++ b/bobequipment/prototypes/personal-roboport.lua @@ -33,7 +33,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, - weight = 50000, + weight = 25000, }, { type = "item", @@ -64,7 +64,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, - weight = 50000, + weight = 25000, }, { type = "item", @@ -95,7 +95,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, - weight = 50000, + weight = 25000, }, { type = "item", @@ -126,7 +126,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, - weight = 50000, + weight = 25000, }, { @@ -159,7 +159,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, - weight = 50000, + weight = 25000, }, { type = "item", @@ -191,7 +191,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, - weight = 50000, + weight = 25000, }, { type = "item", @@ -223,7 +223,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, - weight = 50000, + weight = 25000, }, { type = "item", @@ -255,7 +255,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, - weight = 50000, + weight = 25000, }, { @@ -288,7 +288,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, - weight = 50000, + weight = 25000, }, { type = "item", @@ -320,7 +320,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, - weight = 50000, + weight = 25000, }, { type = "item", @@ -352,7 +352,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, - weight = 50000, + weight = 25000, }, { type = "item", @@ -384,7 +384,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, - weight = 50000, + weight = 25000, }, { @@ -1199,6 +1199,7 @@ if combined_roboports == true then data.raw.item["personal-roboport-equipment"].icon = "__bobequipment__/graphics/icons/technology/personal-roboport-mk1-equipment.png" data.raw.item["personal-roboport-equipment"].icon_size = 128 + data.raw.item["personal-roboport-equipment"].weight = 100000 data.raw["roboport-equipment"]["personal-roboport-equipment"].sprite.filename = "__bobequipment__/graphics/icons/technology/personal-roboport-mk1-equipment.png" data.raw["roboport-equipment"]["personal-roboport-equipment"].sprite.width = 128 @@ -1211,6 +1212,7 @@ if combined_roboports == true then data.raw.item["personal-roboport-mk2-equipment"].icon = "__bobequipment__/graphics/icons/technology/personal-roboport-mk2-equipment.png" data.raw.item["personal-roboport-mk2-equipment"].icon_size = 128 + data.raw.item["personal-roboport-mk2-equipment"].weight = 100000 data.raw["roboport-equipment"]["personal-roboport-mk2-equipment"].sprite.filename = "__bobequipment__/graphics/icons/technology/personal-roboport-mk2-equipment.png" data.raw["roboport-equipment"]["personal-roboport-mk2-equipment"].sprite.width = 128 @@ -1248,6 +1250,7 @@ if combined_roboports == true then filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, + weight = 100000, }, { type = "item", @@ -1271,6 +1274,7 @@ if combined_roboports == true then filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, + weight = 100000, }, { diff --git a/bobgreenhouse/prototypes/items.lua b/bobgreenhouse/prototypes/items.lua index 1dc644307..57b1ebd13 100644 --- a/bobgreenhouse/prototypes/items.lua +++ b/bobgreenhouse/prototypes/items.lua @@ -22,6 +22,7 @@ data:extend({ volume = 0.85, speed = 1.6, }, + weight = 50000, }, { type = "item", @@ -46,6 +47,7 @@ data:extend({ volume = 0.7, speed = 0.6, }, + weight = 1000, }, { type = "item", @@ -72,6 +74,7 @@ data:extend({ volume = 0.9, speed = 0.6, }, + weight = 500, }, { type = "item", @@ -99,5 +102,6 @@ data:extend({ volume = 0.7, speed = 0.6, }, + weight = 10000, }, }) diff --git a/boblibrary/ore-functions.lua b/boblibrary/ore-functions.lua index c3cbf471d..da05d8f05 100644 --- a/boblibrary/ore-functions.lua +++ b/boblibrary/ore-functions.lua @@ -263,6 +263,7 @@ function bobmods.lib.resource.create_item(inputs) drop_sound = inputs.drop_sound, inventory_move_sound = inputs.inventory_move_sound, pick_sound = inputs.pick_sound, + weight = inputs.weight or 5000, }, }) if inputs.icon then @@ -561,6 +562,7 @@ function bobmods.lib.resource.generate_data_stage(inputs) stack_size = inputs.item.stack_size, tint = inputs.tint, create_variations = inputs.item.create_variations, + weight = inputs.item.weight } if inputs.drop_sound then if inputs.drop_sound.filename and inputs.drop_sound.volume then diff --git a/boblogistics/prototypes/aai-loaders.lua b/boblogistics/prototypes/aai-loaders.lua index 1ebe0490c..b57aab0db 100644 --- a/boblogistics/prototypes/aai-loaders.lua +++ b/boblogistics/prototypes/aai-loaders.lua @@ -149,6 +149,8 @@ then if mods["space-age"] then data.raw.recipe["aai-basic-loader"].category = "pressing" end + + data.raw.item["aai-basic-loader"].weight = 20000 end AAILoaders.make_tier({ @@ -308,4 +310,11 @@ then data.raw.recipe["aai-turbo-loader"].category = "crafting-with-fluid-or-metallurgy" data.raw.recipe["aai-ultimate-loader"].category = "crafting-with-fluid-or-metallurgy" end + + data.raw.item["aai-loader"].weight = 20000 + data.raw.item["aai-fast-loader"].weight = 20000 + data.raw.item["aai-express-loader"].weight = 20000 + data.raw.item["aai-turbo-loader"].weight = 20000 + data.raw.item["aai-ultimate-loader"].weight = 20000 + end diff --git a/boblogistics/prototypes/item/belt.lua b/boblogistics/prototypes/item/belt.lua index 791e22d53..8555dcd6a 100644 --- a/boblogistics/prototypes/item/belt.lua +++ b/boblogistics/prototypes/item/belt.lua @@ -15,6 +15,12 @@ local mechanical_pick = { volume = 0.8, } +data.raw.item["transport-belt"].weight = 10000 +data.raw.item["underground-belt"].weight = 20000 +data.raw.item["fast-transport-belt"].weight = 10000 +data.raw.item["fast-underground-belt"].weight = 20000 +data.raw.item["fast-splitter"].weight = 20000 + if settings.startup["bobmods-logistics-beltoverhaul"].value == true then data:extend({ { @@ -29,6 +35,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then drop_sound = belt_drop_move, inventory_move_sound = belt_drop_move, pick_sound = belt_pick, + weight = 10000, }, { type = "item", @@ -42,6 +49,7 @@ if settings.startup["bobmods-logistics-beltoverhaul"].value == true then drop_sound = mechanical_drop_move, inventory_move_sound = mechanical_drop_move, pick_sound = mechanical_pick, + weight = 20000, }, { type = "item", @@ -73,6 +81,7 @@ data:extend({ drop_sound = belt_drop_move, inventory_move_sound = belt_drop_move, pick_sound = belt_pick, + weight = 10000, }, { type = "item", @@ -86,6 +95,7 @@ data:extend({ drop_sound = mechanical_drop_move, inventory_move_sound = mechanical_drop_move, pick_sound = mechanical_pick, + weight = 20000, }, { type = "item", @@ -114,6 +124,7 @@ data:extend({ drop_sound = belt_drop_move, inventory_move_sound = belt_drop_move, pick_sound = belt_pick, + weight = 10000, }, { type = "item", @@ -127,6 +138,7 @@ data:extend({ drop_sound = mechanical_drop_move, inventory_move_sound = mechanical_drop_move, pick_sound = mechanical_pick, + weight = 20000, }, { type = "item", diff --git a/boblogistics/prototypes/item/inserter.lua b/boblogistics/prototypes/item/inserter.lua index 0a4d3f43a..3a17e57ac 100644 --- a/boblogistics/prototypes/item/inserter.lua +++ b/boblogistics/prototypes/item/inserter.lua @@ -4,6 +4,9 @@ data.raw.item["long-handed-inserter"].order = "e[inserter]-c[fast]" data.raw.item["fast-inserter"].order = "e[inserter]-d[express]" data.raw.item["bulk-inserter"].order = "e[inserter]-d[express]-c[bulk]" +data.raw.item["burner-inserter"].weight = 10000 +data.raw.item.inserter.weight = 10000 + local inserter_drop_move = { filename = "__base__/sound/item/inserter-inventory-move.ogg", volume = 0.8, @@ -26,6 +29,7 @@ data:extend({ drop_sound = inserter_drop_move, inventory_move_sound = inserter_drop_move, pick_sound = inserter_pick, + weight = 10000, }, { type = "item", @@ -39,6 +43,7 @@ data:extend({ drop_sound = inserter_drop_move, inventory_move_sound = inserter_drop_move, pick_sound = inserter_pick, + weight = 10000, }, { type = "item", @@ -74,6 +79,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then drop_sound = inserter_drop_move, inventory_move_sound = inserter_drop_move, pick_sound = inserter_pick, + weight = 10000, }, { type = "item", @@ -103,6 +109,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then drop_sound = inserter_drop_move, inventory_move_sound = inserter_drop_move, pick_sound = inserter_pick, + weight = 10000, }, { type = "item", @@ -132,6 +139,7 @@ if settings.startup["bobmods-logistics-inserteroverhaul"].value == true then drop_sound = inserter_drop_move, inventory_move_sound = inserter_drop_move, pick_sound = inserter_pick, + weight = 10000, }, { type = "item", diff --git a/boblogistics/prototypes/item/logistic-container.lua b/boblogistics/prototypes/item/logistic-container.lua index 79c021601..2b13f24e9 100644 --- a/boblogistics/prototypes/item/logistic-container.lua +++ b/boblogistics/prototypes/item/logistic-container.lua @@ -45,6 +45,7 @@ data:extend({ drop_sound = chest_drop_move, inventory_move_sound = chest_drop_move, pick_sound = chest_pick, + weight = 20000, }, { type = "item", @@ -71,6 +72,7 @@ data:extend({ drop_sound = chest_drop_move, inventory_move_sound = chest_drop_move, pick_sound = chest_pick, + weight = 20000, }, { type = "item", @@ -97,6 +99,7 @@ data:extend({ drop_sound = chest_drop_move, inventory_move_sound = chest_drop_move, pick_sound = chest_pick, + weight = 20000, }, { type = "item", @@ -123,6 +126,7 @@ data:extend({ drop_sound = chest_drop_move, inventory_move_sound = chest_drop_move, pick_sound = chest_pick, + weight = 20000, }, { type = "item", @@ -149,6 +153,7 @@ data:extend({ drop_sound = chest_drop_move, inventory_move_sound = chest_drop_move, pick_sound = chest_pick, + weight = 20000, }, }) @@ -178,6 +183,7 @@ data:extend({ drop_sound = chest_drop_move, inventory_move_sound = chest_drop_move, pick_sound = chest_pick, + weight = 20000, }, { type = "item", @@ -204,6 +210,7 @@ data:extend({ drop_sound = chest_drop_move, inventory_move_sound = chest_drop_move, pick_sound = chest_pick, + weight = 20000, }, { type = "item", @@ -230,6 +237,7 @@ data:extend({ drop_sound = chest_drop_move, inventory_move_sound = chest_drop_move, pick_sound = chest_pick, + weight = 20000, }, { type = "item", @@ -256,6 +264,7 @@ data:extend({ drop_sound = chest_drop_move, inventory_move_sound = chest_drop_move, pick_sound = chest_pick, + weight = 20000, }, { type = "item", @@ -282,5 +291,6 @@ data:extend({ drop_sound = chest_drop_move, inventory_move_sound = chest_drop_move, pick_sound = chest_pick, + weight = 20000, }, }) diff --git a/boblogistics/prototypes/item/pipes.lua b/boblogistics/prototypes/item/pipes.lua index 86c2598d1..d4180f1bf 100644 --- a/boblogistics/prototypes/item/pipes.lua +++ b/boblogistics/prototypes/item/pipes.lua @@ -59,6 +59,7 @@ data:extend({ filename = "__base__/sound/item/brick-inventory-pickup.ogg", volume = 0.6, }, + weight = 20000, }, { @@ -88,6 +89,7 @@ data:extend({ drop_sound = pipe_drop_move, inventory_move_sound = pipe_drop_move, pick_sound = pipe_pick, + weight = 20000, }, { @@ -117,6 +119,7 @@ data:extend({ drop_sound = pipe_drop_move, inventory_move_sound = pipe_drop_move, pick_sound = pipe_pick, + weight = 20000, }, { @@ -164,6 +167,7 @@ data:extend({ filename = "__base__/sound/item/plastic-inventory-pickup.ogg", volume = 0.7, }, + weight = 20000, }, }) @@ -196,6 +200,7 @@ if data.raw.item["bob-bronze-alloy"] then drop_sound = pipe_drop_move, inventory_move_sound = pipe_drop_move, pick_sound = pipe_pick, + weight = 20000, }, }) end @@ -229,6 +234,7 @@ if data.raw.item["bob-brass-alloy"] then drop_sound = pipe_drop_move, inventory_move_sound = pipe_drop_move, pick_sound = pipe_pick, + weight = 20000, }, }) end @@ -280,6 +286,7 @@ if data.raw.item["bob-silicon-nitride"] then filename = "__base__/sound/item/brick-inventory-pickup.ogg", volume = 0.6, }, + weight = 20000, }, }) end @@ -313,6 +320,7 @@ if data.raw.item["bob-titanium-plate"] then drop_sound = pipe_drop_move, inventory_move_sound = pipe_drop_move, pick_sound = pipe_pick, + weight = 20000, }, }) end @@ -346,6 +354,7 @@ if data.raw.item["bob-tungsten-plate"] then drop_sound = pipe_drop_move, inventory_move_sound = pipe_drop_move, pick_sound = pipe_pick, + weight = 20000, }, }) end @@ -379,6 +388,7 @@ if data.raw.item["bob-nitinol-alloy"] then drop_sound = pipe_drop_move, inventory_move_sound = pipe_drop_move, pick_sound = pipe_pick, + weight = 20000, }, }) end @@ -412,6 +422,7 @@ if data.raw.item["bob-copper-tungsten-alloy"] then drop_sound = pipe_drop_move, inventory_move_sound = pipe_drop_move, pick_sound = pipe_pick, + weight = 20000, }, }) end diff --git a/boblogistics/prototypes/item/pump.lua b/boblogistics/prototypes/item/pump.lua index 8bfed83e9..79bddb699 100644 --- a/boblogistics/prototypes/item/pump.lua +++ b/boblogistics/prototypes/item/pump.lua @@ -1,4 +1,5 @@ data.raw.item["pump"].order = "b[pipe]-c[pump-1]" +data.raw.item["pump"].weight = 20000 data:extend({ { @@ -22,6 +23,7 @@ data:extend({ filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, + weight = 20000, }, { type = "item", @@ -44,6 +46,7 @@ data:extend({ filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, + weight = 20000, }, { type = "item", @@ -66,5 +69,6 @@ data:extend({ filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, + weight = 20000, }, }) diff --git a/boblogistics/prototypes/item/roboport-parts.lua b/boblogistics/prototypes/item/roboport-parts.lua index 0c9a32ddb..e9b69c453 100644 --- a/boblogistics/prototypes/item/roboport-parts.lua +++ b/boblogistics/prototypes/item/roboport-parts.lua @@ -37,6 +37,7 @@ data:extend({ drop_sound = radio_drop_move, inventory_move_sound = radio_drop_move, pick_sound = radio_pick, + weight = 5000, }, { type = "item", @@ -49,6 +50,7 @@ data:extend({ drop_sound = radio_drop_move, inventory_move_sound = radio_drop_move, pick_sound = radio_pick, + weight = 5000, }, { type = "item", @@ -61,6 +63,7 @@ data:extend({ drop_sound = radio_drop_move, inventory_move_sound = radio_drop_move, pick_sound = radio_pick, + weight = 5000, }, { type = "item", @@ -73,6 +76,7 @@ data:extend({ drop_sound = radio_drop_move, inventory_move_sound = radio_drop_move, pick_sound = radio_pick, + weight = 5000, }, }) @@ -88,6 +92,7 @@ data:extend({ drop_sound = charger_drop_move, inventory_move_sound = charger_drop_move, pick_sound = charger_pick, + weight = 5000, }, { type = "item", @@ -100,6 +105,7 @@ data:extend({ drop_sound = charger_drop_move, inventory_move_sound = charger_drop_move, pick_sound = charger_pick, + weight = 5000, }, { type = "item", @@ -112,6 +118,7 @@ data:extend({ drop_sound = charger_drop_move, inventory_move_sound = charger_drop_move, pick_sound = charger_pick, + weight = 5000, }, { type = "item", @@ -124,6 +131,7 @@ data:extend({ drop_sound = charger_drop_move, inventory_move_sound = charger_drop_move, pick_sound = charger_pick, + weight = 5000, }, }) @@ -139,6 +147,7 @@ data:extend({ drop_sound = roboport_drop_move, inventory_move_sound = roboport_drop_move, pick_sound = roboport_pick, + weight = 5000, }, { type = "item", @@ -151,6 +160,7 @@ data:extend({ drop_sound = roboport_drop_move, inventory_move_sound = roboport_drop_move, pick_sound = roboport_pick, + weight = 5000, }, { type = "item", @@ -163,6 +173,7 @@ data:extend({ drop_sound = roboport_drop_move, inventory_move_sound = roboport_drop_move, pick_sound = roboport_pick, + weight = 5000, }, { type = "item", @@ -175,5 +186,6 @@ data:extend({ drop_sound = roboport_drop_move, inventory_move_sound = roboport_drop_move, pick_sound = roboport_pick, + weight = 5000, }, }) diff --git a/boblogistics/prototypes/item/robots.lua b/boblogistics/prototypes/item/robots.lua index 8bf45729c..eedae5403 100644 --- a/boblogistics/prototypes/item/robots.lua +++ b/boblogistics/prototypes/item/robots.lua @@ -2,11 +2,13 @@ data.raw.item["logistic-robot"].order = "a[robot]-a[logistic-robot-1]" data.raw.item["logistic-robot"].subgroup = "bob-logistic-robots" data.raw.item["logistic-robot"].icon = "__boblogistics__/graphics/icons/robots/logistic-robot-1.png" data.raw.item["logistic-robot"].icon_size = 32 +data.raw.item["logistic-robot"].weight = 20000 data.raw.item["construction-robot"].order = "a[robot]-b[construction-robot-1]" data.raw.item["construction-robot"].subgroup = "bob-construction-robots" data.raw.item["construction-robot"].icon = "__boblogistics__/graphics/icons/robots/construction-robot-1.png" data.raw.item["construction-robot"].icon_size = 32 +data.raw.item["construction-robot"].weight = 20000 local robot_drop_move = { filename = "__base__/sound/item/robotic-inventory-move.ogg", @@ -30,6 +32,7 @@ data:extend({ drop_sound = robot_drop_move, inventory_move_sound = robot_drop_move, pick_sound = robot_pick, + weight = 20000, }, { @@ -44,6 +47,7 @@ data:extend({ drop_sound = robot_drop_move, inventory_move_sound = robot_drop_move, pick_sound = robot_pick, + weight = 20000, }, { @@ -58,6 +62,7 @@ data:extend({ drop_sound = robot_drop_move, inventory_move_sound = robot_drop_move, pick_sound = robot_pick, + weight = 20000, }, { @@ -72,6 +77,7 @@ data:extend({ drop_sound = robot_drop_move, inventory_move_sound = robot_drop_move, pick_sound = robot_pick, + weight = 40000, }, { @@ -86,6 +92,7 @@ data:extend({ drop_sound = robot_drop_move, inventory_move_sound = robot_drop_move, pick_sound = robot_pick, + weight = 20000, }, { @@ -100,6 +107,7 @@ data:extend({ drop_sound = robot_drop_move, inventory_move_sound = robot_drop_move, pick_sound = robot_pick, + weight = 20000, }, { @@ -114,6 +122,7 @@ data:extend({ drop_sound = robot_drop_move, inventory_move_sound = robot_drop_move, pick_sound = robot_pick, + weight = 20000, }, { @@ -128,5 +137,6 @@ data:extend({ drop_sound = robot_drop_move, inventory_move_sound = robot_drop_move, pick_sound = robot_pick, + weight = 40000, }, }) diff --git a/boblogistics/prototypes/item/storage-tank.lua b/boblogistics/prototypes/item/storage-tank.lua index 9edf3723c..62619503b 100644 --- a/boblogistics/prototypes/item/storage-tank.lua +++ b/boblogistics/prototypes/item/storage-tank.lua @@ -1,6 +1,7 @@ data.raw.item["storage-tank"].order = "b[fluid]-a[storage-tank-1a]" data.raw.item["storage-tank"].subgroup = "bob-storage-tank" data.raw.item["storage-tank"].icon = "__boblogistics__/graphics/icons/storage-tank-1.png" +data.raw.item["storage-tank"].weight = 20000 local storage_drop_move = { filename = "__base__/sound/item/metal-large-inventory-move.ogg", @@ -23,6 +24,7 @@ data:extend({ drop_sound = storage_drop_move, inventory_move_sound = storage_drop_move, pick_sound = storage_pick, + weight = 20000, }, { @@ -36,6 +38,7 @@ data:extend({ drop_sound = storage_drop_move, inventory_move_sound = storage_drop_move, pick_sound = storage_pick, + weight = 20000, }, { @@ -49,6 +52,7 @@ data:extend({ drop_sound = storage_drop_move, inventory_move_sound = storage_drop_move, pick_sound = storage_pick, + weight = 20000, }, }) @@ -64,6 +68,7 @@ data:extend({ drop_sound = storage_drop_move, inventory_move_sound = storage_drop_move, pick_sound = storage_pick, + weight = 20000, }, { @@ -77,6 +82,7 @@ data:extend({ drop_sound = storage_drop_move, inventory_move_sound = storage_drop_move, pick_sound = storage_pick, + weight = 20000, }, { @@ -90,6 +96,7 @@ data:extend({ drop_sound = storage_drop_move, inventory_move_sound = storage_drop_move, pick_sound = storage_pick, + weight = 20000, }, { @@ -103,5 +110,6 @@ data:extend({ drop_sound = storage_drop_move, inventory_move_sound = storage_drop_move, pick_sound = storage_pick, + weight = 20000, }, }) diff --git a/boblogistics/prototypes/item/train.lua b/boblogistics/prototypes/item/train.lua index dba73c93b..ba09d9ab1 100644 --- a/boblogistics/prototypes/item/train.lua +++ b/boblogistics/prototypes/item/train.lua @@ -2,14 +2,17 @@ if settings.startup["bobmods-logistics-trains"].value == true then data.raw["item-with-entity-data"]["locomotive"].stack_size = 10 data.raw["item-with-entity-data"]["locomotive"].order = "a[train-system]-e[locomotive-1]" data.raw["item-with-entity-data"]["locomotive"].subgroup = "bob-locomotive" + data.raw["item-with-entity-data"]["locomotive"].weight = 1000000 data.raw["item-with-entity-data"]["cargo-wagon"].stack_size = 10 data.raw["item-with-entity-data"]["cargo-wagon"].order = "a[train-system]-f[cargo-wagon-1]" data.raw["item-with-entity-data"]["cargo-wagon"].subgroup = "bob-cargo-wagon" + data.raw["item-with-entity-data"]["cargo-wagon"].weight = 1000000 data.raw["item-with-entity-data"]["fluid-wagon"].stack_size = 10 data.raw["item-with-entity-data"]["fluid-wagon"].order = "a[train-system]-h[fluid-wagon-1]" data.raw["item-with-entity-data"]["fluid-wagon"].subgroup = "bob-fluid-wagon" + data.raw["item-with-entity-data"]["fluid-wagon"].weight = 1000000 local locomotive_drop_move = { filename = "__base__/sound/item/locomotive-inventory-move.ogg", @@ -45,6 +48,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then drop_sound = locomotive_drop_move, inventory_move_sound = locomotive_drop_move, pick_sound = locomotive_pick, + weight = 1000000, }, { @@ -59,6 +63,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then drop_sound = locomotive_drop_move, inventory_move_sound = locomotive_drop_move, pick_sound = locomotive_pick, + weight = 1000000, }, { @@ -73,6 +78,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then drop_sound = locomotive_drop_move, inventory_move_sound = locomotive_drop_move, pick_sound = locomotive_pick, + weight = 1000000, }, { @@ -87,6 +93,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then drop_sound = locomotive_drop_move, inventory_move_sound = locomotive_drop_move, pick_sound = locomotive_pick, + weight = 1000000, }, { @@ -101,6 +108,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then drop_sound = wagon_drop_move, inventory_move_sound = wagon_drop_move, pick_sound = locomotive_pick, + weight = 1000000, }, { @@ -115,6 +123,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then drop_sound = wagon_drop_move, inventory_move_sound = wagon_drop_move, pick_sound = locomotive_pick, + weight = 1000000, }, { @@ -129,6 +138,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then drop_sound = wagon_drop_move, inventory_move_sound = wagon_drop_move, pick_sound = locomotive_pick, + weight = 1000000, }, { @@ -143,6 +153,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then drop_sound = wagon_drop_move, inventory_move_sound = wagon_drop_move, pick_sound = locomotive_pick, + weight = 1000000, }, { @@ -157,6 +168,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then drop_sound = fluid_drop_move, inventory_move_sound = fluid_drop_move, pick_sound = fluid_pick, + weight = 1000000, }, { @@ -171,6 +183,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then drop_sound = fluid_drop_move, inventory_move_sound = fluid_drop_move, pick_sound = fluid_pick, + weight = 1000000, }, { @@ -185,6 +198,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then drop_sound = fluid_drop_move, inventory_move_sound = fluid_drop_move, pick_sound = fluid_pick, + weight = 1000000, }, { @@ -199,6 +213,7 @@ if settings.startup["bobmods-logistics-trains"].value == true then drop_sound = fluid_drop_move, inventory_move_sound = fluid_drop_move, pick_sound = fluid_pick, + weight = 1000000, }, }) end diff --git a/boblogistics/prototypes/repair-pack.lua b/boblogistics/prototypes/repair-pack.lua index e64e02950..c65700bf1 100644 --- a/boblogistics/prototypes/repair-pack.lua +++ b/boblogistics/prototypes/repair-pack.lua @@ -1,6 +1,7 @@ data.raw["repair-tool"]["repair-pack"].icon = "__boblogistics__/graphics/icons/repair-pack.png" data.raw["repair-tool"]["repair-pack"].icon_size = 32 data.raw["repair-tool"]["repair-pack"].order = "b[repair]-a[repair-pack-1]" +data.raw["repair-tool"]["repair-pack"].weight = 10000 local repair_drop_move = { filename = "__base__/sound/item/repair-pack-inventory-move.ogg", @@ -25,6 +26,7 @@ data:extend({ drop_sound = repair_drop_move, inventory_move_sound = repair_drop_move, pick_sound = repair_pick, + weight = 10000, }, { type = "repair-tool", @@ -39,6 +41,7 @@ data:extend({ drop_sound = repair_drop_move, inventory_move_sound = repair_drop_move, pick_sound = repair_pick, + weight = 10000, }, { type = "repair-tool", @@ -53,6 +56,7 @@ data:extend({ drop_sound = repair_drop_move, inventory_move_sound = repair_drop_move, pick_sound = repair_pick, + weight = 10000, }, { type = "repair-tool", @@ -67,6 +71,7 @@ data:extend({ drop_sound = repair_drop_move, inventory_move_sound = repair_drop_move, pick_sound = repair_pick, + weight = 10000, }, }) diff --git a/boblogistics/prototypes/robot-parts.lua b/boblogistics/prototypes/robot-parts.lua index 9dc50af73..2640f22b5 100644 --- a/boblogistics/prototypes/robot-parts.lua +++ b/boblogistics/prototypes/robot-parts.lua @@ -23,6 +23,8 @@ local electronic_pick = { volume = 0.7, } +data.raw.item["flying-robot-frame"].weight = 10000 + if settings.startup["bobmods-logistics-flyingrobotframes"].value == true then local item = data.raw.item["flying-robot-frame"] item.order = "j[flying-robot-frame-1]" @@ -78,6 +80,7 @@ if settings.startup["bobmods-logistics-flyingrobotframes"].value == true then drop_sound = part_drop_move, inventory_move_sound = part_drop_move, pick_sound = part_pick, + weight = 10000, }, { type = "item", @@ -107,6 +110,7 @@ if settings.startup["bobmods-logistics-flyingrobotframes"].value == true then drop_sound = part_drop_move, inventory_move_sound = part_drop_move, pick_sound = part_pick, + weight = 10000, }, { type = "item", @@ -136,6 +140,7 @@ if settings.startup["bobmods-logistics-flyingrobotframes"].value == true then drop_sound = part_drop_move, inventory_move_sound = part_drop_move, pick_sound = part_pick, + weight = 10000, }, { @@ -276,6 +281,7 @@ if settings.startup["bobmods-logistics-robotparts"].value == true then drop_sound = electronic_drop_move, inventory_move_sound = electronic_drop_move, pick_sound = electronic_pick, + weight = 5000, }, { @@ -289,6 +295,7 @@ if settings.startup["bobmods-logistics-robotparts"].value == true then drop_sound = electronic_drop_move, inventory_move_sound = electronic_drop_move, pick_sound = electronic_pick, + weight = 5000, }, { @@ -302,6 +309,7 @@ if settings.startup["bobmods-logistics-robotparts"].value == true then drop_sound = electronic_drop_move, inventory_move_sound = electronic_drop_move, pick_sound = electronic_pick, + weight = 5000, }, { @@ -315,6 +323,7 @@ if settings.startup["bobmods-logistics-robotparts"].value == true then drop_sound = electronic_drop_move, inventory_move_sound = electronic_drop_move, pick_sound = electronic_pick, + weight = 5000, }, { @@ -328,6 +337,7 @@ if settings.startup["bobmods-logistics-robotparts"].value == true then drop_sound = tool_drop_move, inventory_move_sound = tool_drop_move, pick_sound = tool_pick, + weight = 5000, }, { @@ -341,6 +351,7 @@ if settings.startup["bobmods-logistics-robotparts"].value == true then drop_sound = tool_drop_move, inventory_move_sound = tool_drop_move, pick_sound = tool_pick, + weight = 5000, }, { @@ -354,6 +365,7 @@ if settings.startup["bobmods-logistics-robotparts"].value == true then drop_sound = tool_drop_move, inventory_move_sound = tool_drop_move, pick_sound = tool_pick, + weight = 5000, }, { @@ -367,6 +379,7 @@ if settings.startup["bobmods-logistics-robotparts"].value == true then drop_sound = tool_drop_move, inventory_move_sound = tool_drop_move, pick_sound = tool_pick, + weight = 5000, }, { @@ -380,6 +393,7 @@ if settings.startup["bobmods-logistics-robotparts"].value == true then drop_sound = tool_drop_move, inventory_move_sound = tool_drop_move, pick_sound = tool_pick, + weight = 5000, }, { @@ -393,6 +407,7 @@ if settings.startup["bobmods-logistics-robotparts"].value == true then drop_sound = tool_drop_move, inventory_move_sound = tool_drop_move, pick_sound = tool_pick, + weight = 5000, }, { @@ -406,6 +421,7 @@ if settings.startup["bobmods-logistics-robotparts"].value == true then drop_sound = tool_drop_move, inventory_move_sound = tool_drop_move, pick_sound = tool_pick, + weight = 5000, }, { @@ -419,6 +435,7 @@ if settings.startup["bobmods-logistics-robotparts"].value == true then drop_sound = tool_drop_move, inventory_move_sound = tool_drop_move, pick_sound = tool_pick, + weight = 5000, }, }) diff --git a/bobmining/prototypes/areadrills.lua b/bobmining/prototypes/areadrills.lua index c3f8e0d73..697c540eb 100644 --- a/bobmining/prototypes/areadrills.lua +++ b/bobmining/prototypes/areadrills.lua @@ -21,6 +21,7 @@ if settings.startup["bobmods-mining-areadrills"].value == true then filename = "__base__/sound/item/drill-inventory-pickup.ogg", volume = 0.8, }, + weight = 20000, }, { type = "item", @@ -43,6 +44,7 @@ if settings.startup["bobmods-mining-areadrills"].value == true then filename = "__base__/sound/item/drill-inventory-pickup.ogg", volume = 0.8, }, + weight = 20000, }, { type = "item", @@ -65,6 +67,7 @@ if settings.startup["bobmods-mining-areadrills"].value == true then filename = "__base__/sound/item/drill-inventory-pickup.ogg", volume = 0.8, }, + weight = 20000, }, { type = "item", @@ -87,6 +90,7 @@ if settings.startup["bobmods-mining-areadrills"].value == true then filename = "__base__/sound/item/drill-inventory-pickup.ogg", volume = 0.8, }, + weight = 20000, }, }) diff --git a/bobmining/prototypes/drills.lua b/bobmining/prototypes/drills.lua index 363046f48..1a99bb390 100644 --- a/bobmining/prototypes/drills.lua +++ b/bobmining/prototypes/drills.lua @@ -21,6 +21,7 @@ if settings.startup["bobmods-mining-miningdrills"].value == true then filename = "__base__/sound/item/drill-inventory-pickup.ogg", volume = 0.8, }, + weight = 20000, }, { type = "item", @@ -43,6 +44,7 @@ if settings.startup["bobmods-mining-miningdrills"].value == true then filename = "__base__/sound/item/drill-inventory-pickup.ogg", volume = 0.8, }, + weight = 20000, }, { type = "item", @@ -65,6 +67,7 @@ if settings.startup["bobmods-mining-miningdrills"].value == true then filename = "__base__/sound/item/drill-inventory-pickup.ogg", volume = 0.8, }, + weight = 20000, }, { type = "item", @@ -87,6 +90,7 @@ if settings.startup["bobmods-mining-miningdrills"].value == true then filename = "__base__/sound/item/drill-inventory-pickup.ogg", volume = 0.8, }, + weight = 20000, }, }) @@ -315,3 +319,5 @@ if settings.startup["bobmods-mining-miningdrills"].value == true then }, }) end + +data.raw.item["electric-mining-drill"].weight = 20000 diff --git a/bobmining/prototypes/pumpjacks.lua b/bobmining/prototypes/pumpjacks.lua index e0d810ae5..ebb066fdb 100644 --- a/bobmining/prototypes/pumpjacks.lua +++ b/bobmining/prototypes/pumpjacks.lua @@ -1,5 +1,6 @@ data.raw["mining-drill"]["pumpjack"].fast_replaceable_group = "pumpjack" data.raw.item["pumpjack"].order = "b[fluids]-b[pumpjack-1]" +data.raw.item["pumpjack"].weight = 50000 if settings.startup["bobmods-mining-pumpjacks"].value == true then data.raw["mining-drill"]["pumpjack"].next_upgrade = "bob-pumpjack-1" @@ -26,6 +27,7 @@ if settings.startup["bobmods-mining-pumpjacks"].value == true then filename = "__base__/sound/item/pumpjack-inventory-pickup.ogg", volume = 0.6, }, + weight = 50000, }, { type = "item", @@ -48,6 +50,7 @@ if settings.startup["bobmods-mining-pumpjacks"].value == true then filename = "__base__/sound/item/pumpjack-inventory-pickup.ogg", volume = 0.6, }, + weight = 50000, }, { type = "item", @@ -70,6 +73,7 @@ if settings.startup["bobmods-mining-pumpjacks"].value == true then filename = "__base__/sound/item/pumpjack-inventory-pickup.ogg", volume = 0.6, }, + weight = 50000, }, }) diff --git a/bobmining/prototypes/water-miner.lua b/bobmining/prototypes/water-miner.lua index b2c443603..81bc91e8c 100644 --- a/bobmining/prototypes/water-miner.lua +++ b/bobmining/prototypes/water-miner.lua @@ -21,6 +21,7 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re filename = "__base__/sound/item/pumpjack-inventory-pickup.ogg", volume = 0.6, }, + weight = 50000, }, { type = "item", @@ -43,6 +44,7 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re filename = "__base__/sound/item/pumpjack-inventory-pickup.ogg", volume = 0.6, }, + weight = 50000, }, { type = "item", @@ -65,6 +67,7 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re filename = "__base__/sound/item/pumpjack-inventory-pickup.ogg", volume = 0.6, }, + weight = 50000, }, { type = "item", @@ -87,6 +90,7 @@ if settings.startup["bobmods-mining-waterminers"].value == true and data.raw["re filename = "__base__/sound/item/pumpjack-inventory-pickup.ogg", volume = 0.6, }, + weight = 50000, }, }) diff --git a/bobmodules/prototypes/beacon.lua b/bobmodules/prototypes/beacon.lua index 11a9f4d56..1335ae485 100644 --- a/bobmodules/prototypes/beacon.lua +++ b/bobmodules/prototypes/beacon.lua @@ -8,6 +8,7 @@ local beacon_pick = { } data.raw.item["beacon"].subgroup = "module-beacon" +data.raw.item["beacon"].weight = 50000 data.raw.beacon["beacon"].fast_replaceable_group = "beacon" data.raw.beacon["beacon"].beacon_counter = "total" @@ -24,6 +25,7 @@ data:extend({ drop_sound = beacon_drop_move, inventory_move_sound = beacon_drop_move, pick_sound = beacon_pick, + weight = 50000, }, { @@ -37,6 +39,7 @@ data:extend({ drop_sound = beacon_drop_move, inventory_move_sound = beacon_drop_move, pick_sound = beacon_pick, + weight = 50000, }, util.merge({ diff --git a/bobmodules/prototypes/item/electronics.lua b/bobmodules/prototypes/item/electronics.lua index 5ea2ed0c6..4d7d74ce3 100644 --- a/bobmodules/prototypes/item/electronics.lua +++ b/bobmodules/prototypes/item/electronics.lua @@ -28,6 +28,7 @@ data:extend({ filename = "__base__/sound/item/metal-small-inventory-pickup.ogg", volume = 0.8, }, + weight = 2000, }, { type = "item", @@ -52,6 +53,7 @@ data:extend({ volume = 0.8, speed = 0.85, }, + weight = 5000, }, { type = "item", @@ -64,6 +66,7 @@ data:extend({ drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 5000, }, { type = "item", @@ -76,6 +79,7 @@ data:extend({ drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 5000, }, { type = "item", @@ -88,6 +92,7 @@ data:extend({ drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 5000, }, { type = "item", @@ -100,6 +105,7 @@ data:extend({ drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 5000, }, { type = "item", @@ -112,6 +118,7 @@ data:extend({ drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 5000, }, }) @@ -136,6 +143,7 @@ data:extend({ filename = "__base__/sound/item/metal-small-inventory-pickup.ogg", volume = 0.8, }, + weight = 500, }, { type = "item", @@ -160,6 +168,7 @@ data:extend({ volume = 0.8, speed = 0.85, }, + weight = 2500, }, { type = "item", @@ -184,6 +193,7 @@ data:extend({ volume = 0.85, speed = 1.6, }, + weight = 5000, }, { type = "item", @@ -208,6 +218,7 @@ data:extend({ volume = 0.85, speed = 1.6, }, + weight = 10000, }, { type = "item", @@ -220,6 +231,7 @@ data:extend({ drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 10000, }, { type = "item", @@ -232,6 +244,7 @@ data:extend({ drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 20000, }, { type = "item", @@ -244,6 +257,7 @@ data:extend({ drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 10000, }, { type = "item", @@ -256,6 +270,7 @@ data:extend({ drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 20000, }, { type = "item", @@ -268,6 +283,7 @@ data:extend({ drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 10000, }, { type = "item", @@ -280,6 +296,7 @@ data:extend({ drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 20000, }, { type = "item", @@ -292,6 +309,7 @@ data:extend({ drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 10000, }, { type = "item", @@ -304,6 +322,7 @@ data:extend({ drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 20000, }, { type = "item", @@ -316,6 +335,7 @@ data:extend({ drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 10000, }, { type = "item", @@ -328,6 +348,7 @@ data:extend({ drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 20000, }, }) @@ -344,6 +365,7 @@ if mods["quality"] then drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 5000, }, { type = "item", @@ -356,6 +378,7 @@ if mods["quality"] then drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 10000, }, { type = "item", @@ -368,6 +391,7 @@ if mods["quality"] then drop_sound = electronic_board_drop_move, inventory_move_sound = electronic_board_drop_move, pick_sound = electronic_board_pick, + weight = 20000, }, }) end diff --git a/bobmodules/prototypes/item/module-merged.lua b/bobmodules/prototypes/item/module-merged.lua index 8c2060038..4f78695a9 100644 --- a/bobmodules/prototypes/item/module-merged.lua +++ b/bobmodules/prototypes/item/module-merged.lua @@ -22,6 +22,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then }, art_style = "bob-god-base", requires_beacon_alt_mode = false, + weight = 200000, }, { type = "module", @@ -44,6 +45,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then }, art_style = "bob-god-productivity", requires_beacon_alt_mode = false, + weight = 200000, }, }) if mods["quality"] then @@ -69,6 +71,7 @@ if settings.startup["bobmods-modules-enablegodmodules"].value == true then }, art_style = "bob-god-quality", requires_beacon_alt_mode = false, + weight = 200000, }, }) end diff --git a/bobmodules/prototypes/item/module.lua b/bobmodules/prototypes/item/module.lua index 865c4cf50..7306a41fa 100644 --- a/bobmodules/prototypes/item/module.lua +++ b/bobmodules/prototypes/item/module.lua @@ -65,6 +65,7 @@ data:extend({ beacon_tint = module_color_map["blue"], art_style = "bob-5-lights", requires_beacon_alt_mode = false, + weight = 20000, }, { @@ -88,6 +89,7 @@ data:extend({ beacon_tint = module_color_map["blue"], art_style = "bob-5-lights", requires_beacon_alt_mode = false, + weight = 20000, }, }) @@ -140,6 +142,7 @@ data:extend({ beacon_tint = module_color_map["green"], art_style = "bob-5-lights", requires_beacon_alt_mode = false, + weight = 20000, }, { @@ -161,6 +164,7 @@ data:extend({ beacon_tint = module_color_map["green"], art_style = "bob-5-lights", requires_beacon_alt_mode = false, + weight = 20000, }, }) @@ -225,6 +229,7 @@ data:extend({ beacon_tint = module_color_map["red-yellow"], art_style = "bob-5-lights", requires_beacon_alt_mode = false, + weight = 20000, }, { @@ -249,6 +254,7 @@ data:extend({ beacon_tint = module_color_map["red-yellow"], art_style = "bob-5-lights", requires_beacon_alt_mode = false, + weight = 20000, }, }) @@ -271,6 +277,7 @@ data:extend({ beacon_tint = module_color_map["pine"], art_style = "bob-5-lights", requires_beacon_alt_mode = false, + weight = 20000, }, { @@ -289,6 +296,7 @@ data:extend({ beacon_tint = module_color_map["pine"], art_style = "bob-5-lights", requires_beacon_alt_mode = false, + weight = 20000, }, { @@ -307,6 +315,7 @@ data:extend({ beacon_tint = module_color_map["pine"], art_style = "bob-5-lights", requires_beacon_alt_mode = false, + weight = 20000, }, { @@ -325,6 +334,7 @@ data:extend({ beacon_tint = module_color_map["pine"], art_style = "bob-5-lights", requires_beacon_alt_mode = false, + weight = 20000, }, { @@ -343,6 +353,7 @@ data:extend({ beacon_tint = module_color_map["pine"], art_style = "bob-5-lights", requires_beacon_alt_mode = false, + weight = 20000, }, }) @@ -367,6 +378,7 @@ data:extend({ beacon_tint = module_color_map["brown"], art_style = "bob-5-lights", requires_beacon_alt_mode = false, + weight = 20000, }, { @@ -387,6 +399,7 @@ data:extend({ beacon_tint = module_color_map["brown"], art_style = "bob-5-lights", requires_beacon_alt_mode = false, + weight = 20000, }, { @@ -407,6 +420,7 @@ data:extend({ beacon_tint = module_color_map["brown"], art_style = "bob-5-lights", requires_beacon_alt_mode = false, + weight = 20000, }, { @@ -427,6 +441,7 @@ data:extend({ beacon_tint = module_color_map["brown"], art_style = "bob-5-lights", requires_beacon_alt_mode = false, + weight = 20000, }, { @@ -447,6 +462,7 @@ data:extend({ beacon_tint = module_color_map["brown"], art_style = "bob-5-lights", requires_beacon_alt_mode = false, + weight = 20000, }, }) diff --git a/bobores/data.lua b/bobores/data.lua index 69dbdb99d..7a6b51e39 100644 --- a/bobores/data.lua +++ b/bobores/data.lua @@ -125,3 +125,10 @@ data.raw.item["stone"].stack_size = 200 data.raw.item["coal"].stack_size = 200 data.raw.item["uranium-ore"].stack_size = 200 data.raw.item["sulfur"].stack_size = 200 +data.raw.item["copper-ore"].weight = 5000 +data.raw.item["iron-ore"].weight = 5000 +data.raw.item["stone"].weight = 2500 +data.raw.item["coal"].weight = 1000 +data.raw.item["uranium-ore"].weight = 20000 + +data.raw.item.landfill.weight = 50000 --Needed to compensate for change to stone's weight diff --git a/bobores/prototypes/bauxite.lua b/bobores/prototypes/bauxite.lua index 7ec2e4ec9..1d75f78c5 100644 --- a/bobores/prototypes/bauxite.lua +++ b/bobores/prototypes/bauxite.lua @@ -10,6 +10,7 @@ bobmods.ores.bauxite = { create = true, create_variations = true, subgroup = "bob-ores", + weight = 2500, }, sprite = { sheet = 1, diff --git a/bobores/prototypes/gems.lua b/bobores/prototypes/gems.lua index 7029d23b9..e876d899d 100644 --- a/bobores/prototypes/gems.lua +++ b/bobores/prototypes/gems.lua @@ -21,7 +21,7 @@ if bobmods.ores.settings.UnsortedGemOre == true then filename = "__base__/sound/item/resource-inventory-pickup.ogg", volume = 0.6, }, - weight = 2000, + weight = 5000, }, { type = "recipe", @@ -70,7 +70,7 @@ data:extend({ filename = "__base__/sound/item/resource-inventory-pickup.ogg", volume = 0.6, }, - weight = 2000, + weight = 2500, }, { type = "item", @@ -93,7 +93,7 @@ data:extend({ filename = "__base__/sound/item/resource-inventory-pickup.ogg", volume = 0.6, }, - weight = 2000, + weight = 2500, }, { type = "item", @@ -116,7 +116,7 @@ data:extend({ filename = "__base__/sound/item/resource-inventory-pickup.ogg", volume = 0.6, }, - weight = 2000, + weight = 2500, }, { type = "item", @@ -139,7 +139,7 @@ data:extend({ filename = "__base__/sound/item/resource-inventory-pickup.ogg", volume = 0.6, }, - weight = 2000, + weight = 2500, }, { type = "item", @@ -162,7 +162,7 @@ data:extend({ filename = "__base__/sound/item/resource-inventory-pickup.ogg", volume = 0.6, }, - weight = 2000, + weight = 2500, }, { type = "item", @@ -185,6 +185,6 @@ data:extend({ filename = "__base__/sound/item/resource-inventory-pickup.ogg", volume = 0.6, }, - weight = 2000, + weight = 2500, }, }) diff --git a/bobores/prototypes/gold-ore.lua b/bobores/prototypes/gold-ore.lua index a569a6248..350722209 100644 --- a/bobores/prototypes/gold-ore.lua +++ b/bobores/prototypes/gold-ore.lua @@ -10,6 +10,7 @@ bobmods.ores.gold = { create = true, create_variations = true, subgroup = "bob-ores", + weight = 10000, }, sprite = { sheet = 2, diff --git a/bobores/prototypes/lead-ore.lua b/bobores/prototypes/lead-ore.lua index 7f8f35237..a2616c3fa 100644 --- a/bobores/prototypes/lead-ore.lua +++ b/bobores/prototypes/lead-ore.lua @@ -9,6 +9,7 @@ bobmods.ores.lead = { create_variations = true, subgroup = "bob-ores", stack_size = 200, + weight = 10000, }, stage_mult = 100, sprite = { diff --git a/bobores/prototypes/thorium-ore.lua b/bobores/prototypes/thorium-ore.lua index 2dced0fa8..a3109b17f 100644 --- a/bobores/prototypes/thorium-ore.lua +++ b/bobores/prototypes/thorium-ore.lua @@ -12,6 +12,7 @@ bobmods.ores.thorium = { create = true, create_variations = true, subgroup = "bob-ores", + weight = 20000, }, sprite = { sheet = 6, --sheet 6 is a tintable uranium clone diff --git a/bobores/prototypes/tungsten-ore.lua b/bobores/prototypes/tungsten-ore.lua index 0593d434f..bf2252b93 100644 --- a/bobores/prototypes/tungsten-ore.lua +++ b/bobores/prototypes/tungsten-ore.lua @@ -10,6 +10,7 @@ bobmods.ores.tungsten = { create = true, create_variations = true, subgroup = "bob-ores", + weight = 10000, }, sprite = { sheet = 1, diff --git a/bobplates/data-updates.lua b/bobplates/data-updates.lua index c064889ce..bdc5dc4c3 100644 --- a/bobplates/data-updates.lua +++ b/bobplates/data-updates.lua @@ -336,6 +336,13 @@ data.raw.item["uranium-ore"].stack_size = 200 data.raw.item["sulfur"].stack_size = 200 data.raw.item["wood"].stack_size = 200 +-- Weight changes +data.raw.item["iron-plate"].weight = 1000 +data.raw.item["copper-plate"].weight = 1000 +data.raw.item["steel-plate"].weight = 2500 +data.raw.item["wood"].weight = 2500 +data.raw.item["electric-engine-unit"].weight = 5000 + if not bobmods.ores.cobalt.enabled then bobmods.lib.tech.remove_recipe_unlock("bob-cobalt-processing", "bob-cobalt-oxide") bobmods.lib.recipe.hide("bob-cobalt-oxide") @@ -432,4 +439,5 @@ end if mods["space-age"] then data.raw.recipe["bob-lithium-ion-battery"].category = "chemistry-or-cryogenics" data.raw.recipe["bob-silver-zinc-battery"].category = "chemistry-or-cryogenics" + data.raw["rocket-silo"]["rocket-silo"].to_be_inserted_to_rocket_inventory_size = 50 end diff --git a/bobplates/prototypes/item/alien.lua b/bobplates/prototypes/item/alien.lua index 36c044e4f..33605bb5f 100644 --- a/bobplates/prototypes/item/alien.lua +++ b/bobplates/prototypes/item/alien.lua @@ -27,6 +27,7 @@ then filename = "__base__/sound/item/metal-small-inventory-pickup.ogg", volume = 0.8, }, + weight = 2500, }, { @@ -49,6 +50,7 @@ then filename = "__base__/sound/item/metal-small-inventory-pickup.ogg", volume = 0.8, }, + weight = 2500, }, { diff --git a/bobplates/prototypes/item/alloys.lua b/bobplates/prototypes/item/alloys.lua index 0f5e9b170..e9b74f519 100644 --- a/bobplates/prototypes/item/alloys.lua +++ b/bobplates/prototypes/item/alloys.lua @@ -19,6 +19,7 @@ data:extend({ drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 1000, }, { type = "item", @@ -31,6 +32,7 @@ data:extend({ drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 1000, }, { type = "item", @@ -43,6 +45,7 @@ data:extend({ drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 2500, }, { type = "item", @@ -55,6 +58,7 @@ data:extend({ drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 1250, }, { type = "item", @@ -67,6 +71,7 @@ data:extend({ drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 1000, }, { @@ -80,6 +85,7 @@ data:extend({ drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 1000, }, { type = "item", @@ -92,6 +98,7 @@ data:extend({ drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 1000, }, { type = "item", @@ -104,5 +111,6 @@ data:extend({ drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 2500, }, }) diff --git a/bobplates/prototypes/item/chemicals.lua b/bobplates/prototypes/item/chemicals.lua index 7b222c34a..0bd6cc846 100644 --- a/bobplates/prototypes/item/chemicals.lua +++ b/bobplates/prototypes/item/chemicals.lua @@ -217,10 +217,11 @@ data:extend({ icon_size = 32, subgroup = "bob-resource-chemical", order = "f[bob-salt]", - stack_size = 100, + stack_size = 200, drop_sound = powder_drop_move, inventory_move_sound = powder_drop_move, pick_sound = powder_pick, + weight = 500, }, { @@ -230,10 +231,11 @@ data:extend({ icon_size = 32, subgroup = "bob-resource-chemical", order = "f[bob-lithium-chloride]", - stack_size = 100, + stack_size = 200, drop_sound = powder_drop_move, inventory_move_sound = powder_drop_move, pick_sound = powder_pick, + weight = 500, }, { @@ -243,10 +245,11 @@ data:extend({ icon_size = 32, subgroup = "bob-resource-chemical", order = "f[bob-lithium-perchlorate]", - stack_size = 100, + stack_size = 200, drop_sound = powder_drop_move, inventory_move_sound = powder_drop_move, pick_sound = powder_pick, + weight = 1000, }, { @@ -259,6 +262,7 @@ data:extend({ drop_sound = powder_drop_move, inventory_move_sound = powder_drop_move, pick_sound = powder_pick, + weight = 1000, }, { @@ -272,6 +276,7 @@ data:extend({ drop_sound = powder_drop_move, inventory_move_sound = powder_drop_move, pick_sound = powder_pick, + weight = 1000, }, { @@ -285,6 +290,7 @@ data:extend({ drop_sound = powder_drop_move, inventory_move_sound = powder_drop_move, pick_sound = powder_pick, + weight = 2000, }, { @@ -307,6 +313,7 @@ data:extend({ filename = "__base__/sound/item/resource-inventory-pickup.ogg", volume = 0.6, }, + weight = 1000, }, { @@ -320,6 +327,7 @@ data:extend({ drop_sound = powder_drop_move, inventory_move_sound = powder_drop_move, pick_sound = powder_pick, + weight = 5000, }, { @@ -333,6 +341,7 @@ data:extend({ drop_sound = powder_drop_move, inventory_move_sound = powder_drop_move, pick_sound = powder_pick, + weight = 2500, }, { @@ -346,6 +355,7 @@ data:extend({ drop_sound = powder_drop_move, inventory_move_sound = powder_drop_move, pick_sound = powder_pick, + weight = 1000, }, { @@ -359,6 +369,7 @@ data:extend({ drop_sound = powder_drop_move, inventory_move_sound = powder_drop_move, pick_sound = powder_pick, + weight = 1000, }, { @@ -372,6 +383,7 @@ data:extend({ drop_sound = powder_drop_move, inventory_move_sound = powder_drop_move, pick_sound = powder_pick, + weight = 2000, }, { @@ -385,6 +397,7 @@ data:extend({ drop_sound = powder_drop_move, inventory_move_sound = powder_drop_move, pick_sound = powder_pick, + weight = 1000, }, { @@ -398,6 +411,7 @@ data:extend({ drop_sound = powder_drop_move, inventory_move_sound = powder_drop_move, pick_sound = powder_pick, + weight = 1000, }, { @@ -411,6 +425,7 @@ data:extend({ drop_sound = powder_drop_move, inventory_move_sound = powder_drop_move, pick_sound = powder_pick, + weight = 1000, }, }) diff --git a/bobplates/prototypes/item/electronics.lua b/bobplates/prototypes/item/electronics.lua index c3e2c041c..71c188cdf 100644 --- a/bobplates/prototypes/item/electronics.lua +++ b/bobplates/prototypes/item/electronics.lua @@ -1,6 +1,8 @@ data.raw.item["electronic-circuit"].order = "a[circuits]-a[electronic-circuit]" data.raw.item["advanced-circuit"].order = "a[circuits]-b[advanced-circuit]" data.raw.item["processing-unit"].order = "a[circuits]-c[processing-unit-1]" +data.raw.item["processing-unit"].stack_size = 200 +data.raw.item["processing-unit"].weight = 2500 data:extend({ { @@ -23,6 +25,7 @@ data:extend({ filename = "__base__/sound/item/electric-small-inventory-pickup.ogg", volume = 0.7, }, + weight = 5000, }, { diff --git a/bobplates/prototypes/item/entities.lua b/bobplates/prototypes/item/entities.lua index a58899b49..bef1114b6 100644 --- a/bobplates/prototypes/item/entities.lua +++ b/bobplates/prototypes/item/entities.lua @@ -20,6 +20,7 @@ data:extend({ filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, + weight = 20000, }, { @@ -43,6 +44,7 @@ data:extend({ filename = "__base__/sound/item/brick-inventory-pickup.ogg", volume = 0.6, }, + weight = 10000, }, { type = "item", @@ -65,6 +67,7 @@ data:extend({ filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.8, }, + weight = 10000, }, { type = "item", @@ -111,6 +114,7 @@ data:extend({ filename = "__base__/sound/item/brick-inventory-pickup.ogg", volume = 0.6, }, + weight = 10000, }, { type = "item", @@ -133,6 +137,7 @@ data:extend({ filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.8, }, + weight = 10000, }, { type = "item", @@ -179,7 +184,7 @@ data:extend({ filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, - weight = 5000, + weight = 10000, }, { @@ -203,7 +208,7 @@ data:extend({ filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, - weight = 5000, + weight = 10000, }, { @@ -227,7 +232,7 @@ data:extend({ filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, - weight = 5000, + weight = 10000, }, { @@ -251,7 +256,7 @@ data:extend({ filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, - weight = 5000, + weight = 10000, }, { @@ -275,7 +280,7 @@ data:extend({ filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, - weight = 5000, + weight = 10000, }, { @@ -299,7 +304,7 @@ data:extend({ filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, - weight = 5000, + weight = 10000, }, { @@ -323,7 +328,7 @@ data:extend({ filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, - weight = 5000, + weight = 10000, }, { @@ -347,7 +352,7 @@ data:extend({ filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, - weight = 5000, + weight = 10000, }, { @@ -371,6 +376,7 @@ data:extend({ filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.8, }, + weight = 10000, }, { @@ -394,6 +400,7 @@ data:extend({ filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.8, }, + weight = 10000, }, { @@ -417,6 +424,9 @@ data:extend({ filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, - weight = 5000, + weight = 10000, }, }) + +data.raw.item["stone-furnace"].weight = 10000 +data.raw.item["steel-furnace"].weight = 10000 diff --git a/bobplates/prototypes/item/gems.lua b/bobplates/prototypes/item/gems.lua index 61b8fd23b..5c3704e80 100644 --- a/bobplates/prototypes/item/gems.lua +++ b/bobplates/prototypes/item/gems.lua @@ -19,6 +19,7 @@ data:extend({ drop_sound = gem_drop_move, inventory_move_sound = gem_drop_move, pick_sound = gem_pick, + weight = 625, }, { type = "item", @@ -31,6 +32,7 @@ data:extend({ drop_sound = gem_drop_move, inventory_move_sound = gem_drop_move, pick_sound = gem_pick, + weight = 625, }, { type = "item", @@ -43,6 +45,7 @@ data:extend({ drop_sound = gem_drop_move, inventory_move_sound = gem_drop_move, pick_sound = gem_pick, + weight = 625, }, { type = "item", @@ -55,6 +58,7 @@ data:extend({ drop_sound = gem_drop_move, inventory_move_sound = gem_drop_move, pick_sound = gem_pick, + weight = 625, }, { type = "item", @@ -67,6 +71,7 @@ data:extend({ drop_sound = gem_drop_move, inventory_move_sound = gem_drop_move, pick_sound = gem_pick, + weight = 625, }, { type = "item", @@ -79,6 +84,7 @@ data:extend({ drop_sound = gem_drop_move, inventory_move_sound = gem_drop_move, pick_sound = gem_pick, + weight = 625, }, { @@ -92,6 +98,7 @@ data:extend({ drop_sound = gem_drop_move, inventory_move_sound = gem_drop_move, pick_sound = gem_pick, + weight = 500, }, { type = "item", @@ -104,6 +111,7 @@ data:extend({ drop_sound = gem_drop_move, inventory_move_sound = gem_drop_move, pick_sound = gem_pick, + weight = 500, }, { type = "item", @@ -116,6 +124,7 @@ data:extend({ drop_sound = gem_drop_move, inventory_move_sound = gem_drop_move, pick_sound = gem_pick, + weight = 500, }, { type = "item", @@ -128,6 +137,7 @@ data:extend({ drop_sound = gem_drop_move, inventory_move_sound = gem_drop_move, pick_sound = gem_pick, + weight = 500, }, { type = "item", @@ -140,6 +150,7 @@ data:extend({ drop_sound = gem_drop_move, inventory_move_sound = gem_drop_move, pick_sound = gem_pick, + weight = 500, }, { type = "item", @@ -152,6 +163,7 @@ data:extend({ drop_sound = gem_drop_move, inventory_move_sound = gem_drop_move, pick_sound = gem_pick, + weight = 500, }, { @@ -165,6 +177,7 @@ data:extend({ drop_sound = gem_drop_move, inventory_move_sound = gem_drop_move, pick_sound = gem_pick, + weight = 500, }, { type = "item", @@ -177,6 +190,7 @@ data:extend({ drop_sound = gem_drop_move, inventory_move_sound = gem_drop_move, pick_sound = gem_pick, + weight = 500, }, { type = "item", @@ -189,6 +203,7 @@ data:extend({ drop_sound = gem_drop_move, inventory_move_sound = gem_drop_move, pick_sound = gem_pick, + weight = 500, }, { type = "item", @@ -201,6 +216,7 @@ data:extend({ drop_sound = gem_drop_move, inventory_move_sound = gem_drop_move, pick_sound = gem_pick, + weight = 500, }, { type = "item", @@ -213,6 +229,7 @@ data:extend({ drop_sound = gem_drop_move, inventory_move_sound = gem_drop_move, pick_sound = gem_pick, + weight = 500, }, { type = "item", @@ -225,5 +242,6 @@ data:extend({ drop_sound = gem_drop_move, inventory_move_sound = gem_drop_move, pick_sound = gem_pick, + weight = 500, }, }) diff --git a/bobplates/prototypes/item/nuclear.lua b/bobplates/prototypes/item/nuclear.lua index a0d5b4b42..2925d6109 100644 --- a/bobplates/prototypes/item/nuclear.lua +++ b/bobplates/prototypes/item/nuclear.lua @@ -19,6 +19,7 @@ data:extend({ drop_sound = radioactive_drop_move, inventory_move_sound = radioactive_drop_move, pick_sound = radioactive_pick, + weight = 50000, }, }) @@ -38,6 +39,7 @@ data:extend({ drop_sound = radioactive_drop_move, inventory_move_sound = radioactive_drop_move, pick_sound = radioactive_pick, + weight = 100000, }, { type = "item", @@ -71,6 +73,7 @@ data:extend({ filename = "__base__/sound/item/fuel-cell-inventory-pickup.ogg", volume = 0.5, }, + weight = 1000, }, }) @@ -86,6 +89,7 @@ data:extend({ drop_sound = radioactive_drop_move, inventory_move_sound = radioactive_drop_move, pick_sound = radioactive_pick, + weight = 50000, }, { type = "item", @@ -102,6 +106,7 @@ data:extend({ drop_sound = radioactive_drop_move, inventory_move_sound = radioactive_drop_move, pick_sound = radioactive_pick, + weight = 100000, }, { type = "item", @@ -118,6 +123,7 @@ data:extend({ drop_sound = radioactive_drop_move, inventory_move_sound = radioactive_drop_move, pick_sound = radioactive_pick, + weight = 100000, }, { type = "item", @@ -130,6 +136,7 @@ data:extend({ drop_sound = radioactive_drop_move, inventory_move_sound = radioactive_drop_move, pick_sound = radioactive_pick, + weight = 100000, }, }) @@ -158,6 +165,7 @@ data:extend({ filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, + weight = 100000, }, { type = "item", @@ -179,6 +187,7 @@ data:extend({ filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, + weight = 100000, }, }) @@ -207,6 +216,7 @@ data:extend({ filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, + weight = 100000, }, { type = "item", @@ -219,6 +229,7 @@ data:extend({ drop_sound = radioactive_drop_move, inventory_move_sound = radioactive_drop_move, pick_sound = radioactive_pick, + weight = 2000, }, }) diff --git a/bobplates/prototypes/item/parts.lua b/bobplates/prototypes/item/parts.lua index 9a38033cf..fb78fcbb4 100644 --- a/bobplates/prototypes/item/parts.lua +++ b/bobplates/prototypes/item/parts.lua @@ -27,6 +27,9 @@ local ball_pick = { speed = 1.6, } +data.raw.item["iron-gear-wheel"].weight = 2000 +data.raw.item.battery.weight = 5000 + data:extend({ { type = "item", @@ -39,6 +42,7 @@ data:extend({ drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 5000, }, { @@ -52,6 +56,7 @@ data:extend({ drop_sound = ball_drop_move, inventory_move_sound = ball_drop_move, pick_sound = ball_pick, + weight = 200, }, { @@ -65,6 +70,7 @@ data:extend({ drop_sound = bearing_drop_move, inventory_move_sound = bearing_drop_move, pick_sound = bearing_pick, + weight = 5000, }, { @@ -78,6 +84,7 @@ data:extend({ drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 2000, }, { @@ -91,6 +98,7 @@ data:extend({ drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 5000, }, { @@ -104,6 +112,7 @@ data:extend({ drop_sound = ball_drop_move, inventory_move_sound = ball_drop_move, pick_sound = ball_pick, + weight = 200, }, { @@ -117,6 +126,7 @@ data:extend({ drop_sound = bearing_drop_move, inventory_move_sound = bearing_drop_move, pick_sound = bearing_pick, + weight = 5000, }, { @@ -130,6 +140,7 @@ data:extend({ drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 1000, }, { @@ -143,6 +154,7 @@ data:extend({ drop_sound = ball_drop_move, inventory_move_sound = ball_drop_move, pick_sound = ball_pick, + weight = 40, }, { @@ -156,6 +168,7 @@ data:extend({ drop_sound = bearing_drop_move, inventory_move_sound = bearing_drop_move, pick_sound = bearing_pick, + weight = 1000, }, { @@ -169,6 +182,7 @@ data:extend({ drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 5000, }, { @@ -182,6 +196,7 @@ data:extend({ drop_sound = ball_drop_move, inventory_move_sound = ball_drop_move, pick_sound = ball_pick, + weight = 80, }, { @@ -195,6 +210,7 @@ data:extend({ drop_sound = bearing_drop_move, inventory_move_sound = bearing_drop_move, pick_sound = bearing_pick, + weight = 2000, }, { @@ -208,6 +224,7 @@ data:extend({ drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 2000, }, { @@ -221,6 +238,7 @@ data:extend({ drop_sound = ball_drop_move, inventory_move_sound = ball_drop_move, pick_sound = ball_pick, + weight = 80, }, { @@ -234,6 +252,7 @@ data:extend({ drop_sound = bearing_drop_move, inventory_move_sound = bearing_drop_move, pick_sound = bearing_pick, + weight = 2000, }, { @@ -256,6 +275,7 @@ data:extend({ filename = "__base__/sound/item/electric-small-inventory-pickup.ogg", volume = 0.7, }, + weight = 5000, }, { @@ -278,6 +298,7 @@ data:extend({ filename = "__base__/sound/item/electric-small-inventory-pickup.ogg", volume = 0.7, }, + weight = 5000, }, { @@ -302,6 +323,7 @@ data:extend({ filename = "__base__/sound/item/explosive-inventory-move.ogg", volume = 1, }, + weight = 5000, }, { @@ -326,5 +348,6 @@ data:extend({ filename = "__base__/sound/item/explosive-inventory-move.ogg", volume = 1, }, + weight = 5000, }, }) diff --git a/bobplates/prototypes/item/plates.lua b/bobplates/prototypes/item/plates.lua index 7f5e0246f..f6cdafc6e 100644 --- a/bobplates/prototypes/item/plates.lua +++ b/bobplates/prototypes/item/plates.lua @@ -19,6 +19,7 @@ data:extend({ drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 1000, }, { type = "item", @@ -31,36 +32,43 @@ data:extend({ drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 1000, }, { type = "item", name = "bob-lead-plate", icon = "__bobplates__/graphics/icons/plate/lead-plate.png", - icon_size = 64, subgroup = "bob-material", order = "c-a-f[bob-lead-plate]", stack_size = 200, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, + weight = 2500, }, { type = "item", name = "bob-gold-plate", icon = "__bobplates__/graphics/icons/plate/gold-plate.png", - icon_size = 64, subgroup = "bob-material", order = "c-a-d[bob-gold-plate]", stack_size = 200, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, + weight = 2500, }, { type = "item", name = "bob-nickel-plate", icon = "__bobplates__/graphics/icons/plate/nickel-plate.png", - icon_size = 64, subgroup = "bob-material", order = "c-a-f[bob-nickel-plate]", stack_size = 200, drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 1000, }, { type = "item", @@ -73,6 +81,7 @@ data:extend({ drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 1000, }, { type = "item", @@ -82,6 +91,10 @@ data:extend({ subgroup = "bob-material", order = "c-a-g[bob-aluminium-plate]", stack_size = 200, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, + weight = 500, }, { type = "item", @@ -94,6 +107,7 @@ data:extend({ drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 500, }, { type = "item", @@ -106,6 +120,7 @@ data:extend({ drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 2500, }, { type = "item", @@ -127,6 +142,7 @@ data:extend({ filename = "__base__/sound/item/brick-inventory-pickup.ogg", volume = 0.6, }, + weight = 1000, }, { type = "item", @@ -139,6 +155,7 @@ data:extend({ drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 500, }, { type = "item", @@ -151,5 +168,6 @@ data:extend({ drop_sound = plate_drop_move, inventory_move_sound = plate_drop_move, pick_sound = plate_pick, + weight = 1000, }, }) diff --git a/bobplates/prototypes/item/resource.lua b/bobplates/prototypes/item/resource.lua index 15454e4ea..58f39ffa0 100644 --- a/bobplates/prototypes/item/resource.lua +++ b/bobplates/prototypes/item/resource.lua @@ -9,7 +9,7 @@ data:extend({ fuel_category = "chemical", fuel_value = "2MJ", --"4MJ", fuel_emissions_multiplier = 0.9, - stack_size = 100, + stack_size = 200, drop_sound = { filename = "__base__/sound/item/resource-inventory-move.ogg", volume = 0.8, @@ -22,6 +22,7 @@ data:extend({ filename = "__base__/sound/item/resource-inventory-pickup.ogg", volume = 0.6, }, + weight = 500, }, { @@ -44,6 +45,7 @@ data:extend({ filename = "__base__/sound/item/solid-fuel-inventory-pickup.ogg", volume = 0.7, }, + weight = 1000, }, { @@ -66,6 +68,7 @@ data:extend({ filename = "__base__/sound/item/solid-fuel-inventory-pickup.ogg", volume = 0.7, }, + weight = 1000, }, { @@ -91,6 +94,7 @@ data:extend({ volume = 0.85, speed = 1.6, }, + weight = 1000, }, { @@ -113,6 +117,7 @@ data:extend({ filename = "__base__/sound/item/planner-inventory-pickup.ogg", volume = 0.5, }, + weight = 125, }, { @@ -138,6 +143,7 @@ data:extend({ volume = 0.6, speed = 1.2, }, + weight = 1000, }, { @@ -160,6 +166,7 @@ data:extend({ filename = "__base__/sound/item/fluid-inventory-pickup.ogg", volume = 0.5, }, + weight = 500, }, { @@ -182,6 +189,7 @@ data:extend({ filename = "__base__/sound/item/metal-chest-inventory-pickup.ogg", volume = 0.6, }, + weight = 5000, }, { @@ -204,6 +212,7 @@ data:extend({ filename = "__base__/sound/item/plastic-inventory-pickup.ogg", volume = 0.7, }, + weight = 5000, }, { @@ -231,5 +240,6 @@ data:extend({ filename = "__base__/sound/item/solid-fuel-inventory-pickup.ogg", volume = 0.7, }, + weight = 2000, }, }) diff --git a/bobpower/prototypes/heat-pipes.lua b/bobpower/prototypes/heat-pipes.lua index 9ac30d057..c17d76f97 100644 --- a/bobpower/prototypes/heat-pipes.lua +++ b/bobpower/prototypes/heat-pipes.lua @@ -14,6 +14,7 @@ then "heat-pipe", { { type = "item", name = "steel-plate", amount = 5 }, { type = "item", name = "copper-plate", amount = 10 } } ) + data.raw.item["heat-pipe"].weight = 10000 data:extend({ { @@ -36,6 +37,7 @@ then filename = "__base__/sound/item/metal-small-inventory-pickup.ogg", volume = 0.8, }, + weight = 10000, }, { type = "item", @@ -57,6 +59,7 @@ then filename = "__base__/sound/item/metal-small-inventory-pickup.ogg", volume = 0.8, }, + weight = 10000, }, { type = "item", @@ -78,6 +81,7 @@ then filename = "__base__/sound/item/metal-small-inventory-pickup.ogg", volume = 0.8, }, + weight = 10000, }, { diff --git a/bobpower/prototypes/item/accumulators.lua b/bobpower/prototypes/item/accumulators.lua index 328c24cb6..e20ed59b3 100644 --- a/bobpower/prototypes/item/accumulators.lua +++ b/bobpower/prototypes/item/accumulators.lua @@ -1,6 +1,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then data.raw["item"]["accumulator"].order = "e[accumulator]-a[accumulator]-a-l" data.raw["item"]["accumulator"].subgroup = "bob-energy-accumulator" + data.raw["item"]["accumulator"].weight = 20000 local electric_large_drop_move = { filename = "__base__/sound/item/electric-large-inventory-move.ogg", @@ -24,6 +25,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 10000, }, { @@ -38,6 +40,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 10000, }, { @@ -52,6 +55,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 20000, }, { @@ -66,6 +70,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 10000, }, { @@ -80,6 +85,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 10000, }, { @@ -94,6 +100,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 20000, }, { @@ -108,6 +115,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 10000, }, { @@ -122,6 +130,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 10000, }, }) end diff --git a/bobpower/prototypes/item/boilers.lua b/bobpower/prototypes/item/boilers.lua index f38ca6be4..96af1e6e9 100644 --- a/bobpower/prototypes/item/boilers.lua +++ b/bobpower/prototypes/item/boilers.lua @@ -1,6 +1,7 @@ if settings.startup["bobmods-power-steam"].value == true then data.raw.item["boiler"].order = "b[steam-power]-a[boiler-1]" data.raw.item["boiler"].subgroup = "bob-energy-boiler" + data.raw.item["boiler"].weight = 20000 local steam_drop_move = { filename = "__base__/sound/item/steam-inventory-move.ogg", @@ -24,6 +25,7 @@ if settings.startup["bobmods-power-steam"].value == true then drop_sound = steam_drop_move, inventory_move_sound = steam_drop_move, pick_sound = steam_pick, + weight = 20000, }, { @@ -38,6 +40,7 @@ if settings.startup["bobmods-power-steam"].value == true then drop_sound = steam_drop_move, inventory_move_sound = steam_drop_move, pick_sound = steam_pick, + weight = 20000, }, { @@ -52,6 +55,7 @@ if settings.startup["bobmods-power-steam"].value == true then drop_sound = steam_drop_move, inventory_move_sound = steam_drop_move, pick_sound = steam_pick, + weight = 20000, }, { @@ -66,6 +70,7 @@ if settings.startup["bobmods-power-steam"].value == true then drop_sound = steam_drop_move, inventory_move_sound = steam_drop_move, pick_sound = steam_pick, + weight = 20000, }, }) end diff --git a/bobpower/prototypes/item/fluid-generator.lua b/bobpower/prototypes/item/fluid-generator.lua index 95bb45151..97fd99495 100644 --- a/bobpower/prototypes/item/fluid-generator.lua +++ b/bobpower/prototypes/item/fluid-generator.lua @@ -20,6 +20,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then filename = "__base__/sound/item/mechanical-inventory-pickup.ogg", volume = 0.8, }, + weight = 100000, }, { @@ -42,6 +43,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then filename = "__base__/sound/item/mechanical-inventory-pickup.ogg", volume = 0.8, }, + weight = 100000, }, { @@ -64,6 +66,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then filename = "__base__/sound/item/mechanical-inventory-pickup.ogg", volume = 0.8, }, + weight = 100000, }, }) @@ -95,6 +98,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then volume = 0.8, }, }, + weight = 100000, }) end end diff --git a/bobpower/prototypes/item/heat-exchangers.lua b/bobpower/prototypes/item/heat-exchangers.lua index 7417ecb71..be82631b0 100644 --- a/bobpower/prototypes/item/heat-exchangers.lua +++ b/bobpower/prototypes/item/heat-exchangers.lua @@ -1,6 +1,7 @@ if settings.startup["bobmods-power-steam"].value == true then data.raw.item["heat-exchanger"].order = "f[nuclear-energy]-b[heat-exchanger-1]" data.raw.item["heat-exchanger"].subgroup = "bob-energy-heat-exchanger" + data.raw.item["heat-exchanger"].weight = 40000 local steam_drop_move = { filename = "__base__/sound/item/steam-inventory-move.ogg", @@ -24,6 +25,7 @@ if settings.startup["bobmods-power-steam"].value == true then drop_sound = steam_drop_move, inventory_move_sound = steam_drop_move, pick_sound = steam_pick, + weight = 40000, }, { @@ -38,6 +40,7 @@ if settings.startup["bobmods-power-steam"].value == true then drop_sound = steam_drop_move, inventory_move_sound = steam_drop_move, pick_sound = steam_pick, + weight = 40000, }, { @@ -52,6 +55,7 @@ if settings.startup["bobmods-power-steam"].value == true then drop_sound = steam_drop_move, inventory_move_sound = steam_drop_move, pick_sound = steam_pick, + weight = 40000, }, }) end diff --git a/bobpower/prototypes/item/nuclear.lua b/bobpower/prototypes/item/nuclear.lua index b9c20e4d0..05b072423 100644 --- a/bobpower/prototypes/item/nuclear.lua +++ b/bobpower/prototypes/item/nuclear.lua @@ -1,5 +1,6 @@ if settings.startup["bobmods-power-nuclear"].value == true then data.raw.item["nuclear-reactor"].order = "f[nuclear-energy]-a[reactor-1]" + data.raw.item["nuclear-reactor"].weight = 1000000 data:extend({ { @@ -23,6 +24,7 @@ if settings.startup["bobmods-power-nuclear"].value == true then filename = "__base__/sound/item/reactor-inventory-pickup.ogg", volume = 0.6, }, + weight = 1000000, }, { type = "item", @@ -45,6 +47,7 @@ if settings.startup["bobmods-power-nuclear"].value == true then filename = "__base__/sound/item/reactor-inventory-pickup.ogg", volume = 0.6, }, + weight = 1000000, }, }) end diff --git a/bobpower/prototypes/item/oil-boilers.lua b/bobpower/prototypes/item/oil-boilers.lua index 19f7522f6..214320377 100644 --- a/bobpower/prototypes/item/oil-boilers.lua +++ b/bobpower/prototypes/item/oil-boilers.lua @@ -20,6 +20,7 @@ if settings.startup["bobmods-power-steam"].value == true then drop_sound = steam_drop_move, inventory_move_sound = steam_drop_move, pick_sound = steam_pick, + weight = 20000, }, { @@ -33,6 +34,7 @@ if settings.startup["bobmods-power-steam"].value == true then drop_sound = steam_drop_move, inventory_move_sound = steam_drop_move, pick_sound = steam_pick, + weight = 20000, }, { @@ -46,6 +48,7 @@ if settings.startup["bobmods-power-steam"].value == true then drop_sound = steam_drop_move, inventory_move_sound = steam_drop_move, pick_sound = steam_pick, + weight = 20000, }, { @@ -59,6 +62,7 @@ if settings.startup["bobmods-power-steam"].value == true then drop_sound = steam_drop_move, inventory_move_sound = steam_drop_move, pick_sound = steam_pick, + weight = 20000, }, }) end diff --git a/bobpower/prototypes/item/poles.lua b/bobpower/prototypes/item/poles.lua index 6f99f0de1..a96ac8b2b 100644 --- a/bobpower/prototypes/item/poles.lua +++ b/bobpower/prototypes/item/poles.lua @@ -2,6 +2,10 @@ if settings.startup["bobmods-power-poles"].value == true then data.raw.item["medium-electric-pole"].order = "a[energy]-b[medium-electric-pole-1]" data.raw.item["big-electric-pole"].order = "a[energy]-c[big-electric-pole-1]" data.raw.item["substation"].order = "a[energy]-d[substation-1]" + data.raw.item["small-electric-pole"].weight = 20000 + data.raw.item["medium-electric-pole"].weight = 20000 + data.raw.item["big-electric-pole"].weight = 40000 + data.raw.item["substation"].weight = 100000 local electric_large_drop_move = { filename = "__base__/sound/item/electric-large-inventory-move.ogg", @@ -25,6 +29,7 @@ if settings.startup["bobmods-power-poles"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 20000, }, { @@ -39,6 +44,7 @@ if settings.startup["bobmods-power-poles"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 20000, }, { @@ -53,6 +59,7 @@ if settings.startup["bobmods-power-poles"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 20000, }, { @@ -67,6 +74,7 @@ if settings.startup["bobmods-power-poles"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 40000, }, { @@ -81,6 +89,7 @@ if settings.startup["bobmods-power-poles"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 40000, }, { @@ -95,6 +104,7 @@ if settings.startup["bobmods-power-poles"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 40000, }, { @@ -109,6 +119,7 @@ if settings.startup["bobmods-power-poles"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 100000, }, { @@ -123,6 +134,7 @@ if settings.startup["bobmods-power-poles"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 100000, }, { @@ -137,6 +149,7 @@ if settings.startup["bobmods-power-poles"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 100000, }, }) end diff --git a/bobpower/prototypes/item/solar-panels.lua b/bobpower/prototypes/item/solar-panels.lua index 3d818226f..3553ca187 100644 --- a/bobpower/prototypes/item/solar-panels.lua +++ b/bobpower/prototypes/item/solar-panels.lua @@ -1,6 +1,7 @@ if settings.startup["bobmods-power-solar"].value == true then data.raw["item"]["solar-panel"].order = "d[solar-panel]-a[solar-panel-1-b]" data.raw["item"]["solar-panel"].subgroup = "bob-energy-solar-panel" + data.raw["item"]["solar-panel"].weight = 20000 local electric_large_drop_move = { filename = "__base__/sound/item/electric-large-inventory-move.ogg", @@ -24,6 +25,7 @@ if settings.startup["bobmods-power-solar"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 10000, }, { @@ -38,6 +40,7 @@ if settings.startup["bobmods-power-solar"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 40000, }, { @@ -52,6 +55,7 @@ if settings.startup["bobmods-power-solar"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 10000, }, { @@ -66,6 +70,7 @@ if settings.startup["bobmods-power-solar"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 20000 }, { @@ -80,6 +85,7 @@ if settings.startup["bobmods-power-solar"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 40000, }, { @@ -94,6 +100,7 @@ if settings.startup["bobmods-power-solar"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 10000, }, { @@ -108,6 +115,7 @@ if settings.startup["bobmods-power-solar"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 20000, }, { @@ -122,6 +130,7 @@ if settings.startup["bobmods-power-solar"].value == true then drop_sound = electric_large_drop_move, inventory_move_sound = electric_large_drop_move, pick_sound = electric_large_pick, + weight = 40000, }, }) end diff --git a/bobpower/prototypes/item/steam-engines.lua b/bobpower/prototypes/item/steam-engines.lua index eb6ed013f..78fc5c37e 100644 --- a/bobpower/prototypes/item/steam-engines.lua +++ b/bobpower/prototypes/item/steam-engines.lua @@ -1,6 +1,7 @@ if settings.startup["bobmods-power-steam"].value == true then data.raw["item"]["steam-engine"].order = "b[steam-power]-b[steam-engine-1]" data.raw["item"]["steam-engine"].subgroup = "bob-energy-steam-engine" + data.raw["item"]["steam-engine"].weight = 100000 local steam_drop_move = { filename = "__base__/sound/item/steam-inventory-move.ogg", @@ -24,6 +25,7 @@ if settings.startup["bobmods-power-steam"].value == true then drop_sound = steam_drop_move, inventory_move_sound = steam_drop_move, pick_sound = steam_pick, + weight = 100000, }, { type = "item", @@ -37,6 +39,7 @@ if settings.startup["bobmods-power-steam"].value == true then drop_sound = steam_drop_move, inventory_move_sound = steam_drop_move, pick_sound = steam_pick, + weight = 100000, }, { type = "item", @@ -50,6 +53,7 @@ if settings.startup["bobmods-power-steam"].value == true then drop_sound = steam_drop_move, inventory_move_sound = steam_drop_move, pick_sound = steam_pick, + weight = 100000, }, { type = "item", @@ -63,6 +67,7 @@ if settings.startup["bobmods-power-steam"].value == true then drop_sound = steam_drop_move, inventory_move_sound = steam_drop_move, pick_sound = steam_pick, + weight = 100000, }, }) end diff --git a/bobpower/prototypes/item/steam-turbines.lua b/bobpower/prototypes/item/steam-turbines.lua index 9653045c4..fe47f908d 100644 --- a/bobpower/prototypes/item/steam-turbines.lua +++ b/bobpower/prototypes/item/steam-turbines.lua @@ -1,6 +1,7 @@ if settings.startup["bobmods-power-steam"].value == true then data.raw["item"]["steam-turbine"].order = "b[steam-power]-c[steam-turbine-1]" data.raw["item"]["steam-turbine"].subgroup = "bob-energy-steam-engine" + data.raw["item"]["steam-turbine"].weight = 100000 local steam_drop_move = { filename = "__base__/sound/item/steam-inventory-move.ogg", @@ -24,6 +25,7 @@ if settings.startup["bobmods-power-steam"].value == true then drop_sound = steam_drop_move, inventory_move_sound = steam_drop_move, pick_sound = steam_pick, + weight = 100000, }, { type = "item", @@ -37,6 +39,7 @@ if settings.startup["bobmods-power-steam"].value == true then drop_sound = steam_drop_move, inventory_move_sound = steam_drop_move, pick_sound = steam_pick, + weight = 100000, }, }) end diff --git a/bobrevamp/prototypes/hard-mode.lua b/bobrevamp/prototypes/hard-mode.lua index 6e8a8d2fb..9d391c486 100644 --- a/bobrevamp/prototypes/hard-mode.lua +++ b/bobrevamp/prototypes/hard-mode.lua @@ -46,6 +46,7 @@ if bobmods.plates and settings.startup["bobmods-revamp-hardmode"].value == true filename = "__base__/sound/item/resource-inventory-pickup.ogg", volume = 0.6, }, + weight = 1000, }, { type = "item", @@ -54,10 +55,11 @@ if bobmods.plates and settings.startup["bobmods-revamp-hardmode"].value == true icon_size = 32, subgroup = "bob-resource-chemical", order = "f[sodium-chlorate]", - stack_size = 100, + stack_size = 200, drop_sound = powder_drop_move, inventory_move_sound = powder_drop_move, pick_sound = powder_pick, + weight = 500, }, { type = "item", @@ -66,10 +68,11 @@ if bobmods.plates and settings.startup["bobmods-revamp-hardmode"].value == true icon_size = 32, subgroup = "bob-resource-chemical", order = "f[sodium-perchlorate]", - stack_size = 100, + stack_size = 200, drop_sound = powder_drop_move, inventory_move_sound = powder_drop_move, pick_sound = powder_pick, + weight = 500, }, { diff --git a/bobrevamp/prototypes/rocket-parts.lua b/bobrevamp/prototypes/rocket-parts.lua index 6cf1bc037..a54ed7149 100644 --- a/bobrevamp/prototypes/rocket-parts.lua +++ b/bobrevamp/prototypes/rocket-parts.lua @@ -19,6 +19,7 @@ data:extend({ filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 20000, }, { type = "recipe", diff --git a/bobrevamp/prototypes/rtg.lua b/bobrevamp/prototypes/rtg.lua index 83d193a44..f92189a39 100644 --- a/bobrevamp/prototypes/rtg.lua +++ b/bobrevamp/prototypes/rtg.lua @@ -18,10 +18,11 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then icon_size = 32, subgroup = "bob-resource-chemical", order = "f[sodium-chlorate]", - stack_size = 100, + stack_size = 200, drop_sound = powder_drop_move, inventory_move_sound = powder_drop_move, pick_sound = powder_pick, + weight = 500, }, }) @@ -73,10 +74,11 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then icon_size = 32, subgroup = "bob-resource-chemical", order = "f[sodium-chlorate]", - stack_size = 100, + stack_size = 200, drop_sound = powder_drop_move, inventory_move_sound = powder_drop_move, pick_sound = powder_pick, + weight = 500, }, { type = "item", @@ -89,6 +91,7 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then drop_sound = powder_drop_move, inventory_move_sound = powder_drop_move, pick_sound = powder_pick, + weight = 1000, }, { @@ -270,10 +273,11 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then icon_size = 32, subgroup = "bob-resource-chemical", order = "f[sodium-chlorate]", - stack_size = 100, + stack_size = 200, drop_sound = powder_drop_move, inventory_move_sound = powder_drop_move, pick_sound = powder_pick, + weight = 1000, }, { type = "item", @@ -295,6 +299,7 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then filename = "__base__/sound/item/reactor-inventory-pickup.ogg", volume = 0.6, }, + weight = 20000, }, { type = "recipe", diff --git a/bobtech/prototypes/item/item-alien.lua b/bobtech/prototypes/item/item-alien.lua index 11de88853..af53f8edb 100644 --- a/bobtech/prototypes/item/item-alien.lua +++ b/bobtech/prototypes/item/item-alien.lua @@ -24,6 +24,7 @@ then subgroup = "science-pack", order = "g[science-pack-5-a]", stack_size = 200, + weight = 1 * kg, durability = 1, durability_description_key = "description.science-pack-remaining-amount-key", durability_description_value = "description.science-pack-remaining-amount-value", @@ -38,6 +39,7 @@ then subgroup = "science-pack", order = "g[science-pack-6-a]", stack_size = 200, + weight = 1 * kg, durability = 1, durability_description_key = "description.science-pack-remaining-amount-key", durability_description_value = "description.science-pack-remaining-amount-value", @@ -52,6 +54,7 @@ then subgroup = "science-pack", order = "g[science-pack-6-b]", stack_size = 200, + weight = 1 * kg, durability = 1, durability_description_key = "description.science-pack-remaining-amount-key", durability_description_value = "description.science-pack-remaining-amount-value", @@ -66,6 +69,7 @@ then subgroup = "science-pack", order = "g[science-pack-6-c]", stack_size = 200, + weight = 1 * kg, durability = 1, durability_description_key = "description.science-pack-remaining-amount-key", durability_description_value = "description.science-pack-remaining-amount-value", @@ -80,6 +84,7 @@ then subgroup = "science-pack", order = "g[science-pack-6-d]", stack_size = 200, + weight = 1 * kg, durability = 1, durability_description_key = "description.science-pack-remaining-amount-key", durability_description_value = "description.science-pack-remaining-amount-value", @@ -94,6 +99,7 @@ then subgroup = "science-pack", order = "g[science-pack-6-e]", stack_size = 200, + weight = 1 * kg, durability = 1, durability_description_key = "description.science-pack-remaining-amount-key", durability_description_value = "description.science-pack-remaining-amount-value", @@ -108,6 +114,7 @@ then subgroup = "science-pack", order = "g[science-pack-6-f]", stack_size = 200, + weight = 1 * kg, durability = 1, durability_description_key = "description.science-pack-remaining-amount-key", durability_description_value = "description.science-pack-remaining-amount-value", @@ -122,6 +129,7 @@ then subgroup = "science-pack", order = "g[science-pack-6-g]", stack_size = 200, + weight = 1 * kg, durability = 1, durability_description_key = "description.science-pack-remaining-amount-key", durability_description_value = "description.science-pack-remaining-amount-value", @@ -150,6 +158,7 @@ then filename = "__base__/sound/item/lab-inventory-pickup.ogg", volume = 0.6, }, + weight = 100000, }, }) end diff --git a/bobtech/prototypes/item/item.lua b/bobtech/prototypes/item/item.lua index 032440a73..179386d5c 100644 --- a/bobtech/prototypes/item/item.lua +++ b/bobtech/prototypes/item/item.lua @@ -7,6 +7,8 @@ local science_pick = { volume = 0.6, } +data.raw.item.lab.weight = 100000 + data:extend({ { type = "tool", @@ -54,6 +56,7 @@ data:extend({ filename = "__base__/sound/item/lab-inventory-pickup.ogg", volume = 0.6, }, + weight = 100000, }, }) @@ -79,6 +82,7 @@ if settings.startup["bobmods-burnerphase"].value == true then filename = "__base__/sound/item/lab-inventory-pickup.ogg", volume = 0.6, }, + weight = 100000, }, }) if not data.raw.item["bob-burner-generator"] then @@ -104,6 +108,7 @@ if settings.startup["bobmods-burnerphase"].value == true then filename = "__base__/sound/item/mechanical-inventory-pickup.ogg", volume = 0.8, }, + weight = 100000, }, }) end diff --git a/bobvehicleequipment/prototypes/belt-immunity.lua b/bobvehicleequipment/prototypes/belt-immunity.lua index b21ca2ca4..8db3f2b91 100644 --- a/bobvehicleequipment/prototypes/belt-immunity.lua +++ b/bobvehicleequipment/prototypes/belt-immunity.lua @@ -29,6 +29,7 @@ data:extend({ filename = "__base__/sound/item/mechanical-inventory-pickup.ogg", volume = 0.8, }, + weight = 50000, }, { type = "recipe", diff --git a/bobvehicleequipment/prototypes/fission-cell.lua b/bobvehicleequipment/prototypes/fission-cell.lua index 982552daf..3d5f7687a 100644 --- a/bobvehicleequipment/prototypes/fission-cell.lua +++ b/bobvehicleequipment/prototypes/fission-cell.lua @@ -19,7 +19,7 @@ data:extend({ filename = "__base__/sound/item/reactor-inventory-pickup.ogg", volume = 0.6, }, - weight = 125000, + weight = 100000, }, { @@ -109,7 +109,7 @@ data:extend({ filename = "__base__/sound/item/reactor-inventory-pickup.ogg", volume = 0.6, }, - weight = 125000, + weight = 100000, }, { @@ -200,7 +200,7 @@ data:extend({ filename = "__base__/sound/item/reactor-inventory-pickup.ogg", volume = 0.6, }, - weight = 125000, + weight = 100000, }, { @@ -292,7 +292,7 @@ data:extend({ filename = "__base__/sound/item/reactor-inventory-pickup.ogg", volume = 0.6, }, - weight = 125000, + weight = 100000, }, { @@ -383,7 +383,7 @@ data:extend({ filename = "__base__/sound/item/reactor-inventory-pickup.ogg", volume = 0.6, }, - weight = 125000, + weight = 100000, }, { @@ -473,7 +473,7 @@ data:extend({ filename = "__base__/sound/item/reactor-inventory-pickup.ogg", volume = 0.6, }, - weight = 125000, + weight = 100000, }, { diff --git a/bobvehicleequipment/prototypes/generator.lua b/bobvehicleequipment/prototypes/generator.lua index 4fcb5922a..a4d2e0556 100644 --- a/bobvehicleequipment/prototypes/generator.lua +++ b/bobvehicleequipment/prototypes/generator.lua @@ -19,7 +19,7 @@ data:extend({ filename = "__base__/sound/item/reactor-inventory-pickup.ogg", volume = 0.6, }, - weight = 250000, + weight = 200000, }, { @@ -109,7 +109,7 @@ data:extend({ filename = "__base__/sound/item/reactor-inventory-pickup.ogg", volume = 0.6, }, - weight = 250000, + weight = 200000, }, { @@ -200,7 +200,7 @@ data:extend({ filename = "__base__/sound/item/reactor-inventory-pickup.ogg", volume = 0.6, }, - weight = 250000, + weight = 200000, }, { @@ -292,7 +292,7 @@ data:extend({ filename = "__base__/sound/item/reactor-inventory-pickup.ogg", volume = 0.6, }, - weight = 250000, + weight = 200000, }, { @@ -383,7 +383,7 @@ data:extend({ filename = "__base__/sound/item/reactor-inventory-pickup.ogg", volume = 0.6, }, - weight = 250000, + weight = 200000, }, { @@ -473,7 +473,7 @@ data:extend({ filename = "__base__/sound/item/reactor-inventory-pickup.ogg", volume = 0.6, }, - weight = 250000, + weight = 200000, }, { diff --git a/bobvehicleequipment/prototypes/plasma-defense.lua b/bobvehicleequipment/prototypes/plasma-defense.lua index 3bb43cfdd..ba627ac96 100644 --- a/bobvehicleequipment/prototypes/plasma-defense.lua +++ b/bobvehicleequipment/prototypes/plasma-defense.lua @@ -87,7 +87,7 @@ data:extend({ filename = "__base__/sound/item/turret-inventory-pickup.ogg", volume = 0.5, }, - weight = 400000, + weight = 500000, }, { @@ -179,7 +179,7 @@ data:extend({ filename = "__base__/sound/item/turret-inventory-pickup.ogg", volume = 0.5, }, - weight = 400000, + weight = 500000, }, { @@ -273,7 +273,7 @@ data:extend({ filename = "__base__/sound/item/turret-inventory-pickup.ogg", volume = 0.5, }, - weight = 400000, + weight = 500000, }, { @@ -367,7 +367,7 @@ data:extend({ filename = "__base__/sound/item/turret-inventory-pickup.ogg", volume = 0.5, }, - weight = 400000, + weight = 500000, }, { diff --git a/bobvehicleequipment/prototypes/roboport.lua b/bobvehicleequipment/prototypes/roboport.lua index aa15a6fd6..5e02cf2d2 100644 --- a/bobvehicleequipment/prototypes/roboport.lua +++ b/bobvehicleequipment/prototypes/roboport.lua @@ -33,6 +33,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, + weight = 50000, }, { type = "item", @@ -63,6 +64,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, + weight = 50000, }, { type = "item", @@ -93,6 +95,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, + weight = 50000, }, { type = "item", @@ -123,6 +126,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, + weight = 50000, }, { @@ -154,6 +158,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, + weight = 50000, }, { type = "item", @@ -184,6 +189,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, + weight = 50000, }, { type = "item", @@ -214,6 +220,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, + weight = 50000, }, { type = "item", @@ -244,6 +251,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, + weight = 50000, }, { @@ -275,6 +283,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, + weight = 50000, }, { type = "item", @@ -305,6 +314,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, + weight = 50000, }, { type = "item", @@ -335,6 +345,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, + weight = 50000, }, { type = "item", @@ -365,6 +376,7 @@ data:extend({ filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, + weight = 50000, }, { @@ -1198,6 +1210,7 @@ if combined_roboports == true then filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, + weight = 200000, }, { @@ -1221,6 +1234,7 @@ if combined_roboports == true then filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, + weight = 200000, }, { @@ -1244,6 +1258,7 @@ if combined_roboports == true then filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, + weight = 200000, }, { @@ -1267,6 +1282,7 @@ if combined_roboports == true then filename = "__base__/sound/item/roboport-inventory-pickup.ogg", volume = 0.35, }, + weight = 200000, }, { diff --git a/bobvehicleequipment/prototypes/solar-panel.lua b/bobvehicleequipment/prototypes/solar-panel.lua index 9a44f2919..92567036e 100644 --- a/bobvehicleequipment/prototypes/solar-panel.lua +++ b/bobvehicleequipment/prototypes/solar-panel.lua @@ -20,6 +20,7 @@ data:extend({ filename = "__base__/sound/item/electric-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 200000, }, { @@ -108,6 +109,7 @@ data:extend({ filename = "__base__/sound/item/electric-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 200000, }, { @@ -198,6 +200,7 @@ data:extend({ filename = "__base__/sound/item/electric-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 200000, }, { @@ -291,6 +294,7 @@ if data.raw.item["bob-alien-artifact"] then filename = "__base__/sound/item/electric-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 200000, }, { @@ -384,6 +388,7 @@ if data.raw.item["bob-alien-artifact"] then filename = "__base__/sound/item/electric-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 200000, }, { diff --git a/bobvehicleequipment/prototypes/speed.lua b/bobvehicleequipment/prototypes/speed.lua index 1996d6603..0fd03b862 100644 --- a/bobvehicleequipment/prototypes/speed.lua +++ b/bobvehicleequipment/prototypes/speed.lua @@ -20,6 +20,7 @@ data:extend({ filename = "__base__/sound/item/vehicle-inventory-pickup.ogg", volume = 0.6, }, + weight = 100000, }, { @@ -112,6 +113,7 @@ data:extend({ filename = "__base__/sound/item/vehicle-inventory-pickup.ogg", volume = 0.6, }, + weight = 100000, }, { diff --git a/bobwarfare/prototypes/item/ammo.lua b/bobwarfare/prototypes/item/ammo.lua index c21ef1038..53962109a 100644 --- a/bobwarfare/prototypes/item/ammo.lua +++ b/bobwarfare/prototypes/item/ammo.lua @@ -50,6 +50,9 @@ local largeammopickup = { volume = 0.7, } +data.raw.ammo.rocket.weight = 10000 +data.raw.ammo["explosive-rocket"].weight = 10000 + data:extend({ { type = "ammo", @@ -894,7 +897,7 @@ data:extend({ drop_sound = largeammodropmove, inventory_move_sound = largeammodropmove, pick_sound = largeammopickup, - weight = 40000, + weight = 10000, }, { @@ -910,7 +913,7 @@ data:extend({ drop_sound = largeammodropmove, inventory_move_sound = largeammodropmove, pick_sound = largeammopickup, - weight = 40000, + weight = 10000, }, { @@ -926,7 +929,7 @@ data:extend({ drop_sound = largeammodropmove, inventory_move_sound = largeammodropmove, pick_sound = largeammopickup, - weight = 40000, + weight = 10000, }, { @@ -942,7 +945,7 @@ data:extend({ drop_sound = largeammodropmove, inventory_move_sound = largeammodropmove, pick_sound = largeammopickup, - weight = 40000, + weight = 10000, }, { @@ -958,7 +961,7 @@ data:extend({ drop_sound = largeammodropmove, inventory_move_sound = largeammodropmove, pick_sound = largeammopickup, - weight = 40000, + weight = 10000, }, { @@ -974,7 +977,7 @@ data:extend({ drop_sound = largeammodropmove, inventory_move_sound = largeammodropmove, pick_sound = largeammopickup, - weight = 40000, + weight = 10000, }, { @@ -990,7 +993,7 @@ data:extend({ drop_sound = largeammodropmove, inventory_move_sound = largeammodropmove, pick_sound = largeammopickup, - weight = 40000, + weight = 10000, }, }) @@ -1458,7 +1461,7 @@ data:extend({ drop_sound = largeammodropmove, inventory_move_sound = largeammodropmove, pick_sound = largeammopickup, - weight = 40000, + weight = 10000, }, }) diff --git a/bobwarfare/prototypes/item/armor.lua b/bobwarfare/prototypes/item/armor.lua index e5bd4c173..b608714f0 100644 --- a/bobwarfare/prototypes/item/armor.lua +++ b/bobwarfare/prototypes/item/armor.lua @@ -147,7 +147,7 @@ data:extend({ }, subgroup = "armor", infinite = true, - order = "f[power-armor-mk3]", + order = "e[power-armor-mk3]", stack_size = 1, equipment_grid = "power-armor-equipment-grid-mk3", open_sound = "__base__/sound/armor-open.ogg", @@ -165,6 +165,7 @@ data:extend({ volume = 0.7, }, inventory_size_bonus = 40, + weight = 1000000, }, { @@ -226,7 +227,7 @@ data:extend({ }, subgroup = "armor", infinite = true, - order = "g[power-armor-mk4]", + order = "e[power-armor-mk4]", stack_size = 1, equipment_grid = "power-armor-equipment-grid-mk4", open_sound = "__base__/sound/armor-open.ogg", @@ -244,6 +245,7 @@ data:extend({ volume = 0.7, }, inventory_size_bonus = 50, + weight = 1000000, }, { @@ -304,7 +306,7 @@ data:extend({ }, subgroup = "armor", infinite = true, - order = "h[power-armor-mk5]", + order = "e[power-armor-mk5]", stack_size = 1, equipment_grid = "power-armor-equipment-grid-mk5", open_sound = "__base__/sound/armor-open.ogg", @@ -322,6 +324,7 @@ data:extend({ volume = 0.7, }, inventory_size_bonus = 60, + weight = 1000000, }, }) diff --git a/bobwarfare/prototypes/item/drone.lua b/bobwarfare/prototypes/item/drone.lua index 6f484eff6..9f445beee 100644 --- a/bobwarfare/prototypes/item/drone.lua +++ b/bobwarfare/prototypes/item/drone.lua @@ -19,7 +19,7 @@ data:extend({ filename = "__base__/sound/item/mechanical-inventory-pickup.ogg", volume = 0.8, }, - weight = 10000, + weight = 5000, }, { type = "item", @@ -41,7 +41,7 @@ data:extend({ filename = "__base__/sound/item/mechanical-inventory-pickup.ogg", volume = 0.8, }, - weight = 20000, + weight = 10000, }, }) diff --git a/bobwarfare/prototypes/item/gun.lua b/bobwarfare/prototypes/item/gun.lua index 3c7b83d6a..308cad2ca 100644 --- a/bobwarfare/prototypes/item/gun.lua +++ b/bobwarfare/prototypes/item/gun.lua @@ -42,6 +42,7 @@ data:extend({ filename = "__base__/sound/item/weapon-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 200000, }, { @@ -84,6 +85,7 @@ data:extend({ filename = "__base__/sound/item/weapon-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 200000, }, { @@ -114,6 +116,7 @@ data:extend({ filename = "__base__/sound/item/weapon-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 200000, }, }) diff --git a/bobwarfare/prototypes/item/mine.lua b/bobwarfare/prototypes/item/mine.lua index f1ad380c9..cf4aec2c3 100644 --- a/bobwarfare/prototypes/item/mine.lua +++ b/bobwarfare/prototypes/item/mine.lua @@ -1,3 +1,5 @@ +data.raw.item["land-mine"].weight = 10000 + data:extend({ { type = "item", @@ -20,6 +22,7 @@ data:extend({ filename = "__base__/sound/item/explosive-inventory-pickup.ogg", volume = 0.8, }, + weight = 50000, }, { @@ -43,6 +46,7 @@ data:extend({ filename = "__base__/sound/item/explosive-inventory-pickup.ogg", volume = 0.8, }, + weight = 50000, }, { @@ -66,5 +70,6 @@ data:extend({ filename = "__base__/sound/item/explosive-inventory-pickup.ogg", volume = 0.8, }, + weight = 50000, }, }) diff --git a/bobwarfare/prototypes/item/parts.lua b/bobwarfare/prototypes/item/parts.lua index c9403c271..6c589f696 100644 --- a/bobwarfare/prototypes/item/parts.lua +++ b/bobwarfare/prototypes/item/parts.lua @@ -24,6 +24,7 @@ data:extend({ filename = "__base__/sound/item/raw-fish-inventory-pickup.ogg", volume = 0.7, }, + weight = 1000, }, { @@ -46,6 +47,7 @@ data:extend({ filename = "__base__/sound/item/explosive-inventory-pickup.ogg", volume = 0.8, }, + weight = 500, }, { @@ -68,6 +70,7 @@ data:extend({ filename = "__base__/sound/item/explosive-inventory-pickup.ogg", volume = 0.8, }, + weight = 500, }, { @@ -81,6 +84,7 @@ data:extend({ drop_sound = smallammopartsound, inventory_move_sound = smallammopartsound, pick_sound = smallammopartsound, + weight = 500, }, { @@ -94,6 +98,7 @@ data:extend({ drop_sound = smallammopartsound, inventory_move_sound = smallammopartsound, pick_sound = smallammopartsound, + weight = 625, }, { @@ -107,6 +112,7 @@ data:extend({ drop_sound = smallammopartsound, inventory_move_sound = smallammopartsound, pick_sound = smallammopartsound, + weight = 1000, }, { @@ -120,6 +126,7 @@ data:extend({ drop_sound = smallammopartsound, inventory_move_sound = smallammopartsound, pick_sound = smallammopartsound, + weight = 2000, }, { @@ -133,6 +140,7 @@ data:extend({ drop_sound = smallammopartsound, inventory_move_sound = smallammopartsound, pick_sound = smallammopartsound, + weight = 3333.33, }, { @@ -146,6 +154,7 @@ data:extend({ drop_sound = smallammopartsound, inventory_move_sound = smallammopartsound, pick_sound = smallammopartsound, + weight = 5000, }, { @@ -159,6 +168,7 @@ data:extend({ drop_sound = smallammopartsound, inventory_move_sound = smallammopartsound, pick_sound = smallammopartsound, + weight = 3333.33, }, { @@ -172,6 +182,7 @@ data:extend({ drop_sound = smallammopartsound, inventory_move_sound = smallammopartsound, pick_sound = smallammopartsound, + weight = 5000, }, { @@ -185,6 +196,7 @@ data:extend({ drop_sound = smallammopartsound, inventory_move_sound = smallammopartsound, pick_sound = smallammopartsound, + weight = 3333.33, }, { @@ -198,6 +210,7 @@ data:extend({ drop_sound = smallammopartsound, inventory_move_sound = smallammopartsound, pick_sound = smallammopartsound, + weight = 5000, }, { @@ -211,6 +224,7 @@ data:extend({ drop_sound = smallammopartsound, inventory_move_sound = smallammopartsound, pick_sound = smallammopartsound, + weight = 3333.33, }, { @@ -224,6 +238,7 @@ data:extend({ drop_sound = smallammopartsound, inventory_move_sound = smallammopartsound, pick_sound = smallammopartsound, + weight = 5000, }, { @@ -237,6 +252,7 @@ data:extend({ drop_sound = smallammopartsound, inventory_move_sound = smallammopartsound, pick_sound = smallammopartsound, + weight = 3333.33, }, { @@ -247,6 +263,10 @@ data:extend({ subgroup = "bob-ammo-parts", order = "fd6", stack_size = 100, + drop_sound = smallammopartsound, + inventory_move_sound = smallammopartsound, + pick_sound = smallammopartsound, + weight = 5000, }, { @@ -260,6 +280,7 @@ data:extend({ drop_sound = smallammopartsound, inventory_move_sound = smallammopartsound, pick_sound = smallammopartsound, + weight = 3333.33, }, { @@ -273,6 +294,7 @@ data:extend({ drop_sound = smallammopartsound, inventory_move_sound = smallammopartsound, pick_sound = smallammopartsound, + weight = 5000, }, { @@ -286,6 +308,7 @@ data:extend({ drop_sound = smallammopartsound, inventory_move_sound = smallammopartsound, pick_sound = smallammopartsound, + weight = 3333.33, }, { @@ -299,6 +322,7 @@ data:extend({ drop_sound = smallammopartsound, inventory_move_sound = smallammopartsound, pick_sound = smallammopartsound, + weight = 5000, }, { @@ -312,6 +336,7 @@ data:extend({ drop_sound = smallammopartsound, inventory_move_sound = smallammopartsound, pick_sound = smallammopartsound, + weight = 500, }, { @@ -325,6 +350,7 @@ data:extend({ drop_sound = smallammopartsound, inventory_move_sound = smallammopartsound, pick_sound = smallammopartsound, + weight = 2000, }, { @@ -347,6 +373,7 @@ data:extend({ filename = "__base__/sound/item/weapon-small-inventory-pickup.ogg", volume = 0.7, }, + weight = 125, }, { @@ -369,6 +396,7 @@ data:extend({ filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 2500, }, { @@ -391,6 +419,7 @@ data:extend({ filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 5000, }, { @@ -413,6 +442,7 @@ data:extend({ filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 5000, }, { @@ -435,6 +465,7 @@ data:extend({ filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 5000, }, { @@ -457,6 +488,7 @@ data:extend({ filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 5000, }, { @@ -479,6 +511,7 @@ data:extend({ filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 5000, }, { @@ -501,6 +534,7 @@ data:extend({ filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 5000, }, { @@ -523,6 +557,7 @@ data:extend({ filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 5000, }, { @@ -545,6 +580,7 @@ data:extend({ filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 5000, }, }) @@ -560,6 +596,7 @@ data:extend({ drop_sound = smallammopartsound, inventory_move_sound = smallammopartsound, pick_sound = smallammopartsound, + weight = 3333.33, }, { @@ -573,6 +610,7 @@ data:extend({ drop_sound = smallammopartsound, inventory_move_sound = smallammopartsound, pick_sound = smallammopartsound, + weight = 5000, }, { @@ -595,5 +633,6 @@ data:extend({ filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 5000, }, }) diff --git a/bobwarfare/prototypes/item/radar.lua b/bobwarfare/prototypes/item/radar.lua index b437473ab..b0d434ceb 100644 --- a/bobwarfare/prototypes/item/radar.lua +++ b/bobwarfare/prototypes/item/radar.lua @@ -1,4 +1,5 @@ data.raw.item["radar"].order = "d[radar]-a[radar-1]" +data.raw.item["radar"].weight = 20000 data:extend({ { @@ -22,6 +23,7 @@ data:extend({ filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.8, }, + weight = 20000, }, { @@ -45,6 +47,7 @@ data:extend({ filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.8, }, + weight = 20000, }, { @@ -68,6 +71,7 @@ data:extend({ filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.8, }, + weight = 20000, }, { @@ -91,5 +95,6 @@ data:extend({ filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.8, }, + weight = 20000, }, }) diff --git a/bobwarfare/prototypes/item/tank.lua b/bobwarfare/prototypes/item/tank.lua index a14e694ed..6cd83947f 100644 --- a/bobwarfare/prototypes/item/tank.lua +++ b/bobwarfare/prototypes/item/tank.lua @@ -1,5 +1,6 @@ data.raw["item-with-entity-data"]["tank"].order = "b[personal-transport]-b[tank-1]" data.raw["item-with-entity-data"]["tank"].stack_size = 10 +data.raw["item-with-entity-data"]["tank"].weight = 1000000, data:extend({ { @@ -23,6 +24,7 @@ data:extend({ filename = "__base__/sound/item/vehicle-inventory-pickup.ogg", volume = 0.4, }, + weight = 1000000, }, { @@ -46,5 +48,6 @@ data:extend({ filename = "__base__/sound/item/vehicle-inventory-pickup.ogg", volume = 0.4, }, + weight = 1000000, }, }) diff --git a/bobwarfare/prototypes/item/turrets.lua b/bobwarfare/prototypes/item/turrets.lua index 35abe9a78..40c4d0d17 100644 --- a/bobwarfare/prototypes/item/turrets.lua +++ b/bobwarfare/prototypes/item/turrets.lua @@ -1,5 +1,7 @@ data.raw.item["gun-turret"].order = "b[turret]-a[gun-turret-1]" data.raw.item["laser-turret"].order = "b[turret]-b[laser-turret-1]" +data.raw.item["gun-turret"].weight = 20000 +data.raw.item["flamethrower-turret"].weight = 40000 local turretmovesound = { filename = "__base__/sound/item/turret-inventory-move.ogg", @@ -23,6 +25,7 @@ data:extend({ drop_sound = turretmovesound, inventory_move_sound = turretmovesound, pick_sound = turretplacesound, + weight = 20000, }, { @@ -37,6 +40,7 @@ data:extend({ drop_sound = turretmovesound, inventory_move_sound = turretmovesound, pick_sound = turretplacesound, + weight = 20000, }, { @@ -51,6 +55,7 @@ data:extend({ drop_sound = turretmovesound, inventory_move_sound = turretmovesound, pick_sound = turretplacesound, + weight = 20000, }, { @@ -65,6 +70,7 @@ data:extend({ drop_sound = turretmovesound, inventory_move_sound = turretmovesound, pick_sound = turretplacesound, + weight = 20000, }, { @@ -79,6 +85,7 @@ data:extend({ drop_sound = turretmovesound, inventory_move_sound = turretmovesound, pick_sound = turretplacesound, + weight = 20000, }, { @@ -93,6 +100,7 @@ data:extend({ drop_sound = turretmovesound, inventory_move_sound = turretmovesound, pick_sound = turretplacesound, + weight = 20000, }, { @@ -107,6 +115,7 @@ data:extend({ drop_sound = turretmovesound, inventory_move_sound = turretmovesound, pick_sound = turretplacesound, + weight = 20000, }, { @@ -121,6 +130,7 @@ data:extend({ drop_sound = turretmovesound, inventory_move_sound = turretmovesound, pick_sound = turretplacesound, + weight = 40000, }, { @@ -135,6 +145,7 @@ data:extend({ drop_sound = turretmovesound, inventory_move_sound = turretmovesound, pick_sound = turretplacesound, + weight = 40000, }, { @@ -149,6 +160,7 @@ data:extend({ drop_sound = turretmovesound, inventory_move_sound = turretmovesound, pick_sound = turretplacesound, + weight = 40000, }, { @@ -163,6 +175,7 @@ data:extend({ drop_sound = turretmovesound, inventory_move_sound = turretmovesound, pick_sound = turretplacesound, + weight = 40000, }, { @@ -177,6 +190,7 @@ data:extend({ drop_sound = turretmovesound, inventory_move_sound = turretmovesound, pick_sound = turretplacesound, + weight = 1000000, }, { @@ -191,6 +205,7 @@ data:extend({ drop_sound = turretmovesound, inventory_move_sound = turretmovesound, pick_sound = turretplacesound, + weight = 1000000, }, { @@ -205,6 +220,7 @@ data:extend({ drop_sound = turretmovesound, inventory_move_sound = turretmovesound, pick_sound = turretplacesound, + weight = 1000000, }, { @@ -219,6 +235,7 @@ data:extend({ drop_sound = turretmovesound, inventory_move_sound = turretmovesound, pick_sound = turretplacesound, + weight = 1000000, }, { @@ -242,6 +259,7 @@ data:extend({ filename = "__base__/sound/item/artillery-large-inventory-pickup.ogg", volume = 0.4, }, + weight = 200000, }, { @@ -265,5 +283,6 @@ data:extend({ filename = "__base__/sound/item/artillery-large-inventory-pickup.ogg", volume = 0.4, }, + weight = 200000, }, }) diff --git a/bobwarfare/prototypes/item/wall.lua b/bobwarfare/prototypes/item/wall.lua index 5fc5bf0bd..4d5f08ef1 100644 --- a/bobwarfare/prototypes/item/wall.lua +++ b/bobwarfare/prototypes/item/wall.lua @@ -1,5 +1,7 @@ data.raw.item["stone-wall"].order = "a[wall]-a[stone-wall]" data.raw.item["gate"].order = "a[wall]-b[gate]" +data.raw.item["stone-wall"].weight = 10000 +data.raw.item["gate"].weight = 20000 data:extend({ { @@ -23,6 +25,7 @@ data:extend({ filename = "__base__/sound/item/concrete-inventory-pickup.ogg", volume = 0.8, }, + weight = 20000, }, { type = "item", @@ -45,5 +48,6 @@ data:extend({ filename = "__base__/sound/item/concrete-inventory-pickup.ogg", volume = 0.8, }, + weight = 40000, }, }) diff --git a/bobwarfare/prototypes/robot-parts.lua b/bobwarfare/prototypes/robot-parts.lua index 39af7cdc4..85e876542 100644 --- a/bobwarfare/prototypes/robot-parts.lua +++ b/bobwarfare/prototypes/robot-parts.lua @@ -28,6 +28,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true and bobmods.war drop_sound = electronicdropsound, inventory_move_sound = electronicdropsound, pick_sound = electronicpicksound, + weight = 5000, }, { @@ -41,6 +42,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true and bobmods.war drop_sound = electronicdropsound, inventory_move_sound = electronicdropsound, pick_sound = electronicpicksound, + weight = 5000, }, { @@ -54,6 +56,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true and bobmods.war drop_sound = electronicdropsound, inventory_move_sound = electronicdropsound, pick_sound = electronicpicksound, + weight = 5000, }, { @@ -67,6 +70,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true and bobmods.war drop_sound = electronicdropsound, inventory_move_sound = electronicdropsound, pick_sound = electronicpicksound, + weight = 5000, }, { @@ -80,6 +84,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true and bobmods.war drop_sound = tooldropsound, inventory_move_sound = tooldropsound, pick_sound = toolpicksound, + weight = 10000, }, { @@ -93,6 +98,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true and bobmods.war drop_sound = tooldropsound, inventory_move_sound = tooldropsound, pick_sound = toolpicksound, + weight = 10000, }, { @@ -106,6 +112,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true and bobmods.war drop_sound = tooldropsound, inventory_move_sound = tooldropsound, pick_sound = toolpicksound, + weight = 10000, }, { @@ -119,6 +126,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true and bobmods.war drop_sound = tooldropsound, inventory_move_sound = tooldropsound, pick_sound = toolpicksound, + weight = 10000, }, }) diff --git a/bobwarfare/prototypes/robots.lua b/bobwarfare/prototypes/robots.lua index 26dd14cbb..558f3a5c9 100644 --- a/bobwarfare/prototypes/robots.lua +++ b/bobwarfare/prototypes/robots.lua @@ -24,6 +24,8 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then } end + data.raw.capsule["destroyer-capsule"].weight = 50000 + data:extend({ { type = "item", @@ -45,6 +47,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then filename = "__base__/sound/item/robotic-inventory-pickup.ogg", volume = 0.5, }, + weight = 10000, }, { type = "recipe", @@ -75,6 +78,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then filename = "__base__/sound/item/robotic-inventory-pickup.ogg", volume = 0.5, }, + weight = 10000, }, { type = "recipe", @@ -105,6 +109,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then filename = "__base__/sound/item/robotic-inventory-pickup.ogg", volume = 0.5, }, + weight = 10000, }, { type = "recipe", @@ -174,6 +179,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then filename = "__base__/sound/item/robotic-inventory-pickup.ogg", volume = 0.5, }, + weight = 10000, }, { @@ -248,6 +254,7 @@ if settings.startup["bobmods-warfare-robotupdate"].value == true then filename = "__base__/sound/item/robotic-inventory-pickup.ogg", volume = 0.5, }, + weight = 50000, }, { diff --git a/bobwarfare/prototypes/spidertron.lua b/bobwarfare/prototypes/spidertron.lua index cb27b4c88..e96e5f207 100644 --- a/bobwarfare/prototypes/spidertron.lua +++ b/bobwarfare/prototypes/spidertron.lua @@ -20,6 +20,7 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then filename = "__base__/sound/item/mechanical-large-inventory-pickup.ogg", volume = 0.8, }, + weight = 5000, }, { type = "item", @@ -41,6 +42,7 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then filename = "__base__/sound/item/mechanical-large-inventory-pickup.ogg", volume = 0.8, }, + weight = 5000, }, { type = "item", @@ -62,6 +64,7 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then filename = "__base__/sound/item/mechanical-large-inventory-pickup.ogg", volume = 0.8, }, + weight = 5000, }, { type = "item", @@ -83,6 +86,7 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then filename = "__base__/sound/item/mechanical-large-inventory-pickup.ogg", volume = 0.8, }, + weight = 5000, }, { type = "item", @@ -104,6 +108,7 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then filename = "__base__/sound/item/mechanical-large-inventory-pickup.ogg", volume = 0.8, }, + weight = 25000, }, { type = "item", @@ -125,6 +130,7 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then filename = "__base__/sound/item/electric-small-inventory-pickup.ogg", volume = 0.7, }, + weight = 50000, }, { type = "item", @@ -146,6 +152,7 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then filename = "__base__/sound/item/mechanical-large-inventory-pickup.ogg", volume = 0.8, }, + weight = 200000, }, { type = "item", @@ -167,6 +174,7 @@ if settings.startup["bobmods-warfare-spidertron-overhaul"].value == true then filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", volume = 0.7, }, + weight = 20000, }, }) @@ -344,6 +352,7 @@ function bobmods.warfare.create_spidertron(arguments) filename = "__base__/sound/item/spidertron-inventory-pickup.ogg", volume = 0.5, }, + weight = arguments.item_weight or 1000000 }, { type = "spider-vehicle", @@ -696,6 +705,7 @@ data:extend({ subgroup = "gun", order = "g[spidertron-cannon]", stack_size = 10, + weight = 100000, }, { @@ -900,6 +910,8 @@ bobmods.warfare.create_spidertron({ }, }) +data.raw["item-with-entity-data"].spidertron.weight = 1000000 + data.raw.technology.spidertron.order = "d-e-g-c" data:extend({ {