From f6e68e91d0d5f62dfe9184ce24d02db964a851b3 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 6 May 2022 22:13:52 -0400 Subject: [PATCH] Temporary sprite packing fix --- .../sprites/blocks/turrets/afflict/afflict.png | Bin 5165 -> 0 bytes core/src/mindustry/game/Team.java | 3 ++- core/src/mindustry/world/draw/DrawWeave.java | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) delete mode 100644 core/assets-raw/sprites/blocks/turrets/afflict/afflict.png 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 85d22846956b9555488ac6605ec069e4a8b7862c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5165 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 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");