From f3199d3541454b53cdc484d512153c7fda40b1f6 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Sun, 30 Sep 2012 17:05:46 -0400 Subject: [PATCH] Added wooden privacy fence, white and unpainted picket fences, barbed wire fence, moved all fences to a separate file, minor code cleanups elsewhere. --- crafts.lua | 155 +++++++++++++--------- fences.lua | 100 ++++++++++++++ init.lua | 100 +------------- textures/homedecor_fence_barbed_wire.png | Bin 0 -> 512 bytes textures/homedecor_fence_picket.png | Bin 0 -> 1768 bytes textures/homedecor_fence_picket_white.png | Bin 0 -> 1035 bytes textures/homedecor_fence_privacy.png | Bin 0 -> 683 bytes 7 files changed, 194 insertions(+), 161 deletions(-) create mode 100644 fences.lua create mode 100644 textures/homedecor_fence_barbed_wire.png create mode 100644 textures/homedecor_fence_picket.png create mode 100644 textures/homedecor_fence_picket_white.png create mode 100644 textures/homedecor_fence_privacy.png diff --git a/crafts.lua b/crafts.lua index 918f799..c3a0927 100644 --- a/crafts.lua +++ b/crafts.lua @@ -266,28 +266,6 @@ minetest.register_craft( { -- -minetest.register_craftitem("homedecor:utility_table_legs", { - description = "Legs for Small Utility table", - inventory_image = "homedecor_utility_table_legs.png", -}) - -minetest.register_craft( { - output = 'homedecor:utility_table_legs', - recipe = { - { 'default:stick', 'default:stick', 'default:stick' }, - { 'default:stick', '', 'default:stick' }, - { 'default:stick', '', 'default:stick' }, - }, -}) - -minetest.register_craft({ - type = 'fuel', - recipe = 'homedecor:utility_table_legs', - burntime = 30, -}) - --- - minetest.register_craft( { output = 'homedecor:wood_table_small_round 15', recipe = { @@ -623,36 +601,6 @@ minetest.register_craft({ burntime = 30, }) --- Table legs and stuff - -minetest.register_craft( { - output = 'homedecor:table_legs_wrought_iron 3', - recipe = { - { '', 'default:iron_lump', '' }, - { '', 'default:iron_lump', '' }, - { 'default:iron_lump', 'default:iron_lump', 'default:iron_lump' }, - }, -}) - --- - -minetest.register_craft( { - output = 'homedecor:pole_wrought_iron 4', - recipe = { - { 'default:iron_lump', }, - { 'default:iron_lump', }, - { 'default:iron_lump', }, - }, -}) - -minetest.register_craft( { - output = 'homedecor:fence_wrought_iron 6', - recipe = { - { 'default:iron_lump','default:iron_lump','default:iron_lump' }, - { 'default:iron_lump','default:iron_lump','default:iron_lump' }, - }, -}) - -- minetest.register_craftitem("homedecor:drawer_small", { @@ -767,9 +715,6 @@ minetest.register_craft({ burntime = 30, }) --- ========================================================== --- Recipes that require materials from Calinou's Moreores mod - minetest.register_craftitem("homedecor:brass_ingot", { description = "Brass Ingot", inventory_image = "homedecor_brass_ingot.png", @@ -784,6 +729,16 @@ minetest.register_craft( { }, }) +-- Table legs + +minetest.register_craft( { + output = 'homedecor:table_legs_wrought_iron 3', + recipe = { + { '', 'default:iron_lump', '' }, + { '', 'default:iron_lump', '' }, + { 'default:iron_lump', 'default:iron_lump', 'default:iron_lump' }, + }, +}) minetest.register_craft( { output = 'homedecor:table_legs_brass 3', @@ -794,6 +749,28 @@ minetest.register_craft( { }, }) +minetest.register_craftitem("homedecor:utility_table_legs", { + description = "Legs for Small Utility table", + inventory_image = "homedecor_utility_table_legs.png", +}) + +minetest.register_craft( { + output = 'homedecor:utility_table_legs', + recipe = { + { 'default:stick', 'default:stick', 'default:stick' }, + { 'default:stick', '', 'default:stick' }, + { 'default:stick', '', 'default:stick' }, + }, +}) + +minetest.register_craft({ + type = 'fuel', + recipe = 'homedecor:utility_table_legs', + burntime = 30, +}) + +-- vertical poles/lampposts + minetest.register_craft( { output = 'homedecor:pole_brass 4', recipe = { @@ -804,15 +781,15 @@ minetest.register_craft( { }) minetest.register_craft( { - output = 'homedecor:fence_brass 6', - recipe = { - { 'homedecor:brass_ingot', 'homedecor:brass_ingot', 'homedecor:brass_ingot' }, - { 'homedecor:brass_ingot', 'homedecor:brass_ingot', 'homedecor:brass_ingot' }, - }, + output = 'homedecor:pole_wrought_iron 4', + recipe = { + { 'default:iron_lump', }, + { 'default:iron_lump', }, + { 'default:iron_lump', }, + }, }) --- ======================================================== --- Recipes that require materials from Jeija's Mesecons mod +-- Home electronics if ( minetest.get_modpath("mesecons") ) == nil then @@ -1117,3 +1094,57 @@ minetest.register_craft({ } }) +-- Fences + +minetest.register_craft( { + output = 'homedecor:fence_brass 6', + recipe = { + { 'homedecor:brass_ingot', 'homedecor:brass_ingot', 'homedecor:brass_ingot' }, + { 'homedecor:brass_ingot', 'homedecor:brass_ingot', 'homedecor:brass_ingot' }, + }, +}) + +minetest.register_craft( { + output = 'homedecor:fence_wrought_iron 6', + recipe = { + { 'default:iron_lump','default:iron_lump','default:iron_lump' }, + { 'default:iron_lump','default:iron_lump','default:iron_lump' }, + }, +}) + +minetest.register_craft( { + output = "homedecor:fence_picket 6", + recipe = { + { "default:stick", "default:stick", "default:stick" }, + { "default:stick", "", "default:stick" }, + { "default:stick", "default:stick", "default:stick" } + }, +}) + +minetest.register_craft( { + output = "homedecor:fence_picket_white 6", + recipe = { + { "default:stick", "default:stick", "default:stick" }, + { "default:stick", "unifieddyes:white_paint", "default:stick" }, + { "default:stick", "default:stick", "default:stick" } + }, +}) + +minetest.register_craft( { + output = "homedecor:fence_privacy 6", + recipe = { + { "default:wood", "default:stick", "default:wood" }, + { "default:wood", "", "default:wood" }, + { "default:wood", "default:stick", "default:wood" } + }, +}) + +minetest.register_craft( { + output = "homedecor:fence_barbed_wire 6", + recipe = { + { "default:stick", "default:iron_lump", "default:stick" }, + { "default:stick", "", "default:stick" }, + { "default:stick", "default:iron_lump", "default:stick" } + }, +}) + diff --git a/fences.lua b/fences.lua new file mode 100644 index 0000000..11726ad --- /dev/null +++ b/fences.lua @@ -0,0 +1,100 @@ +-- This file adds fences of various types + +minetest.register_node("homedecor:fence_brass", { + description = "Brass Fence/railing", + drawtype = "fencelike", + tiles = {"homedecor_tile_brass.png"}, + inventory_image = "homedecor_fence_brass.png", + wield_image = "homedecor_pole_brass.png", + paramtype = "light", + is_ground_content = true, + selection_box = { + type = "fixed", + fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, + }, + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), + walkable = true, +}) + +minetest.register_node("homedecor:fence_wrought_iron", { + description = "Wrought Iron Fence/railing", + drawtype = "fencelike", + tiles = {"homedecor_tile_wrought_iron.png"}, + inventory_image = "homedecor_fence_wrought_iron.png", + wield_image = "homedecor_pole_wrought_iron.png", + paramtype = "light", + is_ground_content = true, + selection_box = { + type = "fixed", + fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, + }, + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), + walkable = true, +}) + +minetest.register_node("homedecor:fence_picket", { + description = "Unpainted Picket Fence", + tiles = {"homedecor_fence_picket.png"}, + inventory_image = "homedecor_fence_picket.png", + wield_image = "homedecor_fence_picket.png", + paramtype = "light", + is_ground_content = true, + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), + walkable = true, + paramtype2 = 'wallmounted', + selection_box = { + type = "wallmounted", + }, +}) + +minetest.register_node("homedecor:fence_picket_white", { + description = "White Picket Fence", + tiles = {"homedecor_fence_picket_white.png"}, + inventory_image = "homedecor_fence_picket_white.png", + wield_image = "homedecor_fence_picket_white.png", + paramtype = "light", + is_ground_content = true, + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), + walkable = true, + paramtype2 = 'wallmounted', + selection_box = { + type = "wallmounted", + }, +}) + +minetest.register_node("homedecor:fence_privacy", { + description = "Wooden Privacy Fence", + tiles = {"homedecor_fence_privacy.png"}, + inventory_image = "homedecor_fence_privacy.png", + wield_image = "homedecor_fence_privacy.png", + paramtype = "light", + is_ground_content = true, + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), + walkable = true, + paramtype2 = 'wallmounted', + selection_box = { + type = "wallmounted", + }, +}) + +minetest.register_node("homedecor:fence_barbed_wire", { + description = "Barbed Wire Fence", + tiles = {"homedecor_fence_barbed_wire.png"}, + inventory_image = "homedecor_fence_barbed_wire.png", + wield_image = "homedecor_fence_barbed_wire.png", + paramtype = "light", + is_ground_content = true, + groups = {snappy=3}, + sounds = default.node_sound_wood_defaults(), + walkable = true, + paramtype2 = 'wallmounted', + selection_box = { + type = "wallmounted", + }, +}) + diff --git a/init.lua b/init.lua index c400c0b..7a8988f 100644 --- a/init.lua +++ b/init.lua @@ -11,6 +11,7 @@ -- License: LGPL -- +dofile(minetest.get_modpath("homedecor").."/fences.lua") dofile(minetest.get_modpath("homedecor").."/kitchen_cabinet.lua") dofile(minetest.get_modpath("homedecor").."/refrigerator.lua") dofile(minetest.get_modpath("homedecor").."/oven.lua") @@ -479,70 +480,6 @@ minetest.register_node('homedecor:folding_door_oak', { }, }) -minetest.register_node('homedecor:dresser_mahogany_left_side', { - description = "Mahogany Dresser (Left Half)", - tiles = { 'homedecor_dresser_mahogany_sides.png', - 'homedecor_dresser_mahogany_sides.png', - 'homedecor_dresser_mahogany_sides.png', - 'homedecor_dresser_mahogany_sides.png', - 'homedecor_dresser_mahogany_sides.png', - 'homedecor_dresser_mahogany_front_left.png'}, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - groups = { snappy = 3, not_in_creative_inventory=1 }, - sounds = default.node_sound_leaves_defaults(), -}) - -minetest.register_node('homedecor:dresser_mahogany_right_side', { - description = "Mahogany Dresser (Right Half)", - tiles = { 'homedecor_dresser_mahogany_sides.png', - 'homedecor_dresser_mahogany_sides.png', - 'homedecor_dresser_mahogany_sides.png', - 'homedecor_dresser_mahogany_sides.png', - 'homedecor_dresser_mahogany_sides.png', - 'homedecor_dresser_mahogany_front_right.png'}, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - groups = { snappy = 3, not_in_creative_inventory=1 }, - sounds = default.node_sound_leaves_defaults(), -}) - -minetest.register_node('homedecor:dresser_oak_left_side', { - description = "Oak Dresser (Left Half)", - tiles = { 'homedecor_dresser_oak_sides.png', - 'homedecor_dresser_oak_sides.png', - 'homedecor_dresser_oak_sides.png', - 'homedecor_dresser_oak_sides.png', - 'homedecor_dresser_oak_sides.png', - 'homedecor_dresser_oak_front_left.png'}, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - groups = { snappy = 3, not_in_creative_inventory=1 }, - sounds = default.node_sound_leaves_defaults(), -}) - -minetest.register_node('homedecor:dresser_oak_right_side', { - description = "Oak Dresser (Right Half)", - tiles = { 'homedecor_dresser_oak_sides.png', - 'homedecor_dresser_oak_sides.png', - 'homedecor_dresser_oak_sides.png', - 'homedecor_dresser_oak_sides.png', - 'homedecor_dresser_oak_sides.png', - 'homedecor_dresser_oak_front_right.png'}, - sunlight_propagates = false, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - groups = { snappy = 3, not_in_creative_inventory=1 }, - sounds = default.node_sound_leaves_defaults(), -}) - minetest.register_node('homedecor:shutter_black', { description = "Wooden Shutter (Black)", tiles = { 'homedecor_window_shutter_black.png' }, @@ -823,41 +760,6 @@ minetest.register_node("homedecor:pole_wrought_iron", { walkable = true, }) -minetest.register_node("homedecor:fence_brass", { - description = "Brass Fence/railing", - drawtype = "fencelike", - tiles = {"homedecor_tile_brass.png"}, - inventory_image = "homedecor_fence_brass.png", - wield_image = "homedecor_pole_brass.png", - paramtype = "light", - is_ground_content = true, - selection_box = { - type = "fixed", - fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, - }, - groups = {snappy=3}, - sounds = default.node_sound_wood_defaults(), - walkable = true, -}) - -minetest.register_node("homedecor:fence_wrought_iron", { - description = "Wrought Iron Fence/railing", - drawtype = "fencelike", - tiles = {"homedecor_tile_wrought_iron.png"}, - inventory_image = "homedecor_fence_wrought_iron.png", - wield_image = "homedecor_pole_wrought_iron.png", - paramtype = "light", - is_ground_content = true, - selection_box = { - type = "fixed", - fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, - }, - groups = {snappy=3}, - sounds = default.node_sound_wood_defaults(), - walkable = true, -}) - - minetest.register_node('homedecor:speaker', { description = "Large Stereo Speaker", tiles = { 'homedecor_speaker_top.png', diff --git a/textures/homedecor_fence_barbed_wire.png b/textures/homedecor_fence_barbed_wire.png new file mode 100644 index 0000000000000000000000000000000000000000..be1ff1b5eb6ee6ee387137522001e4d747f6517f GIT binary patch literal 512 zcmV+b0{{JqP)Nkl@7>%RY>+N@ESegkwM`nLmWCD)r-TGSnsmB@=Fmk+&{e@pCypLH z=WVEe;M`|uJ|}VW4f)Z1t-tI;JkKMO$xy4+ z1fbXJX*QchRVfyW0x%d1)NvfD)vA1Wey&emwvd~zZ}j)>4-cNci^t&dLPMiiQQ;Uy zu^AW#5W(z&0DA|DjuBK8>-&3xL;MDj03nz};*3zk*a5*I;uL{7a}0tLzd-~j*dRD@ z47~UOA*hDfQxtIuBSxc<&So>3&87fMr&CQN66EuF8IQ-hUazs%Qm@wqpm6z?#bSZ9 z+if+*;JPk_LP5ISuDY&^@B5U?Wf=?xnoK4sl}a+1Omw+ivfXaE{oX-QjXn0000P);Me)KS5el*)i|mmXAdw9lCxQGH z-+QLJtBOURd*&RR%WUS1TF*>%bydCZfrIPu>v!UVU)~8Wxt=`uaXh;Jqf6HxzkVk^ z_{HVxPv82a?Bou6afa0dc5IiqAYCk0JV@{SMZ zlzH@>C!?9$*A+L7Eb^RxaK!>cpwl34`uV zGehZYPOhN%*d0L_gYOL-%ndWg-C3&P7JEMb`orh)>36>$S59Xnz?w158EcK-{`E@% z`1J9sArXYduC2!X?I&Ldz&~$)FRoqL?D;aM!9V@aSbzMjNUCEq0oH_w;O!@0hyrYT zU>&AOaSz&J`#uHOwubeFiZB&HilVG@pc?cZ%##uU%eEi$wd1{xjw%8Ll!G}C)~Rh_ zX^yIprbMvLfh>uX=kXxBEc8`X2ES!#ju4bN9nFEF8Dxl5P6`q9ZfgMU&Woink2Nrk zCs`Oo!y-^o5`pG50};kqGp3|Cg7;A`7guv5ykfiImSE2-z-BY^%~x))Z9^!`>`15Q zJb@IhUdyBs3T)SS#6Kpnl&nv)`MymPiAlg6wK61Du?mGHDDww~j3`I^iOK7&VcK z;%;aX=4svGA>T3D*69a=lqDe|Xo85LxSM&i2GA@B1dm`U1?b17p%ik;MBklpK$+G` zzu?V{QZgd_*vw2Bkwn+c#u?ye(bp}{J^T`?DZU=HXD3*a!Oc>ujDm>?)kO`(3`VZ9QlDmJ8zT<}P9^tM*<@B=TfZkUahC`pbS^IQtcVzdK4 zu&)8z@omQ=Z1M;ozjN<9F(sk7Q>NhuhMpH5-n|vqZ(LpdfF{BN!>FzC@b0ZhxiBTD zJ3mlF>AsLs;dej188=?JzU!oE<-1XP=i%L3p-Ll_jE3+1z+TTU3Ppt0hb>zcBMdBJ z=LZ_oJn#L$;D?|!>j!>f=zpz#dlXy3&1}fy&6G6 z7=0`*)MmW-r?LL**3D=gwmUxUrsP|H{!9S={^;AW`T?Pt(Yx{HN6&{NBAl~kY*O0! zfxr&_#`Z7-quUUaM3BotoB7};9TU)d?6rTieL%EvN5~?3Kk#3P1Bhj126F2F0000< KMNUMnLSTXx(oSXo literal 0 HcmV?d00001 diff --git a/textures/homedecor_fence_picket_white.png b/textures/homedecor_fence_picket_white.png new file mode 100644 index 0000000000000000000000000000000000000000..5ffe0750ca9406203a0b95d9c7385f350f74d5b0 GIT binary patch literal 1035 zcmV+m1oZofP)nBVQiNW z=>Pvoq15=boqlw&Iy)=n5w=-uhB~oXe=Y1TTQ> z$>fu}B0|fuP}4LdBE{&}b^Yx%KLJNw*B#yw5rq)4cQ`MIK7>F`)6g_c)HDq-Gqr7- z?um$Ej0s{9q1V^f7b2o@9Cv0;j^hpF@Avx-$JTWvW+vwxwQc*t_z^bj;FW6B}m zhrw;z=<#@@sI22~2B_&2i3qW-ZwTT$;DceEB9znVbfU}ULe9CACjAbi6cK8gCZPp~ zQ=RJ?$I*S@dc9K9G)W2SSa(T#j`{%Jrak~-*>cgRs;bl_ZIxK#whZ;#bzSq4)O9K% zNtrD}up9)nXn|Pkx>8-&hb7!~U8bA0XO{J)rUU|62fgbibH0B=MD<(1v(do9aH-A_LPyx#lds76afXqu*sAEk*}vcsAvx?Pq=?KDjZ zg{+_d=@-mQ(=?@-VS9g!kwOUMoclZ4ZN#=$1A2^U?|m^kJxzg_y+be1DP!A!U_hrJ z#zF3VCC_am(m|Bw zfp*}j3Q)60`y2=Zqjq%b&mdSy7f7z1V@yBG))E3XN^4Y)VynZZGX7wU@B5wg z5~-uYvQbr4=A2%uvs@O|@~Wze#6>{N{Feh(DIQc+m70^?hL>fb)9Lh-qU-fqWWNqT z+2BM9-H@DfNjVUJ6X1azyIAku-rll}N|RT&@on2E+i3K*VmBK6+omJATrU45KaS(B zS2pNs+xEq2VjL|aF-B^dCd+@RIRQDl-s%6GblDRT{Q_A0FL`${ViN!W002ovPDHLk FV1fr2@b3Ts literal 0 HcmV?d00001 diff --git a/textures/homedecor_fence_privacy.png b/textures/homedecor_fence_privacy.png new file mode 100644 index 0000000000000000000000000000000000000000..ef5f235ec2ad66058e44dcf5d4d5d633b8626abe GIT binary patch literal 683 zcmV;c0#yBpP)N!h-+svLgOB;>!yCSM_FVq_`MZ4cZ|BKpCqDV~38k*ArSkUe8@~DJ5BdGaZ_^|B z^6SqzT1VII!dk#HxqEt>wHls6DJy6N;B+$1mkYms|5c_Z09q6kDBG!0OfeBqAOkDO z(RWTa8>l!xeUaFNa$m*m@q~#dYcms zOa)1yd!WUX)&|WdUrq5o^S1VYyYO&-CA!i*cG~a= z)>Wys01yHMT(3L(;i#%|bf@k6G^mCu7)m`|5HlhI_n1~kFap+f!PC+0R52BnWlr!+ z&S#@_C&O7y=??AsFbx7oSWFQNeRplF1^QzI6T#Cl6Gpq@B$QZQZz%*x!#|SM5hY`W>KqKM0H%cwsJ-y8sL0ygB8|!*vZ;oVARJnV0 zn*gIj<}_2$g<~YWCCl=-|HC1bjDd)-_koYO#-%D!1w~nELCHaeGrZA8q5`(etLo#5 zkW@90S+eSk)P{524|I&#_I-0+ynHQ@fX^;!Inx|Q2ISzy%hv*6nUo^n!GGg@R8?>g R9moIx002ovPDHLkV1h~IHU$6x literal 0 HcmV?d00001