diff --git a/core/assets-raw/sprites/blocks/props/crystal-blocks1.png b/core/assets-raw/sprites/blocks/props/crystal-blocks1.png new file mode 100644 index 0000000000..838aaaba7f Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/crystal-blocks1.png differ diff --git a/core/assets-raw/sprites/blocks/props/red-ice-boulder1.png b/core/assets-raw/sprites/blocks/props/red-ice-boulder1.png new file mode 100644 index 0000000000..6a3719383e Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/red-ice-boulder1.png differ diff --git a/core/assets-raw/sprites/blocks/props/red-ice-boulder2.png b/core/assets-raw/sprites/blocks/props/red-ice-boulder2.png new file mode 100644 index 0000000000..64913660e4 Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/red-ice-boulder2.png differ diff --git a/core/assets-raw/sprites/blocks/props/red-ice-boulder3.png b/core/assets-raw/sprites/blocks/props/red-ice-boulder3.png new file mode 100644 index 0000000000..ebb2cb653f Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/red-ice-boulder3.png differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index adb53e1a86..18c7e7109b 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -506,3 +506,4 @@ 63198=crystalline-boulder|block-crystalline-boulder-ui 63197=crystal-floor|block-crystal-floor-ui 63196=vibrant-crystal-cluster|block-vibrant-crystal-cluster-ui +63195=red-ice-boulder|block-red-ice-boulder-ui diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index afd76fd7d7..0d49e62e1d 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -49,7 +49,8 @@ public class Blocks{ ferricStone, ferricCraters, carbonStone, beryllicStone, crystallineStone, crystalFloor, iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, grass, salt, //boulders - shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, yellowStoneBoulder, arkyicBoulder, crystalCluster, vibrantCrystalCluster, crystallineBoulder, + shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, yellowStoneBoulder, + arkyicBoulder, crystalCluster, vibrantCrystalCluster, crystallineBoulder, redIceBoulder, metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall, darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal, pebbles, tendrils, @@ -672,6 +673,11 @@ public class Blocks{ crystallineStone.asFloor().decoration = this; }}; + redIceBoulder = new Prop("red-ice-boulder"){{ + variants = 3; + redIce.asFloor().decoration = this; + }}; + metalFloor = new Floor("metal-floor", 0); metalFloorDamaged = new Floor("metal-floor-damaged", 3); diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index 75da1ed535..6d46b778e9 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java @@ -140,6 +140,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ //arkycite //TODO arkycite biome + //TODO ice biome pass((x, y) -> { if(nearWall(x, y)) return; @@ -184,10 +185,9 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ //make sure enemies have room erase(endX, endY, 6); - tiles.getn(endX, endY).setOverlay(Blocks.spawn); + //TODO enemies get stuck on 1x1 passages. - //TODO tech is lazy and boring - //tech(Blocks.darkPanel3, Blocks.darkPanel5, Blocks.darkMetal); + tiles.getn(endX, endY).setOverlay(Blocks.spawn); //ores pass((x, y) -> { @@ -199,10 +199,6 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ }else if(block != Blocks.carbonWall && noise(x + 782, y, 4, 0.8f, 38f, 1f) > 0.665f){ ore = Blocks.wallOreBeryl; } - //TODO generate tungsten, or not? - //else if(block == Blocks.yellowStoneWall && noise(x, y + 942, 4, 0.7f, 38f, 1f) > 0.71f){ - // ore = Blocks.wallOreTungsten; - //} } }else if(!nearWall(x, y)){