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

Campaign balancing

Browse Source
This commit is contained in:
Anuken
2020-11-27 17:37:22 -05:00
parent d06b32c20b
commit 66918f0322
13 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,7 +311,7 @@ public class Conveyor extends Block implements Autotiler{
if(len >= capacity) return false;
Tile facing = Edges.getFacingEdge(source.tile, tile);
int direction = Math.abs(facing.relativeTo(tile.x, tile.y) - rotation);
return (((direction == 0) && minitem >= itemSpace) || ((direction % 2 == 1) && minitem > 0.7f)) && !(source.block.rotate && (source.rotation + 2) % 4 == rotation);
return (((direction == 0) && minitem >= itemSpace) || ((direction % 2 == 1) && minitem > 0.7f)) && !(source.block.rotate && next == source);
}
@Override

4
core/src/mindustry/world/blocks/distribution/ItemBridge.java
View File

@@ -93,7 +93,7 @@ public class ItemBridge extends Block{
Draw.reset();
Draw.color(Pal.placing);
Lines.stroke(1f);
if(link != null){
if(link != null && Math.abs(link.x - x) + Math.abs(link.y - y) > 1){
int rot = link.absoluteRelativeTo(x, y);
float w = (link.x == x ? tilesize : Math.abs(link.x - x) * tilesize - tilesize);
float h = (link.y == y ? tilesize : Math.abs(link.y - y) * tilesize - tilesize);
@@ -145,7 +145,7 @@ public class ItemBridge extends Block{
if(config != null) return;
Tile link = findLink(tile.x, tile.y);
if(linkValid(tile, link)){
if(linkValid(tile, link) && !proximity.contains(link.build)){
link.build.configure(tile.pos());
}