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

Rollback

Browse Source
This commit is contained in:
Skat
2020-11-07 19:46:37 +03:00
parent f8914d0543
commit 9f979cba0d
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/core/Control.java
View File

@@ -186,7 +186,7 @@ public class Control implements ApplicationListener, Loadable{
if(state.isCampaign()){ if(state.isCampaign()){
ui.announce("[accent]" + state.rules.sector.name() + "\n" + ui.announce("[accent]" + state.rules.sector.name() + "\n" +
(state.rules.sector.info.resources.any() ? "[lightgray]" + bundle.get("sectors.resources") + "[white] " + (state.rules.sector.info.resources.any() ? "[lightgray]" + bundle.get("sectors.resources") + "[white] " +
state.rules.sector.info.resources.toString(" ", UnlockableContent::emoji) : ""), 5); state.rules.sector.info.resources.toString(" ", u -> u.emoji()) : ""), 5);
} }
}); });
}); });

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

@@ -42,7 +42,7 @@ public class MenuRenderer implements Disposable{
private void generate(){ private void generate(){
world.beginMapLoad(); world.beginMapLoad();
Tiles tiles = world.resize(width, height); Tiles tiles = world.resize(width, height);
Seq<Block> ores = content.blocks().select(OreBlock.class::isInstance); Seq<Block> ores = content.blocks().select(b -> b instanceof OreBlock);
shadows = new FrameBuffer(width, height); shadows = new FrameBuffer(width, height);
int offset = Mathf.random(100000); int offset = Mathf.random(100000);
Simplex s1 = new Simplex(offset); Simplex s1 = new Simplex(offset);

4
core/src/mindustry/logic/LogicOp.java
View File

@@ -4,7 +4,7 @@ import arc.math.*;
import arc.util.*; import arc.util.*;
public enum LogicOp{ public enum LogicOp{
add("+", Double::sum), add("+", (a, b) -> a + b),
sub("-", (a, b) -> a - b), sub("-", (a, b) -> a - b),
mul("*", (a, b) -> a * b), mul("*", (a, b) -> a * b),
div("/", (a, b) -> a / b), div("/", (a, b) -> a / b),
@@ -29,7 +29,7 @@ public enum LogicOp{
noise("noise", LExecutor.noise::rawNoise2D), noise("noise", LExecutor.noise::rawNoise2D),
not("not", a -> ~(long)(a)), not("not", a -> ~(long)(a)),
abs("abs", Math::abs), abs("abs", a -> Math.abs(a)),
log("log", Math::log), log("log", Math::log),
log10("log10", Math::log10), log10("log10", Math::log10),
sin("sin", d -> Math.sin(d * 0.017453292519943295D)), sin("sin", d -> Math.sin(d * 0.017453292519943295D)),