From 21f6ac681868ead6e5008fa31f21ba598fd9d05f Mon Sep 17 00:00:00 2001
From: LeMagnesium <mg.minetest@gmail.com>
Date: Thu, 29 Sep 2016 21:44:22 +0200
Subject: [PATCH] Create spiky cactus, make the original smoother

 - Remove spikes from the standard cactus' side
 - Remove spikes from all cacti's tops, and add a flower
 - Add specific texture for spiky cactus
 - Create spiky cactus and recipes to convert spiky cactus and cactus
 - Move damages from normal cactus to spiky cactus
 - For #500
---
 minetestforfun_game/mods/default/crafting.lua |  14 +++++++++++++
 minetestforfun_game/mods/default/nodes.lua    |  19 ++++++++++++++++++
 .../default/textures/default_cactus_side.png  | Bin 309 -> 505 bytes
 .../default/textures/default_cactus_spiky.png | Bin 0 -> 356 bytes
 .../default/textures/default_cactus_top.png   | Bin 267 -> 551 bytes
 mods/sprint/esprint.lua                       |   4 ++--
 6 files changed, 35 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 minetestforfun_game/mods/default/textures/default_cactus_side.png
 create mode 100644 minetestforfun_game/mods/default/textures/default_cactus_spiky.png

diff --git a/minetestforfun_game/mods/default/crafting.lua b/minetestforfun_game/mods/default/crafting.lua
index 0a2bbd15..89779149 100755
--- a/minetestforfun_game/mods/default/crafting.lua
+++ b/minetestforfun_game/mods/default/crafting.lua
@@ -784,6 +784,20 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = "default:cactus 2",
+	recipe = {
+		{"default:cactus_spiky", "default:cactus_spiky"},
+	},
+})
+
+minetest.register_craft({
+	output = "default:cactus_spiky 2",
+	recipe = {
+		{"default:cactus", "default:cactus"},
+	},
+})
+
 minetest.register_craft({
 	output = 'default:clay',
 	recipe = {
diff --git a/minetestforfun_game/mods/default/nodes.lua b/minetestforfun_game/mods/default/nodes.lua
index 331aa1bc..5ed8ecbb 100755
--- a/minetestforfun_game/mods/default/nodes.lua
+++ b/minetestforfun_game/mods/default/nodes.lua
@@ -1449,6 +1449,25 @@ minetest.register_node("default:cactus", {
 	end,
 })
 
+minetest.register_node("default:cactus_spiky", {
+	description = "Spiky Cactus",
+	tiles = {"default_cactus_top.png", "default_cactus_top.png",
+		"default_cactus_spiky.png"},
+	paramtype2 = "facedir",
+	groups = {snappy = 1, choppy = 3, flammable = 2},
+	drop = {
+		items = {
+			{items = {"default:cactus_spiky"}},
+		},
+	},
+	sounds = default.node_sound_wood_defaults(),
+	on_place = minetest.rotate_node,
+
+	after_dig_node = function(pos, node, metadata, digger)
+		default.dig_up(pos, node, digger)
+	end,
+})
+
 minetest.register_node("default:papyrus", {
 	description = "Papyrus",
 	drawtype = "plantlike",
diff --git a/minetestforfun_game/mods/default/textures/default_cactus_side.png b/minetestforfun_game/mods/default/textures/default_cactus_side.png
old mode 100755
new mode 100644
index e5c10c3399e84a0307dc2ab8dcae19d6a7cf2b10..530316a4c7940a63d256ae630fc6495da28d1799
GIT binary patch
delta 490
zcmV<G0TuqW0{H`w8Gix*005AYXf^-<010qNS#tmY3ljhU3ljkVnw%H_000McNliru
z;0YZQ1Oa&Xw5k9A0hmcdK~yNuP0~wm(@+ov;Lq3BcATV6N(GfzAbto7{{NaC5=bo4
zmOxw5M-toDW)TN*mNRqCyiV49_VJSwLS=t1M%^BY+TqEVEPt;(-@((Jh{NMVn5|U{
zhez$Ja<1={3q=jF(jOt<@W=fIhBT3f4#v(fz-}We4Czb=h2~0mp?#WK6^ls%H(xE^
z!OJhlop6d)jj@OAH|;B|-a!a1-;x<Smmf}hHp;nl)c1;7-3YlqKjD5O1hX|G+<t-3
z9o&AA6=H;XZGT9U{BjLLFLe+~RU>3k`9_Sg+{<s}LdYSHn)mWb`wS01G}q^)n=2TT
z`qK8hSow#WuaJ)Fl{kYKqgWXRAqZg_W=s-jF3r}`5&ENgb-q#vkmc$%%&(-@Zew;a
z#qT$=93oP$%<UhiG}`Cs_A)~<Cd;)v+IIp{D|N~RbYpv|pExIsy>72s>5sZs;kYw&
z+84txc`mi*(q!xngNLmU{<B8kohNyPa&G$#lf>!Sd12_z)_A_P+bAl_YY$tvxRO`$
g67tIYnrzbj3jp1<uWn<xf&c&j07*qoM6N<$g8Oyi82|tP

delta 293
zcmV+=0owlg1GNH>8Gi!+001a04^sdD07y_wR7J<Ut|n{%D|G-MVgM;~04H$(BWM63
zWdJOA03KZcEO`JFQUDrQ00%ArE_?tLP5=-_01iL^6;}WeN&ql}01G$(zOteO9{}w7
zyGZ~50H{esK~xwS1;K}5!$1%NF!Jj6BH7OVn+CuPT^|=xB7c!NaVyGNu5jbayg==(
zdDcURx&l+P85EuV6t5FkP5A0n7#s1$1|1`Nc3CC97w5Y4P=rb`8~|O4A`cy6yH3m$
zvCctziqt%KX^>!s#}Z`4pgg4z3R$H`#f}mpJkeVd<p9(SjKOFE&y88>I}{YL#}t?Y
ruE>`LVX1$>-X5hrtk%Z*wDJ1~k|_qyc5Y(600000NkvXXu0mjf1q5oS

diff --git a/minetestforfun_game/mods/default/textures/default_cactus_spiky.png b/minetestforfun_game/mods/default/textures/default_cactus_spiky.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdceed2f6b09db7281b334664b049a50244f4877
GIT binary patch
literal 356
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!M}SX=>+wD7)N&ZKOBocB7&MC+
z)C(DuGZ>Uo8FVTb<YF0gDj7tA7^ET?*!39nY8XWQ7zErH_#7BS!x;p<7z~;jxGfm=
zZCb=4&+z8gZcm_@oCO|{#S9GG!XV7ZFl&wkP>{XE)7O>#0jI1m3)g$CTqU5;dQTU}
z5Q)pO=iMhU8}cwaGz4ZY;r#aQe|^@?aIu>Vg)Qf%b8AjKVN(z~#WMEcvGz*Ft=peP
z`dgKpFU&A&UUd2Wqtf{+IOX?>9CO>VaYMQLw>L)Kd-Uf__vUw9A##{=fp_4O>mt#&
zErO0%vA@*|`h3K>nZ?*<nSwUkQ@vK}ip92CVN(PiO75Po!M-3ZfyYg_LQiJuzA~Nd
xwYRtbI`B`S-pu<i`!%h%X<N;nt?u2=KS`7Ayz9L<S)kJyJYD@<);T3K0RZ@&bd3N2

literal 0
HcmV?d00001

diff --git a/minetestforfun_game/mods/default/textures/default_cactus_top.png b/minetestforfun_game/mods/default/textures/default_cactus_top.png
index cf46aa2d88e63ea8a6190d2428c7c52bbc3929e7..6a11d9b9cdd0eb6b7ce2d561115a6b0efbd47aaa 100755
GIT binary patch
delta 538
zcmV+#0_FXS0;dF!7=H)`0000V^Z#K0000JJOGiWi{{a60|De66lK=n!32;bRa{vGf
z6951U69E94oEQKA00(qQO+^Rb2^|v(0|<5a2mk;9v`IukR5;6BlR=KtKoCWr-DStl
zj2HwFBaSc|1gD6EkY>qZHggt^z*&$+a}i(_v9)ASl*sA0oqvj1R6CtXNmkpg{#Czz
z|IXfhX1sn6^#Y13Uc_;LqeAX%?bqNc@P92IHXv>WdVsLApRR<why@fz1y#tLfprf~
zEMLC?kveV;5EO7w&aKd8xB_&5Odv09pA<E?nRN@D(MDnR+Ni4<h#{_VBrsNad1GDk
zGEoa1^jpvnL4Ux|8TdR#1(~Y43Ye$lj}OoG(nI509)CZ;G?pd?qB|SG6(AM#5!`%l
z;Lh956+AsYbH7^JcNAGFFw!p069sJ6t$}|<h3`C#Z;>jV%3xrC+|3LGFK0f1BZJ#|
zaiV=5Qol{$u(kJFx1gE*NxQyY^X2E#bh?P_<2S}h<$tgR?Je>2$wZt4%p@M4OL`>@
zFzVWyE2V<_)$(MV@+Rh^TbWyt!#)-mI<u%ACSg*CBHoG6+3D#4*qLj!2N^opudNy+
zGmRIfkt(v-z~Jra*C4)4oux`PJ->}p@u|UaFtBey{68pPL3w3vbVa(A(-jU~DiAid
c`qtL}mJ>qBtobO$2mk;807*qoM6N<$f)W$$aR2}S

delta 251
zcmV<X00jT11d9TY7=Hu<0002(-QrRJ001peOjJc8V*o3603~VwEP4PaasVZ50LQ$p
zFoFOdUjQzB03&Ar9a;bxQ2-W701Y+(<%rp#0001)Nkl<Z2-jn{AYNW+X_V2!a3XMe
zaiWO=14G85z{!G!QGpChE0QclT$O?uTmyClx-C*lWC(L*V{}zu4GLyp5)Rni5aQ;}
zkZLJ)_O`Q#IfJ61LvD7ki8;eeF@-(1Rou)O%7qvfBrFO6G90=bT>@Bz845L$%qtxd
z6d0sBn8YhhySFiLWT{D-xN_fPIH4jqS*;`I834!wDX`517>xh`002ovPDHLkV1k9c
BSAPHi

diff --git a/mods/sprint/esprint.lua b/mods/sprint/esprint.lua
index 0c2c8ce0..fc1569cd 100755
--- a/mods/sprint/esprint.lua
+++ b/mods/sprint/esprint.lua
@@ -104,9 +104,9 @@ minetest.register_globalstep(function(dtime)
 			if gameTime > 0.4 then
 				local pos = player:getpos()
 				-- From playerplus :
-				-- am I near a cactus?
+				-- am I near a spiky cactus?
 				pos.y = pos.y + 0.1
-				if minetest.find_node_near(pos, 1, "default:cactus") and player:get_hp() > 0 then
+				if minetest.find_node_near(pos, 1, "default:cactus_spiky") and player:get_hp() > 0 then
 					player:set_hp(player:get_hp()-1)
 				end