From 125994482e8ac5a0c1713c856ab7ad9ee3b9bfe5 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 10 Jan 2022 22:52:22 -0500
Subject: [PATCH] Minor polish

---
 .../blocks/units/mech-assembler-in.png        | Bin 0 -> 1166 bytes
 .../blocks/units/mech-assembler-side1.png     | Bin 0 -> 770 bytes
 .../blocks/units/mech-assembler-side2.png     | Bin 0 -> 765 bytes
 .../blocks/units/mech-assembler-top.png       | Bin 0 -> 3206 bytes
 .../sprites/blocks/units/mech-assembler.png   | Bin 0 -> 2898 bytes
 core/assets-raw/sprites/units/quell.png       | Bin 3651 -> 3644 bytes
 core/src/mindustry/content/Blocks.java        |  13 +++++++++----
 .../turrets/ContinuousLiquidTurret.java       |  10 +++++++++-
 .../defense/turrets/ContinuousTurret.java     |   4 +++-
 core/src/mindustry/world/meta/StatValues.java |  16 +++++++++++++---
 gradle.properties                             |   2 +-
 11 files changed, 35 insertions(+), 10 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/units/mech-assembler-in.png
 create mode 100644 core/assets-raw/sprites/blocks/units/mech-assembler-side1.png
 create mode 100644 core/assets-raw/sprites/blocks/units/mech-assembler-side2.png
 create mode 100644 core/assets-raw/sprites/blocks/units/mech-assembler-top.png
 create mode 100644 core/assets-raw/sprites/blocks/units/mech-assembler.png

