From 3a6878ef605c4b4644f8aa20184a989f74c99fd2 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 13 Nov 2021 10:40:55 -0500
Subject: [PATCH] T2 reinforced core unit

---
 core/assets-raw/sprites/units/incite-cell.png | Bin 0 -> 460 bytes
 core/assets-raw/sprites/units/incite.png      | Bin 850 -> 1857 bytes
 .../sprites/units/weapons/incite-weapon.png   | Bin 0 -> 454 bytes
 core/assets/icons/icons.properties            |   1 +
 core/assets/logicids.dat                      | Bin 3255 -> 3263 bytes
 core/src/mindustry/content/Blocks.java        |   2 +-
 core/src/mindustry/content/UnitTypes.java     |  61 +++++++++++++++++-
 7 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100644 core/assets-raw/sprites/units/incite-cell.png
 create mode 100644 core/assets-raw/sprites/units/weapons/incite-weapon.png

diff --git a/core/assets-raw/sprites/units/incite-cell.png b/core/assets-raw/sprites/units/incite-cell.png
new file mode 100644
index 0000000000000000000000000000000000000000..2eecb72f3ffdfebfa26274790181427a4374116c
GIT binary patch
literal 460
zcmeAS@N?(olHy`uVBq!ia0y~yV2EO1V2I;jV_;xdY{@Lbz`(#*9OUlAu<o49O9lqU
zHcuDFkcv5PZw2}tHV|;VD1O8*LHO;zsd<amEd3*}Qp2yHEA83Nz0dhWHWYKJ9i7I2
z4l2^N%U}I$@oH@qlWw%)d;9yJrPQY_Tw1yz?7+P1J7%m>zwqgP!ex`2vD2T*{w>`(
zr6yP9^o2{w2V<1Ik1br9{BVx4_p^obITud8(f%${=+1QB%!Uh>>P`qMc`rMEaZ<_L
z=T|p>IsWp?>&IbF&VRo7X_k)q)*IcnK`AF~wp{7E`$#5IN@2^F@|^D{E-5Tr`u2vh
z%QQAF-L=X6LXu#Y?rA$S+4bu38K?ef7S}(#sNQXK{8o@r#_M-oToWv>&HHlp=BxOJ
zt1Oqam38bnG0!_HWBG~hGnRYZYcAj84P{@u)9uZjmOB^Mc3R1moV3{_u&qR<Q}(B`
zg;ClQxs(@DcZIDV`@NSmu3BvVr~hHxn=?;S^3U|#{W4`a-*nU6pClq*Sua`TY{1u^
zf9ZZ#m~2z!$;0N?EBA%kWQX^1gWbo#z|i1c!z|VM_~?@I?8_iAPgg&ebxsLQ0IV(1
ArT_o{

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/units/incite.png b/core/assets-raw/sprites/units/incite.png
index b6c2aeeeaa509ad168e90c1be0393aa941784488..0f25f7c0ace1cf172fb80f79a7c87e11164dc1cd 100644
GIT binary patch
delta 1830
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
Jvd$@?2>=@5jClY6

delta 815
zcmX@ecZqF+K|M2%r;B4q#hkZuZHsOj2(*S<I(Nx9WKJoZ-MpmiZQ)eUsb*fYPdz^M
z_*N<3q-(<F-x!0Q@Of?Ra{0_|-+kBpQ|(mM$qx>zbFgRx2r0G*IE9^4vvS~@zyA&Y
z^8Wn%Z<|lrcQ1%N82e0NkNJbUe-A%=`SR(HA5VV<y13NU)RfoMzdO8q`(M_$8uPVZ
zrlcH=`u6Z+^!vj4|9`6g{C>UOUP)<FZGB-)-uBz4zFvL0S|>k<Zxw6i!Mn^_fs=~2
z`z~Cs7d+{>gvj38x##7+pS0r@*4&vk->~hKxysJhZ`Q2Yr~dw(JfD)%_3-J^yzg)F
zU*qaNQB}S9{+z1UdF<sv8?&a?XQ+FuFu0aqt8&x8agD0B#wJClEtA$LoZ#cX5Vc82
zclXVM!OKp^O)56pQsp>H#7gDE7NL6}-h|w^gj1!R8Ye9!*QB<ee>P#`l-#fjmsGUF
zHu-Wzu1Y!TR94F9J$=oUQ+oF*b(?li;nKgAxpvZ2p_@0Y*Tim`q;36DSS*OY-qre`
z-7bddc2SY5-&_i0-_56fqg3R;!@0^b_Zpop`fcdfYdCDpZn1}X`75c{x1vhVnr4>C
z&iqidMS0E!i%TVkgcL28ItiZMTNJCp-ZQOd*DuYlu70;TmNIp`{@GSkGV>0D=?{sH
zneP8PB`id@ylGZ<?$i4uS$s@$hp@<7mO1qq-Fn;`Z#N6;2B~ueZsJ&xA=nc=MYmB@
zSE%~(UegPUrn9(OJ6`nT>FV2exuj3T_u%p}mFGS?XT7n~sGcR_?pbS+%0Ky)+Rqe^
zo9j;&PBMM9;LU%NcweuZseE0>E@n?VyS4m*NOxTF>UArPqql(U{E~I)&UURNwWTXu
z7suD9<a=h`-R!zPa#PTwhT1K{1+@!;Ziz2SYl+!rz1+3$S@`=s8)k4Q`Yn6lqA#j(
zahk5++R(!td5UbFW=B>m-YU>?=b`Sc#a9)#yt(k3XD_Qu8vpJUB3Dl>Dr)!PS#<xD
z;Lf}IbIqeRJ(_#_YnZXf$*%Og?d#{cPhL}zTK3bBHALfNm;1A4_WVtHku#IioH!Iy
c!u~KzFIvS}B`;9Gz`(%Z>FVdQ&MBb@0D8iO^8f$<

diff --git a/core/assets-raw/sprites/units/weapons/incite-weapon.png b/core/assets-raw/sprites/units/weapons/incite-weapon.png
new file mode 100644
index 0000000000000000000000000000000000000000..26d09e97840565e9c18e514af18facb2db4b724b
GIT binary patch
literal 454
zcmeAS@N?(olHy`uVBq!ia0y~yV31*8V6fz1V_;xV&G8mwU|?V@4sv&5Sa(k5B?ALv
zgQtsQNJQ(~>$cv99VFO4)E~Jx-SfqhDLO~%81_4Hca@Y1U-5sCW#`1hk((ZVx1>ni
zYkSi46rms^4yTuL?6W7dowogcXYTF4%TIHk@2@`D${Z6DBlXcjzhBM&>*+<2kH7tz
zv}WUBM%IYUx%_Ls`mu<d)^V;k*upF%!H{4!Ta3YDit&=QH<Bh!djFz9WLb+;BU4Y0
z*^1`O=3O(4c0{dR8nONLe}0X_=g#TBX%q=_V-01R9_f~}>czS@i955O{0wjW^M0QE
zmx$tHOy)O#O^{#5#lXps@JDciW0uF#-N(*mCdsNCcD?!F`RVO~tFAf=hg5r%1}?U|
z;@B(R%dwTqudc5rK<ov(ZE}dD&PJnMD}-(w@d*&hIn1Eo`)tSTXCa)W8!lVs*>Wv8
zxhJbQKy%0TdJc|r@})h}niB4ck2LN$`5HL9t?#hlx+u?MYrwC!NaDRoLrr2NyX6eS
z8%>`4J7YFzEo<I*VEgswt5$GS$IDkR6cqhm5q0S(2rO0IfBr|8T=BJ&-x(Mf7(8A5
KT-G@yGywo*x4|?3

literal 0
HcmV?d00001

diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index 104337ba18..6a5aa83cc5 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -435,3 +435,4 @@
 63271=core-acropolis|block-core-acropolis-ui
 63270=heat-reactor|block-heat-reactor-ui
 63269=core-bastion|block-core-bastion-ui
+63268=incite|unit-incite-ui
diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat
index 2f1b489b21a9f2cf4959b997d7f8f7f2750b97f4..2b25fe8faa540943ae125b4b289b8b72cb107eb5 100644
GIT binary patch
delta 26
hcmdlkxnFWaGZ&-g<`yn}MmDz0yyVQ1%^SJd7y)(O2pRwY

delta 19
acmdllxm|KYGZ&-A<`yn}#?8CASr`FDPX+z}

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 71bed3a426..834476ca8b 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1840,7 +1840,7 @@ public class Blocks implements ContentList{
             //TODO cost
             requirements(Category.effect, with(Items.beryllium, 7000, Items.graphite, 7000, Items.tungsten, 5000, Items.carbide, 5000));
 
-            unitType = UnitTypes.evoke;
+            unitType = UnitTypes.incite;
             health = 14000;
             itemCapacity = 11000;
             size = 5;
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 1a04d1cee3..1e8707e999 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -40,7 +40,7 @@ public class UnitTypes implements ContentList{
 
     //air
     public static @EntityDef({Unitc.class}) UnitType flare, eclipse, horizon, zenith, antumbra,
-    evoke, incite; //elicit, incite?
+    evoke; //elicit, incite?
 
     //air, legacy
     public static @EntityDef(value = {Unitc.class}, legacy = true) UnitType mono;
@@ -49,7 +49,8 @@ public class UnitTypes implements ContentList{
     public static @EntityDef(value = {Unitc.class}, legacy = true) UnitType poly;
 
     //air + payload
-    public static @EntityDef({Unitc.class, Payloadc.class}) UnitType mega;
+    public static @EntityDef({Unitc.class, Payloadc.class}) UnitType mega,
+    incite;
 
     //air + payload, legacy
     public static @EntityDef(value = {Unitc.class, Payloadc.class}, legacy = true) UnitType quad;
@@ -2330,7 +2331,6 @@ public class UnitTypes implements ContentList{
             defaultController = BuilderAI::new;
             isCounted = false;
 
-            lowAltitude = true;
             flying = true;
             mineSpeed = 7f;
             mineTier = 1;
@@ -2470,6 +2470,61 @@ public class UnitTypes implements ContentList{
             }});
         }};
 
+        incite = new UnitType("incite"){{
+            defaultController = BuilderAI::new;
+            isCounted = false;
+            envDisabled = 0;
+
+            lowAltitude = false;
+            flying = true;
+            targetAir = false;
+            mineSpeed = 8f;
+            mineTier = 2;
+            buildSpeed = 1.4f;
+            drag = 0.06f;
+            speed = 2.6f;
+            rotateSpeed = 6f;
+            accel = 0.11f;
+            itemCapacity = 70;
+            health = 600f;
+            armor = 2f;
+            hitSize = 18f;
+            commandLimit = 7;
+            buildBeamOffset = 10f;
+            engineSize = 0;
+            payloadCapacity = Mathf.sqr(2f) * tilePayload;
+
+            setEnginesMirror(
+            new UnitEngine(34 / 4f, 30 / 4f, 3f, 45f),
+            new UnitEngine(35 / 4f, -38 / 4f, 3f, 315f)
+            );
+
+            weapons.add(new Weapon("incite-weapon"){{
+                reload = 35f;
+                x = 4f;
+                y = 6.25f;
+                shootY = 5.75f;
+                recoil = 2f;
+                top = false;
+                layerOffset = -0.01f;
+                rotate = false;
+
+                bullet = new BasicBulletType(5f, 15){{
+                    width = 7f;
+                    height = 12f;
+                    shootEffect = Fx.sparkShoot;
+                    smokeEffect = Fx.shootBigSmoke;
+                    pierce = true;
+                    pierceBuilding = true;
+                    hitColor = backColor = trailColor = Pal.bulletYellowBack;
+                    frontColor = Color.white;
+                    trailWidth = 1.5f;
+                    trailLength = 7;
+                    hitEffect = despawnEffect = Fx.hitBulletColor;
+                }};
+            }});
+        }};
+
         //endregion
         //region internal