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

Replaced 'loadout' class with schematics / Small sound tweaks

Browse Source
This commit is contained in:
Anuken
2019-11-03 22:15:05 -05:00
parent 08d0a7ada7
commit 08b730a349
16 changed files with 115 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/io/anuke/mindustry/maps/generators/Generator.java
View File

@@ -1,11 +1,11 @@
package io.anuke.mindustry.maps.generators;
import io.anuke.mindustry.type.Loadout;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.game.*;
import io.anuke.mindustry.world.*;
public abstract class Generator{
public int width, height;
protected Loadout loadout;
protected Schematic loadout;
public Generator(int width, int height){
this.width = width;
@@ -15,7 +15,7 @@ public abstract class Generator{
public Generator(){
}
public void init(Loadout loadout){
public void init(Schematic loadout){
this.loadout = loadout;
}

5
core/src/io/anuke/mindustry/maps/generators/MapGenerator.java
View File

@@ -5,6 +5,7 @@ import io.anuke.arc.math.*;
import io.anuke.arc.math.geom.*;
import io.anuke.arc.util.*;
import io.anuke.mindustry.content.*;
import io.anuke.mindustry.game.*;
import io.anuke.mindustry.io.*;
import io.anuke.mindustry.maps.*;
import io.anuke.mindustry.type.*;
@@ -52,7 +53,7 @@ public class MapGenerator extends Generator{
}
@Override
public void init(Loadout loadout){
public void init(Schematic loadout){
this.loadout = loadout;
map = maps.loadInternalMap(mapName);
width = map.width;
@@ -149,7 +150,7 @@ public class MapGenerator extends Generator{
throw new IllegalArgumentException("All zone maps must have a core.");
}
loadout.setup(core.x, core.y);
schematics.placeLoadout(loadout, core.x, core.y);
world.prepareTiles(tiles);
world.setMap(map);

4
core/src/io/anuke/mindustry/maps/zonegen/DesertWastesGenerator.java
View File

@@ -5,6 +5,8 @@ import io.anuke.mindustry.content.Blocks;
import io.anuke.mindustry.maps.generators.BasicGenerator;
import io.anuke.mindustry.world.Tile;
import static io.anuke.mindustry.Vars.schematics;
public class DesertWastesGenerator extends BasicGenerator{
public DesertWastesGenerator(int width, int height){
@@ -42,6 +44,6 @@ public class DesertWastesGenerator extends BasicGenerator{
//scatter(tiles, Blocks.sandRocks, Blocks.creeptree, 1f);
tiles[endX][endY].setOverlay(Blocks.spawn);
loadout.setup(spawnX, spawnY);
schematics.placeLoadout(loadout, spawnX, spawnY);
}
}

4
core/src/io/anuke/mindustry/maps/zonegen/OvergrowthGenerator.java
View File

@@ -5,6 +5,8 @@ import io.anuke.mindustry.content.Blocks;
import io.anuke.mindustry.maps.generators.BasicGenerator;
import io.anuke.mindustry.world.Tile;
import static io.anuke.mindustry.Vars.schematics;
public class OvergrowthGenerator extends BasicGenerator{
public OvergrowthGenerator(int width, int height){
@@ -38,6 +40,6 @@ public class OvergrowthGenerator extends BasicGenerator{
//scatter(tiles, Blocks.sporePine, Blocks.whiteTreeDead, 1f);
tiles[endX][endY].setOverlay(Blocks.spawn);
loadout.setup(spawnX, spawnY);
schematics.placeLoadout(loadout, spawnX, spawnY);
}
}