From f81405dc031991bc36562fdbc50452ed52c9baaa Mon Sep 17 00:00:00 2001 From: Dorian Wouters Date: Tue, 22 Dec 2015 00:56:37 +0100 Subject: [PATCH] [christmas_craft] Use overrides, add more snow Override, don't redefine. Else, go die. --- mods/christmas_craft/depends.txt | 3 +- mods/christmas_craft/settings.lua | 151 ++++++------------ .../textures/christmas_grass_1.png | Bin 0 -> 186 bytes .../textures/christmas_grass_2.png | Bin 0 -> 214 bytes .../textures/christmas_grass_3.png | Bin 0 -> 264 bytes .../textures/christmas_grass_4.png | Bin 0 -> 383 bytes .../textures/christmas_grass_5.png | Bin 0 -> 460 bytes .../textures/christmas_youngtree16xa.png | Bin 0 -> 505 bytes .../textures/christmas_youngtree16xb.png | Bin 0 -> 398 bytes .../textures/grass_w_snow_side.png | Bin 817 -> 273 bytes 10 files changed, 48 insertions(+), 106 deletions(-) create mode 100755 mods/christmas_craft/textures/christmas_grass_1.png create mode 100755 mods/christmas_craft/textures/christmas_grass_2.png create mode 100755 mods/christmas_craft/textures/christmas_grass_3.png create mode 100755 mods/christmas_craft/textures/christmas_grass_4.png create mode 100755 mods/christmas_craft/textures/christmas_grass_5.png create mode 100755 mods/christmas_craft/textures/christmas_youngtree16xa.png create mode 100755 mods/christmas_craft/textures/christmas_youngtree16xb.png mode change 100755 => 100644 mods/christmas_craft/textures/grass_w_snow_side.png diff --git a/mods/christmas_craft/depends.txt b/mods/christmas_craft/depends.txt index 331d858c..04bb57b4 100755 --- a/mods/christmas_craft/depends.txt +++ b/mods/christmas_craft/depends.txt @@ -1 +1,2 @@ -default \ No newline at end of file +default +youngtrees? \ No newline at end of file diff --git a/mods/christmas_craft/settings.lua b/mods/christmas_craft/settings.lua index b20d8924..ab0a62f0 100755 --- a/mods/christmas_craft/settings.lua +++ b/mods/christmas_craft/settings.lua @@ -1,116 +1,57 @@ print (" ---- Overrider christmas_craft = true! ---- ") -minetest.after(0, function() -minetest.register_node(":default:dirt_with_grass", { - description = "Dirt with Grass", - tiles = {"snow.png", "default_dirt.png", "grass_w_snow_side.png"}, - is_ground_content = true, - groups = {crumbly=3,soil=1}, - drop = { - max_items = 3, items = { - {items = {'default:dirt'}, rarity = 0,}, - {items = {'christmas_craft:snowball'}, rarity = 0,}, - --{items = {'snow:snowball_entity'}, rarity = 2,}, - }}, - sounds = default.node_sound_dirt_defaults({ - footstep = {name="default_grass_footstep", gain=0.4}, - }), -}) +local dirttiles = {"snow.png", "default_dirt.png", {name = "default_dirt.png^grass_w_snow_side.png", tileable_vertical = false}} +local snowballdrop = {items = {'christmas_craft:snowball'}, rarity = 0} -minetest.register_node(":default:dirt_with_dry_grass", { - description = "Dirt with Dry Grass", - tiles = {"snow.png", "default_dirt.png", {name = "grass_w_snow_side.png", tileable_vertical = false}}, - groups = {crumbly = 3, soil = 1}, - drop = { - max_items = 3, items = { - {items = {'default:dirt'}, rarity = 0,}, - {items = {'christmas_craft:snowball'}, rarity = 0,}, - --{items = {'snow:snowball_entity'}, rarity = 2,}, - }}, - sounds = default.node_sound_dirt_defaults({ - footstep = {name = "default_grass_footstep", gain = 0.4}, - }), -}) - - --- remplace leaves (normal) -minetest.register_node(":default:leaves", { - description = "Leaves", - drawtype = "nodebox", - visual_scale = 1.3, - tiles = {"snow.png", "christmas_craft_leaves_top.png", "christmas_craft_leaves_side.png"}, - paramtype = "light", - walkable = false, - groups = {snappy=3, leafdecay=3, flammable=2, leaves=1}, - drop = { - max_items = 1, - items = { - { - -- player will get sapling with 1/40 chance - items = {'default:sapling'}, - rarity = 40, - }, - { - -- player will get leaves only if he get no saplings, - -- this is because max_items is 1 - items = {'default:leaves'}, +local add_drop = function (def) + if type(def.drop) == "table" then + if def.drop.max_items then + def.drop.max_items = def.drop.max_items + 1 + end + table.insert(def.drop.items, snowballdrop) + elseif type(def.drop) == "string" then + def.drop = { + items = { + {items = {def.drop}, rarity = 0}, + snowballdrop } } - }, - sounds = default.node_sound_leaves_defaults(), - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}, - }, - }, - selection_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}, - }, - }, -}) --- remplace jungleleaves -minetest.register_node(":default:jungleleaves", { - description = "Jungle Leaves", - drawtype = "nodebox", - visual_scale = 1.3, - tiles = {"snow.png", "christmas_craft_leaves_top.png", "christmas_craft_leaves_side.png"}, - paramtype = "light", - walkable = false, - groups = {snappy=3, leafdecay=3, flammable=2, leaves=1}, - drop = { - max_items = 1, - items = { - { - -- player will get sapling with 1/40 chance - items = {'moretrees:jungletree_sapling'}, - rarity = 40, - }, - { - -- player will get leaves only if he get no saplings, - -- this is because max_items is 1 - items = {'moretrees:jungletree_leaves_green'}, + else + def.drop = { + items = { + snowballdrop } } - }, - sounds = default.node_sound_leaves_defaults(), - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}, - }, - }, - selection_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}, - }, - }, -}) -end) + end +end + +local dirt_with_grass = minetest.registered_items["default:dirt_with_grass"] +minetest.override_item("default:dirt_with_grass", {tiles = dirttiles}) +add_drop(dirt_with_grass) + +local dirt_with_dry_grass = minetest.registered_items["default:dirt_with_dry_grass"] +minetest.override_item("default:dirt_with_dry_grass", {tiles = dirttiles}) +add_drop(dirt_with_dry_grass) + +local leavetiles = {"snow.png", "christmas_craft_leaves_top.png", "christmas_craft_leaves_side.png"} + +-- Replace leaves +minetest.override_item("default:leaves", {tiles = leavetiles}) + +-- Replace jungleleaves +minetest.override_item("default:jungleleaves", {tiles = leavetiles}) + +-- Replace grass +for i=1,5 do + minetest.override_item("default:grass_" .. i, {tiles = {"christmas_grass_"..i..".png"}}) +end + +-- Replace youngtrees +if minetest.registered_items["youngtrees:youngtree_top"] then + minetest.override_item("youngtrees:youngtree_top", {tiles = {"christmas_youngtree16xa.png"}}) + minetest.override_item("youngtrees:youngtree_middle", {tiles = {"christmas_youngtree16xb.png"}}) +end print (" ---- Overrider christmas_craft [OK] ---- ") diff --git a/mods/christmas_craft/textures/christmas_grass_1.png b/mods/christmas_craft/textures/christmas_grass_1.png new file mode 100755 index 0000000000000000000000000000000000000000..ceacf2d26af57bd9af22f1bb5e9c266fb25eaaa7 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(m=r&PZ!4!i{7`rihKtY7?|}h?~(IXh$#4=RmadKVtT}AbIPRP+#=tH z1r~qY*M{c*oGhJu=V-Nl!<@|wbBe31zW?A-gTe~DWM4fU12z| literal 0 HcmV?d00001 diff --git a/mods/christmas_craft/textures/christmas_grass_2.png b/mods/christmas_craft/textures/christmas_grass_2.png new file mode 100755 index 0000000000000000000000000000000000000000..f23abe297bb3454c5b78b0d39a9498f3bd912e7d GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(m=rqPZ!4!i{7_qH*z&Q2)JH!_E`LH$Nvpyw{813b%7XnlA=-AM3oy$ zx$iyWeQzg`m-lb>zW0xxe+>P9ul9%b$GMizi!YbP9(Y{paC;l$>s?KSG6!wWC*0ol z`Jn+%(YcQ?(^y?vcCGX0^u62=)HNl@=Q2x>*T(m|SFMuyzT7|1W$_vvpc@!GUHx3v IIVCg!09n9PB>(^b literal 0 HcmV?d00001 diff --git a/mods/christmas_craft/textures/christmas_grass_3.png b/mods/christmas_craft/textures/christmas_grass_3.png new file mode 100755 index 0000000000000000000000000000000000000000..1d610718c35ffd368434b66d708ed9861e6934dd GIT binary patch literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(m=sgo-U3d7QJu#c5^j52)OohcWwUhxUTu^7A~`Y6UxMHb#a_p!lA9L zrWsthy3z7GW53+r;MnUoucyaef4(_$mbAp|$GdZ*e{-@bv>a;-c*V45o%X6MhRY_5 z6P9T*q~+h=_db1L2g8F$D<4}h1&FXJnyk?A{(WTE1-1z)oD8-1nGJXjOR6YMKahJn zAhh_i4fBNOmiMYduI~9heWuc(O*%5i8684Hr=?0N9pZjfn*7A?L+EUvs~J39{an^L HB{Ts5@up#} literal 0 HcmV?d00001 diff --git a/mods/christmas_craft/textures/christmas_grass_4.png b/mods/christmas_craft/textures/christmas_grass_4.png new file mode 100755 index 0000000000000000000000000000000000000000..fe2f2fd2aaa37c899e85b36068c22bce3bc4801f GIT binary patch literal 383 zcmV-_0f7FAP)jVatJUgd^Ei&QZ7WM}t(DvDHs4^q zUME+rH2|m634o#~0JvN(gb-5iy{9Zo0P^egnhcic#u(nEluC7sk(3~WK+`nyMY9ZR zt%MM0+g6s}Fvg&@CdQa}RaLWrQi`G|&{|`R;e0+*RTbWQwAO65TL~eM=Q-0f0WeJy d-g~UI@&(JyuVkUm;m`m8002ovPDHLkV1gc{r@sII literal 0 HcmV?d00001 diff --git a/mods/christmas_craft/textures/christmas_grass_5.png b/mods/christmas_craft/textures/christmas_grass_5.png new file mode 100755 index 0000000000000000000000000000000000000000..3fd85b826515ec44664a19804469b2d7c47e2d4c GIT binary patch literal 460 zcmV;-0Wjkio91Fcd{s5rL8hh7SEB zr~Fsv8WLk7CJtogXZRQ5$dC$3LV5>=UfvUvH+pB%cAwpSRtx{D%CfZoWIP^^UyYL? zV{yFS@An_(DGh-0`Rp1+QP?SxZ-YM2$5Y0}!{K1Z16+SFjm^8=&H|iHCkv40`3K>! zdQH;+aJgI@O&{00005lFds3Q540`NFPdq(kh2y zn%YEA3kTX&6A1GMWXrbhT(~oFsYnsDXczPW5kW?@ZxgL22pq(uS6U=eAqL??sBVjT zgM~GAcaQtd@0@$NK!-&{#5pG-qK*VbD)w^DiE~b@X8MG3{9npQPu86G72s4&wRdxICB)D#P$>!n)(f5emVbyim?Cy*OhZ6mDMS_ zIZo*VeYRE5>fEke05BqJ<>bPtG}u3c=488vi~pn7eEv%6i_V}00235BN>`X zmHIyb8%t%W&)dZ9)eQh3ky@2yKak4m_L4d0ogI=WF-mNGpzQ&5IRRupkOQz5txAAO z`5g~9=j3*~AxV0S(dj_2V#p`WAASb vqz~tC_jnO^bQd?#dK;JbXVK)|JORK5k5(ZrD>VJ<00000NkvXXu0mjf8$r>~ literal 0 HcmV?d00001 diff --git a/mods/christmas_craft/textures/christmas_youngtree16xb.png b/mods/christmas_craft/textures/christmas_youngtree16xb.png new file mode 100755 index 0000000000000000000000000000000000000000..e2d494fa49e4bc7a3f7a117e1ccb40dbd98724ac GIT binary patch literal 398 zcmV;90df9`P)TQ?W_|K@^<5C?TY{Ljr~? zJeSy{I4$-gwzL!cf%Iwog?vB?TPutE13?HFhzJp`3Tad{U~CM#*Xvlwoym!J5uIvx z-tN44@9hF52wRdQMV?PNr%b^2fScj4o#%xREW4XID2lJ;;7T-Yipzi@BtIM1* zhTB{1bJul0H=SOPWzkA3j*4G+Qglyg=BJ?DT@v0Sn*3#qGn&CyL{^?t8$_p2W%NL1FS07XUDwP8;cZz`;hh s-())aLWC_zj>nr??LOvX^LbqV0MIp|YtpoQ0{{R307*qoM6N<$g4u$lfdBvi literal 0 HcmV?d00001 diff --git a/mods/christmas_craft/textures/grass_w_snow_side.png b/mods/christmas_craft/textures/grass_w_snow_side.png old mode 100755 new mode 100644 index c164a4cf38d15d9a1ab020c1977b39eca486e24d..51b3d65178a61413a78c432a3ac99ffe7c3fc41a GIT binary patch delta 164 zcmV;V09*gD29W}gBMAUnP)t-s0001!!2wr)#tntC00001bW%=J06^y0W&i*HWl2Oq zR2Uh}!Ak;zAPfb-XFn7O3IP)dmiu3`D>t5?GiW!U(6w@6F4Aq#316}_RpHPNX-x3R z)Xe$0YJHTrV+%vSEU&cJJjb?zpC7Akk?bg*Iw~km1OO&)iVJ02CV+|m@dGgw2VEu) ScQD5Q0000U_>`zJ1t>7Enz+_Vm>TlNk3#jE@VSA zWkNA!LosDVIA=sLX+<+@MKfzmK5RxbZbvk3PCsr^MQ=|)Z+}una7{dMNi}jyICNJ^ zbY4?+Pds%`J#|q&by-VwUQ~8oRd-iLcV1L^TuymlReE7ndss+(RzZAOM|@gHeOpO= zV^)4-T7P9*fmua@V^o4j%QDhWJ-{8WRP@Zk!4GgYg3bYZj^j*m3(lOeQ}n7 zc$R~DmvLE`Z&a9bT$poRn0|7Zcx0M}dzyxPn|WlLfOMULbe?rupmtiId}*MHf1!+k zqLYcFcU+~9gQj|1r;&xIlZB~(VXBUPs*#1Qi*&J-gCVk;jk2JWvyphSp_R0ojkKbb zxS4~yqmsRwfy1kr#iovtELVS+P~R~C008|-L_t(|0bIdL7Q!G50Ki;X58zW*^@BiY zA)$!``alvFXq1-pNF`Ub|-WT#d7 z#m0N)FqoRVHn+RmMMi`;*y|b@TQF3&n$_3mYZy8?t7WB2>SQrkr}(7WTAJ_*im1z} zDka%47#MI%>ua)l1cgQO=