From da877261766cb772636c97bc63835fe0e990797c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 9 Nov 2021 20:20:44 -0500
Subject: [PATCH] Core: Citadel

---
 .../production/silicon-arc-furnace-bottom.png | Bin 307 -> 462 bytes
 .../blocks/storage/core-citadel-team.png      | Bin 0 -> 2720 bytes
 .../blocks/storage/core-citadel-thruster1.png | Bin 0 -> 1243 bytes
 .../blocks/storage/core-citadel-thruster2.png | Bin 0 -> 1259 bytes
 .../sprites/blocks/storage/core-citadel.png   | Bin 0 -> 2762 bytes
 core/assets/icons/icons.properties            |   1 +
 core/assets/logicids.dat                      | Bin 3223 -> 3237 bytes
 core/src/mindustry/content/Blocks.java        |  18 ++++++++++++++++--
 8 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/storage/core-citadel-team.png
 create mode 100644 core/assets-raw/sprites/blocks/storage/core-citadel-thruster1.png
 create mode 100644 core/assets-raw/sprites/blocks/storage/core-citadel-thruster2.png
 create mode 100644 core/assets-raw/sprites/blocks/storage/core-citadel.png

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 cc9cacb3f84e5f9fefbbff462bfd7413245acb09..4f4b6a2b8fa10ba52de5f54471a2bd0c9083c362 100644
GIT binary patch
literal 462
zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&z}VsG
z;uumf=k49yg@+A9STAymr>MW%&!n2-T*lI$`ng$s;vI)-rOuW#lX7kc?~A{WKM((E
zzCLAM-rAylB{x1E4^iTgFZna;B8PLk%zr~=!7_e}f5qRFa`u({NzQSNsD1e3cvSa>
z9~VBJ-zf6%KJ#(=>-Raz<7NI!?N|O&Q}8GID~E1j%_*C^QN=aar2n$V&1FnrYmj6}
zW0)}*8I=>IGv?);UCpCd9xhqtw&U2N)Om9S&uy)oo15NJ%oF?Kj^x9LrP^n$m1UB1
z|D>opB(<dH_Ri;F@#y)mV(-Vv2N^mASGgVY=VBC6?vawU*JShP*|6NGZc+{N<V8sq
S=Q3|GfPkl~pUXO@geCy2V4>~+

literal 307
zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW7>k44ofy`glX=O&!0^`7
z#WAE}&fANIybOvA2OJy(bbf6Ac4EiFYOYx&?~3;eroC*~pUrTMVGUyh^9HsA-UCt%
erVK+=KrVC%Q^0gnzJ3M<1_n=8KbLh*2~7Z;6kKuu

diff --git a/core/assets-raw/sprites/blocks/storage/core-citadel-team.png b/core/assets-raw/sprites/blocks/storage/core-citadel-team.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4412053d9d3067cef517dc85fb2e0813848d2af
GIT binary patch
literal 2720
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
BC1n5r

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/storage/core-citadel-thruster1.png b/core/assets-raw/sprites/blocks/storage/core-citadel-thruster1.png
new file mode 100644
index 0000000000000000000000000000000000000000..a637342ac9c08321c35b5aa7cc4c287b3e68e1ca
GIT binary patch
literal 1243
zcmeAS@N?(olHy`uVBq!ia0y~yVEDkmz_5gaje&t-rPtzO1_lPk;vjb?hIQv;UNSJS
zO!ahe45^s&_U^&H%N8;R9@?+2o$|2hNOuE^Q_S~0x7?lP>|AuQhef~X2<yGpy(Wu=
zq|D1?j)(1kZxS@yY<m3Nk|b*;22`-(-OY>Y4124-{`$Lq>G6GaKkv9&$IfB-q9*!&
zNqYysJ>!eBvntfx-E|TyCJVoRa-xHkM_u)!-!sAZs<r0%_jTp|-{1dVWUEF(NA5?z
zWgW$j=T33aNyv-qtq8t$#QJ3KkM(ahGlre+G*^0b__%+hyc$#6+$YDZPj*He*wB2b
zqWJIKC$SIOrX2hI_xJhb`_H>Syi&SRP(o{!;QN?Y+FKhIPO^P8SI1Q+VMW6E3iatq
zVg@-^Ua_zCX5nELHsJ9&U|_&l{JC%5<=w3fipP2*4ip$A9bsxSRu#0jyYs$KYc+>N
znp;=Ifr5h?g4_~XS+W}&7H*m*$SuL9mLM^sAu)let&tPNS@GuG&(mq|RTEZZbeX5G
zoTJOaGxd!7Ju#53h+nt%lpkSg>kYcTM?db)+h6yX+IY7en=SlfsjL(WPit21p6q$M
zx9sg|Sm^L}{n?etLDkB<+gmucOt|%B_fgaLw|e*W9xx~_*<;DVlkV1K?sVWo%9aXc
z79K&vv^|1MZ7F*+-H%HvCTLu8261!t9+6f|IB_W$#JO74ZSHhngIE7YHx7w)d5b3r
z=dYe>p~lp<V)ND)BKfC5(GjgQ&pq2$$HKw$i1)^6ZhOkqf?66L@>>eVcbk|$np2^C
zhP};oecb;4U!T3*ef0SCBRfk^&dKgMuwlV>kSlIhb(%XJ2#8$`;)HJ9m+XBYpwo0?
zgAOcgPy!0d@rqjCE~=QY;?$xtgB^1^>}&pnY|+2$a$rK{*(I%Eg4_~fHg<RP?XGzr
zxpt(9``mV!x0RW)$_8hiyb-U_J$J|Q&`#xz4G(=zrrr0RIL+_F`Ob&~1wlgZQ{=K&
zU$tc6*{FN(q)6`RrKK!q&h8e=Kezs**w$t~*}~aRq?p>KR`o<2n6Pkr2P@Cas;-Cw
z0Sl&gu%0=qee;U-qW%t6o{4=wp7-Z>AD5Ng*zhprNCzuVx?6X|0R!WpBhQ!*H(k-4
zR(?KSPcFR5`sq*h13$BuJmZjVT<Gw2qD84sR@K6Wg#l|juG^GrCNUmni&nn3D{opu
z;$r3c8$t#l8$>?d``paRGxdyep5e~;0|6IBHkxis2w0i@=oV6vJbVDm37K~5>;^MN
zXII_Fy#fX?A)CU3UV{R;UPARA2jk&<NLpBOOl<L5PKl&5AgRO0q!kk+X2DXXSyjyr
z`!{=8c|@nU&Ds3r95}&EeIxnt(l;%pwytj-7F*3HojtpwvigsF#p}0IS7w}-Y)oWd
zTX#dq;LQ?~M_U)?w=^V%?-YD~MEaqWgwmpOr5~>A&!4Zm_u8!NM|VIr`fqcwIXb&)
zZO9Q-P#UWX7W!y&ZyF1av8ABAWPVG-!$qco^0FXf0<|8=Jz_;IJ{ZbA*-zcHplTIw
QUKU8k)78&qol`;+0EUJj#Q*>R

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/storage/core-citadel-thruster2.png b/core/assets-raw/sprites/blocks/storage/core-citadel-thruster2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e09884a489b0cb6882ded8759ae98333375b40f7
GIT binary patch
literal 1259
zcmeAS@N?(olHy`uVBq!ia0y~yVEDkmz_5gaje&t-rPtzO1_lPk;vjb?hIQv;UNSJS
zEcJA845^s&_O4^z9W#lBi}!Q;C*?7HQ8G(7e8TLt!tob|O=~vmHnC*r2OXIGOUKiE
znqi>Z7LP!Y&dU7M1UKVbHHR-os3<d_f`(V?`s^5ATy5{4zfa%x+rPWF^=`d<q_V(#
zWrez}OU(~Xhx}_ttSzmQ7!P;OsZe)!(@CfZ5_+E^_i^X-U%#Gye)RGGpTFUO-Arva
z#NMZLS(xAR^gP1!?9tT@^HkqGlkarYpR|)s*gB^|S!rGVy_DJ+91>-dq~EKkCovx8
z^Ll*tYxLyuM(!Y~_p9&!ulV=-m)bn{hgV8B3QB0L5_})?N_%U=!b!G|=IXfWB&<j{
zU!ne7Nz5SU$}9HO#VkC`!UjA(2Mi1ti$C_wyS%%#LGf5`#DNbfM><$})V-AU?cII<
zaY&e;!I>VBjSUZb0+qxJLataPF*>K}DvLq29zFmwC*bDc!^xY!3mJr%9G$&6<eV5&
zo7Xet{O%4`9#Ngz+<VqZjECJ;X5Tyh|KHuOds%s;b9&9yKNMS=a7b`nm8!gMQ=VBZ
z%IMs9D}HwH@g?8fr1CfgGZeSJEbq>~w^h1Ux-s$Di;7|n3BMkZ{Fa7?H#0uEaY!g7
zovBb};W=3m+}CIBbRb|!JBWL;s?*%*z=WmCL7dfJ#qwJk5~s>N?iDcDv!mC`Z_nDW
zM>9Ai7M;7cD0mOZD>gTUKH5ZOCmm$;Qi|)^YVv5S@kAvS9{ZD>KbCqFE1&B$KU9+t
z@#W#;<?rM7*TmJ-_|A!*ex~x|`km|tmj3wm_SN~N$E!Nb4~1u(xaPe_kg4re)KO{0
zgcYm4%0@G_d9CSWO%cQhF9QQcXyAohs<K_f!RQ<+wzc`-Q<s|B&&x96mvuHMUY_O2
zy;e!gKxfC^-SIVRrgyCEWKExwXL;-Mt_Zh;87FV*|5$2K{G8)?-w~!ZVb$5S`mRw{
z2kk*=WAda5_0JK}YtJbrbmV^YTb2>6w^lhp@1FO^XMbkp1X{niAh_Lgonk`7%HtiZ
zJd#!25eFu$T;9RT!&=oDaUf>TB;UQtzd9lg2)yiw-(R=2;?6}uZi#t45*r&H9?1~o
zmPm8!x>1u5F=5xyPY)j!e%x{Cwx+*5gI~O|srwBM9@eb>BP)}GE_1W;v}U>PdA8GA
zkXyp+hSbMvrJGrJq-B2|p4PCiX=%szdGb05D^lbNyHEaQYU^4C@?f)9tnhWU1c@09
zi3v<?jhqr}V9vr#SMu7na!P1rNrIw(&7{4PqK-=|Cj2<50ZIsU20@^JPdD8rk?VUv
zAo-ZIVuFO(Jr2gh7hnl=!^O9E|0cfIO<1wO<k6g^<>%gBP)Jyja=v5wws1j%kS*><
zR_>jclXvXs?Z^KQMCY&fajibZ!DF5A_3*TYMD?YD>t$<|S$KAz>a|e6$8r6DfMDsm
z=KK4rtG9lM%3jx53`$-$w}n26<iFY)Bsl#D$Zd|EM?P0X3mKew;!=|Wa^L1_E;S_}
lhU?0X>JD+#vV`Hr$^ZHWhnKD_<!uGYc)I$ztaD0e0st~?CPDxJ

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/storage/core-citadel.png b/core/assets-raw/sprites/blocks/storage/core-citadel.png
new file mode 100644
index 0000000000000000000000000000000000000000..795eb990b2dfa7644196badd9f877e1ac0268535
GIT binary patch
literal 2762
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

literal 0
HcmV?d00001

diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index 3e9805ee66..a5bfbe9482 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -433,3 +433,4 @@
 63275=reinforced-liquid-tank|block-reinforced-liquid-tank-ui
 63274=reinforced-bridge-conduit|block-reinforced-bridge-conduit-ui
 63273=core-aegis|block-core-aegis-ui
+63272=core-citadel|block-core-citadel-ui
diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat
index e86a9ebbf6b70b01567d266df4a9b3fbb1b81ad7..9aa5dac48f4db7225345f4a83bdd8214dcda4c0d 100644
GIT binary patch
delta 30
lcmbO(xm1#gVe3YwL@r*Q<ou#k-Q>)Y#FW&W%}HFQOaPEG310vJ

delta 16
XcmZ1~IbD*8VarCQM6S(+TqaBaD|G~?

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 4b545dd5a5..854b556cd8 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -95,7 +95,7 @@ public class Blocks implements ContentList{
     //storage
     coreShard, coreFoundation, coreNucleus, vault, container, unloader,
     //storage - erekir
-    coreBastion, coreAegis,
+    coreBastion, coreAegis, coreCitadel,
 
     //turrets
     duo, scatter, scorch, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, foreshadow, spectre, meltdown, segment, parallax, tsunami,
@@ -733,7 +733,6 @@ public class Blocks implements ContentList{
             itemCapacity = 30;
             drawer = new DrawArcSmelter();
 
-            //TODO don't use sand?
             consumes.items(with(Items.graphite, 1, Items.sand, 4));
             consumes.power(6f);
         }};
@@ -1825,6 +1824,7 @@ public class Blocks implements ContentList{
         }};
 
         coreAegis = new CoreBlock("core-aegis"){{
+            //TODO cost
             requirements(Category.effect, BuildVisibility.editorOnly, with(Items.beryllium, 2000, Items.graphite, 2000, Items.tungsten, 1000));
 
             unitType = UnitTypes.evoke;
@@ -1837,6 +1837,20 @@ public class Blocks implements ContentList{
             researchCostMultiplier = 0.07f;
         }};
 
+        coreCitadel = new CoreBlock("core-citadel"){{
+            //TODO cost
+            requirements(Category.effect, with(Items.beryllium, 7000, Items.graphite, 7000, Items.tungsten, 5000, Items.carbide, 5000));
+
+            unitType = UnitTypes.gamma;
+            health = 14000;
+            itemCapacity = 11000;
+            size = 5;
+            thrusterLength = 40/4f;
+
+            unitCapModifier = 30;
+            researchCostMultiplier = 0.11f;
+        }};
+
         vault = new StorageBlock("vault"){{
             requirements(Category.effect, with(Items.titanium, 250, Items.thorium, 125));
             size = 3;