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

Fixed #6782 / Fixed #6781 / Fixed #6779

Browse Source
This commit is contained in:
Anuken
2022-05-08 09:23:43 -04:00
parent aaccb36d93
commit e94e31aedf
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/input/InputHandler.java
View File

@@ -590,6 +590,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
logicCutsceneZoom = -1f; logicCutsceneZoom = -1f;
} }
if(!commandMode){
commandRect = false;
}
playerPlanTree.clear(); playerPlanTree.clear();
player.unit().plans.each(playerPlanTree::insert); player.unit().plans.each(playerPlanTree::insert);

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

@@ -183,12 +183,12 @@ public class Turret extends ReloadTurret{
public float estimateDps(){ public float estimateDps(){
if(!hasAmmo()) return 0f; if(!hasAmmo()) return 0f;
return shoot.shots / reload * 60f * peekAmmo().estimateDPS() * potentialEfficiency * timeScale; return shoot.shots / reload * 60f * (peekAmmo() == null ? 0f : peekAmmo().estimateDPS()) * potentialEfficiency * timeScale;
} }
@Override @Override
public float range(){ public float range(){
if(hasAmmo()){ if(peekAmmo() != null){
return range + peekAmmo().rangeChange; return range + peekAmmo().rangeChange;
} }
return range; return range;

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

@@ -281,6 +281,8 @@ public class BeamDrill extends Block{
Draw.rect(block.region, x, y); Draw.rect(block.region, x, y);
Draw.rect(topRegion, x, y, rotdeg()); Draw.rect(topRegion, x, y, rotdeg());
if(isPayload()) return;
var dir = Geometry.d4(rotation); var dir = Geometry.d4(rotation);
int ddx = Geometry.d4x(rotation + 1), ddy = Geometry.d4y(rotation + 1); int ddx = Geometry.d4x(rotation + 1), ddy = Geometry.d4y(rotation + 1);