diff --git a/lignumis/data-updates.lua b/lignumis/data-updates.lua new file mode 100644 index 0000000..e3e118d --- /dev/null +++ b/lignumis/data-updates.lua @@ -0,0 +1 @@ +require("prototypes/content/updates") \ No newline at end of file diff --git a/lignumis/locale/en/strings.cfg b/lignumis/locale/en/strings.cfg index 00de6ce..adc2fbd 100644 --- a/lignumis/locale/en/strings.cfg +++ b/lignumis/locale/en/strings.cfg @@ -81,5 +81,8 @@ basic-construction-robotics-copper=Basic construction robotics (copper) wood-floor=Wood floor natural-gold-soil=Gold-infused soil +[fuel-category-name] +wood=Wood fuel + [lignumis] start-new-game=Lignumis is meant to be played in a fresh game as it extends the early game before Nauvis. \ No newline at end of file diff --git a/lignumis/prototypes/content/burner-long-handed-inserter.lua b/lignumis/prototypes/content/burner-long-handed-inserter.lua index c777c18..4c3621b 100644 --- a/lignumis/prototypes/content/burner-long-handed-inserter.lua +++ b/lignumis/prototypes/content/burner-long-handed-inserter.lua @@ -18,8 +18,8 @@ long_handed_inserter.energy_source = { fuel_categories = { "chemical" }, effectivity = 1, fuel_inventory_size = 1, - initial_fuel = "wood", - initial_fuel_percent = 0.5, + initial_fuel = "coal", + initial_fuel_percent = 0.25, light_flicker = { color = { 0, 0, 0 } }, smoke = { { diff --git a/lignumis/prototypes/content/data.lua b/lignumis/prototypes/content/data.lua index e8ad506..d34dcc6 100644 --- a/lignumis/prototypes/content/data.lua +++ b/lignumis/prototypes/content/data.lua @@ -17,6 +17,7 @@ require("steam-science") require("wood-liquefaction") require("wooden-rocket-silo") require("basic-gun-turret") +require("fuel-category") require("basic-construction-robots") require("noise") diff --git a/lignumis/prototypes/content/fuel-category-updates.lua b/lignumis/prototypes/content/fuel-category-updates.lua new file mode 100644 index 0000000..34b3a5c --- /dev/null +++ b/lignumis/prototypes/content/fuel-category-updates.lua @@ -0,0 +1,27 @@ +local blacklist = { + --"burner-assembling-machine", + --"stone-furnace", + --"desiccation-furnace", + --"lumber-mill" +} + +function update_fuel_categories(t) + for _, entity in pairs(t) do + if entity.energy_source + and entity.energy_source.type == "burner" + and not table.contains(blacklist, entity.name) + and entity.energy_source.fuel_categories + and table.contains(entity.energy_source.fuel_categories, "chemical") + then + table.insert(entity.energy_source.fuel_categories, "wood") + end + end +end + +data.raw.item["wood"].fuel_category = "wood" +data.raw.item["lumber"].fuel_category = "wood" +data.raw.item["tree-seed"].fuel_category = "wood" +data.raw.item["wooden-wall"].fuel_category = "wood" + +-- Add more if incompatibilities arise +update_fuel_categories(data.raw["boiler"]) \ No newline at end of file diff --git a/lignumis/prototypes/content/fuel-category.lua b/lignumis/prototypes/content/fuel-category.lua new file mode 100644 index 0000000..99191c9 --- /dev/null +++ b/lignumis/prototypes/content/fuel-category.lua @@ -0,0 +1,6 @@ +data:extend({ + { + type = "fuel-category", + name = "wood" + } +}) \ No newline at end of file diff --git a/lignumis/prototypes/content/gold/stromatolite.lua b/lignumis/prototypes/content/gold/stromatolite.lua index 3d50035..753f5f3 100644 --- a/lignumis/prototypes/content/gold/stromatolite.lua +++ b/lignumis/prototypes/content/gold/stromatolite.lua @@ -184,7 +184,9 @@ local seed = { drop_sound = space_age_item_sounds.agriculture_inventory_move, stack_size = 10, default_import_location = "lignumis", - weight = 10 * kg + weight = 10 * kg, + fuel_category = "wood", + fuel_value = "100kJ" } local bacteria = { diff --git a/lignumis/prototypes/content/updates.lua b/lignumis/prototypes/content/updates.lua new file mode 100644 index 0000000..c6d2a3f --- /dev/null +++ b/lignumis/prototypes/content/updates.lua @@ -0,0 +1 @@ +require("fuel-category-updates") \ No newline at end of file diff --git a/lignumis/prototypes/integrations/vanilla.lua b/lignumis/prototypes/integrations/vanilla.lua index a7c43db..74036aa 100644 --- a/lignumis/prototypes/integrations/vanilla.lua +++ b/lignumis/prototypes/integrations/vanilla.lua @@ -29,6 +29,8 @@ burner_inserter.hand_base_picture.filename = "__lignumis__/graphics/entity/burne burner_inserter.hand_closed_picture.filename = "__lignumis__/graphics/entity/burner-inserter-hand-closed.png" burner_inserter.hand_open_picture.filename = "__lignumis__/graphics/entity/burner-inserter-hand-open.png" burner_inserter.platform_picture.sheet.filename = "__lignumis__/graphics/entity/burner-inserter-platform.png" +burner_inserter.energy_source.initial_fuel = "coal" +burner_inserter.energy_source.initial_fuel_percent = 0.15 data.raw.item["burner-inserter"].icon = "__lignumis__/graphics/icons/burner-inserter.png" @@ -44,10 +46,6 @@ local wood_processing = data.raw.recipe["wood-processing"] wood_processing.ingredients[1].amount = 1 wood_processing.icon = data.raw.item["tree-seed"].icon -local tree_seed = data.raw.item["tree-seed"] -tree_seed.fuel_category = nil -tree_seed.fuel_value = nil - for _, tree in pairs(data.raw.tree) do tree.minable.result = nil tree.minable.count = nil