D00Med update 16/7/17

>added silo
>changed rocks
>improved watering can
>minor improvements and fixes

mods/mapgen/mapgen.lua

@@ -1532,7 +1532,7 @@ end
 		biomes = {"coniferous_forest_tall"},
 		y_min = 1,
 		y_max = 31000,
-		schematic = minetest.get_modpath("mapgen") .. "/schematics/rocks/s_stone1.mts",
+		schematic = minetest.get_modpath("mapgen") .. "/schematics/rocks/savanna_rock1.mts",
 		flags = "place_center_x, place_center_z",
 	})	
 		minetest.register_decoration({
@@ -1550,7 +1550,7 @@ end
 		biomes = {"coniferous_forest_tall"},
 		y_min = 1,
 		y_max = 31000,
-		schematic = minetest.get_modpath("mapgen") .. "/schematics/rocks/s_stone2.mts",
+		schematic = minetest.get_modpath("mapgen") .. "/schematics/rocks/savanna_rock2.mts",
 		flags = "place_center_x, place_center_z",
 	})	
 		minetest.register_decoration({
@@ -1568,7 +1568,7 @@ end
 		biomes = {"coniferous_forest_tall"},
 		y_min = 1,
 		y_max = 31000,
-		schematic = minetest.get_modpath("mapgen") .. "/schematics/rocks/s_stone3.mts",
+		schematic = minetest.get_modpath("mapgen") .. "/schematics/rocks/savanna_rock3.mts",
 		flags = "place_center_x, place_center_z",
 	})	
 	
@@ -1587,7 +1587,7 @@ end
 		biomes = {"deciduous_forest2", "grassland"},
 		y_min = 1,
 		y_max = 31000,
-		schematic = minetest.get_modpath("mapgen") .. "/schematics/rocks/stone1.mts",
+		schematic = minetest.get_modpath("mapgen") .. "/schematics/rocks/rock1.mts",
 		flags = "place_center_x, place_center_z",
 	})	
 		minetest.register_decoration({
@@ -1605,7 +1605,7 @@ end
 		biomes = {"deciduous_forest2", "grassland"},
 		y_min = 1,
 		y_max = 31000,
-		schematic = minetest.get_modpath("mapgen") .. "/schematics/rocks/stone2.mts",
+		schematic = minetest.get_modpath("mapgen") .. "/schematics/rocks/rock2.mts",
 		flags = "place_center_x, place_center_z",
 	})	
 		minetest.register_decoration({
@@ -1623,7 +1623,62 @@ end
 		biomes = {"deciduous_forest2", "grassland"},
 		y_min = 1,
 		y_max = 31000,
-		schematic = minetest.get_modpath("mapgen") .. "/schematics/rocks/stone3.mts",
+		schematic = minetest.get_modpath("mapgen") .. "/schematics/rocks/rock3.mts",
+		flags = "place_center_x, place_center_z",
+	})	
+	
+			minetest.register_decoration({
+		deco_type = "schematic",
+		place_on = {"default:desert_sand"},
+		sidelen = 16,
+		noise_params = {
+			offset = 0.0005,
+			scale = 0.0005,
+			spread = {x = 250, y = 250, z = 250},
+			seed = 2,
+			octaves = 3,
+			persist = 0.66
+		},
+		biomes = {"desert",},
+		y_min = 1,
+		y_max = 31000,
+		schematic = minetest.get_modpath("mapgen") .. "/schematics/rocks/desert_rock1.mts",
+		flags = "place_center_x, place_center_z",
+	})	
+		minetest.register_decoration({
+		deco_type = "schematic",
+		place_on = {"default:desert_sand"},
+		sidelen = 16,
+		noise_params = {
+			offset = 0.0005,
+			scale = 0.0005,
+			spread = {x = 250, y = 250, z = 250},
+			seed = 2,
+			octaves = 3,
+			persist = 0.66
+		},
+		biomes = {"desert",},
+		y_min = 1,
+		y_max = 31000,
+		schematic = minetest.get_modpath("mapgen") .. "/schematics/rocks/desert_rock2.mts",
+		flags = "place_center_x, place_center_z",
+	})	
+		minetest.register_decoration({
+		deco_type = "schematic",
+		place_on = {"default:desert_sand"},
+		sidelen = 16,
+		noise_params = {
+			offset = 0.0005,
+			scale = 0.0005,
+			spread = {x = 250, y = 250, z = 250},
+			seed = 2,
+			octaves = 3,
+			persist = 0.66
+		},
+		biomes = {"desert",},
+		y_min = 1,
+		y_max = 31000,
+		schematic = minetest.get_modpath("mapgen") .. "/schematics/rocks/desert_rock3.mts",
 		flags = "place_center_x, place_center_z",
 	})	
 	

