diff --git a/lignumis/locale/en/strings.cfg b/lignumis/locale/en/strings.cfg index 45d7b68..a2409a1 100644 --- a/lignumis/locale/en/strings.cfg +++ b/lignumis/locale/en/strings.cfg @@ -107,7 +107,6 @@ nutrients-from-wood-pulp=Nutrients from wood pulp active-noise-cancelling=Active noise cancelling casting-gold=Casting gold gold-ore-crushing=Gold ore crushing -processing-unit-gold=Processing unit (gold) [recipe-description] moist-stromatolite-remnant-desiccation-without-steam=Used for balancing the production of steam. diff --git a/lignumis/prototypes/compatibility/crushing-industry.lua b/lignumis/prototypes/compatibility/crushing-industry.lua index f716c16..4c9a5ac 100644 --- a/lignumis/prototypes/compatibility/crushing-industry.lua +++ b/lignumis/prototypes/compatibility/crushing-industry.lua @@ -1,4 +1,5 @@ local item_sounds = require("__base__.prototypes.item_sounds") +local Technology = require("__cf-lib__/data/Technology") local Recipe = require("__cf-lib__/data/Recipe") if not mods["crushing-industry"] then return end @@ -10,8 +11,8 @@ data:extend({ name = "crushed-gold-ore", icon = Lignumis.graphics .. "icons/crushed-gold-ore.png", pictures = { - { size = 64, filename = Lignumis.graphics .. "icons/crushed-gold-ore.png", scale = 0.5, mipmap_count = 4 }, - { size = 64, filename = Lignumis.graphics .. "icons/crushed-gold-ore-1.png", scale = 0.5, mipmap_count = 4 }, + { size = 64, filename = Lignumis.graphics .. "icons/crushed-gold-ore.png", scale = 0.5, mipmap_count = 4 }, + { size = 64, filename = Lignumis.graphics .. "icons/crushed-gold-ore-1.png", scale = 0.5, mipmap_count = 4 }, { size = 64, filename = Lignumis.graphics .. "icons/crushed-gold-ore-2.png", scale = 0.5, mipmap_count = 4 }, }, subgroup = "raw-resource", @@ -78,21 +79,16 @@ data:extend({ } }) -Recipe:new("molten-gold"):replaceIngredient("gold-ore", "crushed-gold-ore", 75) - if settings.startup["crushing-industry-byproducts"].value then - table.insert(data.raw["recipe"]["crushed-gold-ore"].results, - { type = "item", name = "gold-ore", amount = 1, probability = 0.05 }) - table.insert(data.raw["recipe"]["crushed-gold-ore"].results, - { type = "item", name = "moist-stromatolite-remnant", amount = 1, probability = 0.02 }) + table.insert(data.raw["recipe"]["crushed-gold-ore"].results, { type = "item", name = "gold-ore", amount = 1, probability = 0.05 }) + table.insert(data.raw["recipe"]["crushed-gold-ore"].results, { type = "item", name = "sand", amount = 1, probability = 0.02 }) end local gold_recipe = Recipe:new("burner-crusher") :replaceIngredient("iron-gear-wheel", "wooden-gear-wheel") :replaceIngredient("iron-plate", "gold-plate") :assign({ - category = settings.startup["lignumis-lumber-mill-more-recipes"].value and "wood-processing-or-assembling" or - "crafting" + category = settings.startup["lignumis-lumber-mill-more-recipes"].value and "wood-processing-or-assembling" or "crafting" }) gold_recipe:clone("burner-crusher-copper") @@ -105,4 +101,4 @@ gold_recipe:clone("burner-crusher-copper") } }) :unlockedByTechnology("copper-processing") - :apply() + :apply() \ No newline at end of file diff --git a/lignumis/prototypes/content/gold/intermediates.lua b/lignumis/prototypes/content/gold/intermediates.lua index 3c7c56e..3f4f010 100644 --- a/lignumis/prototypes/content/gold/intermediates.lua +++ b/lignumis/prototypes/content/gold/intermediates.lua @@ -40,8 +40,6 @@ data:extend({ { type = "recipe", name = "gold-cable", - category = "crafting", - additional_categories = { "electromagnetics" }, ingredients = { { type = "item", name = "gold-plate", amount = 1 } }, results = { { type = "item", name = "gold-cable", amount = 2 } }, allow_productivity = true diff --git a/lignumis/prototypes/content/mid-game-recipes.lua b/lignumis/prototypes/content/mid-game-recipes.lua index bf57604..7344436 100644 --- a/lignumis/prototypes/content/mid-game-recipes.lua +++ b/lignumis/prototypes/content/mid-game-recipes.lua @@ -167,7 +167,7 @@ data:extend({ allow_productivity = true, icons = { { icon = "__base__/graphics/icons/low-density-structure.png" }, - { icon = Lignumis.graphics .. "icons/gold-plate.png", scale = 0.25, shift = { 8, 8 } } + { icon = Lignumis.graphics .. "icons/gold-plate.png", scale = 0.25, shift = { 8, 8 } } } }, { @@ -216,34 +216,6 @@ data:extend({ } }) -if settings.startup["lignumis-basic-circuit-board"].value then - data:extend({ - { - type = "recipe", - name = "processing-unit-gold", - category = "crafting-with-steam", - additional_categories = { "electromagnetics" }, - enabled = false, - auto_recycle = false, - energy_required = 10, - ingredients = - { - { type = "item", name = "basic-circuit-board", amount = 20 }, - { type = "item", name = "gold-cable", amount = 8 }, - { type = "item", name = "plastic-bar", amount = 3 }, - { type = "fluid", name = "wood-pulp", amount = 5 } - }, - results = { { type = "item", name = "processing-unit", amount = 1 } }, - allow_productivity = true, - icons = { - { icon = "__base__/graphics/icons/processing-unit.png" }, - { icon = Lignumis.graphics .. "icons/gold-cable.png", scale = 0.25, shift = { 8, 8 } } - } - } - }) - Technology:new("processing-unit"):addRecipe("processing-unit-gold") -end - local plastics = Technology:new("plastics") plastics:addRecipe("cupriavidus-necator-starter") plastics:addRecipe("cupriavidus-necator") @@ -283,4 +255,4 @@ rocket_fuel_productivity:addEffect({ type = "change-recipe-productivity", recipe = "rocket-fuel-from-wood-pulp-and-peat", change = 0.1 -}) +}) \ No newline at end of file diff --git a/lignumis/prototypes/content/steam-assembling-machine.lua b/lignumis/prototypes/content/steam-assembling-machine.lua index 2a6871e..2a6322c 100644 --- a/lignumis/prototypes/content/steam-assembling-machine.lua +++ b/lignumis/prototypes/content/steam-assembling-machine.lua @@ -9,7 +9,7 @@ assembling_machine.name = "steam-assembling-machine" assembling_machine.icons = { { icon = Lignumis.graphics .. "icons/steam-assembling-machine.png", icon_size = 64 } } assembling_machine.minable.result = "steam-assembling-machine" assembling_machine.next_upgrade = "assembling-machine-1" -assembling_machine.module_slots = 2 +assembling_machine.module_slots = nil assembling_machine.corpses = "steam-assembling-machine-remnants" assembling_machine.resistances = nil assembling_machine.graphics_set = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-1"].graphics_set)