diff --git a/CHANGELOG.md b/CHANGELOG.md index bb974e3..88a7f88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ - Added the Magic Shards Ore which can be found in the Lava World - Remove the Slime and Mushroom world because adding content for all 5 different worlds is gonna be hard. - Water and Lava now have "chemical reactions" +- Added Calcite - A lot of other changes that I forgot to document ## [Oct 19th 2024] Bugfix Update diff --git a/mods/ITEMS/pyutest_blocks/basic.lua b/mods/ITEMS/pyutest_blocks/basic.lua index 9943eeb..a832d16 100644 --- a/mods/ITEMS/pyutest_blocks/basic.lua +++ b/mods/ITEMS/pyutest_blocks/basic.lua @@ -86,6 +86,12 @@ PyuTest.make_building_blocks("pyutest_blocks:tuff", "Tuff", {"pyutest-tuff.png"} cracky = PyuTest.BLOCK_NORMAL, }) +PyuTest.make_building_blocks("pyutest_blocks:calcite", "Calcite", {"pyutest-calcite.png"}, nil, { + ground = 1, + stone = 1, + cracky = PyuTest.BLOCK_NORMAL, +}) + PyuTest.make_building_blocks("pyutest_blocks:stone_bricks", "Stone Bricks", { "pyutest-bricks2.png" }, "#82807c", { diff --git a/mods/WORLD/pyutest_mapgen/api.lua b/mods/WORLD/pyutest_mapgen/api.lua index b721eae..fdf774e 100644 --- a/mods/WORLD/pyutest_mapgen/api.lua +++ b/mods/WORLD/pyutest_mapgen/api.lua @@ -41,7 +41,7 @@ PyuTest.is_flat = function() return minetest.get_mapgen_setting("mg_name") == "flat" end -PyuTest.SPECIALSTONE_NOISE_PARAMS = { +PyuTest.SPECIAL_STONE_NOISE_PARAMS = { offset = 0, scale = 1, spread = {x = 250, y = 250, z = 250}, @@ -52,6 +52,17 @@ PyuTest.SPECIALSTONE_NOISE_PARAMS = { flags = "defaults" } +PyuTest.MOUNTAIN_STRIP_NOISE_PARAMS = { + offset = 0, + scale = 1, + spread = {x = 512, y = 512, z = 512}, + -- seed = 8425, + octaves = 6, + persist = 0.4, + lacunarity = 2, + flags = "defaults" +} + PyuTest.BIOME_TOPS = { lowland = 10, normal = 30, diff --git a/mods/WORLD/pyutest_mapgen/mapgen.lua b/mods/WORLD/pyutest_mapgen/mapgen.lua index 52ba473..ffef301 100644 --- a/mods/WORLD/pyutest_mapgen/mapgen.lua +++ b/mods/WORLD/pyutest_mapgen/mapgen.lua @@ -7,7 +7,7 @@ minetest.register_alias("mapgen_singlenode", "air") local mg_flags = minetest.settings:get_flags("mg_flags") local mg_name = minetest.get_mapgen_setting("mg_name") minetest.set_mapgen_setting(string.format("mg%s_cavern_threshold", mg_name), "0.20", true) -minetest.set_mapgen_setting(string.format("mg%s_mount_zero_level", mg_name), "1.1", true) +minetest.set_mapgen_setting(string.format("mg%s_mount_zero_level", mg_name), "1.4", true) mg_flags.caverns = true mg_flags.dungeons = false diff --git a/mods/WORLD/pyutest_ores/init.lua b/mods/WORLD/pyutest_ores/init.lua index 46d97fa..9683cc2 100644 --- a/mods/WORLD/pyutest_ores/init.lua +++ b/mods/WORLD/pyutest_ores/init.lua @@ -10,7 +10,7 @@ minetest.register_ore({ clust_size = 5, y_max = PyuTest.OVERWORLD_SURFACE_BOTTOM - 1, y_min = PyuTest.OVERWORLD_BOTTOM, - noise_params = PyuTest.SPECIALSTONE_NOISE_PARAMS + noise_params = PyuTest.SPECIAL_STONE_NOISE_PARAMS }) minetest.register_ore({ @@ -22,7 +22,7 @@ minetest.register_ore({ clust_size = 5, y_max = PyuTest.OVERWORLD_SURFACE_BOTTOM - 1, y_min = PyuTest.OVERWORLD_BOTTOM, - noise_params = PyuTest.SPECIALSTONE_NOISE_PARAMS + noise_params = PyuTest.SPECIAL_STONE_NOISE_PARAMS }) minetest.register_ore({ @@ -34,7 +34,7 @@ minetest.register_ore({ clust_size = 5, y_max = PyuTest.OVERWORLD_SURFACE_BOTTOM - 1, y_min = PyuTest.OVERWORLD_BOTTOM, - noise_params = PyuTest.SPECIALSTONE_NOISE_PARAMS + noise_params = PyuTest.SPECIAL_STONE_NOISE_PARAMS }) minetest.register_ore({ @@ -46,7 +46,7 @@ minetest.register_ore({ clust_size = 5, y_max = PyuTest.OVERWORLD_SURFACE_BOTTOM - 1, y_min = PyuTest.OVERWORLD_BOTTOM, - noise_params = PyuTest.SPECIALSTONE_NOISE_PARAMS + noise_params = PyuTest.SPECIAL_STONE_NOISE_PARAMS }) minetest.register_ore({ @@ -58,7 +58,7 @@ minetest.register_ore({ clust_size = 5, y_max = PyuTest.OVERWORLD_SURFACE_BOTTOM - 1, y_min = PyuTest.OVERWORLD_DEEP_OCEAN_MIN, - noise_params = PyuTest.SPECIALSTONE_NOISE_PARAMS + noise_params = PyuTest.SPECIAL_STONE_NOISE_PARAMS }) PyuTest.ORE_STONES = { @@ -78,7 +78,7 @@ minetest.register_ore({ clust_size = 5, y_max = PyuTest.OVERWORLD_SURFACE_BOTTOM - 1, y_min = PyuTest.OVERWORLD_BOTTOM, - noise_params = PyuTest.SPECIALSTONE_NOISE_PARAMS + noise_params = PyuTest.SPECIAL_STONE_NOISE_PARAMS }) -- Overworld ores diff --git a/mods/WORLD/pyutest_overworld/features.lua b/mods/WORLD/pyutest_overworld/features.lua index f4512b0..2592464 100644 --- a/mods/WORLD/pyutest_overworld/features.lua +++ b/mods/WORLD/pyutest_overworld/features.lua @@ -18,5 +18,28 @@ minetest.register_ore({ clust_num_ores = 1, clust_size = 1, y_max = PyuTest.OVERWORLD_TOP, + y_min = PyuTest.BIOME_TOPS.normal, +}) + +minetest.register_ore({ + ore_type = "scatter", + ore = "pyutest_blocks:lava_source", + wherein = PyuTest.ORE_STONES, + clust_scarcity = 16 * 16 * 16, + clust_num_ores = 1, + clust_size = 1, + y_max = PyuTest.OVERWORLD_DEEP_OCEAN_MIN - 1, y_min = PyuTest.OVERWORLD_BOTTOM, }) + +-- Mountain Strips +minetest.register_ore({ + ore_type = "sheet", + ore = "pyutest_blocks:calcite_block", + wherein = "pyutest_blocks:stone_block", + y_max = PyuTest.BIOME_TOPS.mountains, + y_min = PyuTest.BIOME_TOPS.normal, + noise_params = PyuTest.MOUNTAIN_STRIP_NOISE_PARAMS, + column_height_max = 12, + column_height_min = 8, +}) diff --git a/mods/WORLD/pyutest_worlds/ice.lua b/mods/WORLD/pyutest_worlds/ice.lua index a0b5a75..3bf2368 100644 --- a/mods/WORLD/pyutest_worlds/ice.lua +++ b/mods/WORLD/pyutest_worlds/ice.lua @@ -20,7 +20,7 @@ PyuTest.IceWorld:register_ore({ clust_num_ores = 35, clust_size = 5, biomes = {icy_cavern}, - noise_params = PyuTest.SPECIALSTONE_NOISE_PARAMS + noise_params = PyuTest.SPECIAL_STONE_NOISE_PARAMS }) PyuTest.IceWorld:register_ore({ @@ -31,5 +31,5 @@ PyuTest.IceWorld:register_ore({ clust_num_ores = 6, clust_size = 5, biomes = {icy_cavern}, - noise_params = PyuTest.SPECIALSTONE_NOISE_PARAMS + noise_params = PyuTest.SPECIAL_STONE_NOISE_PARAMS }) diff --git a/mods/WORLD/pyutest_worlds/lava.lua b/mods/WORLD/pyutest_worlds/lava.lua index dfe8427..036f2bb 100644 --- a/mods/WORLD/pyutest_worlds/lava.lua +++ b/mods/WORLD/pyutest_worlds/lava.lua @@ -31,7 +31,7 @@ PyuTest.LavaWorld:register_ore({ clust_num_ores = 6, clust_size = 5, biomes = {lava_cavern}, - noise_params = PyuTest.SPECIALSTONE_NOISE_PARAMS + noise_params = PyuTest.SPECIAL_STONE_NOISE_PARAMS }) PyuTest.LavaWorld:register_ore({ @@ -42,7 +42,7 @@ PyuTest.LavaWorld:register_ore({ clust_num_ores = 1, clust_size = 2, biomes = PyuTest.LavaWorld.biome_names, - noise_params = PyuTest.SPECIALSTONE_NOISE_PARAMS + noise_params = PyuTest.SPECIAL_STONE_NOISE_PARAMS }) PyuTest.make_ore("pyutest_worlds:magic_shards_ore", "Magic Shards Ore", { diff --git a/textures/pyutest-calcite.png b/textures/pyutest-calcite.png new file mode 100644 index 0000000..b874ad6 Binary files /dev/null and b/textures/pyutest-calcite.png differ