mods/mapgen/nodes.lua

@@ -772,18 +772,23 @@ minetest.register_node("mapgen:bamboo", {
 
 minetest.register_node("mapgen:bamboo_leaves", {
 	description = "Bamboo Leaves",
-	drawtype = "firelike",
+	drawtype = "allfaces",
 	tiles = {"mapgen_bamboo_leaves.png"},
 	paramtype = "light",
 	is_ground_content = false,
 	sunlight_propagates = false,
 	groups = {snappy=1, flammable=1, oddly_breakable_by_hand=1, leafdecay=4, leaves=1},
 	sounds = default.node_sound_leaves_defaults(),
-	walkable = false,
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.4, -0.4, -0.4, 0.4, 0.4, 0.4}
 	},
+	collision_box = {
+		type = "fixed",
+		fixed = {
+			{-0.1875, -0.5, -0.1875, 0.1875, 0.5, 0.1875},
+		}
+	},
 	drop = {
 		max_items = 1,
 		items = {
@@ -1997,8 +2002,16 @@ minetest.register_abm({
 		return 
 		end
 		local dir = minetest.facedir_to_dir(node.param2)
+		local particle_pos = {x=pos.x-0.22*dir.z*1.2, y=pos.y+0.1, z=pos.z-0.18*dir.x*1.2}
+		if dir.x == 0 and dir.z == 0 then
+		particle_pos = {x=pos.x, y=pos.y+0.1, z=pos.z+0.2}
+		elseif dir.x == -1 and dir.z == 0 then
+		particle_pos = {x=pos.x-0.15, y=pos.y+0.1, z=pos.z}
+		elseif dir.x == 0 and dir.z == -1 then
+		particle_pos = {x=pos.x+0.15, y=pos.y+0.1, z=pos.z}
+		end
 		minetest.add_particle({
-			pos = {x=pos.x-0.25*dir.z, y=pos.y+0.1, z=pos.z-0.25*dir.x},
+			pos = particle_pos,
 			velocity = {x=0, y=0, z=0},
 			acceleration = {x=0, y=0, z=0},
 			expirationtime = 5,

mods/mobs_farlands/land.lua

@@ -179,8 +179,8 @@ mobs:register_mob("mobs_m:mammoth", {
 		{name = "mobs:meat_raw", chance = 2, min = 5, max = 6},
 	},
 	animation = {
-		speed_normal = 16,
-		speed_run = 19,
+		speed_normal = 15,
+		speed_run = 17,
 		walk_start = 45,
 		walk_end = 65,
 		stand_start = 20,
@@ -239,8 +239,8 @@ mobs:register_mob("mobs_m:elephant", {
 		{name = "mobs:meat_raw", chance = 2, min = 3, max = 4},
 	},
 	animation = {
-		speed_normal = 16,
-		speed_run = 19,
+		speed_normal = 14,
+		speed_run = 16,
 		walk_start = 25,
 		walk_end = 45,
 		stand_start = 1,
@@ -792,7 +792,7 @@ mobs:register_mob("mobs_m:beetle", {
 	textures = {
 		{"mobs_beetle.png"},
 	},
-	blood_texture = "mobs_rotten_blood.png",
+	blood_texture = "mobs_blood.png",
 	makes_footstep_sound = true,
 	walk_velocity = 1,
 	run_velocity = 1.5,
@@ -1037,8 +1037,8 @@ mobs:register_mob("mobs_m:badger", {
 	follow = {"mobs:meat_raw"},
 	view_range = 7,
 	animation = {
-		speed_normal = 20,
-		speed_run = 25,
+		speed_normal = 22,
+		speed_run = 26,
 		walk_start = 25,
 		walk_end = 45,
 		stand_start = 75,

mods/stm_nodes/init.lua

@@ -1,4 +1,30 @@
 
+minetest.register_node("stm_nodes:silo", {
+	description = "Grain Silo",
+	tiles = {
+		"stm_nodes_silo.png",
+	},
+	drawtype = "mesh",
+	mesh = "silo.obj",
+	paramtype = "light",
+	selection_box = {
+		type = "fixed",
+		fixed = {
+			{-0.5, -0.5, -0.5, 1.5, 2.8, 1.5},
+		}
+	},
+	collision_box = {
+		type = "fixed",
+		fixed = {
+			{-0.5, -0.5, -0.5, 1.5, 2.8, 1.5}, 
+		}
+	},
+	groups = {cracky = 1},
+	sounds = default.node_sound_metal_defaults(),
+	on_rightclick = function(pos, node, clicker, itemstack)
+	end
+})
+
 minetest.register_node("stm_nodes:reactor", {
 	description = "Reactor (for testing)",
 	tiles = {

mods/stm_nodes/models/silo.obj

@@ -0,0 +1,156 @@
+# Blender v2.72 (sub 0) OBJ File: 'silo.blend'
+# www.blender.org
+mtllib silo.mtl
+o Cube.001
+v 0.306462 -0.565221 -0.323338
+v 0.306462 -0.565221 -0.523338
+v 0.506463 -0.565221 -0.523338
+v 0.506463 -0.565221 -0.323338
+v 0.306462 -0.148165 -0.323338
+v 0.306462 -0.148165 -0.523338
+v 0.506463 -0.148165 -0.523338
+v 0.506463 -0.148165 -0.323338
+v 0.306462 -0.565221 1.473987
+v 0.306462 -0.565221 1.273987
+v 0.506463 -0.565221 1.273987
+v 0.506463 -0.565221 1.473987
+v 0.306462 -0.148165 1.473987
+v 0.306462 -0.148165 1.273987
+v 0.506463 -0.148165 1.273987
+v 0.506463 -0.148165 1.473987
+v -1.493297 -0.565221 1.473987
+v -1.493297 -0.565221 1.273987
+v -1.293297 -0.565221 1.273987
+v -1.293297 -0.565221 1.473987
+v -1.493297 -0.148165 1.473987
+v -1.493297 -0.148165 1.273987
+v -1.293297 -0.148165 1.273987
+v -1.293297 -0.148165 1.473987
+v -1.493297 -0.565221 -0.323338
+v -1.493297 -0.565221 -0.523338
+v -1.293297 -0.565221 -0.523338
+v -1.293297 -0.565221 -0.323338
+v -1.493297 -0.148165 -0.323338
+v -1.493297 -0.148165 -0.523338
+v -1.293297 -0.148165 -0.523338
+v -1.293297 -0.148165 -0.323338
+v -1.495473 -0.163537 1.475302
+v -1.495473 -0.163537 -0.524698
+v 0.504526 -0.163537 -0.524698
+v 0.504526 -0.163537 1.475302
+v -1.495473 -0.001965 1.475302
+v -1.495473 -0.001965 -0.524698
+v 0.504526 -0.001965 -0.524698
+v 0.504526 -0.001965 1.475302
+v -1.432472 -0.219428 1.417705
+v -1.432472 -0.219428 -0.467101
+v 0.441525 -0.219428 -0.467101
+v 0.441525 -0.219428 1.417705
+v -1.432472 2.795394 1.417705
+v -1.432472 2.795394 -0.467101
+v 0.441525 2.795394 -0.467101
+v 0.441525 2.795394 1.417705
+v -1.495473 2.255081 1.475302
+v -1.495473 2.255081 -0.524698
+v 0.504526 2.255081 -0.524698
+v 0.504526 2.255081 1.475302
+v -1.495473 2.418051 1.475302
+v -1.495473 2.418051 -0.524698
+v 0.504526 2.418051 -0.524698
+v 0.504526 2.418051 1.475302
+v -1.495473 1.181628 1.475302
+v -1.495473 1.181628 -0.524698
+v 0.504526 1.181628 -0.524698
+v 0.504526 1.181628 1.475302
+v -1.495473 1.342715 1.475302
+v -1.495473 1.342715 -0.524698
+v 0.504526 1.342715 -0.524698
+v 0.504526 1.342715 1.475302
+vt 0.535714 0.385475
+vt 0.564286 0.385475
+vt 0.564286 0.340782
+vt 0.535714 0.340782
+vt 0.507143 0.385475
+vt 0.507143 0.340782
+vt 0.478571 0.385475
+vt 0.478571 0.340782
+vt 0.592857 0.385475
+vt 0.592857 0.340782
+vt 0.535714 0.407821
+vt 0.507143 0.407821
+vt 0.478571 0.407821
+vt 0.500000 0.508380
+vt 0.750000 0.508380
+vt 0.750000 0.491620
+vt 0.500000 0.491620
+vt 0.250000 0.508380
+vt 0.250000 0.491620
+vt 0.000000 0.508380
+vt 0.000000 0.491620
+vt 1.000000 0.508380
+vt 1.000000 0.491620
+vt 0.500000 0.703911
+vt 0.250000 0.703911
+vt 0.000000 0.703911
+vt 0.457143 0.312849
+vt 0.685714 0.312849
+vt 0.685714 0.000000
+vt 0.457143 0.000000
+vt 0.228571 0.312849
+vt 0.228571 0.000000
+vt 0.000000 0.312849
+vt 0.000000 0.000000
+vt 0.914286 0.312849
+vt 0.914286 0.000000
+vt 0.457143 0.491620
+vt 0.228571 0.491620
+usemtl Material
+s off
+f 5/1 6/2 2/3 1/4
+f 6/5 7/1 3/4 2/6
+f 7/7 8/5 4/6 3/8
+f 8/2 5/9 1/10 4/3
+f 1/11 2/12 3/5 4/1
+f 8/7 7/5 6/12 5/13
+f 13/1 14/2 10/3 9/4
+f 14/5 15/1 11/4 10/6
+f 15/7 16/5 12/6 11/8
+f 16/2 13/9 9/10 12/3
+f 9/11 10/12 11/5 12/1
+f 16/7 15/5 14/12 13/13
+f 21/1 22/2 18/3 17/4
+f 22/5 23/1 19/4 18/6
+f 23/7 24/5 20/6 19/8
+f 24/2 21/9 17/10 20/3
+f 17/11 18/12 19/5 20/1
+f 24/7 23/5 22/12 21/13
+f 29/1 30/2 26/3 25/4
+f 30/5 31/1 27/4 26/6
+f 31/7 32/5 28/6 27/8
+f 32/2 29/9 25/10 28/3
+f 25/11 26/12 27/5 28/1
+f 32/7 31/5 30/12 29/13
+f 37/14 38/15 34/16 33/17
+f 38/18 39/14 35/17 34/19
+f 39/20 40/18 36/19 35/21
+f 40/15 37/22 33/23 36/16
+f 33/18 34/14 35/24 36/25
+f 40/20 39/18 38/25 37/26
+f 45/27 46/28 42/29 41/30
+f 46/31 47/27 43/30 42/32
+f 47/31 48/33 44/34 43/32
+f 48/28 45/35 41/36 44/29
+f 41/37 42/38 43/31 44/27
+f 48/21 47/33 46/31 45/38
+f 53/14 54/15 50/16 49/17
+f 54/18 55/14 51/17 50/19
+f 55/20 56/18 52/19 51/21
+f 56/15 53/22 49/23 52/16
+f 49/18 50/14 51/24 52/25
+f 56/20 55/18 54/25 53/26
+f 61/14 62/15 58/16 57/17
+f 62/18 63/14 59/17 58/19
+f 63/20 64/18 60/19 59/21
+f 64/15 61/22 57/23 60/16
+f 57/18 58/14 59/24 60/25
+f 64/20 63/18 62/25 61/26

mods/tools/init.lua

@@ -5,8 +5,6 @@ minetest.register_globalstep(function()
 		local item = player:get_wielded_item():get_name()
 		if item == "default:torch" or item == "decoblocks:lantern" then
 			local pos = player:getpos()
-			local item = player:get_wielded_item()
-			item:add_wear(2000)
 			pos.y = pos.y+1.2
 			if minetest.get_node(pos).name == "air" then
 				minetest.set_node(pos, {name="tools:light"})
@@ -19,7 +17,6 @@ minetest.register_globalstep(function()
 			end
 		end
 	end
-	return item
 end)
 
 minetest.register_node("tools:light", {
@@ -43,8 +40,31 @@ minetest.register_craftitem("tools:watering_can", {
 	description = "Watering Can",
 	inventory_image = "tools_watering_can.png",
 	liquids_pointable = true,
+	range = 4,
 	on_use = function(item, placer, pointed_thing)
+	if pointed_thing.under == nil then return end
+	local dir = placer:get_look_dir()
+	local pos1 = placer:getpos()
 	local pos = pointed_thing.under
+	for i=1,10 do
+		minetest.add_particle({
+			pos = {x=pos1.x+math.random(-5,5)/10, y=pos1.y+0.5, z=pos1.z+math.random(-5,5)/10},
+			velocity = {x=pos.x-pos1.x, y=1, z=pos.z-pos1.z},
+			acceleration = {x=0, y=-4, z=0},
+			expirationtime = 1,
+			size = 8,
+			collisiondetection = false,
+			collisionremoval = true,
+			vertical = true,
+			texture = "tools_water_spray.png",
+		})
+	end
+	
+	local node = minetest.get_node(pos)
+	if node.name == "mapgen:dry_dirt" then
+		minetest.set_node(pos, {name="default:dirt"})
+	end
+	
 	pos.y = pos.y+1
 	local mg_name = minetest.get_mapgen_setting("mg_name")
 	local node = minetest.get_node(pos)