Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Saner naming scheme of wall blocks

Browse Source
This commit is contained in:
Anuken
2020-09-10 12:09:25 -04:00
parent aec4a07aec
commit 0e61d61dd2
47 changed files with 7004 additions and 6641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,10 +34,10 @@ public class Blocks implements ContentList{
public static Block
//environment
air, spawn, cliff, deepwater, water, taintedWater, tar, slag, stone, craters, charr, sand, darksand, ice, snow, darksandTaintedWater,
holostone, rocks, sporerocks, icerocks, cliffs, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster,
iceSnow, sandWater, darksandWater, duneRocks, sandRocks, moss, sporeMoss, shale, shaleRocks, shaleBoulder, sandBoulder, grass, salt,
metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor5, ignarock, magmarock, hotrock, snowrocks, rock, snowrock, saltRocks,
air, spawn, cliff, deepwater, water, taintedWater, tar, slag, stone, craters, charr, sand, darksand, dirt, ice, snow, darksandTaintedWater,
holostone, stoneWall, dirtWall, sporeWall, iceWall, cliffs, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster,
iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, shaleBoulder, sandBoulder, grass, salt,
metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor5, ignarock, magmarock, hotrock, snowWall, rock, snowrock, saltWall,
darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal,
pebbles, tendrils,
@@ -258,6 +258,8 @@ public class Blocks implements ContentList{
attributes.set(Attribute.oil, 1.5f);
}};
dirt = new Floor("dirt");
((ShallowLiquid)darksandTaintedWater).set(Blocks.taintedWater, Blocks.darksand);
((ShallowLiquid)sandWater).set(Blocks.water, Blocks.sand);
((ShallowLiquid)darksandWater).set(Blocks.water, Blocks.darksand);
@@ -295,11 +297,11 @@ public class Blocks implements ContentList{
fillsTile = false;
}};
rocks = new StaticWall("rocks"){{
stoneWall = new StaticWall("stone-wall"){{
variants = 2;
}};
sporerocks = new StaticWall("sporerocks"){{
sporeWall = new StaticWall("spore-wall"){{
variants = 2;
}};
@@ -311,25 +313,29 @@ public class Blocks implements ContentList{
variants = 2;
}};
icerocks = new StaticWall("icerocks"){{
dirtWall = new StaticWall("dirt-wall"){{
variants = 2;
}};
iceWall = new StaticWall("ice-wall"){{
variants = 2;
iceSnow.asFloor().wall = this;
}};
snowrocks = new StaticWall("snowrocks"){{
snowWall = new StaticWall("snow-wall"){{
variants = 2;
}};
duneRocks = new StaticWall("dunerocks"){{
duneWall = new StaticWall("dune-wall"){{
variants = 2;
ignarock.asFloor().wall = this;
}};
sandRocks = new StaticWall("sandrocks"){{
sandWall = new StaticWall("sand-wall"){{
variants = 2;
}};
saltRocks = new StaticWall("saltrocks");
saltWall = new StaticWall("salt-wall");
sporePine = new StaticTree("spore-pine"){{
variants = 0;
@@ -358,7 +364,7 @@ public class Blocks implements ContentList{
attributes.set(Attribute.oil, 1f);
}};
shaleRocks = new StaticWall("shalerocks"){{
shaleWall = new StaticWall("shale-wall"){{
variants = 2;
}};
@@ -379,7 +385,7 @@ public class Blocks implements ContentList{
sporeMoss = new Floor("spore-moss"){{
variants = 3;
attributes.set(Attribute.spores, 0.3f);
wall = sporerocks;
wall = sporeWall;
}};
metalFloor = new Floor("metal-floor"){{

26
core/src/mindustry/graphics/MenuRenderer.java
View File

@@ -50,21 +50,21 @@ public class MenuRenderer implements Disposable{
Simplex s3 = new Simplex(offset + 2);
RidgedPerlin rid = new RidgedPerlin(1 + offset, 1);
Block[] selected = Structs.select(
new Block[]{Blocks.sand, Blocks.sandRocks},
new Block[]{Blocks.shale, Blocks.shaleRocks},
new Block[]{Blocks.ice, Blocks.icerocks},
new Block[]{Blocks.sand, Blocks.sandRocks},
new Block[]{Blocks.shale, Blocks.shaleRocks},
new Block[]{Blocks.ice, Blocks.icerocks},
new Block[]{Blocks.sand, Blocks.sandWall},
new Block[]{Blocks.shale, Blocks.shaleWall},
new Block[]{Blocks.ice, Blocks.iceWall},
new Block[]{Blocks.sand, Blocks.sandWall},
new Block[]{Blocks.shale, Blocks.shaleWall},
new Block[]{Blocks.ice, Blocks.iceWall},
new Block[]{Blocks.moss, Blocks.sporePine}
);
Block[] selected2 = Structs.select(
new Block[]{Blocks.ignarock, Blocks.duneRocks},
new Block[]{Blocks.ignarock, Blocks.duneRocks},
new Block[]{Blocks.stone, Blocks.rocks},
new Block[]{Blocks.stone, Blocks.rocks},
new Block[]{Blocks.moss, Blocks.sporerocks},
new Block[]{Blocks.salt, Blocks.saltRocks}
new Block[]{Blocks.ignarock, Blocks.duneWall},
new Block[]{Blocks.ignarock, Blocks.duneWall},
new Block[]{Blocks.stone, Blocks.stoneWall},
new Block[]{Blocks.stone, Blocks.stoneWall},
new Block[]{Blocks.moss, Blocks.sporeWall},
new Block[]{Blocks.salt, Blocks.saltWall}
);
Block ore1 = ores.random();
@@ -146,7 +146,7 @@ public class MenuRenderer implements Disposable{
floor = Mathf.chance(0.2) ? Blocks.sporeMoss : Blocks.moss;
if(wall != Blocks.air){
wall = Blocks.sporerocks;
wall = Blocks.sporeWall;
}
}
}

12
core/src/mindustry/io/SaveFileReader.java
View File

@@ -32,7 +32,17 @@ public abstract class SaveFileReader{
"mass-conveyor", "payload-conveyor",
"vestige", "scepter",
"turbine-generator", "steam-generator"
"turbine-generator", "steam-generator",
"rocks", "stone-wall",
"sporerocks", "spore-wall",
"icerocks", "ice-wall",
"dunerocks", "dune-wall",
"sandrocks", "sand-wall",
"shalerocks", "shale-wall",
"snowrocks", "snow-wall",
"saltrocks", "salt-wall",
"dirtwall", "dirt-wall"
);
protected final ReusableByteOutStream byteOutput = new ReusableByteOutStream();

2
core/src/mindustry/maps/filters/NoiseFilter.java
View File

@@ -11,7 +11,7 @@ import static mindustry.maps.filters.FilterOption.wallsOnly;
public class NoiseFilter extends GenerateFilter{
float scl = 40, threshold = 0.5f, octaves = 3f, falloff = 0.5f;
Block floor = Blocks.stone, block = Blocks.rocks;
Block floor = Blocks.stone, block = Blocks.stoneWall;
@Override
public FilterOption[] options(){

2
core/src/mindustry/maps/filters/RiverNoiseFilter.java
View File

@@ -11,7 +11,7 @@ import static mindustry.maps.filters.FilterOption.wallsOnly;
public class RiverNoiseFilter extends GenerateFilter{
float scl = 40, threshold = 0f, threshold2 = 0.1f;
Block floor = Blocks.water, floor2 = Blocks.deepwater, block = Blocks.sandRocks;
Block floor = Blocks.water, floor2 = Blocks.deepwater, block = Blocks.sandWall;
@Override
public FilterOption[] options(){

2
core/src/mindustry/maps/filters/TerrainFilter.java
View File

@@ -12,7 +12,7 @@ import static mindustry.maps.filters.FilterOption.wallsOnly;
public class TerrainFilter extends GenerateFilter{
float scl = 40, threshold = 0.9f, octaves = 3f, falloff = 0.5f, magnitude = 1f, circleScl = 2.1f;
Block floor = Blocks.stone, block = Blocks.rocks;
Block floor = Blocks.stone, block = Blocks.stoneWall;
@Override
public FilterOption[] options(){