diff --git a/core/assets-raw/sprites/blocks/turrets/afflict/afflict.png b/core/assets-raw/sprites/blocks/turrets/afflict/afflict.png deleted file mode 100644 index 85d2284695..0000000000 Binary files a/core/assets-raw/sprites/blocks/turrets/afflict/afflict.png and /dev/null differ diff --git a/core/src/mindustry/game/Team.java b/core/src/mindustry/game/Team.java index 6844bc7661..9bbb6289e6 100644 --- a/core/src/mindustry/game/Team.java +++ b/core/src/mindustry/game/Team.java @@ -33,7 +33,8 @@ public class Team implements Comparable{ crux = new Team(2, "crux", Color.valueOf("f25555"), Color.valueOf("fc8e6c"), Color.valueOf("f25555"), Color.valueOf("a04553")), malis = new Team(3, "malis", Color.valueOf("a27ce5"), Color.valueOf("c195fb"), Color.valueOf("665c9f"), Color.valueOf("484988")), green = new Team(4, "green", Color.valueOf("54d67d"), Color.valueOf("96f58c"), Color.valueOf("54d67d"), Color.valueOf("28785c")), - blue = new Team(5, "blue", Color.valueOf("6c87fd"), Color.valueOf("85caf9"), Color.valueOf("6c87fd"), Color.valueOf("3b3392")); + //TODO temporarily no palette. + blue = new Team(5, "blue", Color.valueOf("6c87fd")); //Color.valueOf("85caf9"), Color.valueOf("6c87fd"), Color.valueOf("3b3392") static{ Mathf.rand.setSeed(8); diff --git a/core/src/mindustry/world/draw/DrawWeave.java b/core/src/mindustry/world/draw/DrawWeave.java index f8b6aed9ed..d95652455e 100644 --- a/core/src/mindustry/world/draw/DrawWeave.java +++ b/core/src/mindustry/world/draw/DrawWeave.java @@ -27,6 +27,11 @@ public class DrawWeave extends DrawBlock{ Draw.reset(); } + @Override + public TextureRegion[] icons(Block block){ + return new TextureRegion[]{weave}; + } + @Override public void load(Block block){ weave = Core.atlas.find(block.name + "-weave");