fix wrong textures on a couple of lamps

rope lights are not dimmable
fix bad not-in-creative-inventory flags on wall lamp and plasma ball
2025-11-04 12:35:33 +01:00 · 2019-06-02 03:16:00 -04:00 · 2019-06-02 03:13:46 -04:00 · 2019-06-02 02:51:41 -04:00 · 2019-06-02 02:47:46 -04:00 · 2019-06-02 02:45:01 -04:00
6 changed files with 721 additions and 661 deletions
--- a/homedecor_electrical/init.lua
+++ b/homedecor_electrical/init.lua
@@ -2,9 +2,10 @@
 local S = homedecor.gettext

 function homedecor.toggle_switch(pos, node, clicker, itemstack, pointed_thing)
-	if minetest.is_protected(pos, clicker:get_player_name()) then
-		minetest.record_protection_violation(pos,
-		sender:get_player_name())
+	if not clicker then return false end
+	local playername = clicker:get_player_name()
+	if minetest.is_protected(pos, playername) then
+		minetest.record_protection_violation(pos, playername)
 		return false
 	end
 	local sep = string.find(node.name, "_o", -5)
--- a/homedecor_furniture_medieval/init.lua
+++ b/homedecor_furniture_medieval/init.lua
@@ -58,61 +58,10 @@ homedecor.register("chains", {
 	sounds = default.node_sound_stone_defaults(),
 })

-homedecor.register("torch_wall", {
-	description = S("Wall Torch"),
-	mesh = "forniture_torch.obj",
-	tiles = {
-		{
-			name="forniture_torch_flame.png",
-			animation={
-				type="vertical_frames",
-				aspect_w=40,
-				aspect_h=40,
-				length=1.0,
-			},
-		},
-		{ name = "homedecor_generic_metal.png", color = homedecor.color_black },
-		{ name = "homedecor_generic_metal.png", color = homedecor.color_med_grey },
-		"forniture_coal.png",
-	},
-	inventory_image="forniture_torch_inv.png",
-	walkable = false,
-	light_source = 14,
-	selection_box = {
-		type = "fixed",
-		fixed = { -0.15, -0.45, 0.15, 0.15,0.35, 0.5 },
-	},
-	groups = {cracky=3},
-})
-
-local wl_cbox = {
-	type = "fixed",
-	fixed = { -0.2, -0.5, 0, 0.2, 0.5, 0.5 },
-}
-
-homedecor.register("wall_lamp", {
-	description = S("Wall Lamp"),
-	mesh = "homedecor_wall_lamp.obj",
-	tiles = {
-		{ name = "homedecor_generic_metal.png", color = homedecor.color_med_grey },
-		homedecor.lux_wood,
-		"homedecor_light.png",
-		"homedecor_generic_metal_wrought_iron.png"
-	},
-	use_texture_alpha = true,
-	inventory_image = "homedecor_wall_lamp_inv.png",
-	groups = {snappy=3},
-	light_source = 11,
-	selection_box = wl_cbox,
-	walkable = false
-})
-
 minetest.register_alias("3dforniture:bars", "homedecor:bars")
 minetest.register_alias("3dforniture:L_binding_bars", "homedecor:L_binding_bars")
 minetest.register_alias("3dforniture:chains", "homedecor:chains")
-minetest.register_alias("3dforniture:torch_wall", "homedecor:torch_wall")

 minetest.register_alias('bars', 'homedecor:bars')
 minetest.register_alias('binding_bars', 'homedecor:L_binding_bars')
 minetest.register_alias('chains', 'homedecor:chains')
-minetest.register_alias('torch_wall', 'homedecor:torch_wall')
--- a/homedecor_lighting/init.lua
+++ b/homedecor_lighting/init.lua
--- a/homedecor_lighting/textures/homedecor_table_generic_light_source_off.png
+++ b/homedecor_lighting/textures/homedecor_table_generic_light_source_off.png
--- a/homedecor_lighting/textures/homedecor_table_generic_light_source_on.png
+++ b/homedecor_lighting/textures/homedecor_table_generic_light_source_on.png
--- a/homedecor_lighting/textures/homedecor_generic_light_source_yellow.png
+++ b/homedecor_lighting/textures/homedecor_generic_light_source_yellow.png
Author	SHA1	Message	Date
Vanessa Dannenberg	84c3933fd4	fix wrong textures on a couple of lamps	2019-06-02 03:16:00 -04:00
Vanessa Dannenberg	968cdfd549	rope lights are not dimmable	2019-06-02 03:13:46 -04:00
Vanessa Dannenberg	c457874d03	fix bad not-in-creative-inventory flags on wall lamp and plasma ball	2019-06-02 02:51:41 -04:00
Vanessa Dannenberg	67acbd6d59	fix not being able to right-click table and standing lamps	2019-06-02 02:47:46 -04:00
Vanessa Dannenberg	fdb37bdaf5	fix wrong colorization table usage in table, standing, and desk lamps	2019-06-02 02:45:01 -04:00
Vanessa Dannenberg	ab8bf5586f	move "medieval" wall lamp and torch to homedecor_lighting make them mesecon/digiline controllable (on/off only, alldir rules) also fix a couple of old texture references	2019-06-02 02:37:02 -04:00
Vanessa Dannenberg	2f3c12eb2a	rename and move generic light source textures	2019-06-02 02:23:10 -04:00
Vanessa Dannenberg	4174737a1a	make most presently non-dimmable lights dimmable merge table and standing lamps into the new code of all the relevant lights, the plasma ball is the only one that remains on/off-only, since dimmable doesn't make sense there. That one, and any future lights that get the on/off-only treatment, will use the previous on/off behavior, i.e. turn off with the messages "off" or "low" or a number < 4, and turn on with "med", "hi", "max", "on" or a number > 3 This alters the behavior of table/standing lamps - they will no longer cycle brightnesses by right-click. Like all other controllable lights, they'll just toggle on/off. If there's enough demand for it, I'll add that feature back in at a later date.	2019-06-02 02:11:15 -04:00
Vanessa Dannenberg	11771e12cb	allow numeric messages for dimmable lamps allow non-dimmables to respond to "off", "low", "med", "hi", "max", "on" number messages for dimmables: 0 turns the light off 1-3 sets it to "low" 4-7 sets it to "med" 8-11 sets it to "hi" 12+ sets it to "max" (i.e. full-on) non-dimmables: a number > 3 or the strings "med", "hi", "max", or "on" turn the light on a number < 4 or the strings "off" and "low" turn the light off	2019-06-01 23:13:02 -04:00
Vanessa Dannenberg	b3337921a1	fix crash (bad variable ref)	2019-05-31 08:00:46 -04:00