From 4e40b4fa18e45a6249b95ce9bab13ea7e97341c2 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tom@stellard.net>
Date: Sat, 12 Dec 2020 20:00:58 -0800
Subject: [PATCH] Faroe Islands: Move Super Cup to week 1

This is when it is actually played.
---
 .../europe/faroe_islands/README.TXT           | 74 +++++++++----------
 .../cup_faroe_islands4a_qualifying.xml        |  2 +-
 .../cup_faroe_islands4b_qualifying.xml        |  2 +-
 .../cup_faroe_islands4c_qualifying.xml        |  2 +-
 .../faroe_islands/cup_faroe_islands_cup.xml   | 12 +--
 .../cup_faroe_islands_supercup.xml            |  3 +-
 .../faroe_islands/league_faroe_islands1.xml   | 12 +--
 .../faroe_islands/league_faroe_islands2.xml   | 12 +--
 .../faroe_islands/league_faroe_islands3.xml   | 10 +--
 9 files changed, 62 insertions(+), 67 deletions(-)

diff --git a/support_files/definitions/europe/faroe_islands/README.TXT b/support_files/definitions/europe/faroe_islands/README.TXT
index edb69e24..da526703 100644
--- a/support_files/definitions/europe/faroe_islands/README.TXT
+++ b/support_files/definitions/europe/faroe_islands/README.TXT
@@ -1,45 +1,41 @@
 * Faroe Islands weeks based off of the data at 
 http://www.rsssf.com/tablesf/far2019.html
 
-We can't put the Super Cup in week 1, because it depends on the winner
-of the National Cup, and for season number 1, there is no winner yet
-at the beginning of the season.
-
-Week 50 (Mar  3) Super Cup
-Week 1  (Mar 10) B(1),1(1)
-Week 2  (Mar 17) B(2),1(2),3(1)
-Week 3  (Mar 24) 3(2)
-Week 4  (Mar 31) B(3),1(3),3(3),Cup(1)
-Week 5  (Apr 7)  B(4),1(4),2(1),3(4),Cup(2)
-Week 6  (Apr 14) B(5),1(5),2(2),3(5)
-Week 7  (Apr 21) B(6),1(6),3(6), Cup(3)
-Week 8  (Apr 28) B(7),1(7),2(3),3(7)
-Week 9  (May  5) B(8),1(8),2(4),3(8),Cup(4.1)
-Week 10 (May 12) B(9),1(9),2(5),3(9)
-Week 11 (May 19) B(10),1(10),2(6),3(10),Cup(4.2)
-Week 12 (May 26) B(11),1(11),2(7)
-Week 13 (Jun  2) B(12),1(12),2(8)
-Week 14 (Jun  9)
-Week 15 (Jun 16) B(13),1(13),2(9)
-Week 16 (Jun 23) B(14),1(14),2(10) 
-Week 17 (Jun 30) B(15),2(11)  EUROPA
-Week 18 (Jul 7)  Champions League EUROPA
-Week 19 (Jul 14) Champions League EUROPA
-Week 20 (Jul 21) 1(15) EUROPA
-Week 21 (Jul 28) B(16), 1(16) EUROPA
-Week 22 (Aug  4) B(17), 1(17)
-Week 23 (Aug 11) B(18), 1(18)
-Week 24 (Aug 18) B(19), 1(19), 2(12)
-Week 25 (Aug 25) B(20), 1(20), 2(13)
-Week 26 (Sep  1) B(21), 1(21), 2(14)
-Week 27 (Sep  8)
-Week 28 (Sep 15) B(22), 1(22), 2(15)
-Week 29 (Sep 22) B(23), 1(23), 2(16), Cup(5)
-Week 30 (Sep 29) B(24), 1(24), 2(17)
-Week 31 (Oct  6) B(25), 1(25), 2(18)
-Week 32 (Oct 13)
-Week 33 (Oct 20) B(26), 1(26)
-Week 34 (Oct 27) B(27), 1(27)
+Week 1  (Mar  3) Super Cup
+Week 2  (Mar 10) B(1),1(1)
+Week 3  (Mar 17) B(2),1(2),3(1)
+Week 4  (Mar 24) 3(2)
+Week 5  (Mar 31) B(3),1(3),3(3),Cup(1)
+Week 6  (Apr 7)  B(4),1(4),2(1),3(4),Cup(2)
+Week 7  (Apr 14) B(5),1(5),2(2),3(5)
+Week 8  (Apr 21) B(6),1(6),3(6), Cup(3)
+Week 9  (Apr 28) B(7),1(7),2(3),3(7)
+Week 10 (May  5) B(8),1(8),2(4),3(8),Cup(4.1)
+Week 11 (May 12) B(9),1(9),2(5),3(9)
+Week 12 (May 19) B(10),1(10),2(6),3(10),Cup(4.2)
+Week 13 (May 26) B(11),1(11),2(7)
+Week 14 (Jun  2) B(12),1(12),2(8)
+Week 15 (Jun  9)
+Week 16 (Jun 16) B(13),1(13),2(9)
+Week 17 (Jun 23) B(14),1(14),2(10)
+Week 18 (Jun 30) B(15),2(11)  EUROPA
+Week 19 (Jul 7)  Champions League EUROPA
+Week 20 (Jul 14) Champions League EUROPA
+Week 21 (Jul 21) 1(15) EUROPA
+Week 22 (Jul 28) B(16), 1(16) EUROPA
+Week 23 (Aug  4) B(17), 1(17)
+Week 24 (Aug 11) B(18), 1(18)
+Week 25 (Aug 18) B(19), 1(19), 2(12)
+Week 26 (Aug 25) B(20), 1(20), 2(13)
+Week 27 (Sep  1) B(21), 1(21), 2(14)
+Week 28 (Sep  8)
+Week 29 (Sep 15) B(22), 1(22), 2(15)
+Week 30 (Sep 22) B(23), 1(23), 2(16), Cup(5)
+Week 31 (Sep 29) B(24), 1(24), 2(17)
+Week 32 (Oct  6) B(25), 1(25), 2(18)
+Week 33 (Oct 13)
+Week 34 (Oct 20) B(26), 1(26)
+Week 35 (Oct 27) B(27), 1(27)
 
 
 * Delid 3:
