This commit is contained in:
Anuken
2020-02-20 10:34:17 -05:00
parent 1d1c73fd6f
commit 97f342aceb
6 changed files with 15 additions and 10 deletions

View File

@@ -96,7 +96,7 @@ public class NetClient implements ApplicationListener{
state.set(State.menu);
logic.reset();
platform.updateRPC();
player.name = Core.settings.getString("name");
player.name(Core.settings.getString("name"));
if(quiet) return;

View File

@@ -129,7 +129,6 @@ public class Saves{
}
slot.save();
lastSectorSave = slot;
Log.info("Saving " + slot.getName());
Core.settings.putSave("last-sector-save", slot.getName());
}

View File

@@ -8,7 +8,7 @@ import arc.util.*;
import arc.util.noise.*;
import mindustry.*;
import mindustry.content.*;
import mindustry.game.*;
import mindustry.maps.zonegen.*;
import mindustry.type.*;
import mindustry.world.*;
@@ -120,7 +120,10 @@ public class TestPlanetGenerator implements PlanetGenerator{
tiles.each((x, y) -> tiles.get(x, y).setBlock(!read.get(x, y) ? Blocks.air : tiles.get(x, y).floor().wall));
distort(0.009f, 12f);
tiles.get(tiles.width /2, tiles.height /2).setBlock(Blocks.coreShard, Team.sharded);
OvergrowthGenerator gen = new OvergrowthGenerator(tiles.width, tiles.height);
gen.decorate(tiles);
//tiles.get(tiles.width /2, tiles.height /2).setBlock(Blocks.coreShard, Team.sharded);
}
void distort(float scl, float mag){

View File

@@ -23,10 +23,12 @@ public class OvergrowthGenerator extends BasicGenerator{
ores(tiles);
//terrain(tiles, Blocks.sporePine, 70f, 1.4f, 1f);
int rand = 40;
int border = 25;
int spawnX = Mathf.clamp(30 + Mathf.range(rand), border, width - border), spawnY = Mathf.clamp(30 + Mathf.range(rand), border, height - border);
int endX = Mathf.clamp(width - 30 + Mathf.range(rand), border, width - border), endY = Mathf.clamp(height - 30 + Mathf.range(rand), border, height - border);
//int rand = 40;
//int border = 25;
//int spawnX = Mathf.clamp(30 + Mathf.range(rand), border, width - border), spawnY = Mathf.clamp(30 + Mathf.range(rand), border, height - border);
//int endX = Mathf.clamp(width - 30 + Mathf.range(rand), border, width - border), endY = Mathf.clamp(height - 30 + Mathf.range(rand), border, height - border);
int radius = (int)(width / 2 / Mathf.sqrt3);
brush(tiles, pathfind(tiles, spawnX, spawnY, endX, endY, tile -> (tile.solid() ? 5f : 0f) + (float)sim.octaveNoise2D(1, 1, 1f / 50f, tile.x, tile.y) * 50, manhattan), 6);
brush(tiles, pathfind(tiles, spawnX, spawnY, endX, endY, tile -> (tile.solid() ? 4f : 0f) + (float)sim.octaveNoise2D(1, 1, 1f / 90f, tile.x+999, tile.y) * 70, manhattan), 5);
@@ -40,6 +42,7 @@ public class OvergrowthGenerator extends BasicGenerator{
//scatter(tiles, Blocks.sporePine, Blocks.whiteTreeDead, 1f);
tiles.getn(endX, endY).setOverlay(Blocks.spawn);
loadout = Loadouts.advancedShard;
schematics.placeLoadout(loadout, spawnX, spawnY);
}
}

View File

@@ -110,7 +110,7 @@ public class SolidPump extends Pump{
tile.entity.liquids().add(result, maxPump);
entity.lastPump = maxPump;
entity.warmup = Mathf.lerpDelta(entity.warmup, 1f, 0.02f);
if(tile.entity.timer.get(timerContentCheck, 10)) useContent(tile, result);
if(tile.entity.timer(timerContentCheck, 10)) useContent(tile, result);
if(Mathf.chance(entity.delta() * updateEffectChance))
updateEffect.at(entity.getX() + Mathf.range(size * 2f), entity.getY() + Mathf.range(size * 2f));
}else{