New basic water sprite

2019-01-29 22:26:02 -05:00
parent 5af35b6771
commit dbf05a1419
22 changed files with 725 additions and 766 deletions
--- a/core/src/io/anuke/mindustry/entities/Player.java
+++ b/core/src/io/anuke/mindustry/entities/Player.java
@@ -516,7 +516,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
                if(mech.shake > 1f){
                    Effects.shake(mech.shake, mech.shake, this);
                }
-                Effects.effect(Fx.unitLand, tile.floor().minimapColor, x, y, tile.floor().isLiquid ? 1f : 0.5f);
+                Effects.effect(Fx.unitLand, tile.floor().liquidColor == null ? tile.floor().minimapColor : tile.floor().minimapColor, x, y, tile.floor().isLiquid ? 1f : 0.5f);
            }
            mech.onLand(this);
            achievedFlight = false;