Merge remote-tracking branch 'origin/master' into portals

mods/ITEMS/mcl_bows/arrow.lua

@@ -16,23 +16,17 @@ local dir_to_pitch = function(dir)
 end
 
 local random_arrow_positions = function(positions, placement)
-	local min = 0
-	local max = 0
 	if positions == 'x' then
-		min = -4
+		return math.random(-4, 4)
-		max = 4
 	elseif positions == 'y' then
-		min = 0
+		return math.random(0, 10)
-		max = 10
 	end
 	if placement == 'front' and positions == 'z' then
-		min = 3
+		return 3
-		max = 3
 	elseif placement == 'back' and positions == 'z' then
-		min = -3
+		return -3
-		max = -3
 	end
-	return math.random(max, min)
+	return 0
 end
 
 local mod_awards = minetest.get_modpath("awards") and minetest.get_modpath("mcl_achievements")
@@ -304,8 +298,8 @@ ARROW_ENTITY.on_step = function(self, dtime)
 								else
 									self._attach_parent = 'Body'
 								end
-								self._z_rotation = math.random(30, -30)
+								self._z_rotation = math.random(-30, 30)
-								self._y_rotation = math.random(30, -30)
+								self._y_rotation = math.random( -30, 30)
 								self.object:set_attach(obj, self._attach_parent, {x=self._x_position,y=self._y_position,z=random_arrow_positions('z', placement)}, {x=0,y=self._rotation_station + self._y_rotation,z=self._z_rotation})
 								minetest.after(150, function()
 									self.object:remove()

mods/ITEMS/mcl_core/init.lua

@@ -14,7 +14,7 @@ mcl_autogroup.register_diggroup("shearsy_wool")
 mcl_autogroup.register_diggroup("shearsy_cobweb")
 mcl_autogroup.register_diggroup("swordy")
 mcl_autogroup.register_diggroup("swordy_cobweb")
-mcl_autogroup.register_diggroup("creative_breakable")
+mcl_autogroup.register_diggroup("hoey")
 
 -- Load files
 local modpath = minetest.get_modpath("mcl_core")

mods/ITEMS/mcl_core/nodes_trees.lua

@@ -108,7 +108,19 @@ local register_leaves = function(subname, description, longdesc, tiles, sapling,
 		tiles = tiles,
 		paramtype = "light",
 		stack_max = 64,
-		groups = {handy=1,shearsy=1,swordy=1, leafdecay=leafdecay_distance, flammable=2, leaves=1, deco_block=1, dig_by_piston=1, fire_encouragement=30, fire_flammability=60},
+		groups = {
+			handy=1,
+			hoey=1,
+			shearsy=1,
+			swordy=1,
+			leafdecay=leafdecay_distance,
+			flammable=2,
+			leaves=1,
+			deco_block=1,
+			dig_by_piston=1,
+			fire_encouragement=30,
+			fire_flammability=60
+		},
 		drop = get_drops(0),
 		_mcl_shears_drop = true,
 		sounds = mcl_sounds.node_sound_leaves_defaults(),

mods/ITEMS/mcl_enchanting/groupcaps.lua

@@ -45,6 +45,10 @@ end
 -- To make it more efficient it will first check a hash value to determine if
 -- the tool needs to be updated.
 function mcl_enchanting.update_groupcaps(itemstack)
+	if not itemstack:get_tool_capabilities() then
+		return
+	end
+
 	local name = itemstack:get_name()
 	local level = mcl_enchanting.get_enchantment(itemstack, "efficiency")
 	local groupcaps = get_efficiency_groupcaps(name, level)

mods/ITEMS/mcl_farming/hoes.lua

@@ -78,6 +78,9 @@ minetest.register_tool("mcl_farming:hoe_wood", {
 	},
 	_repair_material = "group:wood",
 	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		hoey = { speed = 2, level = 1, uses = 60 }
+	},
 })
 
 minetest.register_craft({
@@ -118,6 +121,9 @@ minetest.register_tool("mcl_farming:hoe_stone", {
 	},
 	_repair_material = "mcl_core:cobble",
 	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		hoey = { speed = 4, level = 3, uses = 132 }
+	},
 })
 
 minetest.register_craft({
@@ -154,6 +160,9 @@ minetest.register_tool("mcl_farming:hoe_iron", {
 	},
 	_repair_material = "mcl_core:iron_ingot",
 	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		hoey = { speed = 6, level = 4, uses = 251 }
+	},
 })
 
 minetest.register_craft({
@@ -196,6 +205,9 @@ minetest.register_tool("mcl_farming:hoe_gold", {
 	},
 	_repair_material = "mcl_core:gold_ingot",
 	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		hoey = { speed = 12, level = 2, uses = 33 }
+	},
 })
 
 minetest.register_craft({
@@ -240,6 +252,9 @@ minetest.register_tool("mcl_farming:hoe_diamond", {
 	},
 	_repair_material = "mcl_core:diamond",
 	_mcl_toollike_wield = true,
+	_mcl_diggroups = {
+		hoey = { speed = 8, level = 5, uses = 1562 }
+	},
 })
 
 minetest.register_craft({

mods/ITEMS/mcl_farming/wheat.lua

@@ -146,7 +146,7 @@ minetest.register_node("mcl_farming:hay_block", {
 	paramtype2 = "facedir",
 	is_ground_content = false,
 	on_place = mcl_util.rotate_axis,
-	groups = {handy=1, flammable=2, fire_encouragement=60, fire_flammability=20, building_block=1, fall_damage_add_percent=-80},
+	groups = {handy=1, hoey=1, flammable=2, fire_encouragement=60, fire_flammability=20, building_block=1, fall_damage_add_percent=-80},
 	sounds = mcl_sounds.node_sound_leaves_defaults(),
 	on_rotate = on_rotate,
 	_mcl_blast_resistance = 0.5,

mods/ITEMS/mcl_nether/init.lua

@@ -176,7 +176,7 @@ minetest.register_node("mcl_nether:nether_wart_block", {
 	stack_max = 64,
 	tiles = {"mcl_nether_nether_wart_block.png"},
 	is_ground_content = false,
-	groups = {handy=1, building_block=1},
+	groups = {handy=1, hoey=1, building_block=1},
 	sounds = mcl_sounds.node_sound_leaves_defaults(
 		{
 			footstep={name="default_dirt_footstep", gain=0.7},

mods/ITEMS/mcl_ocean/kelp.lua

@@ -275,7 +275,7 @@ minetest.register_node("mcl_ocean:dried_kelp_block", {
 	description = S("Dried Kelp Block"),
 	_doc_items_longdesc = S("A decorative block that serves as a great furnace fuel."),
 	tiles = { "mcl_ocean_dried_kelp_top.png", "mcl_ocean_dried_kelp_bottom.png", "mcl_ocean_dried_kelp_side.png" },
-	groups = { handy = 1, building_block = 1, flammable = 2, fire_encouragement = 30, fire_flammability = 60 },
+	groups = { handy = 1, hoey = 1, building_block = 1, flammable = 2, fire_encouragement = 30, fire_flammability = 60 },
 	sounds = mcl_sounds.node_sound_leaves_defaults(),
 	paramtype2 = "facedir",
 	on_place = mcl_util.rotate_axis,

mods/ITEMS/mcl_sponges/init.lua

@@ -48,7 +48,7 @@ minetest.register_node("mcl_sponges:sponge", {
 	buildable_to = false,
 	stack_max = 64,
 	sounds = mcl_sounds.node_sound_dirt_defaults(),
-	groups = {handy=1, building_block=1},
+	groups = {handy=1, hoey=1, building_block=1},
 	on_place = function(itemstack, placer, pointed_thing)
 		local pn = placer:get_player_name()
 		if pointed_thing.type ~= "node" then
@@ -107,7 +107,7 @@ minetest.register_node("mcl_sponges:sponge_wet", {
 	buildable_to = false,
 	stack_max = 64,
 	sounds = mcl_sounds.node_sound_dirt_defaults(),
-	groups = {handy=1, building_block=1},
+	groups = {handy=1, hoey=1, building_block=1},
 	_mcl_blast_resistance = 0.6,
 	_mcl_hardness = 0.6,
 })

mods/ITEMS/mcl_tools/init.lua

@@ -51,6 +51,7 @@ minetest.register_tool(":", {
 		handy = { speed = 1, level = 1, uses = 0 },
 		axey = { speed = 1, level = 1, uses = 0 },
 		shovely = { speed = 1, level = 1, uses = 0 },
+		hoey = { speed = 1, level = 1, uses = 0 },
 		pickaxey = { speed = 1, level = 0, uses = 0 },
 		swordy = { speed = 1, level = 0, uses = 0 },
 		swordy_cobweb = { speed = 1, level = 0, uses = 0 },