Skip to content

Commit 2839709

Browse files
SJuliezSJuliez
authored
Merge pull request #4152 from IllianiCBT/partsAcquisitionLineWrap
Updated Parts Acquisition Dialog in Repair Tab
2 parents 92542ca + 3efac0b commit 2839709

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

‎MekHQ/src/mekhq/campaign/Campaign.java

+18-18
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import megamek.codeUtilities.MathUtility;
2929
import megamek.codeUtilities.ObjectUtility;
3030
import megamek.common.*;
31+
import megamek.common.AmmoType.Munitions;
3132
import megamek.common.annotations.Nullable;
3233
import megamek.common.enums.Gender;
3334
import megamek.common.equipment.BombMounted;
@@ -669,7 +670,7 @@ public void purchaseShipSearchResult() {
669670
: calculatePartTransitTime(Compute.d6(2) - 2);
670671

671672
getFinances().debit(TransactionType.UNIT_PURCHASE, getLocalDate(), cost, "Purchased " + en.getShortName());
672-
addNewUnit(en, true, transitDays, 3);
673+
addNewUnit(en, true, transitDays);
673674
if (!getCampaignOptions().isInstantUnitMarketDelivery()) {
674675
addReport("<font color='green'>Unit will be delivered in " + transitDays + " days.</font>");
675676
}
@@ -5285,20 +5286,20 @@ public TargetRoll getTargetForAcquisition(final IAcquisitionWork acquisition,
52855286
et = ((MissingEquipmentPart) acquisition).getType();
52865287
}
52875288

5288-
StringBuilder partAvailabilityLog = new StringBuilder();
5289-
partAvailabilityLog.append("Part Rating Level: " + partAvailability)
5290-
.append("(" + EquipmentType.ratingNames[partAvailability] + ")");
5289+
StringBuilder partAvailabilityLog = new StringBuilder("<html>");
5290+
partAvailabilityLog.append("Part Rating Level: ").append(partAvailability)
5291+
.append(" (").append(EquipmentType.ratingNames[partAvailability]).append(')');
52915292

52925293
/*
52935294
* Even if we can acquire Clan parts, they have a minimum availability of F for
52945295
* non-Clan units
52955296
*/
52965297
if (acquisition.getTechBase() == Part.T_CLAN && !getFaction().isClan()) {
52975298
partAvailability = Math.max(partAvailability, EquipmentType.RATING_F);
5298-
partAvailabilityLog.append(";[clan part for non clan faction]");
5299+
partAvailabilityLog.append("<br>[clan part for non clan faction]");
52995300
} else if (et != null) {
53005301
/*
5301-
* AtB rules do not simply affect difficulty of obtaining parts, but whether
5302+
* AtB rules do not simply affect the difficulty of getting parts, but whether
53025303
* they can be obtained at all. Changing the system to use availability codes
53035304
* can have a serious effect on game play, so we apply a few tweaks to keep some
53045305
* of the more basic items from becoming completely unobtainable, while applying
@@ -5309,32 +5310,32 @@ public TargetRoll getTargetForAcquisition(final IAcquisitionWork acquisition,
53095310
&& !(et instanceof FlamerWeapon)
53105311
&& partAvailability < EquipmentType.RATING_C) {
53115312
partAvailability = EquipmentType.RATING_C;
5312-
partAvailabilityLog.append(";(non-flamer lasers)");
5313+
partAvailabilityLog.append("<br>[Non-Flamer Lasers]");
53135314
}
53145315
if (et instanceof ACWeapon) {
53155316
partAvailability -= 2;
5316-
partAvailabilityLog.append(";(autocannon): -2");
5317+
partAvailabilityLog.append("<br>Autocannon: -2");
53175318
}
53185319
if (et instanceof GaussWeapon
53195320
|| et instanceof FlamerWeapon) {
53205321
partAvailability--;
5321-
partAvailabilityLog.append(";(gauss rifle or flamer): -1");
5322+
partAvailabilityLog.append("<br>Gauss Rifle or Flamer: -1");
53225323
}
53235324
if (et instanceof AmmoType) {
53245325
switch (((AmmoType) et).getAmmoType()) {
53255326
case AmmoType.T_AC:
53265327
partAvailability -= 2;
5327-
partAvailabilityLog.append(";(autocannon ammo): -2");
5328+
partAvailabilityLog.append("<br>Autocannon Ammo: -2");
53285329
break;
53295330
case AmmoType.T_GAUSS:
53305331
partAvailability -= 1;
5331-
partAvailabilityLog.append(";(gauss ammo): -1");
5332+
partAvailabilityLog.append("<br>Gauss Ammo: -1");
53325333
break;
53335334
}
5334-
if (EnumSet.of(AmmoType.Munitions.M_STANDARD).containsAll(
5335+
if (EnumSet.of(Munitions.M_STANDARD).containsAll(
53355336
((AmmoType) et).getMunitionType())){
53365337
partAvailability--;
5337-
partAvailabilityLog.append(";(standard ammo): -1");
5338+
partAvailabilityLog.append("<br>Standard Ammo: -1");
53385339
}
53395340
}
53405341
}
@@ -5346,12 +5347,13 @@ public TargetRoll getTargetForAcquisition(final IAcquisitionWork acquisition,
53465347
|| acquisition instanceof MissingMekLocation
53475348
|| acquisition instanceof MissingMekSensor)) {
53485349
partAvailability--;
5349-
partAvailabilityLog.append("(Mek part prior to 2950 or after 3040): - 1");
5350+
partAvailabilityLog.append("<br>Mek part prior to 2950 or after 3040: - 1");
53505351
}
53515352

53525353
int AtBPartsAvailability = findAtBPartsAvailabilityLevel(acquisition, null);
5353-
partAvailabilityLog.append("; Total part availability: " + partAvailability)
5354-
.append("; Current campaign availability: " + AtBPartsAvailability);
5354+
partAvailabilityLog.append("<br>Total part availability: ").append(partAvailability)
5355+
.append("<br>Current campaign availability: ").append(AtBPartsAvailability)
5356+
.append("</html>");
53555357
if (partAvailability > AtBPartsAvailability) {
53565358
return new TargetRoll(TargetRoll.IMPOSSIBLE, partAvailabilityLog.toString());
53575359
}
@@ -6880,8 +6882,6 @@ public void initTurnover() {
68806882
}
68816883

68826884
public void initAtB(boolean newCampaign) {
6883-
getRetirementDefectionTracker().setLastRetirementRoll(getLocalDate());
6884-
68856885
if (!newCampaign) {
68866886
/*
68876887
* Switch all contracts to AtBContract's

0 commit comments

Comments
 (0)