From 729494e8afb5ef8bd417a1c1864ea31a9616f140 Mon Sep 17 00:00:00 2001 From: addi Date: Sun, 12 Jun 2016 11:20:51 +0200 Subject: [PATCH] Removed Straw. Aliased darkage:straw to farming:straw. Depends now on farming --- depends.txt | 4 +-- init.lua | 34 ++----------------- nodes.lua | 11 ++---- stairsplus.lua | 4 +-- textures/darkage_straw.png | Bin 852 -> 0 bytes textures32/darkage_reinforced_chalk.png | Bin 813 -> 0 bytes textures32/darkage_reinforced_wood.png | Bin 717 -> 0 bytes textures32/darkage_reinforced_wood_left.png | Bin 717 -> 0 bytes textures32/darkage_reinforced_wood_right.png | Bin 669 -> 0 bytes textures32/darkage_straw.png | Bin 2878 -> 0 bytes 10 files changed, 10 insertions(+), 43 deletions(-) delete mode 100644 textures/darkage_straw.png delete mode 100644 textures32/darkage_reinforced_chalk.png delete mode 100644 textures32/darkage_reinforced_wood.png delete mode 100644 textures32/darkage_reinforced_wood_left.png delete mode 100644 textures32/darkage_reinforced_wood_right.png delete mode 100644 textures32/darkage_straw.png diff --git a/depends.txt b/depends.txt index 0a3cc0b..0ac23d4 100644 --- a/depends.txt +++ b/depends.txt @@ -1,3 +1,3 @@ default -farming? -moreblocks? \ No newline at end of file +farming +moreblocks? diff --git a/init.lua b/init.lua index 6d26dc0..9fa897b 100644 --- a/init.lua +++ b/init.lua @@ -49,7 +49,7 @@ minetest.register_craft({ output = 'darkage:adobe 4', recipe = { {'default:sand','default:sand'}, - {'default:clay_lump','darkage:straw'}, + {'default:clay_lump','farming:straw'}, } }) @@ -143,40 +143,12 @@ minetest.register_craft({ } }) -minetest.register_craft({ - output = 'darkage:straw 2', - recipe = { - {'default:dry_shrub','default:dry_shrub'}, - {'default:dry_shrub','default:dry_shrub'}, - } -}) - -minetest.register_craft({ - output = 'darkage:straw 2', - recipe = { - {'darkage:dry_leaves','darkage:dry_leaves'}, - {'darkage:dry_leaves','darkage:dry_leaves'}, - } -}) - -if minetest.get_modpath("farming") then ---only if farming installed -minetest.register_craft({ - output = 'darkage:straw 4', - recipe = { - {'farming:wheat_harvested','farming:wheat_harvested'}, - {'farming:wheat_harvested','farming:wheat_harvested'}, - } -}) -else ---nothing else -end minetest.register_craft({ output = 'darkage:straw_bale', recipe = { - {'darkage:straw','darkage:straw'}, - {'darkage:straw','darkage:straw'}, + {'farming:straw','farming:straw'}, + {'farming:straw','farming:straw'}, } }) diff --git a/nodes.lua b/nodes.lua index 725713a..c0fc88e 100644 --- a/nodes.lua +++ b/nodes.lua @@ -198,13 +198,8 @@ minetest.register_node("darkage:slate_tile", { sounds = default.node_sound_stone_defaults() }) -minetest.register_node("darkage:straw", { - description = "Straw", - tiles = {"darkage_straw.png"}, - is_ground_content = true, - groups = {snappy=3, flammable=2}, - sounds = default.node_sound_leaves_defaults(), -}) +-- Removed straw, because its in minetst game. Registering alias for compatibility reasons +minetest.register_alias("darkage:straw", "farming:straw") minetest.register_node("darkage:stone_brick", { description = "Stone Brick", @@ -218,7 +213,7 @@ minetest.register_node("darkage:straw_bale", { description = "Straw Bale", tiles = {"darkage_straw_bale.png"}, is_ground_content = true, - drop = 'darkage:straw 4', + drop = 'farming:straw 4', groups = {snappy=2, flammable=2}, sounds = default.node_sound_leaves_defaults(), }) diff --git a/stairsplus.lua b/stairsplus.lua index 7eb268a..7d2b1ff 100644 --- a/stairsplus.lua +++ b/stairsplus.lua @@ -39,9 +39,9 @@ sounds = default.node_sound_stone_defaults(), }) --straw -stairsplus:register_all("darkage", "straw", "darkage:straw", { +stairsplus:register_all("darkage", "straw", "farming:straw", { description = "Straw", -tiles = {"darkage_straw.png"}, +tiles = {"farming_straw.png"}, groups = {snappy=3, flammable=2}, sounds = default.node_sound_leaves_defaults(), }) diff --git a/textures/darkage_straw.png b/textures/darkage_straw.png deleted file mode 100644 index 9817316a37bb59866e4b904a6cf0617d2b85a3b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 852 zcmV-a1FQUrP)Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RX3Jwk}5ko^xaR2}U=1D|BR5;58 z!P#ybRRDnD|C~8zRxjh&<4Ga7O%(~E3Kc52EQIawxDnicO)!?r!{d&!ERjk`wwr?U z&zJPWfYx|OB+6}Y1Dky1;R|^EQ$(KhDfShkFd$8A;%JEc?!-b?HizSo!1WmTE=R`- zSG%12(4*}}B)f+3RP*Xhz;+{<#EN7G+iin1#^CiFaHmXSShA8S7PXvKiV>z19q{9+9 zwr%t3M~w`JlD;o67?dM<^UF7cfkOC#Jnd*&@IA@>O~E+w2yD&qaYr<*$XJUvCXEekRziZH`YpF2A%qTy{jU!0|ONPeb-Q!})(L zMOKkK*_c|fTp8j+O`3w7J_9KlCL_h-I%oOV5RV0cXE7WG1ffN}Z_%RVaAuS31i}({ zp2v%0g?#t6Af5^=OHfxiN6%f}{ZmlZf~INs^=HlUu_4VG;zP}c_a)nVgAfAOH>kF1 z8H9??ve+zZd=Hums=T4e4F|CzOH;C)#MB1cS16rQl!hV$`IHJkQKWnJh0QiG6lufF zRYBf#RE>)pzEW>J@Ju7X)RclEz7Hfbm!7rmDm=PdCOvv;rB}FswC)@q=~|b94y^& ecbm}Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RX3KJC}1TZTmMF0Q-zez+vR5;5$ zlFw^hRS?HNXU@6jycd!t?Z&rKA$PAR+FP&@R1ie`L5d+Utq3J%QGYc>y6Ub=-C8Z! zKnc=S{|0|yEojkAwLVK|3_j6?3Gdx^-#Pc(?{B)&pb_$!_Nbd{s5laxI&S` z*`?RHd*=?ZiD)r6YZ(srF(Mo}av10A!SIV8ZPFirlz{6v)-Qick;A!_6a2Hgi`I%d z*38Zw#@CVIXw2eMk5lBZcIj(EjFf;J0u10X%h|14Et2I$`oI2$%^WB}L~;6s)h}GjqDROvk^Co3EA~TlML>yqOfdm+n zvG?B|u9LB`^%Ebz`2^=y76DpRTepa@!2s2y!cQu!0qIyEHG~k*Mx&Ib9F=@{^+z7W zYZtDOnnduPloCoQni%L<5UrtUB4s%ur3N1YqBE9`JxP(b*Uz6?;;)?@y4?=mdz1*) zb#5sp3#hEX@r^sPr`2@S$+gOv4S%Wqp3J?*r*1Y}v!hzbPM63g$uJJyw z_UTtGowt@5{JDc7p#X^yQW91dj#1?B&S&4?oF&GZs+!=O!#PK0Eo+w^ELkBn5F@CU zbJD#*E7nWruTs}FGt)EpYD@?LA3P$OnVD&VpO6{D^^2?A=)=Q3P_N9B_J+{^`@l6U rkOA?23NW34==Nv+tss90W~bqQyHg)wllqtN00000NkvXXu0mjfPy%)L diff --git a/textures32/darkage_reinforced_wood.png b/textures32/darkage_reinforced_wood.png deleted file mode 100644 index 87871291155bdb5e1697569d69eec4485cc7819b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 717 zcmV;;0y6!HP)Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RX3KJC~I@)JwEdT%lUr9tkR5;6R zlTS|*Q5400uQMImQVRxXM++pBSr9}F3+))C#hXX|Q z%s2xCcwC?~fN8*1&dQwtBCKMTi!gNmI+B3ycK3|)hdIS?&iPCN>;_bFi)3A8oxKV));JegZU z*PyjO%-quiatSC`N*o9K&`B~gyGZomAeWon7YfwK*Y4h9>)Q?`Km@=Xyrbdsxd2eI zN#ZH!z14%uEpu{et+cW71zm&VU>_%^28BX}#A*h)0SH}j)6o&I_U&v062#Xw85tWu zRn@xAHSF#d_^_HmR%FoH{rsv5<@Q{vUR+{fejNZ^gVFJ5-8v1Xi6VpSQY`Ol3fIsz z9wj~<1K{RRq%QY4o#kM^gi8TglHkYBB9*H7HOpQ+OQ35OVPSKB^!&K$c_}z8xaqZ>oDFe+x#B3M>&{ z+q5k{*e{UYNFfU#{XI|VOw_5}rTQ*t!t)rhmn%$7M)0(H5rD%mAQbf5kotV`RxC6wZ-bRyR00000NkvXXu0mjf?jbdo diff --git a/textures32/darkage_reinforced_wood_left.png b/textures32/darkage_reinforced_wood_left.png deleted file mode 100644 index 6a6243aaadfc4490ef0a8a5680f12a3380872487..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 717 zcmV;;0y6!HP)Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RX3KJD5EYw^z_5c6^Ur9tkR5;6Z zliy2IVHn3h@6Opz*O{Vj$EL!LD{N(97j0r)O;j=pgy^EnE&{>-p_?wd5`-?g>?)Xa z5hNJ|fowt=z~4|DTu>Q1MNGqL)41JBdzOeQphfLwkPfV~=Yb^2IX z$k+`osF2oSc4h*@G&!n@Q34>Qg%9QLKS&|#1xSv^NswV~ev#Rk2}0d%M_MQVnVVl^`qn5N?cV=R;`N=NQZ+CD5dv%UN)$!$0N~1JN$U{1 zG>FG5vtMgI$tg=VyqZa=R3)>VLv{mNkC(o_kbO&k8;~Krvc}YnVN_M+Un&+$yj#v8 zyJU#=2H9#E?`(1mSmN2!Rqos!BcdwD8n`VBmkbV%%l1B|g^6ilBC0|}Rk(J0nnV;H zJzQd=xO1rZ!+M@veiM%iWJ!W=Kgv|=<{y9p&_?1=cW3IxFagEYgjfMd0&y{b6&Z@) zY4aQc)vBXl0V+FHKCkM?k_?k08lhmIQILA|iQ&N(c!MgiM0#bdVezk@CDz~TNWDJp zb#(iw2`5|SUAD@*^mO@&s0tl^cOy=pKZB9~$cxusxg0-*;*)v1nnN~C(857Nq2r`m zH}3!}k5l%t-HcPd!v6~y%c ztlwqOH(H00000NkvXXu0mjfpI|g= diff --git a/textures32/darkage_reinforced_wood_right.png b/textures32/darkage_reinforced_wood_right.png deleted file mode 100644 index f4f28d02862a21a8d101d2d887b416818b366c7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 669 zcmV;O0%HA%P)Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RX3KJI;3GXjVAOHXYFG)l}R5;6h zlTA+(Q5c1vnYol{(+?AY7J(RtF)?CDSan#rfJ7F?1h@VucU|xUTp43bG?17OHwF*` zNP{ef7SXXop@nwZnMNGP#o&~W#*^I5y*Vf6J?Fks4uU>H+(>{Vfh>b`e&_!IBuJxaOHeLH+R1H|nd%+KdJuDK`@jE@d=*}&pTi8(_$q&}wwbz@3mx>p>sMTP$(HJ`=3xK7?uMv4-W;PN&I&#?jSVqJI=%YiN zx?xc9M2fQAB%Vm|_RV@^`|-1}A<^BZTQ`$Pz~`bx(X8^w(8%R7s45H( zfb?XXpwR;Ju&W*e`T+m@$Uw3WWF_3Q;|}Oq$Ryz}G+*pel0P9<00000NkvXXu0mjf DnEx!; diff --git a/textures32/darkage_straw.png b/textures32/darkage_straw.png deleted file mode 100644 index aa539c713d25eee99c430c891947bbb59f30d65d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2878 zcmV-E3&He>P)Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RX3KR@32rwnq=Kuf-&`Cr=R9M3$ z)5(*Z=Rv^X-@AT$f89MjJ^N^^k!;7pNh%3psiG(j6qo#oTsc!*;1CXEGsI57*s^RS zS<-CkS$qGM{@%w-Ld-uifu34=se(<9q>s5=jC4RU=u`bBh5724ut_6Sd z4_o+wPjGS6l+TqrpzW4Z7a~mV^dnJFPSd{+Vk;4cz@X- zh35aBXXJ%qwA17I?FJi$++MeQ^M`w?D#Tcc0M-ki>Aayg4rs~-&sc&qL^`P$jD5zt zF>#_PRvWTR&Ny0=>mjbB_+dF-%7I=||a~(K1`XI*oEys^STw^(VS<)Y; z?CeF14jgGerl|x`hcSyg==FX2TaqdRI*0KkUf^?l+6SXq zE*jFlrI%O&FCdORx*Dp+aq^+ZU^nL3Pg07a<<;{wvJ)I01dPXyas|dSNE?Gv7%7o{ z;1MQ*rVy05B#9M4Xz@bmZ~6TEuT%PcLtq7I&`_;66h+R%V!_sKh;s@l1gm+A6pH2T zio>HVwsygI1)Hj(>pJ2@^5|5sny#qpj=1OJMGk3j7^5gNhaU*Ec6b_;kfbT}QjHP< z&q#(llGUo9lQl`=7;QO*W1n7M^Y}DmIqg_4E3V!z`Q%xT{Ugi4Bai7cqw5?|Dk;jG z`NN!@eM7eq$kDOIk0o?)e5x4kh8&zI_D%$&Lyf~>6UX)Y7SDpCz_o&Gm9tnZIXLY| zQ$dhOw)YifxnXg)BuETzUp{bkR&zaBb8~w~+><;$O<2y?nigZArE2*gY~#9~zXfq?jW=fJuq_&cLE!iF_npPr&LksZx7U@96f@eSU7>p!R zOX5V(sTS*dOs5<2CHSf2_(b#BZ|<;>q*&JANuHiYC|$95@TeQf*I!roVM5zD&c0t# zJCJmOuRhNhA8DjA;A)VL`-_^^K~r|vxTTj^FoKB!(( zfkZKzWE`Dt(Y7_&+OfAEb8|JvgdvYU+~VDvjH~Z6~+j2P9@W20+ zla2%rH;%X$f`;tAVZ0ktmo>eugr;!_N>+29xEFJD81VLGPSY7~u2uxGW@~If*X)l6 zR7J+@0s6y;AnACxULnt4t{Dym%NaCHixiI8q@-;f+BB@@4XasAS9P4d$`M-QCn4FQ z!5Bea6igo~>Pm3@G~)hxLsct;)VzCf%kE*1D0CE+!Dz?Dt9#zPvV@`J{rMdE-SeE| zk2GKYCa0+dW!v)dyO#C3!f3F*#`ZYk{A@*4tT=yDV12`A zTk>$b!4dKH)rK%M)J=ouD;z#WwIa_d0?(2c1#)^*(seD%b%D`>#iZo!ro;w@m(M%$ z6)34GmNji7`TFxaqR3~{bSONsrK4;zuFqQ9y5{7QK223Ic~{d4`1LRE(I(*XtYDK_ z%Jqh(lPu?&V&jlO(sJ=`L+fgatmER{jN7{zQaR?cl8du7Rh{!N&G_us*Ic}PV0I(% zjpFib&0@9TyDyh0tGT&yRQZN5k~~aHwCmUuB}ys6)UdT5Grj8=Zu?BGCE2=0HZEs! zQRBys%kw$wqNXl7+P1^FhHt-~^TmI@C5a`@{ptJlWKP^mxV~NE`-6*88#6yko z3{|f20?j8s?X$QKXxf@2i3$CLr%(1s`jUVBr&sji03`#es^sxUDawUt6xp)C+Lkyp zDBIDwHTA~f8;g8&YVfQ_n;ZIxCGLfcMtz0@gEfldlLRA%NCbNa5vL#b$ybK)Zp8G? z;hf{~M+sUhHmzp=IN@$mvv-(~^enx!kLU!Woq*mr;`q^!G>I9GHAlzW$laqpRvBz$ z>F;bY>|3;U96Zqs1~JEv1GG^*+&9F-n5Ul@+PcGpiXifNxB(&I@y7;eh(~=cUKeyu zvY3G%DYUgL?p9Q*n!zZf+9(bVd`>}Po?vIMqjQp<{)NZ>fud=^h!Pg)i6YJJzG3fJq1u|0Cq8J&&Yt0BvO-3YAPy8sPa>s6dy-FovPZw?k@OX9 z11$n21-It~dDl=?6}>IZ z)=&~Bnn$M=8N?D{1V!1=wGGBM^tKgc

