From 5de77aab151e51b8512426f7c07b15c4cbb36134 Mon Sep 17 00:00:00 2001
From: UlyssesSockdrawer <matthew.d.franklin1@gmail.com>
Date: Sun, 15 Oct 2023 09:41:28 +0100
Subject: [PATCH 1/4] Aurigan Restoration Campaign - Planet Control

This PR makes a lot of assumptions about some rough dates of when the battles might have taken place during the Aurigan Restoration campaign.

By putting joint control for planets between the ARC and ARD factions (and some Taurian control too) my hope is this should get MekHQ to trigger contracts during the war.
---
 .../planetary_systems/system_events.xml       | 80 +++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/MekHQ/data/universe/planetary_systems/system_events.xml b/MekHQ/data/universe/planetary_systems/system_events.xml
index 5ab2562ef3..a428423781 100644
--- a/MekHQ/data/universe/planetary_systems/system_events.xml
+++ b/MekHQ/data/universe/planetary_systems/system_events.xml
@@ -62286,6 +62286,14 @@
         <date>3022-01-01</date>
         <faction source="canon">ARD</faction>
       </event>
+      <event>
+        <date>3025-03-01</date>
+        <faction source="assumption">ARC,ARD</faction>
+      </event>
+      <event>
+        <date>3025-04-01</date>
+        <faction source="assumption">ARD</faction>
+      </event>		  
       <event>
         <date>3026-01-01</date>
         <faction source="canon">ARC</faction>
@@ -132146,6 +132154,10 @@
         <date>3022-01-01</date>
         <faction source="canon">ARD</faction>
       </event>
+      <event>
+        <date>3025-02-15</date>
+        <faction source="assumption">ARC,ARD</faction>
+      </event>		  
       <event>
         <date>3026-01-01</date>
         <faction source="canon">ARC</faction>
@@ -199509,6 +199521,10 @@
         <date>3022-01-01</date>
         <faction source="canon">ARD</faction>
       </event>
+      <event>
+        <date>3025-07-01</date>
+        <faction source="canon">ARC,ARD</faction>
+      </event>		  
       <event>
         <date>3026-01-01</date>
         <faction source="canon">ARC</faction>
@@ -267957,6 +267973,10 @@
         <date>3022-01-01</date>
         <faction source="canon">ARD</faction>
       </event>
+      <event>
+        <date>3025-03-15</date>
+        <faction source="assumption">ARC,ARD</faction>
+      </event>	  
       <event>
         <date>3026-01-01</date>
         <faction source="canon">ARC</faction>
@@ -334855,6 +334875,10 @@
         <date>3022-01-01</date>
         <faction source="canon">ARD</faction>
       </event>
+      <event>
+        <date>3025-06-01</date>
+        <faction source="assumption">ARC,ARD</faction>
+      </event>	  
       <event>
         <date>3026-01-01</date>
         <faction source="canon">ARC</faction>
@@ -385792,6 +385816,10 @@
         <date>3022-01-01</date>
         <faction source="canon">ARD</faction>
       </event>
+      <event>
+        <date>3025-03-01</date>
+        <faction source="assumption">ARC</faction>
+      </event>		  
       <event>
         <date>3026-01-01</date>
         <faction source="canon">ARC</faction>
@@ -404463,6 +404491,10 @@
         <date>3022-01-01</date>
         <faction source="canon">ARD</faction>
       </event>
+      <event>
+        <date>3025-05-01</date>
+        <faction source="assumption">ARC,ARD</faction>
+      </event>	
       <event>
         <date>3026-01-01</date>
         <faction source="canon">ARC</faction>
@@ -522507,6 +522539,10 @@
         <date>3022-01-01</date>
         <faction source="canon">ARD</faction>
       </event>
+      <event>
+        <date>3025-05-15</date>
+        <faction source="assumption">ARC,ARD</faction>
+      </event>	  
       <event>
         <date>3026-01-01</date>
         <faction source="canon">ARC</faction>
@@ -542726,6 +542762,10 @@
         <date>3022-01-01</date>
         <faction source="canon">ARD</faction>
       </event>
