Voomra/trader
Archived
0
Fork 0
Code Activity

implement headquarter parse in power play file

Browse Source
This commit is contained in:
iMoHax
2016-12-01 17:48:28 +03:00
parent fdbd4ba3a6
commit 5edae41336
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils/src/main/java/ru/trader/powerplay/PPParser.java
View File

@@ -78,10 +78,14 @@ public class PPParser {
POWER_STATE state = getState(values[3]); POWER_STATE state = getState(values[3]);
String upkeep = values[4]; String upkeep = values[4];
String income = values[6]; String income = values[6];
String trigger = values[11];
String status = values[12]; String status = values[12];
if (starSystemName == null || power == null || state == null) return; if (starSystemName == null || power == null || state == null) return;
if (state.isControl()){ if (state.isControl()){
if ("FAIL".equals(status)) return; if ("FAIL".equals(status)) return;
if ("1000000000".equals(trigger)){
state = POWER_STATE.HEADQUARTERS;
}
Place place = market.get(starSystemName); Place place = market.get(starSystemName);
if (place != null){ if (place != null){
if (upkeep != null){ if (upkeep != null){
@@ -169,14 +173,10 @@ public class PPParser {
if (controllingSystems.isEmpty()) return; if (controllingSystems.isEmpty()) return;
for (Place starSystem : market.get()) { for (Place starSystem : market.get()) {
if (!starSystem.isPopulated()) continue; if (!starSystem.isPopulated()) continue;
if (starSystem.getPowerState() != POWER_STATE.HEADQUARTERS){ starSystem.setPower(POWER.NONE, POWER_STATE.NONE);
starSystem.setPower(POWER.NONE, POWER_STATE.NONE);
}
for (PowerData powerData : controllingSystems){ for (PowerData powerData : controllingSystems){
if (starSystem.equals(powerData.starSystem)){ if (starSystem.equals(powerData.starSystem)){
if (starSystem.getPowerState() != POWER_STATE.HEADQUARTERS){ starSystem.setPower(powerData.power, powerData.state);
starSystem.setPower(powerData.power, powerData.state);
}
} else { } else {
if (!powerData.state.isControl()) continue; if (!powerData.state.isControl()) continue;
if (starSystem.getDistance(powerData.starSystem) <= Market.CONTROLLING_RADIUS){ if (starSystem.getDistance(powerData.starSystem) <= Market.CONTROLLING_RADIUS){