diff --git a/support_files/definitions/europe/faroe_islands/cup_faroe_islands4a_qualifying.xml b/support_files/definitions/europe/faroe_islands/cup_faroe_islands4a_qualifying.xml
index e43663b7..5782ccc9 100644
--- a/support_files/definitions/europe/faroe_islands/cup_faroe_islands4a_qualifying.xml
+++ b/support_files/definitions/europe/faroe_islands/cup_faroe_islands4a_qualifying.xml
@@ -7,7 +7,7 @@
   <property>national</property>
   <property>include_reserve_teams</property>
   <group>2000</group>
-  <last_week>11</last_week>
+  <last_week>12</last_week>
   <cup_rounds>
     <cup_round>
       <number_of_groups>1</number_of_groups>
diff --git a/support_files/definitions/europe/faroe_islands/cup_faroe_islands4b_qualifying.xml b/support_files/definitions/europe/faroe_islands/cup_faroe_islands4b_qualifying.xml
index e0af0ca3..3d8467e4 100644
--- a/support_files/definitions/europe/faroe_islands/cup_faroe_islands4b_qualifying.xml
+++ b/support_files/definitions/europe/faroe_islands/cup_faroe_islands4b_qualifying.xml
@@ -7,7 +7,7 @@
   <property>national</property>
   <property>include_reserve_teams</property>
   <group>2000</group>
-  <last_week>11</last_week>
+  <last_week>12</last_week>
 
   <cup_rounds>
     <cup_round>
diff --git a/support_files/definitions/europe/faroe_islands/cup_faroe_islands4c_qualifying.xml b/support_files/definitions/europe/faroe_islands/cup_faroe_islands4c_qualifying.xml
index de239768..a23cc984 100644
--- a/support_files/definitions/europe/faroe_islands/cup_faroe_islands4c_qualifying.xml
+++ b/support_files/definitions/europe/faroe_islands/cup_faroe_islands4c_qualifying.xml
@@ -7,7 +7,7 @@
   <property>national</property>
   <property>include_reserve_teams</property>
   <group>2000</group>
-  <last_week>11</last_week>
+  <last_week>12</last_week>
 
   <cup_rounds>
     <cup_round>
diff --git a/support_files/definitions/europe/faroe_islands/cup_faroe_islands_cup.xml b/support_files/definitions/europe/faroe_islands/cup_faroe_islands_cup.xml
index 790ab079..09017cdd 100644
--- a/support_files/definitions/europe/faroe_islands/cup_faroe_islands_cup.xml
+++ b/support_files/definitions/europe/faroe_islands/cup_faroe_islands_cup.xml
@@ -4,7 +4,7 @@
   <short_name>Cup</short_name>
   <symbol>flag_faroe_islands.png</symbol>
   <sid>faroe_islands_cup</sid>
-  <last_week>29</last_week>
+  <last_week>30</last_week>
   <property>national</property>
 
     <cup_rounds>
@@ -17,28 +17,28 @@
           </choose_teams>
           <round_name>Preliminary Round</round_name>
           <home_away>0</home_away>
-	  <!-- Week 4 -->
+	  <!-- Week 5 -->
 	  <delay>-15</delay>
         </cup_round>
 
         <cup_round>
             <round_name>1st Round</round_name>
             <home_away>0</home_away>
-	  <!-- Week 5 -->
+	  <!-- Week 6 -->
 	  <delay>-16</delay>
         </cup_round>
 
         <cup_round>
             <round_name>Quarter Final</round_name>
             <home_away>0</home_away>
-	  <!-- Week 7 -->
+	  <!-- Week 8 -->
 	  <delay>-16</delay>
         </cup_round>
 
         <cup_round>
             <round_name>Semi Final</round_name>
             <home_away>1</home_away>
