From a50c8d33ebe0a31f19c955f82b6943948d43a7f5 Mon Sep 17 00:00:00 2001
From: TenPlus1 <kinsellaja@yahoo.com>
Date: Thu, 22 Mar 2018 15:57:36 +0000
Subject: [PATCH] add new stage to cocoa, tweak code

---
 cocoa.lua                    |  17 +++++++++++------
 init.lua                     |   6 +++---
 textures/farming_cocoa_1.png | Bin 230 -> 230 bytes
 textures/farming_cocoa_2.png | Bin 244 -> 238 bytes
 textures/farming_cocoa_3.png | Bin 253 -> 446 bytes
 textures/farming_cocoa_4.png | Bin 0 -> 253 bytes
 6 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 textures/farming_cocoa_4.png

diff --git a/cocoa.lua b/cocoa.lua
index 2bbbb50..a8491ac 100644
--- a/cocoa.lua
+++ b/cocoa.lua
@@ -125,25 +125,30 @@ local crop_def = {
 -- stage 1
 minetest.register_node("farming:cocoa_1", table.copy(crop_def))
 
--- stage2
+-- stage 2
 crop_def.tiles = {"farming_cocoa_2.png"}
+minetest.register_node("farming:cocoa_2", table.copy(crop_def))
+
+-- stage3
+crop_def.tiles = {"farming_cocoa_3.png"}
 crop_def.drop = {
 	items = {
 		{items = {'farming:cocoa_beans 1'}, rarity = 1},
 	}
 }
-minetest.register_node("farming:cocoa_2", table.copy(crop_def))
+minetest.register_node("farming:cocoa_3", table.copy(crop_def))
 
--- stage 3 (final)
-crop_def.tiles = {"farming_cocoa_3.png"}
+-- stage 4 (final)
+crop_def.tiles = {"farming_cocoa_4.png"}
 crop_def.groups.growing = 0
 crop_def.drop = {
 	items = {
 		{items = {'farming:cocoa_beans 2'}, rarity = 1},
 		{items = {'farming:cocoa_beans 1'}, rarity = 2},
+		{items = {'farming:cocoa_beans 1'}, rarity = 4},
 	}
 }
-minetest.register_node("farming:cocoa_3", table.copy(crop_def))
+minetest.register_node("farming:cocoa_4", table.copy(crop_def))
 
 -- add random cocoa pods to jungle tree's
 minetest.register_on_generated(function(minp, maxp)
@@ -181,7 +186,7 @@ minetest.register_on_generated(function(minp, maxp)
 				--print ("Cocoa Pod added at " .. minetest.pos_to_string(pos))
 
 				minetest.swap_node(pos, {
-					name = "farming:cocoa_" .. tostring(math.random(1, 3))
+					name = "farming:cocoa_" .. tostring(math.random(1, 4))
 				})
 			end
 
diff --git a/init.lua b/init.lua
index 8a9165c..4faa222 100644
--- a/init.lua
+++ b/init.lua
@@ -211,7 +211,7 @@ local function reg_plant_stages(plant_name, stage, force_last)
 end
 
 
-register_plant_node = function(node)
+local register_plant_node = function(node)
 
 	local plant_name, stage = plant_name_stage(node)
 
@@ -554,8 +554,8 @@ farming.register_plant = function(name, def)
 			waving = 1,
 			tiles = {mname .. "_" .. pname .. "_" .. i .. ".png"},
 			paramtype = "light",
-			paramtype2 = def.paramtype2 or nil,
-			place_param2 = def.place_param2 or nil,
+			paramtype2 = def.paramtype2,
+			place_param2 = def.place_param2,
 			walkable = false,
 			buildable_to = true,
 			drop = drop,
diff --git a/textures/farming_cocoa_1.png b/textures/farming_cocoa_1.png
index f887a1fb1b758229c763a7f60d4bd15436877b8e..18fd362ca60be7c7c7e4586cd3f6000733321259 100644
GIT binary patch
delta 21
ccmaFH_>6IaCbO}r=0qI>mMp6Rfr$xi0832<r~m)}

delta 21
dcmaFH_>6IaCUc5w_Cy^67UTF?|0X810RUCX2r&Qv

