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

Armored duct + Balancing

Browse Source
This commit is contained in:
Anuken
2022-04-11 09:42:16 -04:00
parent 9f95dc6e47
commit 54d90633e7
12 changed files with 53 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/blocks/defense/Radar.java
View File

@@ -15,7 +15,7 @@ import mindustry.world.meta.*;
import static mindustry.Vars.*;
public class Radar extends Block{
public float discoveryTime = 60f * 7f;
public float discoveryTime = 60f * 10f;
public float rotateSpeed = 2f;
public @Load("@-base") TextureRegion baseRegion;

15
core/src/mindustry/world/blocks/distribution/Duct.java
View File

@@ -22,6 +22,7 @@ import static mindustry.Vars.*;
public class Duct extends Block implements Autotiler{
public float speed = 5f;
public boolean armored = false;
public @Load(value = "@-top-#", length = 5) TextureRegion[] topRegions;
public @Load(value = "@-bottom-#", length = 5, fallback = "duct-bottom-#") TextureRegion[] botRegions;
@@ -74,7 +75,12 @@ public class Duct extends Block implements Autotiler{
@Override
public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock){
return (otherblock.outputsItems() && blendsArmored(tile, rotation, otherx, othery, otherrot, otherblock)) || (lookingAt(tile, rotation, otherx, othery, otherblock) && otherblock.hasItems);
if(!armored){
return (otherblock.outputsItems() || (lookingAt(tile, rotation, otherx, othery, otherblock) && otherblock.hasItems))
&& lookingAtEither(tile, rotation, otherx, othery, otherrot, otherblock);
}else{
return (otherblock.outputsItems() && blendsArmored(tile, rotation, otherx, othery, otherrot, otherblock)) || (lookingAt(tile, rotation, otherx, othery, otherblock) && otherblock.hasItems);
}
}
@Override
@@ -162,7 +168,12 @@ public class Duct extends Block implements Autotiler{
@Override
public boolean acceptItem(Building source, Item item){
return current == null && items.total() == 0 &&
((source.block.rotate && source.front() == this && source.block.hasItems) || Edges.getFacingEdge(source.tile(), tile).relativeTo(tile) == rotation);
(armored ?
//armored acceptance
((source.block.rotate && source.front() == this && source.block.hasItems) || Edges.getFacingEdge(source.tile(), tile).relativeTo(tile) == rotation) :
//standard acceptance - do not accept from front
!(source.block.rotate && next == source) && Math.abs(Edges.getFacingEdge(source.tile, tile).relativeTo(tile.x, tile.y) - rotation) != 2
);
}
@Override