From e6b434e3314d50597dc5b0b48e5b5d88ac552011 Mon Sep 17 00:00:00 2001
From: markc77 <markc77@localhost>
Date: Sat, 22 Apr 2006 14:58:09 +0000
Subject: [PATCH] Ireland 2006 definition

---
 .../definitions/ireland/cup_ireland_cl.xml    | 10 ++++++-
 .../definitions/ireland/cup_ireland_cl_q.xml  |  3 +--
 .../ireland/cup_ireland_setanta.xml           | 17 +++++++-----
 .../definitions/ireland/cup_ireland_uefa.xml  |  8 +-----
 .../ireland/cup_ireland_uefa_q.xml            |  3 +--
 .../definitions/ireland/league_ireland1.xml   | 22 ++++++++--------
 .../definitions/ireland/league_ireland2.xml   | 26 +++++++++----------
 7 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/support_files/definitions/ireland/cup_ireland_cl.xml b/support_files/definitions/ireland/cup_ireland_cl.xml
index 49f697aa..5b6c53bd 100644
--- a/support_files/definitions/ireland/cup_ireland_cl.xml
+++ b/support_files/definitions/ireland/cup_ireland_cl.xml
@@ -30,6 +30,8 @@
         <choose_team>
           <choose_team_sid>england1</choose_team_sid>
           <number_of_teams>1</number_of_teams>
+          <start_idx>1</start_idx>
+          <end_idx>6</end_idx>
           <randomly>1</randomly>
           <generate>1</generate>
         </choose_team>
@@ -37,6 +39,8 @@
         <choose_team>
           <choose_team_sid>france1</choose_team_sid>
           <number_of_teams>1</number_of_teams>
+          <start_idx>1</start_idx>
+          <end_idx>5</end_idx>
           <randomly>1</randomly>
           <generate>1</generate>
         </choose_team>
@@ -44,6 +48,8 @@
         <choose_team>
           <choose_team_sid>germany1</choose_team_sid>
           <number_of_teams>1</number_of_teams>
+          <start_idx>1</start_idx>
+          <end_idx>6</end_idx>
           <randomly>1</randomly>
           <generate>1</generate>
         </choose_team>
@@ -58,12 +64,14 @@
         <choose_team>
           <choose_team_sid>italy1</choose_team_sid>
           <number_of_teams>1</number_of_teams>
+          <start_idx>1</start_idx>
+          <end_idx>5</end_idx>
           <randomly>1</randomly>
           <generate>1</generate>
         </choose_team>
 
         <choose_team>
-          <choose_team_sid>netherlands1_short</choose_team_sid>
+          <choose_team_sid>netherlands1</choose_team_sid>
           <number_of_teams>1</number_of_teams>
           <randomly>1</randomly>
           <generate>1</generate>
diff --git a/support_files/definitions/ireland/cup_ireland_cl_q.xml b/support_files/definitions/ireland/cup_ireland_cl_q.xml
index 924f242f..f53e6bc5 100644
--- a/support_files/definitions/ireland/cup_ireland_cl_q.xml
+++ b/support_files/definitions/ireland/cup_ireland_cl_q.xml
@@ -26,8 +26,7 @@
         </choose_team>
 
         <choose_team>
-          <choose_team_sid>france2 germany2 italy2 scotland2
-            belgium2 romania2</choose_team_sid>
+          <choose_team_sid>bulgaria1 poland1 romania1 scg1 sweden_allsvenskan france2 germany2 italy2</choose_team_sid>
           <number_of_teams>7</number_of_teams>
           <randomly>1</randomly>
           <generate>1</generate>
diff --git a/support_files/definitions/ireland/cup_ireland_setanta.xml b/support_files/definitions/ireland/cup_ireland_setanta.xml
index 918bed78..cd80c044 100644
--- a/support_files/definitions/ireland/cup_ireland_setanta.xml
+++ b/support_files/definitions/ireland/cup_ireland_setanta.xml
@@ -4,7 +4,7 @@
   <short_name>Setanta Cup</short_name>
   <symbol>map_ireland.png</symbol>
   <sid>ireland_setanta</sid>
-  <last_week>16</last_week>
+  <last_week>18</last_week>
   <week_gap>2</week_gap>
   <property>international</property>
   <talent_diff>500</talent_diff>
@@ -13,8 +13,8 @@
   <cup_rounds>
     <cup_round>
       <number_of_groups>2</number_of_groups>
-      <number_of_advance>1</number_of_advance>
-      <new_teams>6</new_teams>
+      <number_of_advance>2</number_of_advance>
+      <new_teams>8</new_teams>
       <choose_teams>
         <choose_team>
           <choose_team_sid>ireland_senior</choose_team_sid>
@@ -24,13 +24,13 @@
         </choose_team>
         <choose_team>
           <choose_team_sid>ireland1</choose_team_sid>
-          <number_of_teams>2</number_of_teams>
+          <number_of_teams>3</number_of_teams>
           <start_idx>1</start_idx>
-          <end_idx>3</end_idx>
+          <end_idx>4</end_idx>
         </choose_team>
         <choose_team>
           <choose_team_sid>n_ireland1</choose_team_sid>
-          <number_of_teams>3</number_of_teams>
+          <number_of_teams>4</number_of_teams>
           <randomly>1</randomly>
           <generate>1</generate>
         </choose_team>
@@ -41,5 +41,10 @@
       <home_away>0</home_away>
       <neutral>1</neutral>
     </cup_round>
+
+    <cup_round>
+      <home_away>0</home_away>
+      <neutral>1</neutral>
+    </cup_round>
   </cup_rounds>
 </cup>
