diff --git a/core/assets-raw/sprites/blocks/turrets/arc-cell.png b/core/assets-raw/sprites/blocks/turrets/arc-cell.png new file mode 100644 index 0000000000..bdc9b7a5d3 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/arc-cell.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/arc.png b/core/assets-raw/sprites/blocks/turrets/arc.png index f214c4aa0f..bf0ccab2cf 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/arc.png and b/core/assets-raw/sprites/blocks/turrets/arc.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/cyclone-cell.png b/core/assets-raw/sprites/blocks/turrets/cyclone-cell.png new file mode 100644 index 0000000000..cbd02b6df1 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/cyclone-cell.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/cyclone.png b/core/assets-raw/sprites/blocks/turrets/cyclone.png index 7e1ae002b1..4cd9a6db85 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/cyclone.png and b/core/assets-raw/sprites/blocks/turrets/cyclone.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/duo-cell.png b/core/assets-raw/sprites/blocks/turrets/duo-cell.png new file mode 100644 index 0000000000..e60afd2ab0 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/duo-cell.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/duo.png b/core/assets-raw/sprites/blocks/turrets/duo.png index c234ccb38c..d2502da912 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/duo.png and b/core/assets-raw/sprites/blocks/turrets/duo.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/fuse-cell.png b/core/assets-raw/sprites/blocks/turrets/fuse-cell.png new file mode 100644 index 0000000000..116dccde22 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/fuse-cell.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/fuse.png b/core/assets-raw/sprites/blocks/turrets/fuse.png index 7322029f77..ee8fca47bf 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/fuse.png and b/core/assets-raw/sprites/blocks/turrets/fuse.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/hail-cell.png b/core/assets-raw/sprites/blocks/turrets/hail-cell.png new file mode 100644 index 0000000000..1b677643d2 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/hail-cell.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/hail.png b/core/assets-raw/sprites/blocks/turrets/hail.png index 4333d6ef7e..fc028c0f37 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/hail.png and b/core/assets-raw/sprites/blocks/turrets/hail.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/lancer-cell.png b/core/assets-raw/sprites/blocks/turrets/lancer-cell.png new file mode 100644 index 0000000000..c970db925e Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/lancer-cell.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/lancer.png b/core/assets-raw/sprites/blocks/turrets/lancer.png index d3bbc2d909..3c98279d99 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/lancer.png and b/core/assets-raw/sprites/blocks/turrets/lancer.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/meltdown-lecc.png b/core/assets-raw/sprites/blocks/turrets/meltdown-lecc.png new file mode 100644 index 0000000000..8f778fe77d Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/meltdown-lecc.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/meltdown.png b/core/assets-raw/sprites/blocks/turrets/meltdown.png index 68c1b15347..0f6a8486d6 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/meltdown.png and b/core/assets-raw/sprites/blocks/turrets/meltdown.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/ripple-cell.png b/core/assets-raw/sprites/blocks/turrets/ripple-cell.png new file mode 100644 index 0000000000..064f1e191d Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/ripple-cell.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/ripple.png b/core/assets-raw/sprites/blocks/turrets/ripple.png index 92bd3db328..bca5923d9e 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/ripple.png and b/core/assets-raw/sprites/blocks/turrets/ripple.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/salvo-cell.png b/core/assets-raw/sprites/blocks/turrets/salvo-cell.png new file mode 100644 index 0000000000..c976976ec1 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/salvo-cell.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/salvo.png b/core/assets-raw/sprites/blocks/turrets/salvo.png index 63db15cded..25550df875 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/salvo.png and b/core/assets-raw/sprites/blocks/turrets/salvo.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/scatter-cell.png b/core/assets-raw/sprites/blocks/turrets/scatter-cell.png new file mode 100644 index 0000000000..7636248e07 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/scatter-cell.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/scatter.png b/core/assets-raw/sprites/blocks/turrets/scatter.png index 82d01d22c2..b9c50ef039 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/scatter.png and b/core/assets-raw/sprites/blocks/turrets/scatter.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/scorch-team.png b/core/assets-raw/sprites/blocks/turrets/scorch-team.png new file mode 100644 index 0000000000..3417032518 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/scorch-team.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/scorch.png b/core/assets-raw/sprites/blocks/turrets/scorch.png index 54616726e5..375e88e63f 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/scorch.png and b/core/assets-raw/sprites/blocks/turrets/scorch.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/spectre-team.png b/core/assets-raw/sprites/blocks/turrets/spectre-team.png new file mode 100644 index 0000000000..3275cbc7ec Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/spectre-team.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/spectre.png b/core/assets-raw/sprites/blocks/turrets/spectre.png index f85734b19d..a51d4fbf6c 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/spectre.png and b/core/assets-raw/sprites/blocks/turrets/spectre.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/swarmer-team.png b/core/assets-raw/sprites/blocks/turrets/swarmer-team.png new file mode 100644 index 0000000000..8334ac3259 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/swarmer-team.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/swarmer.png b/core/assets-raw/sprites/blocks/turrets/swarmer.png index 6f98a1ba7a..efb8b93f25 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/swarmer.png and b/core/assets-raw/sprites/blocks/turrets/swarmer.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/wave-team.png b/core/assets-raw/sprites/blocks/turrets/wave-team.png new file mode 100644 index 0000000000..d62a03eeea Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/wave-team.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/wave.png b/core/assets-raw/sprites/blocks/turrets/wave.png index f7823cc437..c4044605d7 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/wave.png and b/core/assets-raw/sprites/blocks/turrets/wave.png differ diff --git a/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java b/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java index 75e24a8e87..a099754f1d 100644 --- a/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java +++ b/core/src/mindustry/world/blocks/defense/PointDefenseTurret.java @@ -111,6 +111,9 @@ public class PointDefenseTurret extends Block{ @Override public void draw(){ Draw.rect(baseRegion, x, y); + Draw.color(Color.toFloatBits(0, 0, 0, 0.22f)); + Draw.rect(region, x - (size / 2f), y - (size / 2f), rotation - 90) + Draw.color(); Draw.rect(region, x, y, rotation - 90); } diff --git a/core/src/mindustry/world/blocks/defense/TractorBeamTurret.java b/core/src/mindustry/world/blocks/defense/TractorBeamTurret.java index 9e9035bb77..8573c679b3 100644 --- a/core/src/mindustry/world/blocks/defense/TractorBeamTurret.java +++ b/core/src/mindustry/world/blocks/defense/TractorBeamTurret.java @@ -106,6 +106,9 @@ public class TractorBeamTurret extends Block{ @Override public void draw(){ Draw.rect(baseRegion, x, y); + Draw.color(Color.toFloatBits(0, 0, 0, 0.22f)); + Draw.rect(region, x - (size / 2f), y - (size / 2f), rotation - 90); + Draw.color(); Draw.rect(region, x, y, rotation - 90); //draw laser if applicable diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index d74ff36214..983de634fd 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -202,6 +202,9 @@ public abstract class Turret extends Block{ tr2.trns(rotation, -recoil); + Draw.color(Color.toFloatBits(0, 0, 0, 0.22f)); + Draw.rect(region, x + tr2.x - (size / 2f), y + tr2.y - (size / 2f), rotation - 90); + Draw.color(); drawer.get(this); if(heatRegion != Core.atlas.find("error")){