diff --git a/chairs.lua b/chairs.lua index 41662d4..33e21fa 100644 --- a/chairs.lua +++ b/chairs.lua @@ -140,6 +140,7 @@ minetest.register_node("luxury_decor:decorative_wooden_chair", { description = "Decorative Wooden Chair", visual_scale = 0.5, mesh = "decorative_wooden_chair.obj", + inventory_image = "decorative_chair_inv.png", tiles = {"dark_wood_material2.png"}, paramtype = "light", paramtype2 = "facedir", diff --git a/lighting.lua b/lighting.lua index caf3e34..13383ab 100644 --- a/lighting.lua +++ b/lighting.lua @@ -2,6 +2,7 @@ minetest.register_node("luxury_decor:luxury_desk_lamp_off", { description = "Luxury Desk Lamp", visual_scale = 0.5, mesh = "luxury_desk_lamp.obj", + inventory_image = "luxury_desk_lamp_inv.png", tiles = {"luxury_desk_lamp.png"}, paramtype = "light", paramtype2 = "facedir", @@ -32,6 +33,7 @@ minetest.register_node("luxury_decor:luxury_desk_lamp_on", { description = "Luxury Desk Lamp", visual_scale = 0.5, mesh = "luxury_desk_lamp.obj", + inventory_image = "luxury_desk_lamp_inv.png", tiles = {"luxury_desk_lamp.png"}, paramtype = "light", paramtype2 = "facedir", @@ -64,7 +66,11 @@ minetest.register_node("luxury_decor:iron_chandelier", { description = "Iron Chandelier", visual_scale = 0.5, mesh = "iron_chandelier.obj", - tiles = {"iron_chandelier.png"}, + inventory_image = "iron_chandelier_inv.png", + tiles = {{ + name = "iron_chandelier_animated.png", + animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, lenght = 3.4} + }}, paramtype = "light", paramtype2 = "facedir", groups = {choppy = 2.5}, diff --git a/models/iron_chandelier.blend b/models/iron_chandelier.blend index 3c41f0d..9de5deb 100644 Binary files a/models/iron_chandelier.blend and b/models/iron_chandelier.blend differ diff --git a/models/iron_chandelier.blend1 b/models/iron_chandelier.blend1 deleted file mode 100644 index 7e4e422..0000000 Binary files a/models/iron_chandelier.blend1 and /dev/null differ diff --git a/models/luxury_flowerpot.blend b/models/luxury_flowerpot.blend index a2b3565..5c20667 100644 Binary files a/models/luxury_flowerpot.blend and b/models/luxury_flowerpot.blend differ diff --git a/models/simple_wooden_bed_side_table_1.blend1 b/models/simple_wooden_bed_side_table_1.blend1 index 34a5859..b524993 100644 Binary files a/models/simple_wooden_bed_side_table_1.blend1 and b/models/simple_wooden_bed_side_table_1.blend1 differ diff --git a/models/wall_glass_lamp.blend b/models/wall_glass_lamp.blend new file mode 100644 index 0000000..a7260bc Binary files /dev/null and b/models/wall_glass_lamp.blend differ diff --git a/music.lua b/music.lua index 0415bd3..c48da56 100644 --- a/music.lua +++ b/music.lua @@ -2,6 +2,7 @@ minetest.register_node("luxury_decor:grand_piano", { description = "Grand Piano", visual_scale = 0.5, mesh = "grand_piano.obj", + inventory_image = "grand_piano_inv.png", tiles = {"grand_piano.png"}, --inventory_image = "simple_wooden_table_inv.png", paramtype = "light", diff --git a/redecorating.lua b/redecorating.lua index 6da225e..1cdedba 100644 --- a/redecorating.lua +++ b/redecorating.lua @@ -38,4 +38,31 @@ minetest.register_node("luxury_decor:simple_flowerpot", { }, sounds = default.node_sound_wood_defaults() }) + +minetest.register_node("luxury_decor:luxury_flowerpot", { + description = "Luxury Flowerpot", + visual_scale = 0.5, + mesh = "luxury_flowerpot.obj", + inventory_image = "luxury_flowerpot_inv.png", + tiles = {"luxury_flowerpot.png"}, + paramtype = "light", + paramtype2 = "facedir", + groups = {choppy = 2}, + drawtype = "mesh", + collision_box = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}, + --[[{-0.65, -0.3, -1.46, 0.65, 1.4, -1.66}, + {-0.65, -0.3, 0.46, 0.65, 1.4, 0.66}]] + } + }, + selection_box = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5} + } + }, + sounds = default.node_sound_wood_defaults() +}) diff --git a/textures/iron_chandelier.png b/textures/iron_chandelier.png index 1d7ba90..36cd1bb 100644 Binary files a/textures/iron_chandelier.png and b/textures/iron_chandelier.png differ diff --git a/textures/iron_chandelier_animated.png b/textures/iron_chandelier_animated.png new file mode 100644 index 0000000..8d37d1c Binary files /dev/null and b/textures/iron_chandelier_animated.png differ diff --git a/textures/simple_flowerpot.png b/textures/luxury_flowerpot.png similarity index 100% rename from textures/simple_flowerpot.png rename to textures/luxury_flowerpot.png diff --git a/textures/luxury_flowerpot_inv.png b/textures/luxury_flowerpot_inv.png new file mode 100644 index 0000000..44c818f Binary files /dev/null and b/textures/luxury_flowerpot_inv.png differ