diff --git a/Makefile.am b/Makefile.am index bd6370c4..62753d7d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,7 @@ dist_man6_MANS = man/bygfoot.6 SUPPORT_DIRS = support_files support_files/names support_files/pixmaps support_files/pixmaps/history support_files/pixmaps/live_game support_files/pixmaps/flags support_files/definitions support_files/definitions/brazil support_files/definitions/short_leagues support_files/definitions/europe support_files/definitions/misc support_files/definitions/belgium support_files/definitions/england support_files/definitions/romania support_files/definitions/france support_files/definitions/usa support_files/definitions/germany support_files/definitions/scotland support_files/definitions/short_leagues_south_america support_files/definitions/italy support_files/definitions/argentina -SUPPORT_FILES = support_files/names/player_names_england.xml support_files/names/player_names_general.xml support_files/names/player_names_germany.xml support_files/names/player_names_france.xml support_files/names/player_names_italy.xml support_files/bygfoot.conf support_files/pixmaps/history/champion.png support_files/pixmaps/history/start_game.png support_files/pixmaps/history/fire_finance.png support_files/pixmaps/history/fire_failure.png support_files/pixmaps/history/job_offer.png support_files/pixmaps/history/end_season.png support_files/pixmaps/history/promoted.png support_files/pixmaps/history/relegated.png support_files/pixmaps/history/win_final.png support_files/pixmaps/history/lose_final.png support_files/pixmaps/history/reach_cup_round.png support_files/pixmaps/bygfoot_icon.png support_files/pixmaps/new_week.png support_files/pixmaps/preview.png support_files/pixmaps/transfers.png support_files/pixmaps/live_game/sub.png support_files/pixmaps/live_game/red.png support_files/pixmaps/live_game/save.png support_files/pixmaps/live_game/goal.png support_files/pixmaps/live_game/yellow.png support_files/pixmaps/live_game/scoring_chance.png support_files/pixmaps/live_game/injury_temp.png support_files/pixmaps/live_game/injury.png support_files/pixmaps/live_game/structure_change.png support_files/pixmaps/live_game/whistle.png support_files/pixmaps/live_game/miss.png support_files/pixmaps/live_game/foul.png support_files/pixmaps/live_game/cross_bar.png support_files/pixmaps/live_game/post.png support_files/pixmaps/live_game/penalty.png support_files/pixmaps/live_game/stadium_brkn.png support_files/pixmaps/live_game/stadium_fire.png support_files/pixmaps/live_game/stadium_riot.png support_files/pixmaps/live_game/header.png support_files/pixmaps/live_game/goal_own.png support_files/pixmaps/live_game/lost_possession.png support_files/pixmaps/boost_anti.png support_files/pixmaps/boost_off.png support_files/pixmaps/boost_on.png support_files/pixmaps/style_def.png support_files/pixmaps/style_atk.png support_files/pixmaps/style_bal.png support_files/pixmaps/style_all_atk.png support_files/pixmaps/style_all_def.png support_files/pixmaps/table_up.png support_files/pixmaps/table_down.png support_files/pixmaps/table_stay.png support_files/pixmaps/flags/flag_germany.png support_files/pixmaps/flags/flag_ch.png support_files/pixmaps/flags/flag_cz.png support_files/pixmaps/flags/flag_usa.png support_files/pixmaps/flags/flag_dk.png support_files/pixmaps/flags/flag_es.png support_files/pixmaps/flags/flag_eu.png support_files/pixmaps/flags/flag_gr.png support_files/pixmaps/flags/flag_hu.png support_files/pixmaps/flags/flag_nl.png support_files/pixmaps/flags/flag_pl.png support_files/pixmaps/flags/flag_pt.png support_files/pixmaps/flags/flag_ru.png support_files/pixmaps/flags/flag_tr.png support_files/pixmaps/flags/flag_uk.png support_files/pixmaps/flags/flag_belgium.png support_files/pixmaps/flags/flag_england.png support_files/pixmaps/flags/flag_france.png support_files/pixmaps/flags/flag_romania.png support_files/pixmaps/flags/flag_brazil.png support_files/pixmaps/flags/flag_scotland.png support_files/pixmaps/flags/flag_ecuador.png support_files/pixmaps/flags/flag_argentina.png support_files/pixmaps/flags/flag_bolivia.png support_files/pixmaps/flags/flag_chile.png support_files/pixmaps/flags/flag_colombia.png support_files/pixmaps/flags/flag_peru.png support_files/pixmaps/flags/flag_paraguay.png support_files/pixmaps/flags/flag_uruguay.png support_files/pixmaps/flags/flag_venezuela.png support_files/pixmaps/flags/flag_mexico.png support_files/pixmaps/flags/flag_italy.png support_files/definitions/brazil/country_brazil.xml support_files/definitions/brazil/cup_brazil_prom_games2.xml support_files/definitions/brazil/cup_brazil_prom_games3.xml support_files/definitions/brazil/cup_brazil_prom_games4.xml support_files/definitions/brazil/cup_brazil_prom_games5.xml support_files/definitions/brazil/cup_brazil_prom_games6.xml support_files/definitions/brazil/league_brazil1.xml support_files/definitions/brazil/league_brazil2.xml support_files/definitions/brazil/league_brazil3.xml support_files/definitions/brazil/league_brazil4.xml support_files/definitions/brazil/league_brazil5.xml support_files/definitions/brazil/league_brazil6.xml support_files/definitions/brazil/cup_brazil_sul_am_bo_ve.xml support_files/definitions/brazil/cup_brazil_libertadores.xml support_files/definitions/brazil/cup_brazil_copa_do_brasil.xml support_files/definitions/brazil/cup_brazil_sul_am_br2.xml support_files/definitions/brazil/cup_brazil_sul_am_br1.xml support_files/definitions/brazil/cup_brazil_sul_am_br3.xml support_files/definitions/brazil/cup_brazil_sul_am_ar.xml support_files/definitions/brazil/cup_brazil_sul_am_br4.xml support_files/definitions/brazil/cup_brazil_sul_am_pa_ur.xml support_files/definitions/brazil/cup_brazil_sul_am_ch_pe.xml support_files/definitions/brazil/cup_brazil_sul_am_co_ec.xml support_files/definitions/brazil/cup_brazil_sul_am_knockout.xml support_files/definitions/brazil/cup_supercup_brazil_intercontinental.xml support_files/definitions/short_leagues/league_czech1_short.xml support_files/definitions/short_leagues/league_denmark1_short.xml support_files/definitions/short_leagues/league_greece1_short.xml support_files/definitions/short_leagues/league_netherlands1_short.xml support_files/definitions/short_leagues/league_portugal1_short.xml support_files/definitions/short_leagues/league_russia1_short.xml support_files/definitions/short_leagues/league_spain1_short.xml support_files/definitions/short_leagues/league_switzerland1_short.xml support_files/definitions/short_leagues/league_turkey1_short.xml support_files/definitions/short_leagues/league_ukraine1_short.xml support_files/definitions/europe/cup_europe_champ_league.xml support_files/definitions/europe/cup_europe_cwc.xml support_files/definitions/europe/league_europe_div.xml support_files/definitions/europe/cup_europe_uefa.xml support_files/definitions/europe/cup_supercup_europe_uefa.xml support_files/definitions/europe/cup_supercup_europe_intercontinental.xml support_files/definitions/misc/cup_supercup_league_vs_cup.xml support_files/definitions/belgium/country_belgium.xml support_files/definitions/belgium/cup_belgium.xml support_files/definitions/belgium/league_belgium2.xml support_files/definitions/belgium/league_belgium1.xml support_files/definitions/belgium/league_belgium3a.xml support_files/definitions/belgium/league_belgium3b.xml support_files/definitions/belgium/league_belgium4a.xml support_files/definitions/belgium/league_belgium4b.xml support_files/definitions/belgium/league_belgium4c.xml support_files/definitions/belgium/league_belgium4d.xml support_files/definitions/belgium/cup_belgium_eindronde2.xml support_files/definitions/england/country_england.xml support_files/definitions/england/league_england1.xml support_files/definitions/england/league_england2.xml support_files/definitions/england/league_england3.xml support_files/definitions/england/league_england4.xml support_files/definitions/england/league_england5.xml support_files/definitions/england/cup_england_fa.xml support_files/definitions/england/cup_england_prom_games2.xml support_files/definitions/england/cup_england_league.xml support_files/definitions/england/cup_england_prom_games3.xml support_files/definitions/england/cup_england_prom_games4.xml support_files/definitions/england/cup_england_prom_games5.xml support_files/definitions/romania/country_romania.xml support_files/definitions/romania/cup_romania_cupa.xml support_files/definitions/romania/cup_supercup_romania.xml support_files/definitions/romania/league_romania1.xml support_files/definitions/romania/league_romania2.xml support_files/definitions/romania/league_romania3.xml support_files/definitions/france/country_france.xml support_files/definitions/france/cup_france_coupe.xml support_files/definitions/france/league_france1.xml support_files/definitions/france/league_france2.xml support_files/definitions/france/league_france3.xml support_files/definitions/france/league_france4.xml support_files/definitions/france/league_france5.xml support_files/definitions/france/cup_france_ligue.xml support_files/definitions/usa/league_usa_econf.xml support_files/definitions/usa/country_usa.xml support_files/definitions/usa/league_usa_wconf.xml support_files/definitions/usa/cup_usa_eplayoff.xml support_files/definitions/usa/cup_usa_wplayoff.xml support_files/definitions/usa/cup_usa_mls_cup.xml support_files/definitions/germany/cup_germany_dfb.xml support_files/definitions/germany/league_germany1.xml support_files/definitions/germany/league_germany3a.xml support_files/definitions/germany/league_germany2.xml support_files/definitions/germany/league_germany3b.xml support_files/definitions/germany/country_germany.xml support_files/definitions/scotland/league_scotland1.xml support_files/definitions/scotland/country_scotland.xml support_files/definitions/scotland/league_scotland2.xml support_files/definitions/scotland/league_scotland3.xml support_files/definitions/scotland/league_scotland4.xml support_files/definitions/scotland/cup_scotland_fa.xml support_files/definitions/short_leagues_south_america/league_bolivia1_short.xml support_files/definitions/short_leagues_south_america/league_chile1_short.xml support_files/definitions/short_leagues_south_america/league_colombia1_short.xml support_files/definitions/short_leagues_south_america/league_ecuador1_short.xml support_files/definitions/short_leagues_south_america/league_mexico1_short.xml support_files/definitions/short_leagues_south_america/league_paraguay1_short.xml support_files/definitions/short_leagues_south_america/league_peru1_short.xml support_files/definitions/short_leagues_south_america/league_uruguay1_short.xml support_files/definitions/short_leagues_south_america/league_venezuela1_short.xml support_files/definitions/italy/league_italy1.xml support_files/definitions/italy/cup_italy_coppa.xml support_files/definitions/italy/league_italy2.xml support_files/definitions/italy/league_italy3a.xml support_files/definitions/italy/league_italy3b.xml support_files/definitions/italy/country_italy.xml support_files/definitions/argentina/league_argentina1.xml support_files/bygfoot_constants support_files/bygfoot_user.conf support_files/bygfoot_app support_files/bygfoot_help +SUPPORT_FILES = support_files/names/player_names_brazil.xml support_files/names/player_names_england.xml support_files/names/player_names_usa.xml support_files/names/player_names_general.xml support_files/names/player_names_germany.xml support_files/names/player_names_scotland.xml support_files/names/player_names_france.xml support_files/names/player_names_italy.xml support_files/bygfoot.conf support_files/pixmaps/history/champion.png support_files/pixmaps/history/start_game.png support_files/pixmaps/history/fire_finance.png support_files/pixmaps/history/fire_failure.png support_files/pixmaps/history/job_offer.png support_files/pixmaps/history/end_season.png support_files/pixmaps/history/promoted.png support_files/pixmaps/history/relegated.png support_files/pixmaps/history/win_final.png support_files/pixmaps/history/lose_final.png support_files/pixmaps/history/reach_cup_round.png support_files/pixmaps/bygfoot_icon.png support_files/pixmaps/new_week.png support_files/pixmaps/preview.png support_files/pixmaps/transfers.png support_files/pixmaps/live_game/sub.png support_files/pixmaps/live_game/red.png support_files/pixmaps/live_game/save.png support_files/pixmaps/live_game/goal.png support_files/pixmaps/live_game/yellow.png support_files/pixmaps/live_game/scoring_chance.png support_files/pixmaps/live_game/injury_temp.png support_files/pixmaps/live_game/injury.png support_files/pixmaps/live_game/structure_change.png support_files/pixmaps/live_game/whistle.png support_files/pixmaps/live_game/miss.png support_files/pixmaps/live_game/foul.png support_files/pixmaps/live_game/cross_bar.png support_files/pixmaps/live_game/post.png support_files/pixmaps/live_game/penalty.png support_files/pixmaps/live_game/stadium_brkn.png support_files/pixmaps/live_game/stadium_fire.png support_files/pixmaps/live_game/stadium_riot.png support_files/pixmaps/live_game/header.png support_files/pixmaps/live_game/goal_own.png support_files/pixmaps/live_game/lost_possession.png support_files/pixmaps/boost_anti.png support_files/pixmaps/boost_off.png support_files/pixmaps/boost_on.png support_files/pixmaps/style_def.png support_files/pixmaps/style_atk.png support_files/pixmaps/style_bal.png support_files/pixmaps/style_all_atk.png support_files/pixmaps/style_all_def.png support_files/pixmaps/table_up.png support_files/pixmaps/table_down.png support_files/pixmaps/table_stay.png support_files/pixmaps/flags/flag_germany.png support_files/pixmaps/flags/flag_ch.png support_files/pixmaps/flags/flag_cz.png support_files/pixmaps/flags/flag_usa.png support_files/pixmaps/flags/flag_dk.png support_files/pixmaps/flags/flag_es.png support_files/pixmaps/flags/flag_eu.png support_files/pixmaps/flags/flag_gr.png support_files/pixmaps/flags/flag_hu.png support_files/pixmaps/flags/flag_nl.png support_files/pixmaps/flags/flag_pl.png support_files/pixmaps/flags/flag_pt.png support_files/pixmaps/flags/flag_ru.png support_files/pixmaps/flags/flag_tr.png support_files/pixmaps/flags/flag_uk.png support_files/pixmaps/flags/flag_belgium.png support_files/pixmaps/flags/flag_england.png support_files/pixmaps/flags/flag_france.png support_files/pixmaps/flags/flag_romania.png support_files/pixmaps/flags/flag_brazil.png support_files/pixmaps/flags/flag_scotland.png support_files/pixmaps/flags/flag_ecuador.png support_files/pixmaps/flags/flag_argentina.png support_files/pixmaps/flags/flag_bolivia.png support_files/pixmaps/flags/flag_chile.png support_files/pixmaps/flags/flag_colombia.png support_files/pixmaps/flags/flag_peru.png support_files/pixmaps/flags/flag_paraguay.png support_files/pixmaps/flags/flag_uruguay.png support_files/pixmaps/flags/flag_venezuela.png support_files/pixmaps/flags/flag_mexico.png support_files/pixmaps/flags/flag_italy.png support_files/definitions/brazil/country_brazil.xml support_files/definitions/brazil/cup_brazil_prom_games2.xml support_files/definitions/brazil/cup_brazil_prom_games3.xml support_files/definitions/brazil/cup_brazil_prom_games4.xml support_files/definitions/brazil/cup_brazil_prom_games5.xml support_files/definitions/brazil/cup_brazil_prom_games6.xml support_files/definitions/brazil/league_brazil1.xml support_files/definitions/brazil/league_brazil2.xml support_files/definitions/brazil/league_brazil3.xml support_files/definitions/brazil/league_brazil4.xml support_files/definitions/brazil/league_brazil5.xml support_files/definitions/brazil/league_brazil6.xml support_files/definitions/brazil/cup_brazil_sul_am_bo_ve.xml support_files/definitions/brazil/cup_brazil_libertadores.xml support_files/definitions/brazil/cup_brazil_copa_do_brasil.xml support_files/definitions/brazil/cup_brazil_sul_am_br2.xml support_files/definitions/brazil/cup_brazil_sul_am_br1.xml support_files/definitions/brazil/cup_brazil_sul_am_br3.xml support_files/definitions/brazil/cup_brazil_sul_am_ar.xml support_files/definitions/brazil/cup_brazil_sul_am_br4.xml support_files/definitions/brazil/cup_brazil_sul_am_pa_ur.xml support_files/definitions/brazil/cup_brazil_sul_am_ch_pe.xml support_files/definitions/brazil/cup_brazil_sul_am_co_ec.xml support_files/definitions/brazil/cup_brazil_sul_am_knockout.xml support_files/definitions/brazil/cup_supercup_brazil_intercontinental.xml support_files/definitions/short_leagues/league_czech1_short.xml support_files/definitions/short_leagues/league_denmark1_short.xml support_files/definitions/short_leagues/league_greece1_short.xml support_files/definitions/short_leagues/league_netherlands1_short.xml support_files/definitions/short_leagues/league_portugal1_short.xml support_files/definitions/short_leagues/league_russia1_short.xml support_files/definitions/short_leagues/league_spain1_short.xml support_files/definitions/short_leagues/league_switzerland1_short.xml support_files/definitions/short_leagues/league_turkey1_short.xml support_files/definitions/short_leagues/league_ukraine1_short.xml support_files/definitions/europe/cup_europe_champ_league.xml support_files/definitions/europe/cup_europe_cwc.xml support_files/definitions/europe/league_europe_div.xml support_files/definitions/europe/cup_europe_uefa.xml support_files/definitions/europe/cup_supercup_europe_uefa.xml support_files/definitions/europe/cup_supercup_europe_intercontinental.xml support_files/definitions/misc/cup_supercup_league_vs_cup.xml support_files/definitions/belgium/country_belgium.xml support_files/definitions/belgium/cup_belgium.xml support_files/definitions/belgium/league_belgium2.xml support_files/definitions/belgium/league_belgium1.xml support_files/definitions/belgium/league_belgium3a.xml support_files/definitions/belgium/league_belgium3b.xml support_files/definitions/belgium/league_belgium4a.xml support_files/definitions/belgium/league_belgium4b.xml support_files/definitions/belgium/league_belgium4c.xml support_files/definitions/belgium/league_belgium4d.xml support_files/definitions/belgium/cup_belgium_eindronde2.xml support_files/definitions/england/country_england.xml support_files/definitions/england/league_england1.xml support_files/definitions/england/league_england2.xml support_files/definitions/england/league_england3.xml support_files/definitions/england/league_england4.xml support_files/definitions/england/league_england5.xml support_files/definitions/england/cup_england_fa.xml support_files/definitions/england/cup_england_prom_games2.xml support_files/definitions/england/cup_england_league.xml support_files/definitions/england/cup_england_prom_games3.xml support_files/definitions/england/cup_england_prom_games4.xml support_files/definitions/england/cup_england_prom_games5.xml support_files/definitions/romania/country_romania.xml support_files/definitions/romania/cup_romania_cupa.xml support_files/definitions/romania/cup_supercup_romania.xml support_files/definitions/romania/league_romania1.xml support_files/definitions/romania/league_romania2.xml support_files/definitions/romania/league_romania3.xml support_files/definitions/france/country_france.xml support_files/definitions/france/cup_france_coupe.xml support_files/definitions/france/league_france1.xml support_files/definitions/france/league_france2.xml support_files/definitions/france/league_france3.xml support_files/definitions/france/league_france4.xml support_files/definitions/france/league_france5.xml support_files/definitions/france/cup_france_ligue.xml support_files/definitions/usa/league_usa_econf.xml support_files/definitions/usa/country_usa.xml support_files/definitions/usa/league_usa_wconf.xml support_files/definitions/usa/cup_usa_eplayoff.xml support_files/definitions/usa/cup_usa_wplayoff.xml support_files/definitions/usa/cup_usa_mls_cup.xml support_files/definitions/germany/cup_germany_dfb.xml support_files/definitions/germany/league_germany1.xml support_files/definitions/germany/league_germany3a.xml support_files/definitions/germany/league_germany2.xml support_files/definitions/germany/league_germany3b.xml support_files/definitions/germany/country_germany.xml support_files/definitions/scotland/league_scotland1.xml support_files/definitions/scotland/country_scotland.xml support_files/definitions/scotland/league_scotland2.xml support_files/definitions/scotland/league_scotland3.xml support_files/definitions/scotland/league_scotland4.xml support_files/definitions/scotland/cup_scotland_fa.xml support_files/definitions/scotland/cup_scotland_league.xml support_files/definitions/short_leagues_south_america/league_bolivia1_short.xml support_files/definitions/short_leagues_south_america/league_chile1_short.xml support_files/definitions/short_leagues_south_america/league_colombia1_short.xml support_files/definitions/short_leagues_south_america/league_ecuador1_short.xml support_files/definitions/short_leagues_south_america/league_mexico1_short.xml support_files/definitions/short_leagues_south_america/league_paraguay1_short.xml support_files/definitions/short_leagues_south_america/league_peru1_short.xml support_files/definitions/short_leagues_south_america/league_uruguay1_short.xml support_files/definitions/short_leagues_south_america/league_venezuela1_short.xml support_files/definitions/italy/league_italy1.xml support_files/definitions/italy/cup_italy_coppa.xml support_files/definitions/italy/league_italy2.xml support_files/definitions/italy/league_italy3a.xml support_files/definitions/italy/league_italy3b.xml support_files/definitions/italy/country_italy.xml support_files/definitions/argentina/league_argentina1.xml support_files/bygfoot_constants support_files/bygfoot_user.conf support_files/bygfoot_app support_files/bygfoot_help install-data-local: @$(NORMAL_INSTALL) diff --git a/src/fixture.c b/src/fixture.c index 6408354b..022de39c 100644 --- a/src/fixture.c +++ b/src/fixture.c @@ -396,8 +396,8 @@ fixture_write_round_robin(gpointer league_cup, gint cup_round, GPtrArray *teams, /* second half of fixtures */ for(i = 0; i < len - 1; i++) { - week_round_number = - fixture_get_free_round(first_week + (len - 1 + i) * week_gap, teams, -1, -1); + week_round_number = (cup_round == -1) ? + 1 : fixture_get_free_round(first_week + (len - 1 + i) * week_gap, teams, -1, -1); for(j = 0; j < len / 2; j++) fixture_write(fixtures, g_array_index(fixtures, Fixture, first_fixture + i * (len / 2) + j).teams[1], @@ -439,8 +439,8 @@ fixture_write_round_robin_matchday(GArray *fixtures, gint cup_round, GPtrArray * gint i; gint len = teams->len / 2; gpointer home[len], away[len]; - gint week_round_number = - fixture_get_free_round(week_number, teams, -1, -1); + gint week_round_number = (cup_round == -1) ? + 1 : fixture_get_free_round(week_number, teams, -1, -1); home[0] = g_ptr_array_index(teams, len * 2 - 1); @@ -582,6 +582,8 @@ fixture_get_free_round(gint week_number, const GPtrArray *teams, gint team_id1, for(i=0;ilen;i++) for(j=0;jlen;j++) if(g_array_index(lig(i).fixtures, Fixture, j).week_number == week_number && + (stat5 != STATUS_GENERATE_TEAMS || + g_array_index(lig(i).fixtures, Fixture, j).attendance == -1) && ((teams == NULL && (query_fixture_team_involved((&g_array_index(lig(i).fixtures, Fixture, j)), team_id1) || query_fixture_team_involved((&g_array_index(lig(i).fixtures, Fixture, j)), team_id2))) || @@ -594,6 +596,8 @@ fixture_get_free_round(gint week_number, const GPtrArray *teams, gint team_id1, for(i=0;ilen;i++) for(j=0;jfixtures->len;j++) if(g_array_index(acp(i)->fixtures, Fixture, j).week_number == week_number && + (stat5 != STATUS_GENERATE_TEAMS || + g_array_index(acp(i)->fixtures, Fixture, j).attendance == -1) && ((teams == NULL && (query_fixture_team_involved((&g_array_index(acp(i)->fixtures, Fixture, j)), team_id1) || query_fixture_team_involved((&g_array_index(acp(i)->fixtures, Fixture, j)), team_id2))) || diff --git a/support_files/definitions/scotland/country_scotland.xml b/support_files/definitions/scotland/country_scotland.xml index 0c754ccc..a22dcdc7 100644 --- a/support_files/definitions/scotland/country_scotland.xml +++ b/support_files/definitions/scotland/country_scotland.xml @@ -12,6 +12,7 @@ scotland_fa + scotland_league europe_uefa europe_cwc europe_champ_league diff --git a/support_files/definitions/scotland/cup_scotland_fa.xml b/support_files/definitions/scotland/cup_scotland_fa.xml index 106df4bc..1d4250de 100644 --- a/support_files/definitions/scotland/cup_scotland_fa.xml +++ b/support_files/definitions/scotland/cup_scotland_fa.xml @@ -4,7 +4,7 @@ FA Cup flag_scotland.png scotland_fa - 42 + 43 4 national diff --git a/support_files/definitions/scotland/cup_scotland_league.xml b/support_files/definitions/scotland/cup_scotland_league.xml new file mode 100644 index 00000000..c0b6902d --- /dev/null +++ b/support_files/definitions/scotland/cup_scotland_league.xml @@ -0,0 +1,56 @@ + + + CIS Insurance Cup + League Cup + flag_scotland.png + scotland_league + 41 + 3 + national + + + + 0 + 1 + + + + + scotland1 + + + scotland2 + + + scotland3 + + + scotland4 + + + + + + 0 + 1 + + + 0 + 1 + + + 0 + 1 + + + 0 + 1 + 1 + + + 0 + 1 + 1 + + + diff --git a/support_files/definitions/scotland/league_scotland1.xml b/support_files/definitions/scotland/league_scotland1.xml index 0fb3548f..6322b472 100644 --- a/support_files/definitions/scotland/league_scotland1.xml +++ b/support_files/definitions/scotland/league_scotland1.xml @@ -31,7 +31,7 @@ Glasgow R. - Dundee + Falkirk Dundee U. diff --git a/support_files/definitions/scotland/league_scotland2.xml b/support_files/definitions/scotland/league_scotland2.xml index 301293d9..d9e56cb0 100644 --- a/support_files/definitions/scotland/league_scotland2.xml +++ b/support_files/definitions/scotland/league_scotland2.xml @@ -35,19 +35,19 @@ Clyde - Falkirk + Dundee Hamilton - Partick + Stranraer Dumfries - Raith + Brechin Ross County diff --git a/support_files/definitions/scotland/league_scotland3.xml b/support_files/definitions/scotland/league_scotland3.xml index e3b1f289..f2abf129 100644 --- a/support_files/definitions/scotland/league_scotland3.xml +++ b/support_files/definitions/scotland/league_scotland3.xml @@ -29,16 +29,16 @@ - Arbroath + Peterhead Ayr - Berwick + Gretna - Brechin + Raith Dumbarton @@ -50,7 +50,7 @@ Greenock - Stranraer + Partick Stirling diff --git a/support_files/definitions/scotland/league_scotland4.xml b/support_files/definitions/scotland/league_scotland4.xml index c263f775..d4a4facf 100644 --- a/support_files/definitions/scotland/league_scotland4.xml +++ b/support_files/definitions/scotland/league_scotland4.xml @@ -37,13 +37,13 @@ Elgin - Gretna + Berwick Montrose - Peterhead + Arbroath Stenhousemuir