i&GLTpg4o*U<%26-p#Hq#xf~r{3b%Oqu zLK~<`fmRh#wJZzRIZ{-$U^s-laD+XDmK%b;;rnlEhT94$g+v+H-H!?T65|l?HZ#62hrhmtjq zp7we7x<)F4w6Q`_ww4rG_q_063$?av$a2)W(f6Vyi z4>>yris81;!O0ls1kQmr4YrryI*l}rXc%K6$=Pei)!Q0lp{X^=NV3ipejL+JHIo}i zh9UE%hDPD5l4M}Gy=swKLDW<1JW_;-qL(hmSP9K$7Qhbn0_^*%Bs-vgpX`n%sta1!e$@z;0WemfyVRjAjSN}Xi`QW7nClvXzLm5e&3W`llv)N!m zO_nue%ZjRO7;amleoIw$bgiUw&>zGg3~>*N+|b_-sqz-rMr3P=w1TYzpUFi@)zpmk z1=o`txv5}z(_plsSeN9PB%4<(XO8#p3d&7~5FREFETl>4M#_Uul{Gj;~x)L&I_a# zgx2HV|K*$?{pAzZv)A0+HC(@6;|DEzQ_aZchD^it*&SWA&E$MZN6Bhdaeq@14tzo_ zv8H5tCmC)lY#=y$RnqGVuFhr@ivSh)T;VA5oXb}^HZpV%OJ2NO;zdwaEuC~+y(ux? cJ)TVYe_!Y(K%mEBy#N3J07*qoM6N<$g30HOrT_o{