From 05e7b9f8e35d637be3b6651214760f4ca5f91c3a Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Mon, 1 Oct 2012 19:22:54 -0400 Subject: [PATCH] Changed nodename of yellow lighting to clearly specify that (recipes are still the same). Added white lighting. --- crafts.lua | 47 ++++- init.lua | 94 +--------- lighting.lua | 174 ++++++++++++++++++ .../homedecor_glowlight_cube_white_sides.png | Bin 0 -> 233 bytes .../homedecor_glowlight_cube_white_tb.png | Bin 0 -> 239 bytes ...homedecor_glowlight_cube_yellow_sides.png} | Bin ...=> homedecor_glowlight_cube_yellow_tb.png} | Bin .../homedecor_glowlight_thick_white_sides.png | Bin 0 -> 218 bytes ...omedecor_glowlight_thick_yellow_sides.png} | Bin .../homedecor_glowlight_thin_white_sides.png | Bin 0 -> 186 bytes ...homedecor_glowlight_thin_yellow_sides.png} | Bin textures/homedecor_glowlight_white_tb.png | Bin 0 -> 281 bytes ....png => homedecor_glowlight_yellow_tb.png} | Bin 13 files changed, 225 insertions(+), 90 deletions(-) create mode 100644 lighting.lua create mode 100644 textures/homedecor_glowlight_cube_white_sides.png create mode 100644 textures/homedecor_glowlight_cube_white_tb.png rename textures/{homedecor_glowlight_cube_sides.png => homedecor_glowlight_cube_yellow_sides.png} (100%) rename textures/{homedecor_glowlight_cube_tb.png => homedecor_glowlight_cube_yellow_tb.png} (100%) create mode 100644 textures/homedecor_glowlight_thick_white_sides.png rename textures/{homedecor_glowlight_thick_sides.png => homedecor_glowlight_thick_yellow_sides.png} (100%) create mode 100644 textures/homedecor_glowlight_thin_white_sides.png rename textures/{homedecor_glowlight_thin_sides.png => homedecor_glowlight_thin_yellow_sides.png} (100%) create mode 100644 textures/homedecor_glowlight_white_tb.png rename textures/{homedecor_glowlight_tb.png => homedecor_glowlight_yellow_tb.png} (100%) diff --git a/crafts.lua b/crafts.lua index 027dff81..e1770de5 100644 --- a/crafts.lua +++ b/crafts.lua @@ -1072,29 +1072,66 @@ minetest.register_craft({ -- Lighting +-- yellow + minetest.register_craft({ - output = "homedecor:glowlight_thick 6", + output = "homedecor:glowlight_thick_yellow 6", recipe = { {"moreblocks:superglowglass", "moreblocks:superglowglass", "moreblocks:superglowglass", }, } }) minetest.register_craft({ - output = "homedecor:glowlight_thin 6", + output = "homedecor:glowlight_thin_yellow 6", recipe = { - {"homedecor:glowlight_thick", "homedecor:glowlight_thick", "homedecor:glowlight_thick", }, + {"homedecor:glowlight_thick_yellow", "homedecor:glowlight_thick_yellow", "homedecor:glowlight_thick_yellow", }, } }) minetest.register_craft({ - output = "homedecor:glowlight_small_cube 8", + output = "homedecor:glowlight_small_cube_yellow 8", recipe = { {"default:stick" }, {"moreblocks:superglowglass" }, } }) --- Fences +-- white + +minetest.register_craft({ + output = "homedecor:glowlight_thick_white 6", + recipe = { + { "wool:white", "wool:white", "wool:white" }, + {"moreblocks:superglowglass", "moreblocks:superglowglass", "moreblocks:superglowglass", }, + } +}) + +minetest.register_craft({ + type = "shapeless", + output = "homedecor:glowlight_thick_white 2", + recipe = { + "wool:white", + "homedecor:glowlight_thick_yellow", + "homedecor:glowlight_thick_yellow", + } +}) + +minetest.register_craft({ + output = "homedecor:glowlight_thin_white 6", + recipe = { + {"homedecor:glowlight_thick_white", "homedecor:glowlight_thick_white", "homedecor:glowlight_thick_white", }, + } +}) + +minetest.register_craft({ + output = "homedecor:glowlight_small_cube_white 8", + recipe = { + {"wool:white" }, + {"moreblocks:superglowglass" }, + } +}) + +-- Fences and gates minetest.register_craft( { output = 'homedecor:fence_brass 6', diff --git a/init.lua b/init.lua index 7a8988f2..a78e9e39 100644 --- a/init.lua +++ b/init.lua @@ -11,6 +11,7 @@ -- License: LGPL -- +dofile(minetest.get_modpath("homedecor").."/lighting.lua") dofile(minetest.get_modpath("homedecor").."/fences.lua") dofile(minetest.get_modpath("homedecor").."/kitchen_cabinet.lua") dofile(minetest.get_modpath("homedecor").."/refrigerator.lua") @@ -779,12 +780,14 @@ minetest.register_node('homedecor:speaker', { minetest.register_node('homedecor:speaker_small', { description = "Small Surround Speaker", drawtype = "nodebox", - tiles = { 'homedecor_speaker_top.png', - 'homedecor_speaker_bottom.png', - 'homedecor_speaker_right.png', - 'homedecor_speaker_left.png', - 'homedecor_speaker_back.png', - 'homedecor_speaker_front.png'}, + tiles = { + 'homedecor_speaker_top.png', + 'homedecor_speaker_bottom.png', + 'homedecor_speaker_right.png', + 'homedecor_speaker_left.png', + 'homedecor_speaker_back.png', + 'homedecor_speaker_front.png' + }, selection_box = { type = "fixed", fixed = { -0.2, -0.5, 0, 0.2, 0, 0.4 } @@ -802,85 +805,6 @@ minetest.register_node('homedecor:speaker_small', { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node('homedecor:glowlight_thick', { - description = "Glowlight (thick)", - drawtype = "nodebox", - tiles = { 'homedecor_glowlight_tb.png', - 'homedecor_glowlight_tb.png', - 'homedecor_glowlight_thick_sides.png', - 'homedecor_glowlight_thick_sides.png', - 'homedecor_glowlight_thick_sides.png', - 'homedecor_glowlight_thick_sides.png'}, - selection_box = { - type = "fixed", - fixed = { -0.5, 0, -0.5, 0.5, 0.5, 0.5 } - }, - node_box = { - type = "fixed", - fixed = { -0.5, 0, -0.5, 0.5, 0.5, 0.5 } - }, - - sunlight_propagates = false, - paramtype = "light", - walkable = true, - groups = { snappy = 3 }, - light_source = LIGHT_MAX, - sounds = default.node_sound_leaves_defaults(), -}) - -minetest.register_node('homedecor:glowlight_thin', { - description = "Glowlight (thin)", - drawtype = "nodebox", - tiles = { 'homedecor_glowlight_tb.png', - 'homedecor_glowlight_tb.png', - 'homedecor_glowlight_thin_sides.png', - 'homedecor_glowlight_thin_sides.png', - 'homedecor_glowlight_thin_sides.png', - 'homedecor_glowlight_thin_sides.png'}, - selection_box = { - type = "fixed", - fixed = { -0.5, 0.25, -0.5, 0.5, 0.5, 0.5 } - }, - node_box = { - type = "fixed", - fixed = { -0.5, 0.25, -0.5, 0.5, 0.5, 0.5 } - }, - - sunlight_propagates = false, - paramtype = "light", - walkable = true, - groups = { snappy = 3 }, - light_source = LIGHT_MAX-1, - sounds = default.node_sound_leaves_defaults(), -}) - -minetest.register_node('homedecor:glowlight_small_cube', { - description = "Glowlight (small cube)", - drawtype = "nodebox", - tiles = {'homedecor_glowlight_cube_tb.png', - 'homedecor_glowlight_cube_tb.png', - 'homedecor_glowlight_cube_sides.png', - 'homedecor_glowlight_cube_sides.png', - 'homedecor_glowlight_cube_sides.png', - 'homedecor_glowlight_cube_sides.png' - }, - selection_box = { - type = "fixed", - fixed = { -0.25, -0.5, -0.25, 0.25, 0, 0.25 } - }, - node_box = { - type = "fixed", - fixed = { -0.25, -0.5, -0.25, 0.25, 0, 0.25 } - }, - - sunlight_propagates = false, - paramtype = "light", - walkable = true, - groups = { snappy = 3 }, - light_source = LIGHT_MAX-1, - sounds = default.node_sound_leaves_defaults(), -}) - -- local curtaincolors = { diff --git a/lighting.lua b/lighting.lua new file mode 100644 index 00000000..2c26c50d --- /dev/null +++ b/lighting.lua @@ -0,0 +1,174 @@ + +-- This file supplies glowlights + +-- Yellow + +minetest.register_node('homedecor:glowlight_thick_yellow', { + description = "Yellow Glowlight (thick)", + drawtype = "nodebox", + tiles = { + 'homedecor_glowlight_yellow_tb.png', + 'homedecor_glowlight_yellow_tb.png', + 'homedecor_glowlight_thick_yellow_sides.png', + 'homedecor_glowlight_thick_yellow_sides.png', + 'homedecor_glowlight_thick_yellow_sides.png', + 'homedecor_glowlight_thick_yellow_sides.png' + }, + selection_box = { + type = "fixed", + fixed = { -0.5, 0, -0.5, 0.5, 0.5, 0.5 } + }, + node_box = { + type = "fixed", + fixed = { -0.5, 0, -0.5, 0.5, 0.5, 0.5 } + }, + + sunlight_propagates = false, + paramtype = "light", + walkable = true, + groups = { snappy = 3 }, + light_source = LIGHT_MAX, + sounds = default.node_sound_leaves_defaults(), +}) + +minetest.register_node('homedecor:glowlight_thin_yellow', { + description = "Yellow Glowlight (thin)", + drawtype = "nodebox", + tiles = { + 'homedecor_glowlight_yellow_tb.png', + 'homedecor_glowlight_yellow_tb.png', + 'homedecor_glowlight_thin_yellow_sides.png', + 'homedecor_glowlight_thin_yellow_sides.png', + 'homedecor_glowlight_thin_yellow_sides.png', + 'homedecor_glowlight_thin_yellow_sides.png' + }, + selection_box = { + type = "fixed", + fixed = { -0.5, 0.25, -0.5, 0.5, 0.5, 0.5 } + }, + node_box = { + type = "fixed", + fixed = { -0.5, 0.25, -0.5, 0.5, 0.5, 0.5 } + }, + + sunlight_propagates = false, + paramtype = "light", + walkable = true, + groups = { snappy = 3 }, + light_source = LIGHT_MAX-1, + sounds = default.node_sound_leaves_defaults(), +}) + +minetest.register_node('homedecor:glowlight_small_cube_yellow', { + description = "Yellow Glowlight (small cube)", + drawtype = "nodebox", + tiles = { + 'homedecor_glowlight_cube_yellow_tb.png', + 'homedecor_glowlight_cube_yellow_tb.png', + 'homedecor_glowlight_cube_yellow_sides.png', + 'homedecor_glowlight_cube_yellow_sides.png', + 'homedecor_glowlight_cube_yellow_sides.png', + 'homedecor_glowlight_cube_yellow_sides.png' + }, + selection_box = { + type = "fixed", + fixed = { -0.25, -0.5, -0.25, 0.25, 0, 0.25 } + }, + node_box = { + type = "fixed", + fixed = { -0.25, -0.5, -0.25, 0.25, 0, 0.25 } + }, + + sunlight_propagates = false, + paramtype = "light", + walkable = true, + groups = { snappy = 3 }, + light_source = LIGHT_MAX-1, + sounds = default.node_sound_leaves_defaults(), +}) + +-- White + +minetest.register_node('homedecor:glowlight_thick_white', { + description = "White Glowlight (thick)", + drawtype = "nodebox", + tiles = { + 'homedecor_glowlight_white_tb.png', + 'homedecor_glowlight_white_tb.png', + 'homedecor_glowlight_thick_white_sides.png', + 'homedecor_glowlight_thick_white_sides.png', + 'homedecor_glowlight_thick_white_sides.png', + 'homedecor_glowlight_thick_white_sides.png' + }, + selection_box = { + type = "fixed", + fixed = { -0.5, 0, -0.5, 0.5, 0.5, 0.5 } + }, + node_box = { + type = "fixed", + fixed = { -0.5, 0, -0.5, 0.5, 0.5, 0.5 } + }, + + sunlight_propagates = false, + paramtype = "light", + walkable = true, + groups = { snappy = 3 }, + light_source = LIGHT_MAX, + sounds = default.node_sound_leaves_defaults(), +}) + +minetest.register_node('homedecor:glowlight_thin_white', { + description = "White Glowlight (thin)", + drawtype = "nodebox", + tiles = { + 'homedecor_glowlight_white_tb.png', + 'homedecor_glowlight_white_tb.png', + 'homedecor_glowlight_thin_white_sides.png', + 'homedecor_glowlight_thin_white_sides.png', + 'homedecor_glowlight_thin_white_sides.png', + 'homedecor_glowlight_thin_white_sides.png' + }, + selection_box = { + type = "fixed", + fixed = { -0.5, 0.25, -0.5, 0.5, 0.5, 0.5 } + }, + node_box = { + type = "fixed", + fixed = { -0.5, 0.25, -0.5, 0.5, 0.5, 0.5 } + }, + + sunlight_propagates = false, + paramtype = "light", + walkable = true, + groups = { snappy = 3 }, + light_source = LIGHT_MAX-1, + sounds = default.node_sound_leaves_defaults(), +}) + +minetest.register_node('homedecor:glowlight_small_cube_white', { + description = "White Glowlight (small cube)", + drawtype = "nodebox", + tiles = { + 'homedecor_glowlight_cube_white_tb.png', + 'homedecor_glowlight_cube_white_tb.png', + 'homedecor_glowlight_cube_white_sides.png', + 'homedecor_glowlight_cube_white_sides.png', + 'homedecor_glowlight_cube_white_sides.png', + 'homedecor_glowlight_cube_white_sides.png' + }, + selection_box = { + type = "fixed", + fixed = { -0.25, -0.5, -0.25, 0.25, 0, 0.25 } + }, + node_box = { + type = "fixed", + fixed = { -0.25, -0.5, -0.25, 0.25, 0, 0.25 } + }, + + sunlight_propagates = false, + paramtype = "light", + walkable = true, + groups = { snappy = 3 }, + light_source = LIGHT_MAX-1, + sounds = default.node_sound_leaves_defaults(), +}) diff --git a/textures/homedecor_glowlight_cube_white_sides.png b/textures/homedecor_glowlight_cube_white_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..51bd18db7eeb4a9e1babe7e76925567c97e2c001 GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#4i}@CiOP{>2d@ByIy_w*Lp096o#f4T*nz|Ocump7JO5oQy$+N#2KlaDlKbr| zm&&{YVk=e^x*O%a;{T&Gdv@;aJF%gmr9FY6Gk3oKy=&d`2KlUp6qlM?3s$8)dzZ$h zV9dB@?;&mlrL#JxnG}>fx=xf|W?(pT^k>^DrJHWQRVJzEH=gO~cz!q6%2>bg+>*<4 clINz&DfdJPr-?dU1iFdA)78&qol`;+0Bdnp9{>OV literal 0 HcmV?d00001 diff --git a/textures/homedecor_glowlight_cube_white_tb.png b/textures/homedecor_glowlight_cube_white_tb.png new file mode 100644 index 0000000000000000000000000000000000000000..6066f68528345df273a69a1dbe584d282132e4a8 GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#4i}@CiFDC{H!p!geV#6kAsXlJPIBZr?7-prx9^;5(SPozTCcWuH(qKnn&4_) zs>oqi)Ab^+Qb>#c@%M&WvFDZNERRbh^9U+>8Y%TX{=s*~^6uTcp`k9jtc}ZsL$01V zbLK8%h-kxYN&N$pA{$nvshu><-EPuQF5ECTsC@F8RUHvtD&<}?SFU34SSKSGx|R9b hwC$VYTK+$n9_J?*ZszgO>=@8x44$rjF6*2Ung9n*Rf_-s literal 0 HcmV?d00001 diff --git a/textures/homedecor_glowlight_cube_sides.png b/textures/homedecor_glowlight_cube_yellow_sides.png similarity index 100% rename from textures/homedecor_glowlight_cube_sides.png rename to textures/homedecor_glowlight_cube_yellow_sides.png diff --git a/textures/homedecor_glowlight_cube_tb.png b/textures/homedecor_glowlight_cube_yellow_tb.png similarity index 100% rename from textures/homedecor_glowlight_cube_tb.png rename to textures/homedecor_glowlight_cube_yellow_tb.png diff --git a/textures/homedecor_glowlight_thick_white_sides.png b/textures/homedecor_glowlight_thick_white_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..b3ed7966432679a2d89d3bbbc391f5fa1e70dbf7 GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#4i}@Ci5$}^i8P>4rKgKyh{pN16AbxS6nU6)+s!}x|L%B@|BzUu>rL%mRs?zk2Wf?!2baTc9Ht NJYD@<);T3K0RRt*Py+w} literal 0 HcmV?d00001 diff --git a/textures/homedecor_glowlight_thick_sides.png b/textures/homedecor_glowlight_thick_yellow_sides.png similarity index 100% rename from textures/homedecor_glowlight_thick_sides.png rename to textures/homedecor_glowlight_thick_yellow_sides.png diff --git a/textures/homedecor_glowlight_thin_white_sides.png b/textures/homedecor_glowlight_thin_white_sides.png new file mode 100644 index 0000000000000000000000000000000000000000..4b41d05f1b967d0d18fbf83a9e498956fc7538fe GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#4i}@CiQ<+srqMv5NKY5X5RLP1`wsFRFyLU`IFC| z;NM`W&cKiswo`HCCW%Q(ObjP|U%!f4ed%udk~1orFZHGbAF4cfclY+%tL|0JuRpNd f@~(TReTZ@DPOpE*c+ao`En)C<^>bP0l+XkKs8T)H literal 0 HcmV?d00001 diff --git a/textures/homedecor_glowlight_thin_sides.png b/textures/homedecor_glowlight_thin_yellow_sides.png similarity index 100% rename from textures/homedecor_glowlight_thin_sides.png rename to textures/homedecor_glowlight_thin_yellow_sides.png diff --git a/textures/homedecor_glowlight_white_tb.png b/textures/homedecor_glowlight_white_tb.png new file mode 100644 index 0000000000000000000000000000000000000000..5da4494085bef3bde4e6ccbe9308ec64466dc08e GIT binary patch literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#4i}@CiJI1m1wVj7J3L(+Lp09kPI44GqQK$IyDRs7{Ykwl#u=_whN*3=OZV0A zYOH(R#lgUEOhQW}G&EEz%;nB^S-~SRX(?%;hVsWZYRoF`DqOIN!603&f&D`U!}jO; z4M)$%FIy?^uupn1+n(Qs$C_A|7W-Y>^6qSo_c;cI$GJI;{d1HouXH`nC|~09eNDXW zi-5B(zkfd3_j1{^kloMB%_htgy!hbP0l+XkKZgFk0 literal 0 HcmV?d00001 diff --git a/textures/homedecor_glowlight_tb.png b/textures/homedecor_glowlight_yellow_tb.png similarity index 100% rename from textures/homedecor_glowlight_tb.png rename to textures/homedecor_glowlight_yellow_tb.png