Completely remove wooden tools (#331)

The default items given on respawn will consist of wooden tools instead.

mods/ctf/ctf_crafting/init.lua

@@ -73,6 +73,7 @@ crafting.register_recipe({
 	level  = 1,
 })
 
+-- Wood x4
 crafting.register_recipe({
 	type   = "inv",
 	output = "default:wood 4",
@@ -144,64 +145,6 @@ crafting.register_recipe({
 	level  = 1,
 })
 
--- Shovels
-for _, orex in pairs(full_ores) do
-	crafting.register_recipe({
-		type   = "inv",
-		output = "default:shovel_" .. orex[1],
-		items  = { "default:stick 2", orex[2] },
-		always_known = true,
-		level  = 1,
-	})
-end
-
--- Axes
-for _, orex in pairs(full_ores) do
-	crafting.register_recipe({
-		type   = "inv",
-		output = "default:axe_" .. orex[1],
-		items  = { "default:stick 2", orex[2] .. " 3" },
-		always_known = true,
-		level  = 1,
-	})
-end
-
--- Wooden plank x3 <== Wooden pickaxe
-crafting.register_recipe({
-	type   = "inv",
-	output = "default:wood 3",
-	items  = { "default:pick_wood" },
-	always_known = true,
-	level  = 1,
-})
-
--- Wooden plank x2 <== Wooden sword
-crafting.register_recipe({
-	type   = "inv",
-	output = "default:wood 2",
-	items  = { "default:sword_wood" },
-	always_known = true,
-	level  = 1,
-})
-
--- Wooden plank x3 <== Wooden axe
-crafting.register_recipe({
-	type   = "inv",
-	output = "default:wood 3",
-	items  = { "default:axe_wood" },
-	always_known = true,
-	level  = 1,
-})
-
--- Wooden plank <== Wooden shovel
-crafting.register_recipe({
-	type   = "inv",
-	output = "default:wood 1",
-	items  = { "default:shovel_wood" },
-	always_known = true,
-	level  = 1,
-})
-
 crafting.register_recipe({
 	type   = "inv",
 	output = "ctf_traps:spike 1",
@@ -241,3 +184,25 @@ crafting.register_recipe({
 	always_known = true,
 	level  = 1,
 })
+
+-- Shovels
+for _, orex in pairs(full_ores) do
+	crafting.register_recipe({
+		type   = "inv",
+		output = "default:shovel_" .. orex[1],
+		items  = { "default:stick 2", orex[2] },
+		always_known = true,
+		level  = 1,
+	})
+end
+
+-- Axes
+for _, orex in pairs(full_ores) do
+	crafting.register_recipe({
+		type   = "inv",
+		output = "default:axe_" .. orex[1],
+		items  = { "default:stick 2", orex[2] .. " 3" },
+		always_known = true,
+		level  = 1,
+	})
+end

mods/ctf/ctf_map/chest.lua

@@ -1,8 +1,4 @@
 local blacklist = {
-	"default:pick_wood",
-	"default:axe_wood",
-	"default:shovel_wood",
-	"default:sword_wood",
 	"default:leaves",
 	"default:jungleleaves",
 	"default:pine_needles",

mods/ctf/ctf_map/give_initial_stuff.lua

@@ -2,7 +2,8 @@ give_initial_stuff = {}
 
 setmetatable(give_initial_stuff, {
 	__call = function(self, player)
-		minetest.log("action", "Giving initial stuff to player "..player:get_player_name())
+		minetest.log("action", "Giving initial stuff to player "
+				.. player:get_player_name())
 		local inv = player:get_inventory()
 		inv:set_list("main",  {})
 		inv:set_list("craft", {})
@@ -21,8 +22,8 @@ setmetatable(give_initial_stuff, {
 
 function give_initial_stuff.get_stuff()
 	return ctf_map.map and ctf_map.map.initial_stuff or {
-		"default:pick_wood",
+		"default:pick_stone",
-		"default:sword_wood",
+		"default:sword_stone",
 		"default:torch 3",
 	}
 end

mods/mtg/default/aliases.lua

@@ -41,17 +41,13 @@ minetest.register_alias("mossycobble", "default:mossycobble")
 minetest.register_alias("steelblock", "default:steelblock")
 minetest.register_alias("sapling", "default:sapling")
 
-minetest.register_alias("WPick", "default:pick_wood")
 minetest.register_alias("STPick", "default:pick_stone")
 minetest.register_alias("SteelPick", "default:pick_steel")
 minetest.register_alias("MesePick", "default:pick_mese")
-minetest.register_alias("WShovel", "default:shovel_wood")
 minetest.register_alias("STShovel", "default:shovel_stone")
 minetest.register_alias("SteelShovel", "default:shovel_steel")
-minetest.register_alias("WAxe", "default:axe_wood")
 minetest.register_alias("STAxe", "default:axe_stone")
 minetest.register_alias("SteelAxe", "default:axe_steel")
-minetest.register_alias("WSword", "default:sword_wood")
 minetest.register_alias("STSword", "default:sword_stone")
 minetest.register_alias("SteelSword", "default:sword_steel")
 

mods/mtg/default/crafting.lua

@@ -435,28 +435,3 @@ minetest.register_craft({
 	recipe = "group:stick",
 	burntime = 1,
 })
-
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "default:pick_wood",
-	burntime = 6,
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "default:shovel_wood",
-	burntime = 4,
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "default:axe_wood",
-	burntime = 6,
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "default:sword_wood",
-	burntime = 5,
-})

mods/mtg/default/tools.lua

@@ -21,21 +21,6 @@ minetest.register_item(":", {
 -- Picks
 --
 
-minetest.register_tool("default:pick_wood", {
-	description = "Wooden Pickaxe",
-	inventory_image = "default_tool_woodpick.png",
-	tool_capabilities = {
-		full_punch_interval = 1.2,
-		max_drop_level=0,
-		groupcaps={
-			cracky = {times={[3]=1.60}, uses=10, maxlevel=1},
-		},
-		damage_groups = {fleshy=2},
-	},
-	groups = {flammable = 2},
-	sound = {breaks = "default_tool_breaks"},
-})
-
 minetest.register_tool("default:pick_stone", {
 	description = "Stone Pickaxe",
 	inventory_image = "default_tool_stonepick.png",
@@ -110,22 +95,6 @@ minetest.register_tool("default:pick_diamond", {
 -- Shovels
 --
 
-minetest.register_tool("default:shovel_wood", {
-	description = "Wooden Shovel",
-	inventory_image = "default_tool_woodshovel.png",
-	wield_image = "default_tool_woodshovel.png^[transformR90",
-	tool_capabilities = {
-		full_punch_interval = 1.2,
-		max_drop_level=0,
-		groupcaps={
-			crumbly = {times={[1]=3.00, [2]=1.60, [3]=0.60}, uses=10, maxlevel=1},
-		},
-		damage_groups = {fleshy=2},
-	},
-	groups = {flammable = 2},
-	sound = {breaks = "default_tool_breaks"},
-})
-
 minetest.register_tool("default:shovel_stone", {
 	description = "Stone Shovel",
 	inventory_image = "default_tool_stoneshovel.png",
@@ -205,21 +174,6 @@ minetest.register_tool("default:shovel_diamond", {
 -- Axes
 --
 
-minetest.register_tool("default:axe_wood", {
-	description = "Wooden Axe",
-	inventory_image = "default_tool_woodaxe.png",
-	tool_capabilities = {
-		full_punch_interval = 1.0,
-		max_drop_level=0,
-		groupcaps={
-			choppy = {times={[2]=3.00, [3]=1.60}, uses=10, maxlevel=1},
-		},
-		damage_groups = {fleshy=2},
-	},
-	groups = {flammable = 2},
-	sound = {breaks = "default_tool_breaks"},
-})
-
 minetest.register_tool("default:axe_stone", {
 	description = "Stone Axe",
 	inventory_image = "default_tool_stoneaxe.png",
@@ -294,21 +248,6 @@ minetest.register_tool("default:axe_diamond", {
 -- Swords
 --
 
-minetest.register_tool("default:sword_wood", {
-	description = "Wooden Sword",
-	inventory_image = "default_tool_woodsword.png",
-	tool_capabilities = {
-		full_punch_interval = 1,
-		max_drop_level=0,
-		groupcaps={
-			snappy={times={[2]=1.6, [3]=0.40}, uses=10, maxlevel=1},
-		},
-		damage_groups = {fleshy=2},
-	},
-	groups = {flammable = 2},
-	sound = {breaks = "default_tool_breaks"},
-})
-
 minetest.register_tool("default:sword_stone", {
 	description = "Stone Sword",
 	inventory_image = "default_tool_stonesword.png",

mods/other/wield3d/location.lua

@@ -11,7 +11,6 @@ wield3d_location = {
 	["flowers:rose"] = {bone, {x=0.2, y=6.5, z=3}, {x=-100, y=182, z=83}},
 	["flowers:tulip"] = {bone, {x=0.2, y=6.5, z=3}, {x=-100, y=182, z=83}},
 	["flowers:viola"] = {bone, {x=0.2, y=6.5, z=3}, {x=-100, y=182, z=83}},
-	["default:shovel_wood"] = {bone, {x=0, y=6.5, z=3}, {x=-90, y=137, z=83}},
 	["default:shovel_stone"] = {bone, {x=0, y=6.5, z=3}, {x=-90, y=137, z=83}},
 	["default:shovel_steel"] = {bone, {x=0, y=6.5, z=3}, {x=-90, y=137, z=83}},
 	["default:shovel_bronze"] = {bone, {x=0, y=6.5, z=3}, {x=-90, y=137, z=83}},
@@ -29,4 +28,3 @@ wield3d_location = {
 	["vessels:drinking_glass"] = {bone, {x=0, y=6.5, z=3}, {x=-90, y=137, z=83}},
 	["vessels:steel_bottle"] = {bone, {x=0, y=6.5, z=3}, {x=-90, y=137, z=83}},
 }
-

mods/pvp/dropondie/init.lua

@@ -1,8 +1,4 @@
-local blacklist_drop = {
+local blacklist_drop = {}
-	"default:pick_wood",
-	"default:sword_wood",
-	"default:ax_wood"
-}
 
 local function drop(pos, itemstack)
 	local it = itemstack:take_item(itemstack:get_count())
@@ -10,7 +6,7 @@ local function drop(pos, itemstack)
 
 	for _, item in pairs(blacklist_drop) do
 		if sname == item then
-			minetest.log("error", "Not dropping " .. item)
+			minetest.log("info", "Not dropping " .. item)
 			return
 		end
 	end