diff --git a/CHANGELOG.md b/CHANGELOG.md index f5308d8..32faef6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ I should just start giving updates a version number to avoid naming updates. - Added Basalt Magma - Fixed biomes in seperate worlds not generating - Sky World now has normal looking sky +- Added Cacti ## [Oct 20th - Nov 2nd] Update: The Something Update diff --git a/mods/ITEMS/pyutest_blocks/basic.lua b/mods/ITEMS/pyutest_blocks/basic.lua index 4dcf2c3..0038fde 100644 --- a/mods/ITEMS/pyutest_blocks/basic.lua +++ b/mods/ITEMS/pyutest_blocks/basic.lua @@ -25,6 +25,7 @@ PyuTest.make_building_blocks("pyutest_blocks:sand", "Sand", { "pyutest-sand.png" acid_vulnerable = 1, falling_node = 1, sugarcane_spawn_on = 1, + sand = 1, crumbly = PyuTest.BLOCK_FAST }) diff --git a/mods/ITEMS/pyutest_flowers/init.lua b/mods/ITEMS/pyutest_flowers/init.lua index 7431b07..3fecdc1 100644 --- a/mods/ITEMS/pyutest_flowers/init.lua +++ b/mods/ITEMS/pyutest_flowers/init.lua @@ -127,3 +127,15 @@ PyuTest.make_flower("pyutest_flowers:small_mushroom", "Small Mushroom", "pyutest paramtype2 = "wallmounted" }) + +PyuTest.make_node("pyutest_flowers:cactus", "Cactus", { + oddly_breakable_by_hand = PyuTest.BLOCK_FAST, + flammable = 1, + flower = 1, + dig_immediate = 1, + attached_node = 1, +}, { + "pyutest-cactus-top-bottom.png", + "pyutest-cactus-top-bottom.png", + "pyutest-cactus-sides.png", +}) diff --git a/mods/WORLD/pyutest_environment/init.lua b/mods/WORLD/pyutest_environment/init.lua index 7a580e9..6aa8ece 100644 --- a/mods/WORLD/pyutest_environment/init.lua +++ b/mods/WORLD/pyutest_environment/init.lua @@ -32,7 +32,7 @@ minetest.register_abm({ local heat = def.heat_point or 50 - if heat >= 95 then + if heat >= 85 then minetest.remove_node(pos) end end diff --git a/mods/WORLD/pyutest_overworld/biomes.lua b/mods/WORLD/pyutest_overworld/biomes.lua index 53386cf..4b657f9 100644 --- a/mods/WORLD/pyutest_overworld/biomes.lua +++ b/mods/WORLD/pyutest_overworld/biomes.lua @@ -32,11 +32,11 @@ PyuTest.register_overworld_biome("Desert", PyuTest.BIOME_TYPES.HOT, { node_filler = "pyutest_blocks:sandstone_block", node_riverbed = "pyutest_blocks:sand_block", - y_max = PyuTest.BIOME_TOPS.normal, + y_max = PyuTest.BIOME_TOPS.mountains, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 80, - humidity_point = 5, + humidity_point = 10, enable_beaches = false }) @@ -235,17 +235,6 @@ PyuTest.register_overworld_biome("StonyMountains", PyuTest.BIOME_TYPES.WARM, { humidity_point = 10 }, true) -PyuTest.register_overworld_biome("DesertMountains", PyuTest.BIOME_TYPES.HOT, { - node_top = "pyutest_blocks:sand_block", - node_filler = "pyutest_blocks:sandstone_block", - - y_max = PyuTest.BIOME_TOPS.mountains, - y_min = PyuTest.BIOME_TOPS.normal, - - heat_point = 80, - humidity_point = 5 -}, true) - PyuTest.register_overworld_biome("SnowyMountains", PyuTest.BIOME_TYPES.COLD, { node_dust = "pyutest_blocks:snow_carpet", node_top = "pyutest_blocks:snow_block", diff --git a/mods/WORLD/pyutest_overworld/trees.lua b/mods/WORLD/pyutest_overworld/trees.lua index b293cf5..3bf7ae3 100644 --- a/mods/WORLD/pyutest_overworld/trees.lua +++ b/mods/WORLD/pyutest_overworld/trees.lua @@ -44,6 +44,17 @@ minetest.register_decoration({ decoration = "pyutest_flowers:deadbush" }) +minetest.register_decoration({ + deco_type = "simple", + place_on = { "group:sand" }, + fill_ratio = 0.0009, + sidelen = 16, + biomes = { "Desert" }, + decoration = "pyutest_flowers:cactus", + height = 2, + height_max = 5 +}) + minetest.register_decoration({ deco_type = "simple", sidelen = 16, diff --git a/mods/WORLD/pyutest_worlds/lava.lua b/mods/WORLD/pyutest_worlds/lava.lua index ed0c285..54fc99e 100644 --- a/mods/WORLD/pyutest_worlds/lava.lua +++ b/mods/WORLD/pyutest_worlds/lava.lua @@ -13,7 +13,7 @@ local node_stones = { local lava_cavern = PyuTest.LavaWorld:register_biome("LavaCavern", PyuTest.BIOME_TYPES.HOT, { node_stone = "pyutest_blocks:molten_rock_block", - heat_point = 100, + heat_point = 85, humidity_point = 0, }) diff --git a/textures/pyutest-cactus-sides.png b/textures/pyutest-cactus-sides.png new file mode 100644 index 0000000..2ca43e0 Binary files /dev/null and b/textures/pyutest-cactus-sides.png differ diff --git a/textures/pyutest-cactus-top-bottom.png b/textures/pyutest-cactus-top-bottom.png new file mode 100644 index 0000000..c84a70a Binary files /dev/null and b/textures/pyutest-cactus-top-bottom.png differ