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

fixBundles -> updateBundles

Browse Source
This commit is contained in:
Anuken
2018-07-20 20:35:53 -04:00
parent dbb2371801
commit fbcfb23676
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java
View File

@@ -224,7 +224,7 @@ public class WorldGenerator{
double ridge = Mathf.clamp(rid.getValue(x, y, 1f / 400f))/3f; double ridge = Mathf.clamp(rid.getValue(x, y, 1f / 400f))/3f;
double elevation = sim.octaveNoise2D(detailed ? 7 : 2, 0.5, 1f / 500, x, y) * 5.1 - 1 - ridge; double elevation = sim.octaveNoise2D(detailed ? 7 : 2, 0.5, 1f / 500, x, y) * 5.1 - 1 - ridge;
double temp = sim3.octaveNoise2D(detailed ? 2 : 0, 1, 1f / 13f, x, y)/13f + sim3.octaveNoise2D(detailed ? 12 : 6, 0.6, 1f / 620f, x, y) - ridge; double temp = sim3.octaveNoise2D(detailed ? 2 : 1, 1, 1f / 13f, x, y)/13f + sim3.octaveNoise2D(detailed ? 12 : 6, 0.6, 1f / 620f, x, y) - ridge;
double r = sim2.octaveNoise2D(1, 0.6, 1f / 70, x, y); double r = sim2.octaveNoise2D(1, 0.6, 1f / 70, x, y);
double edgeDist = Math.max(sectorSize / 2, sectorSize / 2) - Math.max(Math.abs(x - sectorSize / 2), Math.abs(y - sectorSize / 2)); double edgeDist = Math.max(sectorSize / 2, sectorSize / 2) - Math.max(Math.abs(x - sectorSize / 2), Math.abs(y - sectorSize / 2));

2
packer/build.gradle
View File

@@ -44,7 +44,7 @@ task generateSprites(dependsOn: classes, type: JavaExec) {
workingDir = textureFolder workingDir = textureFolder
} }
task fixBundles(dependsOn: classes, type: JavaExec) { task updateBundles(dependsOn: classes, type: JavaExec) {
file(textureFolder).mkdirs() file(textureFolder).mkdirs()
main = "io.anuke.mindustry.BundleLauncher" main = "io.anuke.mindustry.BundleLauncher"