Farming: update

.github/workflows/build.yml

@@ -8,4 +8,4 @@ jobs:
       - name: lint
         uses: Roang-zero1/factorio-mod-luacheck@master
         with:
-          luacheckrc_url: https://raw.githubusercontent.com/MultiCraft/MultiCraft_game/master/.luacheckrc
+          luacheckrc_url: ""

.luacheckrc

@@ -29,6 +29,7 @@ read_globals = {
 	"mobs",
 	"playerphysics",
 	"screwdriver",
+	"bonemeal",
 	"sscsm",
 	"hunger",
 	"workbench",

files/dungeon_loot/loot.lua

@@ -13,12 +13,6 @@ dungeon_loot.registered_loot = {
 	{name = "carts:rail", chance = 0.35, count = {1, 6}},
 
 	-- farming / consumable
-	{name = "farming:string", chance = 0.5, count = {1, 8}},
-	{name = "farming:wheat", chance = 0.5, count = {2, 5}},
-	{name = "farming_addons:seed_carrot", chance = 0.5, count = {2, 4}},
-	{name = "farming_addons:cocoa_3", chance = 0.5, count = {2, 4}},
-	{name = "farming_addons:melon", chance = 0.5, count = {1, 2}},
-	{name = "farming_addons:pumpkin", chance = 0.5, count = {1, 2}},
 	{name = "default:apple", chance = 0.4, count = {1, 4}},
 	{name = "default:cactus", chance = 0.4, count = {1, 4}, types = {"sandstone", "desert"}},
 

files/farming/farming/depends.txt

@@ -1 +1,2 @@
 default
+dungeon_loot?

files/farming/farming/init.lua

@@ -124,3 +124,14 @@ minetest.register_craft({
 	recipe = "farming:hoe_wood",
 	burntime = 5
 })
+
+-- Register farming items as dungeon loot
+if minetest.global_exists("dungeon_loot") then
+	dungeon_loot.register({
+		{name = "farming:string", chance = 0.5, count = {1, 8}},
+		{name = "farming:wheat", chance = 0.5, count = {2, 5}},
+		{name = "farming:hoe_steel", chance = 0.25},
+		{name = "farming:hoe_gold", chance = 0.2},
+		{name = "farming:hoe_diamond", chance = 0.05}
+	})
+end

files/farming/farming_addons/depends.txt

@@ -1,2 +1,3 @@
 default
 farming
+dungeon_loot?

files/farming/farming_addons/init.lua

@@ -57,3 +57,25 @@ minetest.register_craft({
 		{"", "farming_addons:bowl", ""}
 	}
 })
+
+minetest.after(1, function()
+	-- Add bonemeal support
+	if minetest.global_exists("bonemeal") then
+		bonemeal.add_crop({
+			{"farming_addons:carrot_", 4, "farming_addons:seed_carrot"},
+			{"farming_addons:cocoa_", 3, "farming_addons:seed_cocoa"},
+			{"farming_addons:melon_", 8, "farming_addons:seed_melon"},
+			{"farming_addons:pumpkin_", 8, "farming_addons:seed_pumpkin"}
+		})
+	end
+
+	-- Register dungeon loot
+	if minetest.global_exists("dungeon_loot") then
+		dungeon_loot.register({
+			{name = "farming_addons:seed_carrot", chance = 0.5, count = {2, 4}},
+			{name = "farming_addons:cocoa_3", chance = 0.5, count = {2, 4}},
+			{name = "farming_addons:seed_melon", chance = 0.5, count = {1, 2}},
+			{name = "farming_addons:seed_pumpkin", chance = 0.5, count = {1, 2}}
+		})
+	end
+end)

files/farming/farming_addons/seeds.lua

@@ -3,11 +3,11 @@
 --
 
 -- Pumpkin
-for i = 1, 5 do
+for i = 2, 5 do
 	minetest.override_item("default:dry_grass_" .. i, {drop = {
 		max_items = 1,
 		items = {
-			{items = {"farming_addons:seed_pumpkin"}, rarity = 5},
+			{items = {"farming_addons:seed_pumpkin"}, rarity = 12},
 			{items = {"default:dry_grass_1"}}
 		}
 	}})
@@ -15,7 +15,7 @@ end
 
 -- Carrot
 -- Wheat
-for i = 1, 5 do
+for i = 2, 5 do
 	minetest.override_item("default:grass_" .. i, {drop = {
 		max_items = 1,
 		items = {
@@ -30,7 +30,8 @@ end
 minetest.override_item("default:junglegrass", {drop = {
 	max_items = 1,
 	items = {
-		{items = {"farming_addons:seed_potato"}, rarity = 6},
+		{items = {"farming_plants:seed_potato"}, rarity = 6},
+		{items = {"farming_plants:seed_cucumber"}, rarity = 8},
 		{items = {"default:junglegrass"}}
 	}
 }})
@@ -40,8 +41,7 @@ minetest.override_item("default:junglegrass", {drop = {
 minetest.override_item("default:dry_shrub", {drop = {
 	max_items = 1,
 	items = {
-		{items = {"farming_addons:seed_corn"}, rarity = 6},
-		{items = {"farming_addons:seed_melon"}, rarity = 6},
+		{items = {"farming_plants:seed_corn"}, rarity = 6},
 		{items = {"default:dry_shrub"}}
 	}
 }})