diff --git a/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png b/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png index ad400ba0f0..bf7bbc092c 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png and b/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 288ebd3764..c67e06c80b 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -533,3 +533,4 @@ 63170=world-processor|block-world-processor-ui 63169=reinforced-payload-conveyor|block-reinforced-payload-conveyor-ui 63168=reinforced-payload-router|block-reinforced-payload-router-ui +63167=disperse|block-disperse-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index 6ba4b4cfc5..0ab389a106 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 f7ba80ae5e..3b862cacb1 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -127,7 +127,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, sublimate, titan, afflict, + breach, sublimate, titan, disperse, afflict, //units commandCenter, @@ -3315,33 +3315,45 @@ public class Blocks{ size = 4; }}; - /* - afflict = new ContinuousTurret("afflict"){{ + disperse = new ItemTurret("disperse"){{ requirements(Category.turret, with(Items.carbide, 250, Items.surgeAlloy, 160, Items.silicon, 300, Items.beryllium, 400)); + ammo(Items.graphite, new BasicBulletType(){{ + damage = 40; + speed = 7f; + width = 9f; + height = 15f; + trailColor = Pal.bulletYellowBack; + }}); + //TODO bullet. - shootShake = 4f; - recoilAmount = 1f; - reloadTime = 60f * 3f; - shootLength = 7f; - rotateSpeed = 2.5f; + //recoilAmount = 1f; + reloadTime = 5f; + shootLength = 15f; + rotateSpeed = 5f; coolantUsage = 30f / 60f; coolantOverride = Liquids.water; - draw = new DrawTurret("reinforced-"); + draw = new DrawTurret("reinforced-"){{ - restitution = 0.02f; + }}; + + shots = 4; + alternate = true; + spread = 4.6f; + + restitution = 0.1f; shootWarmupSpeed = 0.08f; outlineColor = Pal.darkOutline; acceptCoolant = false; - scaledHealth = 300; - range = 390f; + scaledHealth = 340; + range = 250f; size = 4; - }};*/ + }}; //endregion //region units