@@ -8,6 +8,7 @@ import arc.scene.ui.*;
|
|||||||
import arc.scene.ui.layout.*;
|
import arc.scene.ui.layout.*;
|
||||||
import arc.struct.*;
|
import arc.struct.*;
|
||||||
import arc.util.ArcAnnotate.*;
|
import arc.util.ArcAnnotate.*;
|
||||||
|
import arc.util.*;
|
||||||
import mindustry.annotations.Annotations.*;
|
import mindustry.annotations.Annotations.*;
|
||||||
import mindustry.content.*;
|
import mindustry.content.*;
|
||||||
import mindustry.game.*;
|
import mindustry.game.*;
|
||||||
@@ -91,6 +92,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{
|
|||||||
if(y >= cy + 1) return 3;
|
if(y >= cy + 1) return 3;
|
||||||
}
|
}
|
||||||
}else{ //need offsets here
|
}else{ //need offsets here
|
||||||
|
Log.info("");
|
||||||
if(Math.abs(x - cx + 0.5f) > Math.abs(y - cy + 0.5f)){
|
if(Math.abs(x - cx + 0.5f) > Math.abs(y - cy + 0.5f)){
|
||||||
if(x+0.5f <= cx - 1) return 0;
|
if(x+0.5f <= cx - 1) return 0;
|
||||||
if(x+0.5f >= cx + 1) return 2;
|
if(x+0.5f >= cx + 1) return 2;
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ public class PowerTurret extends Turret{
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void init(){
|
public void init(){
|
||||||
consumes.powerCond(powerUse, entity -> ((TurretBuild)entity).target != null);
|
consumes.powerCond(powerUse, (TurretBuild entity) -> entity.target != null || (entity.logicControlled() && entity.logicShooting));
|
||||||
super.init();
|
super.init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,8 +33,8 @@ public class ArmoredConduit extends Conduit{
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean acceptLiquid(Building source, Liquid liquid, float amount){
|
public boolean acceptLiquid(Building source, Liquid liquid, float amount){
|
||||||
return super.acceptLiquid(source, liquid, amount) && (source.block instanceof Conduit) ||
|
return super.acceptLiquid(source, liquid, amount) && (source.block instanceof Conduit ||
|
||||||
Edges.getFacingEdge(source.tile(), tile).absoluteRelativeTo(tile.x, tile.y) == rotation;
|
source.tile.absoluteRelativeTo(tile.x, tile.y) == rotation);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user