diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java index 813ec46141..43b5c42203 100644 --- a/core/src/mindustry/type/Weapon.java +++ b/core/src/mindustry/type/Weapon.java @@ -59,7 +59,6 @@ public class Weapon implements Cloneable{ public float rotateSpeed = 20f; /** weapon reload in frames */ public float reload = 1; - /** inaccuracy of degrees of each shot */ public float inaccuracy = 0f; /** intensity and duration of each shot's screen shake */ diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 8cc7639120..39f863c720 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -90,8 +90,8 @@ public class Turret extends ReloadTurret{ public @Nullable Effect shootEffect; /** Optional override for all smoke effects. */ public @Nullable Effect smokeEffect; - /** Optional override for all ammo use effects. */ - public @Nullable Effect ammoUseEffect; + /** Effect created when ammo is used. Not optional. */ + public Effect ammoUseEffect = Fx.none; /** Sound emitted when a single bullet is shot. */ public Sound shootSound = Sounds.shoot; /** Sound emitted when shoot.firstShotDelay is >0 and shooting begins. */