From 44e2b1582bc913fdb8fbe329d950853a7b8bd4a0 Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Sat, 12 Apr 2025 15:43:23 +0100
Subject: [PATCH] tweak crop drops #2

---
 crops/artichoke.lua  |  7 ++++++-
 crops/asparagus.lua  |  4 ++--
 crops/barley.lua     |  8 ++++----
 crops/chili.lua      |  6 ++++--
 crops/cocoa.lua      |  2 +-
 crops/corn.lua       |  4 ++--
 crops/cotton.lua     | 10 +---------
 crops/cucumber.lua   |  3 +--
 crops/eggplant.lua   |  3 +--
 crops/grapes.lua     |  6 +++---
 crops/hemp.lua       |  2 +-
 crops/lettuce.lua    |  2 +-
 crops/peas.lua       |  3 +--
 crops/pineapple.lua  |  2 +-
 crops/potato.lua     |  2 +-
 crops/rhubarb.lua    |  1 +
 crops/rice.lua       |  8 +-------
 crops/rye_oat.lua    |  4 ++++
 crops/soy.lua        |  5 ++---
 crops/spinach.lua    |  2 +-
 crops/strawberry.lua |  2 +-
 crops/vanilla.lua    |  1 -
 crops/wheat.lua      | 14 +++-----------
 23 files changed, 43 insertions(+), 58 deletions(-)

diff --git a/crops/artichoke.lua b/crops/artichoke.lua
index cb9d7a7..edf497a 100644
--- a/crops/artichoke.lua
+++ b/crops/artichoke.lua
@@ -55,6 +55,11 @@ minetest.register_node("farming:artichoke_3", table.copy(def))
 -- stage 4
 
 def.tiles = {"farming_artichoke_4.png"}
+def.drop = {
+	items = {
+		{items = {"farming:artichoke"}, rarity = 1}
+	}
+}
 minetest.register_node("farming:artichoke_4", table.copy(def))
 
 -- stage 5 (final)
@@ -97,6 +102,6 @@ minetest.register_decoration({
 		persist = 0.6
 	},
 	y_min = 1, y_max = 13,
-	decoration = "farming:artichoke_5",
+	decoration = "farming:artichoke_4",
 	spawn_by = "group:tree", num_spawn_by = 1
 })
diff --git a/crops/asparagus.lua b/crops/asparagus.lua
index 71962ad..cc9f3ef 100644
--- a/crops/asparagus.lua
+++ b/crops/asparagus.lua
@@ -59,7 +59,7 @@ minetest.register_node("farming:asparagus_3", table.copy(def))
 def.tiles = {"farming_asparagus_4.png"}
 def.drop = {
 	items = {
-		{items = {"farming:asparagus"}, rarity = 2}
+		{items = {"farming:asparagus"}, rarity = 1}
 	}
 }
 minetest.register_node("farming:asparagus_4", table.copy(def))
@@ -103,6 +103,6 @@ minetest.register_decoration({
 		persist = 0.6
 	},
 	y_min = 8, y_max = 32,
-	decoration = "farming:asparagus_5",
+	decoration = "farming:asparagus_4",
 	param2 = 3
 })
diff --git a/crops/barley.lua b/crops/barley.lua
index ca65456..f82e0a9 100644
--- a/crops/barley.lua
+++ b/crops/barley.lua
@@ -116,10 +116,10 @@ def.groups.growing = nil
 def.selection_box = farming.select_final
 def.drop = {
 	items = {
-		{items = {"farming:barley"}, rarity = 1},
-		{items = {"farming:barley"}, rarity = 3},
-		{items = {"farming:seed_barley"}, rarity = 1},
-		{items = {"farming:seed_barley"}, rarity = 3}
+		{items = {"farming:barley 2"}, rarity = 1},
+		{items = {"farming:barley"}, rarity = 2},
+		{items = {"farming:seed_barley 2"}, rarity = 1},
+		{items = {"farming:seed_barley"}, rarity = 2}
 	}
 }
 minetest.register_node("farming:barley_8", table.copy(def))
