update plantlife, digistuff, farming-redo, roads,

unified inventory, and fixed a few obsolete "overrides"
in the misc-overrides package.

1 files changed, 0 insertions, 248 deletions

diff --git a/farming/grapes.lua b/farming/grapes.lua
deleted file mode 100644
index 9a6ab9e..0000000
--- a/farming/grapes.lua
+++ /dev/null
@@ -1,248 +0,0 @@
-
-local S = farming.intllib
-
--- place trellis
-local function place_grapes(itemstack, placer, pointed_thing, plantname)
-
-	local pt = pointed_thing
-
-	-- check if pointing at a node
-	if not pt or pt.type ~= "node" then
-
-		return
-	end
-
-	local under = minetest.get_node(pt.under)
-
-	-- return if any of the nodes are not registered
-	if not minetest.registered_nodes[under.name] then
-		return
-	end
-
-	-- am I right-clicking on something that has a custom on_place set?
-	-- thanks to Krock for helping with this issue :)
-	local def = minetest.registered_nodes[under.name]
-	if def and def.on_rightclick then
-		return def.on_rightclick(pt.under, under, placer, itemstack)
-	end
-
-	-- check if pointing at trellis
-	if under.name ~= "farming:trellis" then
-		return
-	end
-
-	-- add the node and remove 1 item from the itemstack
-	minetest.set_node(pt.under, {name = plantname})
-
-	minetest.sound_play("default_place_node", {pos = pt.under, gain = 1.0})
-
-	if not farming.is_creative(placer:get_player_name()) then
-
-		itemstack:take_item()
-
-		-- check for refill
-		if itemstack:get_count() == 0 then
-
-			minetest.after(0.20,
-				farming.refill_plant,
-				placer,
-				"farming:grapes",
-				placer:get_wield_index()
-			)
-		end
-	end
-
-	return itemstack
-end
-
--- grapes
-minetest.register_craftitem("farming:grapes", {
-	description = S("Grapes"),
-	inventory_image = "farming_grapes.png",
-	on_use = minetest.item_eat(2),
-	groups = {food_grapes = 1, flammable = 3},
-
-	on_place = function(itemstack, placer, pointed_thing)
-		return place_grapes(itemstack, placer, pointed_thing, "farming:grapes_1")
-	end,
-})
-
--- grapes can be used for violet dye
-minetest.register_craft({
-	output = "dye:violet",
-	recipe = {
-		{'farming:grapes'},
-	}
-})
-
--- trellis
-minetest.register_node("farming:trellis", {
-	description = S("Trellis (place on soil before planting grapes)"),
-	drawtype = "plantlike",
-	tiles = {"farming_trellis.png"},
-	inventory_image = "farming_trellis.png",
-	visual_scale = 1.9, -- 1.45,
-	paramtype = "light",
-	walkable = false,
-	buildable_to = true,
-	sunlight_propagates = true,
-	drop = "farming:trellis",
-	selection_box = farming.select,
-	groups = {snappy = 3, flammable = 2, attached_node = 1},
-	sounds = default.node_sound_leaves_defaults(),
-
-	on_place = function(itemstack, placer, pointed_thing)
-
-		local pt = pointed_thing
-
-		-- check if pointing at a node
-		if not pt or pt.type ~= "node" then
-			return
-		end
-
-		local under = minetest.get_node(pt.under)
-
-		-- return if any of the nodes are not registered
-		if not minetest.registered_nodes[under.name] then
-			return
-		end
-
-		-- am I right-clicking on something that has a custom on_place set?
-		-- thanks to Krock for helping with this issue :)
-		local def = minetest.registered_nodes[under.name]
-		if def and def.on_rightclick then
-			return def.on_rightclick(pt.under, under, placer, itemstack)
-		end
-
-		if minetest.is_protected(pt.under, placer:get_player_name()) then
-			return
-		end
-
-		local nodename = under.name
-
-		if minetest.get_item_group(nodename, "soil") < 2 then
-			return
-		end
-
-		local top = {
-			x = pointed_thing.above.x,
-			y = pointed_thing.above.y + 1,
-			z = pointed_thing.above.z
-		}
-
-		nodename = minetest.get_node(top).name
-
-		if nodename ~= "air" then
-			return
-		end
-
-		minetest.set_node(pointed_thing.above, {name = "farming:trellis"})
-
-		if not farming.is_creative(placer:get_player_name()) then
-			itemstack:take_item()
-		end
-
-		return itemstack
-	end
-})
-
-minetest.register_craft({
-	output = "farming:trellis",
-	recipe = {
-		{'default:stick', 'default:stick', 'default:stick'},
-		{'default:stick', 'default:stick', 'default:stick'},
-		{'default:stick', 'default:stick', 'default:stick'},
-	}
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "farming:trellis",
-	burntime = 15,
-})
-
--- grapes definition
-local crop_def = {
-	drawtype = "plantlike",
-	tiles = {"farming_grapes_1.png"},
-	visual_scale = 1.9, -- 1.45,
-	paramtype = "light",
-	walkable = false,
-	buildable_to = true,
-	sunlight_propagates = true,
-	drop = {
-		items = {
-			{items = {'farming:trellis'}, rarity = 1},
-		}
-	},
-	selection_box = farming.select,
-	groups = {
-		snappy = 3, flammable = 3, not_in_creative_inventory = 1,
-		attached_node = 1, growing = 1
-	},
-	sounds = default.node_sound_leaves_defaults()
-}
-
--- stage 1
-minetest.register_node("farming:grapes_1", table.copy(crop_def))
-
--- stage2
-crop_def.tiles = {"farming_grapes_2.png"}
-minetest.register_node("farming:grapes_2", table.copy(crop_def))
-
--- stage 3
-crop_def.tiles = {"farming_grapes_3.png"}
-minetest.register_node("farming:grapes_3", table.copy(crop_def))
-
--- stage 4
-crop_def.tiles = {"farming_grapes_4.png"}
-minetest.register_node("farming:grapes_4", table.copy(crop_def))
-
--- stage 5
-crop_def.tiles = {"farming_grapes_5.png"}
-minetest.register_node("farming:grapes_5", table.copy(crop_def))
-
--- stage 6
-crop_def.tiles = {"farming_grapes_6.png"}
-minetest.register_node("farming:grapes_6", table.copy(crop_def))
-
--- stage 7
-crop_def.tiles = {"farming_grapes_7.png"}
-minetest.register_node("farming:grapes_7", table.copy(crop_def))
-
--- stage 8 (final)
-crop_def.tiles = {"farming_grapes_8.png"}
-crop_def.groups.growing = 0
-crop_def.drop = {
-	items = {
-		{items = {'farming:trellis'}, rarity = 1},
-		{items = {'farming:grapes 3'}, rarity = 1},
-		{items = {'farming:grapes 1'}, rarity = 2},
-		{items = {'farming:grapes 1'}, rarity = 3},
-	}
-}
-minetest.register_node("farming:grapes_8", table.copy(crop_def))
-
--- wild grape vine (this is what you find on the map)
-minetest.register_node("farming:grapebush", {
-	drawtype = "plantlike",
-	tiles = {"farming_grapebush.png"},
-	paramtype = "light",
-	waving = 1,
-	walkable = false,
-	buildable_to = true,
-	sunlight_propagates = true,
-	drop = {
-		items = {
-			{items = {'farming:grapes 1'}, rarity = 1},
-			{items = {'farming:grapes 1'}, rarity = 2},
-			{items = {'farming:grapes 1'}, rarity = 3},
-		}
-	},
-	selection_box = farming.select,
-	groups = {
-		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
-		not_in_creative_inventory=1
-	},
-	sounds = default.node_sound_leaves_defaults(),
-})