Voomra/trader
Archived
0
Fork 0
Code Activity

use isBlocked

Browse Source
This commit is contained in:
Mo
2016-12-22 19:17:45 +03:00
parent 07c8132372
commit 347b554299
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/main/java/ru/trader/controllers/PowerPlayController.java
View File

@@ -210,7 +210,7 @@ public class PowerPlayController {
if (hq == null || entry.getPowerState().isContested() || entry.getPower() != hq.getPower()) { if (hq == null || entry.getPowerState().isContested() || entry.getPower() != hq.getPower()) {
contested += cc; contested += cc;
} }
if (hq != null && entry.getPowerState().isExploited() && entry.getPower() == hq.getPower()) { if (hq != null && (entry.getPowerState().isExploited() || entry.getPowerState().isBlocked()) && entry.getPower() == hq.getPower()) {
intersected += cc; intersected += cc;
} }
Set<POWER> powers = entry.getControllingSystems().stream().map(Place::getPower).collect(Collectors.toSet()); Set<POWER> powers = entry.getControllingSystems().stream().map(Place::getPower).collect(Collectors.toSet());

2
core/src/main/java/ru/trader/analysis/PowerPlayAnalyzator.java
View File

@@ -173,7 +173,7 @@ public class PowerPlayAnalyzator {
public static Stream<IntersectData> getNearExpansions(Stream<Place> starSystems, Collection<Place> centers, double maxDistance){ public static Stream<IntersectData> getNearExpansions(Stream<Place> starSystems, Collection<Place> centers, double maxDistance){
IntersectsMapper mapper = new IntersectsMapper(centers, maxDistance, false, true); IntersectsMapper mapper = new IntersectsMapper(centers, maxDistance, false, true);
return starSystems.filter(new FarDropper(centers, maxDistance)) return starSystems.filter(new FarDropper(centers, maxDistance))
.filter(p -> p.getPowerState() == POWER_STATE.EXPANSION) .filter(p -> p.getPowerState().isExpansion())
.map(mapper) .map(mapper)
.sorted(new DistanceComparator()); .sorted(new DistanceComparator());
} }

1
core/src/main/java/ru/trader/core/POWER_STATE.java
View File

@@ -18,4 +18,5 @@ public enum POWER_STATE {
public boolean isContested(){ public boolean isContested(){
return this == CONTESTED; return this == CONTESTED;
} }
public boolean isBlocked() { return this == BLOCKED;}
} }