From 8c58ab960430ed59411f953d53c35e5747aee51e Mon Sep 17 00:00:00 2001
From: ademant <ademant@gmx.de>
Date: Sun, 21 Oct 2018 13:30:57 +0200
Subject: [PATCH] error corrections

---
 crops.txt                            |   6 +++---
 register.lua                         |   8 ++++----
 textures/farming_wildgrapes_seed.png | Bin 0 -> 204 bytes
 3 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 textures/farming_wildgrapes_seed.png

diff --git a/crops.txt b/crops.txt
index df71fe0..6140c2b 100644
--- a/crops.txt
+++ b/crops.txt
@@ -5,8 +5,8 @@ beetroot,1,,10,5,2,2,,1,,1,,,,,,,,,,,,3,35,,30,,,,9,,,,,,,,,,
 blackberry,1,,10,4,2,1,,,,,1,,,,,,,,,,,3,,90,20,,,,9,,,,,,,,,,
 blueberry,1,,10,4,2,1,,,,,1,,,,,,,,,,,3,45,90,40,90,,,9,,,,,,,,,,
 carrot,1,,10,8,2,2,,1,,1,,,,,,,,,2,,,3,45,,30,90,,,8,,,,,,,,,,farming:carrot_baked
-chili,1,,20,8,2,1,,,,,1,,,,,,,,,,,3,45,90,,,50,1000,,,,,,,,,,,
-coffee,1,,20,5,2,1,,,,,1,,,,,,,1,4,,,3,50,120,50,150,50,1000,12,,,,,,,,,,
+chili,1,,20,8,2,1,,,,,1,,,,,,,,,,,3,45,90,,,,1000,,,,,,,,,,,
+coffee,1,,20,5,2,1,,,,,1,,,,,,,1,4,,,3,50,120,50,150,,1000,12,,,,,,,,,,
 corn,1,,10,8,2,2,,,,1,,1,,,,,,,4,1,,3,35,90,30,,,,,,,,,,,,,,farming:corn_cob
 cotton,1,,10,8,2,,,,1,1,,1,,,,1,,,,,,3,45,90,20,,,,12,,,,,,,,,,
 culturewheat,1,,100,4,3,,1,,1,1,,1,,,,1,,1,3,,1,3,25,,40,,,,10,,,,,100,farming:straw,,,farming:flour,
@@ -21,7 +21,7 @@ raspberry,1,,10,4,2,1,,,,,1,,,,,,,,,,,3,,,,,,,9,,,,,,,,,,
 rhubarb,1,,10,3,2,2,,1,,1,,,,,,,,,,,,3,,,,,,,9,,,,,,,,,,
 spelt,1,,10,7,2,,,,1,1,,1,,,,1,,,3,,1,3,,,,,,,,,,,,,farming:straw,,,farming:flour,
 strawberry,1,,10,4,2,1,,,,,1,,,,,,,,,,,3,,,,,,,9,,,,,,,,,,
-tea,,,20,5,2,1,,,,,1,,,1,,,,,4,,,3,30,70,30,70,50,,,,,,,,,,,,
+tea,,,20,5,2,1,,,,,1,,,1,,,,,4,,,3,30,70,30,70,,,,,,,,,,,,,
 tobaco,1,,10,8,2,,,,1,1,1,,2,,,,,,4,,,3,,,,,,,,,,,,,,,,,
 tomato,,,10,8,2,1,,,1,1,1,1,,,,,1,,,,,3,,,,,,,,,,,,,,,,,
 nettle,1,,10,5,2,1,,,1,,,,1,,,1,,,2,,,3,5,150,,100,,2000,6,,,,,8,farming:nettle_fibre,,,,
diff --git a/register.lua b/register.lua
index 5363909..e0c0b8f 100644
--- a/register.lua
+++ b/register.lua
@@ -294,10 +294,10 @@ farming.register_steps = function(sdef)
 	node_def.drop_item = sdef.seed_name
 	-- if plant has to be harvested, drop harvest instead
 	if has_harvest then
-		node_def.drop_item = sdef.step_name
-	else
 		if sdef.seed_drop ~= nil then
 			node_def.drop_item = sdef.seed_drop
+		else
+			node_def.drop_item = sdef.step_name
 		end
 	end
 	local lbm_nodes = {sdef.seed_name}
@@ -330,7 +330,7 @@ farming.register_steps = function(sdef)
 			base_rarity =  8 - (i - 1) * 7 / (sdef.steps - 1)
 		end
 		ndef.drop={items={{items={ndef.drop_item}}}}
-		if use_trellis then
+		if sdef.groups["use_trellis"] then
 			table.insert(ndef.drop.items,1,{items={"farming:trellis"}})
 		end
 		local base_rarity = 1
@@ -601,7 +601,7 @@ farming.step_on_punch = function(pos, node, puncher, pointed_thing)
 		placenode.param2 = def.place_param2
 	end
 	minetest.swap_node(pos, placenode)
-	puncher:get_inventory():add_item('main',def.seed_name)
+	puncher:get_inventory():add_item('main',def.drop_item)
 	-- getting one more when using billhook
 	local tool_def = puncher:get_wielded_item():get_definition()
 	if tool_def.groups["billhook"] then
diff --git a/textures/farming_wildgrapes_seed.png b/textures/farming_wildgrapes_seed.png
new file mode 100644
index 0000000000000000000000000000000000000000..1952b74b0f944bd1595a125c4cfc2d6d24d994fd
GIT binary patch
literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(a6=Y!uXJbrcXH4f{D&}UY
z<z;T<XYLkYo+iwivgS_`P#I%MkY6x^!?PP{Ku)};i(?4Kb=|XPc^edX8ZP>KwkYR4
z;MmZZw_s7ZyTZkaZ%6JpEo@)5-d<B8%4XdY{;CVBZ!WF;bx{0LbWURQxt1FXriaNS
zpH#bMxH3<=X~K0)#prLYvtE8Gd@$|2k4D`zFU|`L`;=>eRxx<G`njxgN@xNAD=tR>

literal 0
HcmV?d00001