diff --git a/crops/chili.lua b/crops/chili.lua
index 98ad043..b42956c 100644
--- a/crops/chili.lua
+++ b/crops/chili.lua
@@ -80,8 +80,10 @@ def.groups.growing = nil
 def.selection_box = farming.select_final
 def.drop = {
 	items = {
-		{items = {"farming:chili_pepper 3"}, rarity = 1},
-		{items = {"farming:chili_pepper 2"}, rarity = 2}
+		{items = {"farming:chili_pepper 2"}, rarity = 1},
+		{items = {"farming:chili_pepper"}, rarity = 2},
+		{items = {"farming:chili_pepper"}, rarity = 3},
+		{items = {"farming:chili_pepper"}, rarity = 4}
 	}
 }
 minetest.register_node("farming:chili_8", table.copy(def))
diff --git a/crops/cocoa.lua b/crops/cocoa.lua
index f1971e6..b1adc27 100644
--- a/crops/cocoa.lua
+++ b/crops/cocoa.lua
@@ -127,7 +127,7 @@ def.drop = {
 	items = {
 		{items = {"farming:cocoa_beans_raw 2"}, rarity = 1},
 		{items = {"farming:cocoa_beans_raw"}, rarity = 2},
-		{items = {"farming:cocoa_beans_raw"}, rarity = 4}
+		{items = {"farming:cocoa_beans_raw"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:cocoa_4", table.copy(def))
diff --git a/crops/corn.lua b/crops/corn.lua
index 1b9e9f3..4876925 100644
--- a/crops/corn.lua
+++ b/crops/corn.lua
@@ -79,7 +79,7 @@ def.tiles = {"farming_corn_7.png"}
 def.drop = {
 	items = {
 		{items = {"farming:corn"}, rarity = 1},
-		{items = {"farming:corn"}, rarity = 2}
+		{items = {"farming:corn"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:corn_7", table.copy(def))
@@ -93,7 +93,7 @@ def.drop = {
 	items = {
 		{items = {"farming:corn 2"}, rarity = 1},
 		{items = {"farming:corn"}, rarity = 2},
-		{items = {"farming:corn"}, rarity = 2}
+		{items = {"farming:corn"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:corn_8", table.copy(def))
diff --git a/crops/cotton.lua b/crops/cotton.lua
index 1dc2ae4..8531ef2 100644
--- a/crops/cotton.lua
+++ b/crops/cotton.lua
@@ -93,12 +93,6 @@ minetest.register_node("farming:cotton_5", table.copy(def))
 -- stage 6
 
 def.tiles = {"farming_cotton_6.png"}
-def.drop = {
-	items = {
-		{items = {"farming:cotton"}, rarity = 1},
-		{items = {"farming:cotton"}, rarity = 2}
-	}
-}
 minetest.register_node("farming:cotton_6", table.copy(def))
 
 -- stage 7
@@ -106,10 +100,8 @@ minetest.register_node("farming:cotton_6", table.copy(def))
 def.tiles = {"farming_cotton_7.png"}
 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}
+		{items = {"farming:seed_cotton"}, rarity = 1}
 	}
 }
 minetest.register_node("farming:cotton_7", table.copy(def))
diff --git a/crops/cucumber.lua b/crops/cucumber.lua
index d4b3180..c6cf1eb 100644
--- a/crops/cucumber.lua
+++ b/crops/cucumber.lua
@@ -63,8 +63,7 @@ def.selection_box = farming.select_final
 def.drop = {
 	items = {
 		{items = {"farming:cucumber 2"}, rarity = 1},
-		{items = {"farming:cucumber"}, rarity = 2},
-		{items = {"farming:cucumber"}, rarity = 3}
+		{items = {"farming:cucumber"}, rarity = 2}
 	}
 }
 minetest.register_node("farming:cucumber_4", table.copy(def))
diff --git a/crops/eggplant.lua b/crops/eggplant.lua
index 288e3b9..0794f63 100644
--- a/crops/eggplant.lua
+++ b/crops/eggplant.lua
@@ -67,8 +67,7 @@ def.selection_box = farming.select_final
 def.drop = {
 	items = {
 		{items = {"farming:eggplant 2"}, rarity = 1},
-		{items = {"farming:eggplant"}, rarity = 2},
-		{items = {"farming:eggplant"}, rarity = 3}
+		{items = {"farming:eggplant"}, rarity = 2}
 	}
 }
 minetest.register_node("farming:eggplant_4", table.copy(def))
diff --git a/crops/grapes.lua b/crops/grapes.lua
index 3a77d3e..cc5b6c8 100644
--- a/crops/grapes.lua
+++ b/crops/grapes.lua
@@ -233,9 +233,9 @@ minetest.register_node("farming:grapebush", {
 	sunlight_propagates = true,
 	drop = {
 		items = {
-			{items = {"farming:grapes 1"}, rarity = 1},
-			{items = {"farming:grapes 1"}, rarity = 2},
-			{items = {"farming:grapes 1"}, rarity = 3}
+			{items = {"farming:grapes"}, rarity = 1},
+			{items = {"farming:grapes"}, rarity = 2},
+			{items = {"farming:grapes"}, rarity = 3}
 		}
 	},
 	selection_box = farming.select,
diff --git a/crops/hemp.lua b/crops/hemp.lua
index f36ef14..15c1ea0 100644
--- a/crops/hemp.lua
+++ b/crops/hemp.lua
@@ -118,7 +118,7 @@ def.drop = {
 	items = {
 		{items = {"farming:hemp_leaf 2"}, rarity = 1},
 		{items = {"farming:hemp_leaf"}, rarity = 2},
-		{items = {"farming:seed_hemp"}, rarity = 1},
+		{items = {"farming:seed_hemp 2"}, rarity = 1},
 		{items = {"farming:seed_hemp"}, rarity = 2}
 	}
 }
diff --git a/crops/lettuce.lua b/crops/lettuce.lua
index 017a216..649a0b4 100644
--- a/crops/lettuce.lua
+++ b/crops/lettuce.lua
@@ -64,7 +64,7 @@ def.selection_box = farming.select_final
 def.drop = {
 	items = {
 		{items = {"farming:lettuce 2"}, rarity = 1},
-		{items = {"farming:lettuce"}, rarity = 2}
+		{items = {"farming:lettuce"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:lettuce_5", table.copy(def))
diff --git a/crops/peas.lua b/crops/peas.lua
index 9f24c9e..fe61ef2 100644
--- a/crops/peas.lua
+++ b/crops/peas.lua
@@ -74,8 +74,7 @@ def.drop = {
 	items = {
 		{items = {"farming:pea_pod 2"}, rarity = 1},
 		{items = {"farming:pea_pod"}, rarity = 2},
-		{items = {"farming:pea_pod"}, rarity = 3},
-		{items = {"farming:pea_pod"}, rarity = 4}
+		{items = {"farming:pea_pod"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:pea_5", table.copy(def))
diff --git a/crops/pineapple.lua b/crops/pineapple.lua
index f4076ff..9a633f8 100644
--- a/crops/pineapple.lua
+++ b/crops/pineapple.lua
@@ -100,7 +100,7 @@ def.selection_box = farming.select_final
 def.drop = {
 	items = {
 		{items = {"farming:pineapple"}, rarity = 1},
-		{items = {"farming:pineapple"}, rarity = 2}
+		{items = {"farming:pineapple"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:pineapple_8", table.copy(def))
diff --git a/crops/potato.lua b/crops/potato.lua
index 228d302..6d65444 100644
--- a/crops/potato.lua
+++ b/crops/potato.lua
@@ -69,7 +69,7 @@ minetest.register_node("farming:potato_2", table.copy(def))
 def.tiles = {"farming_potato_3.png"}
 def.drop = {
 	items = {
-		{items = {"farming:potato"}, rarity = 2},
+		{items = {"farming:potato"}, rarity = 1},
 		{items = {"farming:potato"}, rarity = 3}
 	}
 }
diff --git a/crops/rhubarb.lua b/crops/rhubarb.lua
index afbffc1..c662b23 100644
--- a/crops/rhubarb.lua
+++ b/crops/rhubarb.lua
@@ -55,6 +55,7 @@ def.tiles = {"farming_rhubarb_3.png"}
 def.drop = {
 	items = {
 		{items = {"farming:rhubarb"}, rarity = 1},
+		{items = {"farming:rhubarb"}, rarity = 3}
 	}
 }
 minetest.register_node("farming:rhubarb_3", table.copy(def))
diff --git a/crops/rice.lua b/crops/rice.lua
index 3447ae9..80084d6 100644
--- a/crops/rice.lua
+++ b/crops/rice.lua
@@ -94,11 +94,6 @@ minetest.register_node("farming:rice_4", table.copy(def))
 -- stage 5
 
 def.tiles = {"farming_rice_5.png"}
-def.drop = {
-	items = {
-		{items = {"farming:rice"}, rarity = 2}
-	}
-}
 minetest.register_node("farming:rice_5", table.copy(def))
 
 -- stage 6
@@ -106,7 +101,7 @@ minetest.register_node("farming:rice_5", table.copy(def))
 def.tiles = {"farming_rice_6.png"}
 def.drop = {
 	items = {
-		{items = {"farming:rice"}, rarity = 2}
+		{items = {"farming:seed_rice"}, rarity = 2}
 	}
 }
 minetest.register_node("farming:rice_6", table.copy(def))
@@ -117,7 +112,6 @@ def.tiles = {"farming_rice_7.png"}
 def.drop = {
 	items = {
 		{items = {"farming:seed_rice"}, rarity = 1},
-		{items = {"farming:seed_rice"}, rarity = 2},
 		{items = {"farming:seed_rice"}, rarity = 3}
 	}
 }
diff --git a/crops/rye_oat.lua b/crops/rye_oat.lua
index 3fd93c1..1e3f025 100644
--- a/crops/rye_oat.lua
+++ b/crops/rye_oat.lua
@@ -25,6 +25,8 @@ minetest.override_item("farming:rye", {
 minetest.override_item("farming:rye_1", {drop = {}})
 minetest.override_item("farming:rye_2", {drop = {}})
 minetest.override_item("farming:rye_3", {drop = {}})
+minetest.override_item("farming:rye_4", {drop = {}})
+minetest.override_item("farming:rye_5", {drop = {}})
 
 -- Oats
 
@@ -48,3 +50,5 @@ minetest.override_item("farming:oat", {
 minetest.override_item("farming:oat_1", {drop = {}})
 minetest.override_item("farming:oat_2", {drop = {}})
 minetest.override_item("farming:oat_3", {drop = {}})
+minetest.override_item("farming:oat_4", {drop = {}})
+minetest.override_item("farming:oat_5", {drop = {}})
diff --git a/crops/soy.lua b/crops/soy.lua
index 3d366e7..ee35cde 100644
--- a/crops/soy.lua
+++ b/crops/soy.lua
@@ -65,7 +65,7 @@ minetest.register_node("farming:soy_4", table.copy(def))
 def.tiles = {"farming_soy_5.png"}
 def.drop = {
 	items = {
-		{items = {"farming:soy_pod"}, rarity = 1},
+		{items = {"farming:soy_pod"}, rarity = 2}
 	}
 }
 minetest.register_node("farming:soy_5", table.copy(def))
@@ -76,7 +76,6 @@ def.tiles = {"farming_soy_6.png"}
 def.drop = {
 	items = {
 		{items = {"farming:soy_pod"}, rarity = 1},
-		{items = {"farming:soy_pod"}, rarity = 2},
 		{items = {"farming:soy_pod"}, rarity = 3}
 	}
 }
@@ -126,5 +125,5 @@ minetest.register_decoration({
 		persist = 0.6
 	},
 	y_min = 20, y_max = 50,
-	decoration = "farming:soy_5"
+	decoration = "farming:soy_6"
 })
diff --git a/crops/spinach.lua b/crops/spinach.lua
index 2bc2560..8077d41 100644
--- a/crops/spinach.lua
+++ b/crops/spinach.lua
@@ -98,6 +98,6 @@ minetest.register_decoration({
 		persist = 0.6
 	},
 	y_min = 1, y_max = 100,
-	decoration = "farming:spinach_4",
+	decoration = "farming:spinach_3",
 	param2 = 3
 })
diff --git a/crops/strawberry.lua b/crops/strawberry.lua
index 34cc985..495770c 100644
--- a/crops/strawberry.lua
+++ b/crops/strawberry.lua
@@ -75,7 +75,7 @@ minetest.register_node(":ethereal:strawberry_6", table.copy(def))
 def.tiles = {"ethereal_strawberry_7.png"}
 def.drop = {
 	items = {
-		{items = {"ethereal:strawberry"}, rarity = 2},
+		{items = {"ethereal:strawberry"}, rarity = 1},
 		{items = {"ethereal:strawberry"}, rarity = 3}
 	}
 }
diff --git a/crops/vanilla.lua b/crops/vanilla.lua
index 4e95491..a03ad40 100644
--- a/crops/vanilla.lua
+++ b/crops/vanilla.lua
@@ -74,7 +74,6 @@ def.tiles = {"farming_vanilla_7.png"}
 def.drop = {
 	items = {
 		{items = {"farming:vanilla"}, rarity = 1},
-		{items = {"farming:vanilla"}, rarity = 2},
 		{items = {"farming:vanilla"}, rarity = 3}
 	}
 }
diff --git a/crops/wheat.lua b/crops/wheat.lua
index 3ced7fa..993fefe 100644
--- a/crops/wheat.lua
+++ b/crops/wheat.lua
@@ -84,12 +84,6 @@ minetest.register_node("farming:wheat_4", table.copy(def))
 -- stage 5
 
 def.tiles = {"farming_wheat_5.png"}
-def.drop = {
-	items = {
-		{items = {"farming:wheat"}, rarity = 2},
-		{items = {"farming:seed_wheat"}, rarity = 2}
-	}
-}
 minetest.register_node("farming:wheat_5", table.copy(def))
 
 -- stage 6
@@ -98,7 +92,7 @@ def.tiles = {"farming_wheat_6.png"}
 def.drop = {
 	items = {
 		{items = {"farming:wheat"}, rarity = 2},
-		{items = {"farming:seed_wheat"}, rarity = 1}
+		{items = {"farming:seed_wheat"}, rarity = 2}
 	}
 }
 minetest.register_node("farming:wheat_6", table.copy(def))
@@ -108,10 +102,8 @@ minetest.register_node("farming:wheat_6", table.copy(def))
 def.tiles = {"farming_wheat_7.png"}
 def.drop = {
 	items = {
-		{items = {"farming:wheat"}, rarity = 1},
-		{items = {"farming:wheat"}, rarity = 3},
-		{items = {"farming:seed_wheat"}, rarity = 1},
-		{items = {"farming:seed_wheat"}, rarity = 3}
+		{items = {"farming:wheat"}, rarity = 2},
+		{items = {"farming:seed_wheat"}, rarity = 1}
 	}
 }
 minetest.register_node("farming:wheat_7", table.copy(def))