diff --git a/core/assets-raw/sprites/blocks/turrets/afflict/afflict.png b/core/assets-raw/sprites/blocks/turrets/afflict/afflict.png index d075c56d0b..85d2284695 100644 Binary files a/core/assets-raw/sprites/blocks/turrets/afflict/afflict.png and b/core/assets-raw/sprites/blocks/turrets/afflict/afflict.png differ diff --git a/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png b/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png new file mode 100644 index 0000000000..ad400ba0f0 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index a4bb6fd822..f7ba80ae5e 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1691,7 +1691,7 @@ public class Blocks{ }}; regenProjector = new RegenProjector("regen-projector"){{ - requirements(Category.effect, with(Items.silicon, 60, Items.tungsten, 60, Items.oxide, 30, Items.beryllium, 80)); + requirements(Category.effect, with(Items.silicon, 80, Items.tungsten, 60, Items.oxide, 40, Items.beryllium, 80)); size = 3; consumes.power(1f); range = 28; @@ -2572,7 +2572,7 @@ public class Blocks{ thrusterLength = 34/4f; armor = 5f; - unitCapModifier = 4; + unitCapModifier = 2; researchCostMultiplier = 0.07f; }}; @@ -2587,7 +2587,7 @@ public class Blocks{ thrusterLength = 40/4f; armor = 10f; - unitCapModifier = 8; + unitCapModifier = 4; researchCostMultiplier = 0.11f; }}; @@ -2602,7 +2602,7 @@ public class Blocks{ thrusterLength = 48/4f; armor = 15f; - unitCapModifier = 12; + unitCapModifier = 6; researchCostMultiplier = 0.11f; }}; @@ -3509,12 +3509,11 @@ public class Blocks{ shipAssembler = new UnitAssembler("ship-assembler"){{ requirements(Category.units, with(Items.beryllium, 700, Items.oxide, 150, Items.tungsten, 500, Items.silicon, 800)); size = 5; - plans.add(new AssemblerUnitPlan(UnitTypes.quell, 60f * 40f, BlockStack.list(Blocks.berylliumWallLarge, 4, Blocks.duct, 10, Blocks.plasmaBore, 4))); + plans.add(new AssemblerUnitPlan(UnitTypes.quell, 60f * 60f, BlockStack.list(Blocks.berylliumWallLarge, 4, Blocks.duct, 15, Blocks.plasmaBore, 4))); consumes.power(3f); areaSize = 13; - //consumes.liquid(Liquids.gallium, 2f / 60f); - + consumes.liquid(Liquids.gallium, 2f / 60f); }}; //TODO requirements diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index b2e69cc0c9..a72a9158c8 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -2456,7 +2456,7 @@ public class UnitTypes{ heatColor = Color.valueOf("f9350f"); cooldownTime = 80f; - bullet = new BasicBulletType(8f, 110){{ + bullet = new BasicBulletType(8f, 140){{ sprite = "missile-large"; width = 9.5f; height = 15f; @@ -2487,7 +2487,7 @@ public class UnitTypes{ rotate = true; rotateSpeed = 2f; - bullet = new BasicBulletType(4.5f, 20){{ + bullet = new BasicBulletType(4.5f, 25){{ width = 6.5f; height = 11f; shootEffect = Fx.sparkShoot; @@ -2746,7 +2746,7 @@ public class UnitTypes{ //TODO better shootEffect = Fx.shootBig2; smokeEffect = Fx.shootSmokeTitan; - splashDamage = 50f; + splashDamage = 60f; splashDamageRadius = 30f; frontColor = Color.white; hitSound = Sounds.none; @@ -2935,6 +2935,7 @@ public class UnitTypes{ unitSpawned = new MissileUnitType("quell-missile"){{ speed = 3.8f; maxRange = 80f; + lifetime = 60f * 1.4f; outlineColor = Pal.darkOutline; health = 45;