From d192894c5dcfca88ff64cfcb0f8792f6a2cd8f8c Mon Sep 17 00:00:00 2001 From: Brevven Date: Mon, 7 Apr 2025 20:10:00 -0700 Subject: [PATCH] updates --- changelog.txt | 1 + data-util.lua | 17 ++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/changelog.txt b/changelog.txt index c91c8d1..7aec1ee 100644 --- a/changelog.txt +++ b/changelog.txt @@ -5,6 +5,7 @@ Date: 2025-03-22 - Set inventory sounds for some items Fixes: - Loads with crafting efficiency + - Improved compatibility with Muluna --------------------------------------------------------------------------------------------------- Version: 2.1.9 Date: 2025-03-04 diff --git a/data-util.lua b/data-util.lua index 1cff5c3..2ab06b4 100644 --- a/data-util.lua +++ b/data-util.lua @@ -12,7 +12,7 @@ util.get_setting = util.me.get_setting util.titanium_plate = "" util.titanium_processing = "" -local foo = [[ +local item_sounds_helper = [[ local item_sounds = require('__base__.prototypes.item_sounds') inventory_move_sound = item_sounds.wire_inventory_move, @@ -26,6 +26,14 @@ local item_sounds = require('__base__.prototypes.item_sounds') inventory_move_sound = item_sounds.resource_inventory_move, pick_sound = item_sounds.resource_inventory_pickup, drop_sound = item_sounds.resource_inventory_move, + + inventory_move_sound = item_sounds.brick_inventory_move, + pick_sound = item_sounds.brick_inventory_pickup, + drop_sound = item_sounds.brick_inventory_move, + + inventory_move_sound = item_sounds.sulfur_inventory_move, + pick_sound = item_sounds.resource_inventory_pickup, + drop_sound = item_sounds.sulfur_inventory_move, ]] util.A = {{"automation-science-pack", 1}} @@ -1855,11 +1863,7 @@ end -- Save recycling metadata that is later removed by quality mod. Call near end of data.lua function util.prepare_recycling_helper() - if mods.quality then - for _, recipe in pairs(data.raw.recipe) do - recipe.auto_recycle_helper = recipe.auto_recycle - end - end + -- DEPRECATED end -- Recalculate recycling recipes, call near end of data-updates.lua, after calling @@ -1868,7 +1872,6 @@ function util.redo_recycling() if mods.quality then local recycling = require("__quality__.prototypes.recycling") for _, recipe in pairs(data.raw.recipe) do - recipe.auto_recycle = recipe.auto_recycle_helper -- keeping this outside conditional to improve fidelity across multiple mods if recipe.redo_recycling then recycling.generate_recycling_recipe(recipe) end