From 5516435619843e0b1781c97a5208f0983bdd1779 Mon Sep 17 00:00:00 2001 From: VozDuh <61590217+Voz-Duh@users.noreply.github.com> Date: Tue, 5 Jan 2021 23:17:18 +0300 Subject: [PATCH] Custom Launch Pad Pod Textures (#4203) * Custom Launch Pad Pod Textures * Facepalm * Fix * Fix * Fix Co-authored-by: Anuken * Fix Anuke! Co-authored-by: Anuken --- core/src/mindustry/world/blocks/campaign/LaunchPad.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/world/blocks/campaign/LaunchPad.java b/core/src/mindustry/world/blocks/campaign/LaunchPad.java index d0804bd4cf..838efde720 100644 --- a/core/src/mindustry/world/blocks/campaign/LaunchPad.java +++ b/core/src/mindustry/world/blocks/campaign/LaunchPad.java @@ -32,7 +32,7 @@ public class LaunchPad extends Block{ public Sound launchSound = Sounds.none; public @Load("@-light") TextureRegion lightRegion; - public @Load("launchpod") TextureRegion podRegion; + public @Load(value = "@-pod", fallback = "launchpod") TextureRegion podRegion; public Color lightColor = Color.valueOf("eab678"); public LaunchPad(String name){ @@ -200,7 +200,7 @@ public class LaunchPad extends Block{ Draw.z(Layer.weather - 1); - TextureRegion region = Core.atlas.find("launchpod"); + TextureRegion region = blockOn() instanceof mindustry.world.blocks.campaign.LaunchPad p ? p.podRegion : Core.atlas.find("launchpod"); float rw = region.width * Draw.scl * scale, rh = region.height * Draw.scl * scale; Draw.alpha(alpha);