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

Cleanup

Browse Source
This commit is contained in:
Anuken
2018-09-25 12:45:04 -04:00
parent 499b7b2e67
commit 795bc1276b
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java
View File

@@ -71,7 +71,7 @@ public class DefenseBlocks extends BlockList implements ContentList{
}}; }};
mendProjector = new MendProjector("mend-projector"){{ mendProjector = new MendProjector("mend-projector"){{
consumes.power(0.25f); consumes.power(0.2f);
size = 2; size = 2;
consumes.item(Items.phasematter).optional(true); consumes.item(Items.phasematter).optional(true);
}}; }};

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

@@ -287,12 +287,9 @@ public class Sectors{
} }
private void initSector(Sector sector){ private void initSector(Sector sector){
double waveChance = 0.3;
sector.difficulty = (int)(Mathf.dst(sector.x, sector.y)); sector.difficulty = (int)(Mathf.dst(sector.x, sector.y));
if(sector.difficulty == 0){ if(sector.difficulty == 0){
//TODO make specfic expansion sector have specific ores
sector.missions.addAll(TutorialSector.getMissions()); sector.missions.addAll(TutorialSector.getMissions());
}else{ }else{
sector.missions.add(new WaveMission(Math.min(sector.difficulty*5 + Mathf.randomSeed(sector.getSeed(), 0, 3)*5, 100))); sector.missions.add(new WaveMission(Math.min(sector.difficulty*5 + Mathf.randomSeed(sector.getSeed(), 0, 3)*5, 100)));
@@ -304,8 +301,6 @@ public class Sectors{
sector.spawns.addAll(mission.getWaves(sector)); sector.spawns.addAll(mission.getWaves(sector));
} }
//sector.ores.addAll(Items.copper);
//set starter items //set starter items
if(sector.difficulty > 12){ //now with titanium if(sector.difficulty > 12){ //now with titanium
sector.startingItems = Array.with(new ItemStack(Items.copper, 1900), new ItemStack(Items.lead, 500), new ItemStack(Items.densealloy, 470), new ItemStack(Items.silicon, 460), new ItemStack(Items.titanium, 230)); sector.startingItems = Array.with(new ItemStack(Items.copper, 1900), new ItemStack(Items.lead, 500), new ItemStack(Items.densealloy, 470), new ItemStack(Items.silicon, 460), new ItemStack(Items.titanium, 230));