From bb7ae9685010d4f6e88cb0f614922809ab23cecf Mon Sep 17 00:00:00 2001 From: Jean-Patrick Guerrero Date: Tue, 15 Mar 2016 16:21:34 +0100 Subject: [PATCH] Change Lantern textures --- nodes.lua | 25 ++++++++----------------- textures/xdecor_candle_ceiling.png | Bin 321 -> 0 bytes textures/xdecor_lantern.png | Bin 220 -> 225 bytes textures/xdecor_lantern_ceiling.png | Bin 246 -> 0 bytes textures/xdecor_lantern_floor.png | Bin 219 -> 0 bytes textures/xdecor_lantern_inv.png | Bin 0 -> 188 bytes 6 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 textures/xdecor_candle_ceiling.png delete mode 100644 textures/xdecor_lantern_ceiling.png delete mode 100644 textures/xdecor_lantern_floor.png create mode 100644 textures/xdecor_lantern_inv.png diff --git a/nodes.lua b/nodes.lua index 7e2dd3e..54bac65 100644 --- a/nodes.lua +++ b/nodes.lua @@ -106,19 +106,18 @@ xdecor.register("candle", { inventory_image = "xdecor_candle_inv.png", wield_image = "xdecor_candle_wield.png", paramtype2 = "wallmounted", - legacy_wallmounted = true, walkable = false, groups = {dig_immediate=3, attached_node=1}, tiles = {{name = "xdecor_candle_floor.png", animation = {type="vertical_frames", length=1.5}}, - {name = "xdecor_candle_ceiling.png", + {name = "xdecor_candle_floor.png", animation = {type="vertical_frames", length=1.5}}, {name = "xdecor_candle_wall.png", animation = {type="vertical_frames", length=1.5}} }, selection_box = { type = "wallmounted", - wall_top = {-0.3, -0.4, -0.3, 0.3, 0.5, 0.3}, + wall_top = {-0.25, -0.5, -0.25, 0.25, 0.1, 0.25}, wall_bottom = {-0.25, -0.5, -0.25, 0.25, 0.1, 0.25}, wall_side = {-0.5, -0.35, -0.15, -0.15, 0.4, 0.15} } @@ -319,7 +318,6 @@ xdecor.register("ivy", { groups = {dig_immediate=3, flammable=3, plant=1}, paramtype2 = "wallmounted", selection_box = {type="wallmounted"}, - legacy_wallmounted = true, tiles = {"xdecor_ivy.png"}, inventory_image = "xdecor_ivy.png", wield_image = "xdecor_ivy.png", @@ -328,20 +326,15 @@ xdecor.register("ivy", { xdecor.register("lantern", { description = "Lantern", - light_source = 12, - drawtype = "torchlike", - inventory_image = "xdecor_lantern_floor.png", - wield_image = "xdecor_lantern_floor.png", + light_source = 13, + drawtype = "plantlike", + inventory_image = "xdecor_lantern_inv.png", + wield_image = "xdecor_lantern_inv.png", paramtype2 = "wallmounted", - legacy_wallmounted = true, walkable = false, groups = {dig_immediate=3, attached_node=1}, - tiles = {"xdecor_lantern_floor.png", "xdecor_lantern_ceiling.png", "xdecor_lantern.png"}, - selection_box = { - type = "wallmounted", - wall_top = {-0.25, -0.4, -0.25, 0.25, 0.5, 0.25}, - wall_bottom = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25}, - wall_side = {-0.5, -0.5, -0.15, 0.5, 0.5, 0.15} } + tiles = {{name = "xdecor_lantern.png", animation = {type="vertical_frames", length=1.5}}}, + selection_box = xdecor.pixelbox(16, {{4, 0, 4, 8, 16, 8}}) }) for _, l in pairs({"iron", "wooden"}) do @@ -388,7 +381,6 @@ xdecor.register("painting_1", { inventory_image = "xdecor_painting_empty.png", wield_image = "xdecor_painting_empty.png", paramtype2 = "wallmounted", - legacy_wallmounted = true, wield_image = "xdecor_painting_empty.png", sunlight_propagates = true, groups = {choppy=3, oddly_breakable_by_hand=2, flammable=2, attached_node=1}, @@ -406,7 +398,6 @@ for i = 2, 4 do xdecor.register("painting_"..i, { tiles = {"xdecor_painting_"..i..".png"}, paramtype2 = "wallmounted", - legacy_wallmounted = true, drop = "xdecor:painting_1", sunlight_propagates = true, groups = {choppy=3, oddly_breakable_by_hand=2, flammable=2, attached_node=1, not_in_creative_inventory=1}, diff --git a/textures/xdecor_candle_ceiling.png b/textures/xdecor_candle_ceiling.png deleted file mode 100644 index 8b0a054a5d95b025b0919ac9033b1129331160a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 321 zcmV-H0lxl;P)S@9*!kwy}eRe{XVWFD4Nj69U(S zN&5f*00DGTPE!Ct=GbNc006m3L_t(I%hi+J4uc>JMxlk4;(p)%W%o5ouHj+z)0!w1h9 zVj>e%2L>=|U`@~a?Sbmsgr#QYTyy4?Ed8A;gZ6@zoySjoX!PMi_CC~o%)K}_0i8Y| z$mGNaj9tWsp7w`I^r61Fy$^9g!G~D%kuKC9M<2MN50P+Q)Z%$@LErt6^p8G1Mxh7n T7Up2d00000NkvXXu0mjfWk!K} diff --git a/textures/xdecor_lantern.png b/textures/xdecor_lantern.png index 8c5b1fa911afe9041ace8955b72ee1cb95ba4740..3ddcf5397e0341bb19db32b248d72b5dfbb8b619 100644 GIT binary patch delta 210 zcmcb^_>ggec)bG)GXn#|!{Ap-fs|Z;Plzj!)=*I>&-S0!mz5Ib>~E*{*N%CImBhbF zroVTY<6eJ#22{aV666=m;PC858jw@y>EaloaXy)W$&HbXLm+`Am_yJ_(V4^hi0erK z9R&`S1jPkG9a99Hn-p6PvL&Z%ag-Fjtia>;HL1fpX+oKSvq*+Qi=fmajzDI^8AabW z7(OWRPqqGg=P(<;{ETXg2k&N@F}zFkIKVNVO+$He|~EN6r8M delta 205 zcmV;;05bpK0o(zQ7k>~00{{R3?cL&10000UP)t-s0000b8x|=c86g=I(#d!-DjgXR z5Xr!E$i8w91_@%2Wm5nE00DGTPE!Ct=GbNc003-BL_t&t*Cou+34kyR1kg*s|D+S7 zR>4m{#03Nga0WMUh%Vs3Uh9>@<4A&*?8(3g;SD1aAB)Ih-bRa16Bc7ATp=7ZNP-iY zix}ooLfoN8y;oD>tgl%(ul@ZfY zl2ViqzI3ueLqXC&Lry|~-&99IMOyU4{^Aq+icTFUK6#*6kb`?;?kh*2PL`4&zhDMN zM#ek7yj4Jcwx^3@h{Wa4UQfOw1{^Hb#wHb~zx_YYret{{)goXStBl}6dv<;47QMyW z&RbZvD^9;TdtSVds+P}|0*}ab0V}s|KF_;i>uU)&pDXW*^TR%QZ4UGKcsS+Fsl`fx om!&$-Xjm&xY!j`w$b9ynIU<~?Gvch$381wMp00i_>zopr0B`qBQ~&?~ diff --git a/textures/xdecor_lantern_floor.png b/textures/xdecor_lantern_floor.png deleted file mode 100644 index 9dbb5b0e5181a05adff7403c7dfe3384b0ed9efd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv5AX?b1=5-d5~?y{nu?N&k|LK+ zRh&FftR^Qe!Ov%*uVknxdwgFJKO1LSqH;4(DN{+1UoZnB&XcT zDG6Z-0zgtAfQd=r?12=P6b%MRCN;INX$pdD*SAecU^93e!8YUI3BiY}6c~~=E{V`j zU@&&_;XS~^`21u~0-LgM1m_8l1w1W*45=FqOPn##EKOEmWLRa)9hyFmGZAPRgQu&X J%Q~loCIHkNJKF#N diff --git a/textures/xdecor_lantern_inv.png b/textures/xdecor_lantern_inv.png new file mode 100644 index 0000000000000000000000000000000000000000..ea6610180956d0568b397687648519dce8e732dd GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa3-AeX1=1QS3gy}U^ZK$X#*!evUzv-bY+d3g{?sup}rh2