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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 Y*KOSLWAoXm3=9kmp00i_>zopr0OxXCa{vGU 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");