From 64cb5c58795d4803abecf39f81162c58e6516dde Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 11 Feb 2022 16:58:46 -0500
Subject: [PATCH] Large map shield projector

---
 .../cell-synthesis-chamber-bottom.png         | Bin 307 -> 0 bytes
 .../cell-synthesis-chamber-middle.png         | Bin 383 -> 0 bytes
 .../production/cell-synthesis-chamber.png     | Bin 2336 -> 0 bytes
 core/assets/icons/icons.properties            |   1 +
 core/assets/logicids.dat                      | Bin 4084 -> 4108 bytes
 core/src/mindustry/content/Blocks.java        |  32 ------------------
 6 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 core/assets-raw/sprites/blocks/production/cell-synthesis-chamber-bottom.png
 delete mode 100644 core/assets-raw/sprites/blocks/production/cell-synthesis-chamber-middle.png
 delete mode 100644 core/assets-raw/sprites/blocks/production/cell-synthesis-chamber.png

diff --git a/core/assets-raw/sprites/blocks/production/cell-synthesis-chamber-bottom.png b/core/assets-raw/sprites/blocks/production/cell-synthesis-chamber-bottom.png
deleted file mode 100644
index 8c363b7435e1b8574933a822e7ec311be4d95bf8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 307
zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&!0^`7
z#WAE}&fANIybOvA2OJ#adVXC0bYjQDYOYx&?~3;eroC*~pUrTMVGUyh^9HsA-UCt%
erVK+=KrW+*X?f=#`&SGM3=E#GelF{r5}E)r0A6_j

