mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-10 15:19:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

Red ice boulders

Browse Source
This commit is contained in:
Anuken 2022-01-19 18:54:15 -05:00
parent 9e1777f5cf
commit 4bee7e598b
7 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/props/crystal-blocks1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 261 B

BIN
core/assets-raw/sprites/blocks/props/red-ice-boulder1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 691 B

BIN
core/assets-raw/sprites/blocks/props/red-ice-boulder2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 656 B

BIN
core/assets-raw/sprites/blocks/props/red-ice-boulder3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 623 B

1
core/assets/icons/icons.properties
View File

@ -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

8
core/src/mindustry/content/Blocks.java
View File

@ -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);

10
core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
View File

@ -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)){