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

Mostly-complete cliff crusher implementation

Browse Source
This commit is contained in:
Anuken
2021-07-08 16:16:44 -04:00
parent bf89f7a0cc
commit 1baa82a7c6
8 changed files with 56 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -395,6 +395,7 @@ public class Blocks implements ContentList{
duneWall = new StaticWall("dune-wall"){{
basalt.asFloor().wall = darksandWater.asFloor().wall = darksandTaintedWater.asFloor().wall = this;
attributes.set(Attribute.silicate, 2f);
}};
regolithWall = new StaticWall("regolith-wall"){{
@@ -411,6 +412,7 @@ public class Blocks implements ContentList{
carbonWall = new StaticWall("carbon-wall"){{
carbonStone.asFloor().wall = this;
attributes.set(Attribute.silicate, 0.7f);
}};
ferricStoneWall = new StaticWall("ferric-stone-wall"){{
@@ -429,6 +431,7 @@ public class Blocks implements ContentList{
sandWall = new StaticWall("sand-wall"){{
sandWater.asFloor().wall = water.asFloor().wall = deepwater.asFloor().wall = this;
attributes.set(Attribute.silicate, 2f);
}};
saltWall = new StaticWall("salt-wall");
@@ -1515,8 +1518,9 @@ public class Blocks implements ContentList{
cliffCrusher = new WallCrafter("cliff-crusher"){{
requirements(Category.production, with(Items.copper, 10));
consumes.power(0.2f);
consumes.power(0.9f);
drillTime = 110f;
size = 2;
attribute = Attribute.silicate;
output = Items.sand;

7
core/src/mindustry/content/Fx.java
View File

@@ -1689,6 +1689,13 @@ public class Fx{
Lines.spikes(e.x, e.y, e.fin() * 5f, 2, 8);
}),
mineWallSmall = new Effect(50, e -> {
color(e.color, Color.darkGray, e.fin());
randLenVectors(e.id, 2, e.fin() * 6f, (x, y) -> {
Fill.circle(e.x + x, e.y + y, e.fout() + 0.5f);
});
}),
mineSmall = new Effect(30, e -> {
color(e.color, Color.lightGray, e.fin());
randLenVectors(e.id, 3, e.fin() * 5f, (x, y) -> {