From 43b86d39378081de20dfa98adbd30af4c758d2e1 Mon Sep 17 00:00:00 2001
From: tsigiarocc <tsigiarocc@localhost>
Date: Sun, 28 Dec 2008 08:18:55 +0000
Subject: [PATCH] Updated cup and league schedules and added national supercup.

---
 .../europe/england/country_england.xml        |  2 +-
 .../europe/england/cup_england_fa.xml         | 23 +++++++++++--
 .../england/cup_england_league_vs_cup.xml     | 32 +++++++++++++++++++
 .../europe/england/league_england1.xml        | 11 +++++--
 .../europe/england/league_england2.xml        | 20 ++++++++++--
 .../europe/england/league_england3.xml        | 15 +++++++--
 .../europe/england/league_england4.xml        | 19 +++++++++--
 .../europe/england/league_england5.xml        | 19 +++++++++--
 8 files changed, 122 insertions(+), 19 deletions(-)
 create mode 100755 support_files/definitions/europe/england/cup_england_league_vs_cup.xml

diff --git a/support_files/definitions/europe/england/country_england.xml b/support_files/definitions/europe/england/country_england.xml
index c77cc892..3d0dedee 100644
--- a/support_files/definitions/europe/england/country_england.xml
+++ b/support_files/definitions/europe/england/country_england.xml
@@ -18,9 +18,9 @@
     <cup>england_league</cup>
     <cup>europe_uefa</cup>
     <cup>europe_champ_league</cup>
-    <cup>supercup_league_vs_cup</cup>
     <cup>supercup_europe_uefa</cup>
     <cup>supercup_europe_intercontinental</cup>
+    <cup>england_league_vs_cup</cup>
     <cup>england_prom_games2</cup>
     <cup>england_prom_games3</cup>
     <cup>england_prom_games4</cup>
diff --git a/support_files/definitions/europe/england/cup_england_fa.xml b/support_files/definitions/europe/england/cup_england_fa.xml
index 890c6b56..2c6f4c25 100644
--- a/support_files/definitions/europe/england/cup_england_fa.xml
+++ b/support_files/definitions/europe/england/cup_england_fa.xml
@@ -4,7 +4,7 @@
   <short_name>FA Cup</short_name>
   <symbol>flag_england.png</symbol>
   <sid>england_fa</sid>
-  <last_week>47</last_week>
+  <last_week>48</last_week>
   <week_gap>4</week_gap>
   <property>national</property>
 
@@ -18,52 +18,69 @@
 	<choose_team>
 	  <choose_team_sid>england3</choose_team_sid>
 	</choose_team>
+
 	<choose_team>
 	  <choose_team_sid>england4</choose_team_sid>
 	</choose_team>
+
 	<choose_team>
 	  <choose_team_sid>england5</choose_team_sid>
 	</choose_team>
       </choose_teams>
-
+      <delay>-1</delay>
     </cup_round>
+
     <cup_round>
       <home_away>0</home_away>
       <replay>1</replay>
       <byes>0</byes>
+      <delay>-2</delay>
     </cup_round>
+
     <cup_round>
       <home_away>0</home_away>
       <replay>1</replay>
+
       <choose_teams>
 	<choose_team>
 	  <choose_team_sid>england1</choose_team_sid>
 	</choose_team>
+
 	<choose_team>
 	  <choose_team_sid>england2</choose_team_sid>
 	</choose_team>
       </choose_teams>
+      <delay>-1</delay>
     </cup_round>
+
     <cup_round>
       <home_away>0</home_away>
       <replay>1</replay>
+      <delay>-2</delay>
     </cup_round>
+
     <cup_round>
       <home_away>0</home_away>
       <replay>1</replay>
+      <delay>-3</delay>
     </cup_round>
+
     <cup_round>
       <home_away>0</home_away>
       <replay>1</replay>
+      <delay>-4</delay>
     </cup_round>
+
     <cup_round>
       <home_away>0</home_away>
       <neutral>1</neutral>
       <replay>1</replay>
+      <delay>-3</delay>
     </cup_round>
+
     <cup_round>
       <home_away>0</home_away>
       <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
