Skip to content

Commit da0423b

Browse files
authored
Merge pull request #6599 from IllianiBird/refitTimesHangar
Updated Refitting Status Display To Show Time Left
2 parents 221edf6 + 342e286 commit da0423b

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

MekHQ/src/mekhq/campaign/unit/Unit.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929
package mekhq.campaign.unit;
3030

31+
import static java.lang.Math.ceil;
3132
import static java.lang.Math.max;
3233
import static megamek.common.MiscType.F_CARGO;
3334
import static mekhq.campaign.parts.enums.PartQuality.QUALITY_A;
@@ -265,7 +266,11 @@ public String getStatus() {
265266
} else if (!isPresent()) {
266267
return "In transit (" + getDaysToArrival() + " days)";
267268
} else if (isRefitting()) {
268-
return "Refitting";
269+
int minutesInHour = 60;
270+
int hoursInDay = 24;
271+
int minutesInDay = hoursInDay * minutesInHour;
272+
int days = (int) ceil((double) getRefit().getTimeLeft() / minutesInDay);
273+
return "Refitting" + " (" + days + " days)";
269274
} else {
270275
return getCondition();
271276
}
@@ -5962,7 +5967,7 @@ private int getMothballOrActivationTime() {
59625967
if (getEntity() instanceof Infantry) {
59635968
return TECH_WORK_DAY;
59645969
} else if ((getEntity() instanceof Dropship) || (getEntity() instanceof Jumpship)) {
5965-
return TECH_WORK_DAY * (int) Math.ceil(getEntity().getWeight() / 500.0);
5970+
return TECH_WORK_DAY * (int) ceil(getEntity().getWeight() / 500.0);
59665971
} else if (isMothballed()) {
59675972
return TECH_WORK_DAY;
59685973
} else {

0 commit comments

Comments
 (0)