Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Crash fix

Browse Source
This commit is contained in:
Anuken
2022-05-09 03:06:25 -04:00
parent d8ceb03b3c
commit aace191116
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/type/Weapon.java
-1
View File
@@ -59,7 +59,6 @@ public class Weapon implements Cloneable{
public float rotateSpeed = 20f; public float rotateSpeed = 20f;
/** weapon reload in frames */ /** weapon reload in frames */
public float reload = 1; public float reload = 1;
/** inaccuracy of degrees of each shot */ /** inaccuracy of degrees of each shot */
public float inaccuracy = 0f; public float inaccuracy = 0f;
/** intensity and duration of each shot's screen shake */ /** intensity and duration of each shot's screen shake */
core/src/mindustry/world/blocks/defense/turrets/Turret.java
+2 -2
View File
@@ -90,8 +90,8 @@ public class Turret extends ReloadTurret{
public @Nullable Effect shootEffect; public @Nullable Effect shootEffect;
/** Optional override for all smoke effects. */ /** Optional override for all smoke effects. */
public @Nullable Effect smokeEffect; public @Nullable Effect smokeEffect;
/** Optional override for all ammo use effects. */ /** Effect created when ammo is used. Not optional. */
public @Nullable Effect ammoUseEffect; public Effect ammoUseEffect = Fx.none;
/** Sound emitted when a single bullet is shot. */ /** Sound emitted when a single bullet is shot. */
public Sound shootSound = Sounds.shoot; public Sound shootSound = Sounds.shoot;
/** Sound emitted when shoot.firstShotDelay is >0 and shooting begins. */ /** Sound emitted when shoot.firstShotDelay is >0 and shooting begins. */