Skip to content

linkSameType field for ItemBridge #12203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EggleEgg wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −4
Open

linkSameType field for ItemBridge #12203

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions core/src/mindustry/world/blocks/distribution/ItemBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ public class ItemBridge extends Block{
public boolean fadeIn = true;
public boolean moveArrows = true;
public boolean pulse = false;
/** If true, only allows this bridge to link with the same block type. Otherwise this can link with any ItemBridge. */
public boolean linkSameType = true;
public float arrowSpacing = 4f, arrowOffset = 2f, arrowPeriod = 0.4f;
public float arrowTimeScl = 6.2f;
public float bridgeWidth = 6.5f;
Expand Down Expand Up @@ -147,18 +149,28 @@ public boolean linkValid(Tile tile, Tile other){
}

public boolean linkValid(Tile tile, Tile other, boolean checkDouble){
if(other == null || tile == null || !positionsValid(tile.x, tile.y, other.x, other.y)) return false;
if(other == null || tile == null || !positionsValid(tile.x, tile.y, other.x, other.y, linkSameType ? range
: Math.max(tile.block() instanceof ItemBridge bt ? bt.range : range, other.block() instanceof ItemBridge bo ? bo.range : range))) return false;
if(!linkSameType){
//false if at least 1 module isn't shared
if(!(tile.block().hasItems && other.block().hasItems) && !(tile.block().hasLiquids && other.block().hasLiquids)) return false;
}

return ((other.block() == tile.block() && tile.block() == this) || (!(tile.block() instanceof ItemBridge) && other.block() == this))
return ((linkSameType ? other.block() == tile.block() && tile.block() == this : (other.block() instanceof ItemBridge && tile.block() instanceof ItemBridge))
|| (!(tile.block() instanceof ItemBridge) && other.block() == this))
&& (other.team() == tile.team() || tile.block() != this)
&& (!checkDouble || ((ItemBridgeBuild)other.build).link != tile.pos());
}

public boolean positionsValid(int x1, int y1, int x2, int y2){
return positionsValid(x1, y1, x2, y2, range);
}

public boolean positionsValid(int x1, int y1, int x2, int y2, int baseRange){
if(x1 == x2){
return Math.abs(y1 - y2) <= range;
return Math.abs(y1 - y2) <= baseRange;
}else if(y1 == y2){
return Math.abs(x1 - x2) <= range;
return Math.abs(x1 - x2) <= baseRange;
}else{
return false;
}
Expand Down
Loading