diff --git a/README.md b/README.md index 59fc033..07e5fe2 100644 --- a/README.md +++ b/README.md @@ -84,8 +84,6 @@ Version 0.1 * 6 Nodes -PS: This document has been structured as the README.txt of PilzAdam in - his Bed MOD. ### How to install: Unzip the archive an place it in minetest-base-directory/mods/ @@ -113,10 +111,10 @@ invented. I have to improve this texture, it is ugly :P A darken version of the default Stone COOKING - [Basalt Cobble] + [Basalt Rubble] -### Basalt Cobble: +### Basalt Rubble: A darken version of the default Cobble. CRAFT -> 4 @@ -179,14 +177,14 @@ Furnace and then put together to create the Straw ### Gneiss: High grade metamorphic rock formed from Schist, very common, and used in construction. It sometimes brakes in -Gneiss Cobble when being dug. +Gneiss Rubble when being dug. COOKING [Schist] -### Gneiss Cobble: -Brick version of the gneiss. +### Gneiss Rubble: +Cobble version of the gneiss. From dig gneiss @@ -214,15 +212,15 @@ sandstone with iron that gives it this color. [Iron Lump] [Sandstone] COOKING - [Old Red Sandstone Cobble] + [Old Red Sandstone Rubble] -### Old Red Sandstone Cobble: +### Old Red Sandstone Rubble: Cobbles of Old Red Sandstone. CRAFT -> 4 - [Sandstone Cobble] [Sandstone Cobble] - [Iron Lump] [Sandstone Cobble] + [Sandstone] [Sandstone] + [Iron Lump] [Sandstone] ### Reinforced Cobble: @@ -234,14 +232,6 @@ Brick with crossed wooden. [Stick] [] [Stick] -### Sandstone Cobble: -Brick version of the Sandstone, good for -buildings with a pale color. - - COOKING - [Sandstone] - - ### Schist: Medium grade metamorphic rock from Slate. @@ -270,7 +260,7 @@ low-grade regional metamorphism. It is used to build roof. [Slate Cobble] -### Slate Cobble: +### Slate Rubble: Cobble obtained from Slate From dig Slate @@ -283,8 +273,8 @@ slate is easy to find. Note: It has stairs and slabs. CRAFT -> 2 - [Slate Cobble] [Slate Cobble] - [Slate Cobble] [Slate Cobble] + [Slate Rubble] [Slate Rubble] + [Slate Rubble] [Slate Rubble] ### Straw Bale: diff --git a/aliases.lua b/aliases.lua index 7c149f2..d82cb53 100644 --- a/aliases.lua +++ b/aliases.lua @@ -68,7 +68,30 @@ minetest.register_alias("darkage:ors_cobble", "darkage:ors_brick") minetest.register_alias("stairs:slab_ors_cobble", "stairs:slab_ors_brick") minetest.register_alias("stairs:stair_ors_cobble", "stairs:stair_ors_brick") register_moreblocks_alias("darkage:ors_cobble", "darkage:ors_brick") +minetest.register_alias("darkage:ors_cobble_wall", "darkage:ors_rubble_wall") -- Slate Tile minetest.register_alias( "darkage:slate_tale", "darkage:slate_tile") register_moreblocks_alias("darkage:slate_tale", "darkage:slate_tile") + + +-- Basalt Brick +minetest.register_alias("darkage:basalt_cobble", "darkage:basalt_brick") +minetest.register_alias("stairs:slab_basalt_cobble", "stairs:slab_basalt_brick") +minetest.register_alias("stairs:stair_basalt_cobble", "stairs:stair_basalt_brick") +register_moreblocks_alias("darkage:basalt_cobble", "darkage:basalt_brick") +minetest.register_alias("darkage:basalt_cobble_wall", "darkage:basalt_rubble_wall") + +-- Slate Brick +minetest.register_alias("darkage:slate_cobble", "darkage:slate_brick") +minetest.register_alias("stairs:slab_slate_cobble", "stairs:slab_slate_brick") +minetest.register_alias("stairs:stair_slate_cobble", "stairs:stair_slate_brick") +register_moreblocks_alias("darkage:slate_cobble", "darkage:slate_brick") +minetest.register_alias("darkage:slate_cobble_wall", "darkage:slate_rubble_wall") + +-- Gneiss Brick +minetest.register_alias("darkage:gneiss_cobble", "darkage:gneiss_brick") +minetest.register_alias("stairs:slab_gneiss_cobble", "stairs:slab_gneiss_brick") +minetest.register_alias("stairs:stair_gneiss_cobble", "stairs:stair_gneiss_brick") +register_moreblocks_alias("darkage:gneis_cobble", "darkage:gneiss_brick") +minetest.register_alias("darkage:gneiss_cobble_wall", "darkage:gneiss_rubble_wall") diff --git a/init.lua b/init.lua index a97c1bd..359bd07 100644 --- a/init.lua +++ b/init.lua @@ -55,15 +55,40 @@ minetest.register_craft({ } }) +--[[ + Basalt +]] +minetest.register_craft({ + type = "cooking", + output = "darkage:basalt", + recipe = "darkage:basalt_rubble", +}) minetest.register_craft({ - output = "darkage:basalt_cobble 4", + output = "darkage:basalt_rubble 4", recipe = { {"default:cobble", "default:cobble"}, {"default:coal_lump", "default:coal_lump"}, } }) +minetest.register_craft({ + output = "darkage:basalt_brick 4", + recipe = { + {"darkage:basalt", "darkage:basalt"}, + {"darkage:basalt", "darkage:basalt"}, + } +}) + +minetest.register_craft({ + output = "darkage:basalt_block 9", + recipe = { + {"darkage:basalt", "darkage:basalt", "darkage:basalt"}, + {"darkage:basalt", "darkage:basalt", "darkage:basalt"}, + {"darkage:basalt", "darkage:basalt", "darkage:basalt"}, + } +}) + minetest.register_craft({ output = "darkage:cobble_with_plaster 2", recipe = { @@ -104,6 +129,38 @@ minetest.register_craft({ } }) +--[[ + Gneiss +]] +minetest.register_craft({ + type = "cooking", + output = "darkage:gneiss", + recipe = "darkage:schist", +}) + +minetest.register_craft({ + type = "cooking", + output = "darkage:gneiss", + recipe = "darkage:gneiss_rubble", +}) + +minetest.register_craft({ + output = "darkage:gneiss_brick 4", + recipe = { + {"darkage:gneiss", "darkage:gneiss"}, + {"darkage:gneiss", "darkage:gneiss"}, + } +}) + +minetest.register_craft({ + output = "darkage:gneiss_block 9", + recipe = { + {"darkage:gneiss", "darkage:gneiss", "darkage:gneiss"}, + {"darkage:gneiss", "darkage:gneiss", "darkage:gneiss"}, + {"darkage:gneiss", "darkage:gneiss", "darkage:gneiss"}, + } +}) + minetest.register_craft({ output = "darkage:mud 3", recipe = { @@ -120,6 +177,24 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "darkage:marble_tile 2", + recipe = { + {"darkage:marble", "darkage:marble"}, + {"darkage:marble", "darkage:marble"}, + } +}) + +--[[ + Old Red Sandstone +]] + +minetest.register_craft({ + type = "cooking", + output = "darkage:ors", + recipe = "darkage:ors_rubble", +}) + minetest.register_craft({ output = "darkage:ors 4", recipe = { @@ -127,6 +202,22 @@ minetest.register_craft({ {"default:iron_lump", "default:sandstone"}, } }) +minetest.register_craft({ + output = "darkage:ors_brick 4", + recipe = { + {"darkage:ors", "darkage:ors"}, + {"darkage:ors", "darkage:ors"}, + } +}) + +minetest.register_craft({ + output = "darkage:ors_block 9", + recipe = { + {"darkage:ors", "darkage:ors", "darkage:ors"}, + {"darkage:ors", "darkage:ors", "darkage:ors"}, + {"darkage:ors", "darkage:ors", "darkage:ors"}, + } +}) minetest.register_craft({ output = "darkage:silt 3", @@ -144,11 +235,37 @@ minetest.register_craft({ } }) +--[[ + Slate +]] +minetest.register_craft({ + type = "cooking", + output = "darkage:slate", + recipe = "darkage:slate_rubble", +}) + +minetest.register_craft({ + output = "darkage:slate_brick 4", + recipe = { + {"darkage:slate", "darkage:slate"}, + {"darkage:slate", "darkage:slate"}, + } +}) + +minetest.register_craft({ + output = "darkage:slate_block 9", + recipe = { + {"darkage:slate", "darkage:slate", "darkage:slate"}, + {"darkage:slate", "darkage:slate", "darkage:slate"}, + {"darkage:slate", "darkage:slate", "darkage:slate"}, + } +}) + minetest.register_craft({ output = "darkage:slate_tile 2", recipe = { - {"darkage:slate_cobble", "darkage:slate_cobble"}, - {"darkage:slate_cobble", "darkage:slate_cobble"}, + {"darkage:slate_brick", "darkage:slate_brick"}, + {"darkage:slate_brick", "darkage:slate_brick"}, } }) @@ -176,11 +293,7 @@ minetest.register_craft({ }) -- Cookings -minetest.register_craft({ - type = "cooking", - output = "darkage:basalt", - recipe = "darkage:basalt_cobble", -}) + minetest.register_craft({ type = "cooking", @@ -188,24 +301,6 @@ minetest.register_craft({ recipe = "default:leaves", }) -minetest.register_craft({ - type = "cooking", - output = "darkage:gneiss", - recipe = "darkage:schist", -}) - -minetest.register_craft({ - type = "cooking", - output = "darkage:gneiss", - recipe = "darkage:gneiss_cobble", -}) - -minetest.register_craft({ - type = "cooking", - output = "darkage:ors", - recipe = "darkage:ors_brick", -}) - minetest.register_craft({ type = "cooking", output = "darkage:schist", @@ -227,7 +322,7 @@ minetest.register_craft({ minetest.register_craft({ type = "cooking", output = "darkage:slate", - recipe = "darkage:slate_cobble", + recipe = "darkage:slate_rubble", }) -- Desert diff --git a/nodes.lua b/nodes.lua index ed79bbd..831eb81 100644 --- a/nodes.lua +++ b/nodes.lua @@ -1,3 +1,20 @@ +local function get_node_drops(fullRockNode, cobbleRockNode) + return { + max_items = 1, + items = { + { + -- drop the cobble variant with 1/3 chance + items = {cobbleRockNode}, + rarity = 3, + }, + { + -- drop the full node with 2/3 chance + items = {fullRockNode}, + } + } + } +end + ---------- -- Nodes ---------- @@ -10,23 +27,45 @@ minetest.register_node("darkage:adobe", { sounds = default.node_sound_sand_defaults(), }) +--[[ + Basalt +]] minetest.register_node("darkage:basalt", { description = "Basalt", tiles = {"darkage_basalt.png"}, is_ground_content = true, - drop = 'darkage:basalt_cobble', - groups = {cracky=3}, + drop = get_node_drops("darkage:basalt","darkage:basalt_rubble"), + groups = {cracky = 3, stone = 1}, sounds = default.node_sound_stone_defaults() }) -minetest.register_node("darkage:basalt_cobble", { - description = "Basalt Cobble", - tiles = {"darkage_basalt_cobble.png"}, - is_ground_content = true, - groups = {cracky=3}, +minetest.register_node("darkage:basalt_rubble", { + description = "Basalt Rubble", + tiles = {"darkage_basalt_rubble.png"}, + is_ground_content = false, + groups = {cracky = 3, stone = 2}, sounds = default.node_sound_stone_defaults() }) +minetest.register_node("darkage:basalt_brick", { + description = "Basalt Brick", + tiles = {"darkage_basalt_brick.png"}, + is_ground_content = false, + groups = {cracky = 2, stone = 1}, + sounds = default.node_sound_stone_defaults() +}) + +minetest.register_node("darkage:basalt_block", { + description = "Basalt Block", + tiles = {"darkage_basalt_block.png"}, + is_ground_content = false, + groups = {cracky = 2, stone = 1}, + sounds = default.node_sound_stone_defaults() +}) + +--[[ + Chalk +]] minetest.register_node("darkage:chalk", { description = "Chalk", tiles = {"darkage_chalk.png"}, @@ -97,40 +136,58 @@ minetest.register_node("darkage:dry_leaves", { sounds = default.node_sound_leaves_defaults() }) +--[[ + Gneiss +]] minetest.register_node("darkage:gneiss", { description = "Gneiss", tiles = {"darkage_gneiss.png"}, is_ground_content = true, - groups = {cracky=3}, - drop = { - max_items = 1, - items = { - { - -- player will get cobbles with 1/3 chance - items = {'darkage:gneiss_cobble'}, - rarity = 3, - }, - { - items = {'darkage:gneiss'}, - } - } - }, + groups = {cracky = 3, stone = 1}, + drop = get_node_drops("darkage:gneiss", "darkage:gneiss_rubble"), sounds = default.node_sound_stone_defaults() }) -minetest.register_node("darkage:gneiss_cobble", { - description = "Gneiss Cobble", - tiles = {"darkage_gneiss_cobble.png"}, +minetest.register_node("darkage:gneiss_rubble", { + description = "Gneiss Rubble", + tiles = {"darkage_gneiss_rubble.png"}, is_ground_content = false, - groups = {cracky=3}, + groups = {cracky = 3, stone = 2}, sounds = default.node_sound_stone_defaults() }) +minetest.register_node("darkage:gneiss_brick", { + description = "Gneiss Brick", + tiles = {"darkage_gneiss_brick.png"}, + is_ground_content = false, + groups = {cracky = 2, stone = 1}, + sounds = default.node_sound_stone_defaults() +}) + +minetest.register_node("darkage:gneiss_block", { + description = "Gneiss Block", + tiles = {"darkage_gneiss_block.png"}, + is_ground_content = false, + groups = {cracky = 2, stone = 1}, + sounds = default.node_sound_stone_defaults() +}) + +--[[ + Marble +]] minetest.register_node("darkage:marble", { description = "Marble", tiles = {"darkage_marble.png"}, is_ground_content = true, - groups = {cracky=3}, + groups = {cracky = 3, stone = 1}, + sounds = default.node_sound_stone_defaults() +}) + +minetest.register_node("darkage:marble_tile", { + description = "Marble Tile", + tiles = {"darkage_marble_tile.png"}, + is_ground_content = false, + groups = {cracky=2}, sounds = default.node_sound_stone_defaults() }) @@ -145,12 +202,23 @@ minetest.register_node("darkage:mud", { }), }) +--[[ + Old Red Sandstone +]] minetest.register_node("darkage:ors", { description = "Old Red Sandstone", tiles = {"darkage_ors.png"}, is_ground_content = true, - drop = "darkage:ors_brick", - groups = {crumbly=2,cracky=2}, + drop = "darkage:ors_rubble", + groups = {cracky=2}, + sounds = default.node_sound_stone_defaults() +}) + +minetest.register_node("darkage:ors_rubble", { + description = "Old Red Sandstone Rubble", + tiles = {"darkage_ors_rubble.png"}, + is_ground_content = true, + groups = {cracky = 3, crumbly=2, stone = 2}, sounds = default.node_sound_stone_defaults() }) @@ -158,7 +226,15 @@ minetest.register_node("darkage:ors_brick", { description = "Old Red Sandstone Brick", tiles = {"darkage_ors_brick.png"}, is_ground_content = false, - groups = {crumbly=2,cracky=2}, + groups = {cracky = 3, stone = 2}, + sounds = default.node_sound_stone_defaults() +}) + +minetest.register_node("darkage:ors_block", { + description = "Old Red Sandstone Block", + tiles = {"darkage_ors_block.png"}, + is_ground_content = false, + groups = {cracky = 3, stone = 2}, sounds = default.node_sound_stone_defaults() }) @@ -197,18 +273,21 @@ minetest.register_node("darkage:silt", { }), }) +--[[ + Slate +]] minetest.register_node("darkage:slate", { description = "Slate", tiles = {"darkage_slate.png","darkage_slate.png","darkage_slate_side.png"}, is_ground_content = true, - drop = 'darkage:slate_cobble', + drop = 'darkage:slate_rubble', groups = {cracky=2}, sounds = default.node_sound_stone_defaults() }) -minetest.register_node("darkage:slate_cobble", { - description = "Slate Cobble", - tiles = {"darkage_slate_cobble.png"}, +minetest.register_node("darkage:slate_rubble", { + description = "Slate Rubble", + tiles = {"darkage_slate_rubble.png"}, is_ground_content = false, groups = {cracky=2}, sounds = default.node_sound_stone_defaults() @@ -222,6 +301,22 @@ minetest.register_node("darkage:slate_tile", { sounds = default.node_sound_stone_defaults() }) +minetest.register_node("darkage:slate_block", { + description = "Slate Block", + tiles = {"darkage_slate_block.png"}, + is_ground_content = false, + groups = {cracky=2}, + sounds = default.node_sound_stone_defaults() +}) + +minetest.register_node("darkage:slate_brick", { + description = "Slate Brick", + tiles = {"darkage_slate_brick.png"}, + is_ground_content = false, + groups = {cracky=2}, + sounds = default.node_sound_stone_defaults() +}) + -- Removed straw, because its in minetst game. Registering alias for compatibility reasons minetest.register_alias("darkage:straw", "farming:straw") @@ -242,22 +337,6 @@ minetest.register_node("darkage:straw_bale", { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node("darkage:marble", { - description = "Marble", - tiles = {"darkage_marble.png"}, - is_ground_content = true, - groups = {cracky=2}, - sounds = default.node_sound_stone_defaults() -}) - -minetest.register_node("darkage:marble_tile", { - description = "Marble Tile", - tiles = {"darkage_marble_tile.png"}, - is_ground_content = false, - groups = {cracky=2}, - sounds = default.node_sound_stone_defaults() -}) - --[[ Tuff ]] diff --git a/stairs.lua b/stairs.lua index fd75e4b..d512e91 100644 --- a/stairs.lua +++ b/stairs.lua @@ -1,10 +1,10 @@ -- Registration of Stairs (Alphabetical order) darkage.register_stairs("darkage:basalt") -darkage.register_stairs("darkage:basalt_cobble") +darkage.register_stairs("darkage:basalt_rubble") darkage.register_stairs("darkage:chalked_bricks") darkage.register_stairs("darkage:gneiss") -darkage.register_stairs("darkage:gneiss_cobble") +darkage.register_stairs("darkage:gneiss_rubble") darkage.register_stairs("darkage:marble") darkage.register_stairs("darkage:marble_tile") darkage.register_stairs("darkage:old_tuff_bricks") @@ -16,7 +16,7 @@ darkage.register_stairs("darkage:schist") darkage.register_stairs("darkage:serpentine") darkage.register_stairs("darkage:shale") darkage.register_stairs("darkage:slate") -darkage.register_stairs("darkage:slate_cobble") +darkage.register_stairs("darkage:slate_rubble") darkage.register_stairs("darkage:slate_tile") darkage.register_stairs("darkage:stone_brick") darkage.register_stairs("darkage:straw_bale") diff --git a/textures/darkage_basalt_block.png b/textures/darkage_basalt_block.png new file mode 100644 index 0000000..27a4459 Binary files /dev/null and b/textures/darkage_basalt_block.png differ diff --git a/textures/darkage_basalt_cobble.png b/textures/darkage_basalt_brick.png similarity index 100% rename from textures/darkage_basalt_cobble.png rename to textures/darkage_basalt_brick.png diff --git a/textures/darkage_basalt_rubble.png b/textures/darkage_basalt_rubble.png new file mode 100644 index 0000000..334f5bf Binary files /dev/null and b/textures/darkage_basalt_rubble.png differ diff --git a/textures/darkage_chalked_bricks.png b/textures/darkage_chalked_bricks.png index 368d191..35f6e68 100644 Binary files a/textures/darkage_chalked_bricks.png and b/textures/darkage_chalked_bricks.png differ diff --git a/textures/darkage_gneiss_block.png b/textures/darkage_gneiss_block.png new file mode 100644 index 0000000..c21e03e Binary files /dev/null and b/textures/darkage_gneiss_block.png differ diff --git a/textures/darkage_gneiss_cobble.png b/textures/darkage_gneiss_brick.png similarity index 100% rename from textures/darkage_gneiss_cobble.png rename to textures/darkage_gneiss_brick.png diff --git a/textures/darkage_gneiss_rubble.png b/textures/darkage_gneiss_rubble.png new file mode 100644 index 0000000..adba739 Binary files /dev/null and b/textures/darkage_gneiss_rubble.png differ diff --git a/textures/darkage_ors_block.png b/textures/darkage_ors_block.png new file mode 100644 index 0000000..d313bde Binary files /dev/null and b/textures/darkage_ors_block.png differ diff --git a/textures/darkage_ors_rubble.png b/textures/darkage_ors_rubble.png new file mode 100644 index 0000000..91585b9 Binary files /dev/null and b/textures/darkage_ors_rubble.png differ diff --git a/textures/darkage_slate_block.png b/textures/darkage_slate_block.png new file mode 100644 index 0000000..523eeea Binary files /dev/null and b/textures/darkage_slate_block.png differ diff --git a/textures/darkage_slate_cobble.png b/textures/darkage_slate_brick.png similarity index 100% rename from textures/darkage_slate_cobble.png rename to textures/darkage_slate_brick.png diff --git a/textures/darkage_slate_rubble.png b/textures/darkage_slate_rubble.png new file mode 100644 index 0000000..5bd1f73 Binary files /dev/null and b/textures/darkage_slate_rubble.png differ diff --git a/walls.lua b/walls.lua index 464bf21..66dd0f8 100644 --- a/walls.lua +++ b/walls.lua @@ -40,10 +40,10 @@ local register_wall = function(base_node) end -register_wall("darkage:basalt_cobble") -register_wall("darkage:ors_brick") +register_wall("darkage:basalt_rubble") +register_wall("darkage:ors_rubble") register_wall("darkage:stone_brick") -register_wall("darkage:slate_cobble") +register_wall("darkage:slate_rubble") register_wall("darkage:tuff_bricks") register_wall("darkage:old_tuff_bricks") register_wall("darkage:rhyolitic_tuff_bricks")