diff --git a/core/assets-raw/sprites_replacement/blocks/environment/dark-metal-large.png b/core/assets-raw/sprites_replacement/blocks/environment/dark-metal-large.png new file mode 100644 index 0000000000..2b30255f53 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/dark-metal-large.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/dark-metal1.png b/core/assets-raw/sprites_replacement/blocks/environment/dark-metal1.png new file mode 100644 index 0000000000..907b253157 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/dark-metal1.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/dark-metal2.png b/core/assets-raw/sprites_replacement/blocks/environment/dark-metal2.png new file mode 100644 index 0000000000..3eb3558f6c Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/dark-metal2.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-1.png b/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-1.png new file mode 100644 index 0000000000..3035832574 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-1.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-2.png b/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-2.png new file mode 100644 index 0000000000..cead3de9bc Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-2.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-3.png b/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-3.png new file mode 100644 index 0000000000..bf321e76a6 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-3.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-4.png b/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-4.png new file mode 100644 index 0000000000..0a76f30595 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-4.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-5.png b/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-5.png new file mode 100644 index 0000000000..3f3c511fe4 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-5.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-6.png b/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-6.png new file mode 100644 index 0000000000..6ff46b0373 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/dark-panel-6.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/darksand1.png b/core/assets-raw/sprites_replacement/blocks/environment/darksand1.png new file mode 100644 index 0000000000..0478f5a78d Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/darksand1.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/darksand2.png b/core/assets-raw/sprites_replacement/blocks/environment/darksand2.png new file mode 100644 index 0000000000..005403b028 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/darksand2.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/darksand3.png b/core/assets-raw/sprites_replacement/blocks/environment/darksand3.png new file mode 100644 index 0000000000..f6e829199b Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/darksand3.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/hotrock1.png b/core/assets-raw/sprites_replacement/blocks/environment/hotrock1.png new file mode 100644 index 0000000000..d331a9b07c Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/hotrock1.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/hotrock2.png b/core/assets-raw/sprites_replacement/blocks/environment/hotrock2.png new file mode 100644 index 0000000000..5bfe3110eb Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/hotrock2.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/hotrock3.png b/core/assets-raw/sprites_replacement/blocks/environment/hotrock3.png new file mode 100644 index 0000000000..1d37b221a3 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/hotrock3.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/ignarock1.png b/core/assets-raw/sprites_replacement/blocks/environment/ignarock1.png new file mode 100644 index 0000000000..fff2086d21 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/ignarock1.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/ignarock2.png b/core/assets-raw/sprites_replacement/blocks/environment/ignarock2.png new file mode 100644 index 0000000000..da2c7412b7 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/ignarock2.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/ignarock3.png b/core/assets-raw/sprites_replacement/blocks/environment/ignarock3.png new file mode 100644 index 0000000000..e303b57082 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/ignarock3.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/magmarock1.png b/core/assets-raw/sprites_replacement/blocks/environment/magmarock1.png new file mode 100644 index 0000000000..a25af14de1 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/magmarock1.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/magmarock2.png b/core/assets-raw/sprites_replacement/blocks/environment/magmarock2.png new file mode 100644 index 0000000000..7360fb1690 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/magmarock2.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/magmarock3.png b/core/assets-raw/sprites_replacement/blocks/environment/magmarock3.png new file mode 100644 index 0000000000..7516823fc6 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/magmarock3.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/sand1.png b/core/assets-raw/sprites_replacement/blocks/environment/sand1.png new file mode 100644 index 0000000000..ae4fe3c363 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/sand1.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/sand2.png b/core/assets-raw/sprites_replacement/blocks/environment/sand2.png new file mode 100644 index 0000000000..e2544c1e42 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/sand2.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/sand3.png b/core/assets-raw/sprites_replacement/blocks/environment/sand3.png new file mode 100644 index 0000000000..b03562c494 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/sand3.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/shale1.png b/core/assets-raw/sprites_replacement/blocks/environment/shale1.png new file mode 100644 index 0000000000..6f242df279 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/shale1.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/shale2.png b/core/assets-raw/sprites_replacement/blocks/environment/shale2.png new file mode 100644 index 0000000000..2edf629f90 Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/shale2.png differ diff --git a/core/assets-raw/sprites_replacement/blocks/environment/shale3.png b/core/assets-raw/sprites_replacement/blocks/environment/shale3.png new file mode 100644 index 0000000000..95382a191c Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/shale3.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index d8e89c826d..38918a8a92 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -661,6 +661,14 @@ block.metal-floor-2.name = Metal Floor 2 block.metal-floor-3.name = Metal Floor 3 block.metal-floor-5.name = Metal Floor 4 block.metal-floor-damaged.name = Metal Floor Damaged +block.creeptree.name = Creeptree +block.dark-panel-1.name = Dark Panel 1 +block.dark-panel-2.name = Dark Panel 2 +block.dark-panel-3.name = Dark Panel 3 +block.dark-panel-4.name = Dark Panel 4 +block.dark-panel-5.name = Dark Panel 5 +block.dark-panel-6.name = Dark Panel 6 +block.dark-metal.name = Dark Metal block.ignarock.name = Igna Rock block.hotrock.name = Hot Rock block.magmarock.name = Magma Rock diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index 22e37a96e5..abe6fcb69c 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 e8515e12a3..5761887a7b 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 0642f6a587..986bb90541 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 b2f25402db..619c621226 100644 Binary files a/core/assets/sprites/sprites3.png and b/core/assets/sprites/sprites3.png differ diff --git a/core/assets/sprites/sprites_fallback3.png b/core/assets/sprites/sprites_fallback3.png index 2ce1c63240..b100062e96 100644 Binary files a/core/assets/sprites/sprites_fallback3.png and b/core/assets/sprites/sprites_fallback3.png differ diff --git a/core/assets/sprites/sprites_fallback4.png b/core/assets/sprites/sprites_fallback4.png index ae683761fe..82b359b1c3 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_fallback6.png b/core/assets/sprites/sprites_fallback6.png index b083c9d780..91330d4d02 100644 Binary files a/core/assets/sprites/sprites_fallback6.png and b/core/assets/sprites/sprites_fallback6.png differ diff --git a/core/assets/sprites/sprites_fallback7.png b/core/assets/sprites/sprites_fallback7.png index f66b40db60..d0c3f67f9b 100644 Binary files a/core/assets/sprites/sprites_fallback7.png and b/core/assets/sprites/sprites_fallback7.png differ diff --git a/core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java b/core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java index 8faa4d4289..24cc5bcaf7 100644 --- a/core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java @@ -89,7 +89,7 @@ public abstract class BasicGenerator extends RandomGenerator{ if(Mathf.chance(noise(x + 0x231523, y, 40f, 1f))){ floor = Structs.random(blocks); if(Mathf.dst(mx, my, secSize/2, secSize/2) > secSize/2f + 2){ - floor = Blocks.darkPanel5; + floor = Blocks.darkPanel4; } }