From 176f1db35489e018006bbbaf93473c8cf4ab7555 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Mon, 4 May 2015 00:19:55 -0400 Subject: [PATCH] phase out duplicate textures from barbed wire fence/gate and phase out most fence/gate "back" images --- homedecor/doors_and_gates.lua | 52 ++++++++++++------ .../homedecor_gate_barbed_wire_back.png | Bin 399 -> 0 bytes .../homedecor_gate_barbed_wire_edges.png | Bin 0 -> 267 bytes .../homedecor_gate_barbed_wire_front.png | Bin 399 -> 354 bytes .../homedecor_gate_barbed_wire_left.png | Bin 260 -> 0 bytes .../homedecor_gate_barbed_wire_right.png | Bin 260 -> 0 bytes .../homedecor_gate_barbed_wire_top.png | Bin 260 -> 0 bytes .../homedecor_gate_chainlink_back.png | Bin 237 -> 0 bytes 8 files changed, 36 insertions(+), 16 deletions(-) delete mode 100644 homedecor/textures/homedecor_gate_barbed_wire_back.png create mode 100644 homedecor/textures/homedecor_gate_barbed_wire_edges.png delete mode 100644 homedecor/textures/homedecor_gate_barbed_wire_left.png delete mode 100644 homedecor/textures/homedecor_gate_barbed_wire_right.png delete mode 100644 homedecor/textures/homedecor_gate_barbed_wire_top.png delete mode 100644 homedecor/textures/homedecor_gate_chainlink_back.png diff --git a/homedecor/doors_and_gates.lua b/homedecor/doors_and_gates.lua index a8be796f..907c1adb 100644 --- a/homedecor/doors_and_gates.lua +++ b/homedecor/doors_and_gates.lua @@ -337,17 +337,37 @@ for i in ipairs(gates_list) do local gate=gates_list[i] + local edges = { + "homedecor_gate_"..gate.."_top.png", + "homedecor_gate_"..gate.."_bottom.png", + "homedecor_gate_"..gate.."_left.png", + "homedecor_gate_"..gate.."_right.png", + } + + if gate == "barbed_wire" then + edges = { + "homedecor_gate_barbed_wire_edges.png", + "homedecor_gate_barbed_wire_edges.png", + "homedecor_gate_barbed_wire_edges.png", + "homedecor_gate_barbed_wire_edges.png", + } + end + + local tiles = edges + if gate ~= "picket" and gate ~= "picket_white" then + table.insert (tiles, "homedecor_gate_"..gate.."_front.png^[transformFX") + table.insert (tiles, "homedecor_gate_"..gate.."_front.png") + else + table.insert (tiles, "homedecor_gate_"..gate.."_back.png") + table.insert (tiles, "homedecor_gate_"..gate.."_front.png") + end + + + local def = { drawtype = "nodebox", description = S(gate_names[i].." Fence Gate"), - tiles = { - "homedecor_gate_"..gate.."_top.png", - "homedecor_gate_"..gate.."_bottom.png", - "homedecor_gate_"..gate.."_left.png", - "homedecor_gate_"..gate.."_right.png", - "homedecor_gate_"..gate.."_back.png", - "homedecor_gate_"..gate.."_front.png" - }, + tiles = tiles, paramtype = "light", groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), @@ -378,15 +398,15 @@ for i in ipairs(gates_list) do def = homedecor.table_copy(def) def.groups.not_in_creative_inventory = 1 def.selection_box.fixed = { 0.4, -0.5, -0.5, 0.5, 0.5, 0.5 } - def.tiles = { - "homedecor_gate_"..gate.."_top.png", - "homedecor_gate_"..gate.."_bottom.png", - "homedecor_gate_"..gate.."_front.png", - "homedecor_gate_"..gate.."_back.png", - "homedecor_gate_"..gate.."_left.png", - "homedecor_gate_"..gate.."_right.png" - } def.node_box.fixed = gate_models_open[i] + def.tiles = { + tiles[1], + tiles[2], + tiles[6], + tiles[5], + tiles[4], + tiles[3] + } def.drop = "homedecor:gate_"..gate.."_closed" def.on_rightclick = function(pos, node, clicker) homedecor.flip_gate(pos, node, clicker, gate, "open") diff --git a/homedecor/textures/homedecor_gate_barbed_wire_back.png b/homedecor/textures/homedecor_gate_barbed_wire_back.png deleted file mode 100644 index 3139da8cc647b7b984e76d6bac1ab94fb76c7843..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 399 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}dw@@f>+033Po6xvfB*h%+qP}l zvSt4K`8|1F`}XZSeE9Iqn>R0BytsY)_EV=$UAlB>>C&a^)~!2n;zV;A3wgZI=DX0x;@poJJYo0;K75fDYkt%UhOH49cfN|c^*Kw1h@aa45V~Rg8YL2lK>c&zUTf6)Y#?e;us=v zIrfaJ&|wDw=fKvPJciXX?$rMOoNC=SZM~O#N}rOdDa*=S73Tu(^k|tE(H|DxXxP5{ z*OB-pjyk=Wt1HjfRI@d1*{8C^tliAx4p|*`>Z+nQlFKUek+x zJ2PDSG90R-EvM$YcV{@ar#rSL*>`8U*2h_QWx2GcI(KEbbf!BuC)qEo4(`kGYENvD zZ9Z~Z%FA?5DcoJeEoBqa6|6VeY8j_0Z;^9;?3uOECnwH}|HJ6+B$^jHqgxB;1_n=8 KKbLh*2~7ZF)?z*Y literal 0 HcmV?d00001 diff --git a/homedecor/textures/homedecor_gate_barbed_wire_front.png b/homedecor/textures/homedecor_gate_barbed_wire_front.png index 8f938bb64c6e80897ba187cd36bec5dd0f70ed53..4b9ef9168e30286d0ed1589fb0454b4baa920153 100644 GIT binary patch delta 193 zcmV;y06zbZ1L6XZDFXli0Ffz#f5SScO#lD@0d!JMQvg8b*k%9#0EtONK~xyiUCh}Q zf-nq4(d#^m%Ag?F0v%)i|NG2iYu@%*>jrE%+IbB9M5Oj?;J!#s#7}Ii)f$UsxkD*Z z;d}r#x&|8URRCoZ5p`MUFul_t8a`?0AAcbPjM-Ds9Md4OZ7rkI6}q~^GusxCZy1gq v%>{+_k-@KYA~M-i5j$2yQy<3JMrQW|$Y>7*gX!Y+00000NkvXXu0mjfB^*(d delta 237 zcmaFF)XzLYbD~a5Jp%*7;f>t#KuWhH$S?Rm34megd+xtLja{BDjv*3~z6V{IS_}kO z4#browsmMY@#X*h?blZ}MSMJMv#X3NaYx5dsg-L4gFZ}o$A3i6(s&|Mb9Kzg%!NNTk^Z+brnk}Pc=;X7LwM#^ix4p|*`>Z+nQlFKUek+x zJ2PDSG90R-EvM$YcV{@ar#rSL*>`8U*2h_QWx2GcI(KEbbf!BuC)qEo4(`kGYEN-leSE_5f^*rL+d@cKYV?a3s}VXz1Yh6S0w51FGm zsL{Z~b_27o+?_7(yvh5vafx4p|*`>Z+nQlFKUek+x zJ2PDSG90R-EvM$YcV{@ar#rSL*>`8U*2h_QWx2GcI(KEbbf!BuC)qEo4(`kGYEN-leSE_5f^*rL+d@cKYV?a3s}VXz1Yh6S0w51FGm zsL{Z~b_27o+?_7(yvh5vafx4p|*`>Z+nQlFKUek+x zJ2PDSG90R-EvM$YcV{@ar#rSL*>`8U*2h_QWx2GcI(KEbbf!BuC)qEo4(`kGYEN-leSE_5f^*rL+d@cKYV?a3s}VXz1Yh6S0w51FGm zsL{Z~b_27o+?_7(yvh5vaf