From dee9e2587fbba3db4f15034368d92fa1c8e98954 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Mon, 4 May 2015 01:26:37 -0400 Subject: [PATCH] phase out several more redundant fence and gate images --- homedecor/doors_and_gates.lua | 34 ++++++++++-------- homedecor/fences.lua | 4 +-- .../homedecor_fence_privacy_corner_bottom.png | Bin 409 -> 0 bytes .../homedecor_fence_privacy_corner_tb.png | Bin 0 -> 262 bytes .../homedecor_fence_privacy_corner_top.png | Bin 409 -> 0 bytes .../homedecor_gate_barbed_wire_bottom.png | Bin 260 -> 0 bytes ....png => homedecor_gate_barbed_wire_fb.png} | Bin .../homedecor_gate_chainlink_bottom.png | Bin 243 -> 0 bytes ...nt.png => homedecor_gate_chainlink_fb.png} | Bin ...ft.png => homedecor_gate_chainlink_lr.png} | Bin .../homedecor_gate_chainlink_right.png | Bin 241 -> 0 bytes .../textures/homedecor_gate_chainlink_tb.png | Bin 0 -> 244 bytes .../textures/homedecor_gate_chainlink_top.png | Bin 243 -> 0 bytes .../textures/homedecor_gate_picket_bottom.png | Bin 96 -> 0 bytes .../textures/homedecor_gate_picket_left.png | Bin 96 -> 0 bytes .../textures/homedecor_gate_picket_right.png | Bin 96 -> 0 bytes .../textures/homedecor_gate_picket_top.png | Bin 96 -> 0 bytes .../homedecor_gate_picket_white_bottom.png | Bin 96 -> 0 bytes .../homedecor_gate_picket_white_left.png | Bin 96 -> 0 bytes .../homedecor_gate_picket_white_right.png | Bin 96 -> 0 bytes .../homedecor_gate_picket_white_top.png | Bin 96 -> 0 bytes 21 files changed, 21 insertions(+), 17 deletions(-) delete mode 100644 homedecor/textures/homedecor_fence_privacy_corner_bottom.png create mode 100644 homedecor/textures/homedecor_fence_privacy_corner_tb.png delete mode 100644 homedecor/textures/homedecor_fence_privacy_corner_top.png delete mode 100644 homedecor/textures/homedecor_gate_barbed_wire_bottom.png rename homedecor/textures/{homedecor_gate_barbed_wire_front.png => homedecor_gate_barbed_wire_fb.png} (100%) delete mode 100644 homedecor/textures/homedecor_gate_chainlink_bottom.png rename homedecor/textures/{homedecor_gate_chainlink_front.png => homedecor_gate_chainlink_fb.png} (100%) rename homedecor/textures/{homedecor_gate_chainlink_left.png => homedecor_gate_chainlink_lr.png} (100%) delete mode 100644 homedecor/textures/homedecor_gate_chainlink_right.png create mode 100644 homedecor/textures/homedecor_gate_chainlink_tb.png delete mode 100644 homedecor/textures/homedecor_gate_chainlink_top.png delete mode 100644 homedecor/textures/homedecor_gate_picket_bottom.png delete mode 100644 homedecor/textures/homedecor_gate_picket_left.png delete mode 100644 homedecor/textures/homedecor_gate_picket_right.png delete mode 100644 homedecor/textures/homedecor_gate_picket_top.png delete mode 100644 homedecor/textures/homedecor_gate_picket_white_bottom.png delete mode 100644 homedecor/textures/homedecor_gate_picket_white_left.png delete mode 100644 homedecor/textures/homedecor_gate_picket_white_right.png delete mode 100644 homedecor/textures/homedecor_gate_picket_white_top.png diff --git a/homedecor/doors_and_gates.lua b/homedecor/doors_and_gates.lua index 907c1adb..53c2ef80 100644 --- a/homedecor/doors_and_gates.lua +++ b/homedecor/doors_and_gates.lua @@ -337,33 +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", + local tiles = { + "homedecor_gate_"..gate.."_tb.png", + "homedecor_gate_"..gate.."_tb.png", + "homedecor_gate_"..gate.."_lr.png", + "homedecor_gate_"..gate.."_lr.png", + "homedecor_gate_"..gate.."_fb.png^[transformFX", + "homedecor_gate_"..gate.."_fb.png" } if gate == "barbed_wire" then - edges = { + tiles = { "homedecor_gate_barbed_wire_edges.png", "homedecor_gate_barbed_wire_edges.png", "homedecor_gate_barbed_wire_edges.png", "homedecor_gate_barbed_wire_edges.png", + "homedecor_gate_barbed_wire_fb.png^[transformFX", + "homedecor_gate_barbed_wire_fb.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") + if gate == "picket" or gate == "picket_white" then + tiles = { + "homedecor_blanktile.png", + "homedecor_blanktile.png", + "homedecor_blanktile.png", + "homedecor_blanktile.png", + "homedecor_gate_"..gate.."_back.png", + "homedecor_gate_"..gate.."_front.png" + } end - - local def = { drawtype = "nodebox", description = S(gate_names[i].." Fence Gate"), diff --git a/homedecor/fences.lua b/homedecor/fences.lua index 29cae658..f5b3493e 100644 --- a/homedecor/fences.lua +++ b/homedecor/fences.lua @@ -189,8 +189,8 @@ homedecor.register("fence_privacy", { homedecor.register("fence_privacy_corner", { description = S("Wooden Privacy Fence Corner"), tiles = { - "homedecor_fence_privacy_corner_top.png", - "homedecor_fence_privacy_corner_bottom.png", + "homedecor_fence_privacy_corner_tb.png", + "homedecor_fence_privacy_corner_tb.png^[transformFY", "homedecor_fence_privacy_corner_right.png", "homedecor_fence_privacy_backside2.png", "homedecor_fence_privacy_backside.png", diff --git a/homedecor/textures/homedecor_fence_privacy_corner_bottom.png b/homedecor/textures/homedecor_fence_privacy_corner_bottom.png deleted file mode 100644 index 16d04e1627192459d3338059261cd6ce828474da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 409 zcmV;K0cQS*P)vw)auO4_o4 z(yV)xc2=BxS<|h2$)t6Zc2t{uSHhfdlXOnSo^jBob1N&(x-L7oo|j}NXw*j$Dnh}rFGV>eUNcYnrup&ZA+MGN|Sa})~tDxbyCr& zc$j%s0001|Y@$&B004POL_t&-8BM`c0s~PH1i+4M+qRRn-`xL1`RyurhA#}>b|(yu zsf5AZC}Eh-*23T}Cc-dUPKCi4uY{q~^M#?_?g~SxY70Z!tO-L*F9?H{$QCP&fprd| zZ*af0JkBb#=?6pVQD$AC2j`>>rgPcX(J)K*Y`+pH{ubFAe{D`?2qPp8x;= M07*qoM6N<$f|hP^JOBUy literal 0 HcmV?d00001 diff --git a/homedecor/textures/homedecor_fence_privacy_corner_top.png b/homedecor/textures/homedecor_fence_privacy_corner_top.png deleted file mode 100644 index fa048ad5466961471951b2dc2eec09956e43ce9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 409 zcmV;K0cQS*P)};d7FG$nr=$TqjQ*RN|kn2+OmPttb3SxSlP3HvyjSHhfd#h!7{rgf8aPRycllXOqbqjJBPYtg27z?yE7 zb56*ha>1N&(x-L7oo|j}NXw*j$Dnh}rFGV>eVS}an{7*&X-boJRFH8^lXX(ota;I> zc$j%s0000Cy_rn_004POL_t&-8BM`c0s~PH1i+4M+qRRn-`xL1`RyvCG%c3SR~vTM z={vUTLN^k+S#Gv_qv2#}t_&caD^&cJH|UHPO07L4Geu#@T6JM4)uzIr<{M#{?JQx~ z9!|orKZe2(Tq0pOM_*xhy+dILJ`Z8IK5xR{-+#jXhFv{VH{~V$00000NkvXXu0mjf D8q~Yz diff --git a/homedecor/textures/homedecor_gate_barbed_wire_bottom.png b/homedecor/textures/homedecor_gate_barbed_wire_bottom.png deleted file mode 100644 index 000185ae8facf2310e7fa6e922bac599a2aa7f63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Uw}`D>x4p|*`>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(yvh5vafDl8b~5iwLAVXNC*i9-}zmh t%NA3Vcf|VXgP(Hl8^4X-UE0ov`5)%4Qk6BA=hXlJ002ovPDHLkV1h8^Ws?8^ diff --git a/homedecor/textures/homedecor_gate_chainlink_front.png b/homedecor/textures/homedecor_gate_chainlink_fb.png similarity index 100% rename from homedecor/textures/homedecor_gate_chainlink_front.png rename to homedecor/textures/homedecor_gate_chainlink_fb.png diff --git a/homedecor/textures/homedecor_gate_chainlink_left.png b/homedecor/textures/homedecor_gate_chainlink_lr.png similarity index 100% rename from homedecor/textures/homedecor_gate_chainlink_left.png rename to homedecor/textures/homedecor_gate_chainlink_lr.png diff --git a/homedecor/textures/homedecor_gate_chainlink_right.png b/homedecor/textures/homedecor_gate_chainlink_right.png deleted file mode 100644 index bd80d4c03805f4936d76a79a5001c49d37dd48fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 241 zcmVv&Q-K?%du|?$3+Iy zaz;`zke8$6waiix0Duv)PScPR5CuS#F=+*rDk+ix!@LV23uv~~<7S>EaP*iFkTHzw rW7EvzEv4@*mgVUWPh~h|k9Zva>;iN@r=&SV00000NkvXXu0mjf&=O)m diff --git a/homedecor/textures/homedecor_gate_chainlink_tb.png b/homedecor/textures/homedecor_gate_chainlink_tb.png new file mode 100644 index 0000000000000000000000000000000000000000..db5418a1b2fdb30a5dd1f31244e64119647d201b GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UAc6+)whDcmyJ$Nwihyf4lh4uP3 zC+DR7e&FORvSV$*BNp~o3DY`dBQNb!?>Dc$7bCLycjNnV=f7J7*K9lg<=BQE{_aUk zIbUBZh9osMtk`&A-kda@12e)G_0IkpWnm+xP{8}VjOo8n0~15*rsjfBl}4Sdo3Gd? zo(+GTm5^&G%=LanXYHl5{0T;T6DDmgPEZYzX~|f6*~rOMV2a>f{!_7njEr8dvNrtt s?zy^neXi2`_`H+xb89DW&Y4lLm%+d}&E{pKUmnOip00i_>zopr05c(Ep#T5? literal 0 HcmV?d00001 diff --git a/homedecor/textures/homedecor_gate_chainlink_top.png b/homedecor/textures/homedecor_gate_chainlink_top.png deleted file mode 100644 index 324109de7968bf0d6c427a9dba0e2f170a2b29e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 243 zcmVDl8b~5iwLAVXNC*i9-}zmh t%NA3Vcf|VXgP(Hl8^4X-UE0ov`5)%4Qk6BA=hXlJ002ovPDHLkV1h8^Ws?8^ diff --git a/homedecor/textures/homedecor_gate_picket_bottom.png b/homedecor/textures/homedecor_gate_picket_bottom.png deleted file mode 100644 index c22f319c376d9fbf874a025931cfee321314fe10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;bAV5XE0A7ZWqS)qF_r}R1v5B2 myO9RuaC^EqhH%IxD+mHP1`Lc`&pkwdECx?kKbLh*2~7a&JQ0Ne diff --git a/homedecor/textures/homedecor_gate_picket_left.png b/homedecor/textures/homedecor_gate_picket_left.png deleted file mode 100644 index c22f319c376d9fbf874a025931cfee321314fe10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;bAV5XE0A7ZWqS)qF_r}R1v5B2 myO9RuaC^EqhH%IxD+mHP1`Lc`&pkwdECx?kKbLh*2~7a&JQ0Ne diff --git a/homedecor/textures/homedecor_gate_picket_right.png b/homedecor/textures/homedecor_gate_picket_right.png deleted file mode 100644 index c22f319c376d9fbf874a025931cfee321314fe10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;bAV5XE0A7ZWqS)qF_r}R1v5B2 myO9RuaC^EqhH%IxD+mHP1`Lc`&pkwdECx?kKbLh*2~7a&JQ0Ne diff --git a/homedecor/textures/homedecor_gate_picket_top.png b/homedecor/textures/homedecor_gate_picket_top.png deleted file mode 100644 index c22f319c376d9fbf874a025931cfee321314fe10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;bAV5XE0A7ZWqS)qF_r}R1v5B2 myO9RuaC^EqhH%IxD+mHP1`Lc`&pkwdECx?kKbLh*2~7a&JQ0Ne diff --git a/homedecor/textures/homedecor_gate_picket_white_bottom.png b/homedecor/textures/homedecor_gate_picket_white_bottom.png deleted file mode 100644 index c22f319c376d9fbf874a025931cfee321314fe10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;bAV5XE0A7ZWqS)qF_r}R1v5B2 myO9RuaC^EqhH%IxD+mHP1`Lc`&pkwdECx?kKbLh*2~7a&JQ0Ne diff --git a/homedecor/textures/homedecor_gate_picket_white_left.png b/homedecor/textures/homedecor_gate_picket_white_left.png deleted file mode 100644 index c22f319c376d9fbf874a025931cfee321314fe10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;bAV5XE0A7ZWqS)qF_r}R1v5B2 myO9RuaC^EqhH%IxD+mHP1`Lc`&pkwdECx?kKbLh*2~7a&JQ0Ne diff --git a/homedecor/textures/homedecor_gate_picket_white_right.png b/homedecor/textures/homedecor_gate_picket_white_right.png deleted file mode 100644 index c22f319c376d9fbf874a025931cfee321314fe10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;bAV5XE0A7ZWqS)qF_r}R1v5B2 myO9RuaC^EqhH%IxD+mHP1`Lc`&pkwdECx?kKbLh*2~7a&JQ0Ne diff --git a/homedecor/textures/homedecor_gate_picket_white_top.png b/homedecor/textures/homedecor_gate_picket_white_top.png deleted file mode 100644 index c22f319c376d9fbf874a025931cfee321314fe10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 96 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;bAV5XE0A7ZWqS)qF_r}R1v5B2 myO9RuaC^EqhH%IxD+mHP1`Lc`&pkwdECx?kKbLh*2~7a&JQ0Ne