From 34e74834fdb999d3c47d724db80f2b5b706c529f Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 9 Nov 2021 12:49:25 -0500 Subject: [PATCH] Arc furnace recipe fix --- .../production/silicon-arc-furnace-bottom.png | Bin 307 -> 307 bytes .../blocks/production/silicon-arc-furnace.png | Bin 1704 -> 2686 bytes core/src/mindustry/content/Blocks.java | 3 ++- 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/assets-raw/sprites/blocks/production/silicon-arc-furnace-bottom.png b/core/assets-raw/sprites/blocks/production/silicon-arc-furnace-bottom.png index 8c363b7435e1b8574933a822e7ec311be4d95bf8..cc9cacb3f84e5f9fefbbff462bfd7413245acb09 100644 GIT binary patch delta 36 scmdnYw3%sw6RUvEkL}+ky5A59UBVPF-ITANfq{X+)78&qol`;+0Qjs7jQ{`u delta 36 scmdnYw3%sw6RTX$kL#Z%y5A7VC}LXP`N#eh0|Nttr>mdKI;Vst03A>clmGw# diff --git a/core/assets-raw/sprites/blocks/production/silicon-arc-furnace.png b/core/assets-raw/sprites/blocks/production/silicon-arc-furnace.png index 616a346e9f97a2d47f4dfe235a951b6cb9c808ac..4696b92ab107b9fae13baa5c550d80fdc1cf9245 100644 GIT binary patch delta 2678 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 Pz`)??>gTe~DWM4fL*Wp0 delta 1689 zcmew-vVwPlay?tVr;B4q#hkZuz57HAdD?!5ZFnHmY{Aqan{;xLs=LD)O9mn9BTb(R zIM|j3w)x!Zzuz}EBva_*?1j5>{>O*TaStv0`RD2DzuV>aJH7ondwW`U-$Nb4xO;p5 zSNy-CAfvfWyJ0!Y!wf@P1`FX9A@$UB;s0z0I9U9qBu(t}u3J)n!`86k4-fMPhYK#9 zO$|R5CiRQi3o&sXU}6+a6=^!^FI_$DN1#9i0|(1$jW`ZDd*j-rj1v?T4i+50bNBAd zvszwD__OaVWYFN4rV!?ELdc$(iDg0SgF-tk5i6%x{ig-&rI>gYIDN4C>g3?=ai>u7 zk-L+@UB<a4oe_HE@M?Z}xM;@J?^!jLj%Yk*Q zfo^}RNLX=U_?HC7?`3@a{aJjz*hfo_ zsEc8YUk*kxZV~VbI;tb^D&I&k;8FPIduw%Bd~0|eUJB{gPLN}$4bo`&XRgu0eR<8J z?E(QGw@wt|T5xTNxBQx=Y!!+H$BUoWyB=Atu%PhT{`Bs6#x2cFvsbgpvQ{d7ams$Q zUBKjHG)Kl9kJt{O{So$B%K5i-I8I!>C#ALH+8V?2Li1S@S`Wnf+Oljp-6&KCmv(QpVrghfkhEVfw%;s2FfV;; z9>dX#91U_zp(Xt~b-5XV%Z_|!+VLttwwED8vB0(d`-w-_+eA{mYWN%2b)(#s8MIh( zXYGqhS)1uPQ|La|gNbr`n*|xJOuIkx$a-I?xf((?+`Ro}N$+lrrH4*2CRDS&E&JS2ADrQLYssw+r-0q5oDSBjH+TKdSW$Xu z8Sh0wjw^2UHY^L~M^!gf%*dIuC3AAfS~(AY=MIJyQ*HGdt}6AJ=`-ZnN3b4Pn_bPY zMofQ|E8_x%J9{+sa}Pu?Md(JAZ0565(Y?!{!6D6H`^lTRp|3NXTkP(d;`zJ^J7n1o zylWCGbKK3LF8|st#^HMbVq&e%cMJTeQ|qa zVrAd*&SaG~TDy6#s%543Ch^kzQ~r0REO)uvztpEnr}cH%x8_J;xigcvw3!y{clx%t zv&~(2YiAqV0{#m7Io-@V{DRyW3K-uXzdV_t;5YNMgnpKVKb94Jj0yRB$=8A*v-#NP zu1i@Qdn;ltKHYV7<$8^JPid2R)4zl{FQ~abhwuBOdE1=RYJE#hSx%aNHL9!^_pkL8 zy(zzK&x*ZLO;09Q&8&IZeXHZg-U}XqajcAj`&$)`Y8}mQHF%mVE7CG^vGS2{>FCbT zW`&uoPQRXKX>h!_dgYdB#D>i7raAYu>b6P>1liw6k(Bj3Y0D)c5Fhn#YW<%eOBd%I zCzr@Sw_ z>wny_+kAaTud;Sa=6pRjg)Q}uo1BE|uO5+aJuvsY@a--A<=FxnmyawLay|Op>B716 z&feyPiyg0*9s1AAzBVIxS?AQ$c@fG-!xRSB$ zKMWYoK0IM*kto3NB39*R$GPK5`#2k(6g=5J$wG)_i}vMn^Ct>x?UQT}Zwjw@t7yQ> zR8{})#GF_Amojc}k`R>_)cSnq-k-zS4dxv;AEi5QX!2rKU{#)(&hq%9@#X2u0;L$V zTP7Cn3ZIh0vBE8rA)ru6%`+}=lR|{47xRKnVMRNx#^13fEbHAe8I**-ABqz^tB?cMAi^|8t6qhhqI5nkrY;^d+9nT_kLB)BS{|^QR1_n=8KbLh*2~7Ye C5Am%4 diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index edf29d0f9b..4b545dd5a5 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -721,7 +721,7 @@ public class Blocks implements ContentList{ //TODO siliconArcFurnace = new GenericCrafter("silicon-arc-furnace"){{ - requirements(Category.crafting, with(Items.thorium, 200, Items.metaglass, 120, Items.beryllium, 40, Items.silicon, 80)); + requirements(Category.crafting, with(Items.thorium, 200, Items.beryllium, 40, Items.tungsten, 80)); craftEffect = Fx.none; outputItem = new ItemStack(Items.silicon, 5); craftTime = 40f; @@ -729,6 +729,7 @@ public class Blocks implements ContentList{ hasPower = true; hasLiquids = false; envEnabled |= Env.space | Env.underwater; + envDisabled = Env.none; itemCapacity = 30; drawer = new DrawArcSmelter();