1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-11-05 10:00:26 +01:00

Updated homedecor

This commit is contained in:
LeMagnesium 2015-06-20 19:59:54 +02:00
parent e23de39212
commit f29ea87d00
15 changed files with 82 additions and 81 deletions

View File

@ -164,7 +164,7 @@ minetest.register_node("building_blocks:Fireplace", {
},
paramtype = "light",
paramtype2 = "facedir",
light_source = default.LIGHT_MAX - 1,
light_source = LIGHT_MAX,
sunlight_propagates = true,
is_ground_content = true,
groups = {cracky=2},

View File

@ -25,7 +25,7 @@ homedecor.register("speaker_open", {
"homedecor_speaker_open_front.png",
"homedecor_generic_metal_black.png"
},
groups = { snappy = 3 },
groups = { snappy = 3, not_in_creative_inventory=1 },
sounds = default.node_sound_wood_defaults(),
on_punch = function(pos, node, puncher, pointed_thing)
minetest.set_node(pos, {name = "homedecor:speaker", param2 = node.param2})

View File

@ -331,19 +331,16 @@ if minetest.get_modpath("bucket") then
local original_bucket_on_use = minetest.registered_items["bucket:bucket_empty"].on_use
minetest.override_item("bucket:bucket_empty", {
on_use = function(itemstack, user, pointed_thing)
local wielditem = user:get_wielded_item()
local wieldname = itemstack:get_name()
local inv = user:get_inventory()
if pointed_thing.type == "node" and minetest.get_node(pointed_thing.under).name == "homedecor:well" then
if inv:room_for_item("main", "bucket:bucket_water 1") then
wielditem:take_item()
user:set_wielded_item(wielditem)
itemstack:take_item()
inv:add_item("main", "bucket:bucket_water 1")
else
minetest.chat_send_player(user:get_player_name(), "No room in your inventory to add a filled bucket!")
end
return wielditem
return itemstack
else if original_bucket_on_use then
return original_bucket_on_use(itemstack, user, pointed_thing)
else return end

View File

@ -1,4 +1,4 @@
# Blender v2.69 (sub 0) OBJ File: 'table_small_round.blend'
# Blender v2.73 (sub 0) OBJ File: 'table_small_round.blend'
# www.blender.org
o Cylinder
v 0.049009 -0.499000 -0.497592
@ -97,78 +97,78 @@ v -0.298930 -0.437500 -0.364249
v -0.222125 -0.437500 -0.415568
v -0.136784 -0.437500 -0.450918
v -0.046186 -0.437500 -0.468939
vt 0.277778 0.166667
vt 0.277778 0.138889
vt 0.333333 0.138889
vt 0.333333 0.166667
vt 0.388889 0.138889
vt 0.388889 0.166667
vt 0.444444 0.138889
vt 0.444444 0.166667
vt 0.500000 0.138889
vt 0.500000 0.166667
vt 0.555556 0.138889
vt 0.555556 0.166667
vt 0.611111 0.138889
vt 0.611111 0.166667
vt 0.666667 0.138889
vt 0.666667 0.166667
vt 0.722222 0.138889
vt 0.722222 0.166667
vt 0.277778 0.416667
vt 0.277778 0.388889
vt 0.333333 0.388889
vt 0.333333 0.416667
vt 0.388889 0.388889
vt 0.388889 0.416667
vt 0.444444 0.388889
vt 0.444444 0.416667
vt 0.500000 0.388889
vt 0.500000 0.416667
vt 0.555556 0.388889
vt 0.555556 0.416667
vt 0.611111 0.388889
vt 0.611111 0.416667
vt 0.666667 0.388889
vt 0.666667 0.416667
vt 0.722222 0.388889
vt 0.722222 0.416667
vt 0.277778 0.333333
vt 0.277778 0.305556
vt 0.333333 0.305556
vt 0.333333 0.333333
vt 0.388889 0.305556
vt 0.388889 0.333333
vt 0.444444 0.305556
vt 0.444444 0.333333
vt 0.500000 0.305556
vt 0.500000 0.333333
vt 0.555556 0.305556
vt 0.555556 0.333333
vt 0.611111 0.305556
vt 0.611111 0.333333
vt 0.666667 0.305556
vt 0.666667 0.333333
vt 0.722222 0.305556
vt 0.722222 0.333333
vt 0.277778 0.250000
vt 0.277778 0.222222
vt 0.333333 0.222222
vt 0.333333 0.250000
vt 0.388889 0.222222
vt 0.388889 0.250000
vt 0.444444 0.222222
vt 0.444444 0.250000
vt 0.500000 0.222222
vt 0.500000 0.250000
vt 0.555556 0.222222
vt 0.555556 0.250000
vt 0.611111 0.222222
vt 0.611111 0.250000
vt 0.666667 0.250000
vt 0.666667 0.222222
vt 0.722222 0.222222
vt 0.722222 0.250000
vt 0.277344 0.123047
vt 0.277344 0.095703
vt 0.333008 0.095703
vt 0.333008 0.123047
vt 0.388672 0.095703
vt 0.388672 0.123047
vt 0.444336 0.095703
vt 0.444336 0.123047
vt 0.500000 0.095703
vt 0.500000 0.123047
vt 0.555664 0.095703
vt 0.555664 0.123047
vt 0.611328 0.095703
vt 0.611328 0.123047
vt 0.666992 0.095703
vt 0.666992 0.123047
vt 0.722656 0.095703
vt 0.722656 0.123047
vt 0.277344 0.404297
vt 0.277344 0.376953
vt 0.333008 0.376953
vt 0.333008 0.404297
vt 0.388672 0.376953
vt 0.388672 0.404297
vt 0.444336 0.376953
vt 0.444336 0.404297
vt 0.500000 0.376953
vt 0.500000 0.404297
vt 0.555664 0.376953
vt 0.555664 0.404297
vt 0.611328 0.376953
vt 0.611328 0.404297
vt 0.666992 0.376953
vt 0.666992 0.404297
vt 0.722656 0.376953
vt 0.722656 0.404297
vt 0.277344 0.310547
vt 0.277344 0.283203
vt 0.333008 0.283203
vt 0.333008 0.310547
vt 0.388672 0.283203
vt 0.388672 0.310547
vt 0.444336 0.283203
vt 0.444336 0.310547
vt 0.500000 0.283203
vt 0.500000 0.310547
vt 0.555664 0.283203
vt 0.555664 0.310547
vt 0.611328 0.283203
vt 0.611328 0.310547
vt 0.666992 0.283203
vt 0.666992 0.310547
vt 0.722656 0.283203
vt 0.722656 0.310547
vt 0.277344 0.216797
vt 0.277344 0.189453
vt 0.333008 0.189453
vt 0.333008 0.216797
vt 0.388672 0.189453
vt 0.388672 0.216797
vt 0.444336 0.189453
vt 0.444336 0.216797
vt 0.500000 0.189453
vt 0.500000 0.216797
vt 0.555664 0.189453
vt 0.555664 0.216797
vt 0.611328 0.189453
vt 0.611328 0.216797
vt 0.666992 0.216797
vt 0.666992 0.189453
vt 0.722656 0.189453
vt 0.722656 0.216797
vt 0.727947 0.526084
vt 0.684687 0.534689
vt 0.643937 0.551568
@ -233,6 +233,7 @@ vt 0.073466 0.655641
vt 0.095267 0.623014
vt 0.123014 0.595267
vt 0.155641 0.573466
g Cylinder_Cylinder_None
s off
f 1/1 2/2 4/3 3/4
f 3/4 4/3 6/5 5/6

Binary file not shown.

Before

Width:  |  Height:  |  Size: 473 B

After

Width:  |  Height:  |  Size: 824 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 395 B

After

Width:  |  Height:  |  Size: 785 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 656 B

After

Width:  |  Height:  |  Size: 984 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

@ -121,6 +121,9 @@ signs_lib.sign_node_list = {
"signs:sign_wall_red",
"signs:sign_wall_white_red",
"signs:sign_wall_white_black",
"signs:sign_wall_orange",
"signs:sign_wall_blue",
"signs:sign_wall_brown",
"locked_sign:sign_wall_locked"
}
@ -851,7 +854,7 @@ minetest.register_node(":locked_sign:sign_wall_locked", {
-- metal, colored signs
local sign_colors = { "green", "yellow", "red", "white_red", "white_black" }
local sign_colors = { "green", "yellow", "red", "white_red", "white_black", "orange", "blue", "brown" }
for _, color in ipairs(sign_colors) do
minetest.register_node(":signs:sign_wall_"..color, {

Binary file not shown.

After

Width:  |  Height:  |  Size: 175 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 154 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 175 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 155 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 170 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 141 B