From a98f214a1b9465ae719340817b7f8cb4120e2643 Mon Sep 17 00:00:00 2001 From: Evert Date: Sat, 7 Apr 2018 10:07:31 +0300 Subject: [PATCH] Add bronze as material, some melter/caster fixes --- fluidity/register.lua | 2 +- fluidity/textures/fluidity_bronze.png | Bin 0 -> 673 bytes .../fluidity_bronze_flowing_animated.png | Bin 0 -> 2656 bytes .../fluidity_bronze_source_animated.png | Bin 0 -> 2551 bytes fluidity/textures/fluidity_bucket_bronze.png | Bin 0 -> 425 bytes metal_melter/caster.lua | 30 +++++++---- metal_melter/melter.lua | 16 +++--- tinkering/materials.lua | 51 +++++++++++------- 8 files changed, 61 insertions(+), 38 deletions(-) create mode 100644 fluidity/textures/fluidity_bronze.png create mode 100644 fluidity/textures/fluidity_bronze_flowing_animated.png create mode 100644 fluidity/textures/fluidity_bronze_source_animated.png create mode 100644 fluidity/textures/fluidity_bucket_bronze.png diff --git a/fluidity/register.lua b/fluidity/register.lua index 48ff91f..edf45d2 100644 --- a/fluidity/register.lua +++ b/fluidity/register.lua @@ -1,7 +1,7 @@ -- Register molten metals -- Default metals -local metals = {"steel", "copper", "tin", "gold", "mese", "obsidian", "lead", "chromium", "zinc", "silver", "mithril"} +local metals = {"steel", "copper", "tin", "bronze", "gold", "mese", "obsidian", "lead", "chromium", "zinc", "silver", "mithril"} for _,v in pairs(metals) do fluidity.register_molten_metal(v) diff --git a/fluidity/textures/fluidity_bronze.png b/fluidity/textures/fluidity_bronze.png new file mode 100644 index 0000000000000000000000000000000000000000..0ff7552d64b27d5790fe4191b84a6a339bd32ca9 GIT binary patch literal 673 zcmV;S0$%-zP)WFU8GbZ8()Nlj2>E@cM*00IR`L_t(I%T1HrZrd;n zg+EfV9XoED7RdS{dy>8W?h6#d&^Art*s{o7FllE%fFM~sKRlFQKOcOPg{Lubn2h6W zY+Ipglv15#b*jP3`-%gbMtJCz+oydaL($Nnowcr5H^XRA8+zw8FMi znk48{9QQ!_dos+wiX#F|3V91gHjwi<6fc1zz4(lEQveaOW^NA}};UQlUvOZiM}q5CL;g0fpFXH$kt>f{3si zl%W;cEG*SIEzZ+6(KP}<-wIc6C=nO487u1O%9ibG#Vm*%1-+_QO;R z6_`r6*yW%d#RLbO=+4{OxS6j{gVMLcT%7*eV-awV1y}UjAy6GovvHiA{B{n`Q}M5W zxWoJP+}&}4K7_32yToeIH9gM8=WOin5}Q`P9?ff@tp=sW{eq|s`$*WwWZ;evLvz3R&VN~* zq!GN^WNJ_T@nSc=oCux*8Z>1!Bav2|;G00000NkvXX Hu0mjfwtXVP literal 0 HcmV?d00001 diff --git a/fluidity/textures/fluidity_bronze_flowing_animated.png b/fluidity/textures/fluidity_bronze_flowing_animated.png new file mode 100644 index 0000000000000000000000000000000000000000..71e984589a51496c2c66cde8966e00a95ec68678 GIT binary patch literal 2656 zcmV-m3ZM0fP)EK|00006VoOIv0RI30 z001*5eDeSR010qNS#tmY3ljhU3ljkVnw%H_000McNliru;sgfWFU8GbZ8()Nlj2>E@cM*013oNL_t(|+U=Uza$`3R zhChHjizLfdZ^DYEK4Lo@W+oI zIFx_=^I%;g9Jb2iDRUk(eXDd)7-u7!ku&`GdBzO7MtHqd07L}sA_#CAG6p;khM5r* zg2I&GG#N1nB9O9A(zi-b(92{P{>8^rB4-1@%qMOFMD?G;R{j4X1n~v*G#Qw29y1?~ znK}DFpVWB17~^a_Y?PP5=o%~y9yHS;uNLFK%8<)vA4w+p1QMa>c)wjIwm1J@a+xxeWID{oPJMg3R&KT+ zoWGE#CCt0IuhMr>TyYhp(WQ!zvzx8Od5SP+Pjx9@tvFsBfo4V*g;=x8Wz3LVBh^4jW$>jc z6yTS~nO&=kf0oo%HE=!ON*LQl7DAa8h2nl~LID!y;Mugg#6snN5#iM~xS%QuC1qP` z2+if3U+r`;8?MQ-Yn*v5(^YU*gjQ}?70RkmR)w-ElrDnK+21^rN^C6AS<`smctv{} z9XPr46moW+SbHdI4`uD4tUZ+44p9+jmR(nPumnd?N6lg5EOi=;x!_{kdZIC_gd)OF zqVn@gc8Hc_Go}KV=oX|5yH;EyDrik2Q-3$moSH+O+ep|my>XT}m`-yI@tyj3Gtj#&IrGgd14NpV7{`M)WFBt@;X zH-u8Lk&9o(*?kocTPMlmB`@WinXhhgwI*e+Qi8au?;0tDTk>Aj2$i+nV_T6ZO6Jis*DtUiS90$)nH8Q6%_&j-P2jxG%O}x7gO9Ea}+n??OLEz&tEx@_o zDEC`k2xLxP_Epuo>jZ5>Aruk5y$^h|zheE}of1{}{-E4%)D=qhBX5GRZPgV@7hMM+ z!lk4vDIxo2r#x%|Pv^`yXQu2iU{?IK>)fSN@=g8z?4GY;>M}cE+IX$0UTu|q@9hG8 zy7-D_#!p|;SLa{TeN*u9&Ha@xRlUEUpN zXP;g&u~ut8d`zTle18Z_-$=z<9c^@8*tVHJAHs4BDHoY1MTvt8soGl#3U{5l=O^RO zhd^HxN)Z36fT@vbExqI=I%-Z2)cmAZuQRywpq;Fzs#aWX6Z*bXE9o z_YRQ9lM_m%u-XQ*LS0i84kCOxxoY3{rRcI!Cwd&{0^4Mz#4kd#TJUbKq-?x@Oz6*_ zXI_R(TiX6h_hR;a=Ij&?o~4317t)y@KhHc~uBmFuK6seDf31nnB(W$^R;`xAO~F-`s~%h{~!^R)w-ElvSZD3MEP@@gB-Ol-g?adnoX3 zuQ!9fzK3!xdDb4v+Cy1;C~FU8y@#?s8-a}b?C~FU8?V+sqP}ZkB>r8-a}dMq5PlTL-{Wsi;2&r{_+w4 O0000WFU8GbZ8()Nlj2>E@cM*00~=3L_t(&-tCy_a%0JH zg}=7PfAzx?wnEl2y|W2|0Pa$i{*iSr*p{APf`~wH z0qRy(<~b)%mi*^`Tw5LBW*zu?%$$ZyTM2a(rVLXuvcX^PC$d3X2{$W6098Tj03yOu zpD|#6HVlYC2m(`v<6y)fsKAtN5hY8zrir z_o@?KZ~XIYpaO9YY1=BtAyWsC^7oXCF&TbLkD`u3KN_oA$XU>+fCz7|0$r`7><<)y z5CjqNY>NOeOvY(6o_h1oVi2OjVK9Qgar7g#l~4y?6a?nfs=$}0L_d{ky;>`6Rl;hN zZL0v7K`s>u3dt@HNf{1(rb$Bla`c$bW9E7lk@BUl<^NXRD*n_Ml<#+eF~R%&gzit7 z{n@y?iZoG{MN{(qayI(OBRY?U2sE)A`)ug8)n&J)60TPY=GlKZWe&Y@8Zr;3jH>6Q zsf3`=)k2Ixc)bgjFXYffwis+M>1S>N~{8`YURT|aU2rsM(HX6 zGlm5HXv+h#!GFCUxm_z1w5pjW=k6+$bE9 zv+@TCaI;c^!gssCwiQC~(w;|WXIlxeiB6u|jq>G?iR#&3HNr5$b>|WE(`C`FU_}*F zL=fOK_`*Z^sRhag^b_@}QlT;US36P7>#2`GJGG?AT-L%TOQTha{%Ihr81Y{0L_42=L@H801WW-rK z&qL;_z}XDG9P;HsW=M%7s_<&<()al(p^xXxX*6DM!lHY=#*c#8qLWj}d{;ZfAJ2wv z8fAaV3w&=kiWS*9jmCL`J{ga_Er4n&?+vTERN;E%i=KMp*n7A!2!|n)@`cV*653kn zM{h=(R*9-Y6NRs*jEb?U9Os4$$$9c*SrsK~!-L6k%y2#QBMDwt+~>qS?4 z6xx>^r)1n86I1pCrtFQQAB|yxbuFAmTbj?5jFgNxBxr$;hlBvT*1xbnrKQ=-RcRyK ztaW(+Jkx_!{jDBcuLG;bOK4`~BI9!e+fIo=yb4wDF2l1%sznpPkY~g^kKXD|L&-r9 zhwU&qQO06bL=``-dH2@S;ES(2T@pAG$E?7-ytDZ+XCxkaL%T{i4o;xmN_n#li=YgX zgRGy5xhN6T(Hm@6i_>}2IJ+K-(I^;a%$X@c%8t-6!+OXJqbG5uJ~4O{f)!Eq5Xa?hjt>4_@vMemVCCDur>Ib|#6FYewjGr(Ctlu{Xw2jdkM-%|Pc1 zh|}N;?~j-ErsCdUf6m0{%_W&T_pb6%>ajSkDZ_`yw6w7K7)|sRR|l82SubYapfd&@ z&zZm9Cx&Dou6@bi!(-;DH@>@yd_H)UD5Cms%EZ~){P+725#cvC5zOdEKgO=}mM$Xf zy1?C4xQsq3&-9>E4rgP|Nn1HsRGhxKl)4V?AKOa61g(N+|F^Fqn^u;YDHNLfS*6Sl zzW7u;f{37XiNQOQ=VG>UvFJe+F1;ftynC1!XFYg(6=*9TsIEF?w+j6K*L;UO>qN>f zDyv4(_xr?o$Q=8;h{;@)S@LleIu?I$y;44vk+0GM>0+$!kBP5Ea6TPUNoHxP;)sk@5Z>wo0oXEQeqv2Z6o~kYhr(L2DZie4{4rU%e(;m@oxjKx5aE4=v?<--*`RW z?bFg2u3B;NcC?36!5qV;aT#wSym_Vvh--v?e)2Z{>5zH%Fwsw*q+Ev1KYyM$oHM_=jeOcC zHnWE^OR zq5Ph$NVOS%`8;tdJ|h19O{5C4(E0n_Kk7jhTmxo&B!hPkF0lGPpC*RnmSrBetXy?W z`C|L$SxQy-_wOriH-W$3Pw2xj^YcUE$GeJkv2d6z7A6%tXY+-F_>sCwcp4J%s#88Z zBz||NF4GFb1g9bM`C!X6*p!_sKCv1WpsfP2sf1k@{f;0TL-u6tI_2kwkyLbG%1-S$ z%F}3EuawwEA2xq_Kl0@%^JW{^weyGvL&^-(rQiMG&jW9^!TV%3ze^L~U%#sm;BQ~1 z1!=pLeB+OYDdQIwJ_c@DMVm_f(m{mZzlr?%HZElO?W;%~;9ssQ*0m31$=n9F6_+D4 z5w@-Hc!r=(>naFi7Jj&mqzpfeBXtaPwJiNnMPB^Di$8er2frMD@PAInI_~J17V-c9 N002ovPDHLkV1gB8;M4#B literal 0 HcmV?d00001 diff --git a/fluidity/textures/fluidity_bucket_bronze.png b/fluidity/textures/fluidity_bucket_bronze.png new file mode 100644 index 0000000000000000000000000000000000000000..f39a8304493703ebb3de9aa60549af1604b299d6 GIT binary patch literal 425 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4&HECyrsn$JLrv%n*= zn1O*?7=#%aX3dcR3bL1Y`ns||Vqs@zVEE-Q<0?={HZvrm#5q4VH#M&W$Yo$~E=o-- zNlj5G&n(GMaQE~LNYP6LDre;Nba4!^IDK@oqZhNGMC<+(r|#8VXBH_qz2J>`<@7;o zbLr);G79Mv?zyHtwOkfZAbRAaThPoudS1>idx8W%w&%#5JYK!W{=@yn$6T`4_Pl)k zwW{F0jJ?URg4%~OMHHCQg