From b184fc061194f8717928831a4657a8e9796a81a3 Mon Sep 17 00:00:00 2001 From: Tucker Bamberg Date: Tue, 22 Nov 2016 20:48:01 -0500 Subject: [PATCH 01/20] Drop seed if dug premature --- tomatoes.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tomatoes.lua b/tomatoes.lua index 7dcd0ca..15f9343 100644 --- a/tomatoes.lua +++ b/tomatoes.lua @@ -15,7 +15,7 @@ minetest.register_node('farming_plus:tomato_1', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = '', + drop = 'farming_plus:tomato_seed', tiles = {'farming_tomato_1.png'}, selection_box = { type = 'fixed', @@ -32,7 +32,7 @@ minetest.register_node('farming_plus:tomato_2', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = '', + drop = 'farming_plus:tomato_seed', tiles = {'farming_tomato_2.png'}, selection_box = { type = 'fixed', @@ -49,7 +49,7 @@ minetest.register_node('farming_plus:tomato_3', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = '', + drop = 'farming_plus:tomato_seed', tiles = {'farming_tomato_3.png'}, selection_box = { type = 'fixed', From d556ebf424943694b42dae2a2b73e912f19308b2 Mon Sep 17 00:00:00 2001 From: Tucker Bamberg Date: Tue, 22 Nov 2016 20:50:49 -0500 Subject: [PATCH 02/20] drop seed if dug prematurely --- strawberries.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/strawberries.lua b/strawberries.lua index 03ae754..9c3c86c 100644 --- a/strawberries.lua +++ b/strawberries.lua @@ -15,7 +15,7 @@ minetest.register_node('farming_plus:strawberry_1', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = '', + drop = 'farming_plus:strawberry_seed', tiles = {'farming_strawberry_1.png'}, selection_box = { type = 'fixed', @@ -32,7 +32,7 @@ minetest.register_node('farming_plus:strawberry_2', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = '', + drop = 'farming_plus:strawberry_seed', tiles = {'farming_strawberry_2.png'}, selection_box = { type = 'fixed', @@ -49,7 +49,7 @@ minetest.register_node('farming_plus:strawberry_3', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = '', + drop = 'farming_plus:strawberry_seed', tiles = {'farming_strawberry_3.png'}, selection_box = { type = 'fixed', From 0c1d543cefb7c8f107dc43c299f84939f0b3fd92 Mon Sep 17 00:00:00 2001 From: Tucker Bamberg Date: Tue, 22 Nov 2016 20:53:08 -0500 Subject: [PATCH 03/20] Drop Seed if dug premature --- rhubarb.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rhubarb.lua b/rhubarb.lua index 07519a1..d322a3d 100644 --- a/rhubarb.lua +++ b/rhubarb.lua @@ -15,7 +15,7 @@ minetest.register_node('farming_plus:rhubarb_1', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = '', + drop = 'farming_plus:rhubarb_seed', tiles = {'farming_rhubarb_1.png'}, selection_box = { type = 'fixed', @@ -32,7 +32,7 @@ minetest.register_node('farming_plus:rhubarb_2', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = '', + drop = 'farming_plus:rhubarb_seed', tiles = {'farming_rhubarb_2.png'}, selection_box = { type = 'fixed', From 883b17adfa1c2d13197da7850153306a9aef8520 Mon Sep 17 00:00:00 2001 From: Tucker Bamberg Date: Tue, 22 Nov 2016 20:54:56 -0500 Subject: [PATCH 04/20] Drop Seed if dug premature --- pumpkin.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pumpkin.lua b/pumpkin.lua index 0d70003..70dc7e5 100644 --- a/pumpkin.lua +++ b/pumpkin.lua @@ -13,7 +13,7 @@ core.register_node(':farming:pumpkin_1', { paramtype = 'light', sunlight_propagates = true, drawtype = 'nodebox', - drop = '', + drop = 'farming:pumpkin_seed', tiles = { "farming_pumpkin_top.png", "farming_pumpkin_bottom.png", @@ -49,7 +49,7 @@ core.register_node(':farming:pumpkin_2', { paramtype = 'light', sunlight_propagates = true, drawtype = 'nodebox', - drop = '', + drop = 'farming:pumpkin_seed', tiles = { "farming_pumpkin_top.png", "farming_pumpkin_bottom.png", From 65ab4cc895183eade684aff56857a6a314cae20c Mon Sep 17 00:00:00 2001 From: Tucker Bamberg Date: Tue, 22 Nov 2016 21:00:09 -0500 Subject: [PATCH 05/20] Check protection before carving pumpkin --- pumpkin.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pumpkin.lua b/pumpkin.lua index 70dc7e5..ae9cc3f 100644 --- a/pumpkin.lua +++ b/pumpkin.lua @@ -111,9 +111,15 @@ core.register_node(':farming:pumpkin', { on_punch = function(pos, node, puncher) local tool = puncher:get_wielded_item():get_name() - if tool and string.match(tool, 'sword') then - node.name = 'farming:pumpkin_face' - core.set_node(pos, node) + if minetest.is_protected(pos, placer:get_player_name()) or ++ minetest.is_protected({x=pos.x, y=pos.y+1, z=pos.z}, placer:get_player_name()) then + minetest.chat_send_player(puncher, 'No Cutting for you!!') + return False + else + if tool and string.match(tool, 'sword') then + node.name = 'farming:pumpkin_face' + core.set_node(pos, node) + end end end }) From 1ffe47b24cfea403b053a972e341d35973e81562 Mon Sep 17 00:00:00 2001 From: Tucker Bamberg Date: Tue, 22 Nov 2016 21:02:05 -0500 Subject: [PATCH 06/20] drop seed if dug premature --- potatoes.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/potatoes.lua b/potatoes.lua index ad3e332..d039380 100644 --- a/potatoes.lua +++ b/potatoes.lua @@ -15,7 +15,7 @@ minetest.register_node('farming_plus:potato_1', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = '', + drop = 'farming_plus:potato_seed', tiles = {'farming_potato_1.png'}, selection_box = { type = 'fixed', @@ -32,7 +32,7 @@ minetest.register_node('farming_plus:potato_2', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = '', + drop = 'farming_plus:potato_seed', tiles = {'farming_potato_2.png'}, selection_box = { type = 'fixed', From 895620f3f559ce861bdb15112359e8813652776b Mon Sep 17 00:00:00 2001 From: Tucker Bamberg Date: Tue, 22 Nov 2016 21:03:55 -0500 Subject: [PATCH 07/20] Drop seed if dug premature ... --- cucumber.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cucumber.lua b/cucumber.lua index 70ace91..27d4866 100644 --- a/cucumber.lua +++ b/cucumber.lua @@ -14,7 +14,7 @@ minetest.register_node("farming_plus:cucumber_1", { paramtype = "light", walkable = false, drawtype = "plantlike", - drop = "", + drop = "farming_plus:cucumber_seed", tiles = {"cucumber1.png"}, selection_box = { type = "fixed", @@ -30,7 +30,7 @@ minetest.register_node("farming_plus:cucumber_2", { paramtype = "light", walkable = false, drawtype = "plantlike", - drop = "", + drop = "farming_plus:cucumber_seed", tiles = {"cucumber2.png"}, selection_box = { type = "fixed", @@ -46,7 +46,7 @@ minetest.register_node("farming_plus:cucumber_3", { paramtype = "light", walkable = false, drawtype = "plantlike", - drop = "", + drop = "farming_plus:cucumber_seed", tiles = {"cucumber2.png"}, selection_box = { type = "fixed", From 674b79e07bc1cf6263bb6b8a28c662c33f5b92b5 Mon Sep 17 00:00:00 2001 From: Tucker Bamberg Date: Tue, 22 Nov 2016 21:05:22 -0500 Subject: [PATCH 08/20] Drop seed if dug premature --- carrots.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/carrots.lua b/carrots.lua index fa68d91..412c581 100644 --- a/carrots.lua +++ b/carrots.lua @@ -15,7 +15,7 @@ minetest.register_node("farming_plus:carrot_1", { walkable = false, drawtype = "plantlike", waving = 1, - drop = "", + drop = "farming_plus:carrot_seed", tiles = {"farming_carrot_1.png"}, selection_box = { type = "fixed", @@ -32,7 +32,7 @@ minetest.register_node("farming_plus:carrot_2", { walkable = false, drawtype = "plantlike", waving = 1, - drop = "", + drop = "farming_plus:carrot_seed", tiles = {"farming_carrot_2.png"}, selection_box = { type = "fixed", @@ -49,7 +49,7 @@ minetest.register_node("farming_plus:carrot_3", { walkable = false, drawtype = "plantlike", waving = 1, - drop = "", + drop = "farming_plus:carrot_seed", tiles = {"farming_carrot_3.png"}, selection_box = { type = "fixed", From 400e80490c35df4daa76169c249c3f21147a3ba8 Mon Sep 17 00:00:00 2001 From: Tucker Bamberg Date: Tue, 22 Nov 2016 21:11:28 -0500 Subject: [PATCH 09/20] drop seed if dug premature --- corn.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/corn.lua b/corn.lua index fd92099..f02a225 100644 --- a/corn.lua +++ b/corn.lua @@ -12,7 +12,7 @@ minetest.register_node('farming_plus:corn_1', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = '', + drop = 'farming_plus:corn_seed', tiles = {'corn1.png'}, selection_box = { type = 'fixed', @@ -29,7 +29,7 @@ minetest.register_node('farming_plus:corn_2', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = '', + drop = 'farming_plus:corn_seed', tiles = {'corn2.png'}, selection_box = { type = 'fixed', @@ -46,7 +46,7 @@ minetest.register_node('farming_plus:corn_3', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = '', + drop = 'farming_plus:corn_seed', tiles = {'corn3.png'}, selection_box = { type = 'fixed', @@ -63,7 +63,7 @@ minetest.register_node('farming_plus:corn_4', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = '', + drop = 'farming_plus:corn_seed', tiles = {'corn4.png'}, selection_box = { type = 'fixed', @@ -80,7 +80,7 @@ minetest.register_node('farming_plus:corn_5', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = '', + drop = 'farming_plus:corn_seed', tiles = {'corn22.png'}, selection_box = { type = 'fixed', @@ -97,7 +97,7 @@ minetest.register_node('farming_plus:corn_6', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = '', + drop = 'farming_plus:corn_seed', tiles = {'corn23.png'}, selection_box = { type = 'fixed', From 0b9bc56ca4fe9a9f677205d2daee69b85dcadf68 Mon Sep 17 00:00:00 2001 From: Tucker Bamberg Date: Tue, 22 Nov 2016 21:26:05 -0500 Subject: [PATCH 10/20] Behavior more 'plant-like' --- corn.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/corn.lua b/corn.lua index f02a225..ed4a48e 100644 --- a/corn.lua +++ b/corn.lua @@ -29,7 +29,7 @@ minetest.register_node('farming_plus:corn_2', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = 'farming_plus:corn_seed', + drop = '', tiles = {'corn2.png'}, selection_box = { type = 'fixed', @@ -46,7 +46,7 @@ minetest.register_node('farming_plus:corn_3', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = 'farming_plus:corn_seed', + drop = '', tiles = {'corn3.png'}, selection_box = { type = 'fixed', @@ -63,7 +63,7 @@ minetest.register_node('farming_plus:corn_4', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = 'farming_plus:corn_seed', + drop = '', tiles = {'corn4.png'}, selection_box = { type = 'fixed', @@ -80,7 +80,7 @@ minetest.register_node('farming_plus:corn_5', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = 'farming_plus:corn_seed', + drop = '', tiles = {'corn22.png'}, selection_box = { type = 'fixed', @@ -97,7 +97,7 @@ minetest.register_node('farming_plus:corn_6', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = 'farming_plus:corn_seed', + drop = '', tiles = {'corn23.png'}, selection_box = { type = 'fixed', From 7f6b70577870c556089c2215debc3690c8203402 Mon Sep 17 00:00:00 2001 From: Tucker Bamberg Date: Tue, 22 Nov 2016 21:29:49 -0500 Subject: [PATCH 11/20] plantlike update --- carrots.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/carrots.lua b/carrots.lua index 412c581..89f9709 100644 --- a/carrots.lua +++ b/carrots.lua @@ -27,7 +27,7 @@ minetest.register_node("farming_plus:carrot_1", { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node("farming_plus:carrot_2", { +minetest.register_node("", { paramtype = "light", walkable = false, drawtype = "plantlike", @@ -49,7 +49,7 @@ minetest.register_node("farming_plus:carrot_3", { walkable = false, drawtype = "plantlike", waving = 1, - drop = "farming_plus:carrot_seed", + drop = "", tiles = {"farming_carrot_3.png"}, selection_box = { type = "fixed", From bcab6c157472f113f1b4b5fa8ae00ba2082ba705 Mon Sep 17 00:00:00 2001 From: Tucker Bamberg Date: Tue, 22 Nov 2016 21:31:55 -0500 Subject: [PATCH 12/20] plantlike --- cucumber.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cucumber.lua b/cucumber.lua index 27d4866..34b0266 100644 --- a/cucumber.lua +++ b/cucumber.lua @@ -30,7 +30,7 @@ minetest.register_node("farming_plus:cucumber_2", { paramtype = "light", walkable = false, drawtype = "plantlike", - drop = "farming_plus:cucumber_seed", + drop = "", tiles = {"cucumber2.png"}, selection_box = { type = "fixed", @@ -46,7 +46,7 @@ minetest.register_node("farming_plus:cucumber_3", { paramtype = "light", walkable = false, drawtype = "plantlike", - drop = "farming_plus:cucumber_seed", + drop = "", tiles = {"cucumber2.png"}, selection_box = { type = "fixed", From 579ff586a1fac5e5112a9ecd63a9faf11a5261b9 Mon Sep 17 00:00:00 2001 From: Tucker Bamberg Date: Tue, 22 Nov 2016 21:38:02 -0500 Subject: [PATCH 13/20] make more plantlike drop --- potatoes.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/potatoes.lua b/potatoes.lua index d039380..23e66bc 100644 --- a/potatoes.lua +++ b/potatoes.lua @@ -32,7 +32,7 @@ minetest.register_node('farming_plus:potato_2', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = 'farming_plus:potato_seed', + drop = '', tiles = {'farming_potato_2.png'}, selection_box = { type = 'fixed', From 669e2c19a982bcef7b4fbf861eecfc50acd6245f Mon Sep 17 00:00:00 2001 From: Tucker Bamberg Date: Tue, 22 Nov 2016 21:41:17 -0500 Subject: [PATCH 14/20] fixed seed drops --- pumpkin.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pumpkin.lua b/pumpkin.lua index ae9cc3f..1cda4cd 100644 --- a/pumpkin.lua +++ b/pumpkin.lua @@ -49,7 +49,7 @@ core.register_node(':farming:pumpkin_2', { paramtype = 'light', sunlight_propagates = true, drawtype = 'nodebox', - drop = 'farming:pumpkin_seed', + drop = '', tiles = { "farming_pumpkin_top.png", "farming_pumpkin_bottom.png", From e87aa42cb9fc876e1b78985a6b5905f5184b4c78 Mon Sep 17 00:00:00 2001 From: Tucker Bamberg Date: Tue, 22 Nov 2016 21:47:26 -0500 Subject: [PATCH 15/20] plantlike --- rhubarb.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rhubarb.lua b/rhubarb.lua index d322a3d..191073b 100644 --- a/rhubarb.lua +++ b/rhubarb.lua @@ -32,7 +32,7 @@ minetest.register_node('farming_plus:rhubarb_2', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = 'farming_plus:rhubarb_seed', + drop = '', tiles = {'farming_rhubarb_2.png'}, selection_box = { type = 'fixed', From 75b75484cd118f3443cc0e32295d0fd8f5df6bf9 Mon Sep 17 00:00:00 2001 From: Tucker Bamberg Date: Tue, 22 Nov 2016 21:49:24 -0500 Subject: [PATCH 16/20] seed Drop Fix --- strawberries.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strawberries.lua b/strawberries.lua index 9c3c86c..965f921 100644 --- a/strawberries.lua +++ b/strawberries.lua @@ -32,7 +32,7 @@ minetest.register_node('farming_plus:strawberry_2', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = 'farming_plus:strawberry_seed', + drop = '', tiles = {'farming_strawberry_2.png'}, selection_box = { type = 'fixed', @@ -49,7 +49,7 @@ minetest.register_node('farming_plus:strawberry_3', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = 'farming_plus:strawberry_seed', + drop = '', tiles = {'farming_strawberry_3.png'}, selection_box = { type = 'fixed', From 462022545319681b3fd99350e0ea1ed345a9627d Mon Sep 17 00:00:00 2001 From: Tucker Bamberg Date: Tue, 22 Nov 2016 21:51:13 -0500 Subject: [PATCH 17/20] drop seed fix --- tomatoes.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tomatoes.lua b/tomatoes.lua index 15f9343..f774b98 100644 --- a/tomatoes.lua +++ b/tomatoes.lua @@ -32,7 +32,7 @@ minetest.register_node('farming_plus:tomato_2', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = 'farming_plus:tomato_seed', + drop = '', tiles = {'farming_tomato_2.png'}, selection_box = { type = 'fixed', @@ -49,7 +49,7 @@ minetest.register_node('farming_plus:tomato_3', { walkable = false, drawtype = 'plantlike', waving = 1, - drop = 'farming_plus:tomato_seed', + drop = '', tiles = {'farming_tomato_3.png'}, selection_box = { type = 'fixed', From b8beac39a87c08a76d9ba345844a5e82e760ad5d Mon Sep 17 00:00:00 2001 From: Tucker Bamberg Date: Tue, 22 Nov 2016 22:26:30 -0500 Subject: [PATCH 18/20] fix sword bypass --- pumpkin.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pumpkin.lua b/pumpkin.lua index 1cda4cd..e6fb326 100644 --- a/pumpkin.lua +++ b/pumpkin.lua @@ -13,7 +13,7 @@ core.register_node(':farming:pumpkin_1', { paramtype = 'light', sunlight_propagates = true, drawtype = 'nodebox', - drop = 'farming:pumpkin_seed', + drop = ':farming:pumpkin_seed', tiles = { "farming_pumpkin_top.png", "farming_pumpkin_bottom.png", @@ -111,8 +111,7 @@ core.register_node(':farming:pumpkin', { on_punch = function(pos, node, puncher) local tool = puncher:get_wielded_item():get_name() - if minetest.is_protected(pos, placer:get_player_name()) or -+ minetest.is_protected({x=pos.x, y=pos.y+1, z=pos.z}, placer:get_player_name()) then + if minetest.is_protected(pos, puncher:get_player_name()) or minetest.is_protected({x=pos.x, y=pos.y+1, z=pos.z}, puncher:get_player_name()) then minetest.chat_send_player(puncher, 'No Cutting for you!!') return False else From f5d0d9ad931096f29eb28a63b8957f7e5b3beef2 Mon Sep 17 00:00:00 2001 From: Tucker Bamberg Date: Wed, 23 Nov 2016 08:34:51 -0500 Subject: [PATCH 19/20] fix crash --- carrots.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/carrots.lua b/carrots.lua index 89f9709..da11db9 100644 --- a/carrots.lua +++ b/carrots.lua @@ -27,7 +27,7 @@ minetest.register_node("farming_plus:carrot_1", { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node("", { +minetest.register_node("farming_plus:carrot_2", { paramtype = "light", walkable = false, drawtype = "plantlike", From 822c57a383833f6dff6e7b1705965f48fc12dd6b Mon Sep 17 00:00:00 2001 From: Tucker Bamberg Date: Wed, 23 Nov 2016 08:46:43 -0500 Subject: [PATCH 20/20] fix crash --- pumpkin.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/pumpkin.lua b/pumpkin.lua index e6fb326..e14dffe 100644 --- a/pumpkin.lua +++ b/pumpkin.lua @@ -112,7 +112,6 @@ core.register_node(':farming:pumpkin', { on_punch = function(pos, node, puncher) local tool = puncher:get_wielded_item():get_name() if minetest.is_protected(pos, puncher:get_player_name()) or minetest.is_protected({x=pos.x, y=pos.y+1, z=pos.z}, puncher:get_player_name()) then - minetest.chat_send_player(puncher, 'No Cutting for you!!') return False else if tool and string.match(tool, 'sword') then