mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-05 23:20:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Anuken 2020-12-15 11:15:39 -05:00
parent a18e1854ab
commit 659c481c83
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/entities/Puddles.java
View File

@ -14,12 +14,12 @@ public class Puddles{
public static final float maxLiquid = 70f; public static final float maxLiquid = 70f;
/** Deposists a Puddle between tile and source. */ /** Deposits a Puddle between tile and source. */
public static void deposit(Tile tile, Tile source, Liquid liquid, float amount){ public static void deposit(Tile tile, Tile source, Liquid liquid, float amount){
deposit(tile, source, liquid, amount, 0); deposit(tile, source, liquid, amount, 0);
} }
/** Deposists a Puddle at a tile. */ /** Deposits a Puddle at a tile. */
public static void deposit(Tile tile, Liquid liquid, float amount){ public static void deposit(Tile tile, Liquid liquid, float amount){
deposit(tile, tile, liquid, amount, 0); deposit(tile, tile, liquid, amount, 0);
} }

5
core/src/mindustry/entities/comp/PuddleComp.java
View File

@ -22,8 +22,7 @@ import static mindustry.entities.Puddles.*;
abstract class PuddleComp implements Posc, Puddlec, Drawc{ abstract class PuddleComp implements Posc, Puddlec, Drawc{
private static final int maxGeneration = 2; private static final int maxGeneration = 2;
private static final Color tmp = new Color(); private static final Color tmp = new Color();
private static final Rect rect = new Rect(); private static final Rect rect = new Rect(), rect2 = new Rect();
private static final Rect rect2 = new Rect();
private static int seeds; private static int seeds;
@Import float x, y; @Import float x, y;
@ -53,7 +52,7 @@ abstract class PuddleComp implements Posc, Puddlec, Drawc{
Tile other = world.tile(tile.x + point.x, tile.y + point.y); Tile other = world.tile(tile.x + point.x, tile.y + point.y);
if(other != null && other.block() == Blocks.air){ if(other != null && other.block() == Blocks.air){
Puddles.deposit(other, tile, liquid, deposited, generation + 1); Puddles.deposit(other, tile, liquid, deposited, generation + 1);
amount -= deposited / 2f; //tweak to speed up/slow down Puddlec propagation amount -= deposited / 2f; //tweak to speed up/slow down Puddle propagation
} }
} }
} }