diff --git a/core/assets-raw/sprites/blocks/turrets/salvo/salvo-barrel-heat.png b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-barrel-heat.png index 3da2059037..274053f819 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/salvo/salvo-barrel-heat.png and b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-barrel-heat.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/salvo/salvo-barrel.png b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-barrel.png index b21c193a11..1ac7d8ff1f 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/salvo/salvo-barrel.png and b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-barrel.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/salvo/salvo-heat.png b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-heat.png deleted file mode 100644 index 48482e2697..0000000000 Binary files a/core/assets-raw/sprites/blocks/turrets/salvo/salvo-heat.png and /dev/null differ diff --git a/core/assets-raw/sprites/blocks/turrets/salvo/salvo-preview.png b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-preview.png index 77d2e39b93..936f708770 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/salvo/salvo-preview.png and b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-preview.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/salvo/salvo-side-l.png b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-side-l.png new file mode 100644 index 0000000000..4ef9628282 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-side-l.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/salvo/salvo-side-r.png b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-side-r.png new file mode 100644 index 0000000000..21cda3b07b Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/salvo/salvo-side-r.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/salvo/salvo.png b/core/assets-raw/sprites/blocks/turrets/salvo/salvo.png deleted file mode 100644 index 7fb14de983..0000000000 Binary files a/core/assets-raw/sprites/blocks/turrets/salvo/salvo.png and /dev/null differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 1e3de17595..144da59e69 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -3486,11 +3486,16 @@ public class Blocks{ ); drawer = new DrawTurret(){{ - parts.add(new RegionPart("-barrel"){{ - progress = PartProgress.recoil.delay(0.5f); //Since recoil is 1-0, cut from the start instead of the end. - under = true; - turretHeatLayer = Layer.turret - 0.0001f; - moveY = -1.5f; + parts.add(new RegionPart("-side"){{ + progress = PartProgress.warmup; + moveX = 0.6f; + moveRot = -15f; + mirror = true; + layerOffset = 0.001f; + moves.add(new PartMove(PartProgress.recoil, 0.5f, -0.5f, -8f)); + }}, new RegionPart("-barrel"){{ + progress = PartProgress.recoil; + moveY = -2.5f; }}); }}; @@ -3499,7 +3504,7 @@ public class Blocks{ reload = 31f; consumeAmmoOnce = false; ammoEjectBack = 3f; - recoil = 2f; + recoil = 0f; shake = 1f; shoot.shots = 4; shoot.shotDelay = 3f;