diff --git a/core/assets-raw/sprites/blocks/turrets/divine/divine.png b/core/assets-raw/sprites/blocks/turrets/divine/divine.png new file mode 100644 index 0000000000..dda3072860 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/divine/divine.png differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index a0ef0e366e..0f1e0268a3 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -573,3 +573,4 @@ 63111=scathe-missile|unit-scathe-missile-ui 63110=ravage|block-ravage-ui 63109=underflow-duct|block-underflow-duct-ui +63108=divine|block-divine-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index eeb8d385bd..7898cd50d0 100644 Binary files a/core/assets/logicids.dat and b/core/assets/logicids.dat differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 83bc1a63df..7def2dff57 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -136,7 +136,7 @@ public class Blocks{ duo, scatter, scorch, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, foreshadow, spectre, meltdown, segment, parallax, tsunami, //turrets - erekir - breach, diffuse, sublimate, titan, disperse, afflict, lustre, scathe, ravage, + breach, diffuse, sublimate, titan, disperse, afflict, lustre, scathe, ravage, divine, //units groundFactory, airFactory, navalFactory, @@ -4693,7 +4693,7 @@ public class Blocks{ reload = 100f; recoil = 2f; range = 300; - shootCone = 7f; + shootCone = 10f; scaledHealth = 350; rotateSpeed = 1.5f; @@ -4701,7 +4701,44 @@ public class Blocks{ limitRange(); }}; - //TODO 1 more turret + divine = new PowerTurret("divine"){{ + requirements(Category.turret, with(Items.beryllium, 150, Items.silicon, 150, Items.graphite, 250, Items.phaseFabric, 300)); + + shootType = new BasicBulletType(7.5f, 85){{ + width = 12f; + hitSize = 7f; + height = 20f; + shootEffect = Fx.shootBig2; + smokeEffect = Fx.shootBigSmoke; + ammoMultiplier = 1; + pierceCap = 2; + pierce = true; + pierceBuilding = true; + hitColor = backColor = trailColor = Pal.berylShot; + frontColor = Color.white; + trailWidth = 2.1f; + trailLength = 10; + hitEffect = despawnEffect = Fx.hitBulletColor; + buildingDamageMultiplier = 0.3f; + }}; + + heatRequirement = 30f; + consumePower(5f); + + size = 5; + drawer = new DrawTurret("reinforced-"); + outlineColor = Pal.darkOutline; + envEnabled |= Env.space; + reload = 200f; + recoil = 2f; + range = 350; + shootCone = 100f; + scaledHealth = 370; + rotateSpeed = 2f; + + coolant = consume(new ConsumeLiquid(Liquids.water, 15f / 60f)); + limitRange(5f); + }}; //endregion //region units