Added barley, tidied and tweaked code

1 files changed, 45 insertions, 127 deletions

diff --git a/tomato.lua b/tomato.lua
index 99c091a..9cff4a7 100644
--- a/tomato.lua
+++ b/tomato.lua
@@ -1,7 +1,10 @@
 
---= Tomato (Original textures from link below)
--- http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1288375-food-plus-mod-more-food-than-you-can-imagine-v2-9)
+--[[
+	Textures edited from:
+	http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1288375-food-plus-mod-more-food-than-you-can-imagine-v2-9)
+]]
 
+-- tomato
 minetest.register_craftitem("farming:tomato", {
 	description = "Tomato",
 	inventory_image = "farming_tomato.png",
@@ -11,9 +14,8 @@ minetest.register_craftitem("farming:tomato", {
 	on_use = minetest.item_eat(4),
 })
 
--- Define Tomato growth stages
-
-minetest.register_node("farming:tomato_1", {
+-- tomato definition
+local crop_def = {
 	drawtype = "plantlike",
 	tiles = {"farming_tomato_1.png"},
 	paramtype = "light",
@@ -26,133 +28,49 @@ minetest.register_node("farming:tomato_1", {
 		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
 		not_in_creative_inventory = 1, growing = 1
 	},
-	sounds = default.node_sound_leaves_defaults(),
-})
+	sounds = default.node_sound_leaves_defaults()
+}
 
-minetest.register_node("farming:tomato_2", {
-	drawtype = "plantlike",
-	tiles = {"farming_tomato_2.png"},
-	paramtype = "light",
-	sunlight_propagates = true,
-	walkable = false,
-	buildable_to = true,
-	drop = "",
-	selection_box = farming.select,
-	groups = {
-		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
-		not_in_creative_inventory = 1, growing = 1
-	},
-	sounds = default.node_sound_leaves_defaults(),
-})
+-- stage 1
+minetest.register_node("farming:tomato_1", table.copy(crop_def))
 
-minetest.register_node("farming:tomato_3", {
-	drawtype = "plantlike",
-	tiles = {"farming_tomato_3.png"},
-	paramtype = "light",
-	sunlight_propagates = true,
-	waving = 1,
-	walkable = false,
-	buildable_to = true,
-	drop = "",
-	selection_box = farming.select,
-	groups = {
-		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
-		not_in_creative_inventory = 1, growing = 1
-	},
-	sounds = default.node_sound_leaves_defaults(),
-})
+-- stage2
+crop_def.tiles = {"farming_tomato_2.png"}
+minetest.register_node("farming:tomato_2", table.copy(crop_def))
 
-minetest.register_node("farming:tomato_4", {
-	drawtype = "plantlike",
-	tiles = {"farming_tomato_4.png"},
-	paramtype = "light",
-	sunlight_propagates = true,
-	waving = 1,
-	walkable = false,
-	buildable_to = true,
-	drop = "",
-	selection_box = farming.select,
-	groups = {
-		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
-		not_in_creative_inventory = 1, growing = 1
-	},
-	sounds = default.node_sound_leaves_defaults(),
-})
+-- stage 3
+crop_def.tiles = {"farming_tomato_3.png"}
+minetest.register_node("farming:tomato_3", table.copy(crop_def))
 
-minetest.register_node("farming:tomato_5", {
-	drawtype = "plantlike",
-	tiles = {"farming_tomato_5.png"},
-	paramtype = "light",
-	sunlight_propagates = true,
-	waving = 1,
-	walkable = false,
-	buildable_to = true,
-	drop = "",
-	selection_box = farming.select,
-	groups = {
-		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
-		not_in_creative_inventory = 1, growing = 1
-	},
-	sounds = default.node_sound_leaves_defaults(),
-})
+-- stage 4
+crop_def.tiles = {"farming_tomato_4.png"}
+minetest.register_node("farming:tomato_4", table.copy(crop_def))
 
-minetest.register_node("farming:tomato_6", {
-	drawtype = "plantlike",
-	tiles = {"farming_tomato_6.png"},
-	paramtype = "light",
-	sunlight_propagates = true,
-	waving = 1,
-	walkable = false,
-	buildable_to = true,
-	drop = "",
-	selection_box = farming.select,
-	groups = {
-		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
-		not_in_creative_inventory = 1, growing = 1
-	},
-	sounds = default.node_sound_leaves_defaults(),
-})
+-- stage 5
+crop_def.tiles = {"farming_tomato_5.png"}
+minetest.register_node("farming:tomato_5", table.copy(crop_def))
 
-minetest.register_node("farming:tomato_7", {
-	drawtype = "plantlike",
-	tiles = {"farming_tomato_7.png"},
-	paramtype = "light",
-	waving = 1,
-	walkable = false,
-	buildable_to = true,
-	drop = {
-		items = {
-			{items = {'farming:tomato'}, rarity = 1},
-			{items = {'farming:tomato'}, rarity = 3},
-		}
-	},
-	selection_box = farming.select,
-	groups = {
-		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
-		not_in_creative_inventory = 1, growing = 1
-	},
-	sounds = default.node_sound_leaves_defaults(),
-})
+-- stage 6
+crop_def.tiles = {"farming_tomato_6.png"}
+minetest.register_node("farming:tomato_6", table.copy(crop_def))
 
--- Last stage of growth does not have growing group so abm never checks these
+-- stage 7
+crop_def.tiles = {"farming_tomato_7.png"}
+crop_def.drop = {
+	items = {
+		{items = {'farming:tomato'}, rarity = 1},
+		{items = {'farming:tomato'}, rarity = 3},
+	}
+}
+minetest.register_node("farming:tomato_7", table.copy(crop_def))
 
-minetest.register_node("farming:tomato_8", {
-	drawtype = "plantlike",
-	tiles = {"farming_tomato_8.png"},
-	paramtype = "light",
-	waving = 1,
-	walkable = false,
-	buildable_to = true,
-	drop = {
-		items = {
-			{items = {'farming:tomato 3'}, rarity = 1},
-			{items = {'farming:tomato 3'}, rarity = 2},
-		}
-	},
-	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(),
-})
\ No newline at end of file
+-- stage 8 (final)
+crop_def.tiles = {"farming_tomato_8.png"}
+crop_def.groups.growing = 0
+crop_def.drop = {
+	items = {
+		{items = {'farming:tomato 3'}, rarity = 1},
+		{items = {'farming:tomato 3'}, rarity = 2},
+	}
+}
+minetest.register_node("farming:tomato_8", table.copy(crop_def))