diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-7-autotile.aseprite b/core/assets-raw/sprites/blocks/environment/crux-floor-7-autotile.aseprite new file mode 100644 index 0000000000..de23d4ea85 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crux-floor-7-autotile.aseprite differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-7-autotile.png b/core/assets-raw/sprites/blocks/environment/crux-floor-7-autotile.png new file mode 100644 index 0000000000..eba9b8cb2b Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crux-floor-7-autotile.png differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index c3f4c0a6cc..594c419296 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -607,3 +607,4 @@ 63075=colored-floor|block-colored-floor-ui 63074=crux-floor-5|block-crux-floor-5-ui 63073=crux-floor-6|block-crux-floor-6-ui +63072=crux-floor-7|block-crux-floor-7-ui diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 483b750426..7c68a43226 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -11,6 +11,7 @@ import mindustry.entities.effect.*; import mindustry.entities.part.DrawPart.*; import mindustry.entities.part.*; import mindustry.entities.pattern.*; +import mindustry.game.*; import mindustry.gen.*; import mindustry.graphics.*; import mindustry.type.*; @@ -58,7 +59,7 @@ public class Blocks{ shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, yellowStoneBoulder, arkyicBoulder, crystalCluster, vibrantCrystalCluster, crystalBlocks, crystalOrbs, crystallineBoulder, redIceBoulder, rhyoliteBoulder, redStoneBoulder, metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall, - darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal, cruxFloor1, cruxFloor2, cruxFloor3, cruxFloor4, cruxFloor5, cruxFloor6, coloredFloor, + darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal, cruxFloor1, cruxFloor2, cruxFloor3, cruxFloor4, cruxFloor5, cruxFloor6, cruxFloor7, coloredFloor, pebbles, tendrils, //ores @@ -811,16 +812,12 @@ public class Blocks{ cruxFloor1 = new Floor("crux-floor-1"){{ autotile = true; - emitLight = true; drawEdgeOut = false; drawEdgeIn = false; }}; cruxFloor2 = new Floor("crux-floor-2"){{ autotile = true; - //emitLight = true; - //lightRadius = 30f; - //lightColor = Team.crux.color.cpy().a(0.3f); drawEdgeOut = false; drawEdgeIn = false; }}; @@ -847,6 +844,16 @@ public class Blocks{ autotile = true; drawEdgeOut = false; drawEdgeIn = false; + + emitLight = true; + lightRadius = 30f; + lightColor = Team.crux.color.cpy().a(0.3f); + }}; + + cruxFloor7 = new Floor("crux-floor-7"){{ + autotile = true; + drawEdgeOut = false; + drawEdgeIn = false; }}; coloredFloor = new ColoredFloor("colored-floor"){{ diff --git a/gradle.properties b/gradle.properties index 543e664edd..5e1d3a2b35 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,4 +26,4 @@ org.gradle.caching=true org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 android.enableR8.fullMode=false -archash=bd8d9520a4 +archash=ae3b50eaca