-</cup>
+</cup>
\ No newline at end of file
diff --git a/support_files/definitions/europe/england/cup_england_league_vs_cup.xml b/support_files/definitions/europe/england/cup_england_league_vs_cup.xml
new file mode 100755
index 00000000..e25ba08f
--- /dev/null
+++ b/support_files/definitions/europe/england/cup_england_league_vs_cup.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>	
+<cup>
+  <name>Community Shield</name>
+  <short_name>Com. Shield</short_name>
+  <sid>england_league_vs_cup</sid>
+  <last_week>6</last_week>
+  <property>national</property>
+
+  <cup_rounds>
+    <cup_round>
+      <home_away>0</home_away>
+      <neutral>1</neutral>
+
+      <choose_teams>
+	<choose_team>
+	  <choose_team_sid>england_fa</choose_team_sid>
+	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>2</end_idx>
+	</choose_team>
+
+	<choose_team>
+	  <choose_team_sid>england1</choose_team_sid>
+	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>1</end_idx>
+	</choose_team>
+      </choose_teams>
+
+    </cup_round>
+  </cup_rounds>
+</cup>
diff --git a/support_files/definitions/europe/england/league_england1.xml b/support_files/definitions/europe/england/league_england1.xml
index d6b4a1fb..79efbfb0 100644
--- a/support_files/definitions/europe/england/league_england1.xml
+++ b/support_files/definitions/europe/england/league_england1.xml
@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <league>
-
   <sid>england1</sid>
   <name>Premiership</name>
   <short_name>Prem.</short_name>
   <symbol>flag_england.png</symbol>
-  <first_week>2</first_week>
+  <first_week>7</first_week>
   <week_gap>1</week_gap>
+  <break_in length="1">10</break_in>
+  <break_in length="1">15</break_in>
+  <break_in length="1">27</break_in>
+  <break_in length="1">39</break_in> 
   <average_talent>8500</average_talent>
   <names_file>england</names_file>
   <yellow_red>5</yellow_red>
+  <two_match_week_start>18</two_match_week_start>
+  <two_match_week_end>19</two_match_week_end>
 
   <prom_rel>
     <prom_rel_element>
@@ -82,4 +87,4 @@
       <team_name>Wigan</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/england/league_england2.xml b/support_files/definitions/europe/england/league_england2.xml
index de6961e0..5bf640c9 100644
--- a/support_files/definitions/europe/england/league_england2.xml
+++ b/support_files/definitions/europe/england/league_england2.xml
@@ -1,15 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <league>
-
   <sid>england2</sid>
   <name>Football League Championship</name>
   <short_name>Championship</short_name>
   <symbol>flag_england.png</symbol>
-  <first_week>1</first_week>
+  <first_week>6</first_week>
   <week_gap>1</week_gap>
   <average_talent>7600</average_talent>
   <names_file>england</names_file>
   <yellow_red>5</yellow_red>
+  <two_match_week_start>11</two_match_week_start> 
+  <two_match_week_end>12</two_match_week_end>
+  <two_match_week_start>17</two_match_week_start> 
+  <two_match_week_end>18</two_match_week_end>
+  <two_match_week_start>21</two_match_week_start> 
+  <two_match_week_end>22</two_match_week_end>
+  <two_match_week_start>24</two_match_week_start> 
+  <two_match_week_end>25</two_match_week_end>
+  <two_match_week_start>31</two_match_week_start> 
+  <two_match_week_end>32</two_match_week_end>
+  <two_match_week_start>36</two_match_week_start> 
+  <two_match_week_end>37</two_match_week_end>
+  <two_match_week_start>43</two_match_week_start> 
+  <two_match_week_end>44</two_match_week_end>
+
 
   <prom_rel>
 
@@ -108,4 +122,4 @@
       <team_name>Wolverhampton</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/england/league_england3.xml b/support_files/definitions/europe/england/league_england3.xml
index ce3f2d80..c6693e60 100644
--- a/support_files/definitions/europe/england/league_england3.xml
+++ b/support_files/definitions/europe/england/league_england3.xml
@@ -1,15 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <league>
-
   <sid>england3</sid>
   <name>Football League One</name>
   <short_name>League One</short_name>
   <symbol>flag_england.png</symbol>
