Update default, WIP!

games/default/files/default/crafting.lua

@@ -631,6 +631,10 @@ minetest.register_craft({
 	recipe = "default:stonebrick",
 })
 
+minetest.register_craft({
+	output = "farming:string",
+	recipe = {{"default:paper", "default:paper"}},
+})
 
 --
 -- Fuels
@@ -674,7 +678,7 @@ minetest.register_craft({
 
 minetest.register_craft({
 	type = "fuel",
-	recipe = "default:sapling",
+	recipe = "group:sapling",
 	burntime = 5,
 })
 
@@ -710,7 +714,7 @@ minetest.register_craft({
 
 minetest.register_craft({
 	type = "fuel",
-	recipe = "crafting:workbench",
+	recipe = "workbench:workbench",
 	burntime = 15,
 })
 
@@ -719,13 +723,3 @@ minetest.register_craft({
 	recipe = "default:chest",
 	burntime = 15,
 })
-
-minetest.register_craft({
-	output = "farming:string",
-	recipe = {{"default:paper", "default:paper"}},
-})
-
-minetest.register_craftitem("default:flint", {
-	description = "Flint",
-	inventory_image = "default_flint.png"
-})

games/default/files/default/craftitems.lua

@@ -1,14 +1,9 @@
 -- mods/default/craftitems.lua
 
---
--- Crafting items
---
-
 minetest.register_craftitem("default:stick", {
 	description = "Stick",
 	inventory_image = "default_stick.png",
 	groups = {stick = 1, flammable = 2},
-
 })
 
 minetest.register_craftitem("default:paper", {
@@ -162,7 +157,7 @@ end)
 minetest.register_craftitem("default:book", {
 	description = "Book",
 	inventory_image = "default_book.png",
-	groups = {book = 1, flammable = 3, misc = 1},
+	groups = {book = 1, flammable = 3},
 	on_use = book_on_use,
 })
 
@@ -254,3 +249,8 @@ minetest.register_craftitem("default:quartz_crystal", {
 	description = "Quartz Crystal",
 	inventory_image = "default_quartz_crystal.png",
 })
+
+minetest.register_craftitem("default:flint", {
+	description = "Flint",
+	inventory_image = "default_flint.png"
+})

games/default/files/default/functions.lua

@@ -40,7 +40,19 @@ function default.node_sound_sand_defaults(table)
 	table.footstep = table.footstep or
 			{name = "default_sand_footstep", gain = 0.12}
 	table.dug = table.dug or
-			{name = "default_sand_footstep", gain = 0.4}
+			{name = "default_sand_footstep", gain = 0.24}
+	table.place = table.place or
+			{name = "default_place_node", gain = 1.0}
+	default.node_sound_defaults(table)
+	return table
+end
+
+function default.node_sound_gravel_defaults(table)
+	table = table or {}
+	table.footstep = table.footstep or
+			{name = "default_gravel_footstep", gain = 0.4}
+	table.dug = table.dug or
+			{name = "default_gravel_footstep", gain = 1.0}
 	table.place = table.place or
 			{name = "default_place_node", gain = 1.0}
 	default.node_sound_defaults(table)

games/default/files/default/init.lua

@@ -1,4 +1,4 @@
--- MultiCraft game mod: default
+-- MultiCraft Game mod: default
 -- See README.txt for licensing and other information.
 
 -- The API documentation in here was moved into doc/lua_api.txt
@@ -16,12 +16,12 @@ dofile(default_path.."/trees.lua")
 dofile(default_path.."/nodes.lua")
 dofile(default_path.."/chests.lua")
 dofile(default_path.."/furnace.lua")
+dofile(default_path.."/torch.lua")
 dofile(default_path.."/tools.lua")
 dofile(default_path.."/craftitems.lua")
 dofile(default_path.."/crafting.lua")
 dofile(default_path.."/mapgen.lua")
 dofile(default_path.."/aliases.lua")
-dofile(default_path.."/torch.lua")
 
 if not minetest.setting_getbool("creative_mode") then
 	minetest.register_on_newplayer(function (player)

games/default/files/default/nodes.lua

@@ -16,6 +16,7 @@ minetest.register_node("default:stone", {
 minetest.register_node("default:cobble", {
 	description = "Cobblestone",
 	tiles = {"default_cobble.png"},
+	is_ground_content = false,
 	groups = {cracky = 3, stone = 2},
 	sounds = default.node_sound_stone_defaults(),
 })
@@ -34,7 +35,7 @@ minetest.register_node("default:mossycobble", {
 	description = "Mossy Cobblestone",
 	tiles = {"default_mossycobble.png"},
 	is_ground_content = false,
-	groups = {cracky = 3},
+	groups = {cracky = 3, stone = 1},
 	sounds = default.node_sound_stone_defaults(),
 })
 
@@ -94,6 +95,13 @@ minetest.register_node("default:redsandstonecarved", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:obsidian", {
+	description = "Obsidian",
+	tiles = {"default_obsidian.png"},
+	sounds = default.node_sound_stone_defaults(),
+	groups = {cracky = 4, level = 2, oddly_breakable_by_hand = 3},
+})
+
 minetest.register_node("default:bedrock", {
 	description = "Bedrock",
 	tiles = {"default_bedrock.png"},
@@ -101,12 +109,6 @@ minetest.register_node("default:bedrock", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
-minetest.register_node("default:obsidian", {
-	description = "Obsidian",
-	tiles = {"default_obsidian.png"},
-	sounds = default.node_sound_stone_defaults(),
-	groups = {cracky = 4, level = 2, oddly_breakable_by_hand = 3},
-})
 --
 -- Soft / Non-Stone
 --
@@ -124,7 +126,7 @@ minetest.register_node("default:dirt_with_grass", {
 	groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1},
 	drop = 'default:dirt',
 	sounds = default.node_sound_dirt_defaults({
-		footstep = {name="default_grass_footstep", gain = 0.4},
+		footstep = {name = "default_grass_footstep", gain = 0.25},
 	}),
 })
 
@@ -173,9 +175,7 @@ minetest.register_node("default:gravel", {
 	description = "Gravel",
 	tiles = {"default_gravel.png"},
 	groups = {crumbly = 2, falling_node = 1},
-	sounds = default.node_sound_dirt_defaults({
+	sounds = default.node_sound_gravel_defaults(),
-		footstep = {name="default_gravel_footstep", gain = 0.45},
-	}),
 	drop = {
 		max_items = 1,
 		items = {
@@ -231,12 +231,15 @@ minetest.register_node("default:snow", {
 minetest.register_node("default:snowblock", {
 	description = "Snow Block",
 	tiles = {"default_snow.png"},
-	groups = {crumbly = 3},
+	groups = {crumbly = 3, cools_lava = 1, snowy = 1},
-	sounds = default.node_sound_dirt_defaults({
+	sounds = default.node_sound_snow_defaults(),
-		footstep = {name = "default_snow_footstep", gain = 0.4},
-		dug = {name = "default_snow_footstep", gain = 0.75},
-	}),
 	drop = "default:snow 4",
+	on_construct = function(pos)
+		pos.y = pos.y - 1
+		if minetest.get_node(pos).name == "default:dirt_with_grass" then
+			minetest.set_node(pos, {name = "default:dirt_with_snow"})
+		end
+	end,
 })
 
 -- 'is ground content = false' to avoid tunnels in sea ice or ice rivers
@@ -247,7 +250,7 @@ minetest.register_node("default:ice", {
 	is_ground_content = false,
 	paramtype = "light",
 	use_texture_alpha = true,
-	groups = {cracky = 3, puts_out_fire = 1, oddly_breakable_by_hand = 2},
+		groups = {cracky = 3, cools_lava = 1, slippery = 3},
 	sounds = default.node_sound_glass_defaults(),
 })
 
@@ -257,7 +260,7 @@ minetest.register_node("default:packedice", {
 	tiles = {"default_ice_packed.png"},
 	paramtype = "light",
 	use_texture_alpha = true,
-	groups = {cracky = 2},
+	groups = {cracky = 3, cools_lava = 1, slippery = 3},
 	sounds = default.node_sound_glass_defaults(),
 })
 
@@ -282,8 +285,7 @@ minetest.register_node("default:wood", {
 	place_param2 = 0,
 	tiles = {"default_wood.png"},
 	is_ground_content = false,
-	material = "default:wood",
+	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, wood = 1},
-	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1},
 	sounds = default.node_sound_wood_defaults(),
 })
 
@@ -304,6 +306,23 @@ minetest.register_node("default:sapling", {
 	groups = {snappy = 2, dig_immediate = 3, flammable = 2,
 		attached_node = 1, sapling = 1},
 	sounds = default.node_sound_leaves_defaults(),
+
+	on_construct = function(pos)
+		minetest.get_node_timer(pos):start(math.random(300, 1500))
+	end,
+
+	on_place = function(itemstack, placer, pointed_thing)
+		itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
+			"default:sapling",
+			-- minp, maxp to be checked, relative to sapling pos
+			-- minp_relative.y = 1 because sapling pos has been checked
+			{x = -3, y = 1, z = -3},
+			{x = 3, y = 6, z = 3},
+			-- maximum interval of interior volume check
+			4)
+
+		return itemstack
+	end,
 })
 
 minetest.register_node("default:leaves", {
@@ -350,7 +369,7 @@ minetest.register_node("default:apple", {
 		fixed = {-3 / 16, -7 / 16, -3 / 16, 3 / 16, 4 / 16, 3 / 16}
 	},
 	groups = {fleshy = 3, dig_immediate = 3, flammable = 2,
-		leafdecay = 3, leafdecay_drop = 1, food_apple = 1, foodstuffs = 1},
+		leafdecay = 3, leafdecay_drop = 1, food_apple = 1},
 	on_use = minetest.item_eat(2),
 	sounds = default.node_sound_leaves_defaults(),
 
@@ -464,8 +483,9 @@ minetest.register_node("default:pine_tree", {
 		"default_pine_tree.png"},
 	paramtype2 = "facedir",
 	is_ground_content = false,
-	groups = {tree = 1, choppy = 3, oddly_breakable_by_hand = 1, flammable = 2},
+	groups = {tree = 1, choppy = 3, oddly_breakable_by_hand = 1, flammable = 3},
 	sounds = default.node_sound_wood_defaults(),
+
 	on_place = minetest.rotate_node
 })
 
@@ -716,6 +736,7 @@ minetest.register_node("default:stone_with_iron", {
 minetest.register_node("default:steelblock", {
 	description = "Steel Block",
 	tiles = {"default_steel_block.png"},
+	is_ground_content = false,
 	groups = {cracky = 1,level = 2},
 	sounds = default.node_sound_stone_defaults(),
 })
@@ -800,6 +821,57 @@ minetest.register_node("default:diamondblock", {
 	sounds = default.node_sound_stone_defaults(),
 })
 
+--
+-- Plantlife (non-cubic)
+--
+
+minetest.register_node("default:cactus", {
+	description = "Cactus",
+	drawtype = "nodebox",
+	tiles = {"default_cactus_top.png", "default_cactus_bottom.png", "default_cactus_side.png","default_cactus_side.png","default_cactus_side.png","default_cactus_side.png"},
+	groups = {snappy = 1, choppy = 3, flammable = 2},
+	sounds = default.node_sound_wood_defaults(),
+	paramtype = "light",
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-7/16, -8/16, -7/16,  7/16, 8/16,  7/16}, -- Main Body
+			{-8/16, -8/16, -7/16,  8/16, 8/16, -7/16}, -- Spikes
+			{-8/16, -8/16,  7/16,  8/16, 8/16,  7/16}, -- Spikes
+			{-7/16, -8/16, -8/16, -7/16, 8/16,  8/16}, -- Spikes
+			{7/16,  -8/16,  8/16,  7/16, 8/16, -8/16}, -- Spikes
+		},
+	},
+	selection_box = {
+		type = "fixed",
+		fixed = {
+			{-7/16, -8/16, -7/16, 7/16, 8/16, 7/16},
+		},
+	},
+
+
+})
+
+minetest.register_node("default:sugarcane", {
+	description = "Sugarcane",
+	drawtype = "plantlike",
+	tiles = {"default_sugarcane.png"},
+	inventory_image = "default_sugarcane_inv.png",
+	wield_image = "default_sugarcane_inv.png",
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3}
+	},
+	groups = {snappy = 3, flammable = 2},
+	sounds = default.node_sound_leaves_defaults(),
+
+	after_dig_node = function(pos, node, metadata, digger)
+		default.dig_up(pos, node, digger)
+	end,
+})
 
 minetest.register_node("default:dry_shrub", {
 	description = "Dry Shrub",
@@ -832,6 +904,8 @@ minetest.register_node("default:junglegrass", {
 	sunlight_propagates = true,
 	walkable = false,
 	buildable_to = true,
+	groups = {snappy = 3, flora = 1, attached_node = 1, flammable = 1},
+	sounds = default.node_sound_leaves_defaults(),
 	drop = {
 		max_items = 1,
 		items = {
@@ -839,8 +913,6 @@ minetest.register_node("default:junglegrass", {
 			{items = {'default:junglegrass'}},
 		}
 	},
-	groups = {snappy = 3, flora = 1, attached_node = 1, flammable = 1},
-	sounds = default.node_sound_leaves_defaults(),
 })
 
 minetest.register_node("default:grass", {
@@ -861,10 +933,11 @@ minetest.register_node("default:grass", {
 			{items = {'default:grass'}},
 		}
 	},
-	paramtype = "light",
+
 	groups = {snappy = 3, flora = 1, attached_node = 1, grass = 1,
 		flammable = 1, dig_immediate = 3},
 	sounds = default.node_sound_leaves_defaults(),
+
 })
 
 
@@ -928,7 +1001,7 @@ minetest.register_node("default:water_source", {
 	liquid_alternative_source = "default:water_source",
 	liquid_viscosity = 1,
 	post_effect_color = {a = 103, r = 30, g = 60, b = 90},
-	groups = {water = 3, liquid = 3, puts_out_fire = 1, not_in_creative_inventory = 1},
+	groups = {water = 3, liquid = 3, cools_lava = 1, not_in_creative_inventory = 1},
 	sounds = default.node_sound_water_defaults(),
 })
 
@@ -1271,112 +1344,6 @@ minetest.register_node("default:bookshelf", {
 })
 
 
---
--- Plantlife (non-cubic)
---
-
-
-minetest.register_node("default:cactus", {
-	description = "Cactus",
-	drawtype = "nodebox",
-	tiles = {"default_cactus_top.png", "default_cactus_bottom.png", "default_cactus_side.png","default_cactus_side.png","default_cactus_side.png","default_cactus_side.png"},
-	groups = {snappy = 1, choppy = 3, flammable = 2},
-	sounds = default.node_sound_wood_defaults(),
-	paramtype = "light",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-7/16, -8/16, -7/16,  7/16, 8/16,  7/16}, -- Main Body
-			{-8/16, -8/16, -7/16,  8/16, 8/16, -7/16}, -- Spikes
-			{-8/16, -8/16,  7/16,  8/16, 8/16,  7/16}, -- Spikes
-			{-7/16, -8/16, -8/16, -7/16, 8/16,  8/16}, -- Spikes
-			{7/16,  -8/16,  8/16,  7/16, 8/16, -8/16}, -- Spikes
-		},
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {
-			{-7/16, -8/16, -7/16, 7/16, 8/16, 7/16},
-		},
-	},
-
-
-})
-
-minetest.register_node("default:sugarcane", {
-	description = "Sugarcane",
-	drawtype = "plantlike",
-	tiles = {"default_sugarcane.png"},
-	inventory_image = "default_sugarcane_inv.png",
-	wield_image = "default_sugarcane_inv.png",
-	paramtype = "light",
-	sunlight_propagates = true,
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3}
-	},
-	groups = {snappy = 3, flammable = 2},
-	sounds = default.node_sound_leaves_defaults(),
-	after_dig_node = function(pos, node, metadata, digger)
-		default.dig_up(pos, node, digger)
-	end,
-})
-
---
--- Quartz
---
-
-minetest.register_node("default:quartz_ore", {
-	description = "Quartz Ore",
-	tiles = {"default_quartz_ore.png"},
-	groups = {cracky = 3, stone = 1},
-	drop = 'default:quartz_crystal',
-	sounds = default.node_sound_stone_defaults(),
-})
-
-minetest.register_node("default:quartz_block", {
-	description = "Quartz Block",
-	tiles = {"default_quartz_block_top.png", "default_quartz_block_bottom.png", "default_quartz_block_side.png"},
-	groups = {snappy = 1, bendy = 2,cracky = 1,level = 2},
-	sounds = default.node_sound_stone_defaults(),
-})
-
-minetest.register_node("default:quartz_chiseled", {
-	description = "Chiseled Quartz",
-	tiles = {"default_quartz_chiseled_top.png", "default_quartz_chiseled_top.png", "default_quartz_chiseled_side.png"},
-	groups = {snappy = 1,bendy=2,cracky = 1,level = 2},
-	sounds = default.node_sound_stone_defaults(),
-})
-
-minetest.register_node("default:quartz_pillar", {
-	description = "Quartz Pillar",
-	paramtype2 = "facedir",
-	on_place = minetest.rotate_node,
-	tiles = {"default_quartz_pillar_top.png", "default_quartz_pillar_top.png", "default_quartz_pillar_side.png"},
-	groups = {snappy = 1,bendy=2,cracky = 1,level = 2},
-	sounds = default.node_sound_stone_defaults(),
-})
-
-
-minetest.register_node("default:slimeblock", {
-	description = "Slime Block",
-	drawtype = "nodebox",
-	paramtype = "light",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.25, -0.25, -0.25, 0.25, 0.25, 0.25},
-			{-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
-		}
-	},
-	tiles = {"default_slimeblock.png"},
-	paramtype = "light",
-	use_texture_alpha = true,
-	sunlight_propagates = true,
-	groups = {oddly_breakable_by_hand = 3,dig_immediate = 2,bouncy=70,disable_jump=1, fall_damage_add_percent=-100},
-})
-
 minetest.register_node("default:ladder_wood", {
 	description = "Wooden Ladder",
 	drawtype = "signlike",
@@ -1435,23 +1402,48 @@ minetest.register_node("default:vine", {
 })
 
 --
--- Misc
+-- Quartz
 --
 
-minetest.register_node("default:cloud", {
+minetest.register_node("default:quartz_ore", {
-	description = "Cloud",
+	description = "Quartz Ore",
-	tiles = {"default_cloud.png"},
+	tiles = {"default_quartz_ore.png"},
-	is_ground_content = false,
+	groups = {cracky = 3, stone = 1},
-	sounds = default.node_sound_defaults(),
+	drop = 'default:quartz_crystal',
-	groups = {not_in_creative_inventory = 1},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:quartz_block", {
+	description = "Quartz Block",
+	tiles = {"default_quartz_block_top.png", "default_quartz_block_bottom.png", "default_quartz_block_side.png"},
+	groups = {snappy = 1, bendy = 2,cracky = 1,level = 2},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:quartz_chiseled", {
+	description = "Chiseled Quartz",
+	tiles = {"default_quartz_chiseled_top.png", "default_quartz_chiseled_top.png", "default_quartz_chiseled_side.png"},
+	groups = {snappy = 1,bendy=2,cracky = 1,level = 2},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("default:quartz_pillar", {
+	description = "Quartz Pillar",
+	paramtype2 = "facedir",
+	on_place = minetest.rotate_node,
+	tiles = {"default_quartz_pillar_top.png", "default_quartz_pillar_top.png", "default_quartz_pillar_side.png"},
+	groups = {snappy = 1,bendy=2,cracky = 1,level = 2},
+	sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_node("default:glass", {
 	description = "Glass",
-	drawtype = "glasslike",
+	drawtype = "glasslike_framed_optional",
-	tiles = {"default_glass.png"},
+	tiles = {"default_glass.png", "default_glass_detail.png"},
 	paramtype = "light",
+	paramtype2 = "glasslikeliquidlevel",
 	sunlight_propagates = true,
+	is_ground_content = false,
 	groups = {cracky = 3, oddly_breakable_by_hand = 3},
 	sounds = default.node_sound_glass_defaults(),
 	drop = "",
@@ -1573,6 +1565,37 @@ minetest.register_node("default:sponge_wet", {
 	groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 3, not_in_creative_inventory = 1},
 })
 
+
+minetest.register_node("default:slimeblock", {
+	description = "Slime Block",
+	drawtype = "nodebox",
+	paramtype = "light",
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.25, -0.25, -0.25, 0.25, 0.25, 0.25},
+			{-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
+		}
+	},
+	tiles = {"default_slimeblock.png"},
+	paramtype = "light",
+	use_texture_alpha = true,
+	sunlight_propagates = true,
+	groups = {oddly_breakable_by_hand = 3,dig_immediate = 2,bouncy=70,disable_jump=1, fall_damage_add_percent=-100},
+})
+
+--
+-- Misc
+--
+
+minetest.register_node("default:cloud", {
+	description = "Cloud",
+	tiles = {"default_cloud.png"},
+	is_ground_content = false,
+	sounds = default.node_sound_defaults(),
+	groups = {not_in_creative_inventory = 1},
+})
+
 --
 -- register trees for leafdecay
 --
@@ -1640,18 +1663,18 @@ function AddGlass(desc, recipeitem, color)
 end
 
 -- Colored glass
-AddGlass( "Glass Red",		"basecolor_red", "_red")
+AddGlass( "Glass Red",		"basecolor_red", 		"_red")
-AddGlass( "Glass Green",	"unicolor_dark_green", "_green")
+AddGlass( "Glass Green",	"unicolor_dark_green",	"_green")
-AddGlass( "Glass Blue",		"basecolor_blue", "_blue")
+AddGlass( "Glass Blue",		"basecolor_blue",		"_blue")
-AddGlass( "Glass Light Blue", "basecolor_cyan", "_light_blue")
+AddGlass( "Glass Light Blue", "basecolor_cyan",		"_light_blue")
-AddGlass( "Glass Black",	"basecolor_black", "_black")
+AddGlass( "Glass Black",	"basecolor_black",		"_black")
-AddGlass( "Glass White",	"basecolor_white", "_white")
+AddGlass( "Glass White",	"basecolor_white",		"_white")
-AddGlass( "Glass Yellow",	"basecolor_yellow", "_yellow")
+AddGlass( "Glass Yellow",	"basecolor_yellow",		"_yellow")
-AddGlass( "Glass Brown",	"unicolor_dark_orange", "_brown")
+AddGlass( "Glass Brown",	"unicolor_dark_orange",	"_brown")
-AddGlass( "Glass Orange",	"excolor_orange", "_orange")
+AddGlass( "Glass Orange",	"excolor_orange",		"_orange")
-AddGlass( "Glass Pink",		"unicolor_light_red", "_pink")
+AddGlass( "Glass Pink",		"unicolor_light_red",	"_pink")
-AddGlass( "Glass Gray",		"unicolor_darkgrey", "_gray")
+AddGlass( "Glass Gray",		"unicolor_darkgrey",	"_gray")
-AddGlass( "Glass Lime",		"basecolor_green", "_lime")
+AddGlass( "Glass Lime",		"basecolor_green",		"_lime")
-AddGlass( "Glass Silver",	"basecolor_grey", "_silver")
+AddGlass( "Glass Silver",	"basecolor_grey",		"_silver")
-AddGlass( "Glass Magenta",	"basecolor_magenta", "_magenta")
+AddGlass( "Glass Magenta",	"basecolor_magenta",	"_magenta")
-AddGlass( "Glass Purple",	"excolor_violet", "_purple")
+AddGlass( "Glass Purple",	"excolor_violet",		"_purple")

games/default/files/default/tools.lua

@@ -30,12 +30,14 @@ minetest.register_tool("default:pick_wood", {
 		full_punch_interval = 1.2,
 		max_drop_level=0,
 		groupcaps={
-			cracky = {times={[3]=1.60, [10]=1.60}, uses=10, maxlevel=1},
+			cracky = {times={[3]=1.60}, uses=10, maxlevel=1},
 		},
-		damage_groups = {fleshy=3},
+		damage_groups = {fleshy=2},
 	},
-	groups = {tools=1},
+	groups = {flammable = 2},
+	sound = {breaks = "default_tool_breaks"},
 })
+
 minetest.register_tool("default:pick_stone", {
 	description = "Stone Pickaxe",
 	inventory_image = "default_tool_stonepick.png",
@@ -43,11 +45,11 @@ minetest.register_tool("default:pick_stone", {
 		full_punch_interval = 1.3,
 		max_drop_level=0,
 		groupcaps={
-			cracky = {times={[2]=2.0, [3]=1.20, [3]=0.60}, uses=20, maxlevel=1},
+			cracky = {times={[2]=2.0, [3]=1.00}, uses=20, maxlevel=1},
 		},
-		damage_groups = {fleshy=4},
+		damage_groups = {fleshy=3},
 	},
-	groups = {tools=1},
+	sound = {breaks = "default_tool_breaks"},
 })
 minetest.register_tool("default:pick_steel", {
 	description = "Steel Pickaxe",
@@ -56,25 +58,26 @@ minetest.register_tool("default:pick_steel", {
 		full_punch_interval = 1.0,
 		max_drop_level=1,
 		groupcaps={
-			cracky = {times={[1]=4.00, [2]=1.60, [3]=0.80,[3]=0.40}, uses=20, maxlevel=2},
+			cracky = {times={[1]=4.00, [2]=1.60, [3]=0.80}, uses=20, maxlevel=2},
 		},
-		damage_groups = {fleshy=5},
+		damage_groups = {fleshy=4},
 	},
-	groups = {tools=1},
+	sound = {breaks = "default_tool_breaks"},
 })
 minetest.register_tool("default:pick_gold", {
 	description = "Gold Pickaxe",
 	inventory_image = "default_tool_goldpick.png",
 	tool_capabilities = {
-		full_punch_interval = 1.3,
+		full_punch_interval = 0.9,
-		max_drop_level=0,
+		max_drop_level=3,
 		groupcaps={
-			cracky = {times={[2]=2.0, [3]=1.20, [10]=0.30}, uses=20, maxlevel=1},
+			cracky = {times={[1]=2.4, [2]=1.2, [3]=0.60}, uses=20, maxlevel=3},
 		},
-		damage_groups = {fleshy=3},
+		damage_groups = {fleshy=5},
 	},
-	groups = {tools=1},
+	sound = {breaks = "default_tool_breaks"},
 })
+
 minetest.register_tool("default:pick_diamond", {
 	description = "Diamond Pickaxe",
 	inventory_image = "default_tool_diamondpick.png",
@@ -82,14 +85,17 @@ minetest.register_tool("default:pick_diamond", {
 		full_punch_interval = 0.9,
 		max_drop_level=3,
 		groupcaps={
-			cracky = {times={[1]=2.0, [2]=1.0, [3]=0.50,[4]=20.00,[3]=0.20 }, uses=30, maxlevel=4},
+			cracky = {times={[1]=2.0, [2]=1.0, [3]=0.50}, uses=30, maxlevel=3},
 		},
-		damage_groups = {fleshy=6},
+		damage_groups = {fleshy=5},
 	},
-	groups = {tools=1},
+	sound = {breaks = "default_tool_breaks"},
 })
 
+--
 -- Shovels
+--
+
 minetest.register_tool("default:shovel_wood", {
 	description = "Wooden Shovel",
 	inventory_image = "default_tool_woodshovel.png",
@@ -102,8 +108,10 @@ minetest.register_tool("default:shovel_wood", {
 		},
 		damage_groups = {fleshy=2},
 	},
-	groups = {tools=1},
+	groups = {flammable = 2},
+	sound = {breaks = "default_tool_breaks"},
 })
+
 minetest.register_tool("default:shovel_stone", {
 	description = "Stone Shovel",
 	inventory_image = "default_tool_stoneshovel.png",
@@ -116,7 +124,7 @@ minetest.register_tool("default:shovel_stone", {
 		},
 		damage_groups = {fleshy=2},
 	},
-	groups = {tools=1},
+	sound = {breaks = "default_tool_breaks"},
 })
 minetest.register_tool("default:shovel_steel", {
 	description = "Steel Shovel",
@@ -130,22 +138,24 @@ minetest.register_tool("default:shovel_steel", {
 		},
 		damage_groups = {fleshy=3},
 	},
-	groups = {tools=1},
+	sound = {breaks = "default_tool_breaks"},
 })
+
 minetest.register_tool("default:shovel_gold", {
 	description = "Gold Shovel",
 	inventory_image = "default_tool_goldshovel.png",
 	wield_image = "default_tool_goldshovel.png^[transformR90",
 	tool_capabilities = {
-		full_punch_interval = 1.4,
+		full_punch_interval = 1.0,
-		max_drop_level=0,
+		max_drop_level=3,
 		groupcaps={
-			crumbly = {times={[1]=1.80, [2]=1.20, [3]=0.50}, uses=20, maxlevel=1},
+			crumbly = {times={[1]=1.20, [2]=0.60, [3]=0.30}, uses=20, maxlevel=3},
 		},
-		damage_groups = {fleshy=2},
+		damage_groups = {fleshy=4},
 	},
-	groups = {tools=1},
+	sound = {breaks = "default_tool_breaks"},
 })
+
 minetest.register_tool("default:shovel_diamond", {
 	description = "Diamond Shovel",
 	inventory_image = "default_tool_diamondshovel.png",
@@ -156,12 +166,15 @@ minetest.register_tool("default:shovel_diamond", {
 		groupcaps={
 			crumbly = {times={[1]=1.10, [2]=0.50, [3]=0.30}, uses=30, maxlevel=3},
 		},
-		damage_groups = {fleshy=5},
+		damage_groups = {fleshy=4},
 	},
-	groups = {tools=1},
+	sound = {breaks = "default_tool_breaks"},
 })
 
+--
 -- Axes
+--
+
 minetest.register_tool("default:axe_wood", {
 	description = "Wooden Axe",
 	inventory_image = "default_tool_woodaxe.png",
@@ -169,12 +182,14 @@ minetest.register_tool("default:axe_wood", {
 		full_punch_interval = 1.0,
 		max_drop_level=0,
 		groupcaps={
-			choppy = {times={[2]=3.00, [3]=2.00}, uses=10, maxlevel=1},
+			choppy = {times={[2]=3.00, [3]=1.60}, uses=10, maxlevel=1},
 		},
-		damage_groups = {fleshy=1},
+		damage_groups = {fleshy=2},
 	},
-	groups = {tools=1},
+	groups = {flammable = 2},
+	sound = {breaks = "default_tool_breaks"},
 })
+
 minetest.register_tool("default:axe_stone", {
 	description = "Stone Axe",
 	inventory_image = "default_tool_stoneaxe.png",
@@ -182,12 +197,13 @@ minetest.register_tool("default:axe_stone", {
 		full_punch_interval = 1.2,
 		max_drop_level=0,
 		groupcaps={
-			choppy = {times={[1]=3.00, [2]=2.00, [3]=1.50}, uses=20, maxlevel=1},
+			choppy={times={[1]=3.00, [2]=2.00, [3]=1.30}, uses=20, maxlevel=1},
 		},
 		damage_groups = {fleshy=3},
 	},
-	groups = {tools=1},
+	sound = {breaks = "default_tool_breaks"},
 })
+
 minetest.register_tool("default:axe_steel", {
 	description = "Steel Axe",
 	inventory_image = "default_tool_steelaxe.png",
@@ -197,23 +213,24 @@ minetest.register_tool("default:axe_steel", {
 		groupcaps={
 			choppy = {times={[1]=2.50, [2]=1.40, [3]=1.00}, uses=20, maxlevel=2},
 		},
-		damage_groups = {fleshy=5},
+		damage_groups = {fleshy=4},
 	},
-	groups = {tools=1},
+	sound = {breaks = "default_tool_breaks"},
 })
 minetest.register_tool("default:axe_gold", {
 	description = "Gold Axe",
 	inventory_image = "default_tool_goldaxe.png",
 	tool_capabilities = {
-		full_punch_interval = 1.2,
+		full_punch_interval = 0.9,
-		max_drop_level=0,
+		max_drop_level=1,
 		groupcaps={
-			choppy = {times={[1]=3.00, [2]=2.00, [3]=1.50}, uses=20, maxlevel=1},
+			choppy={times={[1]=2.20, [2]=1.00, [3]=0.60}, uses=20, maxlevel=3},
 		},
-		damage_groups = {fleshy=3},
+		damage_groups = {fleshy=6},
 	},
-	groups = {tools=1},
+	sound = {breaks = "default_tool_breaks"},
 })
+
 minetest.register_tool("default:axe_diamond", {
 	description = "Diamond Axe",
 	inventory_image = "default_tool_diamondaxe.png",
@@ -221,14 +238,17 @@ minetest.register_tool("default:axe_diamond", {
 		full_punch_interval = 0.9,
 		max_drop_level=1,
 		groupcaps={
-			choppy = {times={[1]=2.10, [2]=0.90, [3]=0.50}, uses=30, maxlevel=2},
+			choppy={times={[1]=2.10, [2]=0.90, [3]=0.50}, uses=30, maxlevel=3},
 		},
-		damage_groups = {fleshy=6},
+		damage_groups = {fleshy=7},
 	},
-	groups = {tools=1},
+	sound = {breaks = "default_tool_breaks"},
 })
 
+--
 -- Swords
+--
+
 minetest.register_tool("default:sword_wood", {
 	description = "Wooden Sword",
 	inventory_image = "default_tool_woodsword.png",
@@ -240,7 +260,10 @@ minetest.register_tool("default:sword_wood", {
 		},
 		damage_groups = {fleshy=2},
 	},
+	groups = {flammable = 2},
+	sound = {breaks = "default_tool_breaks"},
 })
+
 minetest.register_tool("default:sword_stone", {
 	description = "Stone Sword",
 	inventory_image = "default_tool_stonesword.png",
@@ -252,7 +275,9 @@ minetest.register_tool("default:sword_stone", {
 		},
 		damage_groups = {fleshy=4},
 	},
+	sound = {breaks = "default_tool_breaks"},
 })
+
 minetest.register_tool("default:sword_steel", {
 	description = "Steel Sword",
 	inventory_image = "default_tool_steelsword.png",
@@ -264,19 +289,23 @@ minetest.register_tool("default:sword_steel", {
 		},
 		damage_groups = {fleshy=6},
 	},
+	sound = {breaks = "default_tool_breaks"},
 })
+
 minetest.register_tool("default:sword_gold", {
 	description = "Gold Sword",
 	inventory_image = "default_tool_goldsword.png",
 	tool_capabilities = {
-		full_punch_interval = 1.2,
+		full_punch_interval = 0.7,
-		max_drop_level=0,
+		max_drop_level=1,
 		groupcaps={
-			snappy = {times={[2]=1.4, [3]=0.40}, uses=20, maxlevel=1},
+			snappy={times={[1]=2.0, [2]=1.00, [3]=0.35}, uses=30, maxlevel=3},
 		},
-		damage_groups = {fleshy=4},
+		damage_groups = {fleshy=7},
 	},
+	sound = {breaks = "default_tool_breaks"},
 })
+
 minetest.register_tool("default:sword_diamond", {
 	description = "Diamond Sword",
 	inventory_image = "default_tool_diamondsword.png",
@@ -286,11 +315,15 @@ minetest.register_tool("default:sword_diamond", {
 		groupcaps={
 			snappy = {times={[1]=1.90, [2]=0.90, [3]=0.30}, uses=40, maxlevel=3},
 		},
-		damage_groups = {fleshy=7},
+		damage_groups = {fleshy=8},
 	},
+	sound = {breaks = "default_tool_breaks"},
 })
 
+--
 -- Fishing Pole
+--
+
 minetest.register_tool("default:pole", {
 	description = "Fishing Rod",
 	groups = {},
@@ -313,5 +346,5 @@ minetest.register_tool("default:pole", {
 			end
 		end
 		return nil
-	end,
+	end
 })

games/default/files/flowers/mapgen.lua

@@ -46,7 +46,6 @@ end
 
 local function register_mgv6_waterlily()
 	minetest.register_decoration({
-		name = "flowers:waterlily",
 		deco_type = "simple",
 		place_on = {"default:dirt"},
 		sidelen = 16,
@@ -62,8 +61,7 @@ local function register_mgv6_waterlily()
 		y_min = 0,
 		decoration = "flowers:waterlily",
 		param2 = 0,
-		param2_max = 3,
+		rotation = "random",
-		place_offset_y = 1,
 	})
 end
 
@@ -132,14 +130,13 @@ end
 
 local function register_waterlily()
 	minetest.register_decoration({
-		name = "default:waterlily",
 		deco_type = "simple",
 		place_on = {"default:dirt"},
 		sidelen = 16,
 		noise_params = {
 			offset = -0.12,
 			scale = 0.3,
-			spread = {x = 200, y = 200, z = 200},
+			spread = {x = 100, y = 100, z = 100},
 			seed = 33,
 			octaves = 3,
 			persist = 0.7
@@ -148,9 +145,7 @@ local function register_waterlily()
 		y_max = 0,
 		y_min = 0,
 		decoration = "flowers:waterlily",
-		param2 = 0,
+		rotation = "random",
-		param2_max = 3,
-		place_offset_y = 1,
 	})
 end