Tweak some textures, new chest texture
[oweals/minetest_game.git] / mods / default / nodes.lua
index 89fc74b179b6ac594a0481046d3ae3f52a9820a6..34f2917168f2a2577e8113a719ed454cfe4aef3a 100644 (file)
@@ -376,6 +376,16 @@ minetest.register_node("default:papyrus", {
        end,
 })
 
+default.bookshelf_formspec =
+       "size[8,7;]"..
+       default.gui_bg..
+       default.gui_bg_img..
+       default.gui_slots..
+       "list[context;books;0,0.3;8,2;]"..
+       "list[current_player;main;0,2.85;8,1;]"..
+       "list[current_player;main;0,4.08;8,3;8]"..
+       default.get_hotbar_bg(0,2.85)
+
 minetest.register_node("default:bookshelf", {
        description = "Bookshelf",
        tiles = {"default_wood.png", "default_wood.png", "default_bookshelf.png"},
@@ -384,7 +394,7 @@ minetest.register_node("default:bookshelf", {
        sounds = default.node_sound_wood_defaults(),
        on_construct = function(pos)
                local meta = minetest.env:get_meta(pos)
-               meta:set_string("formspec","size[8,7;]list[context;books;0,0;8,2;]list[current_player;main;0,3;8,4;]")
+               meta:set_string("formspec", default.bookshelf_formspec)
                local inv = meta:get_inventory()
                inv:set_size("books", 8*2)
        end,
@@ -436,8 +446,8 @@ minetest.register_node("default:bookshelf", {
 
 minetest.register_node("default:glass", {
        description = "Glass",
-       drawtype = "glasslike",
-       tiles = {"default_glass.png"},
+       drawtype = "glasslike_framed_optional",
+       tiles = {"default_glass.png", "default_glass_detail.png"},
        inventory_image = minetest.inventorycube("default_glass.png"),
        paramtype = "light",
        sunlight_propagates = true,
@@ -446,12 +456,13 @@ minetest.register_node("default:glass", {
        sounds = default.node_sound_glass_defaults(),
 })
 
+local fence_texture = "default_fence_overlay.png^default_wood.png^default_fence_overlay.png^[makealpha:255,126,126"
 minetest.register_node("default:fence_wood", {
        description = "Wooden Fence",
        drawtype = "fencelike",
        tiles = {"default_wood.png"},
-       inventory_image = "default_fence.png",
-       wield_image = "default_fence.png",
+       inventory_image = fence_texture,
+       wield_image = fence_texture,
        paramtype = "light",
        is_ground_content = false,
        selection_box = {
@@ -712,7 +723,7 @@ minetest.register_node("default:sign_wall", {
                        return
                end
                local meta = minetest.get_meta(pos)
-               fields.text = fields.text or ""
+               if not fields.text then return end
                minetest.log("action", (sender:get_player_name() or "").." wrote \""..fields.text..
                                "\" to sign at "..minetest.pos_to_string(pos))
                meta:set_string("text", fields.text)
@@ -722,9 +733,9 @@ minetest.register_node("default:sign_wall", {
 
 default.chest_formspec = 
        "size[8,9]"..
-       gui_bg..
-       gui_bg_img..
-       gui_slots..
+       default.gui_bg..
+       default.gui_bg_img..
+       default.gui_slots..
        "list[current_name;main;0,0.3;8,4;]"..
        "list[current_player;main;0,4.85;8,1;]"..
        "list[current_player;main;0,6.08;8,3;8]"..
@@ -734,9 +745,9 @@ function default.get_locked_chest_formspec(pos)
        local spos = pos.x .. "," .. pos.y .. "," ..pos.z
        local formspec =
                "size[8,9]"..
-               gui_bg..
-               gui_bg_img..
-               gui_slots..
+               default.gui_bg..
+               default.gui_bg_img..
+               default.gui_slots..
                "list[nodemeta:".. spos .. ";main;0,0.3;8,4;]"..
                "list[current_player;main;0,4.85;8,1;]"..
                "list[current_player;main;0,6.08;8,3;8]"..
@@ -817,10 +828,6 @@ minetest.register_node("default:chest_locked", {
        allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
                local meta = minetest.get_meta(pos)
                if not has_locked_chest_privilege(meta, player) then
-                       minetest.log("action", player:get_player_name()..
-                                       " tried to access a locked chest belonging to "..
-                                       meta:get_string("owner").." at "..
-                                       minetest.pos_to_string(pos))
                        return 0
                end
                return count
@@ -828,10 +835,6 @@ minetest.register_node("default:chest_locked", {
     allow_metadata_inventory_put = function(pos, listname, index, stack, player)
                local meta = minetest.get_meta(pos)
                if not has_locked_chest_privilege(meta, player) then
-                       minetest.log("action", player:get_player_name()..
-                                       " tried to access a locked chest belonging to "..
-                                       meta:get_string("owner").." at "..
-                                       minetest.pos_to_string(pos))
                        return 0
                end
                return stack:get_count()
@@ -839,18 +842,10 @@ minetest.register_node("default:chest_locked", {
     allow_metadata_inventory_take = function(pos, listname, index, stack, player)
                local meta = minetest.get_meta(pos)
                if not has_locked_chest_privilege(meta, player) then
-                       minetest.log("action", player:get_player_name()..
-                                       " tried to access a locked chest belonging to "..
-                                       meta:get_string("owner").." at "..
-                                       minetest.pos_to_string(pos))
                        return 0
                end
                return stack:get_count()
        end,
-       on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
-               minetest.log("action", player:get_player_name()..
-                               " moves stuff in locked chest at "..minetest.pos_to_string(pos))
-       end,
     on_metadata_inventory_put = function(pos, listname, index, stack, player)
                minetest.log("action", player:get_player_name()..
                                " moves stuff to locked chest at "..minetest.pos_to_string(pos))
@@ -874,9 +869,9 @@ minetest.register_node("default:chest_locked", {
 function default.furnace_active(pos, percent, item_percent)
     local formspec = 
        "size[8,8.5]"..
-       gui_bg..
-       gui_bg_img..
-       gui_slots..
+       default.gui_bg..
+       default.gui_bg_img..
+       default.gui_slots..
        "list[current_name;src;2.75,0.5;1,1;]"..
        "list[current_name;fuel;2.75,2.5;1,1;]"..
        "image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:"..
@@ -908,9 +903,9 @@ end
 
 default.furnace_inactive_formspec =
        "size[8,8.5]"..
-       gui_bg..
-       gui_bg_img..
-       gui_slots..
+       default.gui_bg..
+       default.gui_bg_img..
+       default.gui_slots..
        "list[current_name;src;2.75,0.5;1,1;]"..
        "list[current_name;fuel;2.75,2.5;1,1;]"..
        "image[2.75,1.5;1,1;default_furnace_fire_bg.png]"..
@@ -951,6 +946,9 @@ minetest.register_node("default:furnace", {
                return true
        end,
        allow_metadata_inventory_put = function(pos, listname, index, stack, player)
+               if minetest.is_protected(pos, player:get_player_name()) then
+                       return 0
+               end
                local meta = minetest.get_meta(pos)
                local inv = meta:get_inventory()
                if listname == "fuel" then
@@ -969,6 +967,9 @@ minetest.register_node("default:furnace", {
                end
        end,
        allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
+               if minetest.is_protected(pos, player:get_player_name()) then
+                       return 0
+               end
                local meta = minetest.get_meta(pos)
                local inv = meta:get_inventory()
                local stack = inv:get_stack(from_list, from_index)
@@ -987,6 +988,12 @@ minetest.register_node("default:furnace", {
                        return 0
                end
        end,
+       allow_metadata_inventory_take = function(pos, listname, index, stack, player)
+               if minetest.is_protected(pos, player:get_player_name()) then
+                       return 0
+               end
+               return stack:get_count()
+       end,
 })
 
 minetest.register_node("default:furnace_active", {
@@ -1037,6 +1044,9 @@ minetest.register_node("default:furnace_active", {
                return true
        end,
        allow_metadata_inventory_put = function(pos, listname, index, stack, player)
+               if minetest.is_protected(pos, player:get_player_name()) then
+                       return 0
+               end
                local meta = minetest.get_meta(pos)
                local inv = meta:get_inventory()
                if listname == "fuel" then
@@ -1055,6 +1065,9 @@ minetest.register_node("default:furnace_active", {
                end
        end,
        allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
+               if minetest.is_protected(pos, player:get_player_name()) then
+                       return 0
+               end
                local meta = minetest.get_meta(pos)
                local inv = meta:get_inventory()
                local stack = inv:get_stack(from_list, from_index)
@@ -1073,6 +1086,12 @@ minetest.register_node("default:furnace_active", {
                        return 0
                end
        end,
+       allow_metadata_inventory_take = function(pos, listname, index, stack, player)
+               if minetest.is_protected(pos, player:get_player_name()) then
+                       return 0
+               end
+               return stack:get_count()
+       end,
 })
 
 local function swap_node(pos,name)
@@ -1385,84 +1404,27 @@ minetest.register_node("default:grass_1", {
        end,
 })
 
-minetest.register_node("default:grass_2", {
-       description = "Grass",
-       drawtype = "plantlike",
-       waving = 1,
-       tiles = {"default_grass_2.png"},
-       inventory_image = "default_grass_2.png",
-       wield_image = "default_grass_2.png",
-       paramtype = "light",
-       walkable = false,
-       buildable_to = true,
-       is_ground_content = true,
-       drop = "default:grass_1",
-       groups = {snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=1},
-       sounds = default.node_sound_leaves_defaults(),
-       selection_box = {
-               type = "fixed",
-               fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-       },
-})
-minetest.register_node("default:grass_3", {
-       description = "Grass",
-       drawtype = "plantlike",
-       waving = 1,
-       tiles = {"default_grass_3.png"},
-       inventory_image = "default_grass_3.png",
-       wield_image = "default_grass_3.png",
-       paramtype = "light",
-       walkable = false,
-       buildable_to = true,
-       is_ground_content = true,
-       drop = "default:grass_1",
-       groups = {snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=1},
-       sounds = default.node_sound_leaves_defaults(),
-       selection_box = {
-               type = "fixed",
-               fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-       },
-})
-
-minetest.register_node("default:grass_4", {
-       description = "Grass",
-       drawtype = "plantlike",
-       waving = 1,
-       tiles = {"default_grass_4.png"},
-       inventory_image = "default_grass_4.png",
-       wield_image = "default_grass_4.png",
-       paramtype = "light",
-       walkable = false,
-       buildable_to = true,
-       is_ground_content = true,
-       drop = "default:grass_1",
-       groups = {snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=1},
-       sounds = default.node_sound_leaves_defaults(),
-       selection_box = {
-               type = "fixed",
-               fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-       },
-})
-
-minetest.register_node("default:grass_5", {
-       description = "Grass",
-       drawtype = "plantlike",
-       waving = 1,
-       tiles = {"default_grass_5.png"},
-       inventory_image = "default_grass_5.png",
-       wield_image = "default_grass_5.png",
-       paramtype = "light",
-       walkable = false,
-       buildable_to = true,
-       is_ground_content = true,
-       drop = "default:grass_1",
-       groups = {snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=1},
-       sounds = default.node_sound_leaves_defaults(),
-       selection_box = {
-               type = "fixed",
-               fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-       },
-})
+for i=2,5 do
+       minetest.register_node("default:grass_"..i, {
+               description = "Grass",
+               drawtype = "plantlike",
+               waving = 1,
+               tiles = {"default_grass_"..i..".png"},
+               inventory_image = "default_grass_"..i..".png",
+               wield_image = "default_grass_"..i..".png",
+               paramtype = "light",
+               walkable = false,
+               buildable_to = true,
+               is_ground_content = true,
+               drop = "default:grass_1",
+               groups = {snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=1},
+               sounds = default.node_sound_leaves_defaults(),
+               selection_box = {
+                       type = "fixed",
+                       fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
+               },
+       })
+end
 
 minetest.register_node("default:ice", {
        description = "Ice",