diff --git a/bobassembly/graphics/icons/distillery-blue.png b/bobassembly/graphics/icons/distillery-blue.png index f2128a558..a0e058842 100644 Binary files a/bobassembly/graphics/icons/distillery-blue.png and b/bobassembly/graphics/icons/distillery-blue.png differ diff --git a/bobassembly/graphics/icons/distillery-green.png b/bobassembly/graphics/icons/distillery-green.png index 449e490f6..a0cfe980b 100644 Binary files a/bobassembly/graphics/icons/distillery-green.png and b/bobassembly/graphics/icons/distillery-green.png differ diff --git a/bobassembly/graphics/icons/distillery-purple.png b/bobassembly/graphics/icons/distillery-purple.png index d9a640e5a..e75c0a2d0 100644 Binary files a/bobassembly/graphics/icons/distillery-purple.png and b/bobassembly/graphics/icons/distillery-purple.png differ diff --git a/bobassembly/graphics/icons/distillery-red.png b/bobassembly/graphics/icons/distillery-red.png index 33b0b47ba..fa63d063e 100644 Binary files a/bobassembly/graphics/icons/distillery-red.png and b/bobassembly/graphics/icons/distillery-red.png differ diff --git a/bobassembly/prototypes/distillery.lua b/bobassembly/prototypes/distillery.lua index 6aedcaba4..68c757bd2 100644 --- a/bobassembly/prototypes/distillery.lua +++ b/bobassembly/prototypes/distillery.lua @@ -15,7 +15,6 @@ then type = "item", name = "bob-distillery-2", icon = "__bobassembly__/graphics/icons/distillery-red.png", - icon_size = 32, subgroup = "production-machine", order = "e[distillery]", place_result = "bob-distillery-2", @@ -38,7 +37,6 @@ then type = "item", name = "bob-distillery-3", icon = "__bobassembly__/graphics/icons/distillery-blue.png", - icon_size = 32, subgroup = "production-machine", order = "e[distillery]", place_result = "bob-distillery-3", @@ -62,7 +60,6 @@ then type = "item", name = "bob-distillery-4", icon = "__bobassembly__/graphics/icons/distillery-purple.png", - icon_size = 32, subgroup = "production-machine", order = "e[distillery]", place_result = "bob-distillery-4", @@ -86,7 +83,6 @@ then type = "item", name = "bob-distillery-5", icon = "__bobassembly__/graphics/icons/distillery-green.png", - icon_size = 32, subgroup = "production-machine", order = "e[distillery]", place_result = "bob-distillery-5", @@ -166,7 +162,6 @@ then { name = "bob-distillery-2", icon = "__bobassembly__/graphics/icons/distillery-red.png", - icon_size = 32, minable = { mining_time = 0.2, result = "bob-distillery-2" }, max_health = 250, graphics_set = { @@ -188,7 +183,6 @@ then { name = "bob-distillery-3", icon = "__bobassembly__/graphics/icons/distillery-blue.png", - icon_size = 32, minable = { mining_time = 0.2, result = "bob-distillery-3" }, max_health = 300, graphics_set = { @@ -219,7 +213,6 @@ then { name = "bob-distillery-4", icon = "__bobassembly__/graphics/icons/distillery-purple.png", - icon_size = 32, minable = { mining_time = 0.2, result = "bob-distillery-4" }, max_health = 350, graphics_set = { @@ -250,7 +243,6 @@ then { name = "bob-distillery-5", icon = "__bobassembly__/graphics/icons/distillery-green.png", - icon_size = 32, minable = { mining_time = 0.2, result = "bob-distillery-5" }, max_health = 400, graphics_set = { diff --git a/bobassembly/prototypes/electrolyser-updates.lua b/bobassembly/prototypes/electrolyser-updates.lua index 8572f91dd..fba129c32 100644 --- a/bobassembly/prototypes/electrolyser-updates.lua +++ b/bobassembly/prototypes/electrolyser-updates.lua @@ -10,9 +10,13 @@ then and settings.startup["bobmods-plates-expensive-electrolysis"].value == true then data.raw["assembling-machine"]["electrolyser-2"].energy_usage = "1625kW" + data.raw["assembling-machine"]["electrolyser-2"].energy_source.drain = "18kW" data.raw["assembling-machine"]["electrolyser-3"].energy_usage = "2400kW" + data.raw["assembling-machine"]["electrolyser-3"].energy_source.drain = "27kW" data.raw["assembling-machine"]["electrolyser-4"].energy_usage = "3025kW" + data.raw["assembling-machine"]["electrolyser-4"].energy_source.drain = "34kW" data.raw["assembling-machine"]["electrolyser-5"].energy_usage = "3500kW" + data.raw["assembling-machine"]["electrolyser-5"].energy_source.drain = "39kW" end data.raw["assembling-machine"]["electrolyser"].next_upgrade = "electrolyser-2" diff --git a/bobclasses/data-updates.lua b/bobclasses/data-updates.lua index 26f40ce2a..ebc11c5fb 100644 --- a/bobclasses/data-updates.lua +++ b/bobclasses/data-updates.lua @@ -34,8 +34,4 @@ if data.raw["recipe-category"]["mixing-furnace"] then end end -if data.raw["item-group"]["bob-intermediate-products"] then - data.raw["item-subgroup"]["body-parts"].group = "bob-intermediate-products" -end - require("prototypes.recipe-updates") diff --git a/bobclasses/prototypes/category.lua b/bobclasses/prototypes/category.lua index eb9ccc04a..9c8e1a398 100644 --- a/bobclasses/prototypes/category.lua +++ b/bobclasses/prototypes/category.lua @@ -9,6 +9,6 @@ data:extend({ type = "item-subgroup", name = "body-parts", group = "intermediate-products", - order = "i", + order = "e-e2", }, }) diff --git a/bobelectronics/data-updates.lua b/bobelectronics/data-updates.lua index 4b940a99f..7b7c3cccd 100644 --- a/bobelectronics/data-updates.lua +++ b/bobelectronics/data-updates.lua @@ -2,6 +2,8 @@ require("prototypes.recipe-updates") require("prototypes.technology-updates") data.raw.recipe["copper-cable"].category = "electronics" +data.raw.item["copper-cable"].subgroup = "bob-electronic-components" +data.raw.item["copper-cable"].order = "0-a1" if data.raw["recipe-category"]["chemical-furnace"] then if data.raw.recipe["carbon"] then diff --git a/bobelectronics/graphics/icons/gilded-copper-cable.png b/bobelectronics/graphics/icons/gilded-copper-cable.png index ceac50a3d..df8b9d7ec 100644 Binary files a/bobelectronics/graphics/icons/gilded-copper-cable.png and b/bobelectronics/graphics/icons/gilded-copper-cable.png differ diff --git a/bobelectronics/graphics/icons/insulated-cable.png b/bobelectronics/graphics/icons/insulated-cable.png index b415c0a8c..8665c45f9 100644 Binary files a/bobelectronics/graphics/icons/insulated-cable.png and b/bobelectronics/graphics/icons/insulated-cable.png differ diff --git a/bobelectronics/graphics/icons/tinned-copper-cable.png b/bobelectronics/graphics/icons/tinned-copper-cable.png index cd648a60a..ae84aaca7 100644 Binary files a/bobelectronics/graphics/icons/tinned-copper-cable.png and b/bobelectronics/graphics/icons/tinned-copper-cable.png differ diff --git a/bobelectronics/locale/en/bobelectronics.cfg b/bobelectronics/locale/en/bobelectronics.cfg index 77e2f7bd3..f115f2a38 100644 --- a/bobelectronics/locale/en/bobelectronics.cfg +++ b/bobelectronics/locale/en/bobelectronics.cfg @@ -42,7 +42,6 @@ synthetic-wood=Synthetic wood [item-group-name] -bob-intermediate-products=Bob's Intermediate products bob-resource-products=Bob's Materials bob-fluid-products=Bob's Fluids diff --git a/bobelectronics/locale/ru/bobelectronics.cfg b/bobelectronics/locale/ru/bobelectronics.cfg index 431069f79..7cbd23943 100644 --- a/bobelectronics/locale/ru/bobelectronics.cfg +++ b/bobelectronics/locale/ru/bobelectronics.cfg @@ -42,7 +42,6 @@ synthetic-wood=Синтетическое дерево [item-group-name] -bob-intermediate-products=Промежуточные продукты Боба bob-resource-products=Материалы Боба bob-fluid-products=Жидкости Боба diff --git a/bobelectronics/prototypes/category.lua b/bobelectronics/prototypes/category.lua index d3dd7f83c..eeab75926 100644 --- a/bobelectronics/prototypes/category.lua +++ b/bobelectronics/prototypes/category.lua @@ -70,30 +70,22 @@ data:extend({ order = "c-b", }, - { - type = "item-group", - name = "bob-intermediate-products", - order = "c-i", - icon = "__bobelectronics__/graphics/icons/technology/intermediates.png", - icon_size = 64, - }, - { type = "item-subgroup", name = "bob-electronic-components", - group = "bob-intermediate-products", + group = "intermediate-products", order = "e-a1", }, { type = "item-subgroup", name = "bob-boards", - group = "bob-intermediate-products", + group = "intermediate-products", order = "e-a2", }, { type = "item-subgroup", name = "bob-electronic-boards", - group = "bob-intermediate-products", + group = "intermediate-products", order = "e-a3", }, }) diff --git a/bobelectronics/prototypes/chemicals.lua b/bobelectronics/prototypes/chemicals.lua index 38bb876ba..cf6216db3 100644 --- a/bobelectronics/prototypes/chemicals.lua +++ b/bobelectronics/prototypes/chemicals.lua @@ -4,6 +4,7 @@ data:extend({ name = "ferric-chloride-solution", icon = "__bobelectronics__/graphics/icons/ferric-chloride-solution.png", icon_size = 32, + subgroup = "bob-fluid", default_temperature = 25, heat_capacity = "1kJ", base_color = { r = 0.7, g = 0.6, b = 0.2 }, @@ -45,13 +46,13 @@ data:extend({ name = "coal-cracking", icon = "__bobelectronics__/graphics/icons/coal-cracking.png", icon_size = 32, - subgroup = "bob-fluid", - order = "b[fluid-chemistry]-a[coal-cracking]", + subgroup = "fluid-recipes", + order = "a[oil-processing]-c[coal-cracking]", category = "chemistry", enabled = false, - energy_required = 2.5, + energy_required = 3, ingredients = { - { type = "item", name = "coal", amount = 2 }, + { type = "item", name = "coal", amount = 3 }, { type = "fluid", name = "water", amount = 15 }, }, results = { diff --git a/bobelectronics/prototypes/electronics.lua b/bobelectronics/prototypes/electronics.lua index 4ff55a746..cf87d786a 100644 --- a/bobelectronics/prototypes/electronics.lua +++ b/bobelectronics/prototypes/electronics.lua @@ -22,7 +22,6 @@ if data.raw.item["tin-plate"] then type = "item", name = "tinned-copper-cable", icon = "__bobelectronics__/graphics/icons/tinned-copper-cable.png", - icon_size = 32, subgroup = "bob-electronic-components", order = "0-a1[tinned-copper-cable]", stack_size = 200, @@ -52,7 +51,6 @@ data:extend({ type = "item", name = "insulated-cable", icon = "__bobelectronics__/graphics/icons/insulated-cable.png", - icon_size = 32, subgroup = "bob-electronic-components", order = "0-a2[insulated-cable]", stack_size = 200, @@ -82,7 +80,6 @@ if data.raw.item["bob-gold-plate"] then type = "item", name = "gilded-copper-cable", icon = "__bobelectronics__/graphics/icons/gilded-copper-cable.png", - icon_size = 32, subgroup = "bob-electronic-components", order = "0-a3[gilded-copper-cable]", stack_size = 200, diff --git a/bobgreenhouse/prototypes/updates.lua b/bobgreenhouse/prototypes/updates.lua index f546c78bd..c698b1dad 100644 --- a/bobgreenhouse/prototypes/updates.lua +++ b/bobgreenhouse/prototypes/updates.lua @@ -4,10 +4,6 @@ if data.raw["item-subgroup"]["bob-resource-chemical"] then bobmods.lib.item.set_subgroup("fertiliser", "bob-resource-chemical") end -if data.raw["item-group"]["bob-intermediate-products"] then - data.raw["item-subgroup"]["bob-greenhouse-items"].group = "bob-intermediate-products" -end - if data.raw.item["bob-glass"] then bobmods.lib.recipe.replace_ingredient("bob-greenhouse", "copper-plate", "bob-glass") end diff --git a/boblibrary/ore-functions.lua b/boblibrary/ore-functions.lua index da4924b10..b9935edfd 100644 --- a/boblibrary/ore-functions.lua +++ b/boblibrary/ore-functions.lua @@ -326,6 +326,7 @@ function bobmods.lib.resource.create(inputs) name = inputs.name, flags = { "placeable-neutral" }, category = inputs.category, + subgroup = inputs.subgroup, order = "b-d-" .. inputs.name, minimum = minimum, normal = normal, diff --git a/boblogistics/prototypes/category.lua b/boblogistics/prototypes/category.lua index 20fe6e878..91634d04a 100644 --- a/boblogistics/prototypes/category.lua +++ b/boblogistics/prototypes/category.lua @@ -192,11 +192,3 @@ data:extend({ order = "e-e", }, }) - -if data.raw["item-group"]["bob-intermediate-products"] then - data.raw["item-subgroup"]["bob-roboport-parts"].group = "bob-intermediate-products" - data.raw["item-subgroup"]["bob-roboport-parts-antenna"].group = "bob-intermediate-products" - data.raw["item-subgroup"]["bob-roboport-parts-door"].group = "bob-intermediate-products" - data.raw["item-subgroup"]["bob-roboport-parts-charge"].group = "bob-intermediate-products" - data.raw["item-subgroup"]["bob-robot-parts"].group = "bob-intermediate-products" -end diff --git a/bobores/prototypes/fluids.lua b/bobores/prototypes/fluids.lua index ca3641937..1d5612faa 100644 --- a/bobores/prototypes/fluids.lua +++ b/bobores/prototypes/fluids.lua @@ -2,6 +2,7 @@ bobmods.ores.water = { name = "ground-water", icon = "__base__/graphics/icons/fluid/water.png", icon_size = 64, + subgroup = "bob-fluid", category = "water", infinite = true, minimum = 400000, @@ -73,6 +74,7 @@ end bobmods.ores.lithia_water = { name = "lithia-water", icon = "__bobores__/graphics/icons/lithia-water.png", + subgroup = "bob-fluid", category = "water", infinite = true, minimum = 2000000, diff --git a/bobplates/data-updates.lua b/bobplates/data-updates.lua index 4340bdac5..cfd7501f6 100644 --- a/bobplates/data-updates.lua +++ b/bobplates/data-updates.lua @@ -9,7 +9,14 @@ end --Electrolyser power if settings.startup["bobmods-plates-expensive-electrolysis"].value == true then + if feature_flags["quality"] then + data.raw.fluid["hydrogen"].fuel_value = "35kJ" + data.raw.fluid["deuterium"].fuel_value = "35kJ" + data.raw.recipe["water-electrolysis"].energy_required = 2 + data.raw.recipe["heavy-water-electrolysis"].energy_required = 2 + end data.raw["assembling-machine"]["electrolyser"].energy_usage = "1050kW" + data.raw["assembling-machine"]["electrolyser"].energy_source.drain = "12kW" end --change icons. @@ -43,8 +50,10 @@ end -- add Assembling Machine catagory. bobmods.lib.machine.type_if_add_category("assembling-machine", "crafting", "crafting-machine") -bobmods.lib.machine.type_if_add_category("assembling-machine", "crafting-with-fluid", "distillery") -- Adds distilling recipies to assembling machines that can handle fluids bobmods.lib.machine.type_if_add_category("assembling-machine", "chemistry", "distillery") -- Adds distilling recipies to chemical plants +if not data.raw.furnace["bob-distillery"] then + bobmods.lib.machine.type_if_add_category("assembling-machine", "crafting-with-fluid", "distillery") -- Adds distilling recipies to assembling machines that can handle fluids +end -- Reduce cost of Steel and new Steel if settings.startup["bobmods-plates-cheapersteel"].value == true then @@ -194,11 +203,13 @@ bobmods.lib.create_fluid_canister(data.raw.fluid["ferric-chloride-solution"]) bobmods.lib.create_fluid_canister(data.raw.fluid["sulfuric-acid"]) bobmods.lib.create_fluid_canister(data.raw.fluid["nitric-acid"]) bobmods.lib.create_fluid_canister(data.raw.fluid["sulfuric-nitric-acid"]) -bobmods.lib.create_fluid_canister(data.raw.fluid["tungstic-acid"]) bobmods.lib.create_fluid_canister(data.raw.fluid["alien-acid"]) bobmods.lib.create_fluid_canister(data.raw.fluid["alien-explosive"]) bobmods.lib.create_fluid_canister(data.raw.fluid["alien-poison"]) bobmods.lib.create_fluid_canister(data.raw.fluid["alien-fire"]) +if data.raw.fluid["tungstic-acid"] then + bobmods.lib.create_fluid_canister(data.raw.fluid["tungstic-acid"]) +end for i, recipe in pairs(data.raw.recipe) do if string.sub(recipe.name, -7) == "-barrel" and recipe.category == "crafting-with-fluid" then @@ -263,3 +274,130 @@ if not bobmods.ores.cobalt.enabled then bobmods.lib.tech.remove_recipe_unlock("cobalt-processing", "cobalt-oxide") bobmods.lib.recipe.hide("cobalt-oxide") end + +--Intermediate reorganization +data.raw["item-subgroup"]["fluid-recipes"].group = "bob-fluid-products" +data.raw["item-subgroup"]["science-pack"].order = "a" +data.raw["item-subgroup"]["intermediate-product"].order = "c" + +data.raw.fluid.water.subgroup = "bob-fluid" +data.raw.fluid.steam.subgroup = "bob-fluid" +data.raw.fluid["crude-oil"].subgroup = "bob-fluid" +data.raw.fluid["petroleum-gas"].subgroup = "bob-fluid" +data.raw.fluid["light-oil"].subgroup = "bob-fluid" +data.raw.fluid["heavy-oil"].subgroup = "bob-fluid" +data.raw.fluid.lubricant.subgroup = "bob-fluid" +data.raw.fluid["sulfuric-acid"].subgroup = "bob-fluid" + +data.raw.item["solid-fuel"].subgroup = "bob-chemical-fuels" +data.raw.item["rocket-fuel"].subgroup = "bob-chemical-fuels" +data.raw.item["nuclear-fuel"].subgroup = "bob-chemical-fuels" +data.raw.item["iron-plate"].subgroup = "bob-material" +data.raw.item["copper-plate"].subgroup = "bob-material" +data.raw.item["steel-plate"].subgroup = "bob-material" +data.raw.item["uranium-fuel-cell"].order = "r[uranium-processing]-a[uranium-fuel-cell]" +data.raw.item["nuclear-fuel"].subgroup = "bob-chemical-fuels" +data.raw.item["nuclear-fuel"].order = "e[nuclear-fuel]" +data.raw.item["iron-gear-wheel"].subgroup = "bob-gears" +data.raw.item.battery.subgroup = "intermediate-product" +data.raw.item.explosives.subgroup = "intermediate-product" +data.raw.item.explosives.order = "b[chemistry]-a[explosives]" +data.raw.item.sulfur.subgroup = "bob-resource-chemical" +data.raw.item.sulfur.order = "f[sulfur]" +if mods["bobgreenhouse"] then + data.raw.item["wood-pellets"].subgroup = "bob-chemical-fuels" + data.raw.item.seedling.subgroup = "bob-resource" + data.raw.recipe["bob-basic-greenhouse-cycle"].subgroup = "bob-resource" + data.raw.recipe["bob-advanced-greenhouse-cycle"].subgroup = "bob-resource" + data.raw.recipe["bob-basic-greenhouse-cycle"].order = "b[greenhouse-cycle-1]" + data.raw.recipe["bob-advanced-greenhouse-cycle"].order = "b[greenhouse-cycle-2]" +end + +data.raw.recipe["solid-fuel-from-heavy-oil"].subgroup = "bob-chemical-fuels" +data.raw.recipe["solid-fuel-from-light-oil"].subgroup = "bob-chemical-fuels" +data.raw.recipe["solid-fuel-from-petroleum-gas"].subgroup = "bob-chemical-fuels" +data.raw.recipe["nuclear-fuel"].subgroup = "bob-chemical-fuels" +data.raw.recipe["nuclear-fuel"].order = "e[nuclear-fuel]" +data.raw.recipe["iron-plate"].subgroup = "bob-material-smelting" +data.raw.recipe["copper-plate"].subgroup = "bob-material-smelting" +data.raw.recipe["steel-plate"].subgroup = "bob-material-smelting" +data.raw.recipe["plastic-bar"].subgroup = "bob-material-chemical" +data.raw.recipe["uranium-fuel-cell"].subgroup = "bob-fuel-cells" +data.raw.recipe["nuclear-fuel-reprocessing"].order = "r[uranium-processing]-b[reprocessing]" + +if feature_flags["quality"] then + if data.raw.item["alien-blue-alloy"] then + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("alien-blue-alloy", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("alien-orange-alloy", false) + end + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("lithium-perchlorate", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("sodium-hydroxide", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("alumina", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("powdered-tungsten", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("silicon-powder", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("silicon-nitride", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("cobalt-oxide", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("silicon-carbide", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-ruby-3", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-ruby-4", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-ruby-5", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-sapphire-3", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-sapphire-4", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-sapphire-5", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-emerald-3", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-emerald-4", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-emerald-5", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-amethyst-3", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-amethyst-4", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-amethyst-5", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-topaz-3", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-topaz-4", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-topaz-5", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-diamond-3", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-diamond-4", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-diamond-5", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("thorium-232", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("uranium-235", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("uranium-238", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("battery", true) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("lithium-ion-battery", true) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("silver-zinc-battery", true) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-lead-plate", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-gold-plate", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-nickel-plate", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-zinc-plate", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-aluminium-plate", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-titanium-plate", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-tungsten-plate", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("bob-silicon-plate", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("lithium", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("cobalt-plate", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("carbon", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("resin", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("silicon-wafer", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("lithium-cobalt-oxide", false) + + bobmods.lib.recipe.update_recycling_recipe({ + "air-pump", + "air-pump-2", + "air-pump-3", + "air-pump-4", + "water-pump", + "water-pump-2", + "water-pump-3", + "water-pump-4", + "void-pump", + "bob-distillery", + "electrolyser", + "stone-furnace", + "steel-furnace", + "electric-furnace", + "stone-mixing-furnace", + "steel-mixing-furnace", + "electric-mixing-furnace", + "stone-chemical-furnace", + "steel-chemical-furnace", + "electric-chemical-furnace", + "uranium-fuel-cell", + }) +end diff --git a/bobplates/graphics/icons/burner-distillery.png b/bobplates/graphics/icons/burner-distillery.png new file mode 100644 index 000000000..ba67950ba Binary files /dev/null and b/bobplates/graphics/icons/burner-distillery.png differ diff --git a/bobplates/graphics/icons/distillery.png b/bobplates/graphics/icons/distillery.png index 0c74ad1d4..a133781f4 100644 Binary files a/bobplates/graphics/icons/distillery.png and b/bobplates/graphics/icons/distillery.png differ diff --git a/bobplates/graphics/icons/sodium-hydroxide.png b/bobplates/graphics/icons/sodium-hydroxide.png index a1344a9d3..522f479f4 100644 Binary files a/bobplates/graphics/icons/sodium-hydroxide.png and b/bobplates/graphics/icons/sodium-hydroxide.png differ diff --git a/bobplates/graphics/icons/technology/distillery.png b/bobplates/graphics/icons/technology/distillery.png new file mode 100644 index 000000000..e725c95f5 Binary files /dev/null and b/bobplates/graphics/icons/technology/distillery.png differ diff --git a/bobplates/graphics/icons/technology/intermediates.png b/bobplates/graphics/icons/technology/intermediates.png deleted file mode 100644 index 03560fe77..000000000 Binary files a/bobplates/graphics/icons/technology/intermediates.png and /dev/null differ diff --git a/bobplates/locale/en/bobplates.cfg b/bobplates/locale/en/bobplates.cfg index 874480a86..0ba7ad415 100644 --- a/bobplates/locale/en/bobplates.cfg +++ b/bobplates/locale/en/bobplates.cfg @@ -41,7 +41,7 @@ lead-oxide=Lead oxide tungsten-oxide=Tungsten oxide powdered-tungsten=Powdered tungsten silicon-powder=Powdered silicon -cobalt-oxide=Cobalt Oxide +cobalt-oxide=Cobalt oxide salt=Salt sodium-hydroxide=Sodium hydroxide @@ -94,12 +94,12 @@ electrolyser=Electrolyser bob-distillery=Distillery mixing-furnace=Metal mixing furnace -mixing-steel-furnace=Steel Metal mixing furnace -electric-mixing-furnace=Electric Metal mixing furnace +mixing-steel-furnace=Steel metal mixing furnace +electric-mixing-furnace=Electric metal mixing furnace chemical-boiler=Chemical furnace -chemical-steel-furnace=Steel Chemical furnace -chemical-furnace=Electric Chemical furnace +chemical-steel-furnace=Steel chemical furnace +chemical-furnace=Electric chemical furnace stone-mixing-furnace=__ITEM__mixing-furnace__ steel-mixing-furnace=__ITEM__mixing-steel-furnace__ @@ -117,41 +117,41 @@ water-pump-2=Barrelling pump 2 water-pump-3=Barrelling pump 3 water-pump-4=Barrelling pump 4 -gas-canister=Gas Bottle +gas-canister=Gas bottle empty-canister=Empty canister filled-gas-canister=Bottled __1__ filled-canister=__1__ canister -bob-ruby-ore=Ruby Ore -bob-ruby-3=Raw Ruby -bob-ruby-4=Cut Ruby -bob-ruby-5=Polished Ruby +bob-ruby-ore=Ruby ore +bob-ruby-3=Raw ruby +bob-ruby-4=Cut ruby +bob-ruby-5=Polished ruby -bob-sapphire-ore=Sapphire Ore -bob-sapphire-3=Raw Sapphire -bob-sapphire-4=Cut Sapphire -bob-sapphire-5=Polished Sapphire +bob-sapphire-ore=Sapphire ore +bob-sapphire-3=Raw sapphire +bob-sapphire-4=Cut sapphire +bob-sapphire-5=Polished sapphire -bob-emerald-ore=Emerald Ore -bob-emerald-3=Raw Emerald -bob-emerald-4=Cut Emerald -bob-emerald-5=Polished Emerald +bob-emerald-ore=Emerald ore +bob-emerald-3=Raw emerald +bob-emerald-4=Cut emerald +bob-emerald-5=Polished emerald -bob-amethyst-ore=Amethyst Ore -bob-amethyst-3=Raw Amethyst -bob-amethyst-4=Cut Amethyst -bob-amethyst-5=Polished Amethyst +bob-amethyst-ore=Amethyst ore +bob-amethyst-3=Raw amethyst +bob-amethyst-4=Cut amethyst +bob-amethyst-5=Polished amethyst -bob-topaz-ore=Topaz Ore -bob-topaz-3=Raw Topaz -bob-topaz-4=Cut Topaz -bob-topaz-5=Polished Topaz +bob-topaz-ore=Topaz ore +bob-topaz-3=Raw topaz +bob-topaz-4=Cut topaz +bob-topaz-5=Polished topaz -bob-diamond-ore=Diamond Ore -bob-diamond-3=Raw Diamond -bob-diamond-4=Cut Diamond -bob-diamond-5=Polished Diamond +bob-diamond-ore=Diamond ore +bob-diamond-3=Raw diamond +bob-diamond-4=Cut diamond +bob-diamond-5=Polished diamond void=Void @@ -209,19 +209,20 @@ alien-fire=Alien flame fluid [recipe-name] +bob-lead-plate-2=Lead plate water-electrolysis=Water electrolysis salt-water-electrolysis=Salt water electrolysis heavy-water-electrolysis=Heavy water electrolysis -lithium-water-electrolysis=Lithium chloride Electrolysis -tungstic-acid=Tungstic Acid +lithium-water-electrolysis=Lithium chloride electrolysis +tungstic-acid=Tungstic acid lead-oxide=Lead oxide lead-oxide-2=Lead oxide -coal-cracking=Coal cracking to Heavy oil +coal-cracking=Coal cracking to heavy oil bob-oil-processing=Crude oil processing -petroleum-gas-cracking=Petroleum gas cracking to Hydrogen -solid-fuel-from-hydrogen=Solid fuel from Hydrogen -cobalt-oxide-from-copper=Advanced copper processing with Cobalt oxide -silver-from-lead=Advanced lead processing with Silver ore +petroleum-gas-cracking=Petroleum gas cracking to hydrogen +solid-fuel-from-hydrogen=Solid fuel from hydrogen +cobalt-oxide-from-copper=Advanced copper processing with cobalt oxide +silver-from-lead=Advanced lead processing with silver ore bob-heavy-water=Heavy water seperation bob-void=Void __1__ @@ -245,12 +246,12 @@ electrolyser=Electrolyser bob-distillery=Distillery mixing-furnace=Stone Metal mixing furnace -electric-mixing-furnace=Electric Metal mixing furnace +electric-mixing-furnace=Electric metal mixing furnace mixing-steel-furnace=Steel Metal mixing furnace -chemical-boiler=Stone Chemical furnace -chemical-furnace=Electric Chemical furnace -chemical-steel-furnace=Steel Chemical furnace +chemical-boiler=Stone chemical furnace +chemical-furnace=Electric chemical furnace +chemical-steel-furnace=Steel chemical furnace stone-mixing-furnace=__ENTITY__mixing-furnace__ steel-mixing-furnace=__ENTITY__mixing-steel-furnace__ @@ -277,7 +278,6 @@ void-pump=Gas venting pump nuclear-reactor=Uses nuclear fuel cells to generate heat. The heat output increases when built next to other reactors. [item-group-name] -bob-intermediate-products=Bob's Intermediate products bob-resource-products=Bob's Materials bob-fluid-products=Bob's Fluids bob-logistics=Bob's Logistics @@ -315,7 +315,7 @@ deuterium-processing=Deuterium processing ceramics=Ceramics water-bore=Barrelling pump -air-compressor=Air Compressors +air-compressor=Air compressors gas-canisters=Bottled gas processing fluid-barrel-processing=Fluid barrel processing fluid-canister-processing=Fluid canister processing @@ -336,10 +336,10 @@ alien-yellow-research=Yellow alien artifact research alien-green-research=Green alien artifact research alien-red-research=Red alien artifact research -steel-mixing-furnace=Steel Metal mixing furnace -steel-chemical-furnace=Steel Chemical furnace -electric-chemical-furnace=Electric Chemical furnace -electric-mixing-furnace=Electric Metal mixing furnace +steel-mixing-furnace=Steel metal mixing furnace +steel-chemical-furnace=Steel chemical furnace +electric-chemical-furnace=Electric chemical furnace +electric-mixing-furnace=Electric metal mixing furnace thorium-processing=Thorium processing thorium-fuel-reprocessing=Thorium fuel reprocessing @@ -368,18 +368,18 @@ silicon-processing=Research how to purify silicon for use in electronics. titanium-processing=Titanium is a very strong light weight metal, but hard to separate from its ore. tungsten-processing=Tungsten has a very high melting point, let's research how to refine it another way. -nitinol-processing=Nitinol is a Nickel Titanium alloy, let's see what we can use it for. -invar-processing=Invar is an Iron Nickel alloy, maybe we can use this for something. -tungsten-alloy-processing=Research how to make Tungsten based alloys, this might make it even more useful. +nitinol-processing=Nitinol is a nickel titanium alloy, let's see what we can use it for. +invar-processing=Invar is an iron nickel alloy, maybe we can use this for something. +tungsten-alloy-processing=Research how to make tungsten based alloys, this might make it even more useful. [mod-setting-name] -bobmods-plates-cheapersteel=Cheaper Steel +bobmods-plates-cheapersteel=Cheaper steel bobmods-plates-batteryupdate=Battery update bobmods-plates-inventorysize=Inventory size bobmods-plates-purewater=Enable pure water bobmods-plates-groundwater=Enable ground water boring recipes -bobmods-plates-vanillabarrelling=Enable Vanilla barrelling +bobmods-plates-vanillabarrelling=Enable vanilla barrelling bobmods-colorupdate=Color updates bobmods-plates-bluedeuterium=Deuterium is blue! bobmods-plates-nuclearupdate=Nuclear fuel update @@ -387,13 +387,13 @@ bobmods-plates-convert-recipes=Add conversion recipes bobmods-plates-expensive-electrolysis=Expensive electrolysis mode [mod-setting-description] -bobmods-plates-cheapersteel=If enabled, Steel will cost 2 iron plates in stead of 5 (or 4 in expensive mode) +bobmods-plates-cheapersteel=If enabled, steel will cost 2 iron plates in stead of 5 (or 4 in expensive mode) bobmods-plates-batteryupdate=If enabled, the recipe for battery will be replaced with one more in line with the mod bobmods-plates-inventorysize=An override for the character inventory size. Changing this will change the inventory for the player character. bobmods-plates-purewater=If enabled, pure water will exist. This water will be required for Electrolysis and will override the result of mining ground water. it can also be made by condensing steam. bobmods-plates-groundwater=If enabled, the barrelling pump can bore for water anywhere on the map. Water mining patches will not be force enabled. -bobmods-plates-vanillabarrelling=If enabled Assembling machines can be used for barrelling -bobmods-plates-bluedeuterium=I heard Deuterium was supposed to be blue, so I want the game to show it as such -bobmods-plates-nuclearupdate=Reworked nuclear fuels. It removes Plutonium from Thorium, and adds a fusion catalyst to fuel cell recycling needed for Deuterium fuel cells, plus other small changes. +bobmods-plates-vanillabarrelling=If enabled, assembling machines can be used for barrelling +bobmods-plates-bluedeuterium=I heard deuterium was supposed to be blue, so I want the game to show it as such +bobmods-plates-nuclearupdate=Reworked nuclear fuels. It removes plutonium from thorium, and adds a fusion catalyst to fuel cell recycling needed for deuterium fuel cells, plus other small changes. bobmods-plates-convert-recipes=If enabled, additional recipes will be added to convert between the different furnace types. -bobmods-plates-expensive-electrolysis=If enabled, this increases the electricity cost of Electrolysis. This is to make hydrogen from electrolysis cost more than what you gain from burning it for power. +bobmods-plates-expensive-electrolysis=If enabled, this increases the electricity cost of electrolysis. This is to make hydrogen from electrolysis cost more than what you gain from burning it for power. diff --git a/bobplates/locale/ru/bobplates.cfg b/bobplates/locale/ru/bobplates.cfg index ab6f2c1e2..5b20b49a5 100644 --- a/bobplates/locale/ru/bobplates.cfg +++ b/bobplates/locale/ru/bobplates.cfg @@ -274,7 +274,6 @@ void-pump=Насос для выброса газов в атмосферу [item-group-name] -bob-intermediate-products=Промежуточные материалы Боба bob-resource-products=Материалы Боба bob-fluid-products=Жидкости Боба bob-logistics=Логистика Боба diff --git a/bobplates/prototypes/category.lua b/bobplates/prototypes/category.lua index 761d67da7..a51b31953 100644 --- a/bobplates/prototypes/category.lua +++ b/bobplates/prototypes/category.lua @@ -48,12 +48,6 @@ data:extend({ icon_size = 64, }, - { - type = "item-subgroup", - name = "bob-storage", - group = "bob-logistics", - order = "a-a", - }, { type = "item-subgroup", name = "bob-belt", @@ -271,6 +265,12 @@ data:extend({ group = "bob-resource-products", order = "b-a", }, + { + type = "item-subgroup", + name = "bob-chemical-fuels", + group = "bob-resource-products", + order = "b-a1", + }, { type = "item-subgroup", name = "bob-resource", @@ -319,68 +319,50 @@ data:extend({ group = "bob-resource-products", order = "c-c", }, - - { - type = "item-group", - name = "bob-intermediate-products", - order = "c-i", - icon = "__bobplates__/graphics/icons/technology/intermediates.png", - icon_size = 64, - }, - { type = "item-subgroup", - name = "bob-intermediates", - group = "bob-intermediate-products", - order = "e-1", + name = "bob-nuclear", + group = "bob-resource-products", + order = "c-d", }, + { type = "item-subgroup", name = "bob-electronic-components", - group = "bob-intermediate-products", + group = "intermediate-products", order = "e-a1", }, { type = "item-subgroup", name = "bob-boards", - group = "bob-intermediate-products", + group = "intermediate-products", order = "e-a2", }, { type = "item-subgroup", name = "bob-electronic-boards", - group = "bob-intermediate-products", + group = "intermediate-products", order = "e-a3", }, + + { type = "item-subgroup", name = "bob-gears", - group = "bob-intermediate-products", - order = "e-b", + group = "intermediate-products", + order = "b-a", }, { type = "item-subgroup", name = "bob-bearings", - group = "bob-intermediate-products", - order = "e-c", - }, - { - type = "item-subgroup", - name = "bob-roboport-parts", - group = "bob-intermediate-products", - order = "e-d", - }, - { - type = "item-subgroup", - name = "bob-nuclear", group = "intermediate-products", - order = "f-a", + order = "b-b", }, { type = "item-subgroup", name = "bob-fuel-cells", group = "intermediate-products", - order = "f-b", + order = "e-e3", }, { diff --git a/bobplates/prototypes/distillery.lua b/bobplates/prototypes/distillery.lua index 3974196f8..6d8b6c9ae 100644 --- a/bobplates/prototypes/distillery.lua +++ b/bobplates/prototypes/distillery.lua @@ -372,7 +372,6 @@ if settings.startup["bobmods-plates-purewater"].value == true then type = "item", name = "bob-distillery", icon = "__bobplates__/graphics/icons/distillery.png", - icon_size = 32, subgroup = "production-machine", order = "e[distillery]", place_result = "bob-distillery", @@ -409,7 +408,6 @@ if settings.startup["bobmods-plates-purewater"].value == true then type = "furnace", name = "bob-distillery", icon = "__bobplates__/graphics/icons/distillery.png", - icon_size = 32, flags = { "placeable-neutral", "placeable-player", "player-creation" }, minable = { mining_time = 0.2, result = "bob-distillery" }, max_health = 200, diff --git a/bobplates/prototypes/item/alien.lua b/bobplates/prototypes/item/alien.lua index 928e7e03e..12db9e0eb 100644 --- a/bobplates/prototypes/item/alien.lua +++ b/bobplates/prototypes/item/alien.lua @@ -15,6 +15,18 @@ then subgroup = "bob-alien-resource", order = "f[alien]-a", stack_size = 200, + drop_sound = { + filename = "__base__/sound/item/metal-small-inventory-move.ogg", + volume = 0.8, + }, + inventory_move_sound = { + filename = "__base__/sound/item/metal-small-inventory-move.ogg", + volume = 0.8, + }, + pick_sound = { + filename = "__base__/sound/item/metal-small-inventory-pickup.ogg", + volume = 0.8, + }, }, { @@ -25,6 +37,18 @@ then subgroup = "bob-alien-resource", order = "f[alien]-b", stack_size = 200, + drop_sound = { + filename = "__base__/sound/item/metal-small-inventory-move.ogg", + volume = 0.8, + }, + inventory_move_sound = { + filename = "__base__/sound/item/metal-small-inventory-move.ogg", + volume = 0.8, + }, + pick_sound = { + filename = "__base__/sound/item/metal-small-inventory-pickup.ogg", + volume = 0.8, + }, }, { diff --git a/bobplates/prototypes/item/alloys.lua b/bobplates/prototypes/item/alloys.lua index 1e782798f..e3ef11980 100644 --- a/bobplates/prototypes/item/alloys.lua +++ b/bobplates/prototypes/item/alloys.lua @@ -1,3 +1,12 @@ +local plate_drop_move = { + filename = "__base__/sound/item/metal-small-inventory-move.ogg", + volume = 0.8, +} +local plate_pick = { + filename = "__base__/sound/item/metal-small-inventory-pickup.ogg", + volume = 0.8, +} + data:extend({ { type = "item", @@ -7,6 +16,9 @@ data:extend({ subgroup = "bob-alloy", order = "c-b-a[bronze]", stack_size = 200, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, }, { type = "item", @@ -16,6 +28,9 @@ data:extend({ subgroup = "bob-alloy", order = "c-b-b[brass]", stack_size = 200, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, }, { type = "item", @@ -25,6 +40,9 @@ data:extend({ subgroup = "bob-alloy", order = "c-b-d[copper-tungsten]", stack_size = 200, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, }, { type = "item", @@ -34,6 +52,9 @@ data:extend({ subgroup = "bob-alloy", order = "c-b-d[tungsten-carbide]", stack_size = 200, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, }, { type = "item", @@ -43,6 +64,9 @@ data:extend({ subgroup = "bob-alloy", order = "c-b-e[gunmetal]", stack_size = 200, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, }, { @@ -53,6 +77,9 @@ data:extend({ subgroup = "bob-alloy", order = "c-b-f[invar]", stack_size = 200, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, }, { type = "item", @@ -62,6 +89,9 @@ data:extend({ subgroup = "bob-alloy", order = "c-b-g[nitinol]", stack_size = 200, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, }, { type = "item", @@ -71,5 +101,8 @@ data:extend({ subgroup = "bob-alloy", order = "c-b-i[cobalt-steel]", stack_size = 200, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, }, }) diff --git a/bobplates/prototypes/item/chemicals.lua b/bobplates/prototypes/item/chemicals.lua index 4873bf11e..8f83b225e 100644 --- a/bobplates/prototypes/item/chemicals.lua +++ b/bobplates/prototypes/item/chemicals.lua @@ -1,3 +1,14 @@ +local powder_drop_move = { + filename = "__base__/sound/item/sulfur-inventory-move.ogg", + volume = 0.7, + speed = 1.3, +} +local powder_pick = { + filename = "__base__/sound/item/landfill-inventory-pickup.ogg", + volume = 0.6, + speed = 1.2, +} + if settings.startup["bobmods-plates-purewater"].value == true then data:extend({ { @@ -5,6 +16,7 @@ if settings.startup["bobmods-plates-purewater"].value == true then name = "pure-water", icon = "__bobplates__/graphics/icons/pure-water.png", icon_size = 64, + subgroup = "bob-fluid", default_temperature = 15, max_temperature = 100, gas_temperature = 100, @@ -27,6 +39,7 @@ data:extend({ flow_color = { r = 0.5, g = 1.0, b = 1.0 }, icon = "__bobplates__/graphics/icons/liquid-air.png", icon_size = 32, + subgroup = "bob-fluid-pump", order = "a[fluid]-g[bob-liquid-air]", gas_temperature = -100, auto_barrel = false, @@ -42,6 +55,7 @@ data:extend({ flow_color = { r = 0.7, g = 1.0, b = 1.0 }, icon = "__bobplates__/graphics/icons/lithia-water.png", icon_size = 32, + subgroup = "bob-fluid", order = "a[fluid]-a[water-lithia]", }, @@ -55,6 +69,7 @@ data:extend({ max_temperature = 100, icon = "__bobplates__/graphics/icons/hydrogen.png", icon_size = 64, + subgroup = "bob-fluid", order = "a[fluid]-g[hydrogen]", gas_temperature = -252.76, fuel_value = "45kJ", --"90kJ", -- should be 100k, but i'm balancing, halved for 0.17 @@ -71,6 +86,7 @@ data:extend({ max_temperature = 100, icon = "__bobplates__/graphics/icons/oxygen.png", icon_size = 64, + subgroup = "bob-fluid", order = "a[fluid]-g[oxygen]", gas_temperature = -219, }, @@ -85,6 +101,7 @@ data:extend({ max_temperature = 100, icon = "__bobplates__/graphics/icons/nitrogen.png", icon_size = 64, + subgroup = "bob-fluid", order = "a[fluid]-g[nitrogen]", gas_temperature = -210, }, @@ -99,6 +116,7 @@ data:extend({ max_temperature = 100, icon = "__bobplates__/graphics/icons/chlorine.png", icon_size = 64, + subgroup = "bob-fluid", order = "a[fluid]-g[chlorine]", gas_temperature = -102, }, @@ -113,6 +131,7 @@ data:extend({ max_temperature = 100, icon = "__bobplates__/graphics/icons/hydrogen-chloride.png", icon_size = 64, + subgroup = "bob-fluid", order = "a[fluid]-g[hydrogen-chloride]", gas_temperature = -115, }, @@ -127,6 +146,7 @@ data:extend({ max_temperature = 100, icon = "__bobplates__/graphics/icons/nitrogen-dioxide.png", icon_size = 64, + subgroup = "bob-fluid", order = "a[fluid]-g[nitrogen-dioxide]", gas_temperature = -12, }, @@ -141,6 +161,7 @@ data:extend({ max_temperature = 100, icon = "__bobplates__/graphics/icons/sulfur-dioxide.png", icon_size = 64, + subgroup = "bob-fluid", order = "a[fluid]-g[sulfur-dioxide]", gas_temperature = -72, }, @@ -155,22 +176,10 @@ data:extend({ max_temperature = 100, icon = "__bobplates__/graphics/icons/nitric-acid.png", icon_size = 64, + subgroup = "bob-fluid", order = "a[fluid]-g[nitric-acid]", }, - { - type = "fluid", - name = "tungstic-acid", - default_temperature = 25, - heat_capacity = "1kJ", - base_color = { r = 0, g = 0.2, b = 0.7 }, - flow_color = { r = 0.5, g = 0.5, b = 0.5 }, - max_temperature = 100, - icon = "__bobplates__/graphics/icons/tungstic-acid.png", - icon_size = 32, - order = "a[fluid]-g[tungstic-acid]", - }, - { type = "fluid", name = "ferric-chloride-solution", @@ -181,6 +190,7 @@ data:extend({ max_temperature = 100, icon = "__bobplates__/graphics/icons/ferric-chloride-solution.png", icon_size = 32, + subgroup = "bob-fluid", order = "a[fluid]-g[ferric-chloride-solution]", }, @@ -194,6 +204,7 @@ data:extend({ max_temperature = 100, icon = "__bobplates__/graphics/icons/liquid-fuel.png", icon_size = 32, + subgroup = "bob-fluid", order = "a[fluid]-g[liquid-fuel]", emissions_multiplier = 0.8, fuel_value = "2.3MJ", --"4MJ" @@ -207,6 +218,9 @@ data:extend({ subgroup = "bob-resource-chemical", order = "f[salt]", stack_size = 100, + drop_sound = powder_drop_move, + inventory_move_sound = powder_drop_move, + pick_sound = powder_pick, }, { @@ -217,6 +231,9 @@ data:extend({ subgroup = "bob-resource-chemical", order = "f[lithium-chloride]", stack_size = 100, + drop_sound = powder_drop_move, + inventory_move_sound = powder_drop_move, + pick_sound = powder_pick, }, { @@ -227,16 +244,21 @@ data:extend({ subgroup = "bob-resource-chemical", order = "f[lithium-perchlorate]", stack_size = 100, + drop_sound = powder_drop_move, + inventory_move_sound = powder_drop_move, + pick_sound = powder_pick, }, { type = "item", name = "sodium-hydroxide", icon = "__bobplates__/graphics/icons/sodium-hydroxide.png", - icon_size = 32, subgroup = "bob-resource-chemical", order = "f[sodium-hydroxide]", stack_size = 100, + drop_sound = powder_drop_move, + inventory_move_sound = powder_drop_move, + pick_sound = powder_pick, }, { @@ -247,6 +269,9 @@ data:extend({ subgroup = "bob-resource-chemical", order = "f[calcium-chloride]", stack_size = 100, + drop_sound = powder_drop_move, + inventory_move_sound = powder_drop_move, + pick_sound = powder_pick, }, { @@ -257,6 +282,9 @@ data:extend({ subgroup = "bob-resource-chemical", order = "f[lead-oxide]", stack_size = 100, + drop_sound = powder_drop_move, + inventory_move_sound = powder_drop_move, + pick_sound = powder_pick, }, { @@ -267,6 +295,18 @@ data:extend({ subgroup = "bob-resource-chemical", order = "f[alumina]", stack_size = 100, + drop_sound = { + filename = "__base__/sound/item/resource-inventory-move.ogg", + volume = 0.8, + }, + inventory_move_sound = { + filename = "__base__/sound/item/resource-inventory-move.ogg", + volume = 0.8, + }, + pick_sound = { + filename = "__base__/sound/item/resource-inventory-pickup.ogg", + volume = 0.6, + }, }, { @@ -277,6 +317,9 @@ data:extend({ subgroup = "bob-resource-chemical", order = "f[tungsten-oxide]", stack_size = 100, + drop_sound = powder_drop_move, + inventory_move_sound = powder_drop_move, + pick_sound = powder_pick, }, { @@ -287,6 +330,9 @@ data:extend({ subgroup = "bob-resource-chemical", order = "f[powdered-tungsten]", stack_size = 100, + drop_sound = powder_drop_move, + inventory_move_sound = powder_drop_move, + pick_sound = powder_pick, }, { @@ -297,6 +343,9 @@ data:extend({ subgroup = "bob-resource-chemical", order = "f[silicon-powder]", stack_size = 100, + drop_sound = powder_drop_move, + inventory_move_sound = powder_drop_move, + pick_sound = powder_pick, }, { @@ -307,6 +356,9 @@ data:extend({ subgroup = "bob-resource-chemical", order = "f[silicon-nitride]", stack_size = 100, + drop_sound = powder_drop_move, + inventory_move_sound = powder_drop_move, + pick_sound = powder_pick, }, { @@ -317,6 +369,9 @@ data:extend({ subgroup = "bob-resource-chemical", order = "f[cobalt-oxide]", stack_size = 100, + drop_sound = powder_drop_move, + inventory_move_sound = powder_drop_move, + pick_sound = powder_pick, }, { @@ -327,6 +382,9 @@ data:extend({ subgroup = "bob-resource-chemical", order = "f[silicon-carbide]", stack_size = 100, + drop_sound = powder_drop_move, + inventory_move_sound = powder_drop_move, + pick_sound = powder_pick, }, { @@ -337,6 +395,9 @@ data:extend({ subgroup = "bob-resource-chemical", order = "f[silver-nitrate]", stack_size = 100, + drop_sound = powder_drop_move, + inventory_move_sound = powder_drop_move, + pick_sound = powder_pick, }, { @@ -347,6 +408,9 @@ data:extend({ subgroup = "bob-resource-chemical", order = "f[silver-oxide]", stack_size = 100, + drop_sound = powder_drop_move, + inventory_move_sound = powder_drop_move, + pick_sound = powder_pick, }, }) @@ -361,6 +425,7 @@ data:extend({ name = "heavy-water", icon = "__bobplates__/graphics/icons/heavy-water.png", icon_size = 64, + subgroup = "bob-fluid", order = "a[fluid]-a[water-heavy]", default_temperature = 15, max_temperature = 100, @@ -374,6 +439,7 @@ data:extend({ name = "deuterium", icon = "__bobplates__/graphics/icons/deuterium.png", icon_size = 64, + subgroup = "bob-fluid", order = "a[fluid]-g[deuterium]", default_temperature = 25, max_temperature = 100, @@ -381,7 +447,7 @@ data:extend({ heat_capacity = "1kJ", base_color = { r = 0.7, g = 0.7, b = 0.4 }, flow_color = { r = 1, g = 1, b = 0.6 }, - fuel_value = "3.55MJ", + fuel_value = "45kJ", emissions_multiplier = 0.1, }, { @@ -389,6 +455,7 @@ data:extend({ name = "hydrogen-sulfide", icon = "__bobplates__/graphics/icons/hydrogen-sulfide.png", icon_size = 64, + subgroup = "bob-fluid", order = "a[fluid]-g[hydrogen-sulfide]", default_temperature = 25, max_temperature = 100, @@ -398,3 +465,24 @@ data:extend({ flow_color = { r = 1, g = 1, b = 0.5 }, }, }) + + +if not feature_flags["quality"] then + data:extend({ + + { + type = "fluid", + name = "tungstic-acid", + default_temperature = 25, + heat_capacity = "1kJ", + base_color = { r = 0, g = 0.2, b = 0.7 }, + flow_color = { r = 0.5, g = 0.5, b = 0.5 }, + max_temperature = 100, + icon = "__bobplates__/graphics/icons/tungstic-acid.png", + icon_size = 32, + subgroup = "bob-fluid", + order = "a[fluid]-g[tungstic-acid]", + }, + + }) +end diff --git a/bobplates/prototypes/item/electronics.lua b/bobplates/prototypes/item/electronics.lua index 003c709e4..d7128e606 100644 --- a/bobplates/prototypes/item/electronics.lua +++ b/bobplates/prototypes/item/electronics.lua @@ -1,4 +1,6 @@ -data.raw.item["processing-unit"].order = "g[processing-unit-1]" +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:extend({ { @@ -7,7 +9,19 @@ data:extend({ icon = "__bobplates__/graphics/icons/advanced-processing-unit.png", icon_size = 32, subgroup = "intermediate-product", - order = "g[processing-unit-2]", + order = "a[circuits]-d[processing-unit-2]", stack_size = 200, + drop_sound = { + filename = "__base__/sound/item/electric-small-inventory-move.ogg", + volume = 1, + }, + inventory_move_sound = { + filename = "__base__/sound/item/electric-small-inventory-move.ogg", + volume = 1, + }, + pick_sound = { + filename = "__base__/sound/item/electric-small-inventory-pickup.ogg", + volume = 0.7, + }, }, }) diff --git a/bobplates/prototypes/item/gems.lua b/bobplates/prototypes/item/gems.lua index 1cf7c8a08..61b8fd23b 100644 --- a/bobplates/prototypes/item/gems.lua +++ b/bobplates/prototypes/item/gems.lua @@ -1,63 +1,84 @@ +local gem_drop_move = { + filename = "__base__/sound/item/resource-inventory-move.ogg", + volume = 0.8, +} +local gem_pick = { + filename = "__base__/sound/item/resource-inventory-pickup.ogg", + volume = 0.6, +} + data:extend({ { type = "item", name = "bob-ruby-3", icon = "__bobplates__/graphics/icons/gems/ruby-3.png", icon_size = 32, - subgroup = "bob-gems-raw", order = "a-3", stack_size = 100, + drop_sound = gem_drop_move, + inventory_move_sound = gem_drop_move, + pick_sound = gem_pick, }, { type = "item", name = "bob-sapphire-3", icon = "__bobplates__/graphics/icons/gems/sapphire-3.png", icon_size = 32, - subgroup = "bob-gems-raw", order = "b-3", stack_size = 100, + drop_sound = gem_drop_move, + inventory_move_sound = gem_drop_move, + pick_sound = gem_pick, }, { type = "item", name = "bob-emerald-3", icon = "__bobplates__/graphics/icons/gems/emerald-3.png", icon_size = 32, - subgroup = "bob-gems-raw", order = "c-3", stack_size = 100, + drop_sound = gem_drop_move, + inventory_move_sound = gem_drop_move, + pick_sound = gem_pick, }, { type = "item", name = "bob-amethyst-3", icon = "__bobplates__/graphics/icons/gems/amethyst-3.png", icon_size = 32, - subgroup = "bob-gems-raw", order = "d-3", stack_size = 100, + drop_sound = gem_drop_move, + inventory_move_sound = gem_drop_move, + pick_sound = gem_pick, }, { type = "item", name = "bob-topaz-3", icon = "__bobplates__/graphics/icons/gems/topaz-3.png", icon_size = 32, - subgroup = "bob-gems-raw", order = "e-3", stack_size = 100, + drop_sound = gem_drop_move, + inventory_move_sound = gem_drop_move, + pick_sound = gem_pick, }, { type = "item", name = "bob-diamond-3", icon = "__bobplates__/graphics/icons/gems/diamond-3.png", icon_size = 32, - subgroup = "bob-gems-raw", order = "f-3", stack_size = 100, + drop_sound = gem_drop_move, + inventory_move_sound = gem_drop_move, + pick_sound = gem_pick, }, { @@ -65,60 +86,72 @@ data:extend({ name = "bob-ruby-4", icon = "__bobplates__/graphics/icons/gems/ruby-4.png", icon_size = 32, - subgroup = "bob-gems-cut", order = "a-4", stack_size = 100, + drop_sound = gem_drop_move, + inventory_move_sound = gem_drop_move, + pick_sound = gem_pick, }, { type = "item", name = "bob-sapphire-4", icon = "__bobplates__/graphics/icons/gems/sapphire-4.png", icon_size = 32, - subgroup = "bob-gems-cut", order = "b-4", stack_size = 100, + drop_sound = gem_drop_move, + inventory_move_sound = gem_drop_move, + pick_sound = gem_pick, }, { type = "item", name = "bob-emerald-4", icon = "__bobplates__/graphics/icons/gems/emerald-4.png", icon_size = 32, - subgroup = "bob-gems-cut", order = "c-4", stack_size = 100, + drop_sound = gem_drop_move, + inventory_move_sound = gem_drop_move, + pick_sound = gem_pick, }, { type = "item", name = "bob-amethyst-4", icon = "__bobplates__/graphics/icons/gems/amethyst-4.png", icon_size = 32, - subgroup = "bob-gems-cut", order = "d-4", stack_size = 100, + drop_sound = gem_drop_move, + inventory_move_sound = gem_drop_move, + pick_sound = gem_pick, }, { type = "item", name = "bob-topaz-4", icon = "__bobplates__/graphics/icons/gems/topaz-4.png", icon_size = 32, - subgroup = "bob-gems-cut", order = "e-4", stack_size = 100, + drop_sound = gem_drop_move, + inventory_move_sound = gem_drop_move, + pick_sound = gem_pick, }, { type = "item", name = "bob-diamond-4", icon = "__bobplates__/graphics/icons/gems/diamond-4.png", icon_size = 32, - subgroup = "bob-gems-cut", order = "f-4", stack_size = 100, + drop_sound = gem_drop_move, + inventory_move_sound = gem_drop_move, + pick_sound = gem_pick, }, { @@ -126,59 +159,71 @@ data:extend({ name = "bob-ruby-5", icon = "__bobplates__/graphics/icons/gems/ruby-5.png", icon_size = 32, - subgroup = "bob-gems-polished", order = "a-5", stack_size = 100, + drop_sound = gem_drop_move, + inventory_move_sound = gem_drop_move, + pick_sound = gem_pick, }, { type = "item", name = "bob-sapphire-5", icon = "__bobplates__/graphics/icons/gems/sapphire-5.png", icon_size = 32, - subgroup = "bob-gems-polished", order = "b-5", stack_size = 100, + drop_sound = gem_drop_move, + inventory_move_sound = gem_drop_move, + pick_sound = gem_pick, }, { type = "item", name = "bob-emerald-5", icon = "__bobplates__/graphics/icons/gems/emerald-5.png", icon_size = 32, - subgroup = "bob-gems-polished", order = "c-5", stack_size = 100, + drop_sound = gem_drop_move, + inventory_move_sound = gem_drop_move, + pick_sound = gem_pick, }, { type = "item", name = "bob-amethyst-5", icon = "__bobplates__/graphics/icons/gems/amethyst-5.png", icon_size = 32, - subgroup = "bob-gems-polished", order = "d-5", stack_size = 100, + drop_sound = gem_drop_move, + inventory_move_sound = gem_drop_move, + pick_sound = gem_pick, }, { type = "item", name = "bob-topaz-5", icon = "__bobplates__/graphics/icons/gems/topaz-5.png", icon_size = 32, - subgroup = "bob-gems-polished", order = "e-5", stack_size = 100, + drop_sound = gem_drop_move, + inventory_move_sound = gem_drop_move, + pick_sound = gem_pick, }, { type = "item", name = "bob-diamond-5", icon = "__bobplates__/graphics/icons/gems/diamond-5.png", icon_size = 32, - subgroup = "bob-gems-polished", order = "f-5", stack_size = 100, + drop_sound = gem_drop_move, + inventory_move_sound = gem_drop_move, + pick_sound = gem_pick, }, }) diff --git a/bobplates/prototypes/item/nuclear.lua b/bobplates/prototypes/item/nuclear.lua index 5830332b9..2bc8d9b3d 100644 --- a/bobplates/prototypes/item/nuclear.lua +++ b/bobplates/prototypes/item/nuclear.lua @@ -1,3 +1,12 @@ +local radioactive_drop_move = { + filename = "__base__/sound/item/nuclear-inventory-move.ogg", + volume = 0.6, +} +local radioactive_pick = { + filename = "__base__/sound/item/nuclear-inventory-pickup.ogg", + volume = 0.6, +} + data:extend({ { type = "item", @@ -7,6 +16,9 @@ data:extend({ subgroup = "bob-nuclear", order = "s[plutonium-239]", stack_size = 100, + drop_sound = radioactive_drop_move, + inventory_move_sound = radioactive_drop_move, + pick_sound = radioactive_pick, }, }) @@ -24,6 +36,9 @@ if settings.startup["bobmods-plates-nuclearupdate"].value == true then fuel_value = "40GJ", fuel_glow_color = { r = 0.7, g = 1, b = 0 }, stack_size = 50, + drop_sound = radioactive_drop_move, + inventory_move_sound = radioactive_drop_move, + pick_sound = radioactive_pick, }, { type = "item", @@ -33,6 +48,30 @@ if settings.startup["bobmods-plates-nuclearupdate"].value == true then subgroup = "bob-fuel-cells", order = "r[uranium-processing]-0[empty-nuclear-fuel-cell]", stack_size = 50, + drop_sound = { + aggregation = { + max_count = 1, + remove = true, + }, + filename = "__base__/sound/item/fuel-cell-inventory-move.ogg", + volume = 0.6, + }, + inventory_move_sound = { + aggregation = { + max_count = 1, + remove = true, + }, + filename = "__base__/sound/item/fuel-cell-inventory-move.ogg", + volume = 0.6, + }, + pick_sound = { + aggregation = { + max_count = 1, + remove = true, + }, + filename = "__base__/sound/item/fuel-cell-inventory-pickup.ogg", + volume = 0.5, + }, }, }) end @@ -47,6 +86,9 @@ if data.raw.item["thorium-ore"] then subgroup = "bob-nuclear", order = "s[thorium-232]", stack_size = 100, + drop_sound = radioactive_drop_move, + inventory_move_sound = radioactive_drop_move, + pick_sound = radioactive_pick, }, { type = "item", @@ -60,6 +102,9 @@ if data.raw.item["thorium-ore"] then fuel_value = "6GJ", fuel_glow_color = { r = 1, g = 1, b = 0 }, stack_size = 50, + drop_sound = radioactive_drop_move, + inventory_move_sound = radioactive_drop_move, + pick_sound = radioactive_pick, }, { type = "item", @@ -73,6 +118,9 @@ if data.raw.item["thorium-ore"] then fuel_value = "40GJ", fuel_glow_color = { r = 1, g = 0.7, b = 0 }, stack_size = 50, + drop_sound = radioactive_drop_move, + inventory_move_sound = radioactive_drop_move, + pick_sound = radioactive_pick, }, { type = "item", @@ -82,6 +130,9 @@ if data.raw.item["thorium-ore"] then subgroup = "bob-fuel-cells", order = "s[bob-depleted-thorium-fuel-cell]", stack_size = 50, + drop_sound = radioactive_drop_move, + inventory_move_sound = radioactive_drop_move, + pick_sound = radioactive_pick, }, }) @@ -104,6 +155,18 @@ data:extend({ fuel_value = "100GJ", fuel_glow_color = { r = 1, g = 0, b = 0.57 }, stack_size = 50, + drop_sound = { + filename = "__base__/sound/item/fluid-inventory-move.ogg", + volume = 0.6, + }, + inventory_move_sound = { + filename = "__base__/sound/item/fluid-inventory-move.ogg", + volume = 0.6, + }, + pick_sound = { + filename = "__base__/sound/item/fluid-inventory-pickup.ogg", + volume = 0.5, + }, }, { type = "item", @@ -113,6 +176,18 @@ data:extend({ subgroup = "bob-fuel-cells", order = "t[bob-depleted-deuterium-fuel-cell]", stack_size = 50, + drop_sound = { + filename = "__base__/sound/item/fluid-inventory-move.ogg", + volume = 0.6, + }, + inventory_move_sound = { + filename = "__base__/sound/item/fluid-inventory-move.ogg", + volume = 0.6, + }, + pick_sound = { + filename = "__base__/sound/item/fluid-inventory-pickup.ogg", + volume = 0.5, + }, }, }) @@ -131,6 +206,18 @@ if settings.startup["bobmods-plates-nuclearupdate"].value == true then fuel_value = "120GJ", fuel_glow_color = { r = 1, g = 0, b = 0.9 }, stack_size = 50, + drop_sound = { + filename = "__base__/sound/item/fluid-inventory-move.ogg", + volume = 0.6, + }, + inventory_move_sound = { + filename = "__base__/sound/item/fluid-inventory-move.ogg", + volume = 0.6, + }, + pick_sound = { + filename = "__base__/sound/item/fluid-inventory-pickup.ogg", + volume = 0.5, + }, }, { type = "item", @@ -140,6 +227,9 @@ if settings.startup["bobmods-plates-nuclearupdate"].value == true then subgroup = "bob-nuclear", order = "t[fusion-catalyst]", stack_size = 50, + drop_sound = radioactive_drop_move, + inventory_move_sound = radioactive_drop_move, + pick_sound = radioactive_pick, }, }) end diff --git a/bobplates/prototypes/item/ores.lua b/bobplates/prototypes/item/ores.lua index fe7814291..9ebb92c90 100644 --- a/bobplates/prototypes/item/ores.lua +++ b/bobplates/prototypes/item/ores.lua @@ -1,3 +1,12 @@ +local resource_drop_move = { + filename = "__base__/sound/item/resource-inventory-move.ogg", + volume = 0.8 +} +local resouce_pick = { + filename = "__base__/sound/item/resource-inventory-pickup.ogg", + volume = 0.6 +} + if not data.raw.item["gold-ore"] then data:extend({ { @@ -8,6 +17,9 @@ if not data.raw.item["gold-ore"] then subgroup = "bob-ores", order = "b-d[gold-ore]", stack_size = 200, + drop_sound = resource_drop_move, + inventory_move_sound = resource_drop_move, + pick_sound = resouce_pick, }, }) end @@ -22,6 +34,9 @@ if not data.raw.item["lead-ore"] then subgroup = "bob-ores", order = "b-d[lead-ore]", stack_size = 200, + drop_sound = resource_drop_move, + inventory_move_sound = resource_drop_move, + pick_sound = resouce_pick, }, }) end @@ -36,6 +51,9 @@ if not data.raw.item["silver-ore"] then subgroup = "bob-ores", order = "b-d[silver-ore]", stack_size = 200, + drop_sound = resource_drop_move, + inventory_move_sound = resource_drop_move, + pick_sound = resouce_pick, }, }) end @@ -50,6 +68,9 @@ if not data.raw.item["tin-ore"] then subgroup = "bob-ores", order = "b-d[tin-ore]", stack_size = 200, + drop_sound = resource_drop_move, + inventory_move_sound = resource_drop_move, + pick_sound = resouce_pick, }, }) end @@ -64,6 +85,9 @@ if not data.raw.item["tungsten-ore"] then subgroup = "bob-ores", order = "b-d[tungsten-ore]", stack_size = 200, + drop_sound = resource_drop_move, + inventory_move_sound = resource_drop_move, + pick_sound = resouce_pick, }, }) end @@ -78,6 +102,9 @@ if not data.raw.item["zinc-ore"] then subgroup = "bob-ores", order = "b-d[zinc-ore]", stack_size = 200, + drop_sound = resource_drop_move, + inventory_move_sound = resource_drop_move, + pick_sound = resouce_pick, }, }) end @@ -92,6 +119,9 @@ if not data.raw.item["bauxite-ore"] then subgroup = "bob-ores", order = "b-d[bauxite-ore]", stack_size = 200, + drop_sound = resource_drop_move, + inventory_move_sound = resource_drop_move, + pick_sound = resouce_pick, }, }) end @@ -106,6 +136,9 @@ if not data.raw.item["rutile-ore"] then subgroup = "bob-ores", order = "b-d[rutile-ore]", stack_size = 200, + drop_sound = resource_drop_move, + inventory_move_sound = resource_drop_move, + pick_sound = resouce_pick, }, }) end @@ -120,6 +153,9 @@ if not data.raw.item["quartz"] then subgroup = "bob-ores", order = "b-d[quartz]", stack_size = 200, + drop_sound = resource_drop_move, + inventory_move_sound = resource_drop_move, + pick_sound = resouce_pick, }, }) end @@ -134,6 +170,9 @@ if not data.raw.item["nickel-ore"] then subgroup = "bob-ores", order = "b-d[nickel-ore]", stack_size = 200, + drop_sound = resource_drop_move, + inventory_move_sound = resource_drop_move, + pick_sound = resouce_pick, }, }) end @@ -148,6 +187,9 @@ if not data.raw.item["cobalt-ore"] then subgroup = "bob-ores", order = "b-d[cobalt-ore]", stack_size = 200, + drop_sound = resource_drop_move, + inventory_move_sound = resource_drop_move, + pick_sound = resouce_pick, }, }) end diff --git a/bobplates/prototypes/item/parts.lua b/bobplates/prototypes/item/parts.lua index 9d3fec03a..7c8a01dc2 100644 --- a/bobplates/prototypes/item/parts.lua +++ b/bobplates/prototypes/item/parts.lua @@ -1,3 +1,32 @@ +local plate_drop_move = { + filename = "__base__/sound/item/metal-small-inventory-move.ogg", + volume = 0.8, +} +local plate_pick = { + filename = "__base__/sound/item/metal-small-inventory-pickup.ogg", + volume = 0.8, +} +local bearing_drop_move = { + filename = "__base__/sound/item/metal-small-inventory-move.ogg", + volume = 1, + speed = 1.8, +} +local bearing_pick = { + filename = "__base__/sound/item/metal-small-inventory-pickup.ogg", + volume = 1, + speed = 1.6, +} +local ball_drop_move = { + filename = "__base__/sound/item/low-density-inventory-move.ogg", + volume = 0.9, + speed = 1.6, +} +local ball_pick = { + filename = "__base__/sound/item/low-density-inventory-pickup.ogg", + volume = 0.7, + speed = 1.6, +} + data:extend({ { type = "item", @@ -7,6 +36,9 @@ data:extend({ subgroup = "bob-gears", order = "ba[steel-gear-wheel]", stack_size = 100, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, }, { @@ -17,6 +49,9 @@ data:extend({ subgroup = "bob-bearings", order = "baa[ball-bearing-steel]", stack_size = 500, + drop_sound = ball_drop_move, + inventory_move_sound = ball_drop_move, + pick_sound = ball_pick, }, { @@ -27,6 +62,9 @@ data:extend({ subgroup = "bob-bearings", order = "bba[bearing-steel]", stack_size = 100, + drop_sound = bearing_drop_move, + inventory_move_sound = bearing_drop_move, + pick_sound = bearing_pick, }, { @@ -37,6 +75,9 @@ data:extend({ subgroup = "bob-gears", order = "bb[brass-gear-wheel]", stack_size = 100, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, }, { @@ -47,6 +88,9 @@ data:extend({ subgroup = "bob-gears", order = "bc[cobalt-steel-gear-wheel]", stack_size = 100, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, }, { @@ -57,6 +101,9 @@ data:extend({ subgroup = "bob-bearings", order = "bac[ball-bearing-cobalt-steel]", stack_size = 500, + drop_sound = ball_drop_move, + inventory_move_sound = ball_drop_move, + pick_sound = ball_pick, }, { @@ -67,6 +114,9 @@ data:extend({ subgroup = "bob-bearings", order = "bbc[bearing-cobalt-steel]", stack_size = 100, + drop_sound = bearing_drop_move, + inventory_move_sound = bearing_drop_move, + pick_sound = bearing_pick, }, { @@ -77,6 +127,9 @@ data:extend({ subgroup = "bob-gears", order = "bd[titanium-gear-wheel]", stack_size = 100, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, }, { @@ -87,6 +140,9 @@ data:extend({ subgroup = "bob-bearings", order = "bad[ball-bearing-titanium]", stack_size = 500, + drop_sound = ball_drop_move, + inventory_move_sound = ball_drop_move, + pick_sound = ball_pick, }, { @@ -97,6 +153,9 @@ data:extend({ subgroup = "bob-bearings", order = "bbd[bearing-titanium]", stack_size = 100, + drop_sound = bearing_drop_move, + inventory_move_sound = bearing_drop_move, + pick_sound = bearing_pick, }, { @@ -107,6 +166,9 @@ data:extend({ subgroup = "bob-gears", order = "be[tungsten-gear-wheel]", stack_size = 100, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, }, { @@ -117,6 +179,9 @@ data:extend({ subgroup = "bob-bearings", order = "bae[ball-bearing-ceramic]", stack_size = 500, + drop_sound = ball_drop_move, + inventory_move_sound = ball_drop_move, + pick_sound = ball_pick, }, { @@ -127,6 +192,9 @@ data:extend({ subgroup = "bob-bearings", order = "bbe[bearing-ceramic]", stack_size = 100, + drop_sound = bearing_drop_move, + inventory_move_sound = bearing_drop_move, + pick_sound = bearing_pick, }, { @@ -137,6 +205,9 @@ data:extend({ subgroup = "bob-gears", order = "bf[nitinol-gear-wheel]", stack_size = 100, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, }, { @@ -147,6 +218,9 @@ data:extend({ subgroup = "bob-bearings", order = "baf[ball-bearing-nitinol]", stack_size = 500, + drop_sound = ball_drop_move, + inventory_move_sound = ball_drop_move, + pick_sound = ball_pick, }, { @@ -157,6 +231,9 @@ data:extend({ subgroup = "bob-bearings", order = "bbf[bearing-nitinol]", stack_size = 100, + drop_sound = bearing_drop_move, + inventory_move_sound = bearing_drop_move, + pick_sound = bearing_pick, }, { @@ -164,9 +241,21 @@ data:extend({ name = "lithium-ion-battery", icon = "__bobplates__/graphics/icons/lithium-ion-battery.png", icon_size = 64, - subgroup = "bob-intermediates", - order = "f-cba[lithium-ion-battery]", + subgroup = "intermediate-product", + order = "b[chemistry]-d[battery]-2", stack_size = 200, + drop_sound = { + filename = "__base__/sound/item/electric-small-inventory-move.ogg", + volume = 1, + }, + inventory_move_sound = { + filename = "__base__/sound/item/electric-small-inventory-move.ogg", + volume = 1, + }, + pick_sound = { + filename = "__base__/sound/item/electric-small-inventory-pickup.ogg", + volume = 0.7 + }, }, { @@ -174,9 +263,21 @@ data:extend({ name = "silver-zinc-battery", icon = "__bobplates__/graphics/icons/silver-zinc-battery.png", icon_size = 64, - subgroup = "bob-intermediates", - order = "f-cbb[silver-zinc-battery]", + subgroup = "intermediate-product", + order = "b[chemistry]-d[battery]-3", stack_size = 200, + drop_sound = { + filename = "__base__/sound/item/electric-small-inventory-move.ogg", + volume = 1, + }, + inventory_move_sound = { + filename = "__base__/sound/item/electric-small-inventory-move.ogg", + volume = 1, + }, + pick_sound = { + filename = "__base__/sound/item/electric-small-inventory-pickup.ogg", + volume = 0.7 + }, }, { @@ -184,9 +285,23 @@ data:extend({ name = "bob-grinding-wheel", icon = "__bobplates__/graphics/icons/grinding-wheel.png", icon_size = 32, - subgroup = "bob-intermediates", + subgroup = "intermediate-product", order = "f-cca[bob-grinding-wheel]", stack_size = 100, + drop_sound = { + filename = "__base__/sound/item/wood-inventory-move.ogg", + volume = 0.7, + speed = 1.3, + }, + inventory_move_sound = { + filename = "__base__/sound/item/wood-inventory-move.ogg", + volume = 0.7, + speed = 1.3, + }, + pick_sound = { + filename = "__base__/sound/item/explosive-inventory-move.ogg", + volume = 1, + }, }, { @@ -194,8 +309,22 @@ data:extend({ name = "bob-polishing-wheel", icon = "__bobplates__/graphics/icons/polishing-wheel.png", icon_size = 32, - subgroup = "bob-intermediates", + subgroup = "intermediate-product", order = "f-ccb[bob-polishing-wheel]", stack_size = 100, + drop_sound = { + filename = "__base__/sound/item/wood-inventory-move.ogg", + volume = 0.7, + speed = 1.3, + }, + inventory_move_sound = { + filename = "__base__/sound/item/wood-inventory-move.ogg", + volume = 0.7, + speed = 1.3, + }, + pick_sound = { + filename = "__base__/sound/item/explosive-inventory-move.ogg", + volume = 1, + }, }, }) diff --git a/bobplates/prototypes/item/plates.lua b/bobplates/prototypes/item/plates.lua index 2638576eb..f02309767 100644 --- a/bobplates/prototypes/item/plates.lua +++ b/bobplates/prototypes/item/plates.lua @@ -1,3 +1,12 @@ +local plate_drop_move = { + filename = "__base__/sound/item/metal-small-inventory-move.ogg", + volume = 0.8, +} +local plate_pick = { + filename = "__base__/sound/item/metal-small-inventory-pickup.ogg", + volume = 0.8, +} + data:extend({ { type = "item", @@ -7,6 +16,9 @@ data:extend({ subgroup = "bob-material", order = "c-a-a[tin-plate]", stack_size = 200, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, }, { type = "item", @@ -16,6 +28,9 @@ data:extend({ subgroup = "bob-material", order = "c-a-c[silver-plate]", stack_size = 200, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, }, { type = "item", @@ -43,6 +58,9 @@ data:extend({ 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, }, { type = "item", @@ -52,6 +70,9 @@ data:extend({ subgroup = "bob-material", order = "c-a-b[bob-zinc-plate]", stack_size = 200, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, }, { type = "item", @@ -70,6 +91,9 @@ data:extend({ subgroup = "bob-material", order = "c-a-h[bob-titanium-plate]", stack_size = 200, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, }, { type = "item", @@ -79,6 +103,9 @@ data:extend({ subgroup = "bob-material", order = "c-a-i[bob-tungsten-plate]", stack_size = 200, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, }, { type = "item", @@ -88,6 +115,18 @@ data:extend({ subgroup = "bob-material", order = "c-a-e[bob-silicon-plate]", stack_size = 200, + drop_sound = { + filename = "__base__/sound/item/brick-inventory-move.ogg", + volume = 0.5, + }, + inventory_move_sound = { + filename = "__base__/sound/item/brick-inventory-move.ogg", + volume = 0.5, + }, + pick_sound = { + filename = "__base__/sound/item/brick-inventory-pickup.ogg", + volume = 0.6, + }, }, { type = "item", @@ -97,6 +136,9 @@ data:extend({ subgroup = "bob-material", order = "c-a-e[lithium-plate]", stack_size = 200, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, }, { type = "item", @@ -106,5 +148,8 @@ data:extend({ subgroup = "bob-material", order = "c-a-j[cobalt-plate]", stack_size = 200, + drop_sound = plate_drop_move, + inventory_move_sound = plate_drop_move, + pick_sound = plate_pick, }, }) diff --git a/bobplates/prototypes/item/resource.lua b/bobplates/prototypes/item/resource.lua index 4a8631ec8..b997de211 100644 --- a/bobplates/prototypes/item/resource.lua +++ b/bobplates/prototypes/item/resource.lua @@ -10,6 +10,18 @@ data:extend({ fuel_value = "2MJ", --"4MJ", fuel_emissions_multiplier = 0.9, stack_size = 100, + drop_sound = { + filename = "__base__/sound/item/resource-inventory-move.ogg", + volume = 0.8, + }, + inventory_move_sound = { + filename = "__base__/sound/item/resource-inventory-move.ogg", + volume = 0.8, + }, + pick_sound = { + filename = "__base__/sound/item/resource-inventory-pickup.ogg", + volume = 0.6, + }, }, { @@ -20,6 +32,18 @@ data:extend({ subgroup = "bob-resource", order = "f[resin]", stack_size = 100, + drop_sound = { + filename = "__base__/sound/item/solid-fuel-inventory-move.ogg", + volume = 0.7, + }, + inventory_move_sound = { + filename = "__base__/sound/item/solid-fuel-inventory-move.ogg", + volume = 0.7, + }, + pick_sound = { + filename = "__base__/sound/item/solid-fuel-inventory-pickup.ogg", + volume = 0.7, + }, }, { @@ -30,6 +54,18 @@ data:extend({ subgroup = "bob-resource", order = "f[rubber]", stack_size = 100, + drop_sound = { + filename = "__base__/sound/item/solid-fuel-inventory-move.ogg", + volume = 0.7, + }, + inventory_move_sound = { + filename = "__base__/sound/item/solid-fuel-inventory-move.ogg", + volume = 0.7, + }, + pick_sound = { + filename = "__base__/sound/item/solid-fuel-inventory-pickup.ogg", + volume = 0.7, + }, }, { @@ -40,6 +76,21 @@ data:extend({ subgroup = "bob-resource", order = "f[bob-glass]", stack_size = 100, + drop_sound = { + filename = "__base__/sound/item/wood-inventory-move.ogg", + volume = 0.85, + speed = 1.6, + }, + inventory_move_sound = { + filename = "__base__/sound/item/wood-inventory-move.ogg", + volume = 0.85, + speed = 1.6, + }, + pick_sound = { + filename = "__base__/sound/item/wood-inventory-pickup.ogg", + volume = 0.85, + speed = 1.6, + }, }, { @@ -50,6 +101,18 @@ data:extend({ subgroup = "bob-resource", order = "f[silicon-wafer]", stack_size = 500, + drop_sound = { + filename = "__base__/sound/item/planner-inventory-move.ogg", + volume = 0.5, + }, + inventory_move_sound = { + filename = "__base__/sound/item/planner-inventory-move.ogg", + volume = 0.5, + }, + pick_sound = { + filename = "__base__/sound/item/planner-inventory-pickup.ogg", + volume = 0.5, + }, }, { @@ -60,6 +123,21 @@ data:extend({ subgroup = "bob-resource", order = "c-b[lithium-cobalt-oxide]", stack_size = 100, + drop_sound = { + filename = "__base__/sound/item/sulfur-inventory-move.ogg", + volume = 0.7, + speed = 1.3, + }, + inventory_move_sound = { + filename = "__base__/sound/item/sulfur-inventory-move.ogg", + volume = 0.7, + speed = 1.3, + }, + pick_sound = { + filename = "__base__/sound/item/landfill-inventory-pickup.ogg", + volume = 0.6, + speed = 1.2, + }, }, { @@ -70,6 +148,18 @@ data:extend({ subgroup = "bob-resource", order = "f[bob-polishing-compound]", stack_size = 100, + drop_sound = { + filename = "__base__/sound/item/fluid-inventory-move.ogg", + volume = 0.6, + }, + inventory_move_sound = { + filename = "__base__/sound/item/fluid-inventory-move.ogg", + volume = 0.6, + }, + pick_sound = { + filename = "__base__/sound/item/fluid-inventory-pickup.ogg", + volume = 0.5, + }, }, { @@ -77,9 +167,21 @@ data:extend({ name = "gas-canister", icon = "__bobplates__/graphics/icons/gas-canister.png", icon_size = 32, - subgroup = "bob-intermediates", - order = "f-b[gas-canister]", + subgroup = "intermediate-product", + order = "a[basic-intermediates]-d[gas-canister]", stack_size = 10, + drop_sound = { + filename = "__base__/sound/item/metal-chest-inventory-move.ogg", + volume = 0.6, + }, + inventory_move_sound = { + filename = "__base__/sound/item/metal-chest-inventory-move.ogg", + volume = 0.6, + }, + pick_sound = { + filename = "__base__/sound/item/metal-chest-inventory-pickup.ogg", + volume = 0.6, + }, }, { @@ -87,9 +189,21 @@ data:extend({ name = "empty-canister", icon = "__bobplates__/graphics/icons/empty-canister.png", icon_size = 32, - subgroup = "bob-intermediates", - order = "f-c[empty-canister]", + subgroup = "intermediate-product", + order = "a[basic-intermediates]-d[fluid-canister]", stack_size = 10, + drop_sound = { + filename = "__base__/sound/item/plastic-inventory-move.ogg", + volume = 0.5, + }, + inventory_move_sound = { + filename = "__base__/sound/item/plastic-inventory-move.ogg", + volume = 0.5, + }, + pick_sound = { + filename = "__base__/sound/item/plastic-inventory-pickup.ogg", + volume = 0.7, + }, }, { @@ -113,8 +227,20 @@ data:extend({ fuel_acceleration_multiplier = 1.5, fuel_top_speed_multiplier = 1.1, fuel_emissions_multiplier = 0.7, - subgroup = "bob-resource", + subgroup = "bob-chemical-fuels", order = "d[enriched-fuel]", stack_size = 20, + drop_sound = { + filename = "__base__/sound/item/solid-fuel-inventory-move.ogg", + volume = 0.7, + }, + inventory_move_sound = { + filename = "__base__/sound/item/solid-fuel-inventory-move.ogg", + volume = 0.7, + }, + pick_sound = { + filename = "__base__/sound/item/solid-fuel-inventory-pickup.ogg", + volume = 0.7, + }, }, }) diff --git a/bobplates/prototypes/recipe/chemistry-recipe.lua b/bobplates/prototypes/recipe/chemistry-recipe.lua index d458d7f49..adc7f66bb 100644 --- a/bobplates/prototypes/recipe/chemistry-recipe.lua +++ b/bobplates/prototypes/recipe/chemistry-recipe.lua @@ -189,7 +189,7 @@ data:extend({ results = { { type = "item", name = "sodium-hydroxide", amount = 1 }, { type = "fluid", name = "chlorine", amount = 25 }, - { type = "fluid", name = "hydrogen", amount = 20 }, + { type = "fluid", name = "hydrogen", amount = 10 }, }, allow_decomposition = false, allow_productivity = true, @@ -292,33 +292,6 @@ data:extend({ allow_productivity = true, }, - { - type = "recipe", - name = "tungstic-acid", - icon = "__bobplates__/graphics/icons/tungstic-acid.png", - icon_size = 32, - subgroup = "bob-fluid", - order = "b[fluid-chemistry]-b[tungstic-acid]", - category = "chemistry", - enabled = false, - energy_required = 2, - ingredients = { - { type = "item", name = "tungsten-ore", amount = 2 }, - { type = "fluid", name = "hydrogen-chloride", amount = 25 }, - }, - results = { - { type = "fluid", name = "tungstic-acid", amount = 20 }, - { type = "item", name = "calcium-chloride", amount = 1 }, - }, - main_product = "tungstic-acid", - crafting_machine_tint = { - primary = { r = 0.0, g = 0.2, b = 0.7, a = 0.000 }, - secondary = { r = 0.0, g = 0.7, b = 0.7, a = 0.000 }, - tertiary = { r = 0.0, g = 0.0, b = 0.7, a = 0.000 }, - }, - allow_productivity = true, - }, - { type = "recipe", name = "ferric-chloride-solution", @@ -475,8 +448,8 @@ data:extend({ name = "coal-cracking", icon = "__bobplates__/graphics/icons/coal-cracking.png", icon_size = 32, - subgroup = "bob-fluid", - order = "b[fluid-chemistry]-a[coal-cracking]", + subgroup = "fluid-recipes", + order = "a[oil-processing]-c[coal-cracking]", category = "chemistry", enabled = false, energy_required = 3, @@ -597,6 +570,7 @@ data:extend({ category = "chemistry", enabled = false, energy_required = 2, + emissions_multiplier = 0.25, ingredients = { { type = "item", name = "lead-ore", amount = 1 }, { type = "fluid", name = "oxygen", amount = 10 }, @@ -656,20 +630,6 @@ data:extend({ allow_productivity = true, }, - { - type = "recipe", - name = "tungsten-oxide", - subgroup = "bob-material-chemical", - category = "chemical-furnace", - energy_required = 2, - enabled = false, - ingredients = { - { type = "fluid", name = "tungstic-acid", amount = 10 }, - }, - results = { { type = "item", name = "tungsten-oxide", amount = 1 } }, - allow_productivity = true, - }, - { type = "recipe", name = "powdered-tungsten", @@ -775,6 +735,7 @@ data:extend({ category = "chemistry", enabled = false, energy_required = 2, + emissions_multiplier = 0.25, ingredients = { { type = "item", name = "lead-ore", amount = 1 }, { type = "fluid", name = "water", amount = 4 }, @@ -915,3 +876,78 @@ data:extend({ allow_productivity = true, }, }) + +if not feature_flags["quality"] then + data:extend({ + + { + type = "recipe", + name = "tungstic-acid", + icon = "__bobplates__/graphics/icons/tungstic-acid.png", + icon_size = 32, + subgroup = "bob-fluid", + order = "b[fluid-chemistry]-b[tungstic-acid]", + category = "chemistry", + enabled = false, + energy_required = 2, + ingredients = { + { type = "item", name = "tungsten-ore", amount = 2 }, + { type = "fluid", name = "hydrogen-chloride", amount = 50 }, + }, + results = { + { type = "fluid", name = "tungstic-acid", amount = 20 }, + { type = "item", name = "calcium-chloride", amount = 1 }, + }, + main_product = "tungstic-acid", + crafting_machine_tint = { + primary = { r = 0.0, g = 0.2, b = 0.7, a = 0.000 }, + secondary = { r = 0.0, g = 0.7, b = 0.7, a = 0.000 }, + tertiary = { r = 0.0, g = 0.0, b = 0.7, a = 0.000 }, + }, + allow_productivity = true, + }, + + { + type = "recipe", + name = "tungsten-oxide", + subgroup = "bob-material-chemical", + category = "chemical-furnace", + energy_required = 2, + enabled = false, + ingredients = { + { type = "fluid", name = "tungstic-acid", amount = 10 }, + }, + results = { { type = "item", name = "tungsten-oxide", amount = 1 } }, + allow_productivity = true, + }, + + }) +else + data:extend({ + + { + type = "recipe", + name = "tungsten-oxide", + subgroup = "bob-material-chemical", + category = "chemistry", + enabled = false, + energy_required = 4, + ingredients = { + { type = "item", name = "tungsten-ore", amount = 2 }, + { type = "fluid", name = "hydrogen-chloride", amount = 50 }, + }, + results = { + { type = "item", name = "tungsten-oxide", amount = 2 }, + { type = "item", name = "calcium-chloride", amount = 1 }, + }, + main_product = "tungsten-oxide", + crafting_machine_tint = { + primary = { r = 0.0, g = 0.2, b = 0.7, a = 0.000 }, + secondary = { r = 0.0, g = 0.7, b = 0.7, a = 0.000 }, + tertiary = { r = 0.0, g = 0.0, b = 0.7, a = 0.000 }, + }, + allow_productivity = true, + }, + + }) +end diff --git a/bobplates/prototypes/recipe/parts-recipe.lua b/bobplates/prototypes/recipe/parts-recipe.lua index 4479455e4..3a58c8492 100644 --- a/bobplates/prototypes/recipe/parts-recipe.lua +++ b/bobplates/prototypes/recipe/parts-recipe.lua @@ -4,7 +4,7 @@ data:extend({ name = "steel-gear-wheel", enabled = false, ingredients = { - { type = "item", name = "steel-plate", amount = 1 }, + { type = "item", name = "steel-plate", amount = 2 }, }, results = { { type = "item", name = "steel-gear-wheel", amount = 1 } }, allow_productivity = true, @@ -38,7 +38,7 @@ data:extend({ name = "brass-gear-wheel", enabled = false, ingredients = { - { type = "item", name = "brass-alloy", amount = 1 }, + { type = "item", name = "brass-alloy", amount = 2 }, }, results = { { type = "item", name = "brass-gear-wheel", amount = 1 } }, allow_productivity = true, @@ -49,7 +49,7 @@ data:extend({ name = "cobalt-steel-gear-wheel", enabled = false, ingredients = { - { type = "item", name = "cobalt-steel-alloy", amount = 1 }, + { type = "item", name = "cobalt-steel-alloy", amount = 2 }, }, results = { { type = "item", name = "cobalt-steel-gear-wheel", amount = 1 } }, allow_productivity = true, @@ -83,7 +83,7 @@ data:extend({ name = "titanium-gear-wheel", enabled = false, ingredients = { - { type = "item", name = "bob-titanium-plate", amount = 1 }, + { type = "item", name = "bob-titanium-plate", amount = 2 }, }, results = { { type = "item", name = "titanium-gear-wheel", amount = 1 } }, allow_productivity = true, @@ -119,7 +119,7 @@ data:extend({ name = "tungsten-gear-wheel", enabled = false, ingredients = { - { type = "item", name = "bob-tungsten-plate", amount = 1 }, + { type = "item", name = "bob-tungsten-plate", amount = 2 }, }, results = { { type = "item", name = "tungsten-gear-wheel", amount = 1 } }, allow_productivity = true, @@ -130,7 +130,7 @@ data:extend({ name = "nitinol-gear-wheel", enabled = false, ingredients = { - { type = "item", name = "nitinol-alloy", amount = 1 }, + { type = "item", name = "nitinol-alloy", amount = 2 }, }, results = { { type = "item", name = "nitinol-gear-wheel", amount = 1 } }, allow_productivity = true, diff --git a/bobplates/prototypes/recipe/plates-recipe.lua b/bobplates/prototypes/recipe/plates-recipe.lua index 678aa60e5..a264e5c94 100644 --- a/bobplates/prototypes/recipe/plates-recipe.lua +++ b/bobplates/prototypes/recipe/plates-recipe.lua @@ -5,6 +5,7 @@ data:extend({ category = "smelting", subgroup = "bob-material-smelting", energy_required = 3.2, + emissions_multiplier = 10, ingredients = { { type = "item", name = "lead-ore", amount = 1 } }, results = { { type = "item", name = "bob-lead-plate", amount = 1 } }, allow_decomposition = false, @@ -37,7 +38,7 @@ data:extend({ { type = "recipe", - name = "bob-lead-plate", + name = "bob-lead-plate-2", category = "chemical-furnace", subgroup = "bob-material-chemical", energy_required = 6.4, diff --git a/bobplates/prototypes/recipe/resource-recipe.lua b/bobplates/prototypes/recipe/resource-recipe.lua index 051c28643..d34c2ac5a 100644 --- a/bobplates/prototypes/recipe/resource-recipe.lua +++ b/bobplates/prototypes/recipe/resource-recipe.lua @@ -167,7 +167,6 @@ data:extend({ type = "recipe", name = "gas-canister", category = "crafting", - subgroup = "bob-intermediates", energy_required = 1, enabled = false, ingredients = { @@ -181,7 +180,6 @@ data:extend({ type = "recipe", name = "empty-canister", category = "crafting", - subgroup = "bob-intermediates", energy_required = 1, enabled = false, ingredients = { @@ -222,6 +220,8 @@ data:extend({ { type = "item", name = "wood", amount = 2 }, }, results = { { type = "item", name = "coal", amount = 1 } }, + subgroup = "bob-resource", + order = "c", allow_decomposition = false, }, @@ -237,9 +237,11 @@ data:extend({ results = { { type = "item", name = "solid-fuel", amount = 1 }, }, - icon = "__bobplates__/graphics/icons/solid-fuel-from-hydrogen.png", - icon_size = 32, - subgroup = "bob-resource-chemical", + icons = { + { icon = "__base__/graphics/icons/solid-fuel.png", icon_size = 64}, + { icon = "__bobplates__/graphics/icons/hydrogen.png", icon_size = 64, scale = 0.25, shift = {-8, -8}, } + }, + subgroup = "bob-chemical-fuels", enabled = false, order = "b[fluid-chemistry]-c[solid-fuel-from-hydrogen]", crafting_machine_tint = { @@ -262,7 +264,7 @@ data:extend({ { type = "fluid", name = "liquid-fuel", amount = 20 }, }, results = { { type = "item", name = "enriched-fuel", amount = 1 } }, - subgroup = "bob-resource-chemical", + subgroup = "bob-chemical-fuels", order = "d[enriched-fuel]", crafting_machine_tint = { primary = { r = 0.9, g = 0.9, b = 0.9, a = 0.000 }, diff --git a/bobplates/prototypes/technology-updates.lua b/bobplates/prototypes/technology-updates.lua index fc627fa36..7a7b4cf62 100644 --- a/bobplates/prototypes/technology-updates.lua +++ b/bobplates/prototypes/technology-updates.lua @@ -46,7 +46,7 @@ bobmods.lib.tech.add_recipe_unlock("zinc-processing", "brass-gear-wheel") bobmods.lib.tech.add_recipe_unlock("lead-processing", "lead-oxide") bobmods.lib.tech.add_recipe_unlock("lead-processing", "lead-oxide-2") -bobmods.lib.tech.add_recipe_unlock("lead-processing", "bob-lead-plate") +bobmods.lib.tech.add_recipe_unlock("lead-processing", "bob-lead-plate-2") bobmods.lib.tech.add_recipe_unlock("lead-processing", "silver-from-lead") bobmods.lib.tech.add_prerequisite("lead-processing", "nickel-processing") @@ -61,7 +61,9 @@ bobmods.lib.tech.add_recipe_unlock("silicon-processing", "silicon-powder") bobmods.lib.tech.add_recipe_unlock("titanium-processing", "bob-titanium-plate") -bobmods.lib.tech.add_recipe_unlock("tungsten-processing", "tungstic-acid") +if data.raw.recipe["tungstic-acid"] then + bobmods.lib.tech.add_recipe_unlock("tungsten-processing", "tungstic-acid") +end bobmods.lib.tech.add_recipe_unlock("tungsten-processing", "tungsten-oxide") bobmods.lib.tech.add_recipe_unlock("tungsten-processing", "powdered-tungsten") bobmods.lib.tech.add_recipe_unlock("tungsten-processing", "bob-tungsten-plate") diff --git a/bobplates/settings.lua b/bobplates/settings.lua index 7b55210f6..695697b5e 100644 --- a/bobplates/settings.lua +++ b/bobplates/settings.lua @@ -66,12 +66,12 @@ data:extend({ type = "bool-setting", name = "bobmods-plates-convert-recipes", setting_type = "startup", - default_value = true, + default_value = false, }, { type = "bool-setting", name = "bobmods-plates-expensive-electrolysis", setting_type = "startup", - default_value = false, + default_value = true, }, }) diff --git a/bobrevamp/data-updates.lua b/bobrevamp/data-updates.lua index 01dcd51a5..344cd958f 100644 --- a/bobrevamp/data-updates.lua +++ b/bobrevamp/data-updates.lua @@ -16,6 +16,9 @@ if data.raw.item["titanium-pipe"] then end if data.raw.item["advanced-processing-unit"] then bobmods.lib.recipe.replace_ingredient("rocket-silo", "processing-unit", "advanced-processing-unit") + bobmods.lib.recipe.replace_ingredient("rocket-part", "processing-unit", "advanced-processing-unit") + bobmods.lib.recipe.replace_ingredient("satellite", "processing-unit", "advanced-processing-unit") + bobmods.lib.recipe.replace_ingredient("cargo-landing-pad", "processing-unit", "advanced-processing-unit") end if data.raw.item["nitinol-alloy"] then bobmods.lib.tech.add_prerequisite("rocket-silo", "nitinol-processing") @@ -25,6 +28,8 @@ end bobmods.lib.recipe.add_ingredient("rocket-silo", { type = "item", name = "low-density-structure", amount = 50 }) bobmods.lib.recipe.add_ingredient("rocket-silo", { type = "item", name = "rocket-control-unit", amount = 25 }) bobmods.lib.recipe.add_ingredient("rocket-silo", { type = "item", name = "heat-shield-tile", amount = 100 }) +bobmods.lib.recipe.add_ingredient("cargo-landing-pad", { type = "item", name = "heat-shield-tile", amount = 100 }) +bobmods.lib.recipe.add_ingredient("cargo-landing-pad", { type = "item", name = "electric-engine-unit", amount = 40 }) -- oil overhaul if settings.startup["bobmods-revamp-old-oil"].value == true or settings.startup["bobmods-revamp-oil"].value == true then @@ -126,8 +131,8 @@ if settings.startup["bobmods-revamp-oil"].value == true then end end - if data.raw["item-subgroup"]["bob-resource-chemical"] then - data.raw.recipe["solid-fuel-from-sour-gas"].subgroup = "bob-resource-chemical" + if data.raw["item-subgroup"]["bob-chemical-fuels"] then + data.raw.recipe["solid-fuel-from-sour-gas"].subgroup = "bob-chemical-fuels" end if data.raw["item-subgroup"]["bob-fluid"] then data.raw.recipe["petroleum-gas-sweetening"].subgroup = "bob-fluid" @@ -164,7 +169,7 @@ then data.raw.reactor["nuclear-reactor"].localised_name = { "entity-name.uranium-reactor" } data.raw["fuel-category"]["nuclear"].localised_name = { "fuel-category-name.uranium" } data.raw.reactor["nuclear-reactor"].localised_description = - { "", { "entity-description.uranium-reactor" }, { "entity-description.reactor-max-temperature", 1000 } } + { "", { "entity-description.uranium-reactor" }, { "entity-description.reactor-max-temperature", "1000" } } data:extend({ { @@ -172,10 +177,10 @@ then name = "thorium", }, }) - data.raw.reactor["nuclear-reactor-2"].energy_source.fuel_category = "thorium" + data.raw.reactor["nuclear-reactor-2"].energy_source.fuel_categories = { "thorium" } data.raw.reactor["nuclear-reactor-2"].localised_name = { "entity-name.thorium-reactor" } data.raw.reactor["nuclear-reactor-2"].localised_description = - { "", { "entity-description.thorium-reactor" }, { "entity-description.reactor-max-temperature", 1250 } } + { "", { "entity-description.thorium-reactor" }, { "entity-description.reactor-max-temperature", "1250" } } data.raw.reactor["nuclear-reactor-2"].default_fuel_glow_color = { r = 1.0, g = 1.0, b = 0.0 } data.raw.reactor["nuclear-reactor-2"].icon = "__bobrevamp__/graphics/icons/thorium-reactor.png" data.raw.reactor["nuclear-reactor-2"].icon_size = 32 @@ -207,6 +212,10 @@ then bobmods.lib.tech.add_recipe_unlock("bob-nuclear-power-2", "thorium-fuel-cell") bobmods.lib.tech.remove_prerequisite("thorium-fuel-reprocessing", "production-science-pack") bobmods.lib.tech.replace_prerequisite("thorium-fuel-reprocessing", "thorium-processing", "bob-nuclear-power-2") + + if feature_flags["quality"] then + bobmods.lib.recipe.update_recycling_recipe_single("nuclear-reactor-2", true) + end end if @@ -220,10 +229,10 @@ then name = "deuterium", }, }) - data.raw.reactor["nuclear-reactor-3"].energy_source.fuel_category = "deuterium" + data.raw.reactor["nuclear-reactor-3"].energy_source.fuel_categories = { "deuterium" } data.raw.reactor["nuclear-reactor-3"].localised_name = { "entity-name.deuterium-reactor" } data.raw.reactor["nuclear-reactor-3"].localised_description = - { "", { "entity-description.deuterium-reactor" }, { "entity-description.reactor-max-temperature", 1500 } } + { "", { "entity-description.deuterium-reactor" }, { "entity-description.reactor-max-temperature", "1500" } } data.raw.reactor["nuclear-reactor-3"].icon_size = 32 data.raw.item["deuterium-fuel-cell"].fuel_category = "deuterium" @@ -266,4 +275,26 @@ then data.raw.technology["bob-nuclear-power-3"].icon = "__bobrevamp__/graphics/icons/technology/deuterium-nuclear-power.png" end + + if feature_flags["quality"] then + bobmods.lib.recipe.update_recycling_recipe_single("nuclear-reactor-3", true) + end +end + +if feature_flags["quality"] then + if data.raw.recipe["sodium-chlorate"] then + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("sodium-chlorate", false) + bobmods.lib.recipe.update_recycling_recipe_to_self_recipe("sodium-perchlorate", false) + data.raw.recipe["sodium-chlorate"].energy_required = 6 + data.raw.recipe["sodium-perchlorate"].energy_required = 2 + end + + bobmods.lib.recipe.update_recycling_recipe({ + "low-density-structure", + "heat-shield-tile", + "rocket-silo", + "rocket-part", + "satellite", + "cargo-landing-pad", + }) end diff --git a/bobrevamp/data.lua b/bobrevamp/data.lua index 8130f126a..750efa254 100644 --- a/bobrevamp/data.lua +++ b/bobrevamp/data.lua @@ -148,6 +148,7 @@ if settings.startup["bobmods-revamp-oil"].value == true then name = "sour-gas", icon = "__bobrevamp__/graphics/icons/sour-gas.png", icon_size = 64, + subgroup = "bob-fluid", default_temperature = 25, heat_capacity = "0.1kJ", base_color = { r = 0.4, g = 0.1, b = 0.3 }, @@ -182,11 +183,13 @@ if settings.startup["bobmods-revamp-oil"].value == true then { type = "recipe", name = "solid-fuel-from-sour-gas", - icon = "__bobrevamp__/graphics/icons/solid-fuel-from-sour-gas.png", - icon_size = 32, + icons = { + {icon = "__base__/graphics/icons/solid-fuel.png", icon_size = 64}, + {icon = "__bobrevamp__/graphics/icons/sour-gas.png", icon_size = 64, scale = 0.25, shift = {-8, -8}} + }, category = "chemistry", subgroup = "fluid-recipes", - order = "b[fluid-chemistry]-d[solid-fuel-from-sour-gas]", + order = "b[fluid-chemistry]-c[solid-fuel-from-i-sour-gas]", enabled = false, energy_required = 2, emissions_multiplier = 2, diff --git a/bobrevamp/locale/en/bobrevamp.cfg b/bobrevamp/locale/en/bobrevamp.cfg index e37ccfd1e..30b6b4e37 100644 --- a/bobrevamp/locale/en/bobrevamp.cfg +++ b/bobrevamp/locale/en/bobrevamp.cfg @@ -55,11 +55,12 @@ oil-processing-with-sulfur-dioxide=Oil processing with Sulfur dioxide oil-processing-with-sulfur-dioxide-2=Oil processing with Sulfur dioxide oil-processing-with-sulfur-dioxide-3=Oil processing with Sulfur dioxide carbon-dioxide-oil-processing=Carbon dioxide mediated oil processing +enriched-fuel-from-hydrazine=Enriched fuel block petroleum-gas-sweetening=__FLUID__petroleum-gas_ sweetening solid-fuel-from-sour-gas=Solid fuel from Sour gas -ammonium-chloride-recycling=Ammonium chloride recycling +bob-ammonium-chloride-recycling=Ammonium chloride recycling brine-electrolysis=Brine electrolysis diff --git a/bobrevamp/migrations/bobrevamp_1.3.0.json b/bobrevamp/migrations/bobrevamp_1.3.0.json new file mode 100644 index 000000000..12a76714c --- /dev/null +++ b/bobrevamp/migrations/bobrevamp_1.3.0.json @@ -0,0 +1,6 @@ +{ + "recipe": + [ + ["ammonium-chloride-recycling", "bob-ammonium-chloride-recycling"] + ] +} diff --git a/bobrevamp/prototypes/hard-mode.lua b/bobrevamp/prototypes/hard-mode.lua index 59cb4588f..b5cd4b04e 100644 --- a/bobrevamp/prototypes/hard-mode.lua +++ b/bobrevamp/prototypes/hard-mode.lua @@ -1,10 +1,22 @@ if bobmods.plates and settings.startup["bobmods-revamp-hardmode"].value == true then + local powder_drop_move = { + filename = "__base__/sound/item/sulfur-inventory-move.ogg", + volume = 0.7, + speed = 1.3, + } + local powder_pick = { + filename = "__base__/sound/item/landfill-inventory-pickup.ogg", + volume = 0.6, + speed = 1.2, + } + data:extend({ { type = "fluid", name = "carbon-dioxide", icon = "__bobrevamp__/graphics/icons/carbon-dioxide.png", icon_size = 64, + subgroup = "bob-fluid", order = "a[fluid]-g[carbon-dioxide]", default_temperature = 15, max_temperature = 100, @@ -22,6 +34,18 @@ if bobmods.plates and settings.startup["bobmods-revamp-hardmode"].value == true subgroup = "bob-resource-chemical", order = "f[limestone]", stack_size = 100, + drop_sound = { + filename = "__base__/sound/item/resource-inventory-move.ogg", + volume = 0.8, + }, + inventory_move_sound = { + filename = "__base__/sound/item/resource-inventory-move.ogg", + volume = 0.8, + }, + pick_sound = { + filename = "__base__/sound/item/resource-inventory-pickup.ogg", + volume = 0.6, + }, }, { type = "item", @@ -31,6 +55,9 @@ if bobmods.plates and settings.startup["bobmods-revamp-hardmode"].value == true subgroup = "bob-resource-chemical", order = "f[sodium-chlorate]", stack_size = 100, + drop_sound = powder_drop_move, + inventory_move_sound = powder_drop_move, + pick_sound = powder_pick, }, { type = "item", @@ -40,6 +67,9 @@ if bobmods.plates and settings.startup["bobmods-revamp-hardmode"].value == true subgroup = "bob-resource-chemical", order = "f[sodium-perchlorate]", stack_size = 100, + drop_sound = powder_drop_move, + inventory_move_sound = powder_drop_move, + pick_sound = powder_pick, }, { diff --git a/bobrevamp/prototypes/rocket-fuel.lua b/bobrevamp/prototypes/rocket-fuel.lua index 240817d5e..93ecaa20d 100644 --- a/bobrevamp/prototypes/rocket-fuel.lua +++ b/bobrevamp/prototypes/rocket-fuel.lua @@ -5,6 +5,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen name = "ammonia", icon = "__bobrevamp__/graphics/icons/ammonia.png", icon_size = 64, + subgroup = "bob-fluid", order = "a[fluid]-g[ammonia]", default_temperature = 15, max_temperature = 100, @@ -19,6 +20,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen name = "dinitrogen-tetroxide", icon = "__bobrevamp__/graphics/icons/dinitrogen-tetroxide.png", icon_size = 64, + subgroup = "bob-fluid", order = "a[fluid]-g[dinitrogen-tetroxide]", default_temperature = 15, max_temperature = 100, @@ -33,6 +35,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen name = "hydrazine", icon = "__bobrevamp__/graphics/icons/hydrazine.png", icon_size = 64, + subgroup = "bob-fluid", order = "a[fluid]-g[hydrazine]", default_temperature = 15, max_temperature = 100, @@ -49,6 +52,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen name = "hydrogen-peroxide", icon = "__bobrevamp__/graphics/icons/hydrogen-peroxide.png", icon_size = 64, + subgroup = "bob-fluid", order = "a[fluid]-g[hydrogen-peroxide]", default_temperature = 15, max_temperature = 100, @@ -66,6 +70,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen name = "nitrogen-dioxide", icon = "__bobrevamp__/graphics/icons/nitrogen-dioxide.png", icon_size = 64, + subgroup = "bob-fluid", order = "a[fluid]-g[nitrogen-dioxide]", default_temperature = 25, max_temperature = 100, @@ -220,6 +225,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen name = "nitric-oxide", icon = "__bobrevamp__/graphics/icons/nitric-oxide.png", icon_size = 64, + subgroup = "bob-fluid", order = "a[fluid]-g[nitric-oxide]", default_temperature = 15, max_temperature = 100, @@ -297,8 +303,8 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen { type = "item", name = "solid-fuel", amount = 1 }, }, results = { { type = "item", name = "enriched-fuel", amount = 1 } }, - subgroup = "bob-resource-chemical", - order = "d[enriched-fuel]", + subgroup = "bob-chemical-fuels", + order = "d[enriched-fuel]-2", crafting_machine_tint = { primary = { r = 0.9, g = 0.9, b = 0.9, a = 0.000 }, secondary = { r = 0.8, g = 0.8, b = 0.8, a = 0.000 }, diff --git a/bobrevamp/prototypes/rocket-parts-updates.lua b/bobrevamp/prototypes/rocket-parts-updates.lua index d68b868c1..5b30cf736 100644 --- a/bobrevamp/prototypes/rocket-parts-updates.lua +++ b/bobrevamp/prototypes/rocket-parts-updates.lua @@ -26,59 +26,30 @@ bobmods.lib.tech.remove_prerequisite("low-density-structure", "advanced-material bobmods.lib.tech.remove_prerequisite("rocket-silo", "productivity-module-3") if data.raw.technology["advanced-processing-unit"] then - bobmods.lib.tech.replace_prerequisite("rocket-silo", "processing-unit", "advanced-processing-unit") + bobmods.lib.tech.add_prerequisite("rocket-silo", "advanced-processing-unit") + bobmods.lib.tech.remove_prerequisite("rocket-silo", "processing-unit") bobmods.lib.tech.remove_prerequisite("rocket-silo", "speed-module-3") end -if - data.raw.item["basic-electronic-components"] - and data.raw.item["electronic-components"] - and data.raw.item["intergrated-electronics"] - and data.raw.item["processing-electronics"] -then - data.raw.recipe["rocket-control-unit"].ingredients = { - { type = "item", name = "basic-electronic-components", amount = 4 }, - { type = "item", name = "electronic-components", amount = 6 }, - { type = "item", name = "intergrated-electronics", amount = 4 }, - { type = "item", name = "processing-electronics", amount = 8 }, - } - if data.raw.item["solder"] then - bobmods.lib.recipe.add_ingredient("rocket-control-unit", { type = "item", name = "solder", amount = 5 }) - end - if data.raw.item["multi-layer-circuit-board"] then - bobmods.lib.recipe.add_ingredient( - "rocket-control-unit", - { type = "item", name = "multi-layer-circuit-board", amount = 2 } - ) - end - bobmods.lib.tech.replace_prerequisite("rocket-control-unit", "speed-module", "advanced-processing-unit") -elseif data.raw.item["advanced-processing-unit"] then - bobmods.lib.recipe.replace_ingredient("rocket-control-unit", "speed-module", "advanced-processing-unit") - bobmods.lib.tech.replace_prerequisite("rocket-control-unit", "speed-module", "advanced-processing-unit") -end -bobmods.lib.tech.add_science_pack("rocket-control-unit", "production-science-pack", 1) - -bobmods.lib.recipe.replace_ingredient("satellite", "processing-unit", "rocket-control-unit") - if data.raw.item.rtg then bobmods.lib.recipe.set_ingredient("satellite", { type = "item", name = "accumulator", amount = 50 }) bobmods.lib.recipe.remove_ingredient("satellite", "solar-panel") - bobmods.lib.tech.remove_prerequisite("space-science-pack", "solar-energy") + bobmods.lib.tech.remove_prerequisite("rocket-silo", "solar-energy") bobmods.lib.recipe.add_ingredient("satellite", { type = "item", name = "rtg", amount = 10 }) - bobmods.lib.tech.add_prerequisite("space-science-pack", "rtg") + bobmods.lib.tech.add_prerequisite("rocket-silo", "rtg") elseif data.raw.item["solar-panel-3"] then bobmods.lib.recipe.replace_ingredient("satellite", "solar-panel", "solar-panel-3") - bobmods.lib.tech.add_prerequisite("space-science-pack", "bob-solar-energy-3") - bobmods.lib.tech.remove_prerequisite("space-science-pack", "solar-energy") + bobmods.lib.tech.add_prerequisite("rocket-silo", "bob-solar-energy-3") + bobmods.lib.tech.remove_prerequisite("rocket-silo", "solar-energy") end if data.raw.item["silver-zinc-battery"] then bobmods.lib.recipe.replace_ingredient("satellite", "accumulator", "silver-zinc-battery") - bobmods.lib.tech.add_prerequisite("space-science-pack", "battery-3") - bobmods.lib.tech.remove_prerequisite("space-science-pack", "electric-energy-accumulators") + bobmods.lib.tech.add_prerequisite("rocket-silo", "battery-3") + bobmods.lib.tech.remove_prerequisite("rocket-silo", "electric-energy-accumulators") end if data.raw.item["radar-5"] then bobmods.lib.recipe.replace_ingredient("satellite", "radar", "radar-5") - bobmods.lib.tech.add_prerequisite("space-science-pack", "radars-5") + bobmods.lib.tech.replace_prerequisite("rocket-silo", "radar", "radars-5") end diff --git a/bobrevamp/prototypes/rocket-parts.lua b/bobrevamp/prototypes/rocket-parts.lua index 4ba7573b4..31ae2982b 100644 --- a/bobrevamp/prototypes/rocket-parts.lua +++ b/bobrevamp/prototypes/rocket-parts.lua @@ -7,11 +7,23 @@ data:extend({ subgroup = "intermediate-product", order = "m[heat-shield-tile]", stack_size = 100, + drop_sound = { + filename = "__base__/sound/item/metal-large-inventory-move.ogg", + volume = 0.7 + }, + inventory_move_sound = { + filename = "__base__/sound/item/metal-large-inventory-move.ogg", + volume = 0.7 + }, + pick_sound = { + filename = "__base__/sound/item/metal-large-inventory-pickup.ogg", + volume = 0.7 + }, }, { type = "recipe", name = "heat-shield-tile", - category = "crafting-with-fluid", + category = "advanced-crafting", energy_required = 30, enabled = false, ingredients = { diff --git a/bobrevamp/prototypes/rtg-updates.lua b/bobrevamp/prototypes/rtg-updates.lua index 74352c0ab..1d6409e36 100644 --- a/bobrevamp/prototypes/rtg-updates.lua +++ b/bobrevamp/prototypes/rtg-updates.lua @@ -6,22 +6,24 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then { type = "fluid", name = "carbon-dioxide", amount = 150, ignored_by_productivity = 150 } ) - bobmods.lib.recipe.remove_result("sodium-carbonate", "water") - bobmods.lib.recipe.add_result( - "sodium-carbonate", - { type = "fluid", name = "pure-water", amount = 10, fluidbox_index = 1, ignored_by_productivity = 10 } - ) + if data.raw.fluid["pure-water"] then + bobmods.lib.recipe.remove_result("sodium-carbonate", "water") + bobmods.lib.recipe.add_result( + "sodium-carbonate", + { type = "fluid", name = "pure-water", amount = 10, fluidbox_index = 1, ignored_by_productivity = 10 } + ) - bobmods.lib.recipe.remove_result("ammonium-chloride-recycling", "water") - bobmods.lib.recipe.add_result("ammonium-chloride-recycling", { type = "fluid", name = "pure-water", amount = 10 }) + bobmods.lib.recipe.remove_result("bob-ammonium-chloride-recycling", "water") + bobmods.lib.recipe.add_result("bob-ammonium-chloride-recycling", { type = "fluid", name = "pure-water", amount = 10 }) - bobmods.lib.recipe.replace_ingredient("brine", "water", "pure-water") + bobmods.lib.recipe.replace_ingredient("brine", "water", "pure-water") + end bobmods.lib.tech.add_recipe_unlock("rtg", "brine-electrolysis") bobmods.lib.tech.add_recipe_unlock("rtg", "brine") bobmods.lib.tech.add_recipe_unlock("rtg", "ammoniated-brine") bobmods.lib.tech.add_recipe_unlock("rtg", "sodium-bicarbonate") - bobmods.lib.tech.add_recipe_unlock("rtg", "ammonium-chloride-recycling") + bobmods.lib.tech.add_recipe_unlock("rtg", "bob-ammonium-chloride-recycling") end end diff --git a/bobrevamp/prototypes/rtg.lua b/bobrevamp/prototypes/rtg.lua index d1f6bdec7..8c21a1389 100644 --- a/bobrevamp/prototypes/rtg.lua +++ b/bobrevamp/prototypes/rtg.lua @@ -1,4 +1,15 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then + local powder_drop_move = { + filename = "__base__/sound/item/sulfur-inventory-move.ogg", + volume = 0.7, + speed = 1.3, + } + local powder_pick = { + filename = "__base__/sound/item/landfill-inventory-pickup.ogg", + volume = 0.6, + speed = 1.2, + } + data:extend({ { type = "item", @@ -8,6 +19,9 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then subgroup = "bob-resource-chemical", order = "f[sodium-chlorate]", stack_size = 100, + drop_sound = powder_drop_move, + inventory_move_sound = powder_drop_move, + pick_sound = powder_pick, }, }) @@ -18,6 +32,7 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then name = "brine", icon = "__bobrevamp__/graphics/icons/brine.png", icon_size = 32, + subgroup = "bob-fluid", order = "a[fluid]-a[brine]", default_temperature = 15, max_temperature = 100, @@ -41,6 +56,7 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then shift = { 0, 5 }, }, }, + subgroup = "bob-fluid", order = "a[fluid]-a[brine]", default_temperature = 15, max_temperature = 100, @@ -58,6 +74,9 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then subgroup = "bob-resource-chemical", order = "f[sodium-chlorate]", stack_size = 100, + drop_sound = powder_drop_move, + inventory_move_sound = powder_drop_move, + pick_sound = powder_pick, }, { type = "item", @@ -67,6 +86,9 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then subgroup = "bob-resource-chemical", order = "f[sodium-chlorate]", stack_size = 100, + drop_sound = powder_drop_move, + inventory_move_sound = powder_drop_move, + pick_sound = powder_pick, }, { @@ -169,7 +191,7 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then }, { type = "recipe", - name = "ammonium-chloride-recycling", + name = "bob-ammonium-chloride-recycling", icon = "__bobrevamp__/graphics/icons/ammonium-chloride-recycling.png", icon_size = 64, subgroup = "bob-resource-chemical", @@ -209,7 +231,7 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then results = { { type = "item", name = "sodium-hydroxide", amount = 1 }, { type = "fluid", name = "chlorine", amount = 25 }, - { type = "fluid", name = "hydrogen", amount = 20 }, + { type = "fluid", name = "hydrogen", amount = 10 }, }, allow_decomposition = false, }, @@ -254,15 +276,30 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then subgroup = "bob-resource-chemical", order = "f[sodium-chlorate]", stack_size = 100, + drop_sound = powder_drop_move, + inventory_move_sound = powder_drop_move, + pick_sound = powder_pick, }, { type = "item", name = "rtg", icon = "__bobrevamp__/graphics/icons/technology/rtg.png", icon_size = 128, - subgroup = "bob-intermediates", - order = "f[rtg]", + subgroup = "intermediate-product", + order = "m[rtg]", stack_size = 50, + drop_sound = { + filename = "__base__/sound/item/reactor-inventory-move.ogg", + volume = 0.7, + }, + inventory_move_sound = { + filename = "__base__/sound/item/reactor-inventory-move.ogg", + volume = 0.7, + }, + pick_sound = { + filename = "__base__/sound/item/reactor-inventory-pickup.ogg", + volume = 0.6, + }, }, { type = "recipe", diff --git a/bobwarfare/prototypes/category.lua b/bobwarfare/prototypes/category.lua index 02933c671..9f36f9585 100644 --- a/bobwarfare/prototypes/category.lua +++ b/bobwarfare/prototypes/category.lua @@ -9,13 +9,7 @@ data:extend({ type = "item-subgroup", name = "bob-ammo-parts", group = "intermediate-products", - order = "d-a", - }, - { - type = "item-subgroup", - name = "bob-intermediates", - group = "intermediate-products", - order = "e-1", + order = "x-a", }, { type = "item-subgroup", @@ -93,12 +87,6 @@ data:extend({ }, }) -if data.raw["item-group"]["bob-intermediate-products"] then - data.raw["item-subgroup"]["bob-ammo-parts"].group = "bob-intermediate-products" - data.raw["item-subgroup"]["bob-intermediates"].group = "bob-intermediate-products" - data.raw["item-subgroup"]["bob-robot-parts"].group = "bob-intermediate-products" -end - if data.raw["item-group"]["bob-resource-products"] then data.raw["item-subgroup"]["bob-resource"].group = "bob-resource-products" end