diff --git a/building.lua b/building.lua index 425595b..a0adf90 100644 --- a/building.lua +++ b/building.lua @@ -17,7 +17,7 @@ function darkage.register_reinforce(name, craftItem, nodedef) assert(type(nodedef.tiles)=="table","ERRROR: nodedef.tiles have to be a table") assert(nodedef.tiles[1], "ERROR: "..dump(nodedef.tiles).." requires at least 1 entry") local modname = minetest.get_current_modname(); - local tname = name:lower(); -- Technical name + local tname = string.gsub(name:lower()," ", "_"); -- Technical name -- Reinforced X local reinforced = table.copy(nodedef); @@ -156,6 +156,12 @@ darkage.register_reinforce("Wood", "default:wood", { sounds = default.node_sound_wood_defaults() }) +darkage.register_reinforce("Chalked Bricks", "darkage:chalked_bricks", { + tiles = {"darkage_chalked_bricks.png"}, + groups = {cracky = 2, stone = 1}, + sounds = default.node_sound_stone_defaults() +}) + minetest.register_node("darkage:glass", { description = "Medieval Glass", drawtype = "glasslike", diff --git a/init.lua b/init.lua index 284851f..9bdd2b9 100644 --- a/init.lua +++ b/init.lua @@ -80,6 +80,22 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "darkage:chalked_bricks_with_plaster 2", + recipe = { + {"darkage:chalked_bricks", "darkage:chalk_powder"}, + {"darkage:chalked_bricks", "darkage:chalk_powder"}, + } +}) + +minetest.register_craft({ + output = "darkage:chalked_bricks_with_plaster 2", + recipe = { + {"darkage:chalk_powder", "darkage:chalked_bricks"}, + {"darkage:chalk_powder", "darkage:chalked_bricks"}, + } +}) + minetest.register_craft({ output = "darkage:darkdirt 4", recipe = { diff --git a/nodes.lua b/nodes.lua index eec0d5f..43c6c60 100644 --- a/nodes.lua +++ b/nodes.lua @@ -37,9 +37,10 @@ minetest.register_node("darkage:chalk", { }) minetest.register_node("darkage:cobble_with_plaster", { - description = "Cobblestone With Plaster", - tiles = {"darkage_cobble_with_plaster_D.png", "darkage_cobble_with_plaster_B.png", "darkage_cobble_with_plaster_C.png", - "darkage_cobble_with_plaster_A.png", "default_cobble.png", "darkage_chalk.png"}, + description = "Cobblestone with Plaster", + tiles = {"darkage_chalk.png^(default_cobble.png^[mask:darkage_plaster_mask_D.png)", "darkage_chalk.png^(default_cobble.png^[mask:darkage_plaster_mask_B.png)", + "darkage_chalk.png^(default_cobble.png^[mask:darkage_plaster_mask_C.png)", "darkage_chalk.png^(default_cobble.png^[mask:darkage_plaster_mask_A.png)", + "default_cobble.png", "darkage_chalk.png"}, is_ground_content = false, paramtype2 = "facedir", drop = 'default:cobble', @@ -47,6 +48,29 @@ minetest.register_node("darkage:cobble_with_plaster", { sounds = default.node_sound_stone_defaults(), }) +minetest.register_node("darkage:chalked_bricks_with_plaster", { + description = "Chalked Bricks with Plaster", + tiles = {"darkage_chalk.png^(darkage_chalked_bricks.png^[mask:darkage_plaster_mask_D.png)", "darkage_chalk.png^(darkage_chalked_bricks.png^[mask:darkage_plaster_mask_B.png)", + "darkage_chalk.png^(darkage_chalked_bricks.png^[mask:darkage_plaster_mask_C.png)", "darkage_chalk.png^(darkage_chalked_bricks.png^[mask:darkage_plaster_mask_A.png)", + "darkage_chalked_bricks.png", "darkage_chalk.png"}, + is_ground_content = false, + paramtype2 = "facedir", + drop = 'default:cobble', + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), +}) + +--lbm to convert the old cobble_with_plaster to the new chalked_bricks to keep texture consistent +minetest.register_lbm({ + name="darkage:convert_cobble_with_plaster", + nodenames= "darkage:cobble_with_plaster", + run_at_every_load = false, + action = function(pos,node) + node.name = "darkage:chalked_bricks_with_plaster" + minetest.swap_node(pos, node) + end +}) + minetest.register_node("darkage:desert_stone_with_iron", { description = "Desert Iron Ore", tiles = {"default_desert_stone.png^default_mineral_iron.png"}, @@ -344,3 +368,23 @@ minetest.register_node("darkage:rhyolitic_tuff_rubble", { }) +--[[ + add a node using the cobble texture that was introduced in minetest 0.4.dev-20120408 and got removed in 0.4.7 + It has a nice contrast together the stone bricks, so I think it could get usefull. +]] +minetest.register_node("darkage:chalked_bricks", { + description = "Chalked Brick", + tiles = {"darkage_chalked_bricks.png"}, + is_ground_content = false, + groups = {cracky = 2, stone = 1}, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_craft({ + output = "darkage:chalked_bricks 4", + recipe = { + {"default:stone", "default:stone", "darkage:chalk_powder"}, + {"darkage:chalk_powder", "darkage:chalk_powder", "darkage:chalk_powder"}, + {"default:stone", "darkage:chalk_powder", "default:stone"}, + } +}) \ No newline at end of file diff --git a/stairs.lua b/stairs.lua index 99395c1..fd75e4b 100644 --- a/stairs.lua +++ b/stairs.lua @@ -2,6 +2,7 @@ -- Registration of Stairs (Alphabetical order) darkage.register_stairs("darkage:basalt") darkage.register_stairs("darkage:basalt_cobble") +darkage.register_stairs("darkage:chalked_bricks") darkage.register_stairs("darkage:gneiss") darkage.register_stairs("darkage:gneiss_cobble") darkage.register_stairs("darkage:marble") diff --git a/textures/darkage_chalked_bricks.png b/textures/darkage_chalked_bricks.png new file mode 100644 index 0000000..adc0ff3 Binary files /dev/null and b/textures/darkage_chalked_bricks.png differ diff --git a/textures/darkage_cobble_with_plaster_A.png b/textures/darkage_cobble_with_plaster_A.png deleted file mode 100644 index b64ca52..0000000 Binary files a/textures/darkage_cobble_with_plaster_A.png and /dev/null differ diff --git a/textures/darkage_cobble_with_plaster_B.png b/textures/darkage_cobble_with_plaster_B.png deleted file mode 100644 index 786f773..0000000 Binary files a/textures/darkage_cobble_with_plaster_B.png and /dev/null differ diff --git a/textures/darkage_cobble_with_plaster_C.png b/textures/darkage_cobble_with_plaster_C.png deleted file mode 100644 index a65b791..0000000 Binary files a/textures/darkage_cobble_with_plaster_C.png and /dev/null differ diff --git a/textures/darkage_cobble_with_plaster_D.png b/textures/darkage_cobble_with_plaster_D.png deleted file mode 100644 index bf3f84d..0000000 Binary files a/textures/darkage_cobble_with_plaster_D.png and /dev/null differ diff --git a/textures/darkage_glow_stone_lamp.png b/textures/darkage_glow_stone_lamp.png deleted file mode 100644 index 76631be..0000000 Binary files a/textures/darkage_glow_stone_lamp.png and /dev/null differ diff --git a/textures/darkage_plaster_mask_A.png b/textures/darkage_plaster_mask_A.png new file mode 100644 index 0000000..71ab8fe Binary files /dev/null and b/textures/darkage_plaster_mask_A.png differ diff --git a/textures/darkage_plaster_mask_B.png b/textures/darkage_plaster_mask_B.png new file mode 100644 index 0000000..d46b628 Binary files /dev/null and b/textures/darkage_plaster_mask_B.png differ diff --git a/textures/darkage_plaster_mask_C.png b/textures/darkage_plaster_mask_C.png new file mode 100644 index 0000000..feed36d Binary files /dev/null and b/textures/darkage_plaster_mask_C.png differ diff --git a/textures/darkage_plaster_mask_D.png b/textures/darkage_plaster_mask_D.png new file mode 100644 index 0000000..3131f6a Binary files /dev/null and b/textures/darkage_plaster_mask_D.png differ