diff --git a/README.md b/README.md index 79f87eb..558b71a 100644 --- a/README.md +++ b/README.md @@ -20,4 +20,8 @@ PreLeyZero (https://mods.factorio.com/mod/exotic-industries) planetfall (https://mods.factorio.com/mod/ThemTharHills) - Gold ore - - Gold wire \ No newline at end of file + - Gold wire + +CG-Matt (https://mods.factorio.com/mod/simple-wood-liquefaction) + + - Wood liquefaction \ No newline at end of file diff --git a/lignumis/graphics/icons/steam-assembling-machine.png b/lignumis/graphics/icons/steam-assembling-machine.png index 16c0aa5..bcdcf8c 100644 Binary files a/lignumis/graphics/icons/steam-assembling-machine.png and b/lignumis/graphics/icons/steam-assembling-machine.png differ diff --git a/lignumis/graphics/icons/wood-pulp.png b/lignumis/graphics/icons/wood-pulp.png new file mode 100644 index 0000000..46a3084 Binary files /dev/null and b/lignumis/graphics/icons/wood-pulp.png differ diff --git a/lignumis/locale/en/strings.cfg b/lignumis/locale/en/strings.cfg index 1a72a1c..6edab16 100644 --- a/lignumis/locale/en/strings.cfg +++ b/lignumis/locale/en/strings.cfg @@ -40,8 +40,12 @@ steam-science-pack=Steam science pack [item-description] wooden-wall=Use wooden walls to protect your base from the locals and to reduce noise levels. +[fluid-name] +wood-pulp=Wood pulp + [recipe-name] moist-stromatolite-remnant-desiccation=Desiccate moist stromatolite remnant +wood-liquefaction=Wood liquefaction [technology-name] wood-science-pack=Wood science pack @@ -53,6 +57,7 @@ deep-miner=Deep miner gold-fluid-handling=Gold fluid handling steam-automation=Steam automation steam-science-pack=Steam science pack +wood-liquefaction=Wood liquefaction [tile-name] wood-floor=Wood floor diff --git a/lignumis/prototypes/content/burner-assembling-machine.lua b/lignumis/prototypes/content/burner-assembling-machine.lua index 09639a4..74715fa 100644 --- a/lignumis/prototypes/content/burner-assembling-machine.lua +++ b/lignumis/prototypes/content/burner-assembling-machine.lua @@ -7,16 +7,29 @@ assembling_machine.minable.result = "burner-assembling-machine" assembling_machine.next_upgrade = "steam-assembling-machine" assembling_machine.corpses = "burner-assembling-machine-remnants" assembling_machine.resistances = nil -assembling_machine.graphics_set.animation.layers[1].filename = "__lignumis__/graphics/entity/burner-assembling-machine.png" -assembling_machine.crafting_categories = { "crafting", "basic-crafting", "organic-or-assembling", "wood-processing-or-assembling" } +assembling_machine.graphics_set.animation.layers[1].filename = +"__lignumis__/graphics/entity/burner-assembling-machine.png" +assembling_machine.crafting_categories = { "crafting", "basic-crafting", "organic-or-assembling", + "wood-processing-or-assembling" } assembling_machine.crafting_speed = 0.25 assembling_machine.energy_source = { type = "burner", fuel_categories = { "chemical" }, effectivity = 1, fuel_inventory_size = 1, - emissions_per_minute = { noise = 20 } + emissions_per_minute = { noise = 20 }, + smoke = { + { + name = "smoke", + deviation = { 0.1, 0.1 }, + frequency = 2, + position = { 0.0, -0.8 }, + starting_vertical_speed = 0.08, + starting_frame_deviation = 60 + } + } } +assembling_machine.energy_usage = "75kW" local remnants = util.copy(data.raw["corpse"]["assembling-machine-1-remnants"]) remnants.name = "burner-assembling-machine-remnants" @@ -47,8 +60,8 @@ data:extend({ enabled = false, ingredients = { { type = "item", name = "wooden-gear-wheel", amount = 5 }, - { type = "item", name = "lumber", amount = 8 }, - { type = "item", name = "gold-cable", amount = 20 } + { type = "item", name = "lumber", amount = 8 }, + { type = "item", name = "gold-cable", amount = 20 } }, results = { { type = "item", name = "burner-assembling-machine", amount = 1 } }, energy_required = 4 @@ -76,4 +89,4 @@ data:extend({ }, ignore_tech_cost_multiplier = true } -}) \ No newline at end of file +}) diff --git a/lignumis/prototypes/content/data.lua b/lignumis/prototypes/content/data.lua index f28c63f..92e426c 100644 --- a/lignumis/prototypes/content/data.lua +++ b/lignumis/prototypes/content/data.lua @@ -13,5 +13,6 @@ require("deep-miner") require("desiccation-furnace") require("steam-assembling-machine") require("steam-science") +require("wood-liquefaction") require("noise") diff --git a/lignumis/prototypes/content/steam-assembling-machine.lua b/lignumis/prototypes/content/steam-assembling-machine.lua index c8a0b1a..08d8f6e 100644 --- a/lignumis/prototypes/content/steam-assembling-machine.lua +++ b/lignumis/prototypes/content/steam-assembling-machine.lua @@ -5,7 +5,7 @@ assembling_machine.name = "steam-assembling-machine" assembling_machine.icon = "__lignumis__/graphics/icons/steam-assembling-machine.png" assembling_machine.minable.result = "steam-assembling-machine" assembling_machine.next_upgrade = "assembling-machine-1" -assembling_machine.module_specification = nil +assembling_machine.module_slots = nil assembling_machine.corpses = "steam-assembling-machine-remnants" assembling_machine.resistances = nil assembling_machine.graphics_set = util.copy(data.raw["assembling-machine"]["assembling-machine-1"].graphics_set) @@ -13,11 +13,12 @@ assembling_machine.graphics_set.animation.layers[1].filename = "__lignumis__/graphics/entity/steam-assembling-machine.png" assembling_machine.crafting_categories = { "crafting", "basic-crafting", "organic-or-assembling", "wood-processing-or-assembling", "crafting-with-fluid" } -assembling_machine.crafting_speed = 0.25 +assembling_machine.crafting_speed = 0.5 +assembling_machine.energy_usage = "25kW" assembling_machine.energy_source = { type = "fluid", fuel_categories = { "steam" }, - effectivity = 10, + effectivity = 1, emissions_per_minute = { noise = 20 }, scale_fluid_usage = true, fluid_box = { diff --git a/lignumis/prototypes/content/steam-science.lua b/lignumis/prototypes/content/steam-science.lua index 3060fb2..6f657f9 100644 --- a/lignumis/prototypes/content/steam-science.lua +++ b/lignumis/prototypes/content/steam-science.lua @@ -26,7 +26,7 @@ data:extend({ name = "steam-science-pack", category = "crafting-with-fluid", enabled = false, - energy_required = 10, + energy_required = 20, ingredients = { { type = "item", name = "gold-plate", amount = 2 }, { type = "fluid", name = "steam", amount = 10 } diff --git a/lignumis/prototypes/content/wood-liquefaction.lua b/lignumis/prototypes/content/wood-liquefaction.lua new file mode 100644 index 0000000..7d50be8 --- /dev/null +++ b/lignumis/prototypes/content/wood-liquefaction.lua @@ -0,0 +1,69 @@ +data:extend({ + { + type = "fluid", + name = "wood-pulp", + default_temperature = 150, + fuel_value = "150kJ", + base_color = { r = 0.57, g = 0.392, b = 0.114 }, + flow_color = { r = 0.57, g = 0.392, b = 0.114 }, + icon = "__lignumis__/graphics/icons/wood-pulp.png", + icon_size = 64, + icon_mipmaps = 4, + subgroup = "fluid", + order = "w[wood]" + }, + { + type = "recipe", + category = "crafting-with-fluid", + name = "wood-liquefaction", + icon_size = 64, + icon_mipmaps = 4, + icons = { + { icon = "__lignumis__/graphics/icons/wood-pulp.png" }, + { icon = "__base__/graphics/icons/wood.png", scale = 0.25, shift = { 8, 8 } }, + }, + subgroup = "fluid-recipes", + order = "a[oil-processing]-d[wood-liquefaction]", + enabled = false, + energy_required = 3, + crafting_machine_tint = { + primary = { r = 0.57, g = 0.392, b = 0.114, a = 1.000 }, + secondary = { r = 0.57, g = 0.392, b = 0.114, a = 1.000 }, + tertiary = { r = 0.57, g = 0.392, b = 0.114, a = 1.000 }, + quaternary = { r = 0.57, g = 0.392, b = 0.114, a = 1.000 } + }, + ingredients = { + { type = "item", name = "wood", amount = 1 }, + { type = "fluid", name = "steam", amount = 5 } + }, + results = { + { type = "fluid", name = "wood-pulp", amount = 10 } + } + }, + { + type = "technology", + name = "wood-liquefaction", + icon_size = 256, + icon_mipmaps = 4, + icons = { + { icon = "__base__/graphics/technology/oil-processing.png", icon_size = 256 }, + { icon = "__lignumis__/graphics/icons/wood-pulp.png", icon_size = 64, scale = 0.5, shift = { 16, 16 } } + }, + effects = { + { + type = "unlock-recipe", + recipe = "wood-liquefaction" + } + }, + prerequisites = { "steam-science-pack" }, + unit = { + ingredients = { + { "wood-science-pack", 1 }, + { "steam-science-pack", 1 } + }, + time = 15, + count = 50 + }, + order = "w" + } +}) diff --git a/sources/icons/steam-assembling-machine.afphoto b/sources/icons/steam-assembling-machine.afphoto index a3e7db2..8ba8f9e 100644 Binary files a/sources/icons/steam-assembling-machine.afphoto and b/sources/icons/steam-assembling-machine.afphoto differ diff --git a/sources/icons/steam-assembling-machine_old.afphoto b/sources/icons/steam-assembling-machine_old.afphoto new file mode 100644 index 0000000..a3e7db2 Binary files /dev/null and b/sources/icons/steam-assembling-machine_old.afphoto differ diff --git a/sources/icons/wood-pulp.afphoto b/sources/icons/wood-pulp.afphoto new file mode 100644 index 0000000..8b2b1dd Binary files /dev/null and b/sources/icons/wood-pulp.afphoto differ