Removed sector data cache system

This commit is contained in:
Anuken
2020-09-16 18:38:23 -04:00
parent 030542890e
commit bdf814c9b9
14 changed files with 134 additions and 356 deletions
@@ -3,7 +3,6 @@ package mindustry.maps.generators;
import arc.math.*;
import arc.math.geom.*;
import mindustry.content.*;
import mindustry.ctype.*;
import mindustry.game.*;
import mindustry.io.*;
import mindustry.maps.*;
@@ -29,12 +28,13 @@ public class FileMapGenerator implements WorldGenerator{
world.setGenerating(true);
tiles = world.tiles;
Item[] items = {Items.blastCompound, Items.pyratite, Items.copper, Items.thorium, Items.copper, Items.lead};
for(Tile tile : tiles){
if(tile.block() instanceof StorageBlock && !(tile.block() instanceof CoreBlock) && state.hasSector()){
for(Content content : state.getSector().data.resources){
if(content instanceof Item && Mathf.chance(0.3)){
tile.build.items.add((Item)content, Math.min(Mathf.random(500), tile.block().itemCapacity));
for(Item content : items){
if(Mathf.chance(0.2)){
tile.build.items.add(content, Math.min(Mathf.random(500), tile.block().itemCapacity));
}
}
}
@@ -5,7 +5,6 @@ import arc.util.noise.*;
import mindustry.graphics.g3d.*;
import mindustry.graphics.g3d.PlanetGrid.*;
import mindustry.type.*;
import mindustry.type.Sector.*;
import mindustry.world.*;
public abstract class PlanetGenerator extends BasicGenerator implements HexMesher{
@@ -24,7 +23,7 @@ public abstract class PlanetGenerator extends BasicGenerator implements HexMeshe
if(noise < 0.15){
for(Ptile other : tile.tiles){
if(sector.planet.getSector(other).is(SectorAttribute.base)){
if(sector.planet.getSector(other).generateEnemyBase){
any = false;
break;
}
@@ -32,7 +31,7 @@ public abstract class PlanetGenerator extends BasicGenerator implements HexMeshe
}
if(any){
sector.data.attributes |= (1 << SectorAttribute.base.ordinal());
sector.generateEnemyBase = true;
}
}