From 10cfa229f0f44976343b44f6bc30e204845cd011 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Wed, 2 Dec 2020 12:27:00 +0000 Subject: [PATCH] Add blue marble --- README.md | 3 ++- biomes.lua | 35 +++++++++++++++++++++++-- lucky_block.lua | 3 +++ ores.lua | 1 + stairs.lua | 24 +++++++++++++++-- textures/ethereal_blue_marble.png | Bin 0 -> 583 bytes textures/ethereal_blue_marble_tile.png | Bin 0 -> 601 bytes 7 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 textures/ethereal_blue_marble.png create mode 100644 textures/ethereal_blue_marble_tile.png diff --git a/README.md b/README.md index 26b6b9a..6d7f8e2 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Ethereal Mapgen mod for Minetest (works on all except v6) - https://forum.minetest.net/viewtopic.php?f=11&t=14638 ## Lucky Blocks -42 +45 ## Changelog @@ -19,6 +19,7 @@ Ethereal Mapgen mod for Minetest (works on all except v6) - Use default grass abms - Split and re-write mapgen files for tidier generation - Giant Mushroom tops now decay when trunk removed + - Added Blue Marble to grey biomes and Blue Marble Tile recipe ### 1.26 diff --git a/biomes.lua b/biomes.lua index be13a10..fd39604 100644 --- a/biomes.lua +++ b/biomes.lua @@ -4,6 +4,34 @@ minetest.clear_registered_biomes() minetest.clear_registered_decorations() --minetest.clear_registered_ores() +local S = ethereal.intllib + + +-- Blue Marble Nodes +minetest.register_node("ethereal:blue_marble", { + description = S("Blue Marble"), + tiles = {"ethereal_blue_marble.png"}, + groups = {cracky = 1, stone = 1}, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_node("ethereal:blue_marble_tile", { + description = S("Blue Marble Tile"), + tiles = {"ethereal_blue_marble_tile.png"}, + groups = {cracky = 1, stone = 1}, + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_craft({ + output = "ethereal:blue_marble_tile 9", + recipe = { + {"ethereal:blue_marble", "ethereal:blue_marble", "ethereal:blue_marble"}, + {"ethereal:blue_marble", "ethereal:blue_marble", "ethereal:blue_marble"}, + {"ethereal:blue_marble", "ethereal:blue_marble", "ethereal:blue_marble"}, + } +}) + + -- helper strings local tmp, tmp2 @@ -115,8 +143,11 @@ end add_biome("grayness", 2, 41, 15, 30, ethereal.grayness, nil, "ethereal:gray_dirt", 1, "default:dirt", 3) -add_biome("grayness_ocean", -192, 1, 15, 30, ethereal.grayness, - nil, tmp, 2, "default:sand", 2) +--add_biome("grayness_ocean", -192, 1, 15, 30, ethereal.grayness, +-- nil, tmp, 2, "default:sand", 2) + +add_biome("grayness_ocean", -28, 1, 15, 30, ethereal.grayness, + nil, tmp, 2, "default:sand", 2, "ethereal:blue_marble") add_biome("grassytwo", 1, 91, 15, 40, ethereal.grassytwo, diff --git a/lucky_block.lua b/lucky_block.lua index 96afd4b..5a70694 100644 --- a/lucky_block.lua +++ b/lucky_block.lua @@ -67,6 +67,9 @@ lucky_block:add_blocks({ {name = "ethereal:sakura_sapling", max = 10}, {name = "ethereal:willow_sapling", max = 10}, }}, + {"flo", 5, {"ethereal:blue_marble_tile"}, 2}, + {"dro", {"ethereal:blue_marble", "ethereal:blue_marble_tile"}, 8}, + {"dro", {"ethereal:etherium_ore"}, 5}, }) if minetest.get_modpath("3d_armor") then diff --git a/ores.lua b/ores.lua index 27daa3f..1471f8e 100644 --- a/ores.lua +++ b/ores.lua @@ -53,6 +53,7 @@ local add_ore = function(a, b, c, d, e, f, g) }) end + -- Coal add_ore("default:stone_with_coal", "default:desert_stone", 24*24*24, 27, 6, -31000, -16) diff --git a/stairs.lua b/stairs.lua index 3714241..790b569 100644 --- a/stairs.lua +++ b/stairs.lua @@ -4,6 +4,12 @@ local S = ethereal.intllib -- Stairs Redo if stairs and stairs.mod and stairs.mod == "redo" then +stairs.register_all("blue_marble_tile", "ethereal:blue_marble_tile", + {cracky = 1}, + {"ethereal_blue_marble_tile.png"}, + S("Blue Marble Tile"), + default.node_sound_stone_defaults()) + stairs.register_all("crystal_block", "ethereal:crystal_block", {cracky = 1, level = 2, puts_out_fire = 1, cools_lava = 1}, {"crystal_block.png"}, @@ -15,7 +21,7 @@ stairs.register_all("icebrick", "ethereal:icebrick", {"brick_ice.png"}, S("Ice Brick"), default.node_sound_glass_defaults()) - + stairs.register_all("snowbrick", "ethereal:snowbrick", {crumbly = 3, puts_out_fire = 1, cools_lava = 1}, {"brick_snow.png"}, @@ -100,6 +106,13 @@ stairs.register_all("sakura_wood", "ethereal:sakura_wood", -- Stairs Plus (in More Blocks) elseif minetest.global_exists("stairsplus") then +stairsplus:register_all("ethereal", "blue_marble_tile", "ethereal:blue_marble_tile", { + description = S("Blue Marble Tile"), + tiles = {"ethereal_blue_marble_tile.png"}, + groups = {cracky = 1}, + sounds = default.node_sound_stone_defaults(), +}) + stairsplus:register_all("ethereal", "crystal_block", "ethereal:crystal_block", { description = S("Crystal block"), tiles = {"crystal_block.png"}, @@ -211,6 +224,13 @@ stairsplus:register_all("ethereal", "sakura_wood", "ethereal:sakura_wood", { -- Default Stairs else +stairs.register_stair_and_slab("blue_marble_tile", "ethereal:blue_marble_tile", + {cracky = 1}, + {"ethereal_blue_marble_tile.png"}, + S("Blue Marble Tile Stair"), + S("Blue Marble Tile Slab"), + default.node_sound_stone_defaults()) + stairs.register_stair_and_slab("crystal_block", "ethereal:crystal_block", {cracky = 1, level = 2, puts_out_fire = 1, cools_lava = 1}, {"crystal_block.png"}, @@ -224,7 +244,7 @@ stairs.register_stair_and_slab("icebrick", "ethereal:icebrick", S("Ice Brick Stair"), S("Ice Brick Slab"), default.node_sound_glass_defaults()) - + stairs.register_stair_and_slab("snowbrick", "ethereal:snowbrick", {crumbly = 3, puts_out_fire = 1, cools_lava = 1}, {"brick_snow.png"}, diff --git a/textures/ethereal_blue_marble.png b/textures/ethereal_blue_marble.png new file mode 100644 index 0000000000000000000000000000000000000000..5625fd487232c9c290e29a7dee34c25a36510e4f GIT binary patch literal 583 zcmV-N0=WH&P)I+d!WsLqsoV>(v-E>yYIpx0005f zNklWh6@PWFsLOL~<0AH(pD3C60~q0X4d7PvS%g z%1JpLbQs};3MqwMqC_G|O#$2wpn=VFZ}i^Nyf?7>qC+L_n$7A}Q&yun)WtEP@S-cT zTWqSTfqJcd;RR%7X;qj>4b3+Sd?DLY%Vg8_0*Z{a6ka>}j%2zwIczP5z7U?$QazZ_ z2~^7>K6DF;W&4Id{)Fvz@yRNing;02HDWeoOiul13ds=0b>l7*xu|Er1F4kdO^q9$i7s{ zXqixPqg#BhW{JFLjJI);#cY+wc9ptvmcx0S%Y>oCfTGEMqtJ+{(ulFxyWv%Z0005x zNkl+tA=?@Ad4=#@Xx~5 zr13ry&8ow@{Cylt}_wnoUt(U3pfQ-{qXkJ@Ds${hob=6Wg-0 zxm#EdxzB60Jp8=d-c_cCJ>ynpY|CHO`q0C$8u5 zCJ)Oj$CzVTu&6LM$9S2s+&xwbw&9oKFvbg}#1s;$SPH~EET~Rec7=#F z5v`kydZ6N1aTOEcj`I)}esvO4*X+A;J;S!(w5m0Q${1UY?JOCgipeF)HrBfS;AH@AHosmAxFf!ccc`9bO>W! zXoppFud4At&(BQ8%j>dSXI2rr@!$-%;3$8sjx~3cQcXh91{~TeuXlu+nrBBe8EwGF z8zM^HXh~8n)G9WZ<^_4`?gKvF&JEJ~{ zsD-G>0Jcmc)FN$(10>ah#JN4#$IiU