From dc0908e5fa86334226c982877e71aec8cfaf92ce Mon Sep 17 00:00:00 2001
From: Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com>
Date: Wed, 15 Aug 2018 18:15:28 -0400
Subject: update plantlife, farming_redo, nixie tubes add my led_marquee mod

---
 farming/crops/cocoa.lua   |  2 +-
 farming/crops/melon.lua   |  9 +++++----
 farming/crops/pumpkin.lua | 49 +++++++++++++++++++++++++----------------------
 3 files changed, 32 insertions(+), 28 deletions(-)

(limited to 'farming/crops')

diff --git a/farming/crops/cocoa.lua b/farming/crops/cocoa.lua
index 19e9c6b..ecefcea 100644
--- a/farming/crops/cocoa.lua
+++ b/farming/crops/cocoa.lua
@@ -113,7 +113,7 @@ local crop_def = {
 	drawtype = "plantlike",
 	tiles = {"farming_cocoa_1.png"},
 	paramtype = "light",
-	walkable = true,
+	walkable = false,
 	drop = {
 		items = {
 			{items = {'farming:cocoa_beans 1'}, rarity = 2},
diff --git a/farming/crops/melon.lua b/farming/crops/melon.lua
index 2165558..1791fdf 100644
--- a/farming/crops/melon.lua
+++ b/farming/crops/melon.lua
@@ -22,10 +22,10 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
+	type = "shapeless",
 	output = "farming:melon_slice 9",
-	recipe = {
-		{"", "farming:melon_8", ""},
-	}
+	recipe = {"farming:melon_8", "farming:cutting_board"},
+	replacements = {{"farming:cutting_board", "farming:cutting_board"}},
 })
 
 -- melon definition
@@ -82,5 +82,6 @@ crop_def.groups = {
 	food_melon = 1, snappy = 1, oddly_breakable_by_hand = 1,
 	flammable = 2, plant = 1
 }
-crop_def.drop = "farming:melon_slice 9"
+--crop_def.drop = "farming:melon_slice 9"
+crop_def.drop = "farming:melon_8"
 minetest.register_node("farming:melon_8", table.copy(crop_def))
diff --git a/farming/crops/pumpkin.lua b/farming/crops/pumpkin.lua
index d8e8ec6..4abbe13 100644
--- a/farming/crops/pumpkin.lua
+++ b/farming/crops/pumpkin.lua
@@ -5,26 +5,6 @@
 
 local S = farming.intllib
 
--- pumpkin
-minetest.register_node("farming:pumpkin", {
-	description = S("Pumpkin"),
-	tiles = {
-		"farming_pumpkin_top.png",
-		"farming_pumpkin_top.png",
-		"farming_pumpkin_side.png"
-	},
-	groups = {
-		food_pumpkin = 1, choppy = 1, oddly_breakable_by_hand = 1,
-		flammable = 2, plant = 1
-	},
-	drop = {
-		items = {
-			{items = {'farming:pumpkin_slice 9'}, rarity = 1},
-		}
-	},
-	sounds = default.node_sound_wood_defaults(),
-})
-
 -- pumpkin slice
 minetest.register_craftitem("farming:pumpkin_slice", {
 	description = S("Pumpkin Slice"),
@@ -46,10 +26,10 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
+	type = "shapeless",
 	output = "farming:pumpkin_slice 9",
-	recipe = {
-		{"", "farming:pumpkin", ""},
-	}
+	recipe = {"farming:pumpkin", "farming:cutting_board"},
+	replacements = {{"farming:cutting_board", "farming:cutting_board"}},
 })
 
 -- jack 'o lantern
@@ -201,6 +181,7 @@ crop_def.tiles = {"farming_pumpkin_7.png"}
 minetest.register_node("farming:pumpkin_7", table.copy(crop_def))
 
 -- stage 8 (final)
+--[[
 crop_def.tiles = {"farming_pumpkin_8.png"}
 crop_def.groups.growing = 0
 crop_def.drop = {
@@ -209,3 +190,25 @@ crop_def.drop = {
 	}
 }
 minetest.register_node("farming:pumpkin_8", table.copy(crop_def))
+]]
+
+minetest.register_node("farming:pumpkin_8", {
+	description = S("Pumpkin"),
+	tiles = {
+		"farming_pumpkin_top.png",
+		"farming_pumpkin_top.png",
+		"farming_pumpkin_side.png"
+	},
+	groups = {
+		food_pumpkin = 1, choppy = 1, oddly_breakable_by_hand = 1,
+		flammable = 2, plant = 1
+	},
+--	drop = {
+--		items = {
+--			{items = {'farming:pumpkin_slice 9'}, rarity = 1},
+--		}
+--	},
+	sounds = default.node_sound_wood_defaults(),
+})
+
+minetest.register_alias("farming:pumpkin", "farming:pumpkin_8")
-- 
cgit v1.2.3