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

Fixed enemy base generation

Browse Source
This commit is contained in:
Anuken
2018-10-20 17:36:07 -04:00
parent 8c8a2311d6
commit b73dc127a3
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/game/Team.java
View File

@@ -4,7 +4,7 @@ import com.badlogic.gdx.graphics.Color;
import io.anuke.ucore.util.Bundles; import io.anuke.ucore.util.Bundles;
public enum Team{ public enum Team{
none(Color.DARK_GRAY), none(Color.valueOf("4d4e58")),
blue(Color.ROYAL), blue(Color.ROYAL),
red(Color.valueOf("e84737")), red(Color.valueOf("e84737")),
green(Color.valueOf("1dc645")), green(Color.valueOf("1dc645")),

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

@@ -369,8 +369,7 @@ public class WorldGenerator{
int offsetX = x - 4, offsetY = y + 23; int offsetX = x - 4, offsetY = y + 23;
for(int i = ores.size - 1; i >= 0; i--){ for(int i = ores.size - 1; i >= 0; i--){
Item entry = ores.get(i); Item entry = ores.get(i);
if( if(Math.abs(0.5f - sim.octaveNoise2D(2, 0.7, 1f / (50 + i * 2), offsetX, offsetY)) > 0.23f &&
Math.abs(0.5f - sim.octaveNoise2D(2, 0.7, 1f / (50 + i * 2), offsetX, offsetY)) > 0.23f &&
Math.abs(0.5f - sim2.octaveNoise2D(1, 1, 1f / (40 + i * 4), offsetX, offsetY)) > 0.32f){ Math.abs(0.5f - sim2.octaveNoise2D(1, 1, 1f / (40 + i * 4), offsetX, offsetY)) > 0.32f){
floor = OreBlocks.get(floor, entry); floor = OreBlocks.get(floor, entry);
break; break;

5
core/src/io/anuke/mindustry/maps/missions/BattleMission.java
View File

@@ -11,7 +11,7 @@ import io.anuke.ucore.util.Bundles;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
public class BattleMission extends Mission{ public class BattleMission extends Mission{
final int spacing = 20; final int spacing = 30;
@Override @Override
public GameMode getMode(){ public GameMode getMode(){
@@ -25,9 +25,12 @@ public class BattleMission extends Mission{
@Override @Override
public void generate(Generation gen){ public void generate(Generation gen){
super.generate(gen);
if(state.teams.get(defaultTeam).cores.size == 0){ if(state.teams.get(defaultTeam).cores.size == 0){
return; return;
} }
Tile core = state.teams.get(defaultTeam).cores.first(); Tile core = state.teams.get(defaultTeam).cores.first();
int enx = world.width() - 1 - spacing; int enx = world.width() - 1 - spacing;
int eny = world.height() - 1 - spacing; int eny = world.height() - 1 - spacing;

3
core/src/io/anuke/mindustry/maps/missions/Mission.java
View File

@@ -96,11 +96,12 @@ public abstract class Mission{
} }
public void generate(Generation gen){ public void generate(Generation gen){
generateCoreAt(gen, gen.width/2, gen.height/2, defaultTeam); generateCoreAt(gen, 50, 50, defaultTeam);
} }
public void generateCoreAt(Generation gen, int coreX, int coreY, Team team){ public void generateCoreAt(Generation gen, int coreX, int coreY, Team team){
gen.tiles[coreX][coreY].setBlock(StorageBlocks.core); gen.tiles[coreX][coreY].setBlock(StorageBlocks.core);
gen.tiles[coreX][coreY].setTeam(team); gen.tiles[coreX][coreY].setTeam(team);
state.teams.get(team).cores.add(gen.tiles[coreX][coreY]);
} }
} }