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

fixed some sector things, broke more things

Browse Source
This commit is contained in:
Anuken
2020-10-15 15:41:09 -04:00
parent 988e1add82
commit 45b87ec615
12 changed files with 30 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/game/Objectives.java
View File

@@ -28,7 +28,6 @@ public class Objectives{
}
}
//TODO fix
public static class SectorComplete extends SectorObjective{
public SectorComplete(SectorPreset zone){
@@ -39,12 +38,12 @@ public class Objectives{
@Override
public boolean complete(){
return preset.sector.save != null && preset.sector.save.meta.wave >= preset.sector.save.meta.rules.winWave;
return preset.sector.save != null && preset.sector.save.meta.wave >= preset.captureWave;
}
@Override
public String display(){
return Core.bundle.format("requirement.wave", preset.sector.save == null ? "<unknown>" : preset.sector.save.meta.rules.winWave, preset.localizedName);
return Core.bundle.format("requirement.capture", preset.localizedName);
}
}

10
core/src/mindustry/game/Universe.java
View File

@@ -161,17 +161,14 @@ public class Universe{
//if so, just delete the save for now. it's lost.
//TODO don't delete it later maybe
sector.save.delete();
//clear recieved
sector.setExtraItems(new ItemSeq());
sector.save = null;
sector.setDamage(0f);
sector.setDamage(1.01f);
}else if(attacked && wavesPassed > 0 && sector.save.meta.wave + wavesPassed >= sector.save.meta.rules.winWave && !sector.hasEnemyBase()){
//autocapture the sector
sector.setUnderAttack(false);
//fire the event
Events.fire(new SectorCaptureEvent(state.rules.sector));
Events.fire(new SectorCaptureEvent(sector));
}
}
@@ -179,9 +176,10 @@ public class Universe{
if(sector.save != null && sector.save.meta != null && sector.save.meta.secinfo != null && sector.save.meta.secinfo.destination != null){
Sector to = sector.save.meta.secinfo.destination;
if(to.save != null){
float scl = Math.max(1f - sector.getDamage(), 0);
ItemSeq items = new ItemSeq();
//calculated exported items to this sector
sector.save.meta.secinfo.export.each((item, stat) -> items.add(item, (int)(stat.mean * newSecondsPassed)));
sector.save.meta.secinfo.export.each((item, stat) -> items.add(item, (int)(stat.mean * newSecondsPassed * scl)));
to.addItems(items);
}
}