Update MinetestForFunGame

minetestforfun_game/mods/default/README.txt

@@ -58,7 +58,6 @@ VanessaE (WTFPL):
   default_nc_side.png
   default_desert_sand.png
   default_desert_stone.png
-  default_desert_stone_brick.png
   default_sand.png
   default_jungletree_top.png
 
@@ -121,12 +120,13 @@ paramat (CC BY-SA 3.0):
   default_junglewood.png, derived from a texture by BlockMen (CC BY-SA 3.0)
   default_grass.png, derived from a texture by Philipbenr (CC BY-SA 3.0)
   default_grass_side.png, derived from a texture by Philipbenr (CC BY-SA 3.0)
+  default_stone_brick.png, derived from a texture by Cisoun (WTFPL)
+  default_desert_stone_brick.png, derived from a texture by VanessaE (WTFPL)
 
 brunob.santos (CC BY-SA 4.0):
   default_desert_cobble.png
 
 BlockMen (CC BY-SA 3.0):
-  default_stone_brick.png
   default_wood.png
   default_clay_brick.png
   default_iron_ingot.png

minetestforfun_game/mods/default/mapgen.lua

@@ -905,7 +905,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
-		y_min = 1,
+		y_min = 5,
 		y_max = 31000,
 		heat_point = 95,
 		humidity_point = 10,
@@ -923,7 +923,7 @@ function default.register_biomes()
 		--depth_water_top = ,
 		--node_water = "",
 		y_min = -112,
-		y_max = 0,
+		y_max = 4,
 		heat_point = 95,
 		humidity_point = 10,
 	})
@@ -1292,7 +1292,7 @@ function default.register_decorations()
 			persist = 0.6
 		},
 		biomes = {"desert"},
-		y_min = 2,
+		y_min = 5,
 		y_max = 31000,
 		schematic = minetest.get_modpath("default").."/schematics/large_cactus.mts",
 		flags = "place_center_x",
@@ -1314,11 +1314,11 @@ function default.register_decorations()
 			persist = 0.6
 		},
 		biomes = {"desert"},
-		y_min = 2,
+		y_min = 5,
 		y_max = 31000,
 		decoration = "default:cactus",
 		height = 2,
-	        height_max = 5,
+		height_max = 5,
 	})
 
 	-- Papyrus

minetestforfun_game/mods/default/trees.lua

@@ -36,27 +36,27 @@ minetest.register_abm({
 		if node.name == "default:sapling" then
 			minetest.log("action", "A sapling grows into a tree at "..
 				minetest.pos_to_string(pos))
---			if mapgen == "v6" then
+			if mapgen == "v6" then
 				default.grow_tree(pos, random(1, 4) == 1)
---			else
---				default.grow_new_apple_tree(pos)
---			end
+			else
+				default.grow_new_apple_tree(pos)
+			end
 		elseif node.name == "default:junglesapling" then
 			minetest.log("action", "A jungle sapling grows into a tree at "..
 				minetest.pos_to_string(pos))
---			if mapgen == "v6" then
+			if mapgen == "v6" then
 				default.grow_jungle_tree(pos)
---			else
---				default.grow_new_jungle_tree(pos)
---			end
+			else
+				default.grow_new_jungle_tree(pos)
+			end
 		elseif node.name == "default:pine_sapling" then
 			minetest.log("action", "A pine sapling grows into a tree at "..
 				minetest.pos_to_string(pos))
---			if mapgen == "v6" then
+			if mapgen == "v6" then
 				default.grow_pine_tree(pos)
---			else
---				default.grow_new_pine_tree(pos)
---			end
+			else
+				default.grow_new_pine_tree(pos)
+			end
 		elseif node.name == "default:acacia_sapling" then
 			minetest.log("action", "An acacia sapling grows into a tree at "..
 				minetest.pos_to_string(pos))
@@ -359,7 +359,7 @@ end
 -- New apple tree
 
 function default.grow_new_apple_tree(pos)
-	local path = minetest.get_modpath("default") .. "/schematics/apple_tree.mts"
+	local path = minetest.get_modpath("default") .. "/schematics/apple_tree_from_sapling.mts"
 	minetest.place_schematic({x = pos.x - 2, y = pos.y - 1, z = pos.z - 2},
 		path, 0, nil, false)
 end
@@ -368,8 +368,8 @@ end
 -- New jungle tree
 
 function default.grow_new_jungle_tree(pos)
-	local path = minetest.get_modpath("default") .. "/schematics/jungle_tree.mts"
-	minetest.place_schematic({x = pos.x - 2, y = pos.y, z = pos.z - 2},
+	local path = minetest.get_modpath("default") .. "/schematics/jungle_tree_from_sapling.mts"
+	minetest.place_schematic({x = pos.x - 2, y = pos.y - 1, z = pos.z - 2},
 		path, 0, nil, false)
 end
 
@@ -377,7 +377,7 @@ end
 -- New pine tree
 
 function default.grow_new_pine_tree(pos)
-	local path = minetest.get_modpath("default") .. "/schematics/pine_tree.mts"
+	local path = minetest.get_modpath("default") .. "/schematics/pine_tree_from_sapling.mts"
 	minetest.place_schematic({x = pos.x - 2, y = pos.y - 1, z = pos.z - 2},
 		path, 0, nil, false)
 end
@@ -386,7 +386,7 @@ end
 -- New acacia tree
 
 function default.grow_new_acacia_tree(pos)
-	local path = minetest.get_modpath("default") .. "/schematics/acacia_tree.mts"
+	local path = minetest.get_modpath("default") .. "/schematics/acacia_tree_from_sapling.mts"
 	minetest.place_schematic({x = pos.x - 4, y = pos.y - 1, z = pos.z - 4},
 		path, random, nil, false)
 end