Merge pull request #5734 from repligator/data-things-and-typos

Spelling, typos, etc.
MegaMek · Jul 12, 2024 · d1774fe · d1774fe
2 parents 621862d + c88320a
commit d1774fe
Show file tree

Hide file tree

Showing 27 changed files with 39 additions and 39 deletions.
diff --git a/megamek/data/forcegenerator/faction_rules/IS.xml b/megamek/data/forcegenerator/faction_rules/IS.xml
@@ -604,7 +604,7 @@
 	</force>
 
 	<force eschelon="%COMPANY%" eschName="Company" ifUnitType="Infantry"
-			ifRole="artillery|missle_artillery">
+			ifRole="artillery|missile_artillery">
 		<name>{alpha} Field Artillery Company</name>
 		<co>%CAPTAIN%</co>
 

diff --git a/megamek/data/forcegenerator/faction_rules/MH.xml b/megamek/data/forcegenerator/faction_rules/MH.xml
@@ -662,7 +662,7 @@ support wing (cohort). -->
 	</force>
 
 	<force eschelon="%COMPANY%" eschName="Century" ifUnitType="Infantry"
-			ifRole="artillery|missle_artillery">
+			ifRole="artillery|missile_artillery">
 		<co>%CAPTAIN%</co>
 
 		<subforces generate="group">

diff --git a/megamek/data/forcegenerator/faction_rules/MOC.xml b/megamek/data/forcegenerator/faction_rules/MOC.xml
@@ -139,7 +139,7 @@ expanding to a full wing per regiment by the Dark Age. -->
 	</force>
 
 	<force eschelon="%COMPANY%" eschName="Company" ifUnitType="Infantry"
-			ifRole="artillery|missle_artillery">
+			ifRole="artillery|missile_artillery">
 		<name>{ordinal} Field Artillery Company</name>
 		<co>%CAPTAIN%</co>
 

diff --git a/megamek/data/forcegenerator/faction_rules/Periphery.xml b/megamek/data/forcegenerator/faction_rules/Periphery.xml
@@ -654,7 +654,7 @@ Infantry are poorly trained and equipped. -->
 	</force>
 
 	<force eschelon="%COMPANY%" eschName="Company" ifUnitType="Infantry"
-			ifRole="artillery|missle_artillery">
+			ifRole="artillery|missile_artillery">
 		<name>{ordinal} Field Artillery Company</name>
 		<co>%CAPTAIN%</co>
 

diff --git a/megamek/data/forcegenerator/factions.xml b/megamek/data/forcegenerator/factions.xml
@@ -1046,7 +1046,7 @@
 		<ratingLevels>B</ratingLevels>
 		<parentFaction>MOC</parentFaction>
 	</faction>
-	<faction key='MOC.MRG' name='Magristracy Royal Guard' minor='false' clan='false' periphery='true'>
+	<faction key='MOC.MRG' name='Magistracy Royal Guard' minor='false' clan='false' periphery='true'>
 		<years>2530-</years>
 		<ratingLevels>A</ratingLevels>
 		<parentFaction>MOC</parentFaction>

diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Lucifer II LCF-R16K.blk b/megamek/data/mechfiles/fighters/TRO3039u/Lucifer II LCF-R16K.blk
@@ -140,11 +140,11 @@ Chatham
 </primaryFactory>
 
 <systemManufacturers>
-CHASSIS:Lockhead/CBM 200
+CHASSIS:Lockheed/CBM 200
 ENGINE:Manatwist 260
 ARMOR:StarScale Type IV
-COMMUNICATIONS:Lockhead/CBM COMSET 100
-TARGETING:Lockhead/CBM TarSet 55
+COMMUNICATIONS:Lockheed/CBM COMSET 100
+TARGETING:Lockheed/CBM TarSet 55
 </systemManufacturers>
 
 

diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Lucifer II LCF-R16KR.blk b/megamek/data/mechfiles/fighters/TRO3039u/Lucifer II LCF-R16KR.blk
@@ -149,9 +149,9 @@ Chatham
 </primaryFactory>
 
 <systemManufacturers>
-CHASSIS:Lockhead/CBM 200
+CHASSIS:Lockheed/CBM 200
 ENGINE:Manatwist 260 XL
 ARMOR:StarScale Type IV
