diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index cc034dcd97..3325f3361b 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1592,14 +1592,14 @@ public class Blocks implements ContentList{ tsunami = new LiquidTurret("tsunami"){{ requirements(Category.turret, with(Items.metaglass, 100, Items.lead, 400, Items.titanium, 250, Items.thorium, 100)); ammo( - Liquids.water, Bullets.waterShot, - Liquids.slag, Bullets.slagShot, - Liquids.cryofluid, Bullets.cryoShot, - Liquids.oil, Bullets.oilShot + Liquids.water, Bullets.heavyWaterShot, + Liquids.slag, Bullets.heavySlagShot, + Liquids.cryofluid, Bullets.heavyCryoShot, + Liquids.oil, Bullets.heavyOilShot ); size = 3; recoilAmount = 0f; - reloadTime = 1f; + reloadTime = 2f; inaccuracy = 10f; shootCone = 45f; liquidCapacity = 25f; diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java index bf3a575433..dd9317cd6d 100644 --- a/core/src/mindustry/content/Bullets.java +++ b/core/src/mindustry/content/Bullets.java @@ -34,7 +34,7 @@ public class Bullets implements ContentList{ standardGlaive, standardDenseBig, standardThoriumBig, standardIncendiaryBig, //liquid - waterShot, cryoShot, slagShot, oilShot, + waterShot, cryoShot, slagShot, oilShot, heavyWaterShot, heavyCryoShot, heavySlagShot, heavyOilShot, //environment, misc. damageLightning, damageLightningGround, fireball, basicFlame, pyraFlame, driverBolt, healBullet, healBulletBig, frag; @@ -474,6 +474,32 @@ public class Bullets implements ContentList{ drag = 0.03f; }}; + heavyWaterShot = new LiquidBulletType(Liquids.water){{ + knockback = 1.0f; + puddleSize = 1.0f; + damage = 4f; + }}; + + heavyCryoShot = new LiquidBulletType(Liquids.cryofluid){{ + knockback = 0.75f; + puddleSize = 1.0f; + damage = 4f; + }}; + + heavySlagShot = new LiquidBulletType(Liquids.slag){{ + knockback = 0.75f; + puddleSize = 1.0f; + damage = 8f; + drag = 0.03f; + }}; + + heavyOilShot = new LiquidBulletType(Liquids.oil){{ + knockback = 0.75f; + puddleSize = 1.0f; + damage = 4f; + drag = 0.03f; + }}; + driverBolt = new MassDriverBolt(); frag = new BasicBulletType(5f, 8, "bullet"){{ diff --git a/core/src/mindustry/entities/bullet/LiquidBulletType.java b/core/src/mindustry/entities/bullet/LiquidBulletType.java index 22d5c22d42..1cef198572 100644 --- a/core/src/mindustry/entities/bullet/LiquidBulletType.java +++ b/core/src/mindustry/entities/bullet/LiquidBulletType.java @@ -62,7 +62,7 @@ public class LiquidBulletType extends BulletType{ public void draw(Bullet b){ Draw.color(liquid.color, Color.white, b.fout() / 100f); - Fill.circle(b.x, b.y, 3f); + Fill.circle(b.x, b.y, puddleSize / 2); } @Override