mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-09 10:18:40 +07:00
Code Issues Packages Projects Releases Wiki Activity

Generation tweaks

Browse Source
This commit is contained in:
Anuken 2022-01-20 15:19:03 -05:00
parent 1f2fa331ce
commit 0e790e61f2
6 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/environment/yellow-stone-plates1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 307 B

BIN
core/assets-raw/sprites/blocks/environment/yellow-stone-plates2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 285 B

BIN
core/assets-raw/sprites/blocks/environment/yellow-stone-plates3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 296 B

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

@ -508,3 +508,4 @@
63196=vibrant-crystal-cluster|block-vibrant-crystal-cluster-ui
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

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

@ -46,7 +46,7 @@ public class Blocks{
stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster,
redweed, purbush, coralChunk, yellowCoral,
regolithWall, yellowStoneWall, rhyoliteWall, steamVent, carbonWall, redIceWall, ferricStoneWall, beryllicStoneWall, arkyicWall, crystallineStoneWall,
ferricStone, ferricCraters, carbonStone, beryllicStone, crystallineStone, crystalFloor,
ferricStone, ferricCraters, carbonStone, beryllicStone, crystallineStone, crystalFloor, yellowStonePlates,
iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, grass, salt,
//boulders
shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, yellowStoneBoulder,
@ -407,6 +407,10 @@ public class Blocks{
variants = 4;
}};
yellowStonePlates = new Floor("yellow-stone-plates"){{
variants = 3;
}};
redIce = new Floor("red-ice"){{
//TODO red ice boulder
dragMultiplier = 0.4f;
@ -510,7 +514,7 @@ public class Blocks{
}};
yellowStoneWall = new StaticWall("yellow-stone-wall"){{
yellowStone.asFloor().wall = slag.asFloor().wall = this;
yellowStone.asFloor().wall = slag.asFloor().wall = yellowStonePlates.asFloor().wall = this;
attributes.set(Attribute.silicate, 1.5f);
}};
@ -647,7 +651,7 @@ public class Blocks{
yellowStoneBoulder = new Prop("yellow-stone-boulder"){{
variants = 2;
yellowStone.asFloor().decoration = regolith.asFloor().decoration = this;
yellowStone.asFloor().decoration = regolith.asFloor().decoration = yellowStonePlates.asFloor().decoration = this;
}};
//1px outline + 4.50 gaussian shadow in gimp

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

@ -24,9 +24,9 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
public float heightScl = 0.9f, octaves = 8, persistence = 0.7f, heightPow = 3f, heightMult = 1.6f;
Block[][] arr = {
//{Blocks.regolith, Blocks.regolith, Blocks.yellowStone, Blocks.rhyolite, Blocks.basalt}
{Blocks.regolith, Blocks.regolith, Blocks.yellowStone, Blocks.rhyolite, Blocks.carbonStone}
//TODO basalt bad
{Blocks.regolith, Blocks.regolith, Blocks.beryllicStone, Blocks.crystallineStone, Blocks.basalt}
//{Blocks.regolith, Blocks.regolith, Blocks.yellowStone, Blocks.crystallineStone, Blocks.carbonStone}
};
@Override
@ -155,7 +155,11 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
blend(Blocks.arkyciteFloor, Blocks.arkyicStone, 4);
//TODO may overwrite floor blocks under walls and look bad
blend(Blocks.slag, Blocks.yellowStonePlates, 4);
distort(10f, 12f);
distort(5f, 7f);
//does arkycite need smoothing?
@ -178,6 +182,9 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
if(block == Blocks.air) block = Blocks.yellowStoneWall;
}
if(floor == Blocks.yellowStonePlates && noise(x + 78 + y, y, 3, 0.8f, 8f, 1f) > 0.38f){
floor = Blocks.yellowStone;
}
});
inverseFloodFill(tiles.getn(spawnX, spawnY));