Underflow duct (#6957)

* Underflow Gate

I'm not sure why ClassMap decided to import OverflowDuct instead of using the full path when being generated.

* Better top sprite

Also fix base asymmetry

Co-authored-by: Anuken <arnukren@gmail.com>
This commit is contained in:
MEEPofFaith
2022-07-05 15:41:13 -07:00
committed by GitHub
parent 7ddbc40720
commit 45bc4dcb00
8 changed files with 36 additions and 5 deletions

View File

@@ -13,6 +13,7 @@ import mindustry.world.meta.*;
public class OverflowDuct extends Block{
public float speed = 5f;
public boolean invert = false;
public @Load(value = "@-top") TextureRegion topRegion;
@@ -57,7 +58,7 @@ public class OverflowDuct extends Block{
return false;
}
public class DuctRouterBuild extends Building{
public class OverflowDuctBuild extends Building{
public float progress;
public @Nullable Item current;
@@ -95,11 +96,27 @@ public class OverflowDuct extends Block{
public Building target(){
if(current == null) return null;
if(invert){ //Lots of extra code. Make separate UnderflowDuct class?
Building l = left(), r = right();
boolean lc = l != null && l.team == team && l.acceptItem(this, current),
rc = r != null && r.team == team && r.acceptItem(this, current);
if(lc && !rc){
return l;
}else if(rc && !lc){
return r;
}else if(lc && rc){
return cdump == 0 ? l : r;
}
}
Building front = front();
if(front != null && front.team == team && front.acceptItem(this, current)){
return front;
}
if(invert) return null;
for(int i = -1; i <= 1; i++){
int dir = Mathf.mod(rotation + (((i + cdump + 1) % 3) - 1), 4);
if(dir == rotation) continue;
@@ -108,6 +125,7 @@ public class OverflowDuct extends Block{
return other;
}
}
return null;
}