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

Fixed phase cost

Browse Source
This commit is contained in:
Anuken
2022-10-30 14:15:38 -04:00
parent b2e52a647b
commit cd17e11d2a
6 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/mindustry/service/GameService.java
View File

@@ -5,7 +5,6 @@ import arc.struct.*;
import arc.util.*;
import mindustry.*;
import mindustry.content.*;
import mindustry.ctype.*;
import mindustry.game.EventType.*;
import mindustry.game.SectorInfo.*;
import mindustry.gen.*;
@@ -97,8 +96,13 @@ public class GameService{
if(Items.thorium.unlocked()) obtainThorium.complete();
if(Items.titanium.unlocked()) obtainTitanium.complete();
if(!content.sectors().contains(UnlockableContent::locked)){
unlockAllZones.complete();
if(SectorPresets.origin.sector.isCaptured()){
completeErekir.complete();
}
if(SectorPresets.planetaryTerminal.sector.isCaptured()){
completeSerpulo.complete();
}
if(mods.list().size > 0){
@@ -325,9 +329,6 @@ public class GameService{
Events.on(UnlockEvent.class, e -> {
if(e.content == Items.thorium) obtainThorium.complete();
if(e.content == Items.titanium) obtainTitanium.complete();
if(e.content instanceof SectorPreset && !content.sectors().contains(s -> s.locked())){
unlockAllZones.complete();
}
});
Events.run(Trigger.openWiki, openWiki::complete);
@@ -477,14 +478,19 @@ public class GameService{
captureBackground.complete();
}
if(!e.sector.planet.sectors.contains(s -> !s.hasBase())){
if(e.sector.planet == Planets.serpulo && !e.sector.planet.sectors.contains(s -> !s.hasBase())){
captureAllSectors.complete();
}
if(!e.sector.planet.sectors.contains(s -> s.preset != null && !s.hasBase())){
allPresetsErekir.complete();
if(e.sector.planet == Planets.erekir && e.sector.preset != null && e.sector.preset.isLastSector){
completeErekir.complete();
}
if(e.sector.planet == Planets.serpulo && e.sector.preset != null && e.sector.preset.isLastSector){
completeSerpulo.complete();
}
//TODO wrong
if(e.sector.planet == Planets.serpulo){
SStat.sectorsControlled.set(e.sector.planet.sectors.count(Sector::hasBase));
}
@@ -521,7 +527,7 @@ public class GameService{
for(var up : Groups.powerGraph){
var graph = up.graph();
if(graph.all.size > 0 && graph.all.first().team == player.team()){
float balance = graph.getPowerBalance();
float balance = graph.getPowerBalance() * 60f;
if(balance < 10_000) negative10kPower.complete();
if(balance > 100_000) positive100kPower.complete();
if(graph.getBatteryStored() > 1_000_000) store1milPower.complete();