From 55e2b337b89223407a97224529701e0dce3e854c Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Mon, 5 Jan 2026 23:43:55 +0100 Subject: [PATCH] Use a more generic way to set graphics filenames --- .../content/burner-long-handed-inserter.lua | 18 +++++++++------- lignumis/prototypes/integrations/vanilla.lua | 21 ++++++++++--------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/lignumis/prototypes/content/burner-long-handed-inserter.lua b/lignumis/prototypes/content/burner-long-handed-inserter.lua index f3bc55e..9cfa841 100644 --- a/lignumis/prototypes/content/burner-long-handed-inserter.lua +++ b/lignumis/prototypes/content/burner-long-handed-inserter.lua @@ -1,4 +1,5 @@ local item_sounds = require("__base__.prototypes.item_sounds") +local Entity = require("__cf-lib__/data/Entity") local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].value local gfx = Lignumis.graphics .. "entity/burner-long-handed-inserter/" @@ -10,10 +11,6 @@ long_handed_inserter.minable.result = "burner-long-handed-inserter" long_handed_inserter.next_upgrade = "long-handed-inserter" long_handed_inserter.corpse = "burner-long-handed-inserter-remnants" long_handed_inserter.resistances = nil -long_handed_inserter.hand_base_picture.filename = gfx .. "burner-long-handed-inserter-hand-base.png" -long_handed_inserter.hand_closed_picture.filename = gfx .. "burner-long-handed-inserter-hand-closed.png" -long_handed_inserter.hand_open_picture.filename = gfx .. "burner-long-handed-inserter-hand-open.png" -long_handed_inserter.platform_picture.sheet.filename = gfx .. "burner-long-handed-inserter-platform.png" long_handed_inserter.energy_per_movement = "70kJ" long_handed_inserter.energy_per_rotation = "70kJ" long_handed_inserter.energy_source = { @@ -35,13 +32,18 @@ long_handed_inserter.energy_source = { long_handed_inserter.extension_speed = 0.035 long_handed_inserter.rotation_speed = 0.014 +Entity.setFilename(long_handed_inserter.hand_base_picture, gfx .. "burner-long-handed-inserter-hand-base.png") +Entity.setFilename(long_handed_inserter.hand_closed_picture, gfx .. "burner-long-handed-inserter-hand-closed.png") +Entity.setFilename(long_handed_inserter.hand_open_picture, gfx .. "burner-long-handed-inserter-hand-open.png") +Entity.setFilename(long_handed_inserter.platform_picture, gfx .. "burner-long-handed-inserter-platform.png") + local remnants = table.deepcopy(data.raw["corpse"]["long-handed-inserter-remnants"]) remnants.name = "burner-long-handed-inserter-remnants" remnants.icon = Lignumis.graphics .. "icons/burner-long-handed-inserter.png" -remnants.animation[1].filename = gfx .. "burner-long-handed-inserter-remnants.png" -remnants.animation[2].filename = gfx .. "burner-long-handed-inserter-remnants.png" -remnants.animation[3].filename = gfx .. "burner-long-handed-inserter-remnants.png" -remnants.animation[4].filename = gfx .. "burner-long-handed-inserter-remnants.png" +Entity.setFilename(remnants.animation[1], gfx .. "burner-long-handed-inserter-remnants.png") +Entity.setFilename(remnants.animation[2], gfx .. "burner-long-handed-inserter-remnants.png") +Entity.setFilename(remnants.animation[3], gfx .. "burner-long-handed-inserter-remnants.png") +Entity.setFilename(remnants.animation[4], gfx .. "burner-long-handed-inserter-remnants.png") remnants.order = "a-c-0" data:extend({ diff --git a/lignumis/prototypes/integrations/vanilla.lua b/lignumis/prototypes/integrations/vanilla.lua index 45dde80..d8da7a1 100644 --- a/lignumis/prototypes/integrations/vanilla.lua +++ b/lignumis/prototypes/integrations/vanilla.lua @@ -1,6 +1,7 @@ local Technology = require("__cf-lib__/data/Technology") local Recipe = require("__cf-lib__/data/Recipe") local Item = require("__cf-lib__/data/Item") +local Entity = require("__cf-lib__/data/Entity") local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].value @@ -12,10 +13,10 @@ drill.resource_searching_radius = 1.99 drill.icon = Lignumis.graphics .. "icons/burner-mining-drill.png" drill.impact_category = "wood" drill.radius_visualisation_picture = table.deepcopy(data.raw["mining-drill"]["electric-mining-drill"].radius_visualisation_picture) -drill_animation.north.layers[1].filename = Lignumis.graphics .. "entity/burner-mining-drill/burner-mining-drill-N.png" -drill_animation.east.layers[1].filename = Lignumis.graphics .. "entity/burner-mining-drill/burner-mining-drill-E.png" -drill_animation.south.layers[1].filename = Lignumis.graphics .. "entity/burner-mining-drill/burner-mining-drill-S.png" -drill_animation.west.layers[1].filename = Lignumis.graphics .. "entity/burner-mining-drill/burner-mining-drill-W.png" +Entity.setFilename(drill_animation.north, Lignumis.graphics .. "entity/burner-mining-drill/burner-mining-drill-N.png") +Entity.setFilename(drill_animation.east, Lignumis.graphics .. "entity/burner-mining-drill/burner-mining-drill-E.png") +Entity.setFilename(drill_animation.south, Lignumis.graphics .. "entity/burner-mining-drill/burner-mining-drill-S.png") +Entity.setFilename(drill_animation.west, Lignumis.graphics .. "entity/burner-mining-drill/burner-mining-drill-W.png") local drill_item = data.raw["item"]["burner-mining-drill"] drill_item.icon = Lignumis.graphics .. "icons/burner-mining-drill.png" @@ -35,10 +36,10 @@ drill_recipe.ingredients = { local burner_inserter = data.raw["inserter"]["burner-inserter"] burner_inserter.icon = Lignumis.graphics .. "icons/burner-inserter.png" -burner_inserter.hand_base_picture.filename = Lignumis.graphics .. "entity/burner-inserter/burner-inserter-hand-base.png" -burner_inserter.hand_closed_picture.filename = Lignumis.graphics .. "entity/burner-inserter/burner-inserter-hand-closed.png" -burner_inserter.hand_open_picture.filename = Lignumis.graphics .. "entity/burner-inserter/burner-inserter-hand-open.png" -burner_inserter.platform_picture.sheet.filename = Lignumis.graphics .. "entity/burner-inserter/burner-inserter-platform.png" +Entity.setFilename(burner_inserter.hand_base_picture, Lignumis.graphics .. "entity/burner-inserter/burner-inserter-hand-base.png") +Entity.setFilename(burner_inserter.hand_closed_picture, Lignumis.graphics .. "entity/burner-inserter/burner-inserter-hand-closed.png") +Entity.setFilename(burner_inserter.hand_open_picture, Lignumis.graphics .. "entity/burner-inserter/burner-inserter-hand-open.png") +Entity.setFilename(burner_inserter.platform_picture, Lignumis.graphics .. "entity/burner-inserter/burner-inserter-platform.png") burner_inserter.energy_source.initial_fuel_percent = 0.15 data.raw.item["burner-inserter"].icon = Lignumis.graphics .. "icons/burner-inserter.png" @@ -57,11 +58,11 @@ end local stone_furnace = data.raw["furnace"]["stone-furnace"] stone_furnace.icon = Lignumis.graphics .. "icons/stone-furnace.png" -stone_furnace.graphics_set.animation.layers[1].filename = Lignumis.graphics .. "entity/stone-furnace/stone-furnace.png" +Entity.setFilename(stone_furnace.graphics_set.animation, Lignumis.graphics .. "entity/stone-furnace/stone-furnace.png") local stone_furnace_remnants = data.raw["corpse"]["stone-furnace-remnants"] stone_furnace_remnants.icon = Lignumis.graphics .. "icons/stone-furnace.png" -stone_furnace_remnants.animation[1].filename = Lignumis.graphics .. "entity/stone-furnace/stone-furnace-remnants.png" +Entity.setFilename(stone_furnace_remnants.animation[1], Lignumis.graphics .. "entity/stone-furnace/stone-furnace-remnants.png") -- Lab