+      <event>
+        <date>3025-02-15</date>
+        <faction source="assumption">ARC,ARD</faction>
+      </event>		  
       <event>
         <date>3026-01-01</date>
         <faction source="canon">ARC</faction>
@@ -653432,6 +653472,14 @@
         <date>3022-01-01</date>
         <faction source="canon">ARD</faction>
       </event>
+      <event>
+        <date>3025-02-01</date>
+        <faction source="canon">ARC,ARD</faction>
+      </event>	 
+      <event>
+        <date>3025-04-20</date>
+        <faction source="canon">ARC,ARD,TC</faction>
+      </event>		  
       <event>
         <date>3026-01-01</date>
         <faction source="canon">ARC</faction>
@@ -726298,6 +726346,10 @@
         <date>3022-01-01</date>
         <faction source="canon">ARD</faction>
       </event>
+      <event>
+        <date>3025-02-15</date>
+        <faction source="assumption">ARC,ARD</faction>
+      </event>		  
       <event>
         <date>3026-01-01</date>
         <faction source="canon">ARC</faction>
@@ -783044,6 +783096,14 @@
         <date>3022-01-01</date>
         <faction source="canon">ARD</faction>
       </event>
+      <event>
+        <date>3025-03-01</date>
+        <faction source="assumption">ARC,ARD</faction>
+      </event>	
+      <event>
+        <date>3025-05-01</date>
+        <faction source="assumption">ARC,ARD,TC</faction>
+      </event>		  
       <event>
         <date>3026-01-01</date>
         <faction source="canon">ARC</faction>
@@ -872373,6 +872433,10 @@
         <date>3022-01-01</date>
         <faction source="canon">ARD</faction>
       </event>
+      <event>
+        <date>3025-05-01</date>
+        <faction source="assumption">ARC,ARD,TC</faction>
+      </event>		  
       <event>
         <date>3026-01-01</date>
         <faction source="canon">ARC</faction>
@@ -876224,6 +876288,10 @@
         <date>3022-01-01</date>
         <faction source="canon">ARD</faction>
       </event>
+      <event>
+        <date>3025-03-15</date>
+        <faction source="assumption">ARC,ARD</faction>
+      </event>	  
       <event>
         <date>3026-01-01</date>
         <faction source="canon">ARC</faction>
@@ -914581,6 +914649,14 @@
         <date>3022-01-01</date>
         <faction source="canon">ARD</faction>
       </event>
+      <event>
+        <date>3025-01-25</date>
+        <faction source="assumption">ARC,ARD</faction>
+      </event>
+      <event>
+        <date>3025-02-20</date>
+        <faction source="assumption">ARC</faction>
+      </event>	  
       <event>
         <date>3026-01-01</date>
         <faction source="canon">ARC</faction>
@@ -937008,6 +937084,10 @@
         <date>3022-01-01</date>
         <faction source="canon">ARD</faction>
       </event>
+      <event>
+        <date>3025-03-15</date>
+        <faction source="assumption">ARC,ARD</faction>
+      </event>	  
       <event>
         <date>3026-01-01</date>
         <faction source="canon">ARC</faction>

From ac96755be497c4e18b9399cea1311186b1035a7d Mon Sep 17 00:00:00 2001
From: UlyssesSockdrawer <matthew.d.franklin1@gmail.com>
Date: Sun, 15 Oct 2023 10:17:08 +0100
Subject: [PATCH 2/4] Aurigan Restoration Campaign - War Dates

Changed the war dates in FactionHints to match the planetary control data, to support contract generation in MHQ.
---
 MekHQ/data/universe/factionhints.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MekHQ/data/universe/factionhints.xml b/MekHQ/data/universe/factionhints.xml
index 89ec508b2c..0a243c6c35 100644
--- a/MekHQ/data/universe/factionhints.xml
+++ b/MekHQ/data/universe/factionhints.xml
@@ -234,8 +234,8 @@ they shouldn't be fighting DC and Stone's Coalition, so I make them neutral for
 		<parties>FWL,FWLR</parties>
 	</war>
 
