From 16fd682ebb3f2b2190d360cd76e6df6fdd420c23 Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Wed, 1 Apr 2015 21:42:29 +0200 Subject: [PATCH] Modified doors, vines, homedecor, etc... - Added doors:trapdoor_cherry and its craft recipe - Removed useless door textures (not following naming convention, so not used in code since the last mff_game update) - Added missing homedecor_models - Re-added vines:shears needed for vines' roots --- minetestforfun_game/mods/doors/init.lua | 26 +- .../mods/doors/textures/door_brown.png | Bin 127 -> 0 bytes .../mods/doors/textures/door_glass.png | Bin 128 -> 0 bytes .../mods/doors/textures/door_glass_a.png | Bin 204 -> 0 bytes .../mods/doors/textures/door_glass_b.png | Bin 204 -> 0 bytes .../mods/doors/textures/door_glass_side.png | Bin 82 -> 0 bytes .../mods/doors/textures/door_grey.png | Bin 115 -> 0 bytes .../doors/textures/door_obsidian_glass.png | Bin 130 -> 0 bytes .../doors/textures/door_obsidian_glass_a.png | Bin 217 -> 0 bytes .../doors/textures/door_obsidian_glass_b.png | Bin 217 -> 0 bytes .../textures/door_obsidian_glass_side.png | Bin 88 -> 0 bytes .../mods/doors/textures/door_steel.png | Bin 132 -> 0 bytes .../mods/doors/textures/door_steel_a.png | Bin 449 -> 0 bytes .../mods/doors/textures/door_steel_b.png | Bin 461 -> 0 bytes .../mods/doors/textures/door_trapdoor.png | Bin 350 -> 0 bytes .../doors/textures/door_trapdoor_side.png | Bin 173 -> 0 bytes .../mods/doors/textures/door_wood.png | Bin 130 -> 0 bytes .../mods/doors/textures/door_wood_a.png | Bin 555 -> 0 bytes .../mods/doors/textures/door_wood_b.png | Bin 539 -> 0 bytes ...r_cherry.png => doors_trapdoor_cherry.png} | Bin ..._wood_cherry.png => doors_wood_cherry.png} | Bin ...d_cherry_a.png => doors_wood_cherry_a.png} | Bin ...d_cherry_b.png => doors_wood_cherry_b.png} | Bin .../homedecor/models/forniture_chains.obj | 930 +++ .../homedecor/models/homedecor_barbecue.obj | 362 + .../models/homedecor_bathroom_set.obj | 898 +++ .../models/homedecor_bed_extended.obj | 340 + .../models/homedecor_bed_regular.obj | 330 + .../models/homedecor_bedroom_wardrobe.obj | 168 + .../models/homedecor_ceiling_lantern.obj | 515 ++ .../homedecor/models/homedecor_desk.obj | 285 + .../homedecor/models/homedecor_doghouse.obj | 325 + .../models/homedecor_kitchen_faucet.obj | 572 ++ .../homedecor/models/homedecor_piano.obj | 333 + .../homedecor/models/homedecor_pool_table.obj | 5895 +++++++++++++++++ .../models/homedecor_refrigerator.obj | 464 ++ .../models/homedecor_shower_head.obj | 388 ++ .../homedecor/models/homedecor_skateboard.obj | 425 ++ .../models/homedecor_speaker_large.obj | 58 + .../models/homedecor_speaker_large_open.obj | 475 ++ .../models/homedecor_speaker_small.obj | 62 + .../models/homedecor_tool_cabinet.obj | 1589 +++++ .../models/homedecor_trash_can_green.obj | 662 ++ .../models/homedecor_trash_can_green_open.obj | 275 + .../homedecor/models/homedecor_well.obj | 1949 ++++++ .../models/homedecor_windowblind_thick.obj | 426 ++ .../models/homedecor_windowblind_thin.obj | 428 ++ mods/plantlife_modpack/vines/init.lua | 2 +- mods/plantlife_modpack/vines/shear.lua | 4 +- 49 files changed, 18180 insertions(+), 6 deletions(-) delete mode 100644 minetestforfun_game/mods/doors/textures/door_brown.png delete mode 100644 minetestforfun_game/mods/doors/textures/door_glass.png delete mode 100644 minetestforfun_game/mods/doors/textures/door_glass_a.png delete mode 100644 minetestforfun_game/mods/doors/textures/door_glass_b.png delete mode 100644 minetestforfun_game/mods/doors/textures/door_glass_side.png delete mode 100644 minetestforfun_game/mods/doors/textures/door_grey.png delete mode 100644 minetestforfun_game/mods/doors/textures/door_obsidian_glass.png delete mode 100644 minetestforfun_game/mods/doors/textures/door_obsidian_glass_a.png delete mode 100644 minetestforfun_game/mods/doors/textures/door_obsidian_glass_b.png delete mode 100644 minetestforfun_game/mods/doors/textures/door_obsidian_glass_side.png delete mode 100644 minetestforfun_game/mods/doors/textures/door_steel.png delete mode 100644 minetestforfun_game/mods/doors/textures/door_steel_a.png delete mode 100644 minetestforfun_game/mods/doors/textures/door_steel_b.png delete mode 100644 minetestforfun_game/mods/doors/textures/door_trapdoor.png delete mode 100644 minetestforfun_game/mods/doors/textures/door_trapdoor_side.png delete mode 100644 minetestforfun_game/mods/doors/textures/door_wood.png delete mode 100644 minetestforfun_game/mods/doors/textures/door_wood_a.png delete mode 100644 minetestforfun_game/mods/doors/textures/door_wood_b.png rename minetestforfun_game/mods/doors/textures/{door_trapdoor_cherry.png => doors_trapdoor_cherry.png} (100%) rename minetestforfun_game/mods/doors/textures/{door_wood_cherry.png => doors_wood_cherry.png} (100%) rename minetestforfun_game/mods/doors/textures/{door_wood_cherry_a.png => doors_wood_cherry_a.png} (100%) rename minetestforfun_game/mods/doors/textures/{door_wood_cherry_b.png => doors_wood_cherry_b.png} (100%) create mode 100644 mods/homedecor_modpack/homedecor/models/forniture_chains.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_barbecue.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_bathroom_set.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_bed_extended.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_bed_regular.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_bedroom_wardrobe.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_ceiling_lantern.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_desk.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_doghouse.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_kitchen_faucet.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_piano.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_pool_table.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_refrigerator.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_shower_head.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_skateboard.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_speaker_large.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_speaker_large_open.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_speaker_small.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_tool_cabinet.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_trash_can_green.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_trash_can_green_open.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_well.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_windowblind_thick.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_windowblind_thin.obj diff --git a/minetestforfun_game/mods/doors/init.lua b/minetestforfun_game/mods/doors/init.lua index 384f37a1..41b4d017 100644 --- a/minetestforfun_game/mods/doors/init.lua +++ b/minetestforfun_game/mods/doors/init.lua @@ -354,10 +354,10 @@ minetest.register_craft({ doors.register_door("doors:door_cherry", { description = "Cherry Door", - inventory_image = "door_wood_cherry.png", + inventory_image = "doors_wood_cherry.png", groups = {choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1}, - tiles_bottom = {"door_wood_cherry_b.png", "default_wood_cherry_planks.png"}, - tiles_top = {"door_wood_cherry_a.png", "default_wood_cherry_planks.png"}, + tiles_bottom = {"doors_wood_cherry_b.png", "default_wood_cherry_planks.png"}, + tiles_top = {"doors_wood_cherry_a.png", "default_wood_cherry_planks.png"}, sounds = default.node_sound_wood_defaults(), sunlight = false, }) @@ -446,3 +446,23 @@ minetest.register_craft({ {'', '', ''}, } }) + +doors.register_trapdoor("doors:trapdoor_cherry", { + description = "Cherry tree trapdoor", + inventory_image = "doors_trapdoor_cherry.png", + wields_images = "doors_trapdoor_cherry.png", + tile_front = "doors_trapdoor_cherry.png", + tile_side = "default_wood_cherry_planks.png", + groups = {snappy=1, choppy=2, oddly_breakable_by_hand=2, flammable=2, door=1}, + sounds = default.node_sound_wood_defaults(), + sound_open = "doors_door_open", + sound_close = "doors_door_close" +}) + +minetest.register_craft({ + output = 'doors:trapdoor_cherry 2', + recipe = { + {'default:cherry_plank', 'default:cherry_plank', 'default:cherry_plank'}, + {'default:cherry_plank', 'default:cherry_plank', 'default:cherry_plank'}, + } +}) diff --git a/minetestforfun_game/mods/doors/textures/door_brown.png b/minetestforfun_game/mods/doors/textures/door_brown.png deleted file mode 100644 index 77f748d8543c5f0da92f09e277d449a6507f2bb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{F!3HF+&llYeq})7R978x}`kp+<+n^xedhmSo z0g3Dlg4G-TTlsJV9@dMS`}&2=x06@%Hj23Dx;hB0wO5K3N>jVzT;a2E?brQ>m#>ig c*mr^5u|aI<9C5>4Koc1}UHx3vIVCg!06s`7YybcN diff --git a/minetestforfun_game/mods/doors/textures/door_glass.png b/minetestforfun_game/mods/doors/textures/door_glass.png deleted file mode 100644 index 49ec245c1672b6c51664c1f4d7327e501d71fa59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|uK)l4KXBmj!-pT!XL5%C z1sO|%{DK)Ap4~_Ta#THC978ywlM{G&Qxg(coY>sd1P)%{P!SPnWMOyWad{BV9?Zlr X=`r&rp9bSVpaup{S3j3^P6K-u^I-tP8aPYB2 z?f&iCpUyFMV<|Ha6MeULZpSQsmsHV+a`z~Q2i#HX`09BJ%(M diff --git a/minetestforfun_game/mods/doors/textures/door_obsidian_glass_a.png b/minetestforfun_game/mods/doors/textures/door_obsidian_glass_a.png deleted file mode 100644 index ef5f8b5a3bf8930baf3e599340507bc305a1bacb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!bbwEYE0C6wQIb*8kykTRvWeBP z@YS;o6A%ypa=TpWXtiZ!;drtD_fBm@5 zt*c(`T@Z7?=$3Q&`vtu}6V`7vh&j~E^W4JeQv9v8-)3$+99G@%D@nL;@#KSVR%#vK z+?(v_w(P`9K?a}Ij4>0s*RFkY=67c(>vV?KH^2P-D{uXn#a7OyuNY*rr>mdKI;Vst E002r!v;Y7A diff --git a/minetestforfun_game/mods/doors/textures/door_obsidian_glass_b.png b/minetestforfun_game/mods/doors/textures/door_obsidian_glass_b.png deleted file mode 100644 index ef5f8b5a3bf8930baf3e599340507bc305a1bacb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!bbwEYE0C6wQIb*8kykTRvWeBP z@YS;o6A%ypa=TpWXtiZ!;drtD_fBm@5 zt*c(`T@Z7?=$3Q&`vtu}6V`7vh&j~E^W4JeQv9v8-)3$+99G@%D@nL;@#KSVR%#vK z+?(v_w(P`9K?a}Ij4>0s*RFkY=67c(>vV?KH^2P-D{uXn#a7OyuNY*rr>mdKI;Vst E002r!v;Y7A diff --git a/minetestforfun_game/mods/doors/textures/door_obsidian_glass_side.png b/minetestforfun_game/mods/doors/textures/door_obsidian_glass_side.png deleted file mode 100644 index 0df598b8bb57c1cb7fa82f8652a5b55257fdbb87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 88 zcmeAS@N?(olHy`uVBq!ia0vp^j3CSbBp9sfW`_bP&H|6fVg?3oVGw3ym^DWND9GjM f;uyjqn=Ali3o!^P8HU{gvKTyF{an^LB{Ts5BtH%W diff --git a/minetestforfun_game/mods/doors/textures/door_steel.png b/minetestforfun_game/mods/doors/textures/door_steel.png deleted file mode 100644 index 042a1bc061e862a24b0a2caae6370a4f746a1eb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 132 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-u0Xo0t83AsMMsYwjow-N z8pvlX3GxeOaCmkj4aiaRba4#fh)z!U@&A5fJ3`L(^H78(65=}0G2vKBth0FH; z_P1rdUPmbf02zKc|G?dGcSHnt2Lx52T1p93B?F8`BUBXt6%b9hJ6+ce;X+EUQfi5l$>bvH?d>%_KYuZuPA~lX{cBh$ zEEWsY%z8u*zFP!W$bGC45u8pZR8@(%PW~!#{pJxAbC$~`>h68N{JY34OM@b927Pb) zsE8uc(5t_G2&gI|(yLGdkH=%99Rwlczpbc)twk_pp?Sh_^w@EEg~Y6QYfVi3`BT-dBMy$ rpUcD63i_6)AJ8~JWC+=Vi@XPj)Y;y7p0Usod*U?441VMm`%jM#ShXZNr9$r1xZvh@h%CpU=bsXswM)43XFiz(gdiH6jiS_I>C5{heM_ z*yh*u3P8?Rwy}*QB7(S&1|Cl*B+*yqjNs|%2bm4qlPXA_dn237GF z3GxUY4EUBk2rOd_)~z*q=2y_Z711Cwh8pvHAc7?bkj-AgHYtsTG0_GS=`Iihg3J*p z0nl==Iy6}JIF@)O0s@f1u0vP?GLwk-Vz6>$4!<=6f>Dy^yVjDNHdhrLpsI#llSO8Z zGYcY+b%19iFqmW}$&q#W?4umXlth&~tVOzU40c6QxG|cK~CzyPU<1f>d~(1 zv0mBWSV!q?zQQp5m>R;-{77sgdrjmEoh6;j5k-s*@XPP#9%W6s%Poq+J%S zSrx5an_^X$pkJS8RG(_ym}S+RW7U#w)|zI}mS)hNW!;%!)Rkk^U1;4~VAY>(Ix*K` zVu|(SGV3Yjc2g@IrdK=8tZ>W?oU0CW6=O+|UoeBivm0qZPLrpLV@SoV*t70phYSRm z1CqVk?insS%9Fr&@cVwb!#W+pxl6vA8?6+b>@;nY3S+kVHvc6{FPI*iBYS>n-$Qoi z$nPC%uY@jCetjfQVQY9q*!)+Fc6;K_&t_ueVL#Fl;vAyD8lAID``*{CqdBtwwm%4b r{OwW2ojt5k+uyvpZNqi%H_yJ{NQnoVMa;N?u3_+W^>bP0l+XkKoc(_J diff --git a/minetestforfun_game/mods/doors/textures/door_trapdoor_side.png b/minetestforfun_game/mods/doors/textures/door_trapdoor_side.png deleted file mode 100644 index c86052305afb5e36c2f9376c32e88a17d4c3fee2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!P=HT}YqYy&g11gbruoETmrdP4 z|NsA2-ftxdlnwKAaSW+o^gYAKbwojg`C?(+yZUFQ8M|v0RJsy#FC0FZchf^>lW%6% zF`3{Ov%K9CWo=F;|9=s)N0t3&(96x?##`+SZqI6;b8?Tt)N0E~mXj0>*VsqZ`J85I U{P6RE9?%8`Pgg&ebxsLQ0G<9l@&Et; diff --git a/minetestforfun_game/mods/doors/textures/door_wood.png b/minetestforfun_game/mods/doors/textures/door_wood.png deleted file mode 100644 index d3a62ab156db2d81442bcef039fed5148d09e9bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-u0YyCl{4Hyt~5}p(1ZCf zkk42W92x@ddmp33~S^MudPDAqs+mZzlvFKqUAKMv`nKghUA>?l<2| zw};)ViJO9fp{A$0r;3r+&mKA=2#yM*7*SP300#%$!Q80La0AD2rU$X_jsENq5h18h zLO@lR-Jgj#ZjSkM;b89kJpMz>2|Ne~zY9T?pgkfo?*IaGF`w_3Zwy#UN=z{#Igq2W zxwSv7p5figRo~km^Xbd(CH}+uW3OjN9CHh8W;ilezldgzwME_lcjx5fgjmfHXFlph zxP!Yb@TF8r*K==lN*pa^%p*C+g~FVK6m@|YnK}`J5Z#Ozlo*tcuby~oPP2bq1$e){ zI`_~4w`trV1Y)TTDV4r9wtwtU+ca+g6+r~PZ}0p+19xr?Xw8USY0y==()j%Catd$O zR(w3(V{>bKiGTZI#mng-&77E%;-*)=btwmO3Jd&j5Q#N08fIcn0VR=BTPO@OZ~jLL z3PHe)C@6h3N`FOMeWTPx;Yq2Ku3`r9Y*J`lPw9I$oPtbVmdMJS5yT{%6SQ7`V$eC zKprvgfJbmFC#)DO0$;u_Bvq1vh!9&EWD|2qAHdVcJ9b&IY=)FXG3EL7fs_;#S+jwt zprVLup+NUf=%;U#+_2$JAP~WD#{+a#5D{o7sFPF(5eV?@O$F;7NU%y3BEX3YD0hbt z+yxPE4p;chjt0f`eg=I z6_P61jFb{q`#@@^^+9b;>x0(EgryVS-)1@J?u_BsQU@%Zr4H_E$0H_4-8}yjVYT6b zm8^tM`6bT@6cJSA;wmybGt~&}4C|SzL%~W;D4CK6`(p50zazH#=UfUh86|}zd|r;2 zptSDP=G@o*FZ&h3a3?$_XgYQ2+}+(_r~ArS8nrcsJwxOHoX6TWWbT4HAt1F;Yv;w) z3CmeYU3qzYgw)%Wyg~#%oIV^?K^4-rj>2SSiXC=^Phb0G`-ZRE$DFzmfkdDRIVS|U d{5|Y5zW}tk6I6%lLR$a;002ovPDHLkV1i<+=