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

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	tools/src/mindustry/tools/Generators.java
This commit is contained in:
Anuken
2021-10-14 19:15:59 -04:00
parent f96700320e dcb84f9faf
commit 082edbff6f
29 changed files with 435 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/src/mindustry/tools/Generators.java
View File

@@ -471,13 +471,14 @@ public class Generators{
}
//draw base region on top to mask weapons
if(type.drawBody) image.draw(get(type.region), true);
int baseColor = Color.valueOf("ffa665").rgba();
if(type.drawCell) image.draw(get(type.region), true);
if(type.drawCell){
Pixmap baseCell = get(type.cellRegion);
Pixmap cell = new Pixmap(type.cellRegion.width, type.cellRegion.height);
cell.each((x, y) -> cell.set(x, y, Color.muli(baseCell.getRaw(x, y), baseColor)));
Pixmap cell = baseCell.copy();
//replace with 0xffd37fff : 0xdca463ff for sharded colors?
cell.replace(in -> in == 0xffffffff ? 0xffa664ff : in == 0xdcc6c6ff ? 0xd06b53ff : 0);
image.draw(cell, image.width / 2 - cell.width / 2, image.height / 2 - cell.height / 2, true);
}