From 3baf8ae1347b8186025dfaf60a5afed9a8f7c9e4 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Mon, 5 Aug 2013 16:52:14 +0100
Subject: [PATCH] [Change] Simplifying some faction stuff.

---
 dat/faction.xml | 42 ++++++++++--------------------------------
 1 file changed, 10 insertions(+), 32 deletions(-)

diff --git a/dat/faction.xml b/dat/faction.xml
index 65bc534..f828eb4 100644
--- a/dat/faction.xml
+++ b/dat/faction.xml
@@ -9,7 +9,6 @@
 <enemies>
 <enemy>Pirate</enemy>
 <enemy>Collective</enemy>
-<enemy>Draktharr</enemy>
 <enemy>DLF</enemy>
 <enemy>Collective</enemy>
 </enemies>
@@ -25,7 +24,6 @@
 <enemies>
 <enemy>Pirate</enemy>
 <enemy>DLF</enemy>
-<enemy>Draktharr</enemy>
 <enemy>Collective</enemy>
 </enemies>
 </faction>
@@ -33,8 +31,6 @@
 <player>-20</player>
 <enemies>
 <enemy>Empire</enemy>
-<enemy>Aerius</enemy>
-<enemy>Ascendancy</enemy>
 <enemy>Draktharr</enemy>
 <enemy>Tex'nus</enemy>
 <enemy>Collective</enemy>
@@ -56,13 +52,14 @@
 <faction name="Empire">
 <player>0</player>
 <allies>
+<ally>Draktharr</ally>
 <ally>Soromid</ally>
+<ally>Tex'nus</ally>
 <ally>Merchant</ally>
 </allies>
 <enemies>
 <enemy>Pirate</enemy>
 <enemy>DLF</enemy>
-<enemy>Draktharr</enemy>
 <enemy>Collective</enemy>
 </enemies>
 </faction>
@@ -70,8 +67,6 @@
 <player>-100</player>
 <enemies>
 <enemy>Empire</enemy>
-<enemy>Aerius</enemy>
-<enemy>Ascendancy</enemy>
 <enemy>Draktharr</enemy>
 <enemy>Tex'nus</enemy>
 <enemy>Soromid</enemy>
@@ -79,43 +74,24 @@
 <enemy>DLF</enemy>
 </enemies>
 </faction>
-<faction name="Aerius">
-<player>0</player>
-<enemies>
-<enemy>Pirate</enemy>
-<enemy>Collective</enemy>
-<enemy>Draktharr</enemy>
-</enemies>
-</faction>
 <faction name="DLF">
 <longname>Detours Liberation Front</longname>
 <player>-10</player>
 <enemies>
 <enemy>Empire</enemy>
-<enemy>Ascendancy</enemy>
 <enemy>Draktharr</enemy>
 <enemy>Tex'nus</enemy>
 <enemy>Collective</enemy>
 <enemy>Soromid</enemy>
 </enemies>
 </faction>
-<faction name="Ascendancy">
-<player>0</player>
-<enemies>
-<enemy>Pirate</enemy>
-<enemy>Collective</enemy>
-<enemy>Draktharr</enemy>
-</enemies>
-</faction>
 <faction name="Draktharr">
 <longname>House Draktharr</longname>
-<player>-80</player>
+<player>0</player>
+<allies>
+<ally>Empire</ally>
+</allies>
 <enemies>
-<enemy>Empire</enemy>
-<enemy>Aerius</enemy>
-<enemy>Ascendancy</enemy>
-<enemy>Tex'nus</enemy>
-<enemy>Soromid</enemy>
 <enemy>Pirate</enemy>
 <enemy>DLF</enemy>
 <enemy>Collective</enemy>
@@ -124,10 +100,13 @@
 <faction name="Tex'nus">
 <longname>House Tex'nus</longname>
 <player>0</player>
+<allies>
+<ally>Empire</ally>
+</allies>
 <enemies>
 <enemy>Pirate</enemy>
 <enemy>Collective</enemy>
-<enemy>Draktharr</enemy>
+<enemy>DLF</enemy>
 </enemies>
 </faction>
 <faction name="Soromid">
@@ -138,7 +117,6 @@
 <ally>Merchant</ally>
 </allies>
 <enemies>
-<enemy>Draktharr</enemy>
 <enemy>Pirate</enemy>
 <enemy>DLF</enemy>
 <enemy>Collective</enemy>