-COMMUNICATIONS:Lockhead/CBM COMSET 100
-TARGETING:Lockhead/CBM TarSet 55
+COMMUNICATIONS:Lockheed/CBM COMSET 100
+TARGETING:Lockheed/CBM TarSet 55
 </systemManufacturers>
diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R15.blk b/megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R15.blk
@@ -142,11 +142,11 @@ Donegal,Fefferfer
 </primaryFactory>
 
 <systemManufacturers>
-CHASSIS:Lockhead/CBM 200
+CHASSIS:Lockheed/CBM 200
 ENGINE:WAS 195
 ARMOR:StarScale Type IV
-COMMUNICATIONS:Lockhead/CBM COMSET 100
-TARGETING:Lockhead/CBM TarSet 55
+COMMUNICATIONS:Lockheed/CBM COMSET 100
+TARGETING:Lockheed/CBM TarSet 55
 </systemManufacturers>
 
 

diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R16.blk b/megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R16.blk
@@ -147,11 +147,11 @@ Donegal
 </primaryFactory>
 
 <systemManufacturers>
-CHASSIS:Lockhead/CBM 200
+CHASSIS:Lockheed/CBM 200
 ENGINE:WAS 195
 ARMOR:StarScale Ferro-Aluminum
-COMMUNICATIONS:Lockhead/CBM COMSET 100
-TARGETING:Lockhead/CBM TarSet 55
+COMMUNICATIONS:Lockheed/CBM COMSET 100
+TARGETING:Lockheed/CBM TarSet 55
 </systemManufacturers>
 
 

diff --git a/megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R20.blk b/megamek/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R20.blk
@@ -136,9 +136,9 @@ Donegal
 </primaryFactory>
 
 <systemManufacturers>
-CHASSIS:Lockhead/CBM 200
+CHASSIS:Lockheed/CBM 200
 ENGINE:WAS 195
 ARMOR:StarScale Type IV
-COMMUNICATIONS:Lockhead/CBM COMSET 100
-TARGETING:Lockhead/CBM TarSet 55
+COMMUNICATIONS:Lockheed/CBM COMSET 100
+TARGETING:Lockheed/CBM TarSet 55
 </systemManufacturers>
diff --git a/megamek/data/mechfiles/fighters/XTRs/Mercenaries/Lucifer LCF-X30.blk b/megamek/data/mechfiles/fighters/XTRs/Mercenaries/Lucifer LCF-X30.blk
@@ -143,11 +143,11 @@ Skye
 </primaryFactory>
 
 <systemManufacturers>
-CHASSIS:Lockhead/CBM 200
+CHASSIS:Lockheed/CBM 200
 ENGINE:Edasich Motors 195 XL
 ARMOR:StarScale Ferro-Aluminum
-COMMUNICATIONS:Lockhead/CBM COMSET 100
-TARGETING:Lockhead/CBM TarSet 55
+COMMUNICATIONS:Lockheed/CBM COMSET 100
+TARGETING:Lockheed/CBM TarSet 55
 </systemManufacturers>
 
 

diff --git a/...ker Absorbtion/Clan (Other)/Aerospace.txt → ...ker Absorption/Clan (Other)/Aerospace.txt b/...ker Absorbtion/Clan (Other)/Aerospace.txt → ...ker Absorption/Clan (Other)/Aerospace.txt
@@ -1,4 +1,4 @@
-Clan (Other) Aerospace Fighters, Widowmaker Absorbtion (2834)
+Clan (Other) Aerospace Fighters, Widowmaker Absorption (2834)
 Cheetah F-10, 1
 Zero ZRO-116b, 2
 Lightning LTN-G15b, 3

diff --git a/...bsorbtion/Clan (Other)/Assault 'Mechs.txt → ...bsorption/Clan (Other)/Assault 'Mechs.txt b/...bsorbtion/Clan (Other)/Assault 'Mechs.txt → ...bsorption/Clan (Other)/Assault 'Mechs.txt
@@ -1,4 +1,4 @@
-Clan (Other) Assault ‘Mechs, Widowmaker Absorbtion (2834)
+Clan (Other) Assault ‘Mechs, Widowmaker Absorption (2834)
 Kraken (Bane) (Standard), 1
 Emperor EMP-6A, 2
 Thug THG-11Eb, 3

