From 5b03ec68878e47c03bc1bfedce9ef1b2ed385100 Mon Sep 17 00:00:00 2001
From: markc77 <markc77@localhost>
Date: Sun, 14 May 2006 18:54:49 +0000
Subject: [PATCH] Scotland 2006/7

---
 .../definitions/scotland/country_scotland.xml |  2 ++
 .../scotland/cup_scotland_prom_games2.xml     | 32 +++++++++++++++++++
 .../scotland/cup_scotland_prom_games3.xml     | 32 +++++++++++++++++++
 .../definitions/scotland/league_scotland1.xml |  4 +--
 .../definitions/scotland/league_scotland2.xml | 12 +++----
 .../definitions/scotland/league_scotland3.xml | 24 ++++++++------
 .../definitions/scotland/league_scotland4.xml | 22 ++++++++-----
 7 files changed, 103 insertions(+), 25 deletions(-)
 create mode 100644 support_files/definitions/scotland/cup_scotland_prom_games2.xml
 create mode 100644 support_files/definitions/scotland/cup_scotland_prom_games3.xml

diff --git a/support_files/definitions/scotland/country_scotland.xml b/support_files/definitions/scotland/country_scotland.xml
index ae61f676..c4b33b7e 100644
--- a/support_files/definitions/scotland/country_scotland.xml
+++ b/support_files/definitions/scotland/country_scotland.xml
@@ -14,6 +14,8 @@
   <cups>
     <cup>scotland_fa</cup>
     <cup>scotland_league</cup>
+    <cup>scotland_prom_games2</cup>
+    <cup>scotland_prom_games3</cup>
     <cup>europe_uefa</cup>
     <cup>europe_cwc</cup>
     <cup>europe_champ_league</cup>
diff --git a/support_files/definitions/scotland/cup_scotland_prom_games2.xml b/support_files/definitions/scotland/cup_scotland_prom_games2.xml
new file mode 100644
index 00000000..5279a5d0
--- /dev/null
+++ b/support_files/definitions/scotland/cup_scotland_prom_games2.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cup>
+  <name>Play-Off for Division One</name>
+  <short_name>Play-Off D1.</short_name>
+  <symbol>flag_scotland.png</symbol>
+  <sid>scotland_prom_games2</sid>
+  <add_week>1000</add_week>
+  <property>national</property>
+  <property>highlight2</property>
+
+  <cup_rounds>
+    <cup_round>
+      <choose_teams>
+        <choose_team>
+          <choose_team_sid>scotland2</choose_team_sid>
+          <number_of_teams>1</number_of_teams>
+          <start_idx>9</start_idx>
+          <end_idx>9</end_idx>
+        </choose_team>
+        <choose_team>
+          <choose_team_sid>scotland3</choose_team_sid>
+          <number_of_teams>3</number_of_teams>
+          <start_idx>2</start_idx>
+          <end_idx>4</end_idx>
+        </choose_team>
+      </choose_teams>
+    </cup_round>
+
+    <cup_round>
+    </cup_round>
+  </cup_rounds>
+</cup>
diff --git a/support_files/definitions/scotland/cup_scotland_prom_games3.xml b/support_files/definitions/scotland/cup_scotland_prom_games3.xml
new file mode 100644
index 00000000..7997cce5
--- /dev/null
+++ b/support_files/definitions/scotland/cup_scotland_prom_games3.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cup>
+  <name>Play-Off for Division Two</name>
+  <short_name>Play-Off D2.</short_name>
+  <symbol>flag_scotland.png</symbol>
+  <sid>scotland_prom_games3</sid>
+  <add_week>1000</add_week>
+  <property>national</property>
+  <property>highlight2</property>
+
+  <cup_rounds>
+    <cup_round>
+      <choose_teams>
+        <choose_team>
+          <choose_team_sid>scotland3</choose_team_sid>
+          <number_of_teams>1</number_of_teams>
+          <start_idx>9</start_idx>
+          <end_idx>9</end_idx>
+        </choose_team>
+        <choose_team>
+          <choose_team_sid>scotland4</choose_team_sid>
+          <number_of_teams>3</number_of_teams>
+          <start_idx>2</start_idx>
+          <end_idx>4</end_idx>
+        </choose_team>
+      </choose_teams>
+    </cup_round>
+
+    <cup_round>
+    </cup_round>
+  </cup_rounds>
+</cup>
diff --git a/support_files/definitions/scotland/league_scotland1.xml b/support_files/definitions/scotland/league_scotland1.xml
index 02527fbb..58c45bef 100644
--- a/support_files/definitions/scotland/league_scotland1.xml
+++ b/support_files/definitions/scotland/league_scotland1.xml
@@ -52,10 +52,10 @@
       <team_name>Kilmarnock</team_name>
     </team>
     <team>
-      <team_name>Livingston</team_name>
+      <team_name>Motherwell</team_name>
     </team>
     <team>
-      <team_name>Motherwell </team_name>
+      <team_name>St Mirren</team_name>
     </team>
   </teams>
 
diff --git a/support_files/definitions/scotland/league_scotland2.xml b/support_files/definitions/scotland/league_scotland2.xml
index 7a30e78a..c20128a0 100644
--- a/support_files/definitions/scotland/league_scotland2.xml
+++ b/support_files/definitions/scotland/league_scotland2.xml
@@ -20,7 +20,7 @@
     </prom_rel_element>
 
     <prom_rel_element>