diff --git a/textures/farming_cocoa_2.png b/textures/farming_cocoa_2.png
index f0d393532509e2d9c2aae1735feff65735cafe99..c304ee0e5c412edd8c8930dfc701d581c336e5b0 100644
GIT binary patch
delta 161
zcmV;S0ABy}0qy~iDFZV#DUmENe{Q#cT>t<80d!JMQvg8b*k%9#0BK1?K~xyijgCPA
zg&+t8$sdYO5buB5sD9eAVdKmKAqvuVlCH<C-PO`Rh9@#pHM-d@51baJZtgZ+3`2X@
z6&fOq(PjWz9YB2o7paI@A?Gte<`QOMf&A9LoVgTv9kTD73%!XzUpW9p6PN>w65n&u
P00000NkvXXu0mjfl%YQy

delta 167
zcmV;Y09gO-0rUZoDFb9RZ;>o8f34=juK)l50d!JMQvg8b*k%9#0B=b|K~xyiRgOs#
zz#s?&iHahE`2W`ivuM&>m@c3IaKbSOS98a1qT!LA1E`89+#FYS3^ppJX1X#d59wXD
zXzXf?wghvlgSox}3sv^oBIl`?))7QPVv0*d%vcJ29!Uvvi60SNB!K@28T?7_!U;+1
V1FX(Eo@xL9002ovPDHLkV1oG@Lumj2

diff --git a/textures/farming_cocoa_3.png b/textures/farming_cocoa_3.png
index 8eaf67eba312f190d3a9602b351bba1942295c31..d66b47d4ca78df51eb94b754aee9087876ffbed3 100644
GIT binary patch
delta 431
zcmV;g0Z{(^0lou}8Gi-<001BJ|6u?C0fk9KK~y-)eUd#d1W^=*pZnn>5yZ%f!bXH>
zHlZL<DD@IQ0KqSj_!$(U(kT1}jY5PFk=R&9W!EePvTN_Xin}|Oz2j7O?#%nV?>Tb>
zf2y!K<7(x1v~>VDz$i)oP%r2ER|250HS22ScK}2xY`Z+)Tz>;8G39$ylxOMakmT*_
zmr+lykL$e)AyU`M2R*qyPUZ{f(P;oo5(6NkF$Pw)1%Z-N%TuZNdhbHC!~iPFqoO=Q
zb@95p;X(j?cYN1DHc5=iO@L{D(jGQEPB20HLuF^t0l4}n2<cm}7Ocf2aWIAKaDRF5
zheq9llm?|yBY%^@1p4oV`>Oqbob{}ytL97lKfpW}ePk(7Q67Y(5nqCkL2)pFO&*(v
zHW2ukwA#y>L8)5DS%b62FVb@{-39aVK=JnGf55^)B1+Y|4^SzkNlf{ktm^m+TDIn8
zezjD*y<y=X>DZazdY-LE4q$As8zB{O^^>{%B>1h!iYRuv8aXYYVF@~Cw$MJ0ra`6{
Z;2Vtvtcz}ku+#tm002ovPDHLkV1kOa&R_rl

delta 236
zcmV<I02BYd1N{Mz8Gi!+001a04^sdD05ecbR7GWvF(ghTttb?~DG|&t7b{~g-832I
zJ|gExE$37_>R?FgYE<oYV(x-(@Qiu#pL+G9Ze&>VKL7v#0d!JMQvg8b*k%9#0C-76
zK~xyiP0mpc10e_mP*)TML3{txc65pDd@(O*NC~OWPCdh0hh>@7K=kVFW^<;K=k$pl
zfVk>(fJGMr*jk?pL)FGw%R{;d%(uS4(weH64GloLC`{rLE~T~oumli*JM11pM9i(_
m3pwY)MCq4|m7M;AotVDna|EF*uE;I`0000<MNUMnLSTZ|e`Eas

diff --git a/textures/farming_cocoa_4.png b/textures/farming_cocoa_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..990a8b456db53bbe859e537509881e94002988cd
GIT binary patch
literal 253
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;VYi?q?il53_4Uzqtf@ciG
zwUhPlnn*sgQ+n>9`#i+@Rf5OstdO^*N$;BSKlD_7nqT#Gao+5AO}#+vj3q&S!3+-1
zZlnP@6`n4RArhB;&js=^D{`;|gp05`R{y_TR?_*l#!x@QgLCD1Kik96?K7`Be0lXQ
zt$5kw=U+PI8g{%YX>b*1z7aK_+xhCTsMF57IL>U}ci_^jRWo>b9d>E>JQCJhy7lh{
z7J&xqH*!ucXVyODwtRlb<>mCAsdN4{&z-UFSux8(opmSlfNo&$boFyt=akR{060iw
AZ~y=R

literal 0
HcmV?d00001