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

Bugfixes & cleanup

Browse Source
This commit is contained in:
Anuken
2020-10-26 23:09:51 -04:00
parent 8d7f96bf00
commit c0d0edfc89
15 changed files with 6885 additions and 6388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/entities/comp/MinerComp.java
View File

@@ -37,7 +37,7 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc, Unitc{
public boolean validMine(Tile tile, boolean checkDst){
return !(tile == null || tile.block() != Blocks.air || (!within(tile.worldx(), tile.worldy(), miningRange) && checkDst)
|| tile.drop() == null || !canMine(tile.drop())) && state.teams.isValidMine(self(), tile);
|| tile.drop() == null || !canMine(tile.drop()));
}
public boolean validMine(Tile tile){
@@ -62,7 +62,6 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc, Unitc{
mineTile = null;
mineTimer = 0f;
}else if(mining()){
state.teams.registerMined(mineTile, self());
Item item = mineTile.drop();
lookAt(angleTo(mineTile.worldx(), mineTile.worldy()));
mineTimer += Time.delta *type.mineSpeed;
@@ -105,7 +104,7 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc, Unitc{
float ex = mineTile.worldx() + Mathf.sin(Time.time() + 48, swingScl, swingMag);
float ey = mineTile.worldy() + Mathf.sin(Time.time() + 48, swingScl + 2f, swingMag);
Draw.z(multimine ? Layer.flyingUnit + 0.1f : Layer.flyingUnitLow - 0.1f);
Draw.z(Layer.flyingUnit + 0.1f);
Draw.color(Color.lightGray, Color.white, 1f - flashScl + Mathf.absin(Time.time(), 0.5f, flashScl));