From 3e04d6987d1fe01d816034efc4f6cacab0495b17 Mon Sep 17 00:00:00 2001 From: sdzen Date: Fri, 12 Feb 2016 17:49:17 -0500 Subject: [PATCH] Overlay water and lava onto buckets to reduce textures, ditto for the redundant gate textures --- data/textures/bucket_lava.png | Bin 0 -> 481 bytes data/textures/bucket_water.png | Bin 0 -> 521 bytes data/textures/gate_steel.png | Bin 622 -> 0 bytes data/textures/gate_wood.png | Bin 677 -> 0 bytes data/textures/tool_steelbucket.png | Bin 254 -> 1029 bytes data/textures/tool_steelbucket_lava.png | Bin 295 -> 0 bytes data/textures/tool_steelbucket_water.png | Bin 296 -> 0 bytes data/textures/tool_tinbucket.png | Bin 240 -> 1193 bytes data/textures/tool_tinbucket_water.png | Bin 274 -> 0 bytes data/textures/tool_woodbucket.png | Bin 443 -> 1262 bytes data/textures/tool_woodbucket_water.png | Bin 390 -> 0 bytes src/content_mapnode_door.cpp | 4 ++-- src/content_toolitem.cpp | 8 ++++---- 13 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 data/textures/bucket_lava.png create mode 100644 data/textures/bucket_water.png delete mode 100644 data/textures/gate_steel.png delete mode 100644 data/textures/gate_wood.png delete mode 100644 data/textures/tool_steelbucket_lava.png delete mode 100644 data/textures/tool_steelbucket_water.png delete mode 100644 data/textures/tool_tinbucket_water.png delete mode 100644 data/textures/tool_woodbucket_water.png diff --git a/data/textures/bucket_lava.png b/data/textures/bucket_lava.png new file mode 100644 index 0000000000000000000000000000000000000000..7148698df388bb7a7eee9dd83c3e154736c8e23f GIT binary patch literal 481 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pIsiAPLQr1<;)SfG$>W=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<3fz`*G0>Eaj?aro_(vsqUHB#wQIKcvXw$sT6FTVF& zp!3gr73U`Zyw~??AKS@2Fj%_daC*(znV~lSjdar2KM>w!808c2K*BwvT;uzCzha3R zi`(2oR*94grWiy}p1fMIud4RP#NYYP=fkYLmM=|rmFt#;m}Yv%1x^X?y{7A5 zZI>^x$-v*^-n!W*zP&ryHPaw=m9*51qJ0mJ?)k5zc71E$_nhUsXPoo(JDDY?*Z$OJ z{oBXkpO@Gqf1G=@=*QnL@il74=c|0ZB^&*;Cr_K}&$DCOL|^=KYV=SM>U2@s&#;+2 VM&aJY`LjSF?dj_0vd$@?2>@8!%5nez literal 0 HcmV?d00001 diff --git a/data/textures/bucket_water.png b/data/textures/bucket_water.png new file mode 100644 index 0000000000000000000000000000000000000000..a81db5c9855a4c62059f0cb4f27dc3ec536e22a3 GIT binary patch literal 521 zcmV+k0`~ohP)WFU8GbZ8()Nlj2>E@cM*00C`DL_t(o!|l{PZd5T4 z2k`%l{ro=mgD6rc;06?txC0fU;T9AWlr&s`0!3nTfE)s@Pt;cEMZaU5eYGxmd3zt?8!> z27tP4QXZm7QYHd9=kj7XAKSLs94@;bz;*4eL1@?E?7ht&EQE=~G3jOBlO!d;h{+jy z1`(5aA7mRzL|8@f{rr?}bprNh?_?&D5;-#o^G@5@j8hz-B1Fznr~|+Z5QdmTEvg`* z{ojGMsr$OA#!!Xi>fl7xWln-a^}7zAd;)*-;??_~aTsS~lG;0$&d=UG{BO_jUyh%@NtTVXWPDqH zbW?hH9|698KB+?2F&y)q{%TKOzO|`6drcgF_qfvlMNt$*QQX88E^3`)wHbUY00000 LNkvXXu0mjf19jCt literal 0 HcmV?d00001 diff --git a/data/textures/gate_steel.png b/data/textures/gate_steel.png deleted file mode 100644 index 751cbfecbed3321e75a32180d5d106b6c6cf6a39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 622 zcmV-!0+IcRP)5Bwr0{)`hKiA7>ZFbsi#u<*mkgu{KP=&s7n z%&uyo*XzaO@n|&q^Y6M|um5fS-G}e@dpI0UrBd$UkjrK5xveP5<#HK~Mx9Q_bq~5; zKA+E$Bt0IFe!m~Q-ENsoX20J{k{ApIKR!N^$>i~P>~wxC77I;NDHV%FN~hB)5{U#+ za2zL_%?bel1O*W7cKhq=NW`kDsw8)=E6Xy+r$R25!=h=L6}__EZV^GD*=)vQvGsZ# z3Wb)-r7Vg>U%~Ud`FyVHx?|h*dL2u(S`9Lkxr}VNT%JrUTs#$CmPkSHS^uN~(8CR` z)oN`vn?|D%csyiT0qHB?65VRG8jVC<*X8)a5xGOjwjG{fnwI|t4tRxo@4EDqJ%Wiu zf=5%rZKYb7&1R}v@)Zoj5JibpKA&H$Rx~jX2uvmuO2m??8kPYObMO`5a~!)=D)IV4 zp#Yl8q9_iBLt1H?hOX&Ace|ahK;vlL^#A|>07*qo IM6N<$g50hWbpQYW diff --git a/data/textures/gate_wood.png b/data/textures/gate_wood.png deleted file mode 100644 index 4dab53673f7103a14234a3a075847e4acdd46bcc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 677 zcmV;W0$TlvP)HF)_u)@JJ{@Yf3#Ad!k2fd_NRL~f2MQ!dou~oki9<9VjlTY>@@e*4vqT&{nui(s zPKCy)U>AD%m=wac%b`>=Z5FzN zV2Dx7vYMiLIE3?Tv?_8>=^|XGWz4~J5W7Oq=n}l^U1IT207{DMnP=8bs4S)Oes3XK z3`oEI`Y{Nk8Ni?e=;0HiZH>ltdO%39Cit%dF#y4}Ieq`bciO~cyL6!Q=N{bJGq@%1 z%p5{ZRAOQa1>6vn;Pezq8`~$y5FWn~5v(5qbVpMcBX(nqQzUfRqwb{j14f4O%G(uH z5Ii8cqsX>5E37eU&^_V;RQdFtykGn6Bf9$D%EJstSC4`7ez~GIgF5mu!eVje>9Hfx z@4x)qARC3TZ^WR@=NfGQ7d+MZI<|3GgBa$|K)On!{PZo#G1PLuis<@f9b9IP%wG@fDS=zpK}l~4vR~gKWyRp_USQNbqU~+VoCM?|m!nCI zDNi}m^V=pOeZL>azjZ3>x_U%0+-~MN00000 LNkvXXu0mjfQ3N$z diff --git a/data/textures/tool_steelbucket.png b/data/textures/tool_steelbucket.png index 57f7718c457df35877f5d945d68a1e76a67557f2..7ef4297140b216b734772e0d30fc7969f37f595a 100644 GIT binary patch delta 976 zcmV;>126pk0fh)NiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<=24YJ` zL;(K){{a7>y{D6rJRS<*0t^-s7@4(dy^&-qe*FIF7+N$Ii|UE-o(C`jDFfxVyVU ze;mhf&S5^ELkI!RIXLHFjKMh<=HK4l5XUjHEc-qKlgY&Q`+YFRP!t7jZf=4@&iP6J z)>=5{Fc=J=wT4m(aU5ef9OCr!lx@X8tJOkL6u7>=4vyBD_ddK&r&BoRFdPn1*EOco z>E;YfCKE5EM4G0!y1H75dR6qq07c&%f7V)z$79rWjc&IKDJ9O%&X#M|&N;FyTcUau{Y}SOYuw-8qucFb zHk+*sO0L>0iXs?e;JpXu9HY?)Pft%!N}(uj#4Ylv3}T|8`EnYy^Nxk3`f|f3MerQVN|; z2SNxi#zJ1LwXoJgDFq<}wAOIW1y*V9O8}g67-PT~3kq)z0I2Iabh|W7;k`#yRRP3e zu?P&3b89V(F`oc@s)E*-8d06AU52MM*MxF5B;J_2b zQ4~Q+i71K?$1#Ku0T3~!l!7q^&(F^Q5K_n(gE0n|mzUdhLfTMDx#Wykq3=-?g~kH_ z?RGmbL#a%XWc$O2N|5s2)By=kN(s(6y!WW+7i&39s^)9GxVg4^3$?Ca~>imR-!0E6h%mq1dK71Wr;k`p|xH*bWToA{_aN9YPA3$ zIQ}>&ze$pSa~@hRRmxZPf8`%aDO6SUsUuQTYHCJG8Rn<~{WSpUY_y?s4vaBqt(U%& z@~JA;9YEi@6(1fRdhb1Yy&gK9PPp$0AyAejilRVW*Ra+i&vTrgpKrAH#ERLtqy<2jg9S)#{bl|NNHG=%xjQkeJ16rJ$YDzI zc6VX;-`;;_Kaj^+;1OBOz`!jG!i)^F=12eq*-JcqUDU`Ft#VP04LazrCx)>PBw5J&T=Kkmpw3)%v L)z4*}Q$iB}5;#S> diff --git a/data/textures/tool_steelbucket_lava.png b/data/textures/tool_steelbucket_lava.png deleted file mode 100644 index 9821e5dce7108261dc930427aba646102d2265bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgg)Zdray@#n4EEak-(R+5nLCymP z9InRB?Jw;jk9r?JA*VO}Q?!!T+Nz!p2Txbm<>X$U>6rCk58vdjC#>f!CLW0qQL70(Y)*K0-AbW|YuPgg)ZdrZ{;h&$K*nvW-nIRD+&iT2y zsd*&~j6ea7nZEak-aXL9cV$B14 zIiESlp6uDHF+;-nz$B@#>W@h^Z3}KVIT)8QKRZ94|JV&4rj4^_&HAUVrY2;TaD82D zff+|L4@0I}3d0?N6lRB632XwFdM=9|xy8rtk@EboNwdMlOvalGGZc^9=zGL9fi1;n g&D)kqpA=Xas`p*1_DHz78t4QDPgg&ebxsLQ0I}?0sQ>@~ diff --git a/data/textures/tool_tinbucket.png b/data/textures/tool_tinbucket.png index ca364fff10b659d936c191cef01065c528fcd5cd..e862306e28b063991255096aa34579ddb4d0be6a 100644 GIT binary patch delta 1141 zcmV-*1d99c0jUWyiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<=24YJ` zL;(K){{a7>y{D6rE*=Wt0t^-tFtr==29Z`Pe*_IlL_t(o!|hkSPV-088|#V)Ra=xYBijnf1le^zP(TW1^}g$Wnl8YwY3G#IqLN~!Z5_{ z?k@S1f$?|@*L9(_ejhQ(*SF^RMx%kjV1PoQ0M~V=m!MQCA>y23v|23y zz|+&yhrr%OqtQT;Bxp99SYBSn{rx?L!{KxQQc46tfGCQflmcT6Yinz`xw%2Pe_Ted z*UQDm#>NJO5GWK1NYfNTh&bHlv40K4~#L~ z-QB%nWoc;%v$L~s90!asjK^bSSq7z4J^=N4-O4J}!3Vh$U!^*HKguwj#fBbX+j4>oh0z!yAh3mRtjDax*$8q4gE?n0I=N#p7 z*{N2mh@wa;rKD1d$8l`gGs%Szh~s!VfQN?%R4Ns#d&U?%&$CGlCI(R>~|^UPuF!pDYbexCE%P}K$KF`e~f~2u7nUs zk_1r{y<+MkPxuFbFbsP_h(D4f`DspP7%(8rATlfvLZFm#7-Q6cGMcB9qEIO0H>171 zJptg))6-KZrK}n_=dUK9X)q&I-}lQ>N}H51hA4{QI1bV@{kj`!t*z81n~*VPL77H1 zhQv9C)*6g4TRH&mPCyeMe>%)$o!@!@=N!K8TY!_mOpk#77r)NH_4PG2 zH#bo%7GE)8*x;Ol5MmRX)23+(&-3inY&LOobMy6m;Ns%KRZ9IPrTohzn3SLI`xcNX zhf)ezmf7jY7{m7VHu+C0+2!S>HgntzAp^uTrm439kR%B_&qJ|Tf5htQ>ZduTZW(5- z8wMulg4X(#At|NcI1Y-%B7z{u<(gA>!buAjLV!|gCmQG6`bCyypp?S*eNak~BngZx zf5}#Se0;2h5LjGX#KOV?3WWlKAONKl{eB-WFE2=v1WGA%yImX{9FSkaz@$yj&(C8t z8ll~8!*yNE&CP)^D~5i*k0^@J@AokpjZmpnzCU=rBX|4_XO7~D%HOzt00000NkvXX Hu0mjf4gd%? delta 206 zcmZ3<`GGO4Gr-TCmrII^fq{Y7)59eQNDF{42Mdtg`pf(kkYX$ja(7}_cTVOdki%Kv z5n0T@z%2~Ij105pNB{-dOFVsD+3#{mvl_}ja$0(5VzhQXL!_sRV~9p@a>4?&AN@=l zJ@p!#d{h%oGO6rf@Z}8g=a5-6`{RFR38k2V2leX9n*Il*vL6r#WsEpkZ*xf_?Lh!T yG5ZmgHHse@*RcfKU+MAFII>KB6${@=4u%W&7wtQ;bEzWGW(H4JKbLh*2~7Y9Mn8=J diff --git a/data/textures/tool_tinbucket_water.png b/data/textures/tool_tinbucket_water.png deleted file mode 100644 index 40af147938ad1ee4be9918ca9a215ef9adea6bde..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0WW zg+Z8+Vb&Z8pdfpRr>`sfT`p->BSF3Ew?TSUGeaUuobz*YQ}ap~7=Z#DGmG`Se04m1 z12xX;oD3-V{)Lx;!F(?3BVn@wAd8{c)5S5w;`G@`7da0YaJU%ztG~>0N`Il#_k?X4 zw}eR0SK~vC0`Kk$$~?Yu(Z%-h=d1vBBl-2w!Ko7_1kL!)AUN|@;|Al+LV>&oZtyWO z6thMM@Hd=fnEG?Ot9fnhlJ)s%D{8sr5+?XnWiU2}oA0%H%KV(U$e!WXQXBCpKy{D6rAs&C=0t^-r4>3!;xc~qF9cffpbVF}#ZDnqB0000007G(RVRU6= zAa`kWXdp*PO;BVmWd{HN1X4*vK~z}7?UzrF9A^=SpZe21-7`CD?`~vU7)M;N#Mg*& zj+AeJ#DRM*NGM0Rz=4ku#E}ChJ^+X00^$^8IYChpC#=1@^S6KdeXBUkM0RkT9UE@A zq?Y>7UG>zjtKO=H*Y^Kza_ED-3h>E;EBYp>HTY}|u3##tf(q1tu5~VJP%o3Nf$mAXx&l9c`y}7EIi=5Jvn>4e zX_zhTa@izy1@nlL=CV ze?4087;OZvE8{o0OaJ2j&T&ec=(7L$46W|-Y|YgQqLoW;;oZoB{DE+ zIXUZj`1v{AY>F(;4{GA>?vI!c1DzRT8HfmqwATZyFSqCsD1reg31j8W(>Wyqxp9vW z<3?9;Rla}x^wVc5Fqxj+Mxe1p z$_j=ntSl(wnm3OhlfZg$!9)fcDM%D7D`aI=1Zp|_Bz*6!JBc{%#>A7xg|-peR%i?+ zp11{J&Zfe&YpEr8^z{NwfedOXpa}!K|EI5C?j)Q~g|P%~g8NeiR0LJUTrhXMZLk!w z?%sd9IWoichGbAOr9H?!*6XBhs#iOfUzxXD&yYU44Wo($8tNLB~Q?0iPhv^;7d&fO>y) zOsvZ>Ub9>+8HNFBWw~7O>pwg=$oIip z@jsU{PNp;Z?F?aLy)h<7E#}60t*j=7DY4qJ*#upG{Q8IIwH<8#264#edo(1Ung9R* M07*qoM6N<$f(l^@R5;7clG{td02Ide8bpK6EG zK~dP1EJd4I>6(SNykG{djAChy#8gTR!G|d5FaGrw1m*VV2j}s-oO3=w7*{Z2tP!6x zB2OuiW^#dU-epMyK@iCKZKQoRl6%u!1*fQlW-!i08X1XRX>Fv)FPHSr1o?wWZley` z1vh>&;2#oj&bJvU*NqOU{I48G?R3yQChl8M-TA&5MWr3@X=EE zY%8Ph@YO5uW+-&)r@Yh@8kHaoEkIwF89pAGeuB%WME=N0HY8GtNo2!Lu2qS$y39>t z-CRHr1n#r@7+QpuuF|By{z-8Wbd&PC lNO(nxp;gQ7W>p?Td;@rpuNxS#&E5b2002ovPDHLkV1kl5u=M}{ diff --git a/data/textures/tool_woodbucket_water.png b/data/textures/tool_woodbucket_water.png deleted file mode 100644 index 25fff45a4c3066aa292ff862fc2d5b82385bc189..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 390 zcmV;10eSw3P)L06KORh+#^k)cD3};S zz>*qPd+}m?hM?F&Kr?m&BCRFT4|J6BmU<29eu6C0xbHx+sPuP^leUz_jszckGrY(OK>u=WB6 zf-&(w)gD3b*`Ulparam2_type = CPT_FACEDIR_SIMPLE; f->description = wgettext("Wood Gate"); - f->setAllTextures("gate_wood.png"); + f->setAllTextures("wood.png"); f->rotate_tile_with_nodebox = true; f->setInventoryTexture("gate_wood_inv.png"); f->wield_nodebox = false; @@ -1462,7 +1462,7 @@ void content_mapnode_door(bool repeat) f = &content_features(i); f->param2_type = CPT_FACEDIR_SIMPLE; f->description = wgettext("Steel Gate"); - f->setAllTextures("gate_steel.png"); + f->setAllTextures("steel.png"); f->rotate_tile_with_nodebox = true; f->setInventoryTexture("gate_steel_inv.png"); f->wield_nodebox = false; diff --git a/src/content_toolitem.cpp b/src/content_toolitem.cpp index f33c919..ff48c71 100644 --- a/src/content_toolitem.cpp +++ b/src/content_toolitem.cpp @@ -513,7 +513,7 @@ void content_toolitem_init() i = CONTENT_TOOLITEM_WBUCKET_WATER; f = &g_content_toolitem_features[i]; f->content = i; - f->texture = "tool_woodbucket_water.png"; + f->texture = "tool_woodbucket.png^bucket_water.png"; f->name = "WBucket_water"; f->description = wgettext("Wooden Bucket of Water"); f->type = TT_SPECIAL; @@ -524,7 +524,7 @@ void content_toolitem_init() i = CONTENT_TOOLITEM_TINBUCKET_WATER; f = &g_content_toolitem_features[i]; f->content = i; - f->texture = "tool_tinbucket_water.png"; + f->texture = "tool_tinbucket.png^bucket_water.png"; f->name = "TinBucket_water"; f->description = wgettext("Tin Bucket of Water"); f->type = TT_SPECIAL; @@ -550,7 +550,7 @@ void content_toolitem_init() i = CONTENT_TOOLITEM_STEELBUCKET_WATER; f = &g_content_toolitem_features[i]; f->content = i; - f->texture = "tool_steelbucket_water.png"; + f->texture = "tool_steelbucket.png^bucket_water.png"; f->name = "SteelBucket_water"; f->description = wgettext("Steel Bucket of Water"); f->type = TT_SPECIAL; @@ -561,7 +561,7 @@ void content_toolitem_init() i = CONTENT_TOOLITEM_STEELBUCKET_LAVA; f = &g_content_toolitem_features[i]; f->content = i; - f->texture = "tool_steelbucket_lava.png"; + f->texture = "tool_steelbucket.png^bucket_lava.png"; f->name = "SteelBucket_lava"; f->description = wgettext("Steel Bucket of Lava"); f->onplace_node = CONTENT_LAVASOURCE;