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

Color cleanup

Browse Source
This commit is contained in:
Anuken
2020-03-19 20:02:43 -04:00
parent 2250f2f0bc
commit f2f39573bb
10 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/io/MapIO.java
View File

@@ -75,7 +75,7 @@ public class MapIO{
Pixmap floors = new Pixmap(map.width, map.height, Format.RGBA8888);
Pixmap walls = new Pixmap(map.width, map.height, Format.RGBA8888);
int black = Color.rgba8888(Color.black);
int black = 255;
int shade = Color.rgba8888(0f, 0f, 0f, 0.5f);
CachedTile tile = new CachedTile(){
@Override
@@ -148,7 +148,7 @@ public class MapIO{
if(wall.synthetic()){
return team.color.rgba();
}
return Color.rgba8888(wall.solid ? wall.color : ore == Blocks.air ? floor.color : ore.color);
return (wall.solid ? wall.color : ore == Blocks.air ? floor.color : ore.color).rgba();
}
/** Reads a pixmap in the 3.5 pixmap format. */
@@ -164,7 +164,7 @@ public class MapIO{
if(block.ore != null) tile.setOverlay(block.ore);
//place core
if(color == Color.rgba8888(Color.green)){
if(color == Color.green.rgba()){
//actual core parts
tile.setBlock(Blocks.coreShard);
tile.setTeam(Team.sharded);