WIP team icons

This commit is contained in:
Anuken
2021-07-31 18:23:22 -04:00
parent 78c35221be
commit 79bf77f4be
10 changed files with 32 additions and 3 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 479 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 608 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 404 B

+1 -1
View File
@@ -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.
+3
View File
@@ -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
@@ -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(){
+1
View File
@@ -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;
+7
View File
@@ -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.*/