-	<!-- Aurigan Civil War: setting for HBS' BattleTech game. The dates are very roughly estimated based on descriptions in game and in the sourcebook. That means they are semi-canon, and should be updated if possible -->
-	<war name="Aurigan Civil War" start="3025-01-25" end ="3025-09-01">
+	<!-- Aurigan Civil War: setting for HBS' BattleTech game. The dates are very roughly estimated based on descriptions in game and in the sourcebook. That means they are semi-canon, and should be updated if possible. Ulysses Update: Changed these to match the planetary control dates better in MHQ to help contract generation. -->
+	<war name="Aurigan Civil War" start="3025-01-01" end ="3025-12-30">
 		<parties>ARC,ARD</parties>
 		<parties start="3025-05-09" end="3025-08-15">ARC,TC</parties>
 	</war>

From 589895ba2618a442aab6a3e64949bc9c1af54bc7 Mon Sep 17 00:00:00 2001
From: UlyssesSockdrawer <matthew.d.franklin1@gmail.com>
Date: Sun, 15 Oct 2023 11:45:42 +0100
Subject: [PATCH 3/4] Corrected war start date

Corrected Arano restoration war start date to match first planet control change.
---
 MekHQ/data/universe/factionhints.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MekHQ/data/universe/factionhints.xml b/MekHQ/data/universe/factionhints.xml
index 0a243c6c35..10cdd9b0a0 100644
--- a/MekHQ/data/universe/factionhints.xml
+++ b/MekHQ/data/universe/factionhints.xml
@@ -235,7 +235,7 @@ they shouldn't be fighting DC and Stone's Coalition, so I make them neutral for
 	</war>
 
 	<!-- Aurigan Civil War: setting for HBS' BattleTech game. The dates are very roughly estimated based on descriptions in game and in the sourcebook. That means they are semi-canon, and should be updated if possible. Ulysses Update: Changed these to match the planetary control dates better in MHQ to help contract generation. -->
-	<war name="Aurigan Civil War" start="3025-01-01" end ="3025-12-30">
+	<war name="Aurigan Civil War" start="3025-01-25" end ="3025-12-30">
 		<parties>ARC,ARD</parties>
 		<parties start="3025-05-09" end="3025-08-15">ARC,TC</parties>
 	</war>

From 659330b1a10edddcb112491c7b874996ebc8bf8b Mon Sep 17 00:00:00 2001
From: UlyssesSockdrawer <matthew.d.franklin1@gmail.com>
Date: Sun, 15 Oct 2023 12:16:36 +0100
Subject: [PATCH 4/4] Arano Restoration - more planet changes

Rationalised the planet changes a bit more after testing. Tested contracts generate correctly and the universe isn't broken.

This should now allow players to follow along and play out some of the actions of the Restoration campaign.
---
 .../planetary_systems/system_events.xml       | 64 ++++++++++++++++---
 1 file changed, 54 insertions(+), 10 deletions(-)

diff --git a/MekHQ/data/universe/planetary_systems/system_events.xml b/MekHQ/data/universe/planetary_systems/system_events.xml
index a428423781..ef1e50eb66 100644
--- a/MekHQ/data/universe/planetary_systems/system_events.xml
+++ b/MekHQ/data/universe/planetary_systems/system_events.xml
@@ -132155,9 +132155,13 @@
         <faction source="canon">ARD</faction>
       </event>
       <event>
-        <date>3025-02-15</date>
+        <date>3025-01-25</date>
         <faction source="assumption">ARC,ARD</faction>
-      </event>		  
+      </event>	
+      <event>
+        <date>3025-03-01</date>
+        <faction source="assumption">ARC</faction>
+      </event>	  
       <event>
         <date>3026-01-01</date>
         <faction source="canon">ARC</faction>
@@ -199522,7 +199526,7 @@
         <faction source="canon">ARD</faction>
       </event>
       <event>
-        <date>3025-07-01</date>
+        <date>3025-09-01</date>
         <faction source="canon">ARC,ARD</faction>
       </event>		  
       <event>
