From 9a8c9dff175236247a16ef0c1755649561d92368 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 12 Jun 2021 10:54:58 -0400
Subject: [PATCH] Red ice

---
 core/assets/icons/icons.properties              |  3 +++
 core/src/mindustry/content/Blocks.java          | 17 +++++++++++++++--
 .../maps/planet/ErekirPlanetGenerator.java      |  4 ++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index f0c8c234c6..720a88689c 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -379,3 +379,6 @@
 63354=payload-launch-pad|block-payload-launch-pad-ui
 63353=silicon-arc-furnace|block-silicon-arc-furnace-ui
 63352=metal-floor-4|block-metal-floor-4-ui
+63351=redice|block-redice-ui
+63350=red-ice|block-red-ice-ui
+63349=red-ice-wall|block-red-ice-wall-ui
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 9356c0586b..d812dbe83d 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -37,10 +37,11 @@ public class Blocks implements ContentList{
 
     //environment
     air, spawn, cliff, deepwater, water, taintedWater, tar, slag, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater, space,
-    dacite, rhyolite, rhyoliteCrater, regolith, yellowStone, redmat, bluemat,
+    dacite, rhyolite, rhyoliteCrater, regolith, yellowStone, redIce,
+    redmat, bluemat,
     stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster,
     redweed, purbush, coralChunk, glowBlob, yellowCoral,
-    regolithWall, yellowStoneWall, rhyoliteWall, carbonWall,
+    regolithWall, yellowStoneWall, rhyoliteWall, carbonWall, redIceWall,
     graphiticStone,
     iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, grass, salt,
     metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall,
@@ -312,6 +313,12 @@ public class Blocks implements ContentList{
             variants = 4;
         }};
 
+        redIce = new Floor("red-ice"){{
+            dragMultiplier = 0.4f;
+            speedMultiplier = 0.9f;
+            attributes.set(Attribute.water, 0.4f);
+        }};
+
         redmat = new Floor("redmat");
         bluemat = new Floor("bluemat");
 
@@ -396,6 +403,12 @@ public class Blocks implements ContentList{
             graphiticStone.asFloor().wall = this;
         }};
 
+
+        redIceWall = new StaticWall("red-ice-wall"){{
+            variants = 2;
+            redIce.asFloor().wall = this;
+        }};
+
         sandWall = new StaticWall("sand-wall"){{
             variants = 2;
             sandWater.asFloor().wall = water.asFloor().wall = deepwater.asFloor().wall = this;
diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
index 138593bf31..47d2370071 100644
--- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
+++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
@@ -71,7 +71,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
 
         if(ice < 0.6){
             if(result == Blocks.rhyolite || result == Blocks.yellowStone || result == Blocks.regolith){
-                return Blocks.ice;
+                return Blocks.redIce;
             }
         }
 
@@ -104,7 +104,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
         if(temp > 0.7){
 
             pass((x, y) -> {
-                if(floor != Blocks.ice){
+                if(floor != Blocks.redIce){
                     float noise = noise(x + 782, y, 7, 0.8f, 310f, 1f);
                     if(noise > 0.67f){
                         if(noise > 0.72f){