1
0
mirror of https://github.com/mt-mods/homedecor_modpack.git synced 2025-07-17 05:10:25 +02:00

Compare commits

...

5 Commits

Author SHA1 Message Date
c118b43711 use signs_lib's custom pole check callback feature
requires signs_lib from commit dcdee22 or later, if present
2019-09-22 03:23:50 -04:00
f6da0f7329 fix the 'fix' 2019-09-19 20:55:56 -04:00
e84a184946 only try to process a light message if it's a string 2019-09-19 19:24:42 -04:00
0c9d883f28 Merge branch 'patch-1' into 'master'
Fix fg/bg texture setting in register_furnace

See merge request VanessaE/homedecor_modpack!7
2019-09-19 18:06:48 +00:00
97e7a31830 Fix fg/bg texture setting in register_furnace
If a custom fire_bg texture had been provided (not currently done
within the modpack itself), fire_fg would have been set to that instead
of the provided fire_fg or default.
2019-09-19 12:50:01 +00:00
6 changed files with 20 additions and 20 deletions

View File

@ -80,7 +80,7 @@ local furnace_can_dig = function(pos,player)
end
function homedecor.register_furnace(name, furnacedef)
furnacedef.fire_fg = furnacedef.fire_bg or "default_furnace_fire_fg.png"
furnacedef.fire_fg = furnacedef.fire_fg or "default_furnace_fire_fg.png"
furnacedef.fire_bg = furnacedef.fire_bg or "default_furnace_fire_bg.png"
furnacedef.output_slots = furnacedef.output_slots or 4

View File

@ -2,4 +2,4 @@ homedecor_common
default
basic_materials
dye
basic_signs?
signs_lib?

View File

@ -264,7 +264,7 @@ homedecor.register("fence_wrought_iron_2_corner", {
})
-- insert the old wood signs-on-metal-fences into signs_lib's conversion LBM
if minetest.get_modpath("basic_signs") then
if minetest.get_modpath("signs_lib") then
table.insert(signs_lib.old_fenceposts_with_signs, "homedecor:fence_brass_with_sign")
signs_lib.old_fenceposts["homedecor:fence_brass_with_sign"] = "homedecor:fence_brass"
signs_lib.old_fenceposts_replacement_signs["homedecor:fence_brass_with_sign"] = "default:sign_wall_wood_onpole"
@ -272,8 +272,6 @@ if minetest.get_modpath("basic_signs") then
table.insert(signs_lib.old_fenceposts_with_signs, "homedecor:fence_wrought_iron_with_sign")
signs_lib.old_fenceposts["homedecor:fence_wrought_iron_with_sign"] = "homedecor:fence_wrought_iron"
signs_lib.old_fenceposts_replacement_signs["homedecor:fence_wrought_iron_with_sign"] = "default:sign_wall_wood_onpole"
signs_lib.allowed_poles["homedecor:pole_brass"] = true
end
-- crafting

View File

@ -103,7 +103,7 @@ if minetest.get_modpath("digilines") then
local setchan = meta:get_string("channel")
if setchan ~= channel then return end
if msg and msg ~= "" then
if msg ~= "" and (type(msg) == "string" or type(msg) == "number" ) then
local n = tonumber(msg)
local suff = word_to_bright[msg] or "invalid"

View File

@ -5,3 +5,4 @@ unifieddyes
building_blocks?
technic?
bucket?
signs_lib?

View File

@ -130,21 +130,22 @@ for _, f in ipairs(flowers_list) do
end
homedecor.register("pole_brass", {
description = S("Brass Pole"),
description = S("Brass Pole"),
mesh = "homedecor_round_pole.obj",
tiles = {"homedecor_generic_metal_brass.png^homedecor_generic_metal_lines_overlay.png",},
inventory_image = "homedecor_pole_brass_inv.png",
wield_image = "homedecor_pole_brass_inv.png",
selection_box = {
type = "fixed",
fixed = { -0.125, -0.5, -0.125, 0.125, 0.5, 0.125 },
},
collision_box = {
type = "fixed",
fixed = { -0.125, -0.5, -0.125, 0.125, 0.5, 0.125 },
},
groups = {snappy=3},
sounds = default.node_sound_wood_defaults(),
tiles = {"homedecor_generic_metal_brass.png^homedecor_generic_metal_lines_overlay.png",},
inventory_image = "homedecor_pole_brass_inv.png",
wield_image = "homedecor_pole_brass_inv.png",
selection_box = {
type = "fixed",
fixed = { -0.125, -0.5, -0.125, 0.125, 0.5, 0.125 },
},
collision_box = {
type = "fixed",
fixed = { -0.125, -0.5, -0.125, 0.125, 0.5, 0.125 },
},
groups = {snappy=3},
sounds = default.node_sound_wood_defaults(),
check_for_pole = true
})
homedecor.register("pole_wrought_iron", {