From 170d3e09c55cf982a6ed180b4bdf755cabbe864c Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Wed, 12 Apr 2017 18:50:50 -0400 Subject: [PATCH] clean-up battery box images, make more consistent added tube or cable entry overlays as appropriate. deleted a couple of obsolete textures --- technic/machines/register/battery_box.lua | 16 +++++++++++----- technic/textures/technic_battery_box_side.png | Bin 576 -> 0 bytes technic/textures/technic_battery_box_side8.png | Bin 639 -> 0 bytes .../textures/technic_battery_box_side_mv.png | Bin 587 -> 0 bytes .../textures/technic_hv_battery_box_bottom.png | Bin 653 -> 338 bytes .../textures/technic_hv_battery_box_front.png | Bin 0 -> 452 bytes .../textures/technic_hv_battery_box_side.png | Bin 777 -> 475 bytes technic/textures/technic_hv_battery_box_top.png | Bin 792 -> 575 bytes .../textures/technic_lv_battery_box_bottom.png | Bin 738 -> 591 bytes .../textures/technic_lv_battery_box_side.png | Bin 594 -> 236 bytes technic/textures/technic_lv_battery_box_top.png | Bin 337 -> 197 bytes .../textures/technic_mv_battery_box_bottom.png | Bin 738 -> 591 bytes .../textures/technic_mv_battery_box_front.png | Bin 0 -> 239 bytes .../textures/technic_mv_battery_box_side.png | Bin 587 -> 159 bytes technic/textures/technic_mv_battery_box_top.png | Bin 337 -> 197 bytes 15 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 technic/textures/technic_battery_box_side.png delete mode 100644 technic/textures/technic_battery_box_side8.png delete mode 100644 technic/textures/technic_battery_box_side_mv.png create mode 100644 technic/textures/technic_hv_battery_box_front.png create mode 100644 technic/textures/technic_mv_battery_box_front.png diff --git a/technic/machines/register/battery_box.lua b/technic/machines/register/battery_box.lua index 7238d6d..bb9c29d 100644 --- a/technic/machines/register/battery_box.lua +++ b/technic/machines/register/battery_box.lua @@ -3,6 +3,7 @@ local digilines_path = minetest.get_modpath("digilines") local S = technic.getter local tube_entry = "^pipeworks_tube_connection_metallic.png" +local cable_entry = "^technic_cable_connection_overlay.png" local fs_helpers = pipeworks.fs_helpers @@ -208,20 +209,25 @@ function technic.register_battery_box(data) groups.tubedevice_receiver = 1 end + local front_tex = "technic_"..ltier.."_battery_box_front.png^technic_power_meter"..i..".png" local tentry = tube_entry + local bentry = tube_entry + if ltier == "lv" then + front_tex = "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png" tentry = "" + bentry = cable_entry end minetest.register_node("technic:"..ltier.."_battery_box"..i, { description = S("%s Battery Box"):format(tier), tiles = { "technic_"..ltier.."_battery_box_top.png"..tentry, - "technic_"..ltier.."_battery_box_bottom.png"..tentry, - "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png", - "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png", - "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png", - "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png"}, + "technic_"..ltier.."_battery_box_bottom.png"..bentry, + "technic_"..ltier.."_battery_box_side.png"..tentry, + "technic_"..ltier.."_battery_box_side.png"..tentry, + "technic_"..ltier.."_battery_box_side.png"..tentry, + front_tex}, groups = groups, connect_sides = {"bottom"}, tube = data.tube and tube or nil, diff --git a/technic/textures/technic_battery_box_side.png b/technic/textures/technic_battery_box_side.png deleted file mode 100644 index 98a22d61d89b21fdd75e4b65f324826e65d7ca88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 576 zcmV-G0>AxPrG5QV?0p4eks z%#2uogya*jLqH@TKSpAKSipkouw()E$V~u=8xTb@h!si%iZKphX1a=n>2{)Qs8y@` z^?R?nUd!{BFP#6V5CSpAEBos1hzL`gv%5D$RcR(QH?QBI8eO9vS2UBFW>N$2r24_^ z@d#A~pa>ygW*pQfgs-RUa2I#y`1qK`VgW#1*Hl#nz$-r@%)ju^?ra=ftYlL}0NC2v zLPQ85kg>9E37{}DM1>ku7yq>=YpzAuyvc$}CYopN!fH&nKZ@+!a#Hy+rph|Y| z?=TabpP%QocWY-Ng2osx0aca3U_jsZhzLbdWV^X!BT|S6?#}LV8Er2E7wZtT~gof&Tu%)xVHau)j{gb-15Z~9uZ-+T4kKB6bV9% zaZQj$l2RE$plKSKrpY8lQP3{C9I}*yB3VqSb9a9JUS9ei7X>c<6M(<*<@(UpWBt?s O00001HxB#Dyj%Jb^nDNko3e#D#GI3l=6mix1#Kn7H9h)D;gP zAsLJ-69O8>8HVn@bzSsy3$n3R)m5kKe)pUz**n;G{$qp?Fta=B>h6dLt7**kP8U^W zr8nfkz55LEKEve!E4?8ry&(WE2N#T97M&CAc{nOi!u)zPiHQ2_evGrEUozrj!s7Mzd$wskNIH0;wp7 z{XV!;RTZk*>I_3fP!R#(VR^#tC<7p+L|9rvRPhConc?m{)pMS2b!tj?B7lh09*jS; z$z#g0gv(1L1Xy6_dCs($@jg2y{y1e*)^K-JRY{9}QE3T0rMmipa6X^6K6zOuCn7{M zYa;8118|_72?31}jgjv1GSgzl_GAP3 zEjaaoZRyoCW_Og~?sZEdxEbmCnpBo;ysK%vZbs}AWnPO&`8L2Em72J^!=ytoUuBfi>5;VOfPqkqpge=3W3O8dq zowhoiDiQ=UL-r2#y@{lWbCCCmu|B)GfiXrdCO_+l7Z0!{aQAl6-MPG)+{HXcdi7q_Yk6^UV*JN(&f&ek^{!@yh;St5JbziDsuX$7;dsoj*JIT0Q{*{Co&zwu z^OO1M3RMLlbIuV$;A}EOKi_4_0yAT|TvAmP0He`};cy7Ro6ZCD(}d%&xKglxqD&D1 zpwsCfA~@$rSXG>JI|U&GM1-eRgD)>&5A2+yu4@K^0d3o&stM;Wn`rFxFuY@aS^^M4 zzWGyv3fop8Mm_jt_L-4L&(DDUIFC(b4MHZ!{2Zi3bA-`fhJw_uhE zV|YY_&1REux>_KYpDX1+M2M+$&QTNvMNuS@EX%0Z>lCsWuq;Z9sWUVF?Ctz!gZ+O3 Z@DGZh1ES1=0eL8Gix*005AYXf^-<0U1d|K~yNum6AbL12GIkB|Ae8!a+C>_g}SR zSuC6mg%xCxmzU&QwrswCe&9cA0a&*Mz%~FFAV>nh>~jwQsC%tB#j#)yLk5$PF_`UE zyWMAP1po{Jq`_bw8OI{olGWBI?{H6rjD1+SZU+FjNqT4XOn-O-BuNHA=G)4Zwz+6q zrGX*9_*MYG43fE$8MzWbmnIbKt_Jl4Y}=7JVzDxh+_sd)5RBH8W@5UvJ6%*TPMlc9KkGcf$ z+6R(@jR6E&-8*OLl-v91Qn>OP9k=wTR$I3F*N3ezbE2OEXM1LGGZ#?z`uli)0kjCx Uouj82pa1{>07*qoM6N<$g6Zds9{>OV delta 639 zcmV-_0)YL}0*wWb8Gi-<001BJ|6u?C00v@9M??Vs0RI60puMM)00009a7bBm000iF z000iF0gmj%`~Uy|2XskIMF-sl9s?^bva&>S0006SNklV{aQB_>I~Eu2qJV8^_Yk$x*0B} zP(UxLvKe+d$A9yI-8Ps>%tTzdJjrt+Cgd69y9@8?Wz>6Wmn7eP`URy+a}9{PuoAw1 z^9$@oK4KXRI91TgNE$kdM@)YF>1Td>^E?KfYukBxWNNu2>Ibc3TxXDySe z;pQAq2iG-;83aN6@h5Rj#0&yNp|j{Llv*|Dndt7=ZGRwLTyyf_nHvT8X0VhZD%kF* z3|n!D(ADH)GBY@CJGXtu-FbOF$eLsp0J=HiDE#LD3O$p&Uvv~+Sx6Le zY}6TaHh2T*T6C9cMcb%zQZrWRhLP2HXG1rgMMl!u@0+RA6^K9==$_ck=_}W;HbbM< zn5d?%psu85V#l^jjijp=*kh9SwTaGJyQ#)Sm5QS8lge6PXMFsSXRL|~5G(4MMcfln Z;eV7BT3EoYQ!)Sm002ovPDHLkV1n2sA(8+9 diff --git a/technic/textures/technic_hv_battery_box_front.png b/technic/textures/technic_hv_battery_box_front.png new file mode 100644 index 0000000000000000000000000000000000000000..6f23439bafb933cee2b56000638db8d438716e38 GIT binary patch literal 452 zcmV;#0XzPQP)li@IzZw>=!lX7iY+d`BZ?Fy74)?CPY@EJNCOoGzabq;b63zr z(G^<&5|D^pk8KJc`$2~r+cWe0-kUKk?+@{s#Q-Fey~>?_%1vtgqxGc?rG`>NSi85^tHG<*?P}nOwwU6iLjV&*AG8;wh^99 z0~i(K{QQUw8`A+uB9bMeVw_(bMK+G=qDW#UqBbDRQhx0=)yB57wFnVhrLFBDAf2ppp_oc}s u^2CmDCUrBkREb;D$JF>*6;V{x=6nKs544dm6%mjC0000Rl%!aN8Pf(kztP|)xaR45gYf(BEBR1|=O0I}Y=Q0zL!9h`D5=b!JNq49i% z|9K2RYkjixm-mmQ5-B2;XsueS4vG%SMOJGCK;!vLYdu@M<$s~xxH17i#3aPRLtYfLxfM2Ja>a8V)(_w-25E}NME`i7m!QQxDYbpeo(M3h7Tw)YOhJAE3_nTS|LigXj2dCzCrdBA@|6I1rhs|ZoXMnpUOn|G$=Qt2vU z^=p`CW=7ne9!KlTU(HG(@%Y=%r~4CYT5B!Ly=m?DvI7W@2j^d(O%8g^@q8wgeERr~ zw`6-~$|@{O%)|u1nl{WArzh2D>*{cKb8!{*>&YY_JVl~4Z@ptMTdozfRxV1saSq{; zo|(~sfhbyAD@1Dm901XU(V2+^sJCnFk~Q}4=luuyvCW3Xpes`V0000j+kJCVGO}2GNAbYS&AE7xOd~)om)SH;L?p7zkh){g+M?A7aC9lQJhRN ze|la|zwY~Pm5bNRqM#_KQ>W^jlG~p@^yPF;NkNj1SQh{w0`B18?uZJa!s5JTt*q$O zD8~bIIi2&Ui+uauZ9cw#NHd6*GHA03}zpeyjyfNgR z#U2}H0e?#wH^;nZApq{!GGp$%HQD8U^EyRi2%uulZkKqlv*7L zc8$6@)^%ubJQ<#Qea(9YW)29R4b0Hhn}CA|5p{F64)&=h8|2nloHVGx^*{;e( z^X~)XrYY5Ew(jPFB_HuSz{7uj|NZ&SultR{5+WxAh?FQNa!6%aJiVg3*wOTIxWnHhYfNPNuOt0C`%@|lz(7BDO{>sjM?Yjw&w<% z@2^)8@?d)0x3As+U@1~qh%=wwv<>gg0rveEZTK9(^tf+NUkT7n$9btsp)7KYDLHLh zb2CQ6Y035I`}W2qBHfS4g{t^B%Odpj~lFu$Kmklw4e zade&S`uP63*P1rC(CH+9tslb7%q*4anoEt-s;x!qqmRe+3zlkO(_3jNApjzHph5D; zs%~?}u(=;dlqj#4i!4>vvrPv8QiJ<$X3vyUkv#yaFv=Cp5@bZ|bC_9Vbk9S9bosd# zH=8;;Cn_f57a|;rK`B$pluth*(8AIw!}tClghpQ<-VwHn00000NkvXXu0mjfLNN*; delta 780 zcmV+n1M~d91egYp8Gi-<001BJ|6u?C00v@9M??Vs0RI60puMM)00009a7bBm000iF z000iF0gmj%`~Uy|2XskIMF-sl9s?{ZjhQAo0007|NklB__~2VUJdIuY_X zqebX8o}4o|Em-SND&n>SsWeKB)K-Y5Vw}_Lw}y=ooEX@7nsq4WvA(00MofV;uT19& ztZ*Dhyff5hF@LAy#C=%Vc!#$RV+E@Wxkl>oLML)mREFvEZ!WMKGcXQ`hV_M?tcD*oFX|zzWwPhzJLCL zVYonAK}6%dp~Qe$W9BeLYyjsQTO8l~@H?$l#&JYM82X;O-(K*}qf4d`5bscHAy$KN z{ROsj#3c|;Gvl~mv?kJU&LJW+Kx-(vak<+f#)A?<@aWDtF8iK~&N5h`^Nx?-e;X~9 zo0}W1_J4a)seE+%n1?qz9$f9X-VR)Cd%U&i90GAV(^917OqeE~Ji6xT?PF9eY@FuP z58mXhH}<5E2x}mhj0S2>sAr#j(r(ld5shwOoWoiVT49DQu|ixHYEG=DGp#nP6+{~M z>@a=rcx|}ES&Ow6>pDy~AiksZ19@F(YaoWmX@7GMKxu_kSNy8cikFSGDGHj}gq$lS zC0Z<`c|jS2Ho~ym;Wiy^*iupjz~lnQxlqa(EgJ7;8qhh5a{r=AK_e)o2q{uZp^2ha zA!aanbIt54r6h6+SZy)JGAad2Mm2+$m!!X1s?1wjx2g~uR75YbAlF>0l_ z_nguk0})e7WRy}`6XNA^5rENq&e>SYW87~ynbSLGtSz+yqA`XVb1ek`5TLc@oD%>L zS-l6uBj=P-Yi){HV*r4hbEOpS{d_))NG^pCMTD7+)}&NpZmorNMMMD5$8k9C#~T*&$l;b7LlB@ zF{byPj^ld0YU|wd@u;G z-BQoBMhK~4GYdAX;6f~rxB)vPZZu+=8M-U~!cN;Pim8xd8-MXB-V61^^K;+#9cwMM zRsi;GW144LYglVJ&l96Hk~7mZk#pua4(54A@B2=Sk?C>)AjXLIp4J+zHHDG`Q&WnDSXlWp4wA&_&%IY;lEbzO-ua-JvFTDE=Xn|Y>`f-R*W zB8UjiT5`^moPU|-nG_@YzLQeo-!ES<#z5~#&S<7 z<$_X*aTwY60})|cH(oydLoFx6FmOo;r4;X;o^F^$gx(s%FyOsMK7WSZC}-ho8KY?^ zlv4M*E(rC7$~)n;)onVt(AG6s4cUuE4}xdTv}6W#n$uWD1~tx z(Mmz@EPva=habPk*%7P24+A1QS%h&Mk>j|f6+wOb{(U#b+@_X-b&j{!S7J)kS~14p zy=UJxtaH#i&U>!cE5;aX2muix=S&u%Z5zfIYOQ$h*|rT4;VcE;8aZdeINlZ4tu^Lp z!a0XFhL{r8T0#goYkBwdgx2~dPwzLB|I;X?U{3daC+ExuQzApX`m@{czn-!&r00000NkvXX Hu0mjfg$Pmy diff --git a/technic/textures/technic_lv_battery_box_side.png b/technic/textures/technic_lv_battery_box_side.png index 24d4e4ec9985554b5fb815f08e7e5232ce4453f6..4d435acaa3a9c6ada5212d1aed4c4bca32fca0ed 100644 GIT binary patch delta 219 zcmV<103`p?1ndEj8Gix*005AYXf^-<0JBL%K~yNuWAqOVWgrDGK`0x(=M5pM3=9n4 zFaWYF0|NuIhPE~X1H(M#C-dJwR{ALL`}gl4A0K@k9YH?6?_a+B{`ZfWnRy=bllgBS zDSZ+^*g%9+7$GzZgmU?&$?yoLVq{r#KVSvOvQP~Te?HhA-&BoDL&KjBwrBUDXkcJq zU|?p%=ZD{aF*FQ9PaoWY$J0*d4rBO%lLeoj|NJD=4_HjyymKcWtI#!YadF`fUI6T6 VS}6N0GU@;T002ovPDHLkV1mpBTs;5) delta 580 zcmV-K0=xa}0n!AJ8Gi-<001BJ|6u?C00v@9M??Vs0RI60puMM)00009a7bBm000iF z000iF0gmj%`~Uy|2XskIMF-pr6BZjYAUPJw0005sNklPrG5QV?0p4eks z%#2uogya*jLqH@TKSpAKSipkouw()E$V~u=8xTb@h!si%ihnT~I%%=lJ-T#bN@ z+CoGKA&{}MZhr}&Ff&Ai+1Uf)=a>)Ooe%mf+%-F2xuz zGsfdFtM-iDw5aMpxbdTMj_XC>~Q+0*z`HIH{{bDln{vY8?+4(b#1(>wOUHfDyI zp{jIU2SD4l88c<6M(<*<@(Up SWBt?s0000uH48Gix*005AYXf^-<0E|gQK~yNum6EXv!!Qg)6-Sq)!3ctXt5g2} z2SP!ZWQkJf;9}^~NSbW8gLfwl&vm89@N3)r>ZKGWqAcQ3S5+e7_5tu;ZD#F}oG|a} z3K-1n*!OQ}kGiU6k%pZ-FqozuGEs2u4I{IiXP_kjS){7A6)n4v06gY7mSJT6skI~C iA74KbuVE=ARO<&5gDv)06EQCU000068^jL|6fUj}HTbluQ1OF+AptVM=m7mG9#;{r|L@<>?8AkxRrOT3Nt#Q3vFf-ov z`*i?-I!#EzQbJv~9-u#bS`3H?(sql?sM9q2u~vbZk#ok~xeUYl6f7m8HMV_^yWazr zTpW4>|61w-i!Da2dJN~ T*GQ{_00000NkvXXu0mjfpmvRZ diff --git a/technic/textures/technic_mv_battery_box_bottom.png b/technic/textures/technic_mv_battery_box_bottom.png index a61066045e69a3957d960ab08593e28ea0cfa2e6..0894d5fd5bd39b723996f5102e970c020567bc41 100644 GIT binary patch delta 577 zcmV-H0>1s?1wjx2g~uR75YbAlF>0l_ z_nguk0})e7WRy}`6XNA^5rENq&e>SYW87~ynbSLGtSz+yqA`XVb1ek`5TLc@oD%>L zS-l6uBj=P-Yi){HV*r4hbEOpS{d_))NG^pCMTD7+)}&NpZmorNMMMD5$8k9C#~T*&$l;b7LlB@ zF{byPj^ld0YU|wd@u;G z-BQoBMhK~4GYdAX;6f~rxB)vPZZu+=8M-U~!cN;Pim8xd8-MXB-V61^^K;+#9cwMM zRsi;GW144LYglVJ&l96Hk~7mZk#pua4(54A@B2=Sk?C>)AjXLIp4J+zHHDG`Q&WnDSXlWp4wA&_&%IY;lEbzO-ua-JvFTDE=Xn|Y>`f-R*W zB8UjiT5`^moPU|-nG_@YzLQeo-!ES<#z5~#&S<7 z<$_X*aTwY60})|cH(oydLoFx6FmOo;r4;X;o^F^$gx(s%FyOsMK7WSZC}-ho8KY?^ zlv4M*E(rC7$~)n;)onVt(AG6s4cUuE4}xdTv}6W#n$uWD1~tx z(Mmz@EPva=habPk*%7P24+A1QS%h&Mk>j|f6+wOb{(U#b+@_X-b&j{!S7J)kS~14p zy=UJxtaH#i&U>!cE5;aX2muix=S&u%Z5zfIYOQ$h*|rT4;VcE;8aZdeINlZ4tu^Lp z!a0XFhL{r8T0#goYkBwdgx2~dPwzLB|I;X?U{3daC+ExuQzApX`m@{czn-!&r00000NkvXX Hu0mjfaad9R diff --git a/technic/textures/technic_mv_battery_box_front.png b/technic/textures/technic_mv_battery_box_front.png new file mode 100644 index 0000000000000000000000000000000000000000..63ed41c81981bbefa202024a0001c98b126bb319 GIT binary patch literal 239 zcmVZ` z4-I7?1u#J<8@}faA*u`v4Bs#SvMd7w1G9#dzK)I{ zAK&*cUw;4l$IQ$;k6U!XXBNe`pAj|?;S{J!76|3??gzuWC%6WjmxcxwMf>Z&P&6tIZ#00000Ne4wvM6N<$f}1Qm2><{9 delta 573 zcmV-D0>b^D0m}rC8Gi-<001BJ|6u?C010qNS#tmY4yynF4yyrWk_jf0AnZZJzaT7l^5T-1tA1P zgr`-5FE3yZ?0=l2u4@K^0d3o&stM;Wn`rFxFuY@aS^^M4z$csU!-(DwsoZbb-z5CW=7(=-6o zb)9g%5BGS?*WD1Wr6}*?y(i8k`ZhDV-EM-_?cdu9qPJj{3S)Rggw1A?aJpI`m!B); zKtzbCbT-aW6a__5B$6!4sMqThvKX)|N{p#9Gyd%D{APpwe**9iil76c00000 LNkvXXu0mjfoi7ft diff --git a/technic/textures/technic_mv_battery_box_top.png b/technic/textures/technic_mv_battery_box_top.png index b32100f977603be82e499cfa6dfd8544be71675b..6050ad0c30b17d23b91293c89b30b96ea84a0d26 100644 GIT binary patch delta 180 zcmV;l089VT0>uH48Gix*005AYXf^-<0E|gQK~yNum6EXv!!Qg)6-Sq)!3ctXt5g2} z2SP!ZWQkJf;9}^~NSbW8gLfwl&vm89@N3)r>ZKGWqAcQ3S5+e7_5tu;ZD#F}oG|a} z3K-1n*!OQ}kGiU6k%pZ-FqozuGEs2u4I{IiXP_kjS){7A6)n4v06gY7mSJT6skI~C iA74KbuVE=ARO<&5gDv)06EQCU000068^jL|6fUj}HTbluQ1OF+AptVM=m7mG9#;{r|L@<>?8AkxRrOT3Nt#Q3vFf-ov z`*i?-I!#EzQbJv~9-u#bS`3H?(sql?sM9q2u~vbZk#ok~xeUYl6f7m8HMV_^yWazr zTpW4>|61w-i!Da2dJN~ T*GQ{_00000NkvXXu0mjfpmvRZ