From aa49b0eb3bdd25f6e3ce5a521e06dbb9544c6114 Mon Sep 17 00:00:00 2001 From: kilbith Date: Sat, 16 Jan 2016 21:25:10 +0100 Subject: [PATCH] Tweak some textures and make pixel nodeboxes simpler --- handlers/nodeboxes.lua | 6 ++-- nodes.lua | 10 +++---- sitting.lua | 12 ++++---- textures/xdecor_cauldron_top_empty.png | Bin 149 -> 331 bytes textures/xdecor_crate.png | Bin 210 -> 206 bytes textures/xdecor_half_cabinet_front.png | Bin 248 -> 415 bytes textures/xdecor_painting_1.png | Bin 251 -> 256 bytes worktable.lua | 40 ++++++++++++------------- 8 files changed, 34 insertions(+), 34 deletions(-) diff --git a/handlers/nodeboxes.lua b/handlers/nodeboxes.lua index 9cfa488..9f0953f 100644 --- a/handlers/nodeboxes.lua +++ b/handlers/nodeboxes.lua @@ -26,9 +26,9 @@ xdecor.pixelnodebox = function(size, boxes) (x / size) - 0.5, (y / size) - 0.5, (z / size) - 0.5, - (w / size) - 0.5, - (h / size) - 0.5, - (l / size) - 0.5 + ((x + w) / size) - 0.5, + ((y + h) / size) - 0.5, + ((z + l) / size) - 0.5 } end return { type = "fixed", fixed = fixed } diff --git a/nodes.lua b/nodes.lua index 86017f6..87ab473 100644 --- a/nodes.lua +++ b/nodes.lua @@ -413,10 +413,10 @@ xdecor.register("stonepath", { sounds = default.node_sound_stone_defaults(), sunlight_propagates = true, node_box = xdecor.pixelnodebox(16, { - {8, 0, 8, 14, 0.5, 14}, - {1, 0, 1, 7, 0.5, 7}, - {1, 0, 10, 6, 0.5, 15}, - {10, 0, 2, 14, 0.5, 6} + {8, 0, 8, 6, 0.5, 6}, + {1, 0, 1, 6, 0.5, 6}, + {1, 0, 10, 5, 0.5, 5}, + {10, 0, 2, 4, 0.5, 4} }), selection_box = xdecor.nodebox.slab_y(0.05) }) @@ -440,7 +440,7 @@ xdecor.register("table", { groups = {choppy=3, oddly_breakable_by_hand=2, flammable=3}, sounds = default.node_sound_wood_defaults(), node_box = xdecor.pixelnodebox(16, { - {0, 14, 0, 16, 16, 16}, {5.5, 0, 5.5, 10.5, 14, 10.5} + {0, 14, 0, 16, 2, 16}, {5.5, 0, 5.5, 5, 14, 6} }) }) diff --git a/sitting.lua b/sitting.lua index 8e36fa8..c336d4e 100644 --- a/sitting.lua +++ b/sitting.lua @@ -61,12 +61,12 @@ xdecor.register("chair", { groups = {choppy=3, oddly_breakable_by_hand=2, flammable=3}, on_rotate = screwdriver.rotate_simple, node_box = xdecor.pixelnodebox(16, { - {3, 0, 11, 5, 16, 13}, - {11, 0, 11, 13, 16, 13}, - {5, 9, 11.5, 11, 15, 12.5}, - {3, 0, 3, 5, 6, 5}, - {11, 0, 3, 13, 6, 5}, - {3, 6, 3, 13, 8, 11} + {3, 0, 11, 2, 16, 2}, + {11, 0, 11, 2, 16, 2}, + {5, 9, 11.5, 6, 6, 1}, + {3, 0, 3, 2, 6, 2}, + {11, 0, 3, 2, 6, 2}, + {3, 6, 3, 10, 2, 8} }), can_dig = dig, on_rightclick = function(pos, node, clicker) diff --git a/textures/xdecor_cauldron_top_empty.png b/textures/xdecor_cauldron_top_empty.png index 2687e267fd21cf0fc845d5e357884777f0fbedd2..d302287e9c83c2d89909029498ed8b8cc94b8b8b 100644 GIT binary patch delta 316 zcmV-C0mJ^40m}lA7=H)?0001xk!Usm000SaNLh0L01FcU01FcV0GgZ_00007bV*G` z2jBq^6&g4-E9}z%008PqL_t(2&y`Y1j)X7_EIUyy76(4W{~rXG2-|%qWaw7UXof?G zyw&2!wr%*&*8v>IG3Oj({8Us~GwTfP`|j?l3LrB9sA^_L1b+Y#X|1j6dLhg?-8~{A zLPS)Rbv)V6GBZ;EV+;|gNdQ`FnaO6RGLx+O2VJsaX=b{6Yb_!e2XOsFgyVT(X+agv zTLW`sOayl?Nu}hXM8!lXZoHQnZwQn{ugV$HQ`IM>{-N02NsM(I|D~b46A=iJT*>CR0r%kr1UcOjUWnf>ylpV=2IFR%Dbg)24y O0000Mit3I#za0!D1iu55zLYzhfwDFRGJOcFC1gA@dP+!$tgFe#cU i324haoOWm~BSXl0?w2m^6Au85VeoYIb6Mw<&;$S-r6B97-=0bV(vqH5hnJB4TC2%+-T%lBL zk|8jp^I#}&w@Cs?7NE>Ml}SMq?Q^`y;Z}sO9Xr48e<@DsCM$)60c#3%GJxV9Ac(+M gtydom;YjB712R_>{@QA#T>t<807*qoM6N<$g6+CPlmGw# delta 182 zcmV;n07?JO0n!1GB!3uCOjJd2OC^0%C}2Pzk6$m8V=!z;B!N~dX+|U4j5^i;004DK zL_t&t*By(o3d1lAL=Qpe8ZDlS(|&-6(JpK}2ZQKZFZusZsN9>5ckgi4T1zVpdMD;N zZ}hw(2?EFC*cl33qmw{350Lwsa;G4Q@!FqcFwa6*&gb~P|1TvQZ5Jsd4ERu}kpmR> k06_#cOF3&}2uBjn9~SHs*l!kEMgRZ+07*qoM6N<$f}wUt+W-In diff --git a/textures/xdecor_half_cabinet_front.png b/textures/xdecor_half_cabinet_front.png index b227e1b64adf2adcccbb3869cdbf8e45b627795d..3e4964c2f71d7212b1ba7054dbe523340f68dbed 100644 GIT binary patch delta 400 zcmV;B0dM~J0iOeq8Gi-<001BJ|6u?C010qNS#tmY3ljhU3ljkVnw%H_000McNliru z-~kX7Bmi9OPcQ%g0X|7YK~y-)?UAug0znXlKW6v#3=$O@3XODx*1~9rbVT34hwu?i zw6QQGHpW<8VS<`S6cA9kyWLwXPA>8eeBI2S%>U0!>Eiro0e_&RM4&a+IWoV%XoZNZ z)Bvf=*f0U!djK@RbuU6I;U{sFLk&O}D86HhR>IN%Ah8)?pve4!?r{@sv_dPPd(r}+ zUfl*@FrHAaZZjB9ihi0}0EV+Ump6}y2s(8cKZ&EdStg0+%%)RJXt?P`e8-m5d8(C= zvv!mB*;l?s?0?Zp@ZO`9l#19UGyuGQi~#5yHUPM~eZqu>-LMA0ee{BoQl5Z6`fo!3 zM$_D7e{Tn$3C=n?2MwMFpM_rAsu1~Mo*>ZqjJtw#_)FssAgp{NOsuFE8LrmwlB~2&~u1N7P)0WI!q&op<1Y=2%UoeBivm0qZ zPP(UyV~E7%vpvy#M-+IN4gEM+xV{wr-<-E?`HO@TpW0J>g#=HqX&hmj=u(;{>&~}m z!h)^e;;O$?-j(XFT$_5{aQ@Y(PWI24*W9u%pZO#E?$Nua{nO7Bw0MUewrtb7+{SQ- fgH`3S`wzyg!ORg4CVHC!?PTzD^>bP0l+XkKDHl{Z diff --git a/textures/xdecor_painting_1.png b/textures/xdecor_painting_1.png index 1792b883749ef82a663543b1eb7389537d3143ec..6ba2cb694186e9ac86c882e1292429b28ae456c0 100644 GIT binary patch delta 228 zcmV~^8J7_~B zScgD4b~m|!SNrR-T|OPW|Km&m0004WQchCGBT&ji)Uox7DuZK@dbyHPkqCoeSsD9xf6qvV1%HeV4w#>1BP8e ep-QT%Km-7xs2+~y5|knU00000{a1wB!4YXOjJbx005zAL4a5|W0=RPb4_ziCSH)dJ%BrSPcfHcJZM8C zId(U>fmi$MvRytM`FX3<00001bW%=J06^y0W&i*Hd`Uz>R0!8&5R`E7bP@4%VQ^po z14ae`7$Z>1Q`B+l5mg4qCXEgyr6v&u!L~FY$e76B_$=Aj)>znTAwy`JnVE62kr#vD z>SAMKGpj&`soLen#^yx_83d!tfuLe0gQ7;0l9Ez~6N8grq@bc;peMrw47-9tl~h%M Z2mpS49j9`}xQze+002ovPDHLkV1mYuTZ{kz diff --git a/worktable.lua b/worktable.lua index 630367d..bc9b6e7 100644 --- a/worktable.lua +++ b/worktable.lua @@ -27,26 +27,26 @@ local nodes = { -- Nodes allowed to be cut. Registration format: [mod name] = [[ } local defs = { - -- Name Yield X Y Z W H L - {"nanoslab", 16, { 0, 0, 0, 8, 1, 8 }}, - {"micropanel", 16, { 0, 0, 0, 16, 1, 8 }}, - {"microslab", 8, { 0, 0, 0, 16, 1, 16 }}, - {"thinstair", 8, { 0, 7, 0, 16, 8, 8 }, - { 0, 15, 8, 16, 16, 16 }}, - {"cube", 4, { 0, 0, 8, 8, 8, 16 }}, - {"panel", 4, { 0, 0, 0, 16, 8, 8 }}, - {"slab", 2, { 0, 0, 0, 16, 8, 16 }}, - {"doublepanel", 2, { 0, 0, 0, 16, 8, 8 }, - { 0, 8, 8, 16, 16, 16 }}, - {"halfstair", 2, { 0, 0, 0, 8, 8, 16 }, - { 0, 8, 8, 8, 16, 16 }}, - {"outerstair", 1, { 0, 0, 0, 16, 8, 16 }, - { 0, 8, 8, 8, 16, 16 }}, - {"stair", 1, { 0, 0, 0, 16, 8, 16 }, - { 0, 8, 8, 16, 16, 16 }}, - {"innerstair", 1, { 0, 0, 0, 16, 8, 16 }, - { 0, 8, 8, 16, 16, 16 }, - { 0, 8, 0, 8, 16, 8 }} + -- Name Yield X Y Z W H L + {"nanoslab", 16, { 0, 0, 0, 8, 1, 8 }}, + {"micropanel", 16, { 0, 0, 0, 16, 1, 8 }}, + {"microslab", 8, { 0, 0, 0, 16, 1, 16 }}, + {"thinstair", 8, { 0, 7, 0, 16, 1, 8 }, + { 0, 15, 8, 16, 1, 8 }}, + {"cube", 4, { 0, 0, 8, 8, 8, 8 }}, + {"panel", 4, { 0, 0, 0, 16, 8, 8 }}, + {"slab", 2, { 0, 0, 0, 16, 8, 16 }}, + {"doublepanel", 2, { 0, 0, 0, 16, 8, 8 }, + { 0, 8, 8, 16, 8, 8 }}, + {"halfstair", 2, { 0, 0, 0, 8, 8, 16 }, + { 0, 8, 8, 8, 8, 8 }}, + {"outerstair", 1, { 0, 0, 0, 16, 8, 16 }, + { 0, 8, 8, 8, 8, 8 }}, + {"stair", 1, { 0, 0, 0, 16, 8, 16 }, + { 0, 8, 8, 16, 8, 8 }}, + {"innerstair", 1, { 0, 0, 0, 16, 8, 16 }, + { 0, 8, 8, 16, 8, 8 }, + { 0, 8, 0, 8, 8, 8 }} } function worktable.get_recipe(item)