Skip to content

Commit 84ceb86

Browse files
authored
Merge pull request #3866 from IllianiCBT/factions
[Refactoring] Fixed Typo and Removed Indents
2 parents 47ea25c + 10b7a17 commit 84ceb86

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

Diff for: MekHQ/data/universe/factions.xml

+18-15
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ Joshua Bartz (Bonepart)
1010
Modified 21-MAR-2021
1111
Justin 'Windchild' Bowen
1212
13+
Modified MAR-2024
14+
IllianiCBT
15+
1316
This file defines the factions used by MekHQ. Keep in mind that the faction shortnames are used by the planets.xml file, so if you remove a faction here, you need to remove all references to it in that file. Not all of the factions listed here are available to play by default. To add a faction as playable, just add the playable tag.
1417
1518
Here is a description of what goes in each faction tag
@@ -94,7 +97,7 @@ successor - unimplemented tag describing another faction code as the specified f
9497
</faction>
9598
<faction>
9699
<shortname>Alf</shortname>
97-
<fullname>Alfrik</fullname>
100+
<fullname>Alfik</fullname>
98101
<colorRGB>103,169,57</colorRGB>
99102
<tags>is,minor</tags>
100103
<start>2200</start> <!-- estimated -->
@@ -1058,7 +1061,7 @@ successor - unimplemented tag describing another faction code as the specified f
10581061
<start>3078</start>
10591062
<end>3139</end>
10601063
</faction>
1061-
<faction>
1064+
<faction>
10621065
<shortname>DT</shortname>
10631066
<fullname>Duchy of Tamarind</fullname>
10641067
<startingPlanet>Tamarind</startingPlanet>
@@ -1083,7 +1086,7 @@ successor - unimplemented tag describing another faction code as the specified f
10831086
<shortname>CEI</shortname>
10841087
<fullname>Escorpión Imperio</fullname>
10851088
<altNamesByYear year='3141'>Scorpion Empire</altNamesByYear>
1086-
<!-- Per Hanseatic Crusade PDF, the Empire was formed at the end of the war, in 3141 -->
1089+
<!-- Per Hanseatic Crusade PDF, the Empire was formed at the end of the war, in 3141 -->
10871090
<alternativeFactionCodes>CGS,NC,UC</alternativeFactionCodes>
10881091
<startingPlanet>Granada</startingPlanet>
10891092
<eraMods>1,1,1,1,2,3,2,2,1</eraMods>
@@ -1185,7 +1188,7 @@ successor - unimplemented tag describing another faction code as the specified f
11851188
<layeredForceIconLogoFilename>Hanseatic League.png</layeredForceIconLogoFilename>
11861189
<tags>deep_periphery,playable</tags>
11871190
<start>2891</start>
1188-
<end>3141</end>
1191+
<end>3141</end>
11891192
</faction>
11901193
<faction>
11911194
<shortname>IP</shortname>
@@ -1919,7 +1922,7 @@ successor - unimplemented tag describing another faction code as the specified f
19191922
<layeredForceIconLogoFilename>Umayyad Caliphate.png</layeredForceIconLogoFilename>
19201923
<tags>deep_periphery</tags>
19211924
<start>2830</start>
1922-
<end>3080</end>
1925+
<end>3080</end>
19231926
</faction>
19241927
<faction>
19251928
<shortname>REB</shortname>
@@ -2066,51 +2069,51 @@ successor - unimplemented tag describing another faction code as the specified f
20662069
<tags>periphery,minor</tags>
20672070
<start>3148</start>
20682071
</faction>
2069-
2070-
<!-- Tamar Rising Factions -->
2071-
<faction>
2072+
2073+
<!-- Tamar Rising Factions -->
2074+
<faction>
20722075
<shortname>AML</shortname>
20732076
<fullname>Alyina Mercantile League</fullname>
20742077
<startingPlanet>Alyina</startingPlanet>
20752078
<colorRGB>47,124,50</colorRGB>
20762079
<tags>clan,minor</tags>
20772080
<start>3151</start>
20782081
</faction>
2079-
<faction>
2082+
<faction>
20802083
<shortname>NTamP</shortname>
20812084
<fullname>Tamar Pact</fullname>
20822085
<startingPlanet>Arcturus</startingPlanet>
20832086
<colorRGB>245,63,81</colorRGB>
20842087
<tags>is,minor</tags>
20852088
<start>3151</start>
20862089
</faction>
2087-
<faction>
2090+
<faction>
20882091
<shortname>VSM</shortname>
20892092
<fullname>Vesper Marches</fullname>
20902093
<startingPlanet>Melissia</startingPlanet>
20912094
<colorRGB>235,162,235</colorRGB>
20922095
<tags>is,minor</tags>
20932096
<start>3151</start>
20942097
</faction>
2095-
<faction>
2098+
<faction>
20962099
<shortname>ARL</shortname>
20972100
<fullname>Arc Royal Liberty Coalition</fullname>
20982101
<startingPlanet>Arc-Royal</startingPlanet>
20992102
<colorRGB>39,212,200</colorRGB>
21002103
<tags>is,minor</tags>
21012104
<start>3151</start>
21022105
</faction>
2103-
<faction>
2106+
<faction>
21042107
<shortname>MalC</shortname>
21052108
<fullname>Malthus Confederation</fullname>
21062109
<startingPlanet>Dustball</startingPlanet>
21072110
<colorRGB>93,133,147</colorRGB>
21082111
<tags>is,minor</tags>
21092112
<start>3151</start>
21102113
</faction>
2111-
2112-
<!-- Dominions Divided Factions -->
2113-
<faction>
2114+
2115+
<!-- Dominions Divided Factions -->
2116+
<faction>
21142117
<shortname>IoS</shortname>
21152118
<fullname>Isle of Skye</fullname>
21162119
<startingPlanet>Skye</startingPlanet>

0 commit comments

Comments
 (0)