diff --git a/README.md b/README.md index 9ffed07..5ec8588 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ Unsorted - Integrate [PlanetsLib](https://mods.factorio.com/mod/PlanetsLib) - Compatibility with hot metals - Compatibility with all wood mods from SafTheLamb +- Compatibility with [Amator Phasma's Coal & Steam (forked)](https://mods.factorio.com/mod/apm_power_ldinc) - Compatibility with [Noble Metals](https://mods.factorio.com/mod/bzgold) once it's updated - Optimize images diff --git a/lignumis/data.lua b/lignumis/data.lua index 6620624..75c3f98 100644 --- a/lignumis/data.lua +++ b/lignumis/data.lua @@ -2,3 +2,4 @@ require("__cf-lib__/util") require("prototypes/content/data") require("prototypes/integrations/data") +require("prototypes/compatibility/data") \ No newline at end of file diff --git a/lignumis/graphics/icons/hot-gold-plate.png b/lignumis/graphics/icons/hot-gold-plate.png new file mode 100644 index 0000000..50efac1 Binary files /dev/null and b/lignumis/graphics/icons/hot-gold-plate.png differ diff --git a/lignumis/info.json b/lignumis/info.json index 0f1f783..4ecc7d2 100644 --- a/lignumis/info.json +++ b/lignumis/info.json @@ -14,6 +14,7 @@ "Wood-Walls >= 1.2.0", "mf-buildings >= 0.1.0", "mf-logistics >= 0.1.0", + "?hot-metals", "!wood-logistics" ] } \ No newline at end of file diff --git a/lignumis/prototypes/compatibility/data.lua b/lignumis/prototypes/compatibility/data.lua new file mode 100644 index 0000000..9b936d5 --- /dev/null +++ b/lignumis/prototypes/compatibility/data.lua @@ -0,0 +1 @@ +require("hot-metals") \ No newline at end of file diff --git a/lignumis/prototypes/compatibility/hot-metals.lua b/lignumis/prototypes/compatibility/hot-metals.lua new file mode 100644 index 0000000..7298a2f --- /dev/null +++ b/lignumis/prototypes/compatibility/hot-metals.lua @@ -0,0 +1,5 @@ +if not mods["hot-metals"] then + return +end + +table.insert(HotMetals.items, { name = "gold-plate", iconFolder = "__lignumis__/graphics/icons/" }) \ No newline at end of file diff --git a/lignumis/prototypes/content/fuel-category-updates.lua b/lignumis/prototypes/content/fuel-category-updates.lua index 34b3a5c..3002887 100644 --- a/lignumis/prototypes/content/fuel-category-updates.lua +++ b/lignumis/prototypes/content/fuel-category-updates.lua @@ -1,9 +1,18 @@ -local blacklist = { - --"burner-assembling-machine", - --"stone-furnace", - --"desiccation-furnace", - --"lumber-mill" -} +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" + +-- Update burner inserters initial fuel +for _, inserter in pairs(data.raw["inserter"]) do + if inserter.energy_source and inserter.energy_source.initial_fuel == "wood" then + inserter.energy_source.initial_fuel = "coal" + end +end + +-- Update energy source fuel categories for buildings that should still use wood as fuel + +local blacklist = {} function update_fuel_categories(t) for _, entity in pairs(t) do @@ -18,10 +27,5 @@ function update_fuel_categories(t) 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 +update_fuel_categories(data.raw["boiler"]) diff --git a/lignumis/prototypes/content/wood-logistics.lua b/lignumis/prototypes/content/wood-logistics.lua index 50d4fa9..47e33f4 100644 --- a/lignumis/prototypes/content/wood-logistics.lua +++ b/lignumis/prototypes/content/wood-logistics.lua @@ -5,6 +5,7 @@ Belt.EntityBuilder:new() :itemsPerSecond(7.5) :nextTier("") :undergroundDistance(4) + :animationSpeedMultiplier(1.01) :apply({ transportBelt = { emissions_per_second = { noise = 0.01 } diff --git a/lignumis/prototypes/integrations/vanilla.lua b/lignumis/prototypes/integrations/vanilla.lua index a5399c2..d9f4c06 100644 --- a/lignumis/prototypes/integrations/vanilla.lua +++ b/lignumis/prototypes/integrations/vanilla.lua @@ -29,7 +29,6 @@ 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" diff --git a/sources/icons/hot-gold-plate.afphoto b/sources/icons/hot-gold-plate.afphoto new file mode 100644 index 0000000..773a506 Binary files /dev/null and b/sources/icons/hot-gold-plate.afphoto differ