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

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source
This commit is contained in:
Anuken
2021-09-16 10:23:31 -04:00
parent e86171e3c7 845b64945e
commit a8fd047cd6
12 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,7 +141,7 @@ public class Blocks implements ContentList{
statusDuration = 120f;
drownTime = 200f;
cacheLayer = CacheLayer.water;
albedo = 0.5f;
albedo = 0.9f;
}};
water = new Floor("shallow-water"){{
@@ -152,7 +152,7 @@ public class Blocks implements ContentList{
liquidDrop = Liquids.water;
isLiquid = true;
cacheLayer = CacheLayer.water;
albedo = 0.5f;
albedo = 0.9f;
}};
taintedWater = new Floor("tainted-water"){{
@@ -163,7 +163,7 @@ public class Blocks implements ContentList{
liquidDrop = Liquids.water;
isLiquid = true;
cacheLayer = CacheLayer.water;
albedo = 0.5f;
albedo = 0.9f;
attributes.set(Attribute.spores, 0.15f);
}};
@@ -176,27 +176,27 @@ public class Blocks implements ContentList{
liquidDrop = Liquids.water;
isLiquid = true;
cacheLayer = CacheLayer.water;
albedo = 0.5f;
albedo = 0.9f;
attributes.set(Attribute.spores, 0.15f);
}};
darksandTaintedWater = new ShallowLiquid("darksand-tainted-water"){{
speedMultiplier = 0.75f;
statusDuration = 60f;
albedo = 0.5f;
albedo = 0.9f;
attributes.set(Attribute.spores, 0.1f);
}};
sandWater = new ShallowLiquid("sand-water"){{
speedMultiplier = 0.8f;
statusDuration = 50f;
albedo = 0.5f;
albedo = 0.9f;
}};
darksandWater = new ShallowLiquid("darksand-water"){{
speedMultiplier = 0.8f;
statusDuration = 50f;
albedo = 0.5f;
albedo = 0.9f;
}};
tar = new Floor("tar"){{
@@ -289,7 +289,6 @@ public class Blocks implements ContentList{
statusDuration = 30f;
attributes.set(Attribute.water, 1f);
cacheLayer = CacheLayer.mud;
albedo = 0.35f;
walkSound = Sounds.mud;
walkSoundVolume = 0.08f;
walkSoundPitchMin = 0.4f;
@@ -361,18 +360,21 @@ public class Blocks implements ContentList{
snow = new Floor("snow"){{
attributes.set(Attribute.water, 0.2f);
albedo = 0.7f;
}};
ice = new Floor("ice"){{
dragMultiplier = 0.35f;
speedMultiplier = 0.9f;
attributes.set(Attribute.water, 0.4f);
albedo = 0.65f;
}};
iceSnow = new Floor("ice-snow"){{
dragMultiplier = 0.6f;
variants = 3;
attributes.set(Attribute.water, 0.3f);
albedo = 0.6f;
}};
shale = new Floor("shale"){{

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

@@ -1910,7 +1910,7 @@ public class Fx{
color(e.color);
stroke(3f * e.fout());
Lines.poly(e.x, e.y, 6, e.rotation + e.fin());
}),
}).followParent(true),
coreLandDust = new Effect(100f, e -> {
color(e.color, e.fout(0.1f));