From 4fcd873f65dfdcfdc50d0ecbd6097f6007fc4af5 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 20 Nov 2021 17:59:24 -0500 Subject: [PATCH] Gallium --- .../sprites/items/liquid-cryofluid.png | Bin 527 -> 526 bytes .../sprites/items/liquid-gallium.png | Bin 0 -> 485 bytes core/assets-raw/sprites/items/liquid-oil.png | Bin 508 -> 508 bytes core/assets-raw/sprites/items/liquid-slag.png | Bin 484 -> 484 bytes .../assets-raw/sprites/items/liquid-water.png | Bin 519 -> 518 bytes core/assets/icons/icons.properties | 1 + core/assets/logicids.dat | Bin 3414 -> 3423 bytes core/src/mindustry/content/Blocks.java | 8 +++++++- core/src/mindustry/content/Liquids.java | 6 ++++++ core/src/mindustry/type/Liquid.java | 2 +- 10 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 core/assets-raw/sprites/items/liquid-gallium.png diff --git a/core/assets-raw/sprites/items/liquid-cryofluid.png b/core/assets-raw/sprites/items/liquid-cryofluid.png index b438a5ed3700ecb5bb3b9e74821a40e0b33ebf87..dca841ea690ca6defa5edb5365754f998f199bc0 100644 GIT binary patch delta 487 zcmVVuuPk+aZ(=+NGP@IY`o^d6#>4u@t{8clX}=z3=XF zz=~y2gF=Y;$FPj1b?pySL@gS#cN<^CBFpdqny*tqt%-odKz}R+fCQ01!~v|uC4U~g zqqO}kj|M{9VV+Vp_J25PCQ_2B$)2UGRT$wy589Kb8yKq+D=Rool*AOK+Jvk?m*Jp)%~C&*MEL&dZC!`Nht zaGbM10u(20xOM^O_LH=Du*)QpIzZWOB9#lQYbdk+FI*r2bh=Lpp>%+A@cQmF1fl~K zdkuAE;>Q1aj8+0L>huy7P{p$xFood6kpOi#k#}DQVqnzi`Rl1%L22CrFRAQmnm8o| zsKc>jKO}A;Rri464BS88dyTDp2-GbIEhl|Y*KOvxg dBTQgdt{)izup9h8ZoU8j002ovPDHLkV1mnU+@$~j delta 488 zcmV)zsXCo3odIqk}Pm!uVE)-Aajv|vS z!*R|62~e1{;o5mz*iX{p!7k%S>HuZCiBvAIuA$8OzB`TW1PSn0-5Uc0#W{G(PUyH2 zc@1@CvK{~HFC9oUSXedem0000m# diff --git a/core/assets-raw/sprites/items/liquid-gallium.png b/core/assets-raw/sprites/items/liquid-gallium.png new file mode 100644 index 0000000000000000000000000000000000000000..ad5cf133fd31faf39fa5ce598ba915ead28c06fa GIT binary patch literal 485 zcmVPx$pGibPR9J=8mAy{GFc8PD7H<#{sSyIw1C{sA6ZyQ`_#! zd#6e)l^8NXXEu~az+s3S+~oY3RHZj1w(stDf1hoD6I%}(%=5hZW-Ni#dQkBH`^jg+ zhmZ$l63_G80aBV3*qS>? ztHYV}0t&z@4;S|DN_h-z z%|(s#dW=p2u-k50CD8dBDc}lW;)en(Leh9dY#?^qO|>42C7RVK;6Y_a(?uyMz#=3) z*@a}9NLM|8q6hpSg821W8$f2JzUU%KDcoGXSO2yTQ@wIOh@@+!Tk!UMT|w}GIuH}d b|DF8;qI$Eb<9q*500000NkvXXu0mjfZm!R( literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/items/liquid-oil.png b/core/assets-raw/sprites/items/liquid-oil.png index 51c7a8db47dd46525d84b755a6a2fc1ddff1601e..402be18572f906b3c7b963f8f13ed2517af07b81 100644 GIT binary patch delta 423 zcmV;Y0a*V01N;M!NPj>Fr#4WRj_#SPpFk)bU0nsgK`BBvhk`hDuUiKzq(PyZi!B`_ zOZx@VK`tid-QBy3rTCw6$G!J{?|*kWV9#=>$vBRG20;hj)oU^l44U~E?_OQRA=oW~iva4z1loVjnZ8)+Y61R}9 zdq8sr7K;yUf}*h`KyU3P-<&RfYtn5vpLZ9mwbCu$vBRG2SE?+)oU^lj9U2^_g-DZA2!Eb5H46d zkQUpCpvO%q2dGz(;2VE31pr*0p8){khif~Mpr`#yk^pIt?rNNj+rwF0E*~Z1M&mRW z6NYmDKQ08Lma|+g?Eysb_HdT7lqxRf1q1*bf88npq-UVJ8sp^VDN{V%y-EU(a~4Pd z(RsC6lNL{RSwvC?DBEqMbAfdYW!8t`ys#4_z+ZK54UiV+;B9|9Vd9GN8k)*xJO0;W zv=@LV+7v3Fi)T4t3&Dva0sMY5_wJiOMA0T$PvuI>=oW~iva4z1loY`4HyzmziCak5 zJ)k)Qi^YdFLD5(eV6d(w-<&SC<@cM;=iLQst#k_p>l#E70ik;%Y+(1UZ``T2QT9Og R9smFU07*qoM6LruV1nJwzsdjr diff --git a/core/assets-raw/sprites/items/liquid-slag.png b/core/assets-raw/sprites/items/liquid-slag.png index 2d51d55a8cb2914450c3c2bf67e48876db481f7b..21b9d3ea7eb1dd86d35673313514f4e0654fd8e3 100644 GIT binary patch delta 429 zcmV;e0aE_t1LOmcL4P&A02CGkXiRtj3Og$cUI2UrYg-a45;{u@I}-{LgAYJ~4V4sE z=o`R=f`Y^+IE&-%c5}0Hv%45{x|`dX`S#zP-33l;igG4NQhY>r0H8UDnC>%QM3H3x z0B3CEfrt1ueJP}uNdRnSf_Or(0Pm|W#1{{C{R$9oBa<&aK7RoKoklJ9HFu+`LTN5y zKZNc90FW!;xD+Hnr%^Lz?_kalA)D|h<^&*E2Eb8;-%>!_8RU!}U)}%!w>MX5w#j|| zuhpwdljmK*b-_88;dQaXU^~@aX7TQIIVf7{V^ti-EG4@HTJiGnOBE;l&E3ckV6dH{ zJ)C950RXLDoqtV6KvXUl36RZvJ?`6!7g7fqw**0Fyflxf4Xx52K?NIteD;A5l?sS9 zUbHkp9H7{9z}Y<1_+OXNNdPwUeNcg_c##6W5Ry0>KHo`-lY+7d`7NdRmrf;d930B_4rL}z#Q`sESoDgZ$n0A&?^s{-Q5AXjw%^a=pDzPd=FJ>O>U zTD`h7cs3Q>6r6GqUgk>-HWSlSOy0dLJB17L+aQV}mXd9Ok-U8TQppK>b31Ya7;GkJ z52tBz06?o(XMckc5S8sB0n(MP#(jJ8ywqOeTHtlYOXG;f&|3O%;av$Ez@b*}43J5* z@qSi9Q5E(aP|Kkm|LbRT6oBhO?f5=3z-eX!#3gB+>&AdGoMSWo|`NXYy-=R7J%w8 z0Qwe|VnAnStW$%Xo(ljtJ}d(Og8TE>zYRW#XDh#wQUjfyn`mBrJW8yrWEN7tFrfwC z_oV=&fiSg6n}2K^Hm6cD3mA^Z(e?K9LJA->P@A+-Y&wbNo4fncVn5+H?*a)BuDpD3 zBWxaDp2J z{e>E+=CcfBh2YF10UWEFI`?%TW`lloKUFIptz8fn6$qQ3DyF9`J+!BPI_@&)X6 VwZc002ovPDHLkV1h2$)0_YR delta 480 zcmV<60U!Q`1cwBWF@M2HL_t(oh1HcYOT$1E$Nv#`se?nYU4&3@Q|Rg-7`nH90nrSd z9NSgUPvB6+$)QlPi-ih~2AV-Bl!8lJI&>)b3F2bXqI(3oOn8GB=;ON^L;xWJ*pLN(aX)Zh z+Y#>uV#lK+GI;0h9ROfvGvVC%&6MW^;exgUQL&xyY;H&~fSJw2s^>}vg6+VnlnOv~ z3_yApR^mXK&e)_TTOAhwaC%$>0QirWk$-D^63sD70ev^gHbr%onA=+gbq|DP2}rNEcy2Sp)}Yc9Oo{O072!& zqdQ^pXqC%I=m2HAj#MtN+E8SDe=u6w2@>G9s@DdHigWQ6ok-(~v<=fr=Q#e?W3(24 zS+BcP0@Z$&1G*5LeI$TmwG;1t8i-l18?L8fMU|=xf?1%V*3@xI2;f+4L-ax7CQ?-o zNbW$s?!bM$PzDf*yO(s}_G=Hr>+;V??1V^;)iz+2)eA)c0Yr7{a~=@tH-cmNpVK!v WskO%9?uUH<0000bKouj diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 25cd1d360b..f61cb723ac 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -452,3 +452,4 @@ 63254=fracture|block-fracture-ui 63253=cyanogen-synthesizer|block-cyanogen-synthesizer-ui 63252=cyanogen|liquid-cyanogen-ui +63251=gallium|liquid-gallium-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index d287989c25ee5420c8f31a68f0d61d3bfbbb3b32..4c325f53df3bd58e853fe3ebbbbd5643e49255ce 100644 GIT binary patch delta 23 ecmca6bzf?OFfSwLWD#B`P6qb$#GIVW(p&&iK?bz| delta 13 UcmcaFbxmr6FfSv=WD#B`03ibdxc~qF diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index e376e03976..0433c675b6 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1043,7 +1043,13 @@ public class Blocks implements ContentList{ slagCentrifuge = new GenericCrafter("slag-centrifuge"){{ requirements(Category.crafting, with(Items.tungsten, 60, Items.graphite, 60, Items.oxide, 40)); - outputLiquids = new LiquidStack[]{}; + size = 3; + consumes.item(Items.sand, 1); + liquidCapacity = 80f; + + consumes.liquid(Liquids.slag, 40f / 60f); + outputLiquid = new LiquidStack(Liquids.gallium, 1f); + outputItem = new ItemStack(Items.scrap, 1); }}; //TODO "crucible" is getting old diff --git a/core/src/mindustry/content/Liquids.java b/core/src/mindustry/content/Liquids.java index 91c869483e..d95e4aceb5 100644 --- a/core/src/mindustry/content/Liquids.java +++ b/core/src/mindustry/content/Liquids.java @@ -6,6 +6,7 @@ import mindustry.type.*; public class Liquids implements ContentList{ public static Liquid water, slag, oil, cryofluid, neoplasm, + gallium, ozone, hydrogen, cyanogen; @Override @@ -57,6 +58,11 @@ public class Liquids implements ContentList{ colorTo = Color.valueOf("9e172c"); }}; + //TODO I have doubts about this liquid's usefulness + gallium = new Liquid("gallium", Color.valueOf("9a9dbf")){{ + + }}; + //TODO reactivity, etc ozone = new Liquid("ozone", Color.valueOf("f099da")){{ gas = true; diff --git a/core/src/mindustry/type/Liquid.java b/core/src/mindustry/type/Liquid.java index ce5972c36e..2bc0ed2455 100644 --- a/core/src/mindustry/type/Liquid.java +++ b/core/src/mindustry/type/Liquid.java @@ -71,7 +71,7 @@ public class Liquid extends UnlockableContent{ //ensure no accidental global mutation color = color.cpy(); //all gases are transparent - color.a = 0.5f; + color.a = 0.6f; //for gases, gas color is implicitly their color gasColor = color; }