diff --git a/... Absorbtion/Clan (Other)/Heavy 'Mechs.txt → ... Absorption/Clan (Other)/Heavy 'Mechs.txt b/... Absorbtion/Clan (Other)/Heavy 'Mechs.txt → ... Absorption/Clan (Other)/Heavy 'Mechs.txt
@@ -1,4 +1,4 @@
-Clan (Other) Heavy ‘Mechs, Widowmaker Absorbtion (2834)
+Clan (Other) Heavy ‘Mechs, Widowmaker Absorption (2834)
 Marauder MAD-1R, 1
 Bombardier BMB-12D, 2
 Archer ARC-2Rb, 3

diff --git a/... Absorbtion/Clan (Other)/Light 'Mechs.txt → ... Absorption/Clan (Other)/Light 'Mechs.txt b/... Absorbtion/Clan (Other)/Light 'Mechs.txt → ... Absorption/Clan (Other)/Light 'Mechs.txt
@@ -1,4 +1,4 @@
-Clan (Other) Light ‘Mechs, Widowmaker Absorbtion (2834)
+Clan (Other) Light ‘Mechs, Widowmaker Absorption (2834)
 Hermes HER-1Sb, 1
 Locust LCT-1Vb, 2
 Firefly FFL-3SLE, 3

diff --git a/...Absorbtion/Clan (Other)/Medium 'Mechs.txt → ...Absorption/Clan (Other)/Medium 'Mechs.txt b/...Absorbtion/Clan (Other)/Medium 'Mechs.txt → ...Absorption/Clan (Other)/Medium 'Mechs.txt
@@ -1,4 +1,4 @@
-Clan (Other) Medium ‘Mechs, Widowmaker Absorbtion (2834)
+Clan (Other) Medium ‘Mechs, Widowmaker Absorption (2834)
 Crab CRB-27b, 1
 Phoenix Hawk PXH-1b (Special), 2
 Mercury II MCY-100, 3

diff --git a/... Absorbtion/Clan Widowmaker/Aerospace.txt → ... Absorption/Clan Widowmaker/Aerospace.txt b/... Absorbtion/Clan Widowmaker/Aerospace.txt → ... Absorption/Clan Widowmaker/Aerospace.txt
@@ -1,4 +1,4 @@
-Clan Widowmaker Aerospace Fighters, Widowmaker Absorbtion (2834)
+Clan Widowmaker Aerospace Fighters, Widowmaker Absorption (2834)
 Trident TRN-3T, 1
 Swift SWF-606, 2
 Hellcat II HCT-213C, 3

diff --git a/...rbtion/Clan Widowmaker/Assault 'Mechs.txt → ...rption/Clan Widowmaker/Assault 'Mechs.txt b/...rbtion/Clan Widowmaker/Assault 'Mechs.txt → ...rption/Clan Widowmaker/Assault 'Mechs.txt
@@ -1,4 +1,4 @@
-Clan Widowmaker Assault ‘Mechs, Widowmaker Absorbtion (2834)
+Clan Widowmaker Assault ‘Mechs, Widowmaker Absorption (2834)
 Nightstar NSR-9J, 1
 King Crab KGC-000b, 2
 Shogun SHG-2H, 3

diff --git a/...sorbtion/Clan Widowmaker/Heavy 'Mechs.txt → ...sorption/Clan Widowmaker/Heavy 'Mechs.txt b/...sorbtion/Clan Widowmaker/Heavy 'Mechs.txt → ...sorption/Clan Widowmaker/Heavy 'Mechs.txt
@@ -1,4 +1,4 @@
-Clan Widowmaker Heavy ‘Mechs, Widowmaker Absorbtion (2834)
+Clan Widowmaker Heavy ‘Mechs, Widowmaker Absorption (2834)
 Guillotine GLT-3N, 1
 Thunderbolt TDR-5Sb, 2
 Ostroc OSR-2Cb, 3

diff --git a/...sorbtion/Clan Widowmaker/Light 'Mechs.txt → ...sorption/Clan Widowmaker/Light 'Mechs.txt b/...sorbtion/Clan Widowmaker/Light 'Mechs.txt → ...sorption/Clan Widowmaker/Light 'Mechs.txt
@@ -1,4 +1,4 @@
-Clan Widowmaker Light ‘Mechs, Widowmaker Absorbtion (2834)
+Clan Widowmaker Light ‘Mechs, Widowmaker Absorption (2834)
 Sling SL-1G, 1
 Hermes HER-1Sb, 2
 Spider SDR-5V, 3

