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

Move beam drill facing update (Fix minor graphical glitch) (#8004)

Browse Source 
* move beam drill facing update

* Add updateFacing back to updateTile

* Stop consuming if not drilling anything.
This commit is contained in:
MEEPofFaith
2023-01-07 08:43:07 -08:00
committed by GitHub
parent bf07deafc6
commit 5af8236643
1 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,6 +202,7 @@ public class BeamDrill extends Block{
public float time;
public float warmup, boostWarmup;
public float lastDrillSpeed;
public int facingAmount;
@Override
public void drawSelect(){
@@ -222,40 +223,8 @@ public class BeamDrill extends Block{
if(lasers[0] == null) updateLasers();
warmup = Mathf.approachDelta(warmup, Mathf.num(efficiency > 0), 1f / 60f);
lastItem = null;
boolean multiple = false;
int dx = Geometry.d4x(rotation), dy = Geometry.d4y(rotation), facingAmount = 0;
//update facing tiles
for(int p = 0; p < size; p++){
Point2 l = lasers[p];
Tile dest = null;
for(int i = 0; i < range; i++){
int rx = l.x + dx*i, ry = l.y + dy*i;
Tile other = world.tile(rx, ry);
if(other != null){
if(other.solid()){
Item drop = other.wallDrop();
if(drop != null && drop.hardness <= tier){
facingAmount ++;
if(lastItem != drop && lastItem != null){
multiple = true;
}
lastItem = drop;
dest = other;
}
break;
}
}
}
facing[p] = dest;
}
//when multiple items are present, count that as no item
if(multiple){
lastItem = null;
}
updateFacing();
float multiplier = Mathf.lerp(1f, optionalBoostIntensity, optionalEfficiency);
boostWarmup = Mathf.lerpDelta(boostWarmup, optionalEfficiency, 0.1f);
@@ -281,7 +250,7 @@ public class BeamDrill extends Block{
@Override
public boolean shouldConsume(){
return items.total() < itemCapacity && enabled;
return items.total() < itemCapacity && lastItem != null && enabled;
}
@Override
@@ -369,15 +338,54 @@ public class BeamDrill extends Block{
public void onProximityUpdate(){
//when rotated.
updateLasers();
updateFacing();
}
void updateLasers(){
protected void updateLasers(){
for(int i = 0; i < size; i++){
if(lasers[i] == null) lasers[i] = new Point2();
nearbySide(tileX(), tileY(), rotation, i, lasers[i]);
}
}
protected void updateFacing(){
lastItem = null;
boolean multiple = false;
int dx = Geometry.d4x(rotation), dy = Geometry.d4y(rotation);
facingAmount = 0;
//update facing tiles
for(int p = 0; p < size; p++){
Point2 l = lasers[p];
Tile dest = null;
for(int i = 0; i < range; i++){
int rx = l.x + dx*i, ry = l.y + dy*i;
Tile other = world.tile(rx, ry);
if(other != null){
if(other.solid()){
Item drop = other.wallDrop();
if(drop != null && drop.hardness <= tier){
facingAmount ++;
if(lastItem != drop && lastItem != null){
multiple = true;
}
lastItem = drop;
dest = other;
}
break;
}
}
}
facing[p] = dest;
}
//when multiple items are present, count that as no item
if(multiple){
lastItem = null;
}
}
@Override
public byte version(){
return 1;