diff --git a/core/assets-raw/sprites/blocks/environment/pebbles1.png b/core/assets-raw/sprites/blocks/environment/pebbles1.png index 81baa64bd5..825833c5b6 100644 Binary files a/core/assets-raw/sprites/blocks/environment/pebbles1.png and b/core/assets-raw/sprites/blocks/environment/pebbles1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/pebbles2.png b/core/assets-raw/sprites/blocks/environment/pebbles2.png index 7b11d5fc17..075f05dfcd 100644 Binary files a/core/assets-raw/sprites/blocks/environment/pebbles2.png and b/core/assets-raw/sprites/blocks/environment/pebbles2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/pebbles3.png b/core/assets-raw/sprites/blocks/environment/pebbles3.png index 39b1ebd9c5..846f5fbc3f 100644 Binary files a/core/assets-raw/sprites/blocks/environment/pebbles3.png and b/core/assets-raw/sprites/blocks/environment/pebbles3.png differ diff --git a/core/assets-raw/sprites/blocks/environment/rock1.png b/core/assets-raw/sprites/blocks/environment/rock1.png index f5fbeae6eb..75d81ad163 100644 Binary files a/core/assets-raw/sprites/blocks/environment/rock1.png and b/core/assets-raw/sprites/blocks/environment/rock1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/rock2.png b/core/assets-raw/sprites/blocks/environment/rock2.png index df9303897d..b4a900c4fd 100644 Binary files a/core/assets-raw/sprites/blocks/environment/rock2.png and b/core/assets-raw/sprites/blocks/environment/rock2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/shale-boulder1.png b/core/assets-raw/sprites/blocks/environment/shale-boulder1.png index ed47edab22..00cc2f2ccb 100644 Binary files a/core/assets-raw/sprites/blocks/environment/shale-boulder1.png and b/core/assets-raw/sprites/blocks/environment/shale-boulder1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/shale-boulder2.png b/core/assets-raw/sprites/blocks/environment/shale-boulder2.png index 1d54fe6d4a..e03c20b62c 100644 Binary files a/core/assets-raw/sprites/blocks/environment/shale-boulder2.png and b/core/assets-raw/sprites/blocks/environment/shale-boulder2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/snowrock1.png b/core/assets-raw/sprites/blocks/environment/snowrock1.png index 5c3a702ccd..d81d328b9c 100644 Binary files a/core/assets-raw/sprites/blocks/environment/snowrock1.png and b/core/assets-raw/sprites/blocks/environment/snowrock1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/snowrock2.png b/core/assets-raw/sprites/blocks/environment/snowrock2.png index c25c544910..99a4b14ce0 100644 Binary files a/core/assets-raw/sprites/blocks/environment/snowrock2.png and b/core/assets-raw/sprites/blocks/environment/snowrock2.png differ diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index 0f5ed9c8e7..f70f94a150 100644 Binary files a/core/assets/sprites/block_colors.png and b/core/assets/sprites/block_colors.png differ diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 22b8172b8a..c7aaab1d2b 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index 9d579c4ebe..12e26dfe8f 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/assets/sprites/sprites3.png b/core/assets/sprites/sprites3.png index f882d80099..006c713d6b 100644 Binary files a/core/assets/sprites/sprites3.png and b/core/assets/sprites/sprites3.png differ diff --git a/core/assets/sprites/sprites_fallback.png b/core/assets/sprites/sprites_fallback.png index d0d2c283f4..12e54bd713 100644 Binary files a/core/assets/sprites/sprites_fallback.png and b/core/assets/sprites/sprites_fallback.png differ diff --git a/core/assets/sprites/sprites_fallback4.png b/core/assets/sprites/sprites_fallback4.png index a61d5ee171..4e73438273 100644 Binary files a/core/assets/sprites/sprites_fallback4.png and b/core/assets/sprites/sprites_fallback4.png differ diff --git a/core/assets/sprites/sprites_fallback5.png b/core/assets/sprites/sprites_fallback5.png index 21c29e8f60..fd480e79e2 100644 Binary files a/core/assets/sprites/sprites_fallback5.png and b/core/assets/sprites/sprites_fallback5.png differ diff --git a/core/assets/sprites/sprites_fallback6.png b/core/assets/sprites/sprites_fallback6.png index 8762b3e5af..c1e2b62ee5 100644 Binary files a/core/assets/sprites/sprites_fallback6.png and b/core/assets/sprites/sprites_fallback6.png differ diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 98938213f9..adf1d74acf 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -384,7 +384,7 @@ public class Blocks implements ContentList{ darkMetal = new StaticWall("dark-metal"); - pebbles = new OverlayFloor("pebbles"); + pebbles = new DoubleOverlayFloor("pebbles"); tendrils = new OverlayFloor("tendrils"); diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java index 7f5cbaabb9..70b7835da7 100644 --- a/core/src/io/anuke/mindustry/content/Zones.java +++ b/core/src/io/anuke/mindustry/content/Zones.java @@ -19,7 +19,7 @@ public class Zones implements ContentList{ @Override public void load(){ - groundZero = new Zone("groundZero", new MapGenerator("groundZero", 1).decor(new Decoration(Blocks.snow, Blocks.snowrock, 0.01))){{ + groundZero = new Zone("groundZero", new MapGenerator("groundZero", 1)){{ baseLaunchCost = ItemStack.with(Items.copper, -100); startingItems = ItemStack.list(Items.copper, 100); alwaysUnlocked = true; diff --git a/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java b/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java index 9592edc538..a19157dbdb 100644 --- a/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java @@ -58,6 +58,10 @@ public class MapGenerator extends Generator{ return this; } + { + decor(new Decoration(Blocks.snow, Blocks.snowrock, 0.01), new Decoration(Blocks.ignarock, Blocks.pebbles, 0.03f)); + } + @Override public void init(Loadout loadout){ this.loadout = loadout; @@ -126,7 +130,9 @@ public class MapGenerator extends Generator{ if(tile.block() == Blocks.air && !(decor.wall instanceof Floor) && tile.floor() == decor.floor && Mathf.chance(decor.chance)){ tile.setBlock(decor.wall); - }else if(tile.floor() == decor.floor && decor.wall instanceof Floor && Mathf.chance(decor.chance)){ + }else if(tile.floor() == decor.floor && decor.wall.isOverlay() && Mathf.chance(decor.chance)){ + tile.setOverlay(decor.wall); + }else if(tile.floor() == decor.floor && decor.wall.isFloor() && !decor.wall.isOverlay() && Mathf.chance(decor.chance)){ tile.setFloor((Floor)decor.wall); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/DoubleOverlayFloor.java b/core/src/io/anuke/mindustry/world/blocks/DoubleOverlayFloor.java new file mode 100644 index 0000000000..7a0a26847d --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/DoubleOverlayFloor.java @@ -0,0 +1,20 @@ +package io.anuke.mindustry.world.blocks; + +import io.anuke.arc.graphics.g2d.Draw; +import io.anuke.arc.math.Mathf; +import io.anuke.mindustry.world.Tile; + +public class DoubleOverlayFloor extends OverlayFloor{ + + public DoubleOverlayFloor(String name){ + super(name); + } + + @Override + public void draw(Tile tile){ + Draw.colorl(0.4f); + Draw.rect(variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))], tile.worldx(), tile.worldy() - 0.75f); + Draw.color(); + Draw.rect(variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))], tile.worldx(), tile.worldy()); + } +}