Skip to content

Commit

Permalink
Bug Fix: Stockpile industry copy jobs now output both BPCs and Runs (…
Browse files Browse the repository at this point in the history
…Issue #482)  9a45e1

Merge main
  • Loading branch information
GoldenGnu committed Sep 14, 2024
2 parents ff6c395 + acd8b63 commit 6da5dc1
Showing 1 changed file with 14 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -888,13 +888,21 @@ public int compare(StockpileFilter o1, StockpileFilter o2) {
continue; //Do not match - try next filter
}
//Jobs
} else if (industryJob != null) { //Copying in progress (not delivered to assets)
if (runs && typeID < 0) {
} else if (industryJob != null) {
if (typeID < 0) { //Copying in progress (not delivered to assets)
if (filter.isJobs() && industryJob.isCopying() && industryJob.isNotDeliveredToAssets()) {
if (add) { //Match
jobsCountNow = jobsCountNow + ((long)industryJob.getRuns() * (long)industryJob.getLicensedRuns());
} else {
count = count + ((long)industryJob.getRuns() * (long)industryJob.getLicensedRuns());
if (runs) { //Runs
if (add) { //Match
jobsCountNow = jobsCountNow + ((long)industryJob.getRuns() * (long)industryJob.getLicensedRuns());
} else {
count = count + ((long)industryJob.getRuns() * (long)industryJob.getLicensedRuns());
}
} else { //BPC
if (add) { //Match
jobsCountNow = jobsCountNow + (long)industryJob.getRuns();
} else {
count = count + (long)industryJob.getRuns();
}
}
}
//Manufacturing in progress (not delivered to assets)
Expand Down

0 comments on commit 6da5dc1

Please sign in to comment.