Added barley, tidied and tweaked code

1 files changed, 63 insertions, 154 deletions

diff --git a/cotton.lua b/cotton.lua
index 1edbd3a..2ddf88e 100644
--- a/cotton.lua
+++ b/cotton.lua
@@ -1,13 +1,5 @@
--- Cotton Seed
-
---minetest.register_craftitem("farming:seed_cotton", {
---	description = "Cotton Seed",
---	inventory_image = "farming_cotton_seed.png",
---	on_place = function(itemstack, placer, pointed_thing)
---		return farming.place_seed(itemstack, placer, pointed_thing, "farming:cotton_1")
---	end,
---})
 
+-- cotton seeds
 minetest.register_node("farming:seed_cotton", {
 	description = "Cotton Seed",
 	tiles = {"farming_cotton_seed.png"},
@@ -25,7 +17,7 @@ minetest.register_node("farming:seed_cotton", {
 	end,
 })
 
--- Cotton
+-- cotton / string
 
 minetest.register_craftitem("farming:cotton", {
 	description = "Cotton",
@@ -34,8 +26,7 @@ minetest.register_craftitem("farming:cotton", {
 
 minetest.register_alias("farming:string", "farming:cotton")
 
--- String to Wool
-
+-- cotton to wool
 minetest.register_craft({
 	output = "wool:white",
 	recipe = {
@@ -44,9 +35,8 @@ minetest.register_craft({
 	}
 })
 
--- Define Cotton growth stages
-
-minetest.register_node("farming:cotton_1", {
+-- cotton definition
+local crop_def = {
 	drawtype = "plantlike",
 	tiles = {"farming_cotton_1.png"},
 	paramtype = "light",
@@ -59,147 +49,66 @@ minetest.register_node("farming:cotton_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:cotton_2", {
-	drawtype = "plantlike",
-	tiles = {"farming_cotton_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(),
-})
-
-minetest.register_node("farming:cotton_3", {
-	drawtype = "plantlike",
-	tiles = {"farming_cotton_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(),
-})
-
-minetest.register_node("farming:cotton_4", {
-	drawtype = "plantlike",
-	tiles = {"farming_cotton_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(),
-})
-
-minetest.register_node("farming:cotton_5", {
-	drawtype = "plantlike",
-	tiles = {"farming_cotton_5.png"},
-	paramtype = "light",
-	sunlight_propagates = true,
-	waving = 1,
-	walkable = false,
-	buildable_to = true,
-	drop =  {
-		items = {
-			{items = {"farming:seed_cotton"}, rarity = 1},
-		}
-	},
-	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:cotton_1", table.copy(crop_def))
 
-minetest.register_node("farming:cotton_6", {
-	drawtype = "plantlike",
-	tiles = {"farming_cotton_6.png"},
-	paramtype = "light",
-	waving = 1,
-	walkable = false,
-	buildable_to = true,
-	drop =  {
-		items = {
-			{items = {"farming:cotton"}, rarity = 1},
-			{items = {"farming:cotton"}, rarity = 2},
-		}
-	},
-	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 2
+crop_def.tiles = {"farming_cotton_2.png"}
+minetest.register_node("farming:cotton_2", table.copy(crop_def))
 
-minetest.register_node("farming:cotton_7", {
-	drawtype = "plantlike",
-	tiles = {"farming_cotton_7.png"},
-	paramtype = "light",
-	waving = 1,
-	walkable = false,
-	buildable_to = true,
-	drop =  {
-		items = {
-			{items = {"farming:cotton"}, rarity = 1},
-			{items = {"farming:cotton"}, rarity = 2},
-			{items = {"farming:seed_cotton"}, rarity = 1},
-			{items = {"farming:seed_cotton"}, rarity = 2},
-		}
-	},
-	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_cotton_3.png"}
+minetest.register_node("farming:cotton_3", table.copy(crop_def))
 
--- Last stage of growth does not have growing group so abm never checks these
+-- stage 4
+crop_def.tiles = {"farming_cotton_4.png"}
+minetest.register_node("farming:cotton_4", table.copy(crop_def))
 
-minetest.register_node("farming:cotton_8", {
-	drawtype = "plantlike",
-	tiles = {"farming_cotton_8.png"},
-	paramtype = "light",
-	waving = 1,
-	walkable = false,
-	buildable_to = true,
-	drop =  {
-		items = {
-			{items = {"farming:string"}, rarity = 1},
-			{items = {"farming:string"}, rarity = 2},
-			{items = {"farming:string"}, rarity = 3},
-			{items = {"farming:seed_cotton"}, rarity = 1},
-			{items = {"farming:seed_cotton"}, rarity = 2},
-			{items = {"farming:seed_cotton"}, 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(),
-})
\ No newline at end of file
+-- stage 5
+crop_def.tiles = {"farming_cotton_5.png"}
+crop_def.drop = {
+	items = {
+		{items = {"farming:seed_cotton"}, rarity = 1},
+	}
+}
+minetest.register_node("farming:cotton_5", table.copy(crop_def))
+
+-- stage 6
+crop_def.tiles = {"farming_cotton_6.png"}
+crop_def.drop = {
+	items = {
+		{items = {"farming:cotton"}, rarity = 1},
+		{items = {"farming:cotton"}, rarity = 2},
+	}
+}
+minetest.register_node("farming:cotton_6", table.copy(crop_def))
+
+-- stage 7
+crop_def.tiles = {"farming_cotton_7.png"}
+crop_def.drop = {
+	items = {
+		{items = {"farming:cotton"}, rarity = 1},
+		{items = {"farming:cotton"}, rarity = 2},
+		{items = {"farming:seed_cotton"}, rarity = 1},
+		{items = {"farming:seed_cotton"}, rarity = 2},
+	}
+}
+minetest.register_node("farming:cotton_7", table.copy(crop_def))
+
+-- stage 8 (final)
+crop_def.tiles = {"farming_cotton_8.png"}
+crop_def.groups.growing = 0
+crop_def.drop = {
+	items = {
+		{items = {"farming:string"}, rarity = 1},
+		{items = {"farming:string"}, rarity = 2},
+		{items = {"farming:string"}, rarity = 3},
+		{items = {"farming:seed_cotton"}, rarity = 1},
+		{items = {"farming:seed_cotton"}, rarity = 2},
+		{items = {"farming:seed_cotton"}, rarity = 3},
+	}
+}
+minetest.register_node("farming:cotton_8", table.copy(crop_def))