New basic water sprite

core/src/io/anuke/mindustry/content/Blocks.java

@@ -107,7 +107,7 @@ public class Blocks implements ContentList{
         }
 
         deepwater = new Floor("deepwater"){{
-            liquidColor = Color.valueOf("546bb3");
+            liquidColor = Color.valueOf("4d5ca4");
             speedMultiplier = 0.2f;
             variants = 0;
             liquidDrop = Liquids.water;
@@ -120,7 +120,7 @@ public class Blocks implements ContentList{
         }};
 
         water = new Floor("water"){{
-            liquidColor = Color.valueOf("546bb3");
+            liquidColor = Color.valueOf("596ab8");
             speedMultiplier = 0.5f;
             variants = 0;
             status = StatusEffects.wet;
@@ -165,25 +165,25 @@ public class Blocks implements ContentList{
             playerUnmineable = true;
         }};
 
+        holostone = new Floor("holostone"){{
+            hasOres = true;
+            edgeStyle = "blocky";
+        }};
+
         iceSnow = new Floor("ice-snow"){{
             variants = 3;
         }};
 
+        snow = new Floor("snow"){{
+            minimapColor = Color.valueOf("c2d1d2");
+        }};
+
         ice = new Floor("ice"){{
             dragMultiplier = 0.2f;
             speedMultiplier = 0.4f;
             minimapColor = Color.valueOf("b8eef8");
         }};
 
-        holostone = new Floor("holostone"){{
-            hasOres = true;
-            edgeStyle = "blocky";
-        }};
-
-        snow = new Floor("snow"){{
-            minimapColor = Color.valueOf("c2d1d2");
-        }};
-
         grass = new Floor("grass"){{
             hasOres = true;
             minimapColor = Color.valueOf("549d5b");
@@ -776,7 +776,7 @@ public class Blocks implements ContentList{
 
         blastDrill = new Drill("blast-drill"){{
             requirements(Category.production, ItemStack.with(Items.copper, 130, Items.silicon, 120, Items.titanium, 100, Items.thorium, 60));
-            drillTime = 120;
+            drillTime = 200;
             size = 3;
             drawRim = true;
             hasPower = true;
@@ -792,7 +792,7 @@ public class Blocks implements ContentList{
 
         plasmaDrill = new Drill("plasma-drill"){{
             heatColor = Color.valueOf("ff461b");
-            drillTime = 100;
+            drillTime = 150;
             size = 4;
             hasLiquids = true;
             hasPower = true;

core/src/io/anuke/mindustry/content/Fx.java

@@ -117,7 +117,7 @@ public class Fx implements ContentList{
         });
 
         unitLand = new GroundEffect(30, e -> {
-            Draw.color(Palette.lightishGray, e.color, e.rotation);
+            Draw.color(Tmp.c1.set(e.color).mul(1.1f));
             Angles.randLenVectors(e.id, 6, 17f * e.finpow(), (x, y) -> {
                 Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.3f);
             });
@@ -1067,7 +1067,7 @@ public class Fx implements ContentList{
             Draw.reset();
         });
         ripple = new GroundEffect(false, 30, e -> {
-            Draw.color(Tmp.c1.set(e.color).shiftValue(0.1f));
+            Draw.color(Tmp.c1.set(e.color).mul(1.2f));
             Lines.stroke(e.fout() + 0.4f);
             Lines.circle(e.x, e.y, 2f + e.fin() * 4f);
             Draw.reset();

core/src/io/anuke/mindustry/content/Liquids.java

@@ -10,7 +10,7 @@ public class Liquids implements ContentList{
     @Override
     public void load(){
 
-        water = new Liquid("water", Color.valueOf("486acd")){{
+        water = new Liquid("water", Color.valueOf("596ab8")){{
             heatCapacity = 0.4f;
             tier = 0;
             effect = StatusEffects.wet;

core/src/io/anuke/mindustry/content/Zones.java

@@ -168,7 +168,7 @@ public class Zones implements ContentList{
             }};
         }};
 
-        ruinousShores = new Zone("ruinousShores", new MapGenerator("groundZero", 1)){{ //TODO implement
+        ruinousShores = new Zone("ruinousShores", new MapGenerator("ruinousShores")){{ //TODO implement
             deployCost = ItemStack.with(Items.copper, 300);
             startingItems = ItemStack.with(Items.copper, 200);
             conditionWave = 15;