diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java index 50d98e7acc..2d50db9afd 100644 --- a/core/src/mindustry/content/Bullets.java +++ b/core/src/mindustry/content/Bullets.java @@ -480,6 +480,7 @@ public class Bullets implements ContentList{ puddleSize = 8f; drag = 0.001f; ammoMultiplier = 2f; + statusDuration = 60f * 4f; }}; heavyCryoShot = new LiquidBulletType(Liquids.cryofluid){{ @@ -489,6 +490,7 @@ public class Bullets implements ContentList{ puddleSize = 8f; drag = 0.001f; ammoMultiplier = 2f; + statusDuration = 60f * 4f; }}; heavySlagShot = new LiquidBulletType(Liquids.slag){{ @@ -499,6 +501,7 @@ public class Bullets implements ContentList{ damage = 6f; drag = 0.001f; ammoMultiplier = 2f; + statusDuration = 60f * 4f; }}; heavyOilShot = new LiquidBulletType(Liquids.oil){{ @@ -508,6 +511,7 @@ public class Bullets implements ContentList{ puddleSize = 8f; drag = 0.001f; ammoMultiplier = 2f; + statusDuration = 60f * 4f; }}; driverBolt = new MassDriverBolt(); diff --git a/core/src/mindustry/entities/bullet/LiquidBulletType.java b/core/src/mindustry/entities/bullet/LiquidBulletType.java index 96e8996980..28bf22ef2c 100644 --- a/core/src/mindustry/entities/bullet/LiquidBulletType.java +++ b/core/src/mindustry/entities/bullet/LiquidBulletType.java @@ -25,7 +25,7 @@ public class LiquidBulletType extends BulletType{ } ammoMultiplier = 1f; - lifetime = 74f; + lifetime = 34f; statusDuration = 60f * 2f; despawnEffect = Fx.none; hitEffect = Fx.hitLiquid; diff --git a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java index 03c8ebab51..e14629b594 100644 --- a/core/src/mindustry/ui/dialogs/CustomRulesDialog.java +++ b/core/src/mindustry/ui/dialogs/CustomRulesDialog.java @@ -186,8 +186,6 @@ public class CustomRulesDialog extends BaseDialog{ }, () -> ui.picker.show(rules.ambientLight, rules.ambientLight::set)).left().width(250f).row(); main.button("@rules.weather", this::weatherDialog).width(250f).left().row(); - - //TODO add weather patterns } void number(String text, Floatc cons, Floatp prov){