From 11eb5f464f74468e3c5d5b0f3a188a9c8cf1c994 Mon Sep 17 00:00:00 2001
From: Voz-Duh <siryoja1@gmail.com>
Date: Thu, 24 Sep 2020 17:47:50 +0300
Subject: [PATCH 1/2] Team Indicator For Command Center

---
 .../blocks/units/command-center-team.png        | Bin 0 -> 511 bytes
 .../sprites/blocks/units/command-center.png     | Bin 783 -> 347 bytes
 .../world/blocks/units/CommandCenter.java       |   8 ++++++--
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/units/command-center-team.png

diff --git a/core/assets-raw/sprites/blocks/units/command-center-team.png b/core/assets-raw/sprites/blocks/units/command-center-team.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9d27f73c97e409300f7a7841c3298d0f4aee854
GIT binary patch
literal 511
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE<t`_ZS!$7>k44ofy`glX=O&z`&C3
z=<CS9u(6-}Pa-P=0|RG)M`SSr1K(i~W;~w1B87p0af+vlV@O5Z+t~+u4>|C-3P;`4
zvM5}_FQwS)U>)M9%a}d)s*t9!*~Y^&-k1NBQR4o8rs9~}m&X=mZBv@Qt_jjf*4>oc
zs>++tdUOlho&4=b6YPKQ&AK0TOlx9vgXpw1jMGdXSn(W9Se_{GHg>gzkWaY7+wQAE
z%G-SA8Qf>e_PJqId1xuyp5#O7lhoH#Hx@iGJi+BHbpV3vE$7FdJ9zlxiTQPv+vch0
zrEf4V*&cD?IsZ#8j`GMAv1`;!q7`~LFFoPR<;}Rq;`_;E9@Cl)2c#8VvOVWFsZ}|b
z?Xb3Y+M0$5<qS?n&J*$)3)DQ=HD*Z(9Ai2AMMK?b&4wk6Yc^!?X6#F-_{NmDYN@-q
z#Jd#}W+@md#C#GK5?-Rb@xMu};w<%CQ=#8cml(n#wy>Gp7s#x4yDsrz>fHrb8VpYQ
zd-$Fxn;|;Qqydb@Dwu8h4@N!sX}Pxc9?N>s4}L~lSz_-^X=lv7_vD#cgml8j9&^)!
zTiBk|w=qp(+i)l;irFhU<L#1TMq!<InAU7)kiJmLul8ix>-_)6*cliY7(8A5T-G@y
GGywo7b<QLJ

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/blocks/units/command-center.png b/core/assets-raw/sprites/blocks/units/command-center.png
index ac9aa455942ab5672a96d2684781eaf6a771add8..a0de4888a9c36400207ab6fb51bdcbfa1b66826d 100644
GIT binary patch
literal 347
zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o7G?$ph6wkZw+svnjKx9jP7LeL$-HD>U|>mi
z^mSxl*x1kgCy|wbfx#faC&V?cpkc<WB^!1fU?2{pe-G+oU|`@Z@Q5sCVBk9p!i>lB
zSEMj7Fl_O3aSZV|{`RUPAG0C{>xJ{Y4bl((^548Q%Yw;ka$c!1cicYC6oFgk*h3n%
zm_k|Z398Lr9PhAumj~w;=5Jr+3>hYUW|_mdia{;luv${XHH$6X?x{68CU>+hDEEbb
z>0m$6_KG1=<}%ZSo=jhlV<iV!#s6@hiqG$TpmOl7I{TwpmrEOun7Y5_>JpT@@v-aA
z#fLjRR9V%8GgvQiOx$vO-{T(-J)JnW3HqFz60=*&L9{`v^aA(v_%_AKx@+!$yzlAi
K=d#Wzp$PzFgmJR~

delta 771
zcmcc3)Xz3SqMn0|fq`LFX5l>s2BvGCE{-7;ac^fB`W<oLas9r}qhk`^4%S7_7(zrs
z?lAftR2AdBr11I4#^Z%XoU=vzouvQIeBXZLT~Sp{mEHb5d(R*G`FI^?y6uefb5aX;
z?b~U8UbWHHc<IdZb5cJlC+KnN%+fqt^Gv5Zp0U^?;i6CGGvoC7$UlM(oKK%~#IN7(
zYw`ME%`+XnT&@*D%ML7>dFf30Ijw?^cR4i*Dnl8Z1tUy?XZ<`AIcW>SId41pbv_pN
zn=B7ia{it)h2dP*2AzjC4{aXqVXNjB4M@m5^fSk=`ED@Ns}GZee#|M@$NtXHlYu#?
z>06D-J^iD%)pZuc-KyHgHm#l|e}1<>K!)dsZ=Bo{#52!dcbWX)t+3dFv&Ct?Tk5Xa
zWikdaZT3Fs7iO<--OZr8-Q>;HSI?jN)$D)zJg@HmGuB(Giys)hxqi$2lB$E(gHO?-
zAl(6~1wVDUUffmJS#aR#b~S}v=M@#C9(-zV_^)>$x{dK%_RPS7O5cX*g{<{c7XH_A
zczx`r9%B&G^Q~tzcJzo`cy;V&9%Cqk>m!;_`nbl!q49H6n#h}FUq2hQH)J#*aXb>P
z*Rz!WHQVu;-%0#`;0(t1r<teU-^GwW-`T<Bz*Bz4YM}tV2cM#a1AcvZCoH6(ub^Yb
zrKkV9@^=eMhIoBWti#j=Z$G;?Z0{*;oEk0lE$i#&qRpHaHhBlWPcmOCzj@C5&;uD&
zzbb#Xuui!?BU1Qg;Ol2^g~cxH%J9t!-={Z!>$jOI3E4tnf*V9RH!Z$){PuCt1+7&N
ze(Rn*w|#=pj`nTd(;0L#4t{F+d{ZW|Ji9-SF)E^YDd%$#G`&%C`<9}LgSEq<O)Z~w
zXDH8^zCr(CO+*8$eYrOzHFRn#C_@ub=)+IGjKQiKGM1Tqp1D~o=AMXwD^quxm+^c{
z?{~sN0<Hg}Clp+3{&^-+$m_=3hNdYSyct`y61OvPxgIjNnUMMCuVBSz1_lNOPgg&e
IbxsLQ01oDEGXMYp

diff --git a/core/src/mindustry/world/blocks/units/CommandCenter.java b/core/src/mindustry/world/blocks/units/CommandCenter.java
index 071bcaf273..ef9e0fbb6b 100644
--- a/core/src/mindustry/world/blocks/units/CommandCenter.java
+++ b/core/src/mindustry/world/blocks/units/CommandCenter.java
@@ -20,7 +20,7 @@ import mindustry.world.meta.*;
 
 public class CommandCenter extends Block{
     public TextureRegionDrawable[] commandRegions = new TextureRegionDrawable[UnitCommand.all.length];
-    public Color topColor = Pal.command, bottomColor = Color.valueOf("5e5e5e");
+    public Color topColor = null, bottomColor = Color.valueOf("5e5e5e");
     public Effect effect = Fx.commandSend;
 
     public CommandCenter(String name){
@@ -63,7 +63,11 @@ public class CommandCenter extends Block{
 
             Draw.color(bottomColor);
             Draw.rect(commandRegions[team.data().command.ordinal()].getRegion(), tile.drawx(), tile.drawy() - 1, size, size);
-            Draw.color(topColor);
+            if(topColor == null){
+                Draw.color(team.color);
+            }else{
+                Draw.color(topColor);
+            }
             Draw.rect(commandRegions[team.data().command.ordinal()].getRegion(), tile.drawx(), tile.drawy(), size, size);
             Draw.color();
         }

From d08c54d9a701400f373ea04ba0bec68db6b252fb Mon Sep 17 00:00:00 2001
From: Voz-Duh <siryoja1@gmail.com>
Date: Thu, 24 Sep 2020 18:10:49 +0300
Subject: [PATCH 2/2] Fix

---
 core/src/mindustry/world/blocks/units/CommandCenter.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/core/src/mindustry/world/blocks/units/CommandCenter.java b/core/src/mindustry/world/blocks/units/CommandCenter.java
index ef9e0fbb6b..cbad080647 100644
--- a/core/src/mindustry/world/blocks/units/CommandCenter.java
+++ b/core/src/mindustry/world/blocks/units/CommandCenter.java
@@ -63,11 +63,7 @@ public class CommandCenter extends Block{
 
             Draw.color(bottomColor);
             Draw.rect(commandRegions[team.data().command.ordinal()].getRegion(), tile.drawx(), tile.drawy() - 1, size, size);
-            if(topColor == null){
-                Draw.color(team.color);
-            }else{
-                Draw.color(topColor);
-            }
+            Draw.color(topColor == null ? team.color : topColor);
             Draw.rect(commandRegions[team.data().command.ordinal()].getRegion(), tile.drawx(), tile.drawy(), size, size);
             Draw.color();
         }