Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented #2177

Browse Source
This commit is contained in:
Anuken
2020-06-21 10:33:08 -04:00
parent a0f0640729
commit 6517eaf62f
22 changed files with 5111 additions and 4859 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/mindustry/world/Block.java
View File

@@ -178,7 +178,10 @@ public class Block extends UnlockableContent{
//TODO move
protected TextureRegion[] generatedIcons;
protected TextureRegion[] variantRegions, editorVariantRegions;
public TextureRegion region, editorIcon;
public @Load("@-team") TextureRegion teamRegion;
public TextureRegion[] teamRegions;
//TODO move
public static TextureRegion[][] cracks;
@@ -622,6 +625,16 @@ public class Block extends UnlockableContent{
}
ContentRegions.loadRegions(this);
//load specific team regions
teamRegions = new TextureRegion[Team.all.length];
for(Team team : Team.all){
if(team.hasPalette){
teamRegions[team.uid] = Core.atlas.find(name + "-team-" + team.name);
}else{
teamRegions[team.uid] = teamRegion;
}
}
}
@Override