Merging PR's

+ Data: Fixes for #5514, #5469, #5460, #5223, #5194 (again), #5162
MegaMek · Jun 1, 2024 · d4a481a · d4a481a
1 parent 242b228
commit d4a481a
Show file tree

Hide file tree

Showing 36 changed files with 978 additions and 834 deletions.
diff --git a/megamek/data/images/units/mechset.txt b/megamek/data/images/units/mechset.txt
@@ -287,6 +287,7 @@ chassis "Protector Combat Support Fighter" "convfighter/Bluehawk.png"
 chassis "Raubvogel Aerobomber" "convfighter/Raubvogel.png"
 chassis "S 2772 Airplane" "convfighter/S 2772 Airplane.png"
 chassis "Vendetta Medium Fighter" "convfighter/Vendetta Medium Fighter.png"
+chassis "Wusun" "fighter/Wusun.png"
 
 # BattleArmor
 chassis "Achileus Light Battle Armor" "battle armor/Achileus_4.png"
@@ -8694,17 +8695,21 @@ chassis "Avalon Cruiser" "warships/Avalon.png"
 chassis "Avatar Heavy Cruiser" "warships/Avatar.png"
 chassis "Baron Destroyer" "warships/Baron.png"
 chassis "Black Lion I Battlecruiser" "warships/Black Lion I Battlecruiser.png"
-exact "Black Lion II Battlecruiser (2843)" "warships/Black_Lion.png"
-exact "Black Lion II Battlecruiser (2691)" "warships/Black Lion I-Battlecruiser.png"
+chassis "Black Lion I Battlecruiser" "warships/Black Lion I Battlecruiser.png"
+chassis "Black Lion II Battlecruiser" "warships/Black Lion II Battlecruiser.png"
+chassis "Black Lion II Battlecruiser (2843)" "warships/black_lion.png"
+chassis "Black Lion II Battlecruiser (2691)" "warships/Black Lion I-Battlecruiser.png"
 chassis "Bonaventure Corvette" "warships/Bonaventure Corvette.png"
 chassis "Cameron Battlecruiser" "warships/Cameron.png"
+chassis "Capital Drone" "warships/Lola II Destroyer.png"
 chassis "Carrack Transport" "warships/Carrack.png"
 chassis "Commonwealth Light Cruiser" "warships/Commonwealth Light Cruiser.png"
 chassis "Concordat Frigate" "warships/Concordat Frigate.png"
 chassis "Congress Frigate" "warships/Congress.png"
-exact "Congress Frigate (2542)" "warships/Congress.png"
 chassis "Congress D Frigate" "warships/Congress D Frigate.png"
+chassis "Congress Frigate (2542)" "warships/Congress Frigate.png"
 chassis "Conqueror Battlecruiser/Carrier" "warships/Conqueror.png"
+chassis "Conqueror Battlecruiser Carrier" "warships/conqueror.png"
 chassis "Cruiser" "warships/Cruiser.png"
 chassis "Dante Frigate" "warships/Dante.png"
 chassis "Dart Light Cruiser" "warships/Dart Light Cruiser.png"
@@ -8713,12 +8718,14 @@ chassis "Defender Battlecruiser" "warships/Defender Battlecruiser.png"
 chassis "Dreadnought Battleship" "warships/Dreadnought Battleship (2330).png"
 chassis "Du Shi Wang Battleship" "warships/Du Shi Wang Battleship.png"
 chassis "Eagle Frigate" "warships/Eagle.png"
-exact "Essex Destroyer (Clan)" "warships/Essex (Clan).png"
 chassis "Essex Destroyer" "warships/Essex Destroyer.png"
+chassis "Essex Destroyer (Clan)" "warships/Essex (Clan).png"
 chassis "Essex I Destroyer" "warships/Essex I Destroyer.png"
+chassis "Essex II Destroyer" "warships/Essex Destroyer.png"
 chassis "Farragut Battleship" "warships/Farragut Battleship.png"
 chassis "Feng Huang Cruiser" "warships/Feng_Huang.png"
 chassis "Fox Corvette" "warships/Fox.png"