diff --git a/core/assets-raw/sprites/blocks/production/cell-synthesis-chamber-middle.png b/core/assets-raw/sprites/blocks/production/cell-synthesis-chamber-middle.png
deleted file mode 100644
index da2dc2fea1777cd23d48b28587d4e884ec3ce150..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z-Z~|
z;uumf=k4u-tC|f2SOY%4`2T;?-8~H++(Eg|j?LTr%ISr{^t46GPBSsUK*7wg*aLyD
zcdh$doc%WSuKPMqW7mndkCpvqli#U!F}{>>{w=dVp`X(~uF!kXGgJD$?{DrM+>9dK
z@<Hj-XMS;%iM<n=T~oxdu{G8<A=tS?=T-FX*+&E(asB#s%}BRpMUvaw*OQ$(G*iC#
zhI(-bx`y1nsMcbzr{T+S_QlSUzfxbGeec%xAkf8-QN)<JEYFsC*A)S+GS}4G8@33n
z+O{Ok!O;7{F@GJ$m1p1Q*|uDseSfFmZ$&1JG`2T)s@V2CE-YctPhqN1l|116lc8@Z
zOM!uQ!{SaxnRC1!GC5wJjTh@zI>ou*#udgb^;b*h80IqEK6YN_kV)(Pul=`RA;7>O
ZUd1%=VvpU@u$YY?K~Gmdmvv4FO#nVCpB?}J

diff --git a/core/assets-raw/sprites/blocks/production/cell-synthesis-chamber.png b/core/assets-raw/sprites/blocks/production/cell-synthesis-chamber.png
deleted file mode 100644
index 26f8399989b4afe09d7c407c7e56f5c4fe4861a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2336
zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^R$o_o4DhE&A8z2(@a>M7Xr
z(2o1~0|pPB9b8Gw*?NsEYo0SGPg}Et(_OM-+8&X=p%pvapH+vhkDh#K|I051+YO|@
zhFm){egFT@%j4_*eXpN)uKxe0-QFvTyQ*TZREov_`>}lgzfXdy6$gc{yjpaQGt0Jn
zJ!_2%XWR#ouUa<sT~+5Ft!<EB$#Q<~qI<?amo;dsX6)P5QoMYH`nmaw;+DR?qxqi8
zLf6q*w)ouK1=B3*o1$cW)BPjGKAcirp?t19aQWirZ$vLK#cgFVJ@S(;t7OZZy{EP{
ztZLc+_wn-lAJ_B$Pk5ALI)7oC#eK(Kuj7%$mJ4+hv>k=Rdw%b0mU>jvF3g+G{Q2c2
ztph?adb94u9{6r;GyCCAS@ra}qKDsJ&{Oa#$ZUI7F8=W^*ZGi&x}zs0(~Ws{JX*mp
zJ+z|pZfni{*>4w}^Sk_g_f0P6dl&T%sK&<ZI5gj2(|ofl=XNZbyRb~W)F_Ho<KEF!
zZJwoECuAS}nJW9JPw&+l4eo#~-Q8glZsro@rDdz`-wl1cCcyok=!fU`|NPS~=PEeK
z<-9|><9+y!=kLz(y$dteRqzVfaEMiV&!0?zgD1}&s9nB$Z+@%w)!SkQ0R`=kB;#z1
zzw6wo-gUqF{fe?FtR?k4(&^#xXS7YW8hy*TQ~&DV@AVQlL#?A&LsZW^-z@a(=cz01
z3;S;_-mHBlQLU)BUFt2<CLx>sS_h4%t`v2?Zh!j4xmV8f&#nJ(CgI!}*?INh4XSVU
zaoKLyax88>HRa5%eUm3g*1jlyFjF-0huDLi2RAi1hB-`m@P|vkcqxM^`?;8zvM-$H
zFISy$Ii}&WW7Gi!?E^bS<B|m4@7b}8$u#}l8Ma>?m9^#G2Fo=L?3|g)$joZZno-AB
z|KO;pX+ZJOsW&BS&wT#%eoBHLbNZ9hf4=WscDQ5FISc*di$BVp&Quio@?P27{foJ_
z;#hTv>WpAB`}cpAHH30*{E@}@`H{xK?(BjE?_#f*cZ4!F->p6JA^h{Zn(zkIGpFB+
z38<MqJmYZp;Pn6Y|7NBbzgmANVrszM^kX09mWM|jh-qRAW3AYBNNCTA1G36DDr&CJ
z47BHd!t#};UhlwW$EX7d65#~~@n?)<p9$^p2tA<n;MLw=y94}Yd_AMd_2JB!Z4Df!
z(%!e(XIFRTF+P5|r@D->Ih1kY?9G?-67(JlK4kxQD@n9Y?9;oCf83`e{NUGD@G3|<
z=3PF+`$KHPfvb;y9$@k_JRo_v-iwhr{auUvnfshcJMOyAJrLk;c;vtwyDbd*m8W*x
zSjFOOTYF{p_qzub?6)%Lm!GQHxRd4Zo?koiw|?hp%k+~EYM5?y)SK6hv#sKL;rqP*
zob#g^rk}h}()!T$)y44EeMWXm8P29<Y&&#8?(d8BPW6)0xh1@L_G&pymYlW5U`@L1
zuQeCa+bly_YxWlF82(t(@YB1Z{h1ce%bWdm+Fy1*dSd<H?Y+-Jhqp7-i%wi<XxI~8
zxu?B?|79I#{p42fO-#@37vIr5=)M2eW7}1~S)NT6eXz46alwcFn5KWLt682IJzlfK
zo0;`!W#PlykHo9L#Qx+z<2+}2N#TMAT<1Hy?@!x*V)6Y`<q3S+Hp(wQIUM9U-`Rbi
zr{>e*^QZD3{57^wU)hL5P;{Q)^nJSZ6W#YueSbhEtitWm)5fMpdv<)t{n%~$Yuz9A
zXNu>%cUc5{aObg?`y2k9<IK}A#{G32d-tDyXV>^M=9hr+pZI#w!ZQ8C@uCTw`QE&B
zp$=0PY!scf+Mp-h{@2<I@3{`2=bGXDBkRb8a#kLb=?f2XIagg<e4eW|ZN}ww4H^%x
z|5pfJu)jxeg=Hu!kDmAk+i45dbJeE0%y{<Y3zMJMi4R8SwGzMX-}B~M`OL#6%lS1Q
zRBI@H(K%SVTw<AJZ3N@`n5L@0ruw=r$GR%U^$|^02Vd25*c}wG-_r1L^E%`85lzpV
zZxnB3VV-08lW#}Jfj_Em?u6<nXdi4?ef%@?_Z}ghCtA+?f2-PD)=T(j>mGC9=4y#E
zt5}%j{GZ2))%|$i5+Z2*tVb^BfPrOq)Pcob1~dE^m%qO{e{XrysTt)nE+_oinVxou
z>Clp<!#QOWSFZ>ceX#pn&#zzmf|{)V%vR!(s4$BVGnj4iCzSE#pB#mP>A#uI^M)Pt
zGF$x5L4Nh_(C;%N|CZYBH~*8$II~e8erC+s^*k(B&o!pMTlCLCKKWe#)^oK@mWy-h
zq8r!_AJD0ZI&i8*JUscq%-t*OFSws^<Ghz#I$g5()U*AX4#A5uLLH9p5dZ$i;j;F+
zGv{6;&%3_AJR;GLIXxx%fWgv)<qeI`o^w|eo@bjicc-!R3*~2D?{d~B_%(m@-&t&&
z$(ZPM@SwqyKV15P6@}-|W>h>lGxcVp-Iq$Ce>04iYb1mp+SG7!O4DY;^J_mCEobFP
zI}9n=jNe84y_Gc2eErY&)#rKdi7r^F^XFzlYx<psf4ck@EZ_X=!gHJ1Qy<K93_Gx@
zrHoPUWKY_e&+iJpExzDhs_t#jKC@kH!4Iy|vK^0&y$b5DJ5PD=H{50kgKPPUsSo=m
zGsrbo`+u)~FT0(~BGxP*zg4_Eefs3NjlccMtM7LSep<@3PETgV&O@i~^B(%HeW$oQ
zy`5uMY=g!P*SVr?7kH1v&Yk<Jygbxen<wTJ(>tB;^wz|XgFBq(?BC>k=i<=~;aj+N
zBs<L&ZJWfpr0kgJTb`}EB}&|OH)yB*(YjN6<!7DwZP&STm%T6FEZVl`@rs7YLVJ$9
zbJ`dGa3<IJ^%j<obK2yyMUS(VcwPAOPHEr$hc|i7zqPP@y~f2(T{T84A-ri>x%h`#
zc2Je8E_IIW*=5~_MU2e88QYBB`G7^ULaffs^1h(?FpSaoU(3axnTL1sWp#X(z49W%
za(3X<4-=S7t{c9J5idRRQ}0#DmpNx|OfA^W;9JULRo)c!=nrRBsma{4C%h`67|(@%
zj=duM+&^&rrP93Pt6FZe&ROs?_{!-IcQjww3VHw7z_jOy=Bv<(e<EMyPR1N64{V5v
vy<+LO)?HY2PYvU%Ig8@NOXnTbcv!#A;-ezZ6@_XB1_lOCS3j3^P6<r_1*Mw_

diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index c67e06c80b..e400f992cd 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -534,3 +534,4 @@
 63169=reinforced-payload-conveyor|block-reinforced-payload-conveyor-ui
 63168=reinforced-payload-router|block-reinforced-payload-router-ui
 63167=disperse|block-disperse-ui
+63166=large-shield-projector|block-large-shield-projector-ui
diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat
index 0ab389a106f9115501ca6bb1b046c1af9e7d6f9a..6448d9c3a32ca014063c673f3598721a869b2e0a 100644
GIT binary patch
delta 40
vcmew&-=o09aAzZvHm|r?PGV7ds%~*cW@=7~Zb4CgR%&ude$i$f-V;m!7?}<t

delta 16
XcmeBC_#)55aC;+@Ht%Lv-s4OFFi!<m

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index dcba0bc1a0..e7f176009e 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -72,7 +72,6 @@ public class Blocks{
     //erekir
     siliconArcFurnace, electrolyzer, oxidationChamber, atmosphericConcentrator, electricHeater, phaseHeater, heatRedirector, slagIncinerator,
     carbideCrucible, slagCentrifuge, surgeCrucible, cyanogenSynthesizer, phaseSynthesizer, heatReactor,
-    cellSynthesisChamber,
 
     //sandbox
     powerSource, powerVoid, itemSource, itemVoid, liquidSource, liquidVoid, payloadSource, payloadVoid, illuminator,
@@ -1430,37 +1429,6 @@ public class Blocks{
             outputItem = new ItemStack(Items.fissileMatter, 1);
         }};
 
-        //TODO needs to be completely redone from the ground up
-        if(false)
-        cellSynthesisChamber = new LiquidConverter("cell-synthesis-chamber"){{
-            //TODO booster mechanics?
-            requirements(Category.crafting, with(Items.thorium, 100, Items.phaseFabric, 120, Items.titanium, 150, Items.surgeAlloy, 70));
-            outputLiquid = new LiquidStack(Liquids.neoplasm, 0.4f);
-            craftTime = 200f;
-            size = 3;
-            hasPower = true;
-            hasItems = true;
-            hasLiquids = true;
-            rotate = false;
-            solid = true;
-            outputsLiquid = true;
-            drawer = new DrawCells(){{
-                color = Color.valueOf("9e172c");
-                particleColorFrom = Color.valueOf("9e172c");
-                particleColorTo = Color.valueOf("f98f4a");
-                radius = 2.5f;
-                lifetime = 1400f;
-                recurrence = 2f;
-                particles = 20;
-                range = 3f;
-            }};
-            liquidCapacity = 30f;
-
-            consumes.power(2f);
-            consumes.items(with(Items.sporePod, 3, Items.phaseFabric, 1));
-            consumes.liquid(Liquids.water, 0.8f);
-        }};
-
         //endregion
         //region defense