mirror of
https://github.com/mt-mods/homedecor_modpack.git
synced 2024-12-23 00:20:17 +01:00
fix groups on "floor" rope lights
if mesecons, put "off" rope lights in creative inv, and drop them as "off" as well. else, put "on" in creative inv and drop "on" allow right-click on rope lights only if no mesecons also cache minetest.get_modpath("mesecons")
This commit is contained in:
parent
ed9fb6a34d
commit
17ea2040e2
@ -11,6 +11,8 @@ local function is_protected(pos, clicker)
|
|||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local hd_mesecons = minetest.get_modpath("mesecons")
|
||||||
|
|
||||||
-- control and brightness for dimmable lamps
|
-- control and brightness for dimmable lamps
|
||||||
|
|
||||||
local brightn_cycle = {
|
local brightn_cycle = {
|
||||||
@ -51,7 +53,7 @@ local rules_alldir = {
|
|||||||
|
|
||||||
local actions
|
local actions
|
||||||
|
|
||||||
if minetest.get_modpath("mesecons") then
|
if hd_mesecons then
|
||||||
|
|
||||||
actions = {
|
actions = {
|
||||||
action_off = function(pos, node)
|
action_off = function(pos, node)
|
||||||
@ -132,7 +134,7 @@ if minetest.get_modpath("digilines") then
|
|||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
if minetest.get_modpath("mesecons") then
|
if hd_mesecons then
|
||||||
homedecor.digiline_wall_light = {
|
homedecor.digiline_wall_light = {
|
||||||
effector = {
|
effector = {
|
||||||
action = on_digiline_receive_string,
|
action = on_digiline_receive_string,
|
||||||
@ -749,6 +751,15 @@ for _, light_brightn_name in ipairs({"off", "on"}) do
|
|||||||
|
|
||||||
local onflag = (light_brightn_name == "on")
|
local onflag = (light_brightn_name == "on")
|
||||||
local nici = (light_brightn_name == "off") and 1 or nil
|
local nici = (light_brightn_name == "off") and 1 or nil
|
||||||
|
local nici_m = (light_brightn_name == "off") and 1 or nil
|
||||||
|
local on_rc = homedecor.toggle_light
|
||||||
|
local di = "on"
|
||||||
|
|
||||||
|
if hd_mesecons then
|
||||||
|
nici_m = (light_brightn_name ~= "off") and 1 or nil
|
||||||
|
on_rc = nil
|
||||||
|
di = "off"
|
||||||
|
end
|
||||||
|
|
||||||
local gen_ls_tex_white = "homedecor_generic_light_source_off.png"
|
local gen_ls_tex_white = "homedecor_generic_light_source_off.png"
|
||||||
if onflag then gen_ls_tex_white = "homedecor_generic_light_source_white.png" end
|
if onflag then gen_ls_tex_white = "homedecor_generic_light_source_white.png" end
|
||||||
@ -829,14 +840,14 @@ for _, light_brightn_name in ipairs({"off", "on"}) do
|
|||||||
"homedecor:rope_light_on_floor_off",
|
"homedecor:rope_light_on_floor_off",
|
||||||
"group:mesecon_conductor_craftable"
|
"group:mesecon_conductor_craftable"
|
||||||
},
|
},
|
||||||
groups = {cracky=3, not_in_creative_inventory = nici},
|
groups = {cracky=3, oddly_breakable_by_hand=3, not_in_creative_inventory = nici_m},
|
||||||
sounds = default.node_sound_stone_defaults(),
|
sounds = default.node_sound_stone_defaults(),
|
||||||
on_rightclick = homedecor.toggle_light,
|
|
||||||
drop = {
|
drop = {
|
||||||
items = {
|
items = {
|
||||||
{items = {"homedecor:rope_light_on_floor_on"} },
|
{items = {"homedecor:rope_light_on_floor_"..di} },
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
on_rightclick = on_rc,
|
||||||
mesecons = {
|
mesecons = {
|
||||||
conductor = {
|
conductor = {
|
||||||
state = mesecon and (onflag and mesecon.state.on or mesecon.state.off),
|
state = mesecon and (onflag and mesecon.state.on or mesecon.state.off),
|
||||||
@ -875,14 +886,14 @@ for _, light_brightn_name in ipairs({"off", "on"}) do
|
|||||||
"homedecor:rope_light_on_ceiling_off",
|
"homedecor:rope_light_on_ceiling_off",
|
||||||
"group:mesecon_conductor_craftable"
|
"group:mesecon_conductor_craftable"
|
||||||
},
|
},
|
||||||
groups = {cracky=3, not_in_creative_inventory = nici},
|
groups = {cracky=3, oddly_breakable_by_hand=3, not_in_creative_inventory = nici_m},
|
||||||
sounds = default.node_sound_stone_defaults(),
|
sounds = default.node_sound_stone_defaults(),
|
||||||
on_rightclick = homedecor.toggle_light,
|
|
||||||
drop = {
|
drop = {
|
||||||
items = {
|
items = {
|
||||||
{items = {"homedecor:rope_light_on_ceiling_on"}},
|
{items = {"homedecor:rope_light_on_ceiling_"..di}},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
on_rightclick = on_rc,
|
||||||
mesecons = {
|
mesecons = {
|
||||||
conductor = {
|
conductor = {
|
||||||
state = mesecon and (onflag and mesecon.state.on or mesecon.state.off),
|
state = mesecon and (onflag and mesecon.state.on or mesecon.state.off),
|
||||||
|
Loading…
Reference in New Issue
Block a user