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

Allow for dynamic laser absorption and insulation (#5047)

Browse Source 
* Allow for dynamic laser absorption

* Might as well do insulated as well

* null checks are important
This commit is contained in:
Matthew Peng
2021-10-05 09:36:29 -07:00
committed by GitHub
parent 77736f227f
commit bc3da30d45
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/entities/Damage.java
View File

@@ -108,7 +108,7 @@ public class Damage{
furthest = null; furthest = null;
boolean found = world.raycast(b.tileX(), b.tileY(), World.toTile(b.x + Tmp.v1.x), World.toTile(b.y + Tmp.v1.y), boolean found = world.raycast(b.tileX(), b.tileY(), World.toTile(b.x + Tmp.v1.x), World.toTile(b.y + Tmp.v1.y),
(x, y) -> (furthest = world.tile(x, y)) != null && furthest.team() != b.team && furthest.block().absorbLasers); (x, y) -> (furthest = world.tile(x, y)) != null && furthest.team() != b.team && (furthest.build != null && furthest.build.absorbLasers()));
return found && furthest != null ? Math.max(6f, b.dst(furthest.worldx(), furthest.worldy())) : length; return found && furthest != null ? Math.max(6f, b.dst(furthest.worldx(), furthest.worldy())) : length;
} }

2
core/src/mindustry/entities/Lightning.java
View File

@@ -53,7 +53,7 @@ public class Lightning{
world.raycastEach(World.toTile(from.getX()), World.toTile(from.getY()), World.toTile(to.getX()), World.toTile(to.getY()), (wx, wy) -> { world.raycastEach(World.toTile(from.getX()), World.toTile(from.getY()), World.toTile(to.getX()), World.toTile(to.getY()), (wx, wy) -> {
Tile tile = world.tile(wx, wy); Tile tile = world.tile(wx, wy);
if(tile != null && tile.block().insulated && tile.team() != team){ if(tile != null && (tile.build != null && tile.build.isInsulated()) && tile.team() != team){
bhit = true; bhit = true;
//snap it instead of removing //snap it instead of removing
lines.get(lines.size - 1).set(wx * tilesize, wy * tilesize); lines.get(lines.size - 1).set(wx * tilesize, wy * tilesize);

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

@@ -1241,6 +1241,14 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
return amount; return amount;
} }
public boolean absorbLasers(){
return block.absorbLasers;
}
public boolean isInsulated(){
return block.insulated;
}
public boolean collide(Bullet other){ public boolean collide(Bullet other){
return true; return true;
} }

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

@@ -348,7 +348,7 @@ public class PowerNode extends PowerBlock{
public static boolean insulated(int x, int y, int x2, int y2){ public static boolean insulated(int x, int y, int x2, int y2){
return world.raycast(x, y, x2, y2, (wx, wy) -> { return world.raycast(x, y, x2, y2, (wx, wy) -> {
Building tile = world.build(wx, wy); Building tile = world.build(wx, wy);
return tile != null && tile.block.insulated; return tile != null && tile.isInsulated();
}); });
} }