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

connectedPower similar to conductivePower (#8306)

Browse Source
This commit is contained in:
MEEPofFaith
2023-02-15 20:22:05 -08:00
committed by GitHub
parent a8a3453632
commit 348819d1ac
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/entities/comp/BuildingComp.java
View File

@@ -1254,7 +1254,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
public void placed(){
if(net.client()) return;
if((block.consumesPower || block.outputsPower) && block.hasPower){
if((block.consumesPower || block.outputsPower) && block.hasPower && block.connectedPower){
PowerNode.getNodeLinks(tile, block, team, other -> {
if(!other.power.links.contains(pos())){
other.configureAny(pos());

4
core/src/mindustry/world/Block.java
View File

@@ -51,6 +51,8 @@ public class Block extends UnlockableContent implements Senseable{
public boolean consumesPower = true;
/** If true, this block is a generator that can produce power. */
public boolean outputsPower = false;
/** If false, power nodes cannot connect to this block. */
public boolean connectedPower = true;
/** If true, this block can conduct power like a cable. */
public boolean conductivePower = false;
/** If true, this block can output payloads; affects blending. */
@@ -413,7 +415,7 @@ public class Block extends UnlockableContent implements Senseable{
}
public void drawPotentialLinks(int x, int y){
if((consumesPower || outputsPower) && hasPower){
if((consumesPower || outputsPower) && hasPower && connectedPower){
Tile tile = world.tile(x, y);
if(tile != null){
PowerNode.getNodeLinks(tile, this, player.team(), other -> {

2
core/src/mindustry/world/blocks/power/BeamNode.java
View File

@@ -179,7 +179,7 @@ public class BeamNode extends PowerBlock{
}
//power nodes do NOT play nice with beam nodes, do not touch them as that forcefully modifies their links
if(other != null && other.block.hasPower && other.team == team && !(other.block instanceof PowerNode)){
if(other != null && other.block.hasPower && other.block.connectedPower && other.team == team && !(other.block instanceof PowerNode)){
links[i] = other;
dests[i] = world.tile(tile.x + j * dir.x, tile.y + j * dir.y);
break;

4
core/src/mindustry/world/blocks/power/PowerNode.java
View File

@@ -210,7 +210,7 @@ public class PowerNode extends PowerBlock{
protected void getPotentialLinks(Tile tile, Team team, Cons<Building> others){
if(!autolink) return;
Boolf<Building> valid = other -> other != null && other.tile() != tile && other.power != null &&
Boolf<Building> valid = other -> other != null && other.tile() != tile && other.block.connectedPower && other.power != null &&
(other.block.outputsPower || other.block.consumesPower || other.block instanceof PowerNode) &&
overlaps(tile.x * tilesize + offset, tile.y * tilesize + offset, other.tile(), laserRange * tilesize) && other.team == team &&
!graphs.contains(other.power.graph) &&
@@ -342,7 +342,7 @@ public class PowerNode extends PowerBlock{
}
public boolean linkValid(Building tile, Building link, boolean checkMaxNodes){
if(tile == link || link == null || !link.block.hasPower || tile.team != link.team) return false;
if(tile == link || link == null || !link.block.hasPower || !link.block.connectedPower || tile.team != link.team) return false;
if(overlaps(tile, link, laserRange * tilesize) || (link.block instanceof PowerNode node && overlaps(link, tile, node.laserRange * tilesize))){
if(checkMaxNodes && link.block instanceof PowerNode node){