-  <first_week>1</first_week>
+  <first_week>6</first_week>
   <week_gap>1</week_gap>
   <average_talent>6800</average_talent>
   <names_file>england</names_file>
   <yellow_red>5</yellow_red>
+  <two_match_week_start>7</two_match_week_start> 
+  <two_match_week_end>8</two_match_week_end>
+  <two_match_week_start>13</two_match_week_start> 
+  <two_match_week_end>14</two_match_week_end>
+  <two_match_week_start>24</two_match_week_start> 
+  <two_match_week_end>25</two_match_week_end>
+  <two_match_week_start>31</two_match_week_start> 
+  <two_match_week_end>32</two_match_week_end>
+  <two_match_week_start>36</two_match_week_start> 
+  <two_match_week_end>37</two_match_week_end>
 
   <prom_rel>
 
@@ -108,4 +117,4 @@
       <team_name>Yeovil</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/england/league_england4.xml b/support_files/definitions/europe/england/league_england4.xml
index f47b1755..1fbeb55d 100644
--- a/support_files/definitions/europe/england/league_england4.xml
+++ b/support_files/definitions/europe/england/league_england4.xml
@@ -1,15 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <league>
-
   <sid>england4</sid>
   <name>Football League Two</name>
   <short_name>League Two</short_name>
   <symbol>flag_england.png</symbol>
-  <first_week>1</first_week>
+  <first_week>6</first_week>
   <week_gap>1</week_gap>
   <average_talent>6200</average_talent>
   <names_file>england</names_file>
   <yellow_red>5</yellow_red>
+  <two_match_week_start>11</two_match_week_start> 
+  <two_match_week_end>12</two_match_week_end>
+  <two_match_week_start>17</two_match_week_start> 
+  <two_match_week_end>18</two_match_week_end>
+  <two_match_week_start>22</two_match_week_start> 
+  <two_match_week_end>23</two_match_week_end>
+  <two_match_week_start>25</two_match_week_start> 
+  <two_match_week_end>26</two_match_week_end>
+  <two_match_week_start>31</two_match_week_start> 
+  <two_match_week_end>32</two_match_week_end>
+  <two_match_week_start>36</two_match_week_start> 
+  <two_match_week_end>37</two_match_week_end>
+  <two_match_week_start>43</two_match_week_start> 
+  <two_match_week_end>44</two_match_week_end>
 
   <prom_rel>
 
@@ -108,4 +121,4 @@
       <team_name>Wycombe</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/england/league_england5.xml b/support_files/definitions/europe/england/league_england5.xml
index 1e7772ac..ea223d19 100644
--- a/support_files/definitions/europe/england/league_england5.xml
+++ b/support_files/definitions/europe/england/league_england5.xml
@@ -1,15 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <league>
-
   <sid>england5</sid>
   <name>National Conference</name>
   <short_name>Conference</short_name>
   <symbol>flag_england.png</symbol>
-  <first_week>1</first_week>
+  <first_week>6</first_week>
   <week_gap>1</week_gap>
   <average_talent>5800</average_talent>
   <names_file>england</names_file>
   <yellow_red>5</yellow_red>
+  <two_match_week_start>11</two_match_week_start> 
+  <two_match_week_end>12</two_match_week_end>
+  <two_match_week_start>17</two_match_week_start> 
+  <two_match_week_end>18</two_match_week_end>
+  <two_match_week_start>22</two_match_week_start> 
+  <two_match_week_end>23</two_match_week_end>
+  <two_match_week_start>25</two_match_week_start> 
+  <two_match_week_end>26</two_match_week_end>
+  <two_match_week_start>31</two_match_week_start> 
+  <two_match_week_end>32</two_match_week_end>
+  <two_match_week_start>36</two_match_week_start> 
+  <two_match_week_end>37</two_match_week_end>
+  <two_match_week_start>43</two_match_week_start> 
+  <two_match_week_end>44</two_match_week_end>
 
   <prom_rel>
     <prom_games>
@@ -99,4 +112,4 @@
       <team_name>York</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file