diff --git a/core/assets-raw/sprites/blocks/units/mech-assembler-in.png b/core/assets-raw/sprites/blocks/units/mech-assembler-in.png
new file mode 100644
index 0000000000000000000000000000000000000000..d411cbd4cd4ca868a197c1a080dd4536e62b33a4
GIT binary patch
literal 1166
zcmeAS@N?(olHy`uVBq!ia0y~yU|0ac9Bd2>4Bh9`br~2K7>k44ofy`glX=O&z~bTQ
z;uumf=k49oxwjoe+#cFHof3G!_ojFChUx2!PcP}pnZ(Dlf<N8WeVI#<-1l>zYqW1R
za5C8`SSlyEF)@IE1E>D_eEF^C89!Tjx^z_eon}{Z;a&b(zC&Q?+-v(4oTiirFK}tm
zc%IiFB)F*OEQ6|2%l^9{a{XZtIe!6&?0*0v_pShuYhQrKxl2G~?-K@9C6|3`K;*nP
zAku0wh?Lq4B5f{%NSV(d(qcM@l-SOos&vHgI*7FU4kEWHF?zXl{O)4a5LC<)<qc4B
zstL7m=;ZhqKb1j$dbzEgt+3)L_KKZ*>g&{;M0h_~?PC=@w>F~T`=e+ZJKK7JM{~MZ
zc8K3MRhrXZ-LUYZZbyOMLB?ZkQ+}BX37%8YIH0;@#)6>7(E<-;_?TnbMTElgYPgkT
z?&mc`E52n-6TRQWaeSH$$4>ECr6BR}YZ^bSEY|-JbFo<VCUeH=r+01lu?qGrKXsbJ
zvZFxfE~|#%LyuiN0ZNAgOQaXLv?#x@a_Ho!zFylPB={|-gF#j4&DFey=bxQdel~Dy
z`D?j{Nl4L#^=?zAKwQ&&#!dmbHp!Md&Mj}HLE56tYZ`<Ex8-y(s4C@LHDO%j%hIuG
zU$tyS_ARxiZ!=FPFVxiwKd{&G@Qt4?r;``jhUOid_D~@4{vxIvQyHZ<;a@~ITrKF>
z;P1KpLD*r%L;qClncw~0ob0}QX<zHN6keweft{P&54v>7s9iR2=?F>t+~Cq7vP}4*
zOGm`j@0^(rBUZF;PYejX$S||y*sRQk>g`8wBzVbkm(FDMsPRY?QuwGi^`z9r=nj7O
zGhrv=mF-##?y9Fa)^JP}Nmwm>>d5u^FBqbE+kX5K5lvWqP#}K)sv1%Enur}N89QgE
zot$eKIPdl;j+mzcP1_R#L>U*Y%4GWU`}z0nx1Kjd2eWw8yp^(Zc$9tn0;5p;?<VFq
zxmqnhehG*ud^~tMvEc~2|87Ph`8~YG9E$twcm)+ceqH^Wp>utHEW1a|-`8dikEETa
zGYZ|e*u_2J$FZbMZY3+HuIk9QNn8D-+TEij+32qN5pAbO(%17Eq8+E+IXLOZv9b!*
z7<N&i8KEsl%=ayb{vZ_M6R}fJ=)O$Te8%7=uignio;|eVmylNccy{Rtmy(Q@Bj)nk
zms(ys_q_eAcnoKL+|}=#iu-no{@43q<@CsT>U6<#&)FX}FY#jh_v>f#4~3OZ4M*Cu
zU71zv)`)UX_)*|Lk)e}6`VO;--J3$*2|o&s=sG-d=9tdV$-nRnvx?mj1KtTg1WxNX
zJaXom%+Sfdauc(P-IEhs6Mjt4wsd&Z+`5FJlRs<`vx;3r7uSRz3Az>zkDA*TFm&?A
z@iD8|Rovp8@Z&+QvBM*0&T?iIyD3G&3Lh6P(PtEr_xjB<;YYyH)30y4zbyt801ONa
a4_?WC*?OgH*2c_ukcg+NpUXO@geCw-{Nl6#

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/units/mech-assembler-side1.png b/core/assets-raw/sprites/blocks/units/mech-assembler-side1.png
new file mode 100644
index 0000000000000000000000000000000000000000..07a26a13183968aa09657897ac72bd0e26e9cb49
GIT binary patch
literal 770
zcmeAS@N?(olHy`uVBq!ia0y~yU|0ac9Bd2>4Bh9`br~2K7>k44ofy`glX=O&z_iEH
z#WAE}&fB|tb446wjy)82VNY2Sa!|DK$&p12$35~I8rXCMcQd#&xd^^%nqubD<bPw|
z-x>XP4?e4Wbotgn|IN4N&i=2;fDJ6(Bk`C2gH7$vpD)YKK4<YL&wlL9;*qZUQI%=Q
z;!8h-7%zGH)_8u}^xgi@|K|mzfuiwB4pLi>Oy9wJ`9Wfh{Js5}``Q>*8g2bF)$N6t
z&&I<)Z$8QW{<=Tj_4+2JpeJ!P@8kUI^4@xBID}d6{AB8;;Se@+_uFkQ8V=7MN3Aw;
zVw{w6n<HOuy}I>h5uZs<p56ZLE4Fy&4<W`+)9(rD9i7fGfxXIghuS`uhB+6c9^U#P
z#Avk8?9ikiLjDJJG%Bsub%r(QL<v6(^S=o4+=0u_pDOOQG_`eXc$1V>(#~-6&Ye3F
zjGI<2UFgb`Vw|m(#yP=P;^Juow=Y3!zcKupd+DJI)02$%Ap4GY{19rN<ncSC<<^f$
zPeM=2KYJ-Hc>nnJ`TgZ_+6q^r9(%K#=#x7(onyk>IbHgK3f40~WHaZ4vuAV9a!!c#
zan*1rE7o#i3|jleJ#*4=!CTyEmF6jl`a4p!&vAKt&e%F@>W4nj3Ci)ulPuyro}T<X
zwWh6Dqw}H6=@bk0%aZ3Z_}Yx;bUgH$*T=}fz|ipgaCe4S?$73{OetX}zpR<XF_$wj
z=;e!Thp)PR44chhxw0%TA+v?)$;4|5r>Y8aO{k7~Y#o=L+QRf?MR?8e*K0ch8dP4&
z-~YIaTd<1PdH#>Ib3Etgii#<$z9JV9Z?!_tA<SAb(YdCRL9;~v(6Jvvj6n|z>dI~_
z?>iD~Ao}cE4X=8VIe+{{iSx(ay;J&<J(H)fxbp6nj!4Fri^^U#GQ3=-=EQg@G_!?i
niM4W-<T(``Pz0dk2lu~Ai>`d}JL2DiB#@k^tDnm{r-UW|f*4K)

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/units/mech-assembler-side2.png b/core/assets-raw/sprites/blocks/units/mech-assembler-side2.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7677e0b77a55dd58d01fb60e1dccac88f19733a
GIT binary patch
literal 765
zcmeAS@N?(olHy`uVBq!ia0y~yU|0ac9Bd2>4Bh9`br~2K7>k44ofy`glX=O&z_i`d
z#WAE}&fB}Yb43Cr+8*+|uupLi-N7xSRnYT<P3A&_>Tx}Wi3))&D-UT(n$BQZ-&6j)
zNY9vk_Vdp0*Sv9aKgOK1=VZVF4rr`*`_B-!Y;(W-yX!T64JF&n_PI2agbBqfIaq1+
z>I*8&y>eu_%KGa60{`sO!=HzKRApKc=v~w4Y{1+1==aCfKdf0irk<R--oU9np)2-&
zte<?@{r$SX^t2UR<&J-U`uqG#{&g{&tS7RThwZz@!Focgxc%-l4%QQY{+DQ9b<=Q|
zlq3D{?a{L->F1g}C)HGaubg}|LvNo;gUu!DLrZ@MF@ADc&vE_8bdCwaQOYsW@k$PA
zSKK0m;vebEU{y^&ZhDbxf@`+YomV<iAkS6&i?K;DU%pJ8V?wM??>hm7*|TR$D?6BN
zHQD0Pkdt=yhz{c>PUR}eV;ym;Lh~K!11#ovG|0S>jaPE`Cm|T06fE@8Ky;zeK9$PL
zU)n3bxg9D0{q^?46WOdw;*x7R8E#&@{6mOw)8ycfs!S>DVA6nb)6SjI#Y`#U!Gc^9
z?#}57Xt<(Xqv=~Dv#|Q0&OP49J>qu?w9j#Q{La|gHT6TI=mh5eWWzb^L6zTZCY>)Z
zQ#G8EJCi3p+3K+5*@Fdb!iF&?ZyJKU@}X#lz}ZE*@e#TXX;Xd9uj;%oPe5&IU!L`D
zEB$>})g1g*&6SRjTF78|$!g0c6(`0|)1P&&tY6a`&>-`r>;1u59IPIb{(ZEK=(><9
zvFnKW?(~YZ^&1!>msTDAb;zxhanr4p9MO-wSv(dV7u<GiI>!XA>*dqG+k!-vp4=RL
zxbw#8z?Ng1H*R-sxi{@3$98dZ-|iWr6ZEo{%W+J|%Tf|ih@I-D;jqhi(e#HthnPSv
dM#ukZ_cLC17cpJKR+S8r^K|udS?83{1ORdbHe~<+

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/units/mech-assembler-top.png b/core/assets-raw/sprites/blocks/units/mech-assembler-top.png
new file mode 100644
index 0000000000000000000000000000000000000000..18b76fc0624afe3145e6d592c0604c3840b1a93f
GIT binary patch
literal 3206
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

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/units/mech-assembler.png b/core/assets-raw/sprites/blocks/units/mech-assembler.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf54cf6950078560e7b40538b78fc9026d9dbea5
GIT binary patch
literal 2898
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

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/units/quell.png b/core/assets-raw/sprites/units/quell.png
index 1ce9a121c2f1a29e44c9ec36c819452427c0293e..8f337b129e58f3ab8d24125fc8828c97ea82ffa9 100644
GIT binary patch
delta 3028
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
Z-jvUrtDY!a!N9=4;OXk;vd$@?2>@BnoKFA%

delta 3035
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

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 63a83f4245..f0ede69604 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -132,6 +132,7 @@ public class Blocks{
     //unit - erekir
     tankAssembler,
     shipAssembler,
+    mechAssembler,
     basicAssemblerModule,
 
     //payloads
@@ -2993,7 +2994,7 @@ public class Blocks{
         //TODO bad name
         sublimate = new ContinuousLiquidTurret("sublimate"){{
             //TODO requirements
-            requirements(Category.turret, with(Items.tungsten, 150, Items.silicon, 160, Items.oxide, 50, Items.beryllium, 200));
+            requirements(Category.turret, with(Items.tungsten, 150, Items.silicon, 160, Items.oxide, 50, Items.beryllium, 250));
 
             draw = new DrawTurret("reinforced-"){{
 
@@ -3035,15 +3036,17 @@ public class Blocks{
             //TODO balance, set up, where is liquid/sec displayed? status effects maybe?
             ammo(
             Liquids.ozone, new ContinuousFlameBulletType(){{
-                damage = 7f;
+                damage = 9f;
                 length = range;
+                knockback = 1f;
 
                 colors = new Color[]{Color.valueOf("eb7abe").a(0.55f), Color.valueOf("e189f5").a(0.7f), Color.valueOf("907ef7").a(0.8f), Color.valueOf("91a4ff"), Color.white};
             }},
             Liquids.cyanogen, new ContinuousFlameBulletType(){{
-                damage = 14f;
-                rangeChange = 50f;
+                damage = 20f;
+                rangeChange = 70f;
                 length = range + rangeChange;
+                knockback = 2f;
 
                 colors = new Color[]{Color.valueOf("465ab8").a(0.55f), Color.valueOf("66a6d2").a(0.7f), Color.valueOf("89e8b6").a(0.8f), Color.valueOf("cafcbe"), Color.white};
                 flareColor = Color.valueOf("89e8b6");
@@ -3312,6 +3315,8 @@ public class Blocks{
 
         }};
 
+        //TODO mech assembler
+
         basicAssemblerModule = new UnitAssemblerModule("basic-assembler-module"){{
             requirements(Category.units, with(Items.graphite, 10));
             consumes.power(0.5f);
diff --git a/core/src/mindustry/world/blocks/defense/turrets/ContinuousLiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ContinuousLiquidTurret.java
index 7db7a37198..496b549f89 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/ContinuousLiquidTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/ContinuousLiquidTurret.java
@@ -33,12 +33,14 @@ public class ContinuousLiquidTurret extends ContinuousTurret{
         super.setStats();
 
         stats.remove(Stat.ammo);
+        //TODO looks bad
+        stats.add(Stat.ammo, StatValues.number(liquidConsumed * 60f, StatUnit.perSecond, true));
         stats.add(Stat.ammo, StatValues.ammo(ammoTypes));
     }
 
     @Override
     public void init(){
-        //TODO use ammoMultiplier here?
+        //TODO display ammoMultiplier.
         consumes.add(new ConsumeLiquidFilter(i -> ammoTypes.containsKey(i), liquidConsumed){
             @Override
             public boolean valid(Building build){
@@ -49,6 +51,12 @@ public class ContinuousLiquidTurret extends ContinuousTurret{
             public void display(Stats stats){
 
             }
+
+            @Override
+            protected float use(Building entity){
+                BulletType type = ammoTypes.get(entity.liquids.current());
+                return Math.min(amount * entity.edelta(), entity.block.liquidCapacity) / (type == null ? 1f : type.ammoMultiplier);
+            }
         });
 
         super.init();
diff --git a/core/src/mindustry/world/blocks/defense/turrets/ContinuousTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ContinuousTurret.java
index 131eb496c9..750e443e0e 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/ContinuousTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/ContinuousTurret.java
@@ -27,6 +27,8 @@ public class ContinuousTurret extends Turret{
         super.setStats();
 
         stats.add(Stat.ammo, StatValues.ammo(ObjectMap.of(this, shootType)));
+        stats.remove(Stat.reload);
+        stats.remove(Stat.inaccuracy);
     }
 
     public class ContinuousTurretBuild extends TurretBuild{
@@ -107,7 +109,7 @@ public class ContinuousTurret extends Turret{
                 return;
             }
 
-            if(consValid() && !charging){
+            if(cons.canConsume() && !charging){
                 shoot(peekAmmo());
             }
         }
diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java
index 3c2bb8a291..064bd095aa 100644
--- a/core/src/mindustry/world/meta/StatValues.java
+++ b/core/src/mindustry/world/meta/StatValues.java
@@ -34,15 +34,25 @@ public class StatValues{
         return table ->  table.add(!value ? "@no" : "@yes");
     }
 
-    public static StatValue number(float value, StatUnit unit){
+    public static StatValue number(float value, StatUnit unit, boolean merge){
         return table -> {
             int precision = Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2;
 
-            table.add(Strings.fixed(value, precision));
-            table.add((unit.space ? " " : "") + unit.localized());
+            String l1 = Strings.fixed(value, precision), l2 = (unit.space ? " " : "") + unit.localized();
+
+            if(merge){
+                table.add(l1 + l2);
+            }else{
+                table.add(l1);
+                table.add(l2);
+            }
         };
     }
 
+    public static StatValue number(float value, StatUnit unit){
+        return number(value, unit, false);
+    }
+
     public static StatValue liquid(Liquid liquid, float amount, boolean perSecond){
         return table -> table.add(new LiquidDisplay(liquid, amount, perSecond));
     }
diff --git a/gradle.properties b/gradle.properties
index e1dd9f2cec..a9f9f23a74 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,4 +24,4 @@ android.useAndroidX=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=3bd873b8b7
+archash=368ccbfa7e