Update MinetestForFun Game (edited)

minetestforfun_game/mods/default/init.lua

@@ -78,14 +78,11 @@ minetest.after(1, count_items)
 minetest.after(5, player_join_sounds)
 minetest.after(5, player_leave_sounds)
 
-hotbar_size = minetest.setting_get("hotbar_size") or 16
 
 minetest.register_on_joinplayer(function(player)
 	player:set_physics_override({
     sneak_glitch = false, -- Climable blocks are quite fast in Carbone.
   })
-	player:hud_set_hotbar_itemcount(hotbar_size)
-	player:hud_set_flags({crosshair = true, hotbar = true, healthbar = false, wielditem = true, breathbar = false})
 end)
 
 minetest.register_on_respawnplayer(function(player)

minetestforfun_game/mods/default/mapgen.lua

@@ -659,6 +659,7 @@ function default.register_biomes()
 		node_water_top = "default:ice",
 		depth_water_top = 10,
 		--node_water = "",
+		node_river_water = "default:ice",
 		y_min = -8,
 		y_max = 31000,
 		heat_point = -5,
@@ -676,6 +677,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = -112,
 		y_max = -9,
 		heat_point = -5,
@@ -695,6 +697,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = 2,
 		y_max = 31000,
 		heat_point = 20,
@@ -712,6 +715,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = -112,
 		y_max = 1,
 		heat_point = 20,
@@ -729,6 +733,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = 2,
 		y_max = 31000,
 		heat_point = 20,
@@ -746,6 +751,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = -112,
 		y_max = 1,
 		heat_point = 20,
@@ -765,6 +771,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = 6,
 		y_max = 31000,
 		heat_point = 45,
@@ -782,6 +789,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = -112,
 		y_max = 5,
 		heat_point = 45,
@@ -799,6 +807,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = 6,
 		y_max = 31000,
 		heat_point = 45,
@@ -816,6 +825,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = -112,
 		y_max = 5,
 		heat_point = 45,
@@ -835,6 +845,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = 6,
 		y_max = 31000,
 		heat_point = 70,
@@ -852,6 +863,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = -112,
 		y_max = 5,
 		heat_point = 70,
@@ -869,6 +881,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = 6,
 		y_max = 31000,
 		heat_point = 70,
@@ -886,6 +899,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = -112,
 		y_max = 5,
 		heat_point = 70,
@@ -905,6 +919,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = 5,
 		y_max = 31000,
 		heat_point = 95,
@@ -922,6 +937,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = -112,
 		y_max = 4,
 		heat_point = 95,
@@ -939,6 +955,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = 5,
 		y_max = 31000,
 		heat_point = 95,
@@ -956,6 +973,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = -112,
 		y_max = 4,
 		heat_point = 95,
@@ -973,6 +991,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = 1,
 		y_max = 31000,
 		heat_point = 95,
@@ -990,6 +1009,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = 0,
 		y_max = 0,
 		heat_point = 95,
@@ -1007,6 +1027,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = -112,
 		y_max = -1,
 		heat_point = 95,
@@ -1026,6 +1047,7 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = -31000,
 		y_max = -113,
 		heat_point = 50,
@@ -1206,8 +1228,8 @@ function default.register_decorations()
 		place_on = {"default:dirt_with_grass"},
 		sidelen = 16,
 		noise_params = {
-			offset = offset,
-			scale = scale,
+			offset = 0.04,
+			scale = 0.02,
 			spread = {x = 100, y = 100, z = 100},
 			seed = 1220999,
 			octaves = 3,

minetestforfun_game/mods/default/nodes.lua

@@ -1523,7 +1523,6 @@ minetest.register_node("default:river_water_flowing", {
 		not_in_creative_inventory = 1},
 })
 
-
 minetest.register_node("default:lava_source", {
 	description = "Lava Source",
 	inventory_image = minetest.inventorycube("default_lava.png"),
@@ -2237,7 +2236,8 @@ minetest.register_node("default:glass", {
 minetest.register_node("default:obsidian_glass", {
 	description = "Obsidian Glass",
 	drawtype = "glasslike_framed_optional",
-	tiles = {"default_obsidian_glass_frame.png", "default_obsidian_glass_detail.png"},
+	tiles = {"default_obsidian_glass.png", "default_obsidian_glass_detail.png"},
+	inventory_image = minetest.inventorycube("default_obsidian_glass.png"),
 	paramtype = "light",
 	is_ground_content = false,
 	sunlight_propagates = true,

minetestforfun_game/mods/flowers/README.txt

@@ -16,7 +16,8 @@ License of media (textures and sounds)
 WTFPL
 
 Gambit (WTFPL):
-  flowers_mushroom_*.png
+    flowers_mushroom_*.png
+    flowers_waterlily.png
 
 DanDuncombe (WTFPL):
-  flowers_spores_*.png
+    flowers_spores_*.png

minetestforfun_game/mods/flowers/init.lua

@@ -39,6 +39,7 @@ local function add_simple_flower(name, desc, box, f_groups)
 	minetest.register_node("flowers:" .. name, {
 		description = desc,
 		drawtype = "plantlike",
+		waving = 1,
 		tiles = {"flowers_" .. name .. ".png"},
 		inventory_image = "flowers_" .. name .. ".png",
 		wield_image = "flowers_" .. name .. ".png",
@@ -258,3 +259,40 @@ minetest.register_abm({
 		end
 	end
 })
+
+
+--
+-- Waterlily
+--
+
+minetest.register_node("flowers:waterlily", {
+	description = "Waterlily",
+	drawtype = "nodebox",
+	paramtype = "light",
+	paramtype2 = "facedir",
+	tiles = {"flowers_waterlily.png"},
+	inventory_image = "flowers_waterlily.png",
+	wield_image = "flowers_waterlily.png",
+	liquids_pointable = true,
+	walkable = false,
+	groups = {snappy = 3, flower = 1},
+	sounds = default.node_sound_leaves_defaults(),
+	node_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, -0.46875, 0.5}
+	},
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5}
+	},
+
+	after_place_node = function(pos, placer, itemstack, pointed_thing)
+		local find_water = minetest.find_nodes_in_area({x = pos.x - 1, y = pos.y, z = pos.z - 1},
+			{x = pos.x + 1, y = pos.y, z = pos.z + 1}, "default:water_source")
+		if #find_water ~= 0 then
+			minetest.set_node(pos, {name = "default:water_source"})
+			pos.y = pos.y + 1
+		end
+		minetest.set_node(pos, {name = "flowers:waterlily", param2 = math.random(0, 3)})
+	end
+})

minetestforfun_game/mods/flowers/mapgen.lua

@@ -10,7 +10,7 @@ local function register_mgv6_flower(name)
 		noise_params = {
 			offset = 0,
 			scale = 0.006,
-			spread = {x=100, y=100, z=100},
+			spread = {x = 100, y = 100, z = 100},
 			seed = 436,
 			octaves = 3,
 			persist = 0.6
@@ -29,7 +29,7 @@ local function register_mgv6_mushroom(name)
 		noise_params = {
 			offset = 0,
 			scale = 0.04,
-			spread = {x=100, y=100, z=100},
+			spread = {x = 100, y = 100, z = 100},
 			seed = 7133,
 			octaves = 3,
 			persist = 0.6
@@ -42,6 +42,26 @@ local function register_mgv6_mushroom(name)
 	})
 end
 
+local function register_mgv6_waterlily()
+	minetest.register_decoration({
+		deco_type = "schematic",
+		place_on = {"default:dirt"},
+		sidelen = 16,
+		noise_params = {
+			offset = -0.12,
+			scale = 0.3,
+			spread = {x = 100, y = 100, z = 100},
+			seed = 33,
+			octaves = 3,
+			persist = 0.7
+		},
+		y_min = 0,
+		y_max = 0,
+		schematic = minetest.get_modpath("flowers").."/schematics/waterlily.mts",
+		rotation = "random",
+	})
+end
+
 function flowers.register_mgv6_decorations()
 	register_mgv6_flower("rose")
 	register_mgv6_flower("tulip")
@@ -52,6 +72,8 @@ function flowers.register_mgv6_decorations()
 
 	register_mgv6_mushroom("mushroom_fertile_brown")
 	register_mgv6_mushroom("mushroom_fertile_red")
+
+	register_mgv6_waterlily()
 end
 
 
@@ -67,7 +89,7 @@ local function register_flower(seed, name)
 		noise_params = {
 			offset = -0.02,
 			scale = 0.03,
-			spread = {x=200, y=200, z=200},
+			spread = {x = 200, y = 200, z = 200},
 			seed = seed,
 			octaves = 3,
 			persist = 0.6
@@ -92,7 +114,7 @@ local function register_mushroom(name)
 		noise_params = {
 			offset = 0,
 			scale = 0.006,
-			spread = {x=200, y=200, z=200},
+			spread = {x = 200, y = 200, z = 200},
 			seed = 2,
 			octaves = 3,
 			persist = 0.66
@@ -104,6 +126,28 @@ local function register_mushroom(name)
 	})
 end
 
+local function register_waterlily()
+	minetest.register_decoration({
+		deco_type = "schematic",
+		place_on = {"default:dirt", "default:sand"},
+		sidelen = 16,
+		noise_params = {
+			offset = -0.12,
+			scale = 0.3,
+			spread = {x = 200, y = 200, z = 200},
+			seed = 33,
+			octaves = 3,
+			persist = 0.7
+		},
+		biomes = {"deciduous_forest_ocean", "sandstone_grassland_ocean",
+			"rainforest_swamp", "savanna_ocean", "desert_ocean"},
+		y_min = 0,
+		y_max = 0,
+		schematic = minetest.get_modpath("flowers").."/schematics/waterlily.mts",
+		rotation = "random",
+	})
+end
+
 function flowers.register_decorations()
 	register_flower(436,     "rose")
 	register_flower(19822,   "tulip")
@@ -114,6 +158,8 @@ function flowers.register_decorations()
 
 	register_mushroom("mushroom_fertile_brown")
 	register_mushroom("mushroom_fertile_red")
+
+	register_waterlily()
 end