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!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|-g>$?hE&XX
zd(n`WL6PBrgM(bpkL#aK?08tsHLK)Z@qWRymks-~8Lly`VT@qjz?Q&!K&ru%VTcOI
YWfU<j@BCx`3g~eLPgg&ebxsLQ05bqyc>n+a

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!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D%zEj?WvLn`LH
zy?t<1vw;9>z~>kL|8Kgxr@@0eDEHa1d7EE3y)c-bwrJUDCZJ9TD3}=*dm!-ju62Kl
zv)`uPbzkRc>^kxGv9jN6@;lWo#+NeAzh(9(^mF>h6?zYPW=h}p{ms3Dn^B}&J}7<q
z%rA~Iv3EkVYl=8Fw#M2f1Uq-=yo%mE`-s3Ju3z7-8R@pHNOF7oda_f8X37`eP%jQa
z*O0px)mjYpG<-SEzSvpvSL(~N@7>xS1iBb9iWoDO<=Hatx+0)e=9+qY!xn*6+m@s`
z7<ykg=C9+p^6dLO+m_3-@9z}+t;nR2#`fk;72BT2g(VF7DNGfrk_WthGW0EFDKOA(
zSlr1dbB^~zCdbRO@nZc-r#KhfxWc%l{%YwQ!(4{j$Ii<fGHJd4wf`0@1Q-~^tC%KU
V?6F%K7PAo~=;`X`vd$@?2>?DTpB?}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
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
GLSTXgrJD%=

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