Skip to content

Commit

Permalink
Merge pull request #3866 from IllianiCBT/factions
Browse files Browse the repository at this point in the history
[Refactoring] Fixed Typo and Removed Indents
  • Loading branch information
HammerGS authored Mar 13, 2024
2 parents 47ea25c + 10b7a17 commit 84ceb86
Showing 1 changed file with 18 additions and 15 deletions.
33 changes: 18 additions & 15 deletions MekHQ/data/universe/factions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ Joshua Bartz (Bonepart)
Modified 21-MAR-2021
Justin 'Windchild' Bowen
Modified MAR-2024
IllianiCBT
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.
Here is a description of what goes in each faction tag
Expand Down Expand Up @@ -94,7 +97,7 @@ successor - unimplemented tag describing another faction code as the specified f
</faction>
<faction>
<shortname>Alf</shortname>
<fullname>Alfrik</fullname>
<fullname>Alfik</fullname>
<colorRGB>103,169,57</colorRGB>
<tags>is,minor</tags>
<start>2200</start> <!-- estimated -->
Expand Down Expand Up @@ -1058,7 +1061,7 @@ successor - unimplemented tag describing another faction code as the specified f
<start>3078</start>
<end>3139</end>
</faction>
<faction>
<faction>
<shortname>DT</shortname>
<fullname>Duchy of Tamarind</fullname>
<startingPlanet>Tamarind</startingPlanet>
Expand All @@ -1083,7 +1086,7 @@ successor - unimplemented tag describing another faction code as the specified f
<shortname>CEI</shortname>
<fullname>Escorpión Imperio</fullname>
<altNamesByYear year='3141'>Scorpion Empire</altNamesByYear>
<!-- Per Hanseatic Crusade PDF, the Empire was formed at the end of the war, in 3141 -->
<!-- Per Hanseatic Crusade PDF, the Empire was formed at the end of the war, in 3141 -->
<alternativeFactionCodes>CGS,NC,UC</alternativeFactionCodes>
<startingPlanet>Granada</startingPlanet>
<eraMods>1,1,1,1,2,3,2,2,1</eraMods>
Expand Down Expand Up @@ -1185,7 +1188,7 @@ successor - unimplemented tag describing another faction code as the specified f
<layeredForceIconLogoFilename>Hanseatic League.png</layeredForceIconLogoFilename>
<tags>deep_periphery,playable</tags>
<start>2891</start>
<end>3141</end>
<end>3141</end>
</faction>
<faction>
<shortname>IP</shortname>
Expand Down Expand Up @@ -1919,7 +1922,7 @@ successor - unimplemented tag describing another faction code as the specified f
<layeredForceIconLogoFilename>Umayyad Caliphate.png</layeredForceIconLogoFilename>
<tags>deep_periphery</tags>
<start>2830</start>
<end>3080</end>
<end>3080</end>
</faction>
<faction>
<shortname>REB</shortname>
Expand Down Expand Up @@ -2066,51 +2069,51 @@ successor - unimplemented tag describing another faction code as the specified f
<tags>periphery,minor</tags>
<start>3148</start>
</faction>
<!-- Tamar Rising Factions -->
<faction>

<!-- Tamar Rising Factions -->
<faction>
<shortname>AML</shortname>
<fullname>Alyina Mercantile League</fullname>
<startingPlanet>Alyina</startingPlanet>
<colorRGB>47,124,50</colorRGB>
<tags>clan,minor</tags>
<start>3151</start>
</faction>
<faction>
<faction>
<shortname>NTamP</shortname>
<fullname>Tamar Pact</fullname>
<startingPlanet>Arcturus</startingPlanet>
<colorRGB>245,63,81</colorRGB>
<tags>is,minor</tags>
<start>3151</start>
</faction>
<faction>
<faction>
<shortname>VSM</shortname>
<fullname>Vesper Marches</fullname>
<startingPlanet>Melissia</startingPlanet>
<colorRGB>235,162,235</colorRGB>
<tags>is,minor</tags>
<start>3151</start>
</faction>
<faction>
<faction>
<shortname>ARL</shortname>
<fullname>Arc Royal Liberty Coalition</fullname>
<startingPlanet>Arc-Royal</startingPlanet>
<colorRGB>39,212,200</colorRGB>
<tags>is,minor</tags>
<start>3151</start>
</faction>
<faction>
<faction>
<shortname>MalC</shortname>
<fullname>Malthus Confederation</fullname>
<startingPlanet>Dustball</startingPlanet>
<colorRGB>93,133,147</colorRGB>
<tags>is,minor</tags>
<start>3151</start>
</faction>
<!-- Dominions Divided Factions -->
<faction>

<!-- Dominions Divided Factions -->
<faction>
<shortname>IoS</shortname>
<fullname>Isle of Skye</fullname>
<startingPlanet>Skye</startingPlanet>
Expand Down

0 comments on commit 84ceb86

Please sign in to comment.