diff --git a/gradle.properties b/gradle.properties index 562fecaa69..a54ba48d55 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=fd0ca91e700653d5565e13d8ea5fea87378b022e +archash=6c228e534e3950e6254d6e7af4c6db67f834bc1d diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java index e1658acd6f..300fffb95a 100644 --- a/tools/src/mindustry/tools/Generators.java +++ b/tools/src/mindustry/tools/Generators.java @@ -459,11 +459,12 @@ public class Generators{ //draw base region on top to mask weapons image.draw(get(type.region), true); - int baseColor = Color.valueOf("ffa665").rgba(); 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);