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

Conveyor tweaks

Browse Source
This commit is contained in:
Anuken
2020-01-28 00:21:05 -05:00
parent a2933e030a
commit 89e1c5afc0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/world/blocks/distribution/Conveyor.java
View File

@@ -190,7 +190,7 @@ public class Conveyor extends Block implements Autotiler{
if(e.ys[i] > nextMax) e.ys[i] = nextMax; if(e.ys[i] > nextMax) e.ys[i] = nextMax;
if(e.ys[i] > 0.5 && i > 0) e.mid = i - 1; if(e.ys[i] > 0.5 && i > 0) e.mid = i - 1;
e.xs[i] = Mathf.approachDelta(e.xs[i], 0, 0.1f); e.xs[i] = Mathf.approachDelta(e.xs[i], 0, speed*2);
if(e.ys[i] >= 1f && offloadDir(tile, e.ids[i])){ if(e.ys[i] >= 1f && offloadDir(tile, e.ids[i])){
//align X position if passing forwards //align X position if passing forwards
@@ -205,7 +205,7 @@ public class Conveyor extends Block implements Autotiler{
} }
} }
if(e.minitem < itemSpace + (e.blendbits == 1 ? 0.5f : 0f)){ if(e.minitem < itemSpace + (e.blendbits == 1 ? 0.3f : 0f)){
e.clogHeat = Mathf.lerpDelta(e.clogHeat, 1f, 0.02f); e.clogHeat = Mathf.lerpDelta(e.clogHeat, 1f, 0.02f);
}else{ }else{
e.clogHeat = 0f; e.clogHeat = 0f;
@@ -281,7 +281,7 @@ public class Conveyor extends Block implements Autotiler{
ConveyorEntity e = tile.ent(); ConveyorEntity e = tile.ent();
if(e.len >= capacity) return false; if(e.len >= capacity) return false;
int direction = source == null ? 0 : Math.abs(source.relativeTo(tile.x, tile.y) - tile.rotation()); int direction = source == null ? 0 : Math.abs(source.relativeTo(tile.x, tile.y) - tile.rotation());
return (((direction == 0) && e.minitem >= itemSpace) || ((direction % 2 == 1) && e.minitem > 0.5f)) && (source == null || !(source.block().rotate && (source.rotation() + 2) % 4 == tile.rotation())); return (((direction == 0) && e.minitem >= itemSpace) || ((direction % 2 == 1) && e.minitem > 0.7f)) && (source == null || !(source.block().rotate && (source.rotation() + 2) % 4 == tile.rotation()));
} }
@Override @Override