diff --git a/packages/editor/src/core/factorioData.ts b/packages/editor/src/core/factorioData.ts index 869fd1ce..1b7927dc 100644 --- a/packages/editor/src/core/factorioData.ts +++ b/packages/editor/src/core/factorioData.ts @@ -10,6 +10,8 @@ import { TilePrototype, EntityWithOwnerPrototype, UtilitySprites, + UtilityConstants, + GuiStyle, HeatBuffer, EnergySource, CraftingMachinePrototype, @@ -744,6 +746,8 @@ const FD: { tiles: Record inventoryLayout: InventoryLayoutGroup[] utilitySprites: UtilitySprites + utilityConstants: UtilityConstants + guiStyle: GuiStyle defines: typeof defines // treesAndRocks: Record @@ -761,6 +765,8 @@ export function loadData(str: string): void { FD.tiles = data.tiles FD.inventoryLayout = data.inventoryLayout FD.utilitySprites = data.utilitySprites + FD.utilityConstants = data.utilityConstants + FD.guiStyle = data.guiStyle FD.defines = data.defines FD.getModulesFor = getModulesFor diff --git a/packages/exporter/src/export-data/data-final-fixes.lua b/packages/exporter/src/export-data/data-final-fixes.lua index 0dbd9094..48ee748a 100644 --- a/packages/exporter/src/export-data/data-final-fixes.lua +++ b/packages/exporter/src/export-data/data-final-fixes.lua @@ -440,10 +440,17 @@ end -- UTILITY SPRITES do - local utilitySprites = deep_copy(data.raw['utility-sprites'].default) - utilitySprites.type = nil - utilitySprites.name = nil - output.utilitySprites = utilitySprites + output.utilitySprites = data.raw['utility-sprites'].default +end + +-- UTILITY CONSTANTS +do + output.utilityConstants = data.raw['utility-constants'].default +end + +-- GUI STYLE +do + output.guiStyle = data.raw['gui-style'].default end -- DEFINES