+chassis "Fredasa (Corvette-Raider)" "warships/fredasa.png"
 chassis "Fredasa Corvette/Raider" "warships/Fredasa.png"
 chassis "Impavido Destroyer" "warships/Impavido.png"
 chassis "Inazuma Corvette" "warships/Inazuma.png"
@@ -8728,29 +8735,30 @@ chassis "Kyushu Frigate" "warships/Kyushu.png"
 chassis "League Destroyer" "warships/League Destroyer.png"
 chassis "Leviathan Heavy Transport" "warships/Leviathan.png"
 chassis "Leviathan II Battleship" "warships/Leviathan.png"
+chassis "Liberator Cruiser" "warships/avatar.png"
 chassis "Lola I Destroyer" "warships/Lola I Destroyer.png"
 chassis "Lola II Destroyer" "warships/Lola II Destroyer.png"
 chassis "Lola III Destroyer" "warships/Lola III Destroyer.png"
 chassis "Luxor Heavy Cruiser" "warships/Luxor.png"
 chassis "McKenna Battleship" "warships/McKenna.png"
 chassis "Mjolnir Battlecruiser" "warships/Mjolnir.png"
 chassis "Monsoon Battleship" "warships/Monsoon Battleship.png"
+chassis "Monsoon Battleship (LF)" "warships/Monsoon Battleship.png"
 chassis "Naga Destroyer" "warships/Naga_Warship.png"
-exact "Naga (Caspar II Control Ship)" "warships/Naga_Warship.png"
+chassis "Naga (Caspar II Control Ship)" "warships/Naga_Warship.png"
 chassis "Narukami Destroyer" "warships/Narukami Destroyer.png"
 chassis "New Syrtis Carrier" "warships/New Syrtis Carrier.png"
 chassis "Nightlord Battleship" "warships/Nightlord.png"
 chassis "Nightwing Surveillance" "warships/Nightwing Surveillance.png"
-chassis "Narukami Destroyer" "warships/Narukami Destroyer.png"
-chassis "New Syrtis Carrier" "warships/New Syrtis Carrier.png"
 chassis "Pinto Corvette" "warships/Pinto Corvette.png"
 chassis "Potemkin Troop Cruiser" "warships/Potemkin.png"
 chassis "Quixote Frigate" "warships/Quixote Frigate.png"
 chassis "Riga Frigate" "warships/Riga Frigate.png"
+chassis "Riga II Destroyer-Carrier" "warships/Riga Frigate.png"
 chassis "Robinson Transport" "warships/Robinson Transport.png"
 chassis "Samarkand Carrier" "warships/Samarkand.png"
-chassis "Stefan Amaris Battleship" "warships/Stefan Amaris.png"
 chassis "Sovetskii Soyuz Heavy Cruiser" "warships/Sovetskii_Soyuz.png"
+chassis "Stefan Amaris Battleship" "warships/Stefan Amaris.png"
 chassis "Suffren Destroyer" "warships/Suffren.png"
 chassis "Sylvester Transport" "warships/Sylvester Transport.png"
 chassis "Tatsumaki Destroyer" "warships/Tatsumaki.png"
@@ -8765,9 +8773,14 @@ chassis "Wagon Wheel Frigate" "warships/Wagon Wheel Frigate.png"
 chassis "Whirlwind Destroyer" "warships/Whirlwind.png"
 chassis "Winchester Cruiser" "warships/Winchester Cruiser.png"
 chassis "York Destroyer/Carrier" "warships/York.png"
+chassis "York Destroyer-Carrier" "warships/york.png"
 chassis "Zechetinu Corvette" "warships/Zechetinu.png"
 chassis "Zechetinu II Corvette" "warships/Zechetinu.png"
 
+
+
+
+
 #all the new turrets go below here
 
 chassis "Light Sniper Turret" "GunEmplacements/AC5_Turret_Single.png"

diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA MRR (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA MRR (Sqd4).blk
@@ -68,11 +68,11 @@ SwarmMek
 SwarmWeaponMek
 StopSwarm
 LegAttack
-BA Fire Resistant:Body
-BA Fire Resistant:LA
-BA Fire Resistant:LA
-BA Fire Resistant:LA
-BA Fire Resistant:RA
+Clan BA Fire Resistant:Body
+Clan BA Fire Resistant:LA
+Clan BA Fire Resistant:LA
+Clan BA Fire Resistant:LA
+Clan BA Fire Resistant:RA
 CLBAMedium Recoilless Rifle:RA
 </Squad Equipment>
 

diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA MRR (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA MRR (Sqd5).blk
@@ -68,11 +68,11 @@ SwarmMek
 SwarmWeaponMek
 StopSwarm
 LegAttack
-BA Fire Resistant:Body
-BA Fire Resistant:LA
-BA Fire Resistant:LA
-BA Fire Resistant:LA
-BA Fire Resistant:RA
+Clan BA Fire Resistant:Body
+Clan BA Fire Resistant:LA
+Clan BA Fire Resistant:LA
+Clan BA Fire Resistant:LA
+Clan BA Fire Resistant:RA
 CLBAMedium Recoilless Rifle:RA
 </Squad Equipment>
 

diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA MRR (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA MRR (Sqd6).blk
@@ -68,11 +68,11 @@ SwarmMek
 SwarmWeaponMek
 StopSwarm
 LegAttack
-BA Fire Resistant:Body
-BA Fire Resistant:LA
-BA Fire Resistant:LA
-BA Fire Resistant:LA
-BA Fire Resistant:RA
+Clan BA Fire Resistant:Body
+Clan BA Fire Resistant:LA
+Clan BA Fire Resistant:LA
+Clan BA Fire Resistant:LA
+Clan BA Fire Resistant:RA
 CLBAMedium Recoilless Rifle:RA
 </Squad Equipment>
 

diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA PPC (Sqd4).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA PPC (Sqd4).blk
@@ -69,11 +69,11 @@ SwarmWeaponMek
 StopSwarm
 LegAttack
 ISBASupportPPC:RA
-BA Fire Resistant:LA
-BA Fire Resistant:LA
-BA Fire Resistant:Body
-BA Fire Resistant:Body
-BA Fire Resistant:RA
+Clan BA Fire Resistant:LA
+Clan BA Fire Resistant:LA
+Clan BA Fire Resistant:Body
+Clan BA Fire Resistant:Body
+Clan BA Fire Resistant:RA
 </Squad Equipment>
 
 <source>

diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA PPC (Sqd5).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA PPC (Sqd5).blk
@@ -69,11 +69,11 @@ SwarmWeaponMek
 StopSwarm
 LegAttack
 ISBASupportPPC:RA
-BA Fire Resistant:LA
-BA Fire Resistant:LA
-BA Fire Resistant:Body
-BA Fire Resistant:Body
-BA Fire Resistant:RA
+Clan BA Fire Resistant:LA
+Clan BA Fire Resistant:LA
+Clan BA Fire Resistant:Body
+Clan BA Fire Resistant:Body
+Clan BA Fire Resistant:RA
 </Squad Equipment>
 
 <source>

diff --git a/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA PPC (Sqd6).blk b/megamek/data/mechfiles/battlearmor/3145/Kurita/Oni BA PPC (Sqd6).blk
@@ -69,11 +69,11 @@ SwarmWeaponMek
 StopSwarm
 LegAttack
 ISBASupportPPC:RA
-BA Fire Resistant:LA
-BA Fire Resistant:LA
-BA Fire Resistant:Body
-BA Fire Resistant:Body
-BA Fire Resistant:RA
+Clan BA Fire Resistant:LA
+Clan BA Fire Resistant:LA
+Clan BA Fire Resistant:Body
+Clan BA Fire Resistant:Body
+Clan BA Fire Resistant:RA
 </Squad Equipment>
 
 <source>

diff --git a/...NTNU RS/Gray Death SA (Harjel) (Sqd4).blk → ...Gray Death Strike Suit (HarJel)(Sqd4).blk b/...NTNU RS/Gray Death SA (Harjel) (Sqd4).blk → ...Gray Death Strike Suit (HarJel)(Sqd4).blk
@@ -1,13 +1,8 @@
-#building block data file
+#Saved from version 0.49.17 on 2024-02-13
 <BlockVersion>
 1
 </BlockVersion>
 
-# Write the version number just in case...
-<Version>
-MAM0
-</Version>
-
 <UnitType>
 BattleArmor
 </UnitType>
@@ -28,13 +23,17 @@ Gray Death Strike Suit
 3107
 </year>
 
+<originalBuildYear>
+3107
+</originalBuildYear>
+
 <type>
-IS Level 2
+Mixed (Clan Chassis)
 </type>
 
-<role>
-Ambusher
-</role>
+<quirks>
+distracting
+</quirks>
 
 <motion_type>
 Leg
@@ -49,59 +48,47 @@ Leg
 </armor_type>
 
 <armor_tech>
-11
+1
 </armor_tech>
 
-<Squad Equipment>
+<Point Equipment>
 ISBAFireDrakeNeedler:RA
-ISBALightTAG:LA
-ISBASRM3:Body
+CLBALightTAG:LA
 BA-SRM3 Ammo:Body:Shots4#
 BABasicManipulator:LA
 BABasicManipulator:RA
 SwarmMek
 SwarmWeaponMek
 StopSwarm
 LegAttack
-IS BA Advanced:LA
-IS BA Advanced:LA
-IS BA Advanced:RA
-IS BA Advanced:RA
-IS BA Advanced:Body
-</Squad Equipment>
-
-<source>
-Record Sheets: 3145 New Tech New Upgrades
-</source>
-
-<chassis>
-biped
-</chassis>
-
-<jumpingMP>
-0
-</jumpingMP>
+BA Advanced:Body
+BA Advanced:RA
+BA Advanced:RA
+BA Advanced:LA
+BA Advanced:LA
+CLBASRM3:Body
+</Point Equipment>
 
-<armor>
-9
-</armor>
+<Trooper 1 Equipment>
+</Trooper 1 Equipment>
 
-<Trooper Count>
-4
-</Trooper Count>
+<Trooper 2 Equipment>
+</Trooper 2 Equipment>
 
-<weightclass>
-2
-</weightclass>
+<Trooper 3 Equipment>
+</Trooper 3 Equipment>
 
-<overview>
-Gray Death Strike battle armor is a production version of the prototype. 
-</overview>
+<Trooper 4 Equipment>
+</Trooper 4 Equipment>
 
 <capabilities>
 Defiance Industries wasn't able to secure a source of the advanced Clan Improved SRM Launcher used on the prototype. As a result, Defiance used a single SRM-3 with two reloads. To make room for this the Gray Death Strike Suit replaced the Battle Claws of the prototype with Basic Manipulators. The launcher can be jettisoned as well, allowing the unit to move slightly more quickly. The Light TAG system mounted in the arm allows armor that has jettisoned the SRM launcher to remain useful on the battlefield, designating enemy units for artillery and missile strikes.
 </capabilities>
 
+<overview>
+Gray Death Strike battle armor is a production version of the prototype.
+</overview>
+
 <deployment>
 This Dark Age era variant of Gray Death Strike Suit uses the same armor and equipment as the standard Gray Death Strike Suit, but is also equipped with HarJel to protect the user. A Firedrake Needler is also present for anti-infantry work.
 </deployment>
@@ -110,10 +97,6 @@ This Dark Age era variant of Gray Death Strike Suit uses the same armor and equi
 The Jihad stopped production at the Gray Death Technologies plants, and then Defiance Industries took over production. Defiance then moved production of the battle armor to Furillo, which slowed production even more. After the Gray Death Technology plant was destroyed in 3074, it would be six years before Defiance produced a new Gray Death Strike suit.
 </history>
 
-<notes>
-BA Harjel not coded. Unit included for completeness
-</notes>
-
 <manufacturer>
 Defiance Industries
 </manufacturer>
@@ -131,7 +114,31 @@ COMMUNICATIONS:Unknown
 TARGETING:Unknown
 </systemManufacturers>
 
-<quirks>
-distracting
-</quirks>
+<notes>
+BA Harjel not coded. Unit included for completeness
+</notes>
+
+<source>
+Record Sheets: 3145 New Tech New Upgrades
+</source>
+
+<chassis>
+biped
+</chassis>
+
+<jumpingMP>
+0
+</jumpingMP>
+
+<armor>
+9
+</armor>
+
+<Trooper Count>
+4
+</Trooper Count>
+
+<weightclass>
+2
+</weightclass>