diff --git a/...orbtion/Clan Widowmaker/Medium 'Mechs.txt → ...orption/Clan Widowmaker/Medium 'Mechs.txt b/...orbtion/Clan Widowmaker/Medium 'Mechs.txt → ...orption/Clan Widowmaker/Medium 'Mechs.txt
@@ -1,4 +1,4 @@
-Clan Widowmaker Medium ‘Mechs, Widowmaker Absorbtion (2834)
+Clan Widowmaker Medium ‘Mechs, Widowmaker Absorption (2834)
 Stag II ST-24G, 1
 Griffin GRF-2N, 2
 Dervish DV-6M, 3

diff --git a/...wmaker Absorbtion/Clan Wolf/Aerospace.txt → ...wmaker Absorption/Clan Wolf/Aerospace.txt b/...wmaker Absorbtion/Clan Wolf/Aerospace.txt → ...wmaker Absorption/Clan Wolf/Aerospace.txt
@@ -1,4 +1,4 @@
-Clan Wolf Aerospace Fighters, Widowmaker Absorbtion (2834)
+Clan Wolf Aerospace Fighters, Widowmaker Absorption (2834)
 Rogue RGU-133Eb, 1
 Tomahawk 'C', 2
 Spad SPD-502, 3

diff --git a/...r Absorbtion/Clan Wolf/Assault 'Mechs.txt → ...r Absorption/Clan Wolf/Assault 'Mechs.txt b/...r Absorbtion/Clan Wolf/Assault 'Mechs.txt → ...r Absorption/Clan Wolf/Assault 'Mechs.txt
@@ -1,4 +1,4 @@
-Clan Wolf Assault ‘Mechs, Widowmaker Absorbtion (2834)
+Clan Wolf Assault ‘Mechs, Widowmaker Absorption (2834)
 Highlander HGN-732b, 1
 Crockett CRK-5003-1b, 2
 Stalker STK-3Fb, 3

diff --git a/...ker Absorbtion/Clan Wolf/Heavy 'Mechs.txt → ...ker Absorption/Clan Wolf/Heavy 'Mechs.txt b/...ker Absorbtion/Clan Wolf/Heavy 'Mechs.txt → ...ker Absorption/Clan Wolf/Heavy 'Mechs.txt
@@ -1,4 +1,4 @@
-Clan Wolf Heavy ‘Mechs, Widowmaker Absorbtion (2834)
+Clan Wolf Heavy ‘Mechs, Widowmaker Absorption (2834)
 Exterminator EXT-4Db, 1
 Archer ARC-2Rb, 2
 Warhammer WHM-6Rb, 3

diff --git a/...ker Absorbtion/Clan Wolf/Light 'Mechs.txt → ...ker Absorption/Clan Wolf/Light 'Mechs.txt b/...ker Absorbtion/Clan Wolf/Light 'Mechs.txt → ...ker Absorption/Clan Wolf/Light 'Mechs.txt
@@ -1,4 +1,4 @@
-Clan Wolf Light ‘Mechs, Widowmaker Absorbtion (2834)
+Clan Wolf Light ‘Mechs, Widowmaker Absorption (2834)
 Mongoose MON-66b, 1
 Locust LCT-1Vb, 2
 Hermes HER-1Sb, 3

diff --git a/...er Absorbtion/Clan Wolf/Medium 'Mechs.txt → ...er Absorption/Clan Wolf/Medium 'Mechs.txt b/...er Absorbtion/Clan Wolf/Medium 'Mechs.txt → ...er Absorption/Clan Wolf/Medium 'Mechs.txt
@@ -1,4 +1,4 @@
-Clan Wolf Medium ‘Mechs, Widowmaker Absorbtion (2834)
+Clan Wolf Medium ‘Mechs, Widowmaker Absorption (2834)
 Kintaro KTO-19b, 1
 Hunchback HBK-4G, 2
 Shadow Hawk IIC (Standard), 3

diff --git a/...834) - Widowmaker Absorbtion/Vehicles.txt → ...834) - Widowmaker Absorption/Vehicles.txt b/...834) - Widowmaker Absorbtion/Vehicles.txt → ...834) - Widowmaker Absorption/Vehicles.txt
@@ -1,4 +1,4 @@
-Vehicles, Widowmaker Absorbtion (2834)
+Vehicles, Widowmaker Absorption (2834)
 Kanga Medium Hovertank (Standard), 1
 Galleon Light Tank GAL-100, 2
 Cyrano Gunship (Royal), 3