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

Re-enabled junction chaining

Browse Source
This commit is contained in:
Anuken
2017-10-04 21:58:12 -04:00
parent 61dbd33f51
commit af29eb8c96
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java
View File

@@ -67,7 +67,8 @@ public class ProductionBlocks{
int dir = source.relativeTo(tile.x, tile.y); int dir = source.relativeTo(tile.x, tile.y);
dir = (dir+4)%4; dir = (dir+4)%4;
Tile to = tile.getNearby()[dir]; Tile to = tile.getNearby()[dir];
Timers.run(10, ()->{
Timers.run(15, ()->{
if(to == null || to.entity == null) return; if(to == null || to.entity == null) return;
to.block().handleItem(to, item, tile); to.block().handleItem(to, item, tile);
}); });
@@ -79,7 +80,8 @@ public class ProductionBlocks{
int dir = source.relativeTo(dest.x, dest.y); int dir = source.relativeTo(dest.x, dest.y);
dir = (dir+4)%4; dir = (dir+4)%4;
Tile to = dest.getNearby()[dir]; Tile to = dest.getNearby()[dir];
return to != null && to.block() != junction && to.block().accept(item, to, dest); //uncomment the junction bit to disable giving items to other junctions
return to != null /*&& to.block() != junction*/ && to.block().accept(item, to, dest);
} }
@Override @Override

2
core/src/io/anuke/mindustry/world/blocks/types/Turret.java
View File

@@ -33,7 +33,7 @@ public class Turret extends Block{
protected int ammoMultiplier = 20; protected int ammoMultiplier = 20;
protected int maxammo = 400; protected int maxammo = 400;
protected float rotatespeed = 0.2f; protected float rotatespeed = 0.2f;
protected float shootCone = 8f; protected float shootCone = 2f;
public Turret(String name) { public Turret(String name) {
super(name); super(name);