@@ -289004,6 +289008,14 @@
         <date>3022-01-01</date>
         <faction source="canon">ARD</faction>
       </event>
+      <event>
+        <date>3025-01-25</date>
+        <faction source="assumption">ARC,ARD</faction>
+      </event>		  
+      <event>
+        <date>3025-03-01</date>
+        <faction source="assumption">ARC</faction>
+      </event>	  
       <event>
         <date>3026-01-01</date>
         <faction source="canon">ARC</faction>
@@ -334876,7 +334888,7 @@
         <faction source="canon">ARD</faction>
       </event>
       <event>
-        <date>3025-06-01</date>
+        <date>3025-07-01</date>
         <faction source="assumption">ARC,ARD</faction>
       </event>	  
       <event>
@@ -385816,6 +385828,10 @@
         <date>3022-01-01</date>
         <faction source="canon">ARD</faction>
       </event>
+      <event>
+        <date>3025-01-25</date>
+        <faction source="assumption">ARC,ARD</faction>
+      </event>	  
       <event>
         <date>3025-03-01</date>
         <faction source="assumption">ARC</faction>
@@ -404495,6 +404511,10 @@
         <date>3025-05-01</date>
         <faction source="assumption">ARC,ARD</faction>
       </event>	
+      <event>
+        <date>3025-08-01</date>
+        <faction source="assumption">ARC</faction>
+      </event>		  
       <event>
         <date>3026-01-01</date>
         <faction source="canon">ARC</faction>
@@ -522542,7 +522562,11 @@
       <event>
         <date>3025-05-15</date>
         <faction source="assumption">ARC,ARD</faction>
-      </event>	  
+      </event>	
+      <event>
+        <date>3025-08-01</date>
+        <faction source="assumption">ARC</faction>
+      </event>		  
       <event>
         <date>3026-01-01</date>
         <faction source="canon">ARC</faction>
@@ -542763,8 +542787,12 @@
         <faction source="canon">ARD</faction>
       </event>
       <event>
-        <date>3025-02-15</date>
+        <date>3025-01-25</date>
         <faction source="assumption">ARC,ARD</faction>
+      </event>	
+      <event>
+        <date>3025-03-01</date>
+        <faction source="assumption">ARC</faction>
       </event>		  
       <event>
         <date>3026-01-01</date>
@@ -653473,12 +653501,16 @@
         <faction source="canon">ARD</faction>
       </event>
       <event>
-        <date>3025-02-01</date>
-        <faction source="canon">ARC,ARD</faction>
+        <date>3025-02-15</date>
+        <faction source="assumption">ARC,ARD</faction>
       </event>	 
       <event>
         <date>3025-04-20</date>
-        <faction source="canon">ARC,ARD,TC</faction>
+        <faction source="assumption">ARC,ARD,TC</faction>
+      </event>	
+      <event>
+        <date>3025-08-15</date>
+        <faction source="assumption">ARC</faction>
       </event>		  
       <event>
         <date>3026-01-01</date>
@@ -726347,8 +726379,12 @@
         <faction source="canon">ARD</faction>
       </event>
       <event>
-        <date>3025-02-15</date>
+        <date>3025-01-25</date>
         <faction source="assumption">ARC,ARD</faction>
+      </event>	
+      <event>
+        <date>3025-03-01</date>
+        <faction source="assumption">ARC</faction>
       </event>		  
       <event>
         <date>3026-01-01</date>
@@ -783103,6 +783139,10 @@
       <event>
         <date>3025-05-01</date>
         <faction source="assumption">ARC,ARD,TC</faction>
+      </event>	
+      <event>
+        <date>3025-08-15</date>
+        <faction source="assumption">ARC</faction>
       </event>		  
       <event>
         <date>3026-01-01</date>
@@ -872436,6 +872476,10 @@
       <event>
         <date>3025-05-01</date>
         <faction source="assumption">ARC,ARD,TC</faction>
+      </event>	
+      <event>
+        <date>3025-08-15</date>
+        <faction source="assumption">ARC</faction>
       </event>		  
       <event>
         <date>3026-01-01</date>