From 79bf77f4becd473b7f9f187e7caba5dbaa1404f9 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 31 Jul 2021 18:23:22 -0400
Subject: [PATCH] WIP team icons

---
 core/assets-raw/sprites/teams/team-crux.png       | Bin 0 -> 479 bytes
 core/assets-raw/sprites/teams/team-derelict.png   | Bin 0 -> 608 bytes
 core/assets-raw/sprites/teams/team-sharded.png    | Bin 0 -> 404 bytes
 core/assets/bundles/bundle.properties             |   2 +-
 core/assets/icons/icons.properties                |   3 +++
 .../src/mindustry/entities/comp/BuildingComp.java |   5 +++--
 core/src/mindustry/game/Team.java                 |   1 +
 core/src/mindustry/ui/Fonts.java                  |   7 +++++++
 tools/src/mindustry/tools/Generators.java         |  13 +++++++++++++
 tools/src/mindustry/tools/ImagePacker.java        |   4 ++++
 10 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 core/assets-raw/sprites/teams/team-crux.png
 create mode 100644 core/assets-raw/sprites/teams/team-derelict.png
 create mode 100644 core/assets-raw/sprites/teams/team-sharded.png

diff --git a/core/assets-raw/sprites/teams/team-crux.png b/core/assets-raw/sprites/teams/team-crux.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fb6783a5b49b3fdced9de4860670f644459bb28
GIT binary patch
literal 479
zcmV<50U-W~P)<h;3K|Lk000e1NJLTq002G!002G+1^@s6bHS)Y00001b5ch_0Itp)
z=>Px$nMp)JRA_<io57O9FbG4H{r`XNUdp92Z48!#yNm7y-XyUFb%D`nq}1c7uKZU=
z(pTW?y6kn>6TW-OZg^|5yI0!@Z%efLJ-gs7NwS-m174n>x^t`HrNMWPD<!-vFzbv~
z!ApX&jfn!D9#G}R*znX~Y75GQrv-BPZWcTxh`ZTfz;6fW>acd<w-$G{mB1c+d0{tn
zs0v?NbP9B+0-s)R8gwWN|D!78bj_=t)hY1S%`Mao-*TLVzSY2d+}u{6T1LYQIqzz}
z-PKQnXFvms$Jr_HENCEcj(5W|p@F1<>4IlN0|n>ihF3rXMa$}fS3v_CUR@2Zga$U7
z6cxN08dz{{EI8(mhK!n)o`wtF1q~#;x*FaI4J4Zs6}%f75RINPARW+va00_JF|w1R
zR*nZ=nd8{P<OZp_Fr+BZ@iraz9oqVU-2fp*!Ol(7elg%(;r4cy6)02z=ooOcUH%D>
zwy6#~V2CwuSIzO}f}cuNc=fn?F7c|xoWL+N7xi7*nZPjhZ~u(brpHs=b&N)TT)#4R
VR6xSYBdGuY002ovPDHLkV1nRP+=u`G

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/teams/team-derelict.png b/core/assets-raw/sprites/teams/team-derelict.png
new file mode 100644
index 0000000000000000000000000000000000000000..38ac90dcb1ad7df85191e10d4c509c68634ec97e
GIT binary patch
literal 608
zcmV-m0-ybfP)<h;3K|Lk000e1NJLTq002G!002G+1^@s6bHS)Y00001b5ch_0Itp)
z=>Px%8c9S!RA_<iTFI8fAPjTn|Nogev~OOTK)lEcbkMCW*iu-6Oo=u&HloqqsK|X(
zBqe%@{vdK3sa#5gk48CD{Ewv*GCiOAW=?zc6F!sEj*wJX#>m6Or6gw(O{5V1M4Tf#
zn`k1Ta0zi#eD<!+Zf?@iLWPa`M{Rg6Q}iRC<H#c$DTiUO3eo2{$VMv4(fhJeG@3_>
z?izmz-uo>}v}Y_8;okbo6g}c%>d!Th3ViAt1w?$<yK`pIL_xx57fobzXOZAUdF|>`
zP4&^?rT06Euo2giytd~)U!i@_;l=<pIIXp&5iNb-DUJxSw3gVCm}yopV$C8CG}Qxp
zx-E1Gxo&P!%b6jXYv(rNk=}WfM~beok|yGIUP&?($cgaE=W(i^6KP9B5y#f>LIjcQ
zw!@<cX@UB%BAx1zO-hrzQv4|Q?aNsU2R$H_-86TWz2;2^m`FdJG4jxnbye{$CS^78
zs{CAoZx!!)#cLu^B;Mtk7$#95KI9(_CL&7lNWGs3{40nzq#`V@uUjrn;~7P3`~S6<
zHk?_sHV)B3yE<x0Ztc7hTHq~O6L<QPo0S6>f9TF4{kCc?8edl&|E_S0Xz|*zym|r-
zI8Y&?M<}u!<v9z@eq391)e?)2Z6YrTTqQotk88+gi+4T1pf@C0;<Yi@Vk3Ir6=^vU
uZl%}6L<<xmJm6s`mqmM{n#ab*Kfy1-Zp2ybxA4>e0000<MNUMnLSTX=Di!qr

literal 0
HcmV?d00001

diff --git a/core/assets-raw/sprites/teams/team-sharded.png b/core/assets-raw/sprites/teams/team-sharded.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3643d4bba12a305b8a598ff702df49f65d5a6d9
GIT binary patch
literal 404
zcmV;F0c-w=P)<h;3K|Lk000e1NJLTq002G!002G+1^@s6bHS)Y00001b5ch_0Itp)
z=>Px$PDw;TRA_<inn@CaFbo98`Tw7tlc*e6WGszLn7$%g>M9b31rS0AA%u7sjoGaC
z-dk&@J$vunyWiDbr)%#n9OYMN1$m12o=CNPy7-wurF^QmXYeZdH1WuRGvrgmM+V&n
zA<Ku0-;p+$@}c50(gsUDOguu`V91AvM@k#n^3&oO(jI2wDljQtC2f>s^=fH@n$;u!
zy%|@6-8G{NG6t=XA1clqkS*^nTrHg3?XlH)ikJhjdR-P&{Qej{mpS#=y$=smN;78o
z%x?TtbgEYkP}Os(OAND@0*r@OMpomMHz~#|Z%d6=K8P@?<x5`^|JB3Bs`p+|JzaYo
z9avR9LK+Cn>MMm4*IriztH?)60|{9@Lq1v>NXqKf-?zB-9VuqZXGsIeS$#%6QyL&-
y^*i#}(f}!|kH|Bm0b*A7$g`w{5JCtc9?2KLaX>vL4JF3_0000<MNUMnLSTYiwyTE#

literal 0
HcmV?d00001

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 91efc5028d..0c01f876a8 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -1405,7 +1405,7 @@ liquid.slag.description = Refined in separators into constituent metals, or spra
 liquid.oil.description = Used in advanced material production and as incendiary ammunition.
 liquid.cryofluid.description = Used as coolant in reactors, turrets and factories.
 
-block.derelict = [lightgray] Derelict
+block.derelict =  [lightgray]Derelict
 block.armored-conveyor.description = Moves items forward. Does not accept inputs from the sides.
 block.illuminator.description = Emits light.
 block.message.description = Stores a message for communication between allies.
diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index 51373139a6..fd80526784 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -353,3 +353,6 @@
 63353=silicon-arc-furnace|block-silicon-arc-furnace-ui
 63352=metal-floor-4|block-metal-floor-4-ui
 63351=invincible|status-invincible-ui
+63356=sharded|team-sharded
+63357=crux|team-crux
+63358=derelict|team-derelict
diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java
index d5bedacc3e..fb40d72eb1 100644
--- a/core/src/mindustry/entities/comp/BuildingComp.java
+++ b/core/src/mindustry/entities/comp/BuildingComp.java
@@ -1072,9 +1072,10 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
     }
 
     public String getDisplayName(){
+        //derelict team icon currently doesn't display
         return team == Team.derelict ?  
-            block.localizedName + "\n" + Core.bundle.get("block.derelict"):
-            block.localizedName;
+            block.localizedName + "\n" + Core.bundle.get("block.derelict") :
+            block.localizedName + (team == player.team() || team.emoji.isEmpty() ? "" : " " + team.emoji);
     }
 
     public TextureRegion getDisplayIcon(){
diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java
index c7c70cda01..e331ce1255 100644
--- a/core/src/mindustry/game/Team.java
+++ b/core/src/mindustry/game/Team.java
@@ -17,6 +17,7 @@ public class Team implements Comparable<Team>{
     public final int id;
     public final Color color;
     public final Color[] palette;
+    public String emoji = "";
     public boolean hasPalette;
     public String name;
 
diff --git a/core/src/mindustry/ui/Fonts.java b/core/src/mindustry/ui/Fonts.java
index 7beff27396..bbd55bbd95 100644
--- a/core/src/mindustry/ui/Fonts.java
+++ b/core/src/mindustry/ui/Fonts.java
@@ -21,6 +21,7 @@ import arc.util.*;
 import mindustry.*;
 import mindustry.core.*;
 import mindustry.ctype.*;
+import mindustry.game.*;
 import mindustry.gen.*;
 
 import java.util.*;
@@ -155,6 +156,12 @@ public class Fonts{
                 }
             }
         });
