From: Jean-Patrick Guerrero Date: Sun, 6 Mar 2016 11:16:33 +0000 (+0100) Subject: Add steel sign + Update wooden sign texture X-Git-Tag: 0.4.14~106 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=aa676ab87863a8d42050d56355db1b25e07ce4bd;p=oweals%2Fminetest_game.git Add steel sign + Update wooden sign texture --- diff --git a/mods/default/README.txt b/mods/default/README.txt index 4d33d390..048b4c0a 100644 --- a/mods/default/README.txt +++ b/mods/default/README.txt @@ -27,7 +27,6 @@ Cisoun's WTFPL texture pack: default_lava.png default_leaves.png default_sapling.png - default_sign_wall.png default_stone.png default_tree.png default_tree_top.png @@ -178,6 +177,7 @@ Gambit (WTFPL): default_paper.png default_diamond_block.png default_ladder_steel.png + default_sign_wall_wood.png asl97 (WTFPL): default_ice.png diff --git a/mods/default/aliases.lua b/mods/default/aliases.lua index 487d20d5..63fe59b2 100644 --- a/mods/default/aliases.lua +++ b/mods/default/aliases.lua @@ -32,7 +32,7 @@ minetest.register_alias("water_source", "default:water_source") minetest.register_alias("lava_flowing", "default:lava_flowing") minetest.register_alias("lava_source", "default:lava_source") minetest.register_alias("torch", "default:torch") -minetest.register_alias("sign_wall", "default:sign_wall") +minetest.register_alias("sign_wall", "default:sign_wall_wood") minetest.register_alias("furnace", "default:furnace") minetest.register_alias("chest", "default:chest") minetest.register_alias("locked_chest", "default:chest_locked") @@ -76,4 +76,5 @@ minetest.register_alias("default:pinetree", "default:pine_tree") minetest.register_alias("default:pinewood", "default:pine_wood") minetest.register_alias("default:ladder", "default:ladder_wood") +minetest.register_alias("default:sign_wall", "default:sign_wall_wood") diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua index 92864b1d..5ab8c538 100644 --- a/mods/default/crafting.lua +++ b/mods/default/crafting.lua @@ -43,7 +43,16 @@ minetest.register_craft({ }) minetest.register_craft({ - output = 'default:sign_wall', + output = 'default:sign_wall_steel 3', + recipe = { + {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, + {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, + {'', 'group:stick', ''}, + } +}) + +minetest.register_craft({ + output = 'default:sign_wall_wood 3', recipe = { {'group:wood', 'group:wood', 'group:wood'}, {'group:wood', 'group:wood', 'group:wood'}, diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 61feec26..9006f137 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -146,7 +146,8 @@ default:chest_locked default:bookshelf -default:sign_wall +default:sign_wall_wood +default:sign_wall_steel default:ladder_wood default:ladder_steel @@ -1610,49 +1611,60 @@ minetest.register_node("default:bookshelf", { end, }) +local function register_sign(material, desc, def) + minetest.register_node("default:sign_wall_" .. material, { + description = desc .. " Sign", + drawtype = "nodebox", + tiles = {"default_sign_wall_" .. material .. ".png"}, + inventory_image = "default_sign_" .. material .. ".png", + wield_image = "default_sign_" .. material .. ".png", + paramtype = "light", + paramtype2 = "wallmounted", + sunlight_propagates = true, + is_ground_content = false, + walkable = false, + node_box = { + type = "wallmounted", + wall_top = {-0.4375, 0.4375, -0.3125, 0.4375, 0.5, 0.3125}, + wall_bottom = {-0.4375, -0.5, -0.3125, 0.4375, -0.4375, 0.3125}, + wall_side = {-0.5, -0.3125, -0.4375, -0.4375, 0.3125, 0.4375}, + }, + groups = def.groups, + legacy_wallmounted = true, + sounds = def.sounds, + + on_construct = function(pos) + --local n = minetest.get_node(pos) + local meta = minetest.get_meta(pos) + meta:set_string("formspec", "field[text;;${text}]") + meta:set_string("infotext", "\"\"") + end, + on_receive_fields = function(pos, formname, fields, sender) + --print("Sign at "..minetest.pos_to_string(pos).." got "..dump(fields)) + local player_name = sender:get_player_name() + if minetest.is_protected(pos, player_name) then + minetest.record_protection_violation(pos, player_name) + return + end + local meta = minetest.get_meta(pos) + if not fields.text then return end + minetest.log("action", (player_name or "") .. " wrote \"" .. + fields.text .. "\" to sign at " .. minetest.pos_to_string(pos)) + meta:set_string("text", fields.text) + meta:set_string("infotext", '"' .. fields.text .. '"') + end, + }) +end -minetest.register_node("default:sign_wall", { - description = "Sign", - drawtype = "nodebox", - tiles = {"default_sign.png"}, - inventory_image = "default_sign_wall.png", - wield_image = "default_sign_wall.png", - paramtype = "light", - paramtype2 = "wallmounted", - sunlight_propagates = true, - is_ground_content = false, - walkable = false, - node_box = { - type = "wallmounted", - wall_top = {-0.4375, 0.4375, -0.3125, 0.4375, 0.5, 0.3125}, - wall_bottom = {-0.4375, -0.5, -0.3125, 0.4375, -0.4375, 0.3125}, - wall_side = {-0.5, -0.3125, -0.4375, -0.4375, 0.3125, 0.4375}, - }, - groups = {choppy = 2, dig_immediate = 2, attached_node = 1}, - legacy_wallmounted = true, - sounds = default.node_sound_defaults(), - - on_construct = function(pos) - --local n = minetest.get_node(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec", "field[text;;${text}]") - meta:set_string("infotext", "\"\"") - end, - on_receive_fields = function(pos, formname, fields, sender) - --print("Sign at "..minetest.pos_to_string(pos).." got "..dump(fields)) - if minetest.is_protected(pos, sender:get_player_name()) then - minetest.record_protection_violation(pos, sender:get_player_name()) - return - end - local meta = minetest.get_meta(pos) - 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) - meta:set_string("infotext", '"' .. fields.text .. '"') - end, +register_sign("wood", "Wooden", { + sounds = default.node_sound_wood_defaults(), + groups = {choppy = 2, attached_node = 1, flammable = 2} }) +register_sign("steel", "Steel", { + sounds = default.node_sound_defaults(), + groups = {cracky = 2, attached_node = 1} +}) minetest.register_node("default:ladder_wood", { description = "Wooden Ladder", diff --git a/mods/default/textures/default_sign.png b/mods/default/textures/default_sign.png deleted file mode 100644 index 912a3723..00000000 Binary files a/mods/default/textures/default_sign.png and /dev/null differ diff --git a/mods/default/textures/default_sign_steel.png b/mods/default/textures/default_sign_steel.png new file mode 100644 index 00000000..5705c787 Binary files /dev/null and b/mods/default/textures/default_sign_steel.png differ diff --git a/mods/default/textures/default_sign_wall.png b/mods/default/textures/default_sign_wall.png deleted file mode 100644 index 56a7d2e3..00000000 Binary files a/mods/default/textures/default_sign_wall.png and /dev/null differ diff --git a/mods/default/textures/default_sign_wall_steel.png b/mods/default/textures/default_sign_wall_steel.png new file mode 100644 index 00000000..d8d4a5b0 Binary files /dev/null and b/mods/default/textures/default_sign_wall_steel.png differ diff --git a/mods/default/textures/default_sign_wall_wood.png b/mods/default/textures/default_sign_wall_wood.png new file mode 100644 index 00000000..f25a67a8 Binary files /dev/null and b/mods/default/textures/default_sign_wall_wood.png differ diff --git a/mods/default/textures/default_sign_wood.png b/mods/default/textures/default_sign_wood.png new file mode 100644 index 00000000..a25a4c34 Binary files /dev/null and b/mods/default/textures/default_sign_wood.png differ