Merge remote-tracking branch 'origin/drops' into trees

Conflicts:
	mods/trees/registration.lua

mods/decorations/init.lua

@@ -6,7 +6,8 @@ minetest.register_node("decorations:malachite_block", {
 	description = "Malachite Block",
 	tiles = {"decorations_malachite.png"},
 	is_ground_content = true,
-	groups = {cracky=3},
+	drop = "minerals:malachite 4",
+	groups = {cracky=3,drop_on_dig=1},
 	sounds = default.node_sound_stone_defaults(),
 })
 
@@ -196,12 +197,6 @@ minetest.register_craft({
 		{"minerals:malachite","minerals:malachite"},
 	}
 })
-minetest.register_craft({
-	output = "minerals:malachite 4",
-	recipe = {
-		{"decorations:malachite_block"},
-	}
-})
 
 minetest.register_craft({
 	output = "decorations:malachite_pyramid",

mods/default/init.lua

@@ -333,7 +333,7 @@ minetest.register_node("default:stone", {
 	description = "Stone",
 	tiles = {"default_stone.png"},
 	is_ground_content = true,
-	groups = {cracky=3},
+	groups = {cracky=3,drop_on_dig=1},
 	drop = {
 		max_items = 1,
 		items = {
@@ -353,8 +353,7 @@ minetest.register_node("default:desert_stone", {
 	description = "Desert Stone",
 	tiles = {"default_desert_stone.png"},
 	is_ground_content = true,
-	groups = {cracky=3},
+	groups = {cracky=3,drop_on_dig=1},
-	drop = 'default:desert_stone',
 	sounds = default.node_sound_stone_defaults(),
 })
 
@@ -362,7 +361,7 @@ minetest.register_node("default:stone_flat", {
 	description = "Flat Stone",
 	tiles = {"default_stone_flat.png"},
 	is_ground_content = true,
-	groups = {cracky=3},
+	groups = {cracky=3,drop_on_dig=1},
 	sounds = default.node_sound_stone_defaults(),
 })
 
@@ -370,7 +369,7 @@ minetest.register_node("default:desert_stone_flat", {
 	description = "Desert Flat Stone",
 	tiles = {"default_desert_stone_flat.png"},
 	is_ground_content = true,
-	groups = {cracky=3},
+	groups = {cracky=3,drop_on_dig=1},
 	sounds = default.node_sound_stone_defaults(),
 })
 
@@ -378,7 +377,7 @@ minetest.register_node("default:cobbleblock_flat", {
 	description = "Stone Brick Block",
 	tiles = {"default_cobbleblock_flat.png"},
 	is_ground_content = true,
-	groups = {cracky=3},
+	groups = {cracky=3,drop_on_dig=1},
 	sounds = default.node_sound_stone_defaults(),
 })
 
@@ -386,7 +385,7 @@ minetest.register_node("default:dirt_with_grass", {
 	description = "Dirt with Grass",
 	tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
 	is_ground_content = true,
-	groups = {crumbly=3},
+	groups = {crumbly=3,drop_on_dig=1},
 	drop = 'default:dirt',
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_grass_footstep", gain=0.4},
@@ -397,7 +396,7 @@ minetest.register_node("default:dirt", {
 	description = "Dirt",
 	tiles = {"default_dirt.png"},
 	is_ground_content = true,
-	groups = {crumbly=3},
+	groups = {crumbly=3,drop_on_dig=1},
 	sounds = default.node_sound_dirt_defaults(),
 })
 
@@ -405,7 +404,7 @@ minetest.register_node("default:sand", {
 	description = "Sand",
 	tiles = {"default_sand.png"},
 	is_ground_content = true,
-	groups = {crumbly=3, falling_node=1},
+	groups = {crumbly=3, falling_node=1,drop_on_dig=1},
 	sounds = default.node_sound_sand_defaults(),
 })
 
@@ -413,7 +412,7 @@ minetest.register_node("default:desert_sand", {
 	description = "Desert Sand",
 	tiles = {"default_desert_sand.png"},
 	is_ground_content = true,
-	groups = {sand=1, crumbly=3, falling_node=1},
+	groups = {sand=1, crumbly=3, falling_node=1,drop_on_dig=1},
 	sounds = default.node_sound_sand_defaults(),
 })
 
@@ -421,7 +420,7 @@ minetest.register_node("default:gravel", {
 	description = "Gravel",
 	tiles = {"default_gravel.png"},
 	is_ground_content = true,
-	groups = {crumbly=2, falling_node=1},
+	groups = {crumbly=2, falling_node=1,drop_on_dig=1},
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_gravel_footstep", gain=0.45},
 	}),
@@ -431,7 +430,7 @@ minetest.register_node("default:sandstone", {
 	description = "Sandstone",
 	tiles = {"default_sandstone.png"},
 	is_ground_content = true,
-	groups = {crumbly=2,cracky=2},
+	groups = {crumbly=2,cracky=2,drop_on_dig=1},
 	drop = 'default:sand',
 	sounds = default.node_sound_stone_defaults(),
 })
@@ -440,7 +439,7 @@ minetest.register_node("default:clay", {
 	description = "Clay",
 	tiles = {"default_clay.png"},
 	is_ground_content = true,
-	groups = {crumbly=3},
+	groups = {crumbly=3,drop_on_dig=1},
 	drop = 'default:clay_lump 4',
 	sounds = default.node_sound_dirt_defaults({
 		footstep = "",
@@ -451,41 +450,16 @@ minetest.register_node("default:brick", {
 	description = "Brick Block",
 	tiles = {"default_brick.png"},
 	is_ground_content = true,
-	groups = {cracky=3},
+	groups = {cracky=3,drop_on_dig=1},
 	drop = 'default:clay_brick 4',
 	sounds = default.node_sound_stone_defaults(),
 })
 
-minetest.register_node("default:leaves", {
-	description = "Leaves",
-	drawtype = "allfaces_optional",
-	visual_scale = 1.3,
-	tiles = {"default_leaves.png"},
-	paramtype = "light",
-	groups = {snappy=3, leafdecay=3, flammable=2},
-	drop = {
-		max_items = 1,
-		items = {
-			{
-				-- player will get sapling with 1/20 chance
-				items = {'default:sapling'},
-				rarity = 20,
-			},
-			{
-				-- player will get leaves only if he get no saplings,
-				-- this is because max_items is 1
-				items = {'default:leaves'},
-			}
-		}
-	},
-	sounds = default.node_sound_leaves_defaults(),
-})
-
 minetest.register_node("default:cactus", {
 	description = "Cactus",
 	tiles = {"default_cactus_top.png", "default_cactus_top.png", "default_cactus_side.png"},
 	is_ground_content = true,
-	groups = {snappy=2,choppy=3,flammable=2,dropping_node=1},
+	groups = {snappy=2,choppy=3,flammable=2,dropping_node=1,drop_on_dig=1},
 	sounds = default.node_sound_wood_defaults(),
 })
 
@@ -498,7 +472,7 @@ minetest.register_node("default:papyrus", {
 	paramtype = "light",
 	is_ground_content = true,
 	walkable = false,
-	groups = {snappy=3,flammable=2, dropping_node=1},
+	groups = {snappy=3,flammable=2, dropping_node=1,drop_on_dig=1},
 	sounds = default.node_sound_leaves_defaults(),
 })
 
@@ -865,7 +839,7 @@ minetest.register_node("default:cobbleblock", {
 	tiles = {"default_cobbleblock.png"},
 	is_ground_content = true,
 	drop = "default:cobble 9",
-	groups = {crumbly=2, oddly_breakable_by_hand=1, falling_node=1},
+	groups = {crumbly=2, oddly_breakable_by_hand=1, falling_node=1, drop_on_dig=1},
 	sounds = default.node_sound_stone_defaults(),
 })
 
@@ -883,33 +857,6 @@ minetest.register_craft({
 	},
 })
 
-minetest.register_node("default:sapling", {
-	description = "Sapling",
-	drawtype = "plantlike",
-	visual_scale = 1.0,
-	tiles = {"default_sapling.png"},
-	inventory_image = "default_sapling.png",
-	wield_image = "default_sapling.png",
-	paramtype = "light",
-	walkable = false,
-	groups = {snappy=2,dig_immediate=3,flammable=2},
-	sounds = default.node_sound_defaults(),
-})
-
-minetest.register_node("default:apple", {
-	description = "Apple",
-	drawtype = "plantlike",
-	visual_scale = 1.0,
-	tiles = {"default_apple.png"},
-	inventory_image = "default_apple.png",
-	paramtype = "light",
-	sunlight_propagates = true,
-	walkable = false,
-	groups = {fleshy=3,dig_immediate=3,flammable=2},
-	on_use = minetest.item_eat(4),
-	sounds = default.node_sound_defaults(),
-})
-
 minetest.register_node("default:dry_shrub", {
 	description = "Dry Shrub",
 	drawtype = "plantlike",

mods/metals/init.lua

@@ -102,7 +102,8 @@ for i=1, #metals.list do
 		description = "Block of "..metals.desc_list[i],
 		tiles = {"metals_"..metals.list[i].."_block.png"},
 		is_ground_content = true,
-		groups = {snappy=1,bendy=2,cracky=1,melty=2,level=2},
+		drop = "metals:"..metals.list[i].."_doubleingot",
+		groups = {snappy=1,bendy=2,cracky=1,melty=2,level=2,drop_on_dig=1},
 		sounds = default.node_sound_stone_defaults(),
 	})
 	
@@ -113,8 +114,8 @@ for i=1, #metals.list do
 	minetest.register_craft({
 		output = "metals:"..metals.list[i].."_block",
 		recipe = {
-			{"metals:"..metals.list[i].."_ingot", "metals:"..metals.list[i].."_ingot"},
+			{"metals:"..metals.list[i].."_doubleingot", "metals:"..metals.list[i].."_doubleingot"},
-			{"metals:"..metals.list[i].."_ingot", "metals:"..metals.list[i].."_ingot"},
+			{"metals:"..metals.list[i].."_doubleingot", "metals:"..metals.list[i].."_doubleingot"},
 		}
 	})
 	

mods/ores/init.lua

@@ -50,7 +50,7 @@ for i=1, #ORES_LIST do
 		description = ORES_DESC_LIST[i],
 		tile_images = {"default_stone.png^ores_"..ORES_LIST[i]..".png"},
 		is_ground_content = true,
-		groups = {cracky=3},
+		groups = {cracky=3,drop_on_dig=1},
 		drop = {
 			max_items = 1,
 			items = {
@@ -66,7 +66,7 @@ minetest.register_node("ores:native_copper_desert", {
 	description = "Native copper ore",
 	tile_images = {"default_desert_stone.png^ores_native_copper.png"},
 	is_ground_content = true,
-	groups = {cracky=3},
+	groups = {cracky=3,drop_on_dig=1},
 	drop = {
 		max_items = 1,
 		items = {
@@ -81,7 +81,7 @@ minetest.register_node("ores:native_gold_desert", {
 	description = "Native gold ore",
 	tile_images = {"default_desert_stone.png^ores_native_gold.png"},
 	is_ground_content = true,
-	groups = {cracky=3},
+	groups = {cracky=3,drop_on_dig=1},
 	drop = {
 		max_items = 1,
 		items = {
@@ -96,7 +96,7 @@ minetest.register_node("ores:peat", {
 	description = "Peat",
 	tile_images = {"ores_peat.png"},
 	is_ground_content = true,
-	groups = {crumbly=3},
+	groups = {crumbly=3,drop_on_dig=1},
 	sounds = default.node_sound_stone_defaults(),
 })
 

mods/stairs/init.lua

@@ -115,32 +115,26 @@ function stairs.register_stair_and_slab(subname, recipeitem, groups, images, des
 	stairs.register_slab(subname, recipeitem, groups, images, desc_slab)
 end
 
-stairs.register_stair_and_slab("wood", "default:wood",
-		{snappy=2,choppy=2,oddly_breakable_by_hand=2},
-		{"default_wood.png"},
-		"Wooden stair",
-		"Wooden slab")
-
 stairs.register_stair_and_slab("stone", "default:stone",
 		{cracky=3},
-		{"default_stone.png"},
+		{"default_stone.png",drop_on_dig=1},
-		"Stone stair",
+		"Stone Stair",
-		"Stone slab")
+		"Stone Slab")
 
 stairs.register_stair_and_slab("cobble", "default:cobbleblock",
 		{cracky=3},
-		{"default_cobbleblock.png"},
+		{"default_cobbleblock.png",drop_on_dig=1},
-		"Cobble stair",
+		"Cobble Stair",
-		"Cobble slab")
+		"Cobble Slab")
 
 stairs.register_stair_and_slab("brick", "default:brick",
 		{cracky=3},
-		{"default_brick.png"},
+		{"default_brick.png",drop_on_dig=1},
-		"Brick stair",
+		"Brick Stair",
-		"Brick slab")
+		"Brick Slab")
 
 stairs.register_stair_and_slab("sandstone", "default:sandstone",
 		{crumbly=2,cracky=2},
-		{"default_sandstone.png"},
+		{"default_sandstone.png",drop_on_dig=1},
-		"Sandstone stair",
+		"Sandstone Stair",
-		"Sandstone slab")
+		"Sandstone Slab")

mods/trees/registration.lua

@@ -17,7 +17,7 @@ function realtest.register_tree(name, TreeDef)
 	minetest.register_node(tree.name.."_planks", {
 		description = tree.description.." Planks",
 		tiles = {tree.textures[3]},
-		groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3},
+		groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,drop_on_dig=1},
 		sounds = default.node_sound_wood_defaults(),
 	})
 	
@@ -46,7 +46,7 @@ function realtest.register_tree(name, TreeDef)
 		visual_scale = 1.3,
 		tiles = {tree.textures[2]},
 		paramtype = "light",
-		groups = {snappy=3, leafdecay=3, flammable=2},
+		groups = {snappy=3, leafdecay=3, flammable=2,drop_on_dig=1},
 		drop = {
 			max_items = 1,
 			items = {
@@ -71,7 +71,7 @@ function realtest.register_tree(name, TreeDef)
 		minetest.register_node(tree.name.."_trunk", {
 		description = tree.description.." Trunk",
 		tiles = tree.textures[1],
-		groups = {tree=1,snappy=1,choppy=2,flammable=2,dropping_node=1},
+		groups = {tree=1,snappy=1,choppy=2,flammable=2,dropping_node=1,drop_on_dig=1},
 		sounds = default.node_sound_wood_defaults(),
 		drawtype = "nodebox",
 		paramtype = "light",