diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Brunel Dump Truck.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Brunel Dump Truck.blk
index e7c0e1fea04..b387b58b57d 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Brunel Dump Truck.blk
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Brunel Dump Truck.blk
@@ -3,7 +3,7 @@
1
-# Write the version number just in case...
+##Write the version number just in case...
MAM0
@@ -16,9 +16,9 @@ LargeSupportTank
Brunel Dump Truck
-
+
-
+
3866
@@ -28,6 +28,10 @@ Brunel Dump Truck
2637
+
+2637
+
+
IS Level 3
@@ -36,6 +40,9 @@ IS Level 3
Wheeled
+
+
+
3
@@ -44,14 +51,6 @@ Wheeled
1
-
-4
-
-
-
-6
-
-
21
13
@@ -61,14 +60,6 @@ Wheeled
10
-
-3
-
-
-
-2
-
-
ISOffRoadChassis
@@ -91,16 +82,42 @@ Backhoe
Dumper (Rear)
+Cargo:SIZE:50.0
-
-150.0
-
+
+6
+
-
-TRO: Vehicle Annex (Revised)
-
+
+3
+
+
+
+3
+
+
+
+2
+
Armor is based on fluff. No Record Sheet available.
+
+
+TRO: Vehicle Annex (Revised)
+
+
+
+150.0
+
+
+
+4.0
+
+
+
+PETROCHEMICALS
+
+
diff --git a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Lesseps Dump Truck.blk b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Lesseps Dump Truck.blk
index 1ca3483278b..428cb75796f 100644
--- a/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Lesseps Dump Truck.blk
+++ b/megamek/data/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Lesseps Dump Truck.blk
@@ -3,7 +3,7 @@
1
-# Write the version number just in case...
+##Write the version number just in case...
MAM0
@@ -16,9 +16,9 @@ SupportTank
Lesseps Dump Truck
-
+
-
+
4499
@@ -28,6 +28,10 @@ Lesseps Dump Truck
2523
+
+2523
+
+
IS Level 3
@@ -36,6 +40,9 @@ IS Level 3
Wheeled
+
+
+
3
@@ -44,10 +51,6 @@ Wheeled
11
-
-4
-
-
28
19
@@ -55,14 +58,6 @@ Wheeled
12
-
-5
-
-
-
-3
-
-
ISOffRoadChassis
@@ -79,11 +74,24 @@ Backhoe
Dumper (Rear)
+Cargo:SIZE:20.0
-
-cargobay:20:1
-
+
+5
+
+
+
+3
+
+
+
+3
+
+
+
+3
+
TRO: Vehicle Annex (Revised)
@@ -92,3 +100,8 @@ TRO: Vehicle Annex (Revised)
50.0
+
+
+4.0
+
+
diff --git a/megamek/src/megamek/common/MechFileParser.java b/megamek/src/megamek/common/MechFileParser.java
index 57a893a98d6..c27c6828853 100644
--- a/megamek/src/megamek/common/MechFileParser.java
+++ b/megamek/src/megamek/common/MechFileParser.java
@@ -783,24 +783,27 @@ else if ((ent instanceof Infantry) && ((Infantry) ent).canMakeAntiMekAttacks())
}
/**
- * Links Dumpers to Cargo equipment if there is one in the same location. Works only for variable size
- * Cargo, {@link MiscType#createCargo()}, (but not Liquid Storage, Cargo containers/bays)
+ * Links each Dumper to the first (unlinked) Cargo equipment if there is one in the same location.
+ * Works only for variable size Cargo, {@link MiscType#createCargo()}, but not Liquid Storage,
+ * Cargo containers or bays.
*
* @param entity The entity to add links to
*/
static void linkDumpers(Entity entity) {
List dumpers = entity.getMisc().stream()
.filter(mounted -> mounted.getType().hasFlag(MiscType.F_DUMPER)).collect(Collectors.toList());
+
List cargos = entity.getMisc().stream()
.filter(mounted -> mounted.is(EquipmentTypeLookup.CARGO)).collect(Collectors.toList());
+ cargos.forEach(cargo -> cargo.setLinkedBy(null));
for (Mounted dumper : dumpers) {
- if (dumper.getLinked() == null) {
- for (Mounted cargo : cargos) {
- if ((cargo.getLinkedBy() == null) && (cargo.getLocation() == dumper.getLocation())) {
- dumper.setLinked(cargo);
- break;
- }
+ dumper.setLinked(null);
+ for (Mounted cargo : cargos) {
+ if ((cargo.getLinkedBy() == null) && (cargo.getLocation() == dumper.getLocation())) {
+ dumper.setLinked(cargo);
+ cargo.setLinkedBy(dumper);
+ break;
}
}
}