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

Conduit padCorners

Browse Source
This commit is contained in:
Anuken
2023-06-19 10:28:54 -04:00
parent 509a6a28b5
commit 5c178c20a1
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/maps/siege.msav
View File

Binary file not shown.

3
core/src/mindustry/ai/ControlPathfinder.java
View File

@@ -50,7 +50,8 @@ public class ControlPathfinder{
costLegs = (team, tile) -> costLegs = (team, tile) ->
PathTile.legSolid(tile) ? impassable : 1 + PathTile.legSolid(tile) ? impassable : 1 +
(PathTile.deep(tile) ? 6000 : 0), (PathTile.deep(tile) ? 6000 : 0) +
(PathTile.solid(tile) ? 2 : 0),
costNaval = (team, tile) -> costNaval = (team, tile) ->
//impassable same-team neutral block, or non-liquid //impassable same-team neutral block, or non-liquid

4
core/src/mindustry/world/blocks/liquid/Conduit.java
View File

@@ -38,6 +38,8 @@ public class Conduit extends LiquidBlock implements Autotiler{
/** indices: [rotation] [fluid type] [frame] */ /** indices: [rotation] [fluid type] [frame] */
public TextureRegion[][][] rotateRegions; public TextureRegion[][][] rotateRegions;
/** If true, the liquid region is padded at corners, so it doesn't stick out. */
public boolean padCorners = true;
public boolean leaks = true; public boolean leaks = true;
public @Nullable Block junctionReplacement, bridgeReplacement, rotBridgeReplacement; public @Nullable Block junctionReplacement, bridgeReplacement, rotBridgeReplacement;
@@ -188,7 +190,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
int wrapRot = (rotation + offset) % 4; int wrapRot = (rotation + offset) % 4;
TextureRegion liquidr = bits == 1 ? rotateRegions[wrapRot][gas][frame] : renderer.fluidFrames[gas][frame]; TextureRegion liquidr = bits == 1 ? rotateRegions[wrapRot][gas][frame] : renderer.fluidFrames[gas][frame];
if(bits == 1){ if(bits == 1 && padCorners){
ox = rotateOffsets[wrapRot][0]; ox = rotateOffsets[wrapRot][0];
oy = rotateOffsets[wrapRot][1]; oy = rotateOffsets[wrapRot][1];
} }