diff --git a/support_files/definitions/ireland/cup_ireland_uefa.xml b/support_files/definitions/ireland/cup_ireland_uefa.xml
index 9d3d5b05..49d55693 100644
--- a/support_files/definitions/ireland/cup_ireland_uefa.xml
+++ b/support_files/definitions/ireland/cup_ireland_uefa.xml
@@ -25,11 +25,7 @@
         </choose_team>
 
         <choose_team>
-          <choose_team_sid>england1 france1 germany1 greece1
-            italy1 netherlands1_short portugal1_short russia1_short
-            scotland1 spain1 switzerland1_short turkey1_short
-            ukraine1_short belgium1 czech1_short
-            denmark1_short</choose_team_sid>
+          <choose_team_sid>belgium1 england1 france1 germany1 italy1 scotland1 spain1 greece1 netherlands1 portugal1_short russia1_short switzerland1_short turkey1_short ukraine1_short czech1_short denmark1_short</choose_team_sid>
           <number_of_teams>31</number_of_teams>
           <randomly>1</randomly>
           <generate>1</generate>
@@ -47,8 +43,6 @@
     </cup_round>
 
     <cup_round>
-      <home_away>0</home_away>
-      <neutral>1</neutral>
     </cup_round>
   </cup_rounds>
 </cup>
diff --git a/support_files/definitions/ireland/cup_ireland_uefa_q.xml b/support_files/definitions/ireland/cup_ireland_uefa_q.xml
index 88d5c6f0..cd430cb4 100644
--- a/support_files/definitions/ireland/cup_ireland_uefa_q.xml
+++ b/support_files/definitions/ireland/cup_ireland_uefa_q.xml
@@ -23,8 +23,7 @@
         </choose_team>
 
         <choose_team>
-          <choose_team_sid>france2 germany2 italy2 scotland2
-            belgium2 romania2</choose_team_sid>
+          <choose_team_sid>bulgaria1 poland1 romania1 scg1 sweden_allsvenskan france2 germany2 italy2</choose_team_sid>
           <number_of_teams>3</number_of_teams>
           <randomly>1</randomly>
           <generate>1</generate>
diff --git a/support_files/definitions/ireland/league_ireland1.xml b/support_files/definitions/ireland/league_ireland1.xml
index 628216c7..3a33c9a6 100644
--- a/support_files/definitions/ireland/league_ireland1.xml
+++ b/support_files/definitions/ireland/league_ireland1.xml
@@ -8,7 +8,7 @@
   <first_week>1</first_week>
   <week_gap>1</week_gap>
   <round_robins>3</round_robins>
-  <average_talent>6700</average_talent>
+  <average_talent>6500</average_talent>
 
   <prom_rel>
     <prom_rel_element>
@@ -23,6 +23,9 @@
     <team>
       <team_name>Cork</team_name>
     </team>
+    <team>
+      <team_name>Derry</team_name>
+    </team>
     <team>
       <team_name>Shelbourne</team_name>
     </team>
@@ -30,31 +33,28 @@
       <team_name>Drogheda</team_name>
     </team>
     <team>
-      <team_name>Derry</team_name>
+      <team_name>Longford</team_name>
     </team>
     <team>
       <team_name>Dublin B.</team_name>
     </team>
-    <team>
-      <team_name>Waterford</team_name>
-    </team>
-    <team>
-      <team_name>Longford</team_name>
-    </team>
     <team>
       <team_name>Bray</team_name>
     </team>
     <team>
-      <team_name>Dublin St. P</team_name>
+      <team_name>Waterford</team_name>
     </team>
     <team>
       <team_name>U.C.D.</team_name>
     </team>
     <team>
-      <team_name>Ballybofey</team_name>
+      <team_name>Dublin St. P</team_name>
     </team>
     <team>
-      <team_name>Dublin S.</team_name>
+      <team_name>Sligo</team_name>
+    </team>
+    <team>
+      <team_name>Dublin C.</team_name>
     </team>
   </teams>
 </league>
diff --git a/support_files/definitions/ireland/league_ireland2.xml b/support_files/definitions/ireland/league_ireland2.xml
index dce1b7f5..18d03fe5 100644
--- a/support_files/definitions/ireland/league_ireland2.xml
+++ b/support_files/definitions/ireland/league_ireland2.xml
@@ -8,7 +8,7 @@
   <first_week>1</first_week>
   <week_gap>1</week_gap>
   <round_robins>4</round_robins>
-  <average_talent>6000</average_talent>
+  <average_talent>5500</average_talent>
 
   <prom_rel>
     <prom_games>
@@ -27,34 +27,34 @@
 
   <teams>
     <team>
-      <team_name>Dublin C.</team_name>
+      <team_name>Dublin S.</team_name>
     </team>
     <team>
-      <team_name>Sligo</team_name>
-    </team>
-    <team>
-      <team_name>Limerick</team_name>
+      <team_name>Ballybofey</team_name>
     </team>
     <team>
       <team_name>Cobh</team_name>
     </team>
     <team>
-      <team_name>Kildare</team_name>
+      <team_name>Kilkenny</team_name>
+    </team>
+    <team>
+      <team_name>Galway</team_name>
     </team>
     <team>
       <team_name>Dundalk</team_name>
     </team>
+    <team>
+      <team_name>Limerick</team_name>
+    </team>
+    <team>
+      <team_name>Kildare</team_name>
+    </team>
     <team>
       <team_name>Monaghan</team_name>
     </team>
     <team>
       <team_name>Athlone</team_name>
     </team>
-    <team>
-      <team_name>Galway</team_name>
-    </team>
-    <team>
-      <team_name>Kilkenny</team_name>
-    </team>
   </teams>
 </league>