Merge branch 'tt'

mods/ITEMS/mcl_core/nodes_base.lua

@@ -862,10 +862,11 @@ for i=0,3 do
 end
 
 for i=1,8 do
-	local id, desc, longdesc, usagehelp, help, walkable, drawtype, node_box
+	local id, desc, longdesc, usagehelp, tt_help, help, walkable, drawtype, node_box
 	if i == 1 then
 		id = "mcl_core:snow"
 		desc = S("Top Snow")
+		tt_help = S("Stackable")
 		longdesc = S("Top snow is a layer of snow. It melts near light sources other than the sun with a light level of 12 or higher.").."\n"..S("Top snow can be stacked and has one of 8 different height levels. At levels 2-8, top snow is collidable. Top snow drops 2-9 snowballs, depending on its height.")
 		usagehelp = S("This block can only be placed on full solid blocks and on another top snow (which increases its height).") 
 		walkable = false
@@ -940,6 +941,7 @@ for i=1,8 do
 
 	minetest.register_node(id, {
 		description = desc,
+		_tt_help = tt_help,
 		_doc_items_longdesc = longdesc,
 		_doc_items_usagehelp = usagehelp,
 		_doc_items_create_entry = help,

mods/ITEMS/mcl_core/nodes_cactuscane.lua

@@ -4,6 +4,7 @@ local S = minetest.get_translator("mcl_core")
 
 minetest.register_node("mcl_core:cactus", {
 	description = S("Cactus"),
+	_tt_help = S("Grows on sand").."\n"..S("Contact damage: @1 per half second", 1),
 	_doc_items_longdesc = S("This is a piece of cactus commonly found in dry areas, especially deserts. Over time, cacti will grow up to 3 blocks high on sand or red sand. A cactus hurts living beings touching it with a damage of 1 HP every half second. When a cactus block is broken, all cactus blocks connected above it will break as well."),
 	_doc_items_usagehelp = S("A cactus can only be placed on top of another cactus or any sand."),
 	drawtype = "nodebox",
@@ -47,6 +48,7 @@ minetest.register_node("mcl_core:cactus", {
 
 minetest.register_node("mcl_core:reeds", {
 	description = S("Sugar Canes"),
+	_tt_help = S("Grows on sand or dirt next to water"),
 	_doc_items_longdesc = S("Sugar canes are a plant which has some uses in crafting. Sugar canes will slowly grow up to 3 blocks when they are next to water and are placed on a grass block, dirt, sand, red sand, podzol or coarse dirt. When a sugar cane is broken, all sugar canes connected above will break as well."),
 	_doc_items_usagehelp = S("Sugar canes can only be placed top of other sugar canes and on top of blocks on which they would grow."),
 	drawtype = "plantlike",

mods/ITEMS/mcl_core/nodes_misc.lua

@@ -56,6 +56,7 @@ minetest.register_node("mcl_core:slimeblock", {
 
 minetest.register_node("mcl_core:cobweb", {
 	description = S("Cobweb"),
+	_tt_help = S("Slows down movement"),
 	_doc_items_longdesc = S("Cobwebs can be walked through, but significantly slow you down."),
 	drawtype = "plantlike",
 	paramtype2 = "degrotate",

mods/ITEMS/mcl_core/nodes_trees.lua

@@ -113,9 +113,10 @@ local register_leaves = function(subname, description, longdesc, tiles, drop1, d
 	})
 end
 
-local register_sapling = function(subname, description, longdesc, texture, selbox)
+local register_sapling = function(subname, description, longdesc, tt_help, texture, selbox)
 	minetest.register_node("mcl_core:"..subname, {
 		description = description,
+		_tt_help = tt_help,
 		_doc_items_longdesc = longdesc,
 		_doc_items_hidden = false,
 		drawtype = "plantlike",
@@ -169,12 +170,30 @@ register_wooden_planks("acaciawood", S("Acacia Wood Planks"), {"default_acacia_w
 register_wooden_planks("birchwood", S("Birch Wood Planks"), {"mcl_core_planks_birch.png"})
 
 
-register_sapling("sapling", S("Oak Sapling"), S("When placed on soil (such as dirt) and exposed to light, an oak sapling will grow into an oak after some time."), "default_sapling.png", {-5/16, -0.5, -5/16, 5/16, 0.5, 5/16})
-register_sapling("darksapling", S("Dark Oak Sapling"), S("Dark oak saplings can grow into dark oaks, but only in groups. A lonely dark oak sapling won't grow. A group of four dark oak saplings grows into a dark oak after some time when they are placed on soil (such as dirt) in a 2×2 square and exposed to light."), "mcl_core_sapling_big_oak.png", {-5/16, -0.5, -5/16, 5/16, 7/16, 5/16})
-register_sapling("junglesapling", S("Jungle Sapling"), S("When placed on soil (such as dirt) and exposed to light, a jungle sapling will grow into a jungle tree after some time. When there are 4 jungle saplings in a 2×2 square, they will grow to a huge jungle tree."), "default_junglesapling.png", {-5/16, -0.5, -5/16, 5/16, 0.5, 5/16})
-register_sapling("acaciasapling", S("Acacia Sapling"), S("When placed on soil (such as dirt) and exposed to light, an acacia sapling will grow into an acacia after some time."), "default_acacia_sapling.png", {-5/16, -0.5, -5/16, 5/16, 4/16, 5/16})
-register_sapling("sprucesapling", S("Spruce Sapling"), S("When placed on soil (such as dirt) and exposed to light, a spruce sapling will grow into a spruce after some time. When there are 4 spruce saplings in a 2×2 square, they will grow to a huge spruce."), "mcl_core_sapling_spruce.png", {-4/16, -0.5, -4/16, 4/16, 0.5, 4/16})
-register_sapling("birchsapling", S("Birch Sapling"), S("When placed on soil (such as dirt) and exposed to light, a birch sapling will grow into a birch after some time."), "mcl_core_sapling_birch.png", {-4/16, -0.5, -4/16, 4/16, 0.5, 4/16})
+register_sapling("sapling", S("Oak Sapling"),
+	S("When placed on soil (such as dirt) and exposed to light, an oak sapling will grow into an oak after some time."),
+	S("Needs soil and light to grow"),
+	"default_sapling.png", {-5/16, -0.5, -5/16, 5/16, 0.5, 5/16})
+register_sapling("darksapling", S("Dark Oak Sapling"),
+	S("Dark oak saplings can grow into dark oaks, but only in groups. A lonely dark oak sapling won't grow. A group of four dark oak saplings grows into a dark oak after some time when they are placed on soil (such as dirt) in a 2×2 square and exposed to light."),
+	S("Needs soil and light to grow") .. "\n" .. S("2×2 saplings required"),
+	"mcl_core_sapling_big_oak.png", {-5/16, -0.5, -5/16, 5/16, 7/16, 5/16})
+register_sapling("junglesapling", S("Jungle Sapling"),
+	S("When placed on soil (such as dirt) and exposed to light, a jungle sapling will grow into a jungle tree after some time. When there are 4 jungle saplings in a 2×2 square, they will grow to a huge jungle tree."),
+	S("Needs soil and light to grow") .. "\n" .. S("2×2 saplings = large tree"),
+	"default_junglesapling.png", {-5/16, -0.5, -5/16, 5/16, 0.5, 5/16})
+register_sapling("acaciasapling", S("Acacia Sapling"),
+	S("When placed on soil (such as dirt) and exposed to light, an acacia sapling will grow into an acacia after some time."),
+	S("Needs soil and light to grow"),
+	"default_acacia_sapling.png", {-5/16, -0.5, -5/16, 5/16, 4/16, 5/16})
+register_sapling("sprucesapling", S("Spruce Sapling"),
+	S("When placed on soil (such as dirt) and exposed to light, a spruce sapling will grow into a spruce after some time. When there are 4 spruce saplings in a 2×2 square, they will grow to a huge spruce."),
+	S("Needs soil and light to grow") .. "\n" .. S("2×2 saplings = large tree"),
+	"mcl_core_sapling_spruce.png", {-4/16, -0.5, -4/16, 4/16, 0.5, 4/16})
+register_sapling("birchsapling", S("Birch Sapling"),
+	S("When placed on soil (such as dirt) and exposed to light, a birch sapling will grow into a birch after some time."),
+	S("Needs soil and light to grow"),
+	"mcl_core_sapling_birch.png", {-4/16, -0.5, -4/16, 4/16, 0.5, 4/16})
 
 
 register_leaves("leaves", S("Oak Leaves"), S("Oak leaves are grown from oak trees."), {"default_leaves.png"}, "mcl_core:sapling", 20, "mcl_core:apple", 200)