-	  <!-- Week 9, 11 -->
+	  <!-- Week 10, 12 -->
 	  <delay>-16</delay>
 	  <week_gap>2</week_gap>
         </cup_round>
@@ -47,7 +47,7 @@
             <round_name>Final</round_name>
             <home_away>0</home_away>
             <neutral>1</neutral>
-	    <!-- Week 29 -->
+	    <!-- Week 30 -->
         </cup_round>
     </cup_rounds>
 </cup>
diff --git a/support_files/definitions/europe/faroe_islands/cup_faroe_islands_supercup.xml b/support_files/definitions/europe/faroe_islands/cup_faroe_islands_supercup.xml
index fc04a22f..ad4b0552 100644
--- a/support_files/definitions/europe/faroe_islands/cup_faroe_islands_supercup.xml
+++ b/support_files/definitions/europe/faroe_islands/cup_faroe_islands_supercup.xml
@@ -4,8 +4,7 @@
   <short_name>SuperCup</short_name>
   <symbol>flag_faroe_islands.png</symbol>
   <sid>faroe_islands_supercup</sid>
-  <add_week>1000</add_week>
-  <last_week>50</last_week>
+  <last_week>1</last_week>
   <property>national</property>
   <group>178</group>
 
diff --git a/support_files/definitions/europe/faroe_islands/league_faroe_islands1.xml b/support_files/definitions/europe/faroe_islands/league_faroe_islands1.xml
index 68e04506..b1feaaa6 100644
--- a/support_files/definitions/europe/faroe_islands/league_faroe_islands1.xml
+++ b/support_files/definitions/europe/faroe_islands/league_faroe_islands1.xml
@@ -4,14 +4,14 @@
   <name>Betri Deildin</name>
   <short_name>Prem</short_name>
   <symbol>flag_faroe_islands.png</symbol>
-  <first_week>1</first_week>
+  <first_week>2</first_week>
   <week_gap>1</week_gap>
   <average_talent>4500</average_talent>
-  <break_in length="1">3</break_in>
-  <break_in length="1">14</break_in>
-  <break_in length="3">18</break_in>
-  <break_in length="1">27</break_in>
-  <break_in length="1">32</break_in>
+  <break_in length="1">4</break_in>
+  <break_in length="1">15</break_in>
+  <break_in length="3">19</break_in>
+  <break_in length="1">28</break_in>
+  <break_in length="1">33</break_in>
   <names_file>denmark</names_file>
   <round_robins>3</round_robins>
   <yellow_red>5</yellow_red>
diff --git a/support_files/definitions/europe/faroe_islands/league_faroe_islands2.xml b/support_files/definitions/europe/faroe_islands/league_faroe_islands2.xml
index 1fe9a59c..0e735371 100644
--- a/support_files/definitions/europe/faroe_islands/league_faroe_islands2.xml
+++ b/support_files/definitions/europe/faroe_islands/league_faroe_islands2.xml
@@ -5,14 +5,14 @@
   <name>1 Deild</name>
   <short_name>1. Deild</short_name>
   <symbol>flag_faroe_islands.png</symbol>
-  <first_week>1</first_week>
+  <first_week>2</first_week>
   <week_gap>1</week_gap>
   <average_talent>3800</average_talent>
-  <break_in length="1">3</break_in>
-  <break_in length="1">14</break_in>
-  <break_in length="3">17</break_in>
-  <break_in length="1">27</break_in>
-  <break_in length="1">32</break_in>
+  <break_in length="1">4</break_in>
+  <break_in length="1">15</break_in>
+  <break_in length="3">18</break_in>
+  <break_in length="1">28</break_in>
+  <break_in length="1">33</break_in>
   <names_file>denmark</names_file>
   <round_robins>3</round_robins>
   <yellow_red>5</yellow_red>
diff --git a/support_files/definitions/europe/faroe_islands/league_faroe_islands3.xml b/support_files/definitions/europe/faroe_islands/league_faroe_islands3.xml
index 1339aac7..34ea463a 100644
--- a/support_files/definitions/europe/faroe_islands/league_faroe_islands3.xml
+++ b/support_files/definitions/europe/faroe_islands/league_faroe_islands3.xml
@@ -4,13 +4,13 @@
   <name>2. Deild</name>
   <short_name>2. Deild</short_name>
   <symbol>flag_faroe_islands.png</symbol>
-  <first_week>5</first_week>
+  <first_week>6</first_week>
   <week_gap>1</week_gap>
   <average_talent>3100</average_talent>
-  <break_in length="1">7</break_in>
-  <break_in length="1">14</break_in>
-  <break_in length="6">18</break_in>
-  <break_in length="1">27</break_in>
+  <break_in length="1">8</break_in>
+  <break_in length="1">15</break_in>
+  <break_in length="6">19</break_in>
+  <break_in length="1">28</break_in>
   <names_file>denmark</names_file>
   <round_robins>2</round_robins>
   <yellow_red>5</yellow_red>