mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-12-15 15:20:57 -08:00
Code Issues Projects Releases Wiki Activity

Swarmer cleanup

Browse source
This commit is contained in:
Anuken 2022-02-24 23:41:41 -05:00
parent 45f27eaeec
commit 28dab2fa05
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/src/mindustry/content/Blocks.java
View file

@ -2845,6 +2845,7 @@ public class Blocks{
size = 2;
scaledHealth = 280;
targetAir = false;
moveWhileCharging = false;
shootSound = Sounds.laser;
coolant = consume(new ConsumeCoolant(0.2f));
@ -2913,10 +2914,12 @@ public class Blocks{
shoot = new ShootAlternate(){{
shots = 4;
barrels = 3;
spread = 3.5f;
shotDelay = 5f;
}};
shootY = 7f;
reloadTime = 30f;
inaccuracy = 10f;
range = 240f;
@ -3184,11 +3187,6 @@ public class Blocks{
loopSoundVolume = 2f;
envEnabled |= Env.space;
shoot = new ShootSpread(){{
shots = 3;
spread = 10f;
}};
shootType = new ContinuousLaserBulletType(78){{
length = 200f;
hitEffect = Fx.hitMeltdown;

4
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View file

@ -75,6 +75,8 @@ public class Turret extends ReloadTurret{
public float minWarmup = 0f;
/** If true, this turret will accurately target moving targets with respect to charge time. */
public boolean accurateDelay = false;
/** If false, this turret can't move while charging. */
public boolean moveWhileCharging = true;
/** pattern used for bullets */
public ShootPattern shoot = new ShootPattern();
@ -404,7 +406,7 @@ public class Turret extends ReloadTurret{
}
public boolean shouldTurn(){
return !charging();
return moveWhileCharging || !charging();
}
@Override