-      <rank_start>9</rank_start>
+      <rank_start>10</rank_start>
       <rank_end>10</rank_end>
       <dest_sid>scotland3</dest_sid>
       <prom_rel_type>relegation</prom_rel_type>
@@ -37,17 +37,20 @@
     <team>
       <team_name>Dundee</team_name>
     </team>
+    <team>
+      <team_name>Gretna</team_name>
+    </team>
     <team>
       <team_name>Hamilton</team_name>
     </team>
     <team>
-      <team_name>Stranraer</team_name>
+      <team_name>Livingston</team_name>
     </team>
     <team>
       <team_name>Dumfries</team_name>
     </team>
     <team>
-      <team_name>Brechin</team_name>
+      <team_name>Partick</team_name>
     </team>
     <team>
       <team_name>Ross County</team_name>
@@ -55,9 +58,6 @@
     <team>
       <team_name>St Johnstone</team_name>
     </team>
-    <team>
-      <team_name>St Mirren</team_name>
-    </team>
   </teams>
 
 </league>
diff --git a/support_files/definitions/scotland/league_scotland3.xml b/support_files/definitions/scotland/league_scotland3.xml
index cc0dd753..f2dd8b13 100644
--- a/support_files/definitions/scotland/league_scotland3.xml
+++ b/support_files/definitions/scotland/league_scotland3.xml
@@ -12,15 +12,21 @@
   <names_file>scotland</names_file>
 
   <prom_rel>
+    <prom_games>
+      <prom_games_dest_sid>scotland2</prom_games_dest_sid>
+      <prom_games_loser_sid>scotland3</prom_games_loser_sid>
+      <prom_games_cup_sid>scotland_prom_games2</prom_games_cup_sid>
+    </prom_games>
+
     <prom_rel_element>
       <rank_start>1</rank_start>
-      <rank_end>2</rank_end>
+      <rank_end>1</rank_end>
       <dest_sid>scotland2</dest_sid>
       <prom_rel_type>promotion</prom_rel_type>
     </prom_rel_element>
 
     <prom_rel_element>
-      <rank_start>9</rank_start>
+      <rank_start>10</rank_start>
       <rank_end>10</rank_end>
       <dest_sid>scotland4</dest_sid>
       <prom_rel_type>relegation</prom_rel_type>
@@ -29,20 +35,20 @@
 
   <teams>
     <team>
-      <team_name>Peterhead</team_name>
+      <team_name>Alloa</team_name>
     </team>
     <team>
       <team_name>Ayr</team_name>
     </team>
     <team>
-      <team_name>Gretna</team_name>
+      <team_name>Brechin</team_name>
+    </team>
+    <team>
+      <team_name>Cowdenbeath</team_name>
     </team>
     <team>
       <team_name>Raith</team_name>
     </team>
-    <team>
-      <team_name>Dumbarton</team_name>
-    </team>
     <team>
       <team_name>Forfar</team_name>
     </team>
@@ -50,13 +56,13 @@
       <team_name>Greenock</team_name>
     </team>
     <team>
-      <team_name>Partick</team_name>
+      <team_name>Peterhead</team_name>
     </team>
     <team>
       <team_name>Stirling</team_name>
     </team>
     <team>
-      <team_name>Alloa</team_name>
+      <team_name>Stranraer</team_name>
     </team>
   </teams>
 
diff --git a/support_files/definitions/scotland/league_scotland4.xml b/support_files/definitions/scotland/league_scotland4.xml
index d5dc761b..16e58343 100644
--- a/support_files/definitions/scotland/league_scotland4.xml
+++ b/support_files/definitions/scotland/league_scotland4.xml
@@ -12,9 +12,15 @@
   <names_file>scotland</names_file>
 
   <prom_rel>
+    <prom_games>
+      <prom_games_dest_sid>scotland3</prom_games_dest_sid>
+      <prom_games_loser_sid>scotland4</prom_games_loser_sid>
+      <prom_games_cup_sid>scotland_prom_games3</prom_games_cup_sid>
+    </prom_games>
+
     <prom_rel_element>
       <rank_start>1</rank_start>
-      <rank_end>2</rank_end>
+      <rank_end>1</rank_end>
       <dest_sid>scotland3</dest_sid>
       <prom_rel_type>promotion</prom_rel_type>
     </prom_rel_element>
@@ -25,7 +31,13 @@
       <team_name>Albion</team_name>
     </team>
     <team>
-      <team_name>Cowdenbeath</team_name>
+      <team_name>Arbroath</team_name>
+    </team>
+    <team>
+      <team_name>Berwick</team_name>
+    </team>
+    <team>
+      <team_name>Dumbarton</team_name>
     </team>
     <team>
       <team_name>East Fife</team_name>
@@ -36,15 +48,9 @@
     <team>
       <team_name>Elgin</team_name>
     </team>
-    <team>
-      <team_name>Berwick</team_name>
-    </team>
     <team>
       <team_name>Montrose</team_name>
     </team>
-    <team>
-      <team_name>Arbroath</team_name>
-    </team>
     <team>
       <team_name>Stenhousemuir</team_name>
     </team>