+
+        for(Team team : Team.baseTeams){
+            if(Core.atlas.has("team-" + team.name)){
+                team.emoji = stringIcons.get(team.name, "");
+            }
+        }
     }
 
     /** Called from a static context for use in the loading screen.*/
diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java
index c78e7dbb5f..dd2867172a 100644
--- a/tools/src/mindustry/tools/Generators.java
+++ b/tools/src/mindustry/tools/Generators.java
@@ -390,6 +390,19 @@ public class Generators{
             }
         });
 
+        generate("team-icons", () -> {
+            for(Team team : Team.all){
+                if(has("team-" + team.name)){
+                    int rgba = team == Team.derelict ? Color.valueOf("b7b8c9").rgba() : team.color.rgba();
+                    Pixmap base = get("team-" + team.name);
+                    base.each((x, y) -> base.setRaw(x, y, Color.muli(base.getRaw(x, y), rgba)));
+
+                    delete("team-" + team.name);
+                    save(base.outline(Pal.gray, 3), "../ui/team-" + team.name);
+                }
+            }
+        });
+
         generate("unit-icons", () -> content.units().each(type -> {
             if(type.isHidden()) return; //hidden units don't generate
 
diff --git a/tools/src/mindustry/tools/ImagePacker.java b/tools/src/mindustry/tools/ImagePacker.java
index 0df257f52f..68a06a2f66 100644
--- a/tools/src/mindustry/tools/ImagePacker.java
+++ b/tools/src/mindustry/tools/ImagePacker.java
@@ -236,6 +236,10 @@ public class ImagePacker{
         base.draw(image, 0, 0, image.width, image.height, base.width/2 - wx/2, base.height/2 - wy/2, wx, wy, true, true);
     }
 
+    static void delete(String name){
+        ((GenRegion)Core.atlas.find(name)).path.delete();
+    }
+
     static void replace(String name, Pixmap image){
         Fi.get(name + ".png").writePng(image);
         ((GenRegion)Core.atlas.find(name)).path.delete();