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

Bugfixes & liquid unit tests

Browse Source
This commit is contained in:
Anuken
2020-03-16 10:41:32 -04:00
parent 1e3326fb8a
commit 928812142a
4 changed files with 68 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/mindustry/entities/def/TileComp.java
View File

@@ -161,10 +161,14 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc{
public byte absoluteRelativeTo(int cx, int cy){
int x = tile.x, y = tile.y;
if(x == cx && y <= cy - 1) return 1;
if(x == cx && y >= cy + 1) return 3;
if(x <= cx - 1 && y == cy) return 0;
if(x >= cx + 1 && y == cy) return 2;
if(Math.abs(x - cx) > Math.abs(y - cy)){
if(x <= cx - 1 && y == cy) return 0;
if(x >= cx + 1 && y == cy) return 2;
}else{
if(x == cx && y <= cy - 1) return 1;
if(x == cx && y >= cy + 1) return 3;
}
return -1;
}
@@ -360,11 +364,11 @@ abstract class TileComp implements Posc, Teamc, Healthc, Tilec, Timerc{
public float moveLiquid(Tilec next, float leakResistance, Liquid liquid){
if(next == null) return 0;
next = next.getLiquidDestination(next, liquid);
next = next.getLiquidDestination(this, liquid);
if(next.team() == team() && next.block().hasLiquids && liquids().get(liquid) > 0f){
if(next.acceptLiquid(next, liquid, 0f)){
if(next.acceptLiquid(this, liquid, 0f)){
float ofract = next.liquids().get(liquid) / next.block().liquidCapacity;
float fract = liquids().get(liquid) / block.liquidCapacity * block.liquidPressure;
float flow = Math.min(Mathf.clamp((fract - ofract) * (1f)) * (block.liquidCapacity), liquids().get(liquid));

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

@@ -121,7 +121,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
smoothLiquid = Mathf.lerpDelta(smoothLiquid, liquids.currentAmount() / liquidCapacity, 0.05f);
if(liquids.total() > 0.001f && timer(timerFlow, 1)){
moveLiquid(tile.getNearbyEntity(tile.rotation()), leakResistance, liquids.current());
moveLiquid(tile.getNearbyEntity(rotation()), leakResistance, liquids.current());
noSleep();
}else{
sleep();

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

@@ -37,10 +37,10 @@ public class LiquidJunction extends LiquidBlock{
@Override
public Tilec getLiquidDestination(Tilec source, Liquid liquid){
int dir = source.relativeTo(tile.x, tile.y);
int dir = source.absoluteRelativeTo(tile.x, tile.y);
dir = (dir + 4) % 4;
Tilec next = nearby(dir);
if(next == null || !next.acceptLiquid(this, liquid, 0f) && !(next.block() instanceof LiquidJunction)){
if(next == null || (!next.acceptLiquid(this, liquid, 0f) && !(next.block() instanceof LiquidJunction))){
return this;
}
return next.getLiquidDestination(this, liquid);