diff --git a/3dmushrooms/textures/3dmushrooms_brown.png b/3dmushrooms/textures/3dmushrooms_brown.png index c36f524..b82168e 100644 Binary files a/3dmushrooms/textures/3dmushrooms_brown.png and b/3dmushrooms/textures/3dmushrooms_brown.png differ diff --git a/3dmushrooms/textures/3dmushrooms_red.png b/3dmushrooms/textures/3dmushrooms_red.png index dc80e32..91cc4a5 100644 Binary files a/3dmushrooms/textures/3dmushrooms_red.png and b/3dmushrooms/textures/3dmushrooms_red.png differ diff --git a/3dmushrooms/textures/3dmushrooms_red_inv.png b/3dmushrooms/textures/3dmushrooms_red_inv.png index 796f867..9868053 100644 Binary files a/3dmushrooms/textures/3dmushrooms_red_inv.png and b/3dmushrooms/textures/3dmushrooms_red_inv.png differ diff --git a/bushes/textures/old & unused/BlockBranch1.png b/bushes/textures/old & unused/BlockBranch1.png deleted file mode 100644 index 28fe91f..0000000 Binary files a/bushes/textures/old & unused/BlockBranch1.png and /dev/null differ diff --git a/bushes/textures/old & unused/BlockBranch1L.png b/bushes/textures/old & unused/BlockBranch1L.png deleted file mode 100644 index 1d8a8e2..0000000 Binary files a/bushes/textures/old & unused/BlockBranch1L.png and /dev/null differ diff --git a/bushes/textures/old & unused/BlockBranch1R.png b/bushes/textures/old & unused/BlockBranch1R.png deleted file mode 100644 index 514b888..0000000 Binary files a/bushes/textures/old & unused/BlockBranch1R.png and /dev/null differ diff --git a/bushes/textures/old & unused/BushBranches1.png b/bushes/textures/old & unused/BushBranches1.png deleted file mode 100644 index 5bb2b46..0000000 Binary files a/bushes/textures/old & unused/BushBranches1.png and /dev/null differ diff --git a/bushes/textures/old & unused/BushBranches1sm.png b/bushes/textures/old & unused/BushBranches1sm.png deleted file mode 100644 index 5574f38..0000000 Binary files a/bushes/textures/old & unused/BushBranches1sm.png and /dev/null differ diff --git a/bushes/textures/old & unused/BushBranches1sm2.png b/bushes/textures/old & unused/BushBranches1sm2.png deleted file mode 100644 index 6ffd2f3..0000000 Binary files a/bushes/textures/old & unused/BushBranches1sm2.png and /dev/null differ diff --git a/bushes/textures/old & unused/BushBranches1sm3.png b/bushes/textures/old & unused/BushBranches1sm3.png deleted file mode 100644 index 5bb9bf5..0000000 Binary files a/bushes/textures/old & unused/BushBranches1sm3.png and /dev/null differ diff --git a/bushes/textures/old & unused/BushBranches1sm4.png b/bushes/textures/old & unused/BushBranches1sm4.png deleted file mode 100644 index b204fef..0000000 Binary files a/bushes/textures/old & unused/BushBranches1sm4.png and /dev/null differ diff --git a/bushes/textures/old & unused/BushBranchesCenter.png b/bushes/textures/old & unused/BushBranchesCenter.png deleted file mode 100644 index 0c9b5af..0000000 Binary files a/bushes/textures/old & unused/BushBranchesCenter.png and /dev/null differ diff --git a/bushes/textures/old & unused/BushBranchesSide1.png b/bushes/textures/old & unused/BushBranchesSide1.png deleted file mode 100644 index ca95dd3..0000000 Binary files a/bushes/textures/old & unused/BushBranchesSide1.png and /dev/null differ diff --git a/bushes/textures/old & unused/BushBranchesSide2.png b/bushes/textures/old & unused/BushBranchesSide2.png deleted file mode 100644 index d62499e..0000000 Binary files a/bushes/textures/old & unused/BushBranchesSide2.png and /dev/null differ diff --git a/bushes/textures/old & unused/blank.png b/bushes/textures/old & unused/blank.png deleted file mode 100644 index ed495a8..0000000 Binary files a/bushes/textures/old & unused/blank.png and /dev/null differ diff --git a/bushes/textures/old & unused/moretrees_pine_leaves3.png b/bushes/textures/old & unused/moretrees_pine_leaves3.png deleted file mode 100644 index 57d077d..0000000 Binary files a/bushes/textures/old & unused/moretrees_pine_leaves3.png and /dev/null differ diff --git a/bushes_classic/nodes.lua b/bushes_classic/nodes.lua index 4cd5318..bac2a89 100644 --- a/bushes_classic/nodes.lua +++ b/bushes_classic/nodes.lua @@ -161,6 +161,7 @@ for i, bush_name in ipairs(bushes_classic.bushes) do paramtype2 = "facedir", on_use = minetest.item_eat(18), groups = { dig_immediate = 3 }, + is_ground_content = false, }) @@ -212,4 +213,5 @@ minetest.register_node(":bushes:basket_empty", { paramtype = "light", paramtype2 = "facedir", groups = { dig_immediate = 3 }, + is_ground_content = false, }) diff --git a/bushes_classic/textures/bushes_basket.png b/bushes_classic/textures/bushes_basket.png index 4384fba..098515a 100644 Binary files a/bushes_classic/textures/bushes_basket.png and b/bushes_classic/textures/bushes_basket.png differ diff --git a/bushes_classic/textures/bushes_basket_pie_blackberry.png b/bushes_classic/textures/bushes_basket_pie_blackberry.png index 83ee63c..cbf30c6 100644 Binary files a/bushes_classic/textures/bushes_basket_pie_blackberry.png and b/bushes_classic/textures/bushes_basket_pie_blackberry.png differ diff --git a/bushes_classic/textures/bushes_basket_pie_blueberry.png b/bushes_classic/textures/bushes_basket_pie_blueberry.png index 9f9b2c6..9f4c844 100644 Binary files a/bushes_classic/textures/bushes_basket_pie_blueberry.png and b/bushes_classic/textures/bushes_basket_pie_blueberry.png differ diff --git a/bushes_classic/textures/bushes_basket_pie_gooseberry.png b/bushes_classic/textures/bushes_basket_pie_gooseberry.png index d6bdff4..4d1404b 100644 Binary files a/bushes_classic/textures/bushes_basket_pie_gooseberry.png and b/bushes_classic/textures/bushes_basket_pie_gooseberry.png differ diff --git a/bushes_classic/textures/bushes_basket_pie_mixed_berry.png b/bushes_classic/textures/bushes_basket_pie_mixed_berry.png index ff271ff..b63bec6 100644 Binary files a/bushes_classic/textures/bushes_basket_pie_mixed_berry.png and b/bushes_classic/textures/bushes_basket_pie_mixed_berry.png differ diff --git a/bushes_classic/textures/bushes_basket_pie_raspberry.png b/bushes_classic/textures/bushes_basket_pie_raspberry.png index 3bfd42f..8cc7d50 100644 Binary files a/bushes_classic/textures/bushes_basket_pie_raspberry.png and b/bushes_classic/textures/bushes_basket_pie_raspberry.png differ diff --git a/bushes_classic/textures/bushes_basket_pie_strawberry.png b/bushes_classic/textures/bushes_basket_pie_strawberry.png index c27b0b3..2ce9876 100644 Binary files a/bushes_classic/textures/bushes_basket_pie_strawberry.png and b/bushes_classic/textures/bushes_basket_pie_strawberry.png differ diff --git a/bushes_classic/textures/bushes_bush_blackberry.png b/bushes_classic/textures/bushes_bush_blackberry.png index fa76c61..8cedd1b 100644 Binary files a/bushes_classic/textures/bushes_bush_blackberry.png and b/bushes_classic/textures/bushes_bush_blackberry.png differ diff --git a/bushes_classic/textures/bushes_bush_blueberry.png b/bushes_classic/textures/bushes_bush_blueberry.png index 3a305ca..870c855 100644 Binary files a/bushes_classic/textures/bushes_bush_blueberry.png and b/bushes_classic/textures/bushes_bush_blueberry.png differ diff --git a/bushes_classic/textures/bushes_bush_fruitless.png b/bushes_classic/textures/bushes_bush_fruitless.png index ffa2e0a..32f14c4 100644 Binary files a/bushes_classic/textures/bushes_bush_fruitless.png and b/bushes_classic/textures/bushes_bush_fruitless.png differ diff --git a/bushes_classic/textures/bushes_bush_gooseberry.png b/bushes_classic/textures/bushes_bush_gooseberry.png index 52eca60..2d0db19 100644 Binary files a/bushes_classic/textures/bushes_bush_gooseberry.png and b/bushes_classic/textures/bushes_bush_gooseberry.png differ diff --git a/bushes_classic/textures/bushes_bush_raspberry.png b/bushes_classic/textures/bushes_bush_raspberry.png index 01809de..f57c640 100644 Binary files a/bushes_classic/textures/bushes_bush_raspberry.png and b/bushes_classic/textures/bushes_bush_raspberry.png differ diff --git a/bushes_classic/textures/bushes_bush_strawberry.png b/bushes_classic/textures/bushes_bush_strawberry.png index a5060e2..7e07d73 100644 Binary files a/bushes_classic/textures/bushes_bush_strawberry.png and b/bushes_classic/textures/bushes_bush_strawberry.png differ diff --git a/cavestuff/nodes.lua b/cavestuff/nodes.lua index 1408808..8ae16a6 100644 --- a/cavestuff/nodes.lua +++ b/cavestuff/nodes.lua @@ -17,7 +17,7 @@ minetest.register_node("cavestuff:pebble_1",{ tiles = {"undergrowth_pebble.png"}, paramtype = "light", paramtype2 = "facedir", - groups = {cracky=3, stone=1, attached_node=1}, + groups = {cracky=3, stone=1, attached_node=1, dig_immediate=3}, selection_box = cbox, collision_box = cbox, on_place = function(itemstack, placer, pointed_thing) @@ -36,7 +36,7 @@ minetest.register_node("cavestuff:pebble_2",{ drop = "cavestuff:pebble_1", paramtype = "light", paramtype2 = "facedir", - groups = {cracky=3, stone=1, attached_node=1, not_in_creative_inventory=1}, + groups = {cracky=3, stone=1, attached_node=1, not_in_creative_inventory=1, dig_immediate=3}, selection_box = cbox, collision_box = cbox, sounds = default.node_sound_stone_defaults(), @@ -49,7 +49,7 @@ minetest.register_node("cavestuff:desert_pebble_1",{ tiles = {"default_desert_stone.png"}, paramtype = "light", paramtype2 = "facedir", - groups = {cracky=3, stone=1, attached_node=1}, + groups = {cracky=3, stone=1, attached_node=1, dig_immediate=3}, selection_box = cbox, collision_box = cbox, on_place = function(itemstack, placer, pointed_thing) @@ -68,7 +68,7 @@ minetest.register_node("cavestuff:desert_pebble_2",{ tiles = {"default_desert_stone.png"}, paramtype = "light", paramtype2 = "facedir", - groups = {cracky=3, stone=1, attached_node=1, not_in_creative_inventory=1}, + groups = {cracky=3, stone=1, attached_node=1, not_in_creative_inventory=1, dig_immediate=3}, selection_box = cbox, collision_box = cbox, sounds = default.node_sound_stone_defaults(), @@ -80,6 +80,7 @@ minetest.register_node("cavestuff:stalactite_1",{ drawtype="nodebox", tiles = {"undergrowth_pebble.png"}, groups = {cracky=3,attached_node=1}, + is_ground_content = false, description = S("Stalactite"), paramtype = "light", paramtype2 = "wallmounted", @@ -126,6 +127,7 @@ minetest.register_node("cavestuff:stalactite_2",{ drawtype="nodebox", tiles = {"undergrowth_pebble.png"}, groups = {cracky=3,attached_node=1,not_in_creative_inventory=1}, + is_ground_content = false, drop = "cavestuff:stalactite_1", paramtype = "light", paramtype2 = "wallmounted", @@ -144,6 +146,7 @@ minetest.register_node("cavestuff:stalactite_3",{ drawtype="nodebox", tiles = {"undergrowth_pebble.png"}, groups = {cracky=3,attached_node=1,not_in_creative_inventory=1}, + is_ground_content = false, drop = "cavestuff:stalactite_1", paramtype = "light", paramtype2 = "wallmounted", diff --git a/dryplants/init.lua b/dryplants/init.lua index 2aec66c..46b3607 100644 --- a/dryplants/init.lua +++ b/dryplants/init.lua @@ -119,6 +119,7 @@ minetest.register_node("dryplants:grass", { fixed = {-0.5 , -0.5 , -0.5 , 0.5 , -0.4375, 0.5 }, }, groups = {snappy=3, flammable=2}, + is_ground_content = false, sounds = default.node_sound_leaves_defaults(), }) @@ -151,6 +152,7 @@ minetest.register_node("dryplants:hay", { fixed = {-0.5 , -0.5 , -0.5 , 0.5 , -0.4375, 0.5 }, }, groups = {snappy=3, flammable=2}, + is_ground_content = false, sounds = default.node_sound_leaves_defaults(), }) diff --git a/dryplants/reed.lua b/dryplants/reed.lua index 1d3bbc7..a15ee0a 100644 --- a/dryplants/reed.lua +++ b/dryplants/reed.lua @@ -44,6 +44,7 @@ minetest.register_node("dryplants:wetreed_slab", { fixed = {-1/2, -1/2, -1/2, 1/2, 0, 1/2}, }, groups = {snappy=3, flammable=2}, + is_ground_content = false, sounds = default.node_sound_leaves_defaults(), }) @@ -72,6 +73,7 @@ minetest.register_node("dryplants:wetreed_roof", { } }, groups = {snappy=3, flammable=2}, + is_ground_content = false, sounds = default.node_sound_leaves_defaults(), }) @@ -194,6 +196,7 @@ minetest.register_node("dryplants:wetreed_roof_corner", { } }, groups = {snappy=3, flammable=2}, + is_ground_content = false, sounds = default.node_sound_leaves_defaults(), }) @@ -224,6 +227,7 @@ minetest.register_node("dryplants:wetreed_roof_corner_2", { } }, groups = {snappy=3, flammable=2}, + is_ground_content = false, sounds = default.node_sound_leaves_defaults(), }) @@ -263,6 +267,7 @@ minetest.register_node("dryplants:reed", { paramtype2 = "facedir", tiles = {"dryplants_reed.png"}, groups = {snappy=3, flammable=2}, + is_ground_content = false, sounds = default.node_sound_leaves_defaults(), }) @@ -284,6 +289,7 @@ minetest.register_node("dryplants:reed_slab", { fixed = {-1/2, -1/2, -1/2, 1/2, 0, 1/2}, }, groups = {snappy=3, flammable=2}, + is_ground_content = false, sounds = default.node_sound_leaves_defaults(), }) @@ -312,6 +318,7 @@ minetest.register_node("dryplants:reed_roof", { } }, groups = {snappy=3, flammable=2}, + is_ground_content = false, sounds = default.node_sound_leaves_defaults(), }) @@ -342,6 +349,7 @@ minetest.register_node("dryplants:reed_roof_corner", { } }, groups = {snappy=3, flammable=2}, + is_ground_content = false, sounds = default.node_sound_leaves_defaults(), }) @@ -372,5 +380,6 @@ minetest.register_node("dryplants:reed_roof_corner_2", { } }, groups = {snappy=3, flammable=2}, + is_ground_content = false, sounds = default.node_sound_leaves_defaults(), }) diff --git a/dryplants/reedmace.lua b/dryplants/reedmace.lua index cad82c2..483072e 100644 --- a/dryplants/reedmace.lua +++ b/dryplants/reedmace.lua @@ -88,6 +88,7 @@ minetest.register_node("dryplants:reedmace_spikes", { flammable=2, not_in_creative_inventory=1 }, + is_ground_content = false, drop = 'dryplants:reedmace_sapling', sounds = default.node_sound_leaves_defaults(), selection_box = { @@ -110,6 +111,7 @@ minetest.register_node("dryplants:reedmace_top", { flammable=2, not_in_creative_inventory=1 }, + is_ground_content = false, drop = 'dryplants:reedmace_sapling', sounds = default.node_sound_leaves_defaults(), selection_box = { @@ -133,6 +135,7 @@ minetest.register_node("dryplants:reedmace_height_2", { flammable=2--, --not_in_creative_inventory=1 }, + is_ground_content = false, drop = 'dryplants:reedmace_sapling', sounds = default.node_sound_leaves_defaults(), selection_box = { @@ -156,6 +159,7 @@ minetest.register_node("dryplants:reedmace_height_3", { flammable=2--, --not_in_creative_inventory=1 }, + is_ground_content = false, drop = 'dryplants:reedmace_sapling', sounds = default.node_sound_leaves_defaults(), selection_box = { @@ -179,6 +183,7 @@ minetest.register_node("dryplants:reedmace_height_3_spikes", { flammable=2--, --not_in_creative_inventory=1 }, + is_ground_content = false, drop = 'dryplants:reedmace_sapling', sounds = default.node_sound_leaves_defaults(), selection_box = { @@ -201,6 +206,7 @@ minetest.register_node("dryplants:reedmace", { flammable=2, not_in_creative_inventory=1 }, + is_ground_content = false, drop = 'dryplants:reedmace_sapling', sounds = default.node_sound_leaves_defaults(), selection_box = { @@ -231,6 +237,7 @@ minetest.register_node("dryplants:reedmace_bottom", { flammable=2, not_in_creative_inventory=1 }, + is_ground_content = false, drop = 'dryplants:reedmace_sapling', sounds = default.node_sound_leaves_defaults(), selection_box = { diff --git a/dryplants/textures/not_in_use/big_pic_8.png b/dryplants/textures/not_in_use/big_pic_8.png deleted file mode 100644 index aac9520..0000000 Binary files a/dryplants/textures/not_in_use/big_pic_8.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/big_pic_9.png b/dryplants/textures/not_in_use/big_pic_9.png deleted file mode 100644 index 1ebe95c..0000000 Binary files a/dryplants/textures/not_in_use/big_pic_9.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/dryplants_cattailsG_m2.png b/dryplants/textures/not_in_use/dryplants_cattailsG_m2.png deleted file mode 100644 index 0a2cae1..0000000 Binary files a/dryplants/textures/not_in_use/dryplants_cattailsG_m2.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/dryplants_juncus_02_left.png b/dryplants/textures/not_in_use/dryplants_juncus_02_left.png deleted file mode 100644 index b771a55..0000000 Binary files a/dryplants/textures/not_in_use/dryplants_juncus_02_left.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/dryplants_juncus_02_right.png b/dryplants/textures/not_in_use/dryplants_juncus_02_right.png deleted file mode 100644 index a9f4b7e..0000000 Binary files a/dryplants/textures/not_in_use/dryplants_juncus_02_right.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/dryplants_juncus_02_whole2.png b/dryplants/textures/not_in_use/dryplants_juncus_02_whole2.png deleted file mode 100644 index 67c3cb8..0000000 Binary files a/dryplants/textures/not_in_use/dryplants_juncus_02_whole2.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/dryplants_juncus_03_left.png b/dryplants/textures/not_in_use/dryplants_juncus_03_left.png deleted file mode 100644 index dc8a33e..0000000 Binary files a/dryplants/textures/not_in_use/dryplants_juncus_03_left.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/dryplants_juncus_03_right.png b/dryplants/textures/not_in_use/dryplants_juncus_03_right.png deleted file mode 100644 index 23b5cf3..0000000 Binary files a/dryplants/textures/not_in_use/dryplants_juncus_03_right.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/dryplants_juncus_03_whole2.png b/dryplants/textures/not_in_use/dryplants_juncus_03_whole2.png deleted file mode 100644 index d494ae4..0000000 Binary files a/dryplants/textures/not_in_use/dryplants_juncus_03_whole2.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/dryplants_reedmace_01.png b/dryplants/textures/not_in_use/dryplants_reedmace_01.png deleted file mode 100644 index aaab5fe..0000000 Binary files a/dryplants/textures/not_in_use/dryplants_reedmace_01.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/dryplants_reedmace_02.png b/dryplants/textures/not_in_use/dryplants_reedmace_02.png deleted file mode 100644 index 5c8751a..0000000 Binary files a/dryplants/textures/not_in_use/dryplants_reedmace_02.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/dryplants_reedmace_03.png b/dryplants/textures/not_in_use/dryplants_reedmace_03.png deleted file mode 100644 index 342b8b8..0000000 Binary files a/dryplants/textures/not_in_use/dryplants_reedmace_03.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/dryplants_reedmace_04.png b/dryplants/textures/not_in_use/dryplants_reedmace_04.png deleted file mode 100644 index a1d708d..0000000 Binary files a/dryplants/textures/not_in_use/dryplants_reedmace_04.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/dryplants_reedmace_bottom_left.png b/dryplants/textures/not_in_use/dryplants_reedmace_bottom_left.png deleted file mode 100644 index 643bbea..0000000 Binary files a/dryplants/textures/not_in_use/dryplants_reedmace_bottom_left.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/dryplants_reedmace_bottom_right.png b/dryplants/textures/not_in_use/dryplants_reedmace_bottom_right.png deleted file mode 100644 index d415003..0000000 Binary files a/dryplants/textures/not_in_use/dryplants_reedmace_bottom_right.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/dryplants_reedmace_left.png b/dryplants/textures/not_in_use/dryplants_reedmace_left.png deleted file mode 100644 index 1a3bd92..0000000 Binary files a/dryplants/textures/not_in_use/dryplants_reedmace_left.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/dryplants_reedmace_right.png b/dryplants/textures/not_in_use/dryplants_reedmace_right.png deleted file mode 100644 index b178d4a..0000000 Binary files a/dryplants/textures/not_in_use/dryplants_reedmace_right.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/dryplants_reedmace_top_left.png b/dryplants/textures/not_in_use/dryplants_reedmace_top_left.png deleted file mode 100644 index 18ae716..0000000 Binary files a/dryplants/textures/not_in_use/dryplants_reedmace_top_left.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/dryplants_reedmace_top_right.png b/dryplants/textures/not_in_use/dryplants_reedmace_top_right.png deleted file mode 100644 index e511b24..0000000 Binary files a/dryplants/textures/not_in_use/dryplants_reedmace_top_right.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/reedmace2.png b/dryplants/textures/not_in_use/reedmace2.png deleted file mode 100644 index ca505bd..0000000 Binary files a/dryplants/textures/not_in_use/reedmace2.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/reedmace3.png b/dryplants/textures/not_in_use/reedmace3.png deleted file mode 100644 index d2ec729..0000000 Binary files a/dryplants/textures/not_in_use/reedmace3.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/reedmace4.png b/dryplants/textures/not_in_use/reedmace4.png deleted file mode 100644 index 9ba759b..0000000 Binary files a/dryplants/textures/not_in_use/reedmace4.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/reedtest.png b/dryplants/textures/not_in_use/reedtest.png deleted file mode 100644 index 33822ef..0000000 Binary files a/dryplants/textures/not_in_use/reedtest.png and /dev/null differ diff --git a/dryplants/textures/not_in_use/texturing.png b/dryplants/textures/not_in_use/texturing.png deleted file mode 100644 index 6a18fda..0000000 Binary files a/dryplants/textures/not_in_use/texturing.png and /dev/null differ diff --git a/dryplants/textures/old/dryplants_grass_short_old3.png b/dryplants/textures/old/dryplants_grass_short_old3.png deleted file mode 100644 index f6f6c5b..0000000 Binary files a/dryplants/textures/old/dryplants_grass_short_old3.png and /dev/null differ diff --git a/dryplants/textures/old/dryplants_grass_short_old4.png b/dryplants/textures/old/dryplants_grass_short_old4.png deleted file mode 100644 index 6e7611c..0000000 Binary files a/dryplants/textures/old/dryplants_grass_short_old4.png and /dev/null differ diff --git a/dryplants/textures/old/dryplants_juncus_02_left_old.png b/dryplants/textures/old/dryplants_juncus_02_left_old.png deleted file mode 100644 index ce49ec2..0000000 Binary files a/dryplants/textures/old/dryplants_juncus_02_left_old.png and /dev/null differ diff --git a/dryplants/textures/old/dryplants_juncus_02_right_old.png b/dryplants/textures/old/dryplants_juncus_02_right_old.png deleted file mode 100644 index e512a77..0000000 Binary files a/dryplants/textures/old/dryplants_juncus_02_right_old.png and /dev/null differ diff --git a/dryplants/textures/old/dryplants_juncus_03_left_old.png b/dryplants/textures/old/dryplants_juncus_03_left_old.png deleted file mode 100644 index 7644a0d..0000000 Binary files a/dryplants/textures/old/dryplants_juncus_03_left_old.png and /dev/null differ diff --git a/dryplants/textures/old/dryplants_juncus_03_right_old.png b/dryplants/textures/old/dryplants_juncus_03_right_old.png deleted file mode 100644 index 801cf23..0000000 Binary files a/dryplants/textures/old/dryplants_juncus_03_right_old.png and /dev/null differ diff --git a/dryplants/textures/old/dryplants_reedmace_bottom_left_old2.png b/dryplants/textures/old/dryplants_reedmace_bottom_left_old2.png deleted file mode 100644 index 7d25e49..0000000 Binary files a/dryplants/textures/old/dryplants_reedmace_bottom_left_old2.png and /dev/null differ diff --git a/dryplants/textures/old/dryplants_reedmace_bottom_old4.png b/dryplants/textures/old/dryplants_reedmace_bottom_old4.png deleted file mode 100644 index a02b19b..0000000 Binary files a/dryplants/textures/old/dryplants_reedmace_bottom_old4.png and /dev/null differ diff --git a/dryplants/textures/old/dryplants_reedmace_bottom_right_old2.png b/dryplants/textures/old/dryplants_reedmace_bottom_right_old2.png deleted file mode 100644 index 0b13beb..0000000 Binary files a/dryplants/textures/old/dryplants_reedmace_bottom_right_old2.png and /dev/null differ diff --git a/dryplants/textures/old/dryplants_reedmace_left_old2.png b/dryplants/textures/old/dryplants_reedmace_left_old2.png deleted file mode 100644 index 784d45d..0000000 Binary files a/dryplants/textures/old/dryplants_reedmace_left_old2.png and /dev/null differ diff --git a/dryplants/textures/old/dryplants_reedmace_old8.png b/dryplants/textures/old/dryplants_reedmace_old8.png deleted file mode 100644 index 1498b5f..0000000 Binary files a/dryplants/textures/old/dryplants_reedmace_old8.png and /dev/null differ diff --git a/dryplants/textures/old/dryplants_reedmace_right_old2.png b/dryplants/textures/old/dryplants_reedmace_right_old2.png deleted file mode 100644 index db758c4..0000000 Binary files a/dryplants/textures/old/dryplants_reedmace_right_old2.png and /dev/null differ diff --git a/dryplants/textures/old/dryplants_reedmace_spikes_old3.png b/dryplants/textures/old/dryplants_reedmace_spikes_old3.png deleted file mode 100644 index 207a747..0000000 Binary files a/dryplants/textures/old/dryplants_reedmace_spikes_old3.png and /dev/null differ diff --git a/dryplants/textures/old/dryplants_reedmace_top_left_old2.png b/dryplants/textures/old/dryplants_reedmace_top_left_old2.png deleted file mode 100644 index 6d9afce..0000000 Binary files a/dryplants/textures/old/dryplants_reedmace_top_left_old2.png and /dev/null differ diff --git a/dryplants/textures/old/dryplants_reedmace_top_old3.png b/dryplants/textures/old/dryplants_reedmace_top_old3.png deleted file mode 100644 index 6eedad4..0000000 Binary files a/dryplants/textures/old/dryplants_reedmace_top_old3.png and /dev/null differ diff --git a/dryplants/textures/old/dryplants_reedmace_top_right_old2.png b/dryplants/textures/old/dryplants_reedmace_top_right_old2.png deleted file mode 100644 index 333f587..0000000 Binary files a/dryplants/textures/old/dryplants_reedmace_top_right_old2.png and /dev/null differ diff --git a/dryplants/textures/old/dryplants_reedmace_water_old2.png b/dryplants/textures/old/dryplants_reedmace_water_old2.png deleted file mode 100644 index 6b10bff..0000000 Binary files a/dryplants/textures/old/dryplants_reedmace_water_old2.png and /dev/null differ diff --git a/ferns/gianttreefern.lua b/ferns/gianttreefern.lua index c983554..2cd134f 100644 --- a/ferns/gianttreefern.lua +++ b/ferns/gianttreefern.lua @@ -138,6 +138,7 @@ minetest.register_node("ferns:tree_fern_leaves_giant", { attached_node=1, not_in_creative_inventory=1 }, + is_ground_content = false, drop = { max_items = 2, items = { @@ -179,6 +180,7 @@ minetest.register_node("ferns:tree_fern_leave_big", { attached_node=1, not_in_creative_inventory=1 }, + is_ground_content = false, drop = "", sounds = default.node_sound_leaves_defaults(), after_destruct = function(pos,oldnode) @@ -217,6 +219,7 @@ minetest.register_node("ferns:tree_fern_leave_big_end", { attached_node=1, not_in_creative_inventory=1 }, + is_ground_content = false, drop = "", sounds = default.node_sound_leaves_defaults(), }) @@ -255,6 +258,7 @@ minetest.register_node("ferns:fern_trunk_big_top", { not_in_creative_inventory=1, leafdecay=3 -- to support vines }, + is_ground_content = false, drop = "ferns:fern_trunk_big", sounds = default.node_sound_wood_defaults(), }) @@ -281,6 +285,7 @@ minetest.register_node("ferns:fern_trunk_big", { fixed = {-1/4, -1/2, -1/4, 1/4, 1/2, 1/4}, }, groups = {tree=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1}, + is_ground_content = false, sounds = default.node_sound_wood_defaults(), after_dig_node = function(pos, node, metadata, digger) if digger == nil then return end diff --git a/ferns/textures/ferns_fern_tree_giant.png b/ferns/textures/ferns_fern_tree_giant.png index 2e3adb7..bc9cd45 100644 Binary files a/ferns/textures/ferns_fern_tree_giant.png and b/ferns/textures/ferns_fern_tree_giant.png differ diff --git a/ferns/textures/ferns_fern_trunk.png b/ferns/textures/ferns_fern_trunk.png index a8e1bf6..5465ef8 100644 Binary files a/ferns/textures/ferns_fern_trunk.png and b/ferns/textures/ferns_fern_trunk.png differ diff --git a/ferns/textures/not_in_use/archaeplantae_horsetails.png b/ferns/textures/not_in_use/archaeplantae_horsetails.png deleted file mode 100644 index 6ba89c1..0000000 Binary files a/ferns/textures/not_in_use/archaeplantae_horsetails.png and /dev/null differ diff --git a/ferns/textures/not_in_use/big picture 3.png b/ferns/textures/not_in_use/big picture 3.png deleted file mode 100644 index de344e6..0000000 Binary files a/ferns/textures/not_in_use/big picture 3.png and /dev/null differ diff --git a/ferns/textures/not_in_use/ferns_fern_big_left.png b/ferns/textures/not_in_use/ferns_fern_big_left.png deleted file mode 100644 index 0fdf515..0000000 Binary files a/ferns/textures/not_in_use/ferns_fern_big_left.png and /dev/null differ diff --git a/ferns/textures/not_in_use/ferns_fern_big_right.png b/ferns/textures/not_in_use/ferns_fern_big_right.png deleted file mode 100644 index d30def0..0000000 Binary files a/ferns/textures/not_in_use/ferns_fern_big_right.png and /dev/null differ diff --git a/ferns/textures/not_in_use/ferns_fern_mid_left.png b/ferns/textures/not_in_use/ferns_fern_mid_left.png deleted file mode 100644 index d146df3..0000000 Binary files a/ferns/textures/not_in_use/ferns_fern_mid_left.png and /dev/null differ diff --git a/ferns/textures/not_in_use/ferns_fern_mid_right.png b/ferns/textures/not_in_use/ferns_fern_mid_right.png deleted file mode 100644 index e10460a..0000000 Binary files a/ferns/textures/not_in_use/ferns_fern_mid_right.png and /dev/null differ diff --git a/ferns/textures/not_in_use/ferns_fern_tree_bl.png b/ferns/textures/not_in_use/ferns_fern_tree_bl.png deleted file mode 100644 index e2fdb67..0000000 Binary files a/ferns/textures/not_in_use/ferns_fern_tree_bl.png and /dev/null differ diff --git a/ferns/textures/not_in_use/ferns_fern_tree_br.png b/ferns/textures/not_in_use/ferns_fern_tree_br.png deleted file mode 100644 index eb547e8..0000000 Binary files a/ferns/textures/not_in_use/ferns_fern_tree_br.png and /dev/null differ diff --git a/ferns/textures/not_in_use/ferns_fern_trunk_big_crown.png b/ferns/textures/not_in_use/ferns_fern_trunk_big_crown.png deleted file mode 100644 index 7a12671..0000000 Binary files a/ferns/textures/not_in_use/ferns_fern_trunk_big_crown.png and /dev/null differ diff --git a/ferns/textures/old/archaeplantae_fern_old4.png b/ferns/textures/old/archaeplantae_fern_old4.png deleted file mode 100644 index a3d403c..0000000 Binary files a/ferns/textures/old/archaeplantae_fern_old4.png and /dev/null differ diff --git a/ferns/textures/old/comb.png b/ferns/textures/old/comb.png deleted file mode 100644 index ea1e19f..0000000 Binary files a/ferns/textures/old/comb.png and /dev/null differ diff --git a/ferns/textures/old/ferns_5_old.png b/ferns/textures/old/ferns_5_old.png deleted file mode 100644 index 5676278..0000000 Binary files a/ferns/textures/old/ferns_5_old.png and /dev/null differ diff --git a/ferns/textures/old/ferns_6_old.png b/ferns/textures/old/ferns_6_old.png deleted file mode 100644 index 36d6040..0000000 Binary files a/ferns/textures/old/ferns_6_old.png and /dev/null differ diff --git a/ferns/textures/old/ferns_7_old.png b/ferns/textures/old/ferns_7_old.png deleted file mode 100644 index 8aabe61..0000000 Binary files a/ferns/textures/old/ferns_7_old.png and /dev/null differ diff --git a/ferns/textures/old/ferns_fern_big_old.png b/ferns/textures/old/ferns_fern_big_old.png deleted file mode 100644 index d17ed11..0000000 Binary files a/ferns/textures/old/ferns_fern_big_old.png and /dev/null differ diff --git a/ferns/textures/old/ferns_fern_mid_old.png b/ferns/textures/old/ferns_fern_mid_old.png deleted file mode 100644 index 08513c2..0000000 Binary files a/ferns/textures/old/ferns_fern_mid_old.png and /dev/null differ diff --git a/ferns/textures/old/ferns_fern_tree_old.png b/ferns/textures/old/ferns_fern_tree_old.png deleted file mode 100644 index 4599672..0000000 Binary files a/ferns/textures/old/ferns_fern_tree_old.png and /dev/null differ diff --git a/ferns/textures/old/ferns_fern_trunk_big_old2.png b/ferns/textures/old/ferns_fern_trunk_big_old2.png deleted file mode 100644 index a048ee0..0000000 Binary files a/ferns/textures/old/ferns_fern_trunk_big_old2.png and /dev/null differ diff --git a/ferns/textures/old/ferns_fern_trunk_big_top_old.png b/ferns/textures/old/ferns_fern_trunk_big_top_old.png deleted file mode 100644 index d83151f..0000000 Binary files a/ferns/textures/old/ferns_fern_trunk_big_top_old.png and /dev/null differ diff --git a/ferns/textures/old/ferns_fern_trunk_big_top_old2.png b/ferns/textures/old/ferns_fern_trunk_big_top_old2.png deleted file mode 100644 index 244ddfe..0000000 Binary files a/ferns/textures/old/ferns_fern_trunk_big_top_old2.png and /dev/null differ diff --git a/ferns/textures/old/ferns_fern_trunk_top_old.png b/ferns/textures/old/ferns_fern_trunk_top_old.png deleted file mode 100644 index 872fdab..0000000 Binary files a/ferns/textures/old/ferns_fern_trunk_top_old.png and /dev/null differ diff --git a/ferns/textures/old/ferns_horsetail_01_old2.png b/ferns/textures/old/ferns_horsetail_01_old2.png deleted file mode 100644 index 7d55718..0000000 Binary files a/ferns/textures/old/ferns_horsetail_01_old2.png and /dev/null differ diff --git a/ferns/textures/old/ferns_horsetail_02_old2.png b/ferns/textures/old/ferns_horsetail_02_old2.png deleted file mode 100644 index d0b5563..0000000 Binary files a/ferns/textures/old/ferns_horsetail_02_old2.png and /dev/null differ diff --git a/ferns/textures/old/ferns_horsetail_03_old2.png b/ferns/textures/old/ferns_horsetail_03_old2.png deleted file mode 100644 index 42cf76e..0000000 Binary files a/ferns/textures/old/ferns_horsetail_03_old2.png and /dev/null differ diff --git a/ferns/textures/old/ferns_horsetail_04_old2.png b/ferns/textures/old/ferns_horsetail_04_old2.png deleted file mode 100644 index 600ebe7..0000000 Binary files a/ferns/textures/old/ferns_horsetail_04_old2.png and /dev/null differ diff --git a/ferns/textures/old/ferns_tree_fern_leave_big_cross_old.png b/ferns/textures/old/ferns_tree_fern_leave_big_cross_old.png deleted file mode 100644 index 00ec9d8..0000000 Binary files a/ferns/textures/old/ferns_tree_fern_leave_big_cross_old.png and /dev/null differ diff --git a/ferns/textures/old/ferns_tree_fern_leave_big_end_old.png b/ferns/textures/old/ferns_tree_fern_leave_big_end_old.png deleted file mode 100644 index ce1a87d..0000000 Binary files a/ferns/textures/old/ferns_tree_fern_leave_big_end_old.png and /dev/null differ diff --git a/ferns/textures/old/ferns_tree_fern_leave_big_old.png b/ferns/textures/old/ferns_tree_fern_leave_big_old.png deleted file mode 100644 index b568383..0000000 Binary files a/ferns/textures/old/ferns_tree_fern_leave_big_old.png and /dev/null differ diff --git a/ferns/treefern.lua b/ferns/treefern.lua index c64b43e..80d7028 100644 --- a/ferns/treefern.lua +++ b/ferns/treefern.lua @@ -82,6 +82,7 @@ minetest.register_node("ferns:tree_fern_leaves", { inventory_image = "ferns_fern_tree_inv.png", walkable = false, groups = {snappy=3,flammable=2,attached_node=1}, + is_ground_content = false, drop = { max_items = 2, items = { @@ -113,6 +114,7 @@ minetest.register_node("ferns:tree_fern_leaves_02", { tiles = {"ferns_fern_big.png"}, walkable = false, groups = {snappy=3,flammable=2,attached_node=1,not_in_creative_inventory=1}, + is_ground_content = false, drop = { max_items = 2, items = { @@ -159,6 +161,7 @@ minetest.register_node("ferns:fern_trunk", { fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, }, groups = {tree=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1}, + is_ground_content = false, sounds = default.node_sound_wood_defaults(), after_dig_node = function(pos, node, metadata, digger) default.dig_up(pos, node, digger) diff --git a/molehills/textures/molehills_dirt.png b/molehills/textures/molehills_dirt.png index 79ffa85..288336e 100644 Binary files a/molehills/textures/molehills_dirt.png and b/molehills/textures/molehills_dirt.png differ diff --git a/molehills/textures/old & unused/molehill_side.png b/molehills/textures/old & unused/molehill_side.png deleted file mode 100644 index 5f0f976..0000000 Binary files a/molehills/textures/old & unused/molehill_side.png and /dev/null differ diff --git a/molehills/textures/old & unused/molehill_top.png b/molehills/textures/old & unused/molehill_top.png deleted file mode 100644 index 55cc541..0000000 Binary files a/molehills/textures/old & unused/molehill_top.png and /dev/null differ diff --git a/nature_classic/blossom.lua b/nature_classic/blossom.lua index a5ab214..4c234e2 100644 --- a/nature_classic/blossom.lua +++ b/nature_classic/blossom.lua @@ -21,6 +21,7 @@ minetest.register_node(":"..nature.blossom_node, { tiles = nature.blossom_textures, paramtype = "light", groups = nature.blossom_groups, + is_ground_content = false, sounds = default.node_sound_leaves_defaults(), waving = 1 }) diff --git a/pl_sunflowers/textures/flowers_sunflower.png b/pl_sunflowers/textures/flowers_sunflower.png index fb95cb4..0455378 100644 Binary files a/pl_sunflowers/textures/flowers_sunflower.png and b/pl_sunflowers/textures/flowers_sunflower.png differ diff --git a/pl_sunflowers/textures/flowers_sunflower_inv.png b/pl_sunflowers/textures/flowers_sunflower_inv.png index c36ed01..3605d77 100644 Binary files a/pl_sunflowers/textures/flowers_sunflower_inv.png and b/pl_sunflowers/textures/flowers_sunflower_inv.png differ diff --git a/poisonivy/textures/poisonivy_seedling.png b/poisonivy/textures/poisonivy_seedling.png index 281fa75..aec2965 100644 Binary files a/poisonivy/textures/poisonivy_seedling.png and b/poisonivy/textures/poisonivy_seedling.png differ diff --git a/trunks/nodes.lua b/trunks/nodes.lua index b6e94c7..a8a882c 100644 --- a/trunks/nodes.lua +++ b/trunks/nodes.lua @@ -40,6 +40,7 @@ for i in pairs(NoDe) do attached_node=1, not_in_creative_inventory=iNV }, + is_ground_content = false, drop = "trunks:twig_1", sounds = default.node_sound_leaves_defaults(), liquids_pointable = true, @@ -139,6 +140,7 @@ minetest.register_node("trunks:twigs", { paramtype2 = "facedir", tiles = {"trunks_twigs.png"}, groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1}, + is_ground_content = false, sounds = default.node_sound_wood_defaults(), }) @@ -158,6 +160,7 @@ minetest.register_node("trunks:twigs_slab", { fixed = {-1/2, -1/2, -1/2, 1/2, 0, 1/2}, }, groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1}, + is_ground_content = false, sounds = default.node_sound_wood_defaults(), }) @@ -181,6 +184,7 @@ minetest.register_node("trunks:twigs_roof", { } }, groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1}, + is_ground_content = false, sounds = default.node_sound_wood_defaults(), }) @@ -209,6 +213,7 @@ minetest.register_node("trunks:twigs_roof_corner", { } }, groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1}, + is_ground_content = false, sounds = default.node_sound_wood_defaults(), }) @@ -237,6 +242,7 @@ minetest.register_node("trunks:twigs_roof_corner_2", { } }, groups = {choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1}, + is_ground_content = false, sounds = default.node_sound_wood_defaults(), }) @@ -388,6 +394,7 @@ for i in pairs(TRuNKS) do attached_node = 1 --not_in_creative_inventory=1 -- atm in inv for testing }, + is_ground_content = false, --drop = "trunks:twig_1", -- not sure about this yet sounds = default.node_sound_wood_defaults(), }) diff --git a/trunks/textures/old & unused/comboSticks.png b/trunks/textures/old & unused/comboSticks.png deleted file mode 100644 index e3b7770..0000000 Binary files a/trunks/textures/old & unused/comboSticks.png and /dev/null differ diff --git a/trunks/textures/old & unused/comboSticks_2.png b/trunks/textures/old & unused/comboSticks_2.png deleted file mode 100644 index 2053592..0000000 Binary files a/trunks/textures/old & unused/comboSticks_2.png and /dev/null differ diff --git a/trunks/textures/old & unused/trunks_root_mask_old.png b/trunks/textures/old & unused/trunks_root_mask_old.png deleted file mode 100644 index 51071c3..0000000 Binary files a/trunks/textures/old & unused/trunks_root_mask_old.png and /dev/null differ diff --git a/trunks/textures/old & unused/trunks_twig_1e.png b/trunks/textures/old & unused/trunks_twig_1e.png deleted file mode 100644 index 518955c..0000000 Binary files a/trunks/textures/old & unused/trunks_twig_1e.png and /dev/null differ diff --git a/trunks/textures/old & unused/trunks_twig_1n.png b/trunks/textures/old & unused/trunks_twig_1n.png deleted file mode 100644 index 157c957..0000000 Binary files a/trunks/textures/old & unused/trunks_twig_1n.png and /dev/null differ diff --git a/trunks/textures/old & unused/trunks_twig_2n.png b/trunks/textures/old & unused/trunks_twig_2n.png deleted file mode 100644 index 9945f22..0000000 Binary files a/trunks/textures/old & unused/trunks_twig_2n.png and /dev/null differ diff --git a/trunks/textures/old & unused/trunks_twig_3n.png b/trunks/textures/old & unused/trunks_twig_3n.png deleted file mode 100644 index 6aacf9d..0000000 Binary files a/trunks/textures/old & unused/trunks_twig_3n.png and /dev/null differ diff --git a/trunks/textures/old & unused/trunks_twig_4n.png b/trunks/textures/old & unused/trunks_twig_4n.png deleted file mode 100644 index c5286b6..0000000 Binary files a/trunks/textures/old & unused/trunks_twig_4n.png and /dev/null differ diff --git a/trunks/textures/old & unused/trunks_twig_5-8.png b/trunks/textures/old & unused/trunks_twig_5-8.png deleted file mode 100644 index 9dda478..0000000 Binary files a/trunks/textures/old & unused/trunks_twig_5-8.png and /dev/null differ diff --git a/trunks/textures/old & unused/trunks_twig_9-12.png b/trunks/textures/old & unused/trunks_twig_9-12.png deleted file mode 100644 index 42a5d45..0000000 Binary files a/trunks/textures/old & unused/trunks_twig_9-12.png and /dev/null differ diff --git a/trunks/textures/trunks_twigs.png b/trunks/textures/trunks_twigs.png index 20ae6ca..23ff51e 100644 Binary files a/trunks/textures/trunks_twigs.png and b/trunks/textures/trunks_twigs.png differ diff --git a/vines/init.lua b/vines/init.lua index f88f09a..506040f 100644 --- a/vines/init.lua +++ b/vines/init.lua @@ -11,8 +11,8 @@ local enable_side = minetest.settings:get_bool("vines_enable_side", true) local enable_jungle = minetest.settings:get_bool("vines_enable_jungle", true) local enable_willow = minetest.settings:get_bool("vines_enable_willow", true) -local rarity_roots = tonumber(minetest.settings:get("vines_rarity_roots")) or 70 -local default_rarity = 95 +local rarity_roots = tonumber(minetest.settings:get("vines_rarity_roots")) or 0.5 +local default_rarity = 0.2 local rarity_standard = tonumber(minetest.settings:get("vines_rarity_standard")) or default_rarity local rarity_side = tonumber(minetest.settings:get("vines_rarity_side")) or default_rarity local rarity_jungle = tonumber(minetest.settings:get("vines_rarity_jungle")) or default_rarity @@ -24,6 +24,25 @@ local growth_max = tonumber(minetest.settings:get("vines_growth_max")) or 360 -- support for i18n local S = minetest.get_translator("vines") +local dids = {} +local spawn_funcs = {} + +local function find_open_side(pos) -- copied from biome_lib + if minetest.get_node({ x=pos.x-1, y=pos.y, z=pos.z }).name == "air" then + return {newpos = { x=pos.x-1, y=pos.y, z=pos.z }, facedir = 2} + end + if minetest.get_node({ x=pos.x+1, y=pos.y, z=pos.z }).name == "air" then + return {newpos = { x=pos.x+1, y=pos.y, z=pos.z }, facedir = 3} + end + if minetest.get_node({ x=pos.x, y=pos.y, z=pos.z-1 }).name == "air" then + return {newpos = { x=pos.x, y=pos.y, z=pos.z-1 }, facedir = 4} + end + if minetest.get_node({ x=pos.x, y=pos.y, z=pos.z+1 }).name == "air" then + return {newpos = { x=pos.x, y=pos.y, z=pos.z+1 }, facedir = 5} + end + return nil +end + -- ITEMS if enable_vines ~= false then @@ -87,7 +106,7 @@ local function ensure_vine_end(pos, oldnode) end -vines.register_vine = function( name, defs, biome ) +vines.register_vine = function( name, defs, def ) local groups = {vines = 1, snappy = 3, flammable = 2} local vine_name_end = 'vines:' .. name .. '_end' @@ -95,16 +114,37 @@ vines.register_vine = function( name, defs, biome ) local vine_image_end = "vines_" .. name .. "_end.png" local vine_image_middle = "vines_" .. name .. "_middle.png" - local spawn_plants = function(pos, fdir) + local spawn_plants = function(pos) + local param2 = 0 + + if def.spawn_on_bottom then -- spawn under e.g. leaves + local newpos = vector.new(pos.x, pos.y - 1, pos.z) + if minetest.get_node(pos).name ~= "air" and minetest.get_node(newpos).name == "air" then + -- (1) prevent floating vines; (2) is there even space? + pos = newpos + else + return + end + elseif def.spawn_on_side then + local onside = find_open_side(pos) + if onside then + pos = onside.newpos + param2 = onside.facedir + else + return + end + end + local max_length = math.random(defs.average_length) local current_length = 1 + -- print("Generate " .. name .. " at " .. minetest.pos_to_string(pos)) if minetest.get_node({ x=pos.x, y=pos.y - 1, z=pos.z }).name == 'air' then while minetest.get_node({ x=pos.x, y=pos.y - 1, z=pos.z }).name == 'air' and current_length < max_length do - minetest.swap_node(pos, { name = vine_name_middle, param2 = fdir }) + minetest.set_node(pos, { name = vine_name_middle, param2 = param2 }) pos.y = pos.y - 1 current_length = current_length + 1 end - minetest.set_node(pos, { name = vine_name_end, param2 = fdir }) + minetest.set_node(pos, { name = vine_name_end, param2 = param2 }) end end @@ -112,7 +152,7 @@ vines.register_vine = function( name, defs, biome ) local drawtype = 'signlike' -- different properties for bottom and side vines. - if not biome.spawn_on_side then + if not def.spawn_on_side then selection_box = { type = "fixed", fixed = { -0.4, -1/2, -0.4, 0.4, 1/2, 0.4 } @@ -197,9 +237,44 @@ vines.register_vine = function( name, defs, biome ) end, }) - biome_lib.register_on_generate(biome, spawn_plants) + minetest.register_decoration({ + name = "vines:" .. name, + decoration = {"air"}, + fill_ratio = def.rarity, + y_min = -16, + y_max = 48, + place_on = def.place_on, + deco_type = "simple", + flags = "all_floors, all_ceilings" + }) + dids[#dids + 1] = {name = name, spawn_func = spawn_plants} end +minetest.register_on_mods_loaded(function() + for idx, def in ipairs(dids) do + local did = minetest.get_decoration_id("vines:" .. def.name) + dids[idx] = did + spawn_funcs[did] = def.spawn_func + end + + minetest.set_gen_notify("decoration", dids) +end) + +minetest.register_on_generated(function(minp, maxp, blockseed) + local g = minetest.get_mapgen_object("gennotify") + + for _, did in ipairs(dids) do + local deco_locations = g["decoration#" .. did] + + if deco_locations then + local func = spawn_funcs[did] + for _, pos in pairs(deco_locations) do + func(pos) + end + end + end +end) + -- ALIASES -- used to remove the old vine nodes and give room for the new. @@ -372,19 +447,12 @@ minetest.register_craft({ if enable_roots ~= false then vines.register_vine('root', {description = S("Roots"), average_length = 9}, { - check_air = false, - avoid_nodes = {"vines:root_middle"}, - avoid_radius = 5, - surface = { + place_on = { "default:dirt_with_grass", "default:dirt" }, spawn_on_bottom = true, - plantlife_limit = -0.6, rarity = rarity_roots, - tries = 3, - humidity_min = 0.4, - temp_min = 0.4, }) else minetest.register_alias('vines:root_middle', 'air') @@ -395,22 +463,14 @@ end if enable_standard ~= false then vines.register_vine('vine', {description = S("Vines"), average_length = 5}, { - check_air = false, - avoid_nodes = {"group:vines"}, - avoid_radius = 5, - surface = { - -- "default:leaves", + place_on = { "default:jungleleaves", "moretrees:jungletree_leaves_red", "moretrees:jungletree_leaves_yellow", "moretrees:jungletree_leaves_green" }, spawn_on_bottom = true, - plantlife_limit = -0.9, rarity = rarity_standard, - tries = 1, - humidity_min = 0.7, - temp_min = 0.4, }) else minetest.register_alias('vines:vine_middle', 'air') @@ -421,22 +481,14 @@ end if enable_side ~= false then vines.register_vine('side', {description = S("Vines"), average_length = 6}, { - check_air = false, - avoid_nodes = {"group:vines", "default:apple"}, - avoid_radius = 3, - surface = { - -- "default:leaves", + place_on = { "default:jungleleaves", "moretrees:jungletree_leaves_red", "moretrees:jungletree_leaves_yellow", "moretrees:jungletree_leaves_green" }, spawn_on_side = true, - plantlife_limit = -0.9, rarity = rarity_side, - tries = 1, - humidity_min = 0.4, - temp_min = 0.4, }) else minetest.register_alias('vines:side_middle', 'air') @@ -447,54 +499,25 @@ end if enable_jungle ~= false then vines.register_vine("jungle", {description = S("Jungle Vines"), average_length = 7}, { - check_air = false, - near_nodes = { - "default:jungleleaves", - "moretrees:jungletree_leaves_red", - "moretrees:jungletree_leaves_yellow", - "moretrees:jungletree_leaves_green" - }, - near_nodes_size = 4, - near_nodes_vertical = 4, - avoid_nodes = { - "vines:jungle_middle", - "vines:jungle_end", - }, - avoid_radius = 5, - surface = { + place_on = { "default:jungletree", "moretrees:jungletree_trunk" }, spawn_on_side = true, - plantlife_limit = -0.9, rarity = rarity_jungle, - tries = 1, - humidity_min = 0.2, - temp_min = 0.3, }) else minetest.register_alias('vines:jungle_middle', 'air') minetest.register_alias('vines:jungle_end', 'air') end --- WILLOW VINES +-- WILLOW VINES (Note from 2024-06: Broken for years now, integration w/ new moretrees spawn mechanic needed) if enable_willow ~= false then - vines.register_vine( 'willow', + vines.register_vine("willow", {description = S("Willow Vines"), average_length = 9}, { - check_air = false, - avoid_nodes = {"vines:willow_middle"}, - avoid_radius = 5, - near_nodes = {'default:water_source'}, - near_nodes_size = 1, - near_nodes_count = 1, - near_nodes_vertical = 7, - plantlife_limit = -0.8, spawn_on_side = true, - surface = {"moretrees:willow_leaves"}, + place_on = {"moretrees:willow_leaves"}, rarity = rarity_willow, - tries = 1, - humidity_min = 0.5, - temp_min = 0.5, }) else minetest.register_alias('vines:willow_middle', 'air') diff --git a/vines/mapgen.lua b/vines/mapgen.lua new file mode 100644 index 0000000..e69de29 diff --git a/vines/mod.conf b/vines/mod.conf index 494b2dd..8f23380 100644 --- a/vines/mod.conf +++ b/vines/mod.conf @@ -1,4 +1,4 @@ name = vines description = Adds climbable vines that are spawned on trees. -depends = default, biome_lib -optional_depends = moretrees +depends = default +optional_depends = moretrees, ebiomes diff --git a/vines/screenshot.png b/vines/screenshot.png index be398e1..7ce1565 100644 Binary files a/vines/screenshot.png and b/vines/screenshot.png differ diff --git a/vines/settingtypes.txt b/vines/settingtypes.txt index 6a5d0fb..6e3b34a 100644 --- a/vines/settingtypes.txt +++ b/vines/settingtypes.txt @@ -7,32 +7,32 @@ vines_enable_rope (Enable vine ropes) bool true #Enables root vines. vines_enable_roots (Enable root vines) bool true -#Rarity of root vines, from 1 to 100, higher numbers are rarer. -vines_rarity_roots (Rarity of roots vines) float 95 0 100 +#Rarity of root vines, from 1 to 10, lower numbers are rarer. +vines_rarity_roots (Rarity of roots vines) float 0.5 1 0 #Enables the standard type of vines. vines_enable_standard (Enable standard vines) bool true -#Rarity of standard vines, from 1 to 100, higher numbers are rarer. -vines_rarity_standard (Rarity of standard vines) float 95 0 100 +#Rarity of standard vines, from 1 to 10, lower numbers are rarer. +vines_rarity_standard (Rarity of standard vines) float 0.2 1 0 #Enables the type of vines that grow on the sides of leaf blocks. vines_enable_side (Enable side vines) bool true -#Rarity of side vines, from 1 to 100, higher numbers are rarer. -vines_rarity_side (Rarity of side vines) float 95 0 100 +#Rarity of side vines, from 1 to 10, lower numbers are rarer. +vines_rarity_side (Rarity of side vines) float 0.2 1 0 #Enables jungle style vines. vines_enable_jungle (Enable jungle vines) bool true -#Rarity of jungle vines, from 1 to 100, higher numbers are rarer. -vines_rarity_jungle (Rarity of jungle vines) float 95 0 100 +#Rarity of jungle vines, from 1 to 10, lower numbers are rarer. +vines_rarity_jungle (Rarity of jungle vines) float 0.2 1 0 #Enables willow vines. vines_enable_willow (Enable willow vines) bool true -#Rarity of willow vines, from 1 to 100, higher numbers are rarer. -vines_rarity_willow (Rarity of willow vines) float 95 0 100 +#Rarity of willow vines, from 1 to 10, lower numbers are rarer. +vines_rarity_willow (Rarity of willow vines) float 0.2 1 0 #Vine growth speed, minimum number of seconds between each growth. vines_growth_min (Minimum number of seconds between growth) int 180 1 3600 diff --git a/vines/textures/vines_item.png b/vines/textures/vines_item.png index 5a4e2cd..637b09a 100644 Binary files a/vines/textures/vines_item.png and b/vines/textures/vines_item.png differ diff --git a/vines/textures/vines_jungle_end.png b/vines/textures/vines_jungle_end.png index a20fce6..5ccf34e 100644 Binary files a/vines/textures/vines_jungle_end.png and b/vines/textures/vines_jungle_end.png differ diff --git a/vines/textures/vines_jungle_middle.png b/vines/textures/vines_jungle_middle.png index 6f285bc..64a96f7 100644 Binary files a/vines/textures/vines_jungle_middle.png and b/vines/textures/vines_jungle_middle.png differ diff --git a/vines/textures/vines_root_end.png b/vines/textures/vines_root_end.png index 42fc559..755d08d 100644 Binary files a/vines/textures/vines_root_end.png and b/vines/textures/vines_root_end.png differ diff --git a/vines/textures/vines_root_middle.png b/vines/textures/vines_root_middle.png index 55f5ecc..72e126f 100644 Binary files a/vines/textures/vines_root_middle.png and b/vines/textures/vines_root_middle.png differ diff --git a/vines/textures/vines_rope.png b/vines/textures/vines_rope.png index a5159dd..41cf1a7 100644 Binary files a/vines/textures/vines_rope.png and b/vines/textures/vines_rope.png differ diff --git a/vines/textures/vines_rope_end.png b/vines/textures/vines_rope_end.png index f86498e..29a3eb9 100644 Binary files a/vines/textures/vines_rope_end.png and b/vines/textures/vines_rope_end.png differ diff --git a/vines/textures/vines_shears.png b/vines/textures/vines_shears.png index 9fe9224..b464bbb 100644 Binary files a/vines/textures/vines_shears.png and b/vines/textures/vines_shears.png differ diff --git a/vines/textures/vines_side_end.png b/vines/textures/vines_side_end.png index 0513ef7..e87780a 100644 Binary files a/vines/textures/vines_side_end.png and b/vines/textures/vines_side_end.png differ diff --git a/vines/textures/vines_side_middle.png b/vines/textures/vines_side_middle.png index bdfd199..2d2c5cd 100644 Binary files a/vines/textures/vines_side_middle.png and b/vines/textures/vines_side_middle.png differ diff --git a/vines/textures/vines_vine_end.png b/vines/textures/vines_vine_end.png index aa82ee6..f87a290 100644 Binary files a/vines/textures/vines_vine_end.png and b/vines/textures/vines_vine_end.png differ diff --git a/vines/textures/vines_vine_middle.png b/vines/textures/vines_vine_middle.png index 92bd2a2..fff2acc 100644 Binary files a/vines/textures/vines_vine_middle.png and b/vines/textures/vines_vine_middle.png differ diff --git a/vines/textures/vines_willow_end.png b/vines/textures/vines_willow_end.png index a064a51..2f62cb5 100644 Binary files a/vines/textures/vines_willow_end.png and b/vines/textures/vines_willow_end.png differ diff --git a/vines/textures/vines_willow_middle.png b/vines/textures/vines_willow_middle.png index a3f48f3..aa7623a 100644 Binary files a/vines/textures/vines_willow_middle.png and b/vines/textures/vines_willow_middle.png differ diff --git a/woodsoils/textures/not in use/woodsoils.png b/woodsoils/textures/not in use/woodsoils.png deleted file mode 100644 index 67253bc..0000000 Binary files a/woodsoils/textures/not in use/woodsoils.png and /dev/null differ diff --git a/woodsoils/textures/woodsoils_ground_cover_side.png b/woodsoils/textures/woodsoils_ground_cover_side.png index d21f2b9..615c2dd 100644 Binary files a/woodsoils/textures/woodsoils_ground_cover_side.png and b/woodsoils/textures/woodsoils_ground_cover_side.png differ diff --git a/youngtrees/init.lua b/youngtrees/init.lua index f231410..c42447f 100644 --- a/youngtrees/init.lua +++ b/youngtrees/init.lua @@ -9,7 +9,7 @@ minetest.register_node("youngtrees:bamboo", { tiles = {"bamboo.png"}, paramtype = "light", walkable = false, - is_ground_content = true, + is_ground_content = false, node_box = { type = "fixed", fixed = { @@ -34,7 +34,7 @@ minetest.register_node("youngtrees:youngtree_top", { wield_image = "youngtree16xa.png", paramtype = "light", walkable = false, - is_ground_content = true, + is_ground_content = false, selection_box = { type = "fixed", fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3} @@ -52,7 +52,7 @@ minetest.register_node("youngtrees:youngtree_middle", { wield_image = "youngtree16xb.png", paramtype = "light", walkable = false, - is_ground_content = true, + is_ground_content = false, selection_box = { type = "fixed", fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3} @@ -70,7 +70,7 @@ minetest.register_node("youngtrees:youngtree_bottom", { wield_image = "youngtree16xc.png", paramtype = "light", walkable = false, - is_ground_content = true, + is_ground_content = false, selection_box = { type = "fixed", fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3} diff --git a/youngtrees/textures/unused/sapling.png b/youngtrees/textures/unused/sapling.png deleted file mode 100644 index a3d5127..0000000 Binary files a/youngtrees/textures/unused/sapling.png and /dev/null differ diff --git a/youngtrees/textures/unused/sapling16x.png b/youngtrees/textures/unused/sapling16x.png deleted file mode 100644 index 45b86ee..0000000 Binary files a/youngtrees/textures/unused/sapling16x.png and /dev/null differ