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

Fixed turret targeting

Browse Source
This commit is contained in:
Anuken
2022-03-02 14:53:50 -05:00
parent b48f350914
commit b05874ccf7
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/campaign/LaunchPad.java
View File

@@ -77,7 +77,7 @@ public class LaunchPad extends Block{
@Override @Override
public boolean shouldConsume(){ public boolean shouldConsume(){
//TODO add launch costs, maybe legacy version //TODO add launch costs, maybe legacy version
return launchCounter < launchTime && enabled; return launchCounter < launchTime;
} }
@Override @Override

8
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -331,13 +331,13 @@ public class Turret extends ReloadTurret{
//turret always reloads regardless of whether it's targeting something //turret always reloads regardless of whether it's targeting something
updateReload(); updateReload();
if(timer(timerTarget, targetInterval)){
findTarget();
}
if(hasAmmo()){ if(hasAmmo()){
if(Float.isNaN(reloadCounter)) reloadCounter = 0; if(Float.isNaN(reloadCounter)) reloadCounter = 0;
if(timer(timerTarget, targetInterval)){
findTarget();
}
if(validateTarget()){ if(validateTarget()){
boolean canShoot = true; boolean canShoot = true;

2
core/src/mindustry/world/blocks/production/SolidPump.java
View File

@@ -114,7 +114,7 @@ public class SolidPump extends Pump{
@Override @Override
public boolean shouldConsume(){ public boolean shouldConsume(){
return liquids.get(result) < liquidCapacity - 0.01f && enabled; return liquids.get(result) < liquidCapacity - 0.01f;
} }
@Override @Override