+ Data: Fixes for #4808, #4752, #4685, #4677, #4619, and #4597

MegaMek · Oct 6, 2023 · d04a567 · d04a567
1 parent 0100819
commit d04a567
Show file tree

Hide file tree

Showing 12 changed files with 982 additions and 165 deletions.
diff --git a/megamek/data/canonUnitQuirks.xml b/megamek/data/canonUnitQuirks.xml
diff --git a/megamek/data/images/units/mechset.txt b/megamek/data/images/units/mechset.txt
diff --git a/megamek/data/mechfiles/battlearmor/3150/Longinus C BA [PPC] (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3150/Longinus C BA [PPC] (Sqd4).blk
@@ -40,9 +40,6 @@ Mixed (IS Chassis)
 Jump
 </motion_type>
 
-<transporters>
-</transporters>
-
 <cruiseMP>
 1
 </cruiseMP>
@@ -66,38 +63,26 @@ CLAdvancedSRM4OS:Body
 ISBASupportPPC:RA
 </Squad Equipment>
 
-<source>
-TRO: 3150
-</source>
-
-<chassis>
-biped
-</chassis>
-
-<jumpingMP>
-3
-</jumpingMP>
-
-<armor>
-10
-</armor>
+<Trooper 1 Equipment>
+</Trooper 1 Equipment>
 
-<Trooper Count>
-5
-</Trooper Count>
+<Trooper 2 Equipment>
+</Trooper 2 Equipment>
 
-<weightclass>
-2
-</weightclass>
+<Trooper 3 Equipment>
+</Trooper 3 Equipment>
 
-<overview>
-The Longinus was the Free Worlds League's attempt to duplicate Elemental Battle Armor. 
-</overview>
+<Trooper 4 Equipment>
+</Trooper 4 Equipment>
 
 <capabilities>
 The Longinus came closest to mimicking the capabilities of the Elemental suit that inspired it, and was thus considered one of the best ever built by the Inner Sphere at the time. It was also revolutionary for carrying an advanced armor composite which almost perfectly matched the Clans' composite on their suits. The 360kg of plating covering the Longinus is enough to withstand a full blast from a Large Laser and keep the trooper wearing it alive. It was also responsible for the tremendous price increase of the suit as new manufacturing processes were required to supply enough of this material.
 </capabilities>
 
+<overview>
+The Longinus was the Free Worlds League's attempt to duplicate Elemental Battle Armor.
+</overview>
+
 <deployment>
 The suit's right arm ends in a Modular Weapon Mount which could carry the standard Small Laser, Flamer, or Machine Gun (in 3063 it could also accommodate a "David" Light Gauss Rifle). Its left arm ends in a Battle Claw and features an Anti-Personnel Weapon Mount which can carry a light weapon for use against unarmored infantry, such as a sub-machine gun. Most importantly the suit features an integral SRM-2 launcher carried on a special detachable mounting. Safety mechanisms prevent the Longinus from engaging its jump jets while the launcher is still attached, but once jettisoned it can make leaps of up to 90 meters at a time. Jettisoning the launcher is also required in order for the battle armor to make anti-'Mech attacks. Finally the launcher carries only a single round of missiles due to the additional safety mechanisms taking up space.
 </deployment>
@@ -114,12 +99,36 @@ Kali Yama Weapons Industries Inc.,Corean Enterprises - MacAdams-Suharno
 Kalidasa,Stewart
 </primaryFactory>
 
-
 <systemManufacturers>
 CHASSIS:Unknown
 ENGINE:Unknown
 ARMOR:Unknown
 JUMPJET:Unknown
 COMMUNICATIONS:Unknown
 TARGETING:Unknown
-</systemManufacturers>
+</systemManufacturers>
+
+<source>
+TRO: 3150
+</source>
+
+<chassis>
+biped
+</chassis>
+
+<jumpingMP>
+3
+</jumpingMP>
+
+<armor>
+10
+</armor>
+
+<Trooper Count>
+4
+</Trooper Count>
+
+<weightclass>
+2
+</weightclass>
+
diff --git a/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 31/Callisto A BA [HMG](Sqd6).blk b/megamek/data/mechfiles/battlearmor/Rec Guides ilClan/Vol 31/Callisto A BA [HMG](Sqd6).blk
@@ -20,6 +20,10 @@ Callisto Battle Armor
 A [HMG](Sqd6)
 </Model>
 
+<mul id:>
+9445
+</mul id:>
+
 <year>
 3147
 </year>
@@ -28,14 +32,6 @@ A [HMG](Sqd6)
 3147
 </originalBuildYear>
 
-<mul id:>
-9445
-</mul id:>
-
-<source>
-Rec Guide:ilClan #31
-</source>
-
 <type>
 Clan Level 2
 </type>
@@ -44,9 +40,6 @@ Clan Level 2
 Leg
 </motion_type>
 
-<transporters>
-</transporters>
-
 <cruiseMP>
 3
 </cruiseMP>
@@ -84,6 +77,13 @@ BABattleClaw:LA
 <Trooper 5 Equipment>
 </Trooper 5 Equipment>
 
+<Trooper 6 Equipment>
+</Trooper 6 Equipment>
+
+<source>
+Rec Guide:ilClan #31
+</source>
+
 <chassis>
 biped
 </chassis>
@@ -97,7 +97,7 @@ biped
 </armor>
 
 <Trooper Count>
-5
+6
 </Trooper Count>
 
 <weightclass>

diff --git a/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 19/Scorpion SCP-2N.mtf b/megamek/data/mechfiles/mechs/Rec Guides ilClan/Vol 19/Scorpion SCP-2N.mtf
@@ -1,8 +1,7 @@
-Version:1.1
+Version:1.3
 Scorpion
 SCP-2N
 mul id:8315
-
 Config:Quad
 techbase:Inner Sphere
 era:3131
@@ -16,7 +15,7 @@ myomer:Standard
 cockpit:Standard Cockpit
 gyro:XL Gyro
 
-heat sinks:10 Single
+heat sinks:10 IS Double
 walk mp:6
 jump mp:0
 
@@ -34,10 +33,10 @@ RTR armor:6
 RTC armor:8
 
 Weapons:4
+TAG, Left Torso
 Plasma Rifle, Right Torso
 MML 3, Right Torso
 MML 3, Right Torso
-TAG, Left Torso
 
 Front Left Leg:
 Hip
@@ -70,8 +69,8 @@ IS Endo Steel
 Left Torso:
 Fusion Engine
 Fusion Engine
-IS Ammo MML-3 LRM
 IS Ammo MML-3 SRM
+IS Ammo MML-3 LRM
 ISTAG
 Supercharger
 ISCASEII

diff --git a/megamek/data/mechfiles/name_changes.txt b/megamek/data/mechfiles/name_changes.txt
@@ -764,6 +764,10 @@ Schildkröte Line Tank (Standard)|Schildkröte Line Tank
 Schildkrote Line Tank|Schildkröte Line Tank
 Sleipnir APC (SRM)|Sleipnir AP Tank (SRM)
 Sleipnir APC|Sleipnir AP Tank
+SM Tank Destroyer SM1 'Telos'|SM Tank Destroyer SM1 'Telos'
+SM1 Tank Destroyer SM1|SM Tank Destroyer SM1
+SM1A Tank Destroyer SM1A|SM Tank Destroyer SM1A
+SM3 Tank Destroyer SM3|SM Tank Destroyer SM3
 St. Christopher Cargo Lifter C1|St. Christopher Cargo Transport C1
 St. Christopher Cargo Lifter C1|St. Christopher Cargo Transport C2
 SturmFeur "Kalki" Cruise Missile Launcher (Standard)|SturmFeur 'Kalki' Cruise Missile Launcher (Standard)
@@ -776,6 +780,8 @@ Vector (EW)|Vector Combat Support VTOL (EW)
 Vector (Scout)|Vector Combat Support VTOL (Scout)
 Vector (Transport)|Vector Combat Support VTOL (Transport)
 
+
+
 #Warships
 Aegis Heavy Cruiser (Clan)|Aegis Heavy Cruiser (2843)
 Athena Cruiser (Standard)|Athena Cruiser (2569)

diff --git a/...iles/vehicles/3075/SM1 Tank Destroyer.blk → ...s/vehicles/3075/SM Tank Destroyer SM1.blk b/...iles/vehicles/3075/SM1 Tank Destroyer.blk → ...s/vehicles/3075/SM Tank Destroyer SM1.blk
@@ -13,7 +13,7 @@ Tank
 </blockversion>
 
 <Name>
-SM1 Tank Destroyer
+SM Tank Destroyer
 </Name>
 
 <Model>

diff --git a/...les/vehicles/3075/SM1A Tank Destroyer.blk → .../vehicles/3075/SM Tank Destroyer SM1A.blk b/...les/vehicles/3075/SM1A Tank Destroyer.blk → .../vehicles/3075/SM Tank Destroyer SM1A.blk
@@ -13,7 +13,7 @@ Tank
 </blockversion>
 
 <Name>
-SM1A Tank Destroyer
+SM Tank Destroyer
 </Name>
 
 <Model>

diff --git a/...iles/vehicles/3075/SM3 Tank Destroyer.blk → ...s/vehicles/3075/SM Tank Destroyer SM3.blk b/...iles/vehicles/3075/SM3 Tank Destroyer.blk → ...s/vehicles/3075/SM Tank Destroyer SM3.blk
@@ -13,7 +13,7 @@ Tank
 </blockversion>
 
 <Name>
-SM3 Tank Destroyer
+SM Tank Destroyer
 </Name>
 
 <Model>

diff --git a/...ta/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Iveco Burro II SuperHeavy Cargo Truck.blk b/...ta/mechfiles/vehicles/TRO Vehicle Annex/Wheeled/Iveco Burro II SuperHeavy Cargo Truck.blk
@@ -0,0 +1,91 @@
+#building block data file
+<BlockVersion>
+1
+</BlockVersion>
+
+# Write the version number just in case...
+<Version>
+MAM0
+</Version>
+
+<UnitType>
+SupportTank
+</UnitType>
+
+<Name>
+Iveco Burro II Super Heavy Cargo Truck
+</Name>
+
+<model>
+
+</model>
+
+<mul id:>
+4382
+</mul id:>
+
+<year>
+3064
+</year>
+
+<type>
+IS Level 3
+</type>
+
+<motion_type>
+Wheeled
+</motion_type>
+
+<cruiseMP>
+3
+</cruiseMP>
+
+<engine_type>
+0
+</engine_type>
+
+<armor>
+25
+20
+20
+13
+</armor>
+
+<barrating>
+9
+</barrating>
+
+<structural_tech_rating>
+4
+</structural_tech_rating>
+
+<Body Equipment>
+Environmental Sealing
+Armored Chassis
+ISOffRoadChassis
+</Body Equipment>
+
+<transporters>
+cargobay:12.5:1
+</transporters>
+
+<Front Equipment>
+Searchlight
+</Front Equipment>
+
+<Right Equipment>
+</Right Equipment>
+
+<Left Equipment>
+</Left Equipment>
+
+<Rear Equipment>
+</Rear Equipment>
+
+<source>
+TRO VAr - Civil War
+</source>
+
+<tonnage>
+50.0
+</tonnage>
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ Tank @@
     </blockversion>
     <Name>
-    SM1 Tank Destroyer
+    SM Tank Destroyer
     </Name>
     <Model>
@@ Expand Down @@