diff --git a/core/assets-raw/sprites/blocks/environment/rough-rhyolite1.png b/core/assets-raw/sprites/blocks/environment/rough-rhyolite1.png new file mode 100644 index 0000000000..3f8f555456 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/rough-rhyolite1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/rough-rhyolite2.png b/core/assets-raw/sprites/blocks/environment/rough-rhyolite2.png new file mode 100644 index 0000000000..a011218c3e Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/rough-rhyolite2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/rough-rhyolite3.png b/core/assets-raw/sprites/blocks/environment/rough-rhyolite3.png new file mode 100644 index 0000000000..9fc10ed086 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/rough-rhyolite3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/rough-rhyolite4.png b/core/assets-raw/sprites/blocks/environment/rough-rhyolite4.png new file mode 100644 index 0000000000..4a73e0ce76 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/rough-rhyolite4.png differ diff --git a/core/assets-raw/sprites/blocks/props/rhyolite-boulder1.png b/core/assets-raw/sprites/blocks/props/rhyolite-boulder1.png new file mode 100644 index 0000000000..888aeed2eb Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/rhyolite-boulder1.png differ diff --git a/core/assets-raw/sprites/blocks/props/rhyolite-boulder2.png b/core/assets-raw/sprites/blocks/props/rhyolite-boulder2.png new file mode 100644 index 0000000000..7b6f910a8a Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/rhyolite-boulder2.png differ diff --git a/core/assets-raw/sprites/blocks/props/rhyolite-boulder3.png b/core/assets-raw/sprites/blocks/props/rhyolite-boulder3.png new file mode 100644 index 0000000000..25059fd947 Binary files /dev/null and b/core/assets-raw/sprites/blocks/props/rhyolite-boulder3.png differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 0f81f57397..9af5d1a3c7 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -509,3 +509,5 @@ 63195=red-ice-boulder|block-red-ice-boulder-ui 63194=crystal-blocks|block-crystal-blocks-ui 63193=yellow-stone-plates|block-yellow-stone-plates-ui +63192=rough-rhyolite|block-rough-rhyolite-ui +63191=rhyolite-boulder|block-rhyolite-boulder-ui diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 24a433c3b5..c56e21c7cc 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -40,7 +40,7 @@ public class Blocks{ //environment air, spawn, cliff, deepwater, water, taintedWater, deepTaintedWater, tar, slag, cryofluid, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater, space, empty, - dacite, rhyolite, rhyoliteCrater, regolith, yellowStone, redIce, + dacite, rhyolite, rhyoliteCrater, roughRhyolite, regolith, yellowStone, redIce, arkyciteFloor, arkyicStone, redmat, bluemat, stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster, @@ -50,7 +50,7 @@ public class Blocks{ 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, crystalBlocks, crystallineBoulder, redIceBoulder, + arkyicBoulder, crystalCluster, vibrantCrystalCluster, crystalBlocks, crystallineBoulder, redIceBoulder, rhyoliteBoulder, metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall, darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal, pebbles, tendrils, @@ -367,6 +367,11 @@ public class Blocks{ blendGroup = rhyolite; }}; + roughRhyolite = new Floor("rough-rhyolite"){{ + attributes.set(Attribute.water, -1f); + variants = 3; + }}; + steamVent = new SteamVent("steam-vent"){{ parent = blendGroup = rhyolite; attributes.set(Attribute.vent, 1f); @@ -519,7 +524,7 @@ public class Blocks{ }}; rhyoliteWall = new StaticWall("rhyolite-wall"){{ - rhyolite.asFloor().wall = rhyoliteCrater.asFloor().wall = this; + rhyolite.asFloor().wall = rhyoliteCrater.asFloor().wall = roughRhyolite.asFloor().wall = this; attributes.set(Attribute.silicate, 1f); }}; @@ -688,6 +693,11 @@ public class Blocks{ redIce.asFloor().decoration = this; }}; + rhyoliteBoulder = new Prop("rhyolite-boulder"){{ + variants = 3; + rhyolite.asFloor().decoration = roughRhyolite.asFloor().decoration = this; + }}; + metalFloor = new Floor("metal-floor", 0); metalFloorDamaged = new Floor("metal-floor-damaged", 3); diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 3d70796424..282559e285 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -2538,7 +2538,7 @@ public class UnitTypes{ drownTimeMultiplier = 2f; hovering = true; - visualElevation = 0.65f; + visualElevation = 0.4f; groundLayer = Layer.legUnit; weapons.add(new Weapon("bulwark-weapon"){{ diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index ca42c750ca..6157f87579 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java @@ -169,6 +169,11 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ median(3, 0.6, Blocks.slag); pass((x, y) -> { + //rough rhyolite + if(noise(x, y + 600 + x, 5, 0.86f, 60f, 1f) < 0.41f && floor == Blocks.rhyolite){ + floor = Blocks.roughRhyolite; + } + if((floor == Blocks.arkyciteFloor || floor == Blocks.arkyicStone) && block.isStatic()){ block = Blocks.arkyicWall; } @@ -244,7 +249,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ //vents outer: for(Tile tile : tiles){ - if(floor == Blocks.rhyolite && rand.chance(0.0011)){ + if(floor == Blocks.rhyolite && rand.chance(0.0015)){ int radius = 2; for(int x = -radius; x <= radius; x++){ for(int y = -radius; y <= radius; y++){