"Minor improvements."

This commit is contained in:
gyboth 2005-09-27 12:18:46 +00:00
parent 27fba55bb5
commit 2c1c98bbec
38 changed files with 736 additions and 499 deletions

View File

@ -1,11 +1,12 @@
10/10/2005: v1.9.2
- fixed some minor bugs
- updated some translations
- switched to Gnu zip in the Windows port
- updated translations
- switched from 'arj' to Gnu 'zip' in the Windows port
- added player streaks (hot/cold)
- added definition for the Netherlands (thanks to Zwakstroom)
- added definition for the World Cup 2006 Germany
- minor definition system improvements
- window geometry can be saved
09/10/2005: v1.9.1

File diff suppressed because one or more lines are too long

View File

@ -68,7 +68,7 @@
<accelerator key="l" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image1909">
<widget class="GtkImage" id="image1947">
<property name="visible">True</property>
<property name="stock">gtk-revert-to-saved</property>
<property name="icon_size">1</property>
@ -136,7 +136,7 @@
<accelerator key="p" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image1910">
<widget class="GtkImage" id="image1948">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@ -184,6 +184,34 @@
<signal name="button_press_event" handler="on_menu_check_button_press_event" last_modification_time="Thu, 24 Mar 2005 12:28:40 GMT"/>
</widget>
</child>
<child>
<widget class="GtkSeparatorMenuItem" id="trennlinie14">
<property name="visible">True</property>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="menu_save_window_geometry">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Save window size, position and vertical divider</property>
<property name="label" translatable="yes">Save window geometry</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_menu_save_window_geometry_activate" last_modification_time="Tue, 27 Sep 2005 10:09:53 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1949">
<property name="visible">True</property>
<property name="stock">gtk-save</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>
</widget>
</child>
</widget>
</child>
</widget>
@ -207,7 +235,7 @@
<accelerator key="F3" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image1911">
<widget class="GtkImage" id="image1950">
<property name="visible">True</property>
<property name="pixbuf">menu_fixtures.png</property>
<property name="xalign">0.5</property>
@ -228,7 +256,7 @@
<accelerator key="F4" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image1912">
<widget class="GtkImage" id="image1951">
<property name="visible">True</property>
<property name="pixbuf">menu_fixtures_comp.png</property>
<property name="xalign">0.5</property>
@ -249,7 +277,7 @@
<accelerator key="F5" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image1913">
<widget class="GtkImage" id="image1952">
<property name="visible">True</property>
<property name="pixbuf">menu_table.png</property>
<property name="xalign">0.5</property>
@ -270,7 +298,7 @@
<accelerator key="F6" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image1914">
<widget class="GtkImage" id="image1953">
<property name="visible">True</property>
<property name="pixbuf">menu_league_results.png</property>
<property name="xalign">0.5</property>
@ -297,7 +325,7 @@
<accelerator key="s" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image1915">
<widget class="GtkImage" id="image1954">
<property name="visible">True</property>
<property name="pixbuf">menu_league_stats.png</property>
<property name="xalign">0.5</property>
@ -318,7 +346,7 @@
<accelerator key="h" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image1916">
<widget class="GtkImage" id="image1955">
<property name="visible">True</property>
<property name="pixbuf">menu_history.png</property>
<property name="xalign">0.5</property>
@ -350,7 +378,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="image1917">
<widget class="GtkImage" id="image1956">
<property name="visible">True</property>
<property name="pixbuf">menu_style.png</property>
<property name="xalign">0.5</property>
@ -428,7 +456,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="image1918">
<widget class="GtkImage" id="image1957">
<property name="visible">True</property>
<property name="pixbuf">menu_scout.png</property>
<property name="xalign">0.5</property>
@ -495,7 +523,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="image1919">
<widget class="GtkImage" id="image1958">
<property name="visible">True</property>
<property name="pixbuf">menu_physio.png</property>
<property name="xalign">0.5</property>
@ -562,7 +590,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="image1920">
<widget class="GtkImage" id="image1959">
<property name="visible">True</property>
<property name="pixbuf">menu_youth_academy.png</property>
<property name="xalign">0.5</property>
@ -729,7 +757,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="image1921">
<widget class="GtkImage" id="image1960">
<property name="visible">True</property>
<property name="pixbuf">menu_boost.png</property>
<property name="xalign">0.5</property>
@ -792,7 +820,7 @@
<signal name="activate" handler="on_menu_reset_players_activate" last_modification_time="Tue, 26 Apr 2005 13:16:39 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1922">
<widget class="GtkImage" id="image1961">
<property name="visible">True</property>
<property name="stock">gtk-undo</property>
<property name="icon_size">1</property>
@ -813,7 +841,7 @@
<signal name="activate" handler="on_menu_custom_structure_activate" last_modification_time="Sat, 26 Feb 2005 12:46:30 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1923">
<widget class="GtkImage" id="image1962">
<property name="visible">True</property>
<property name="pixbuf">menu_structure.png</property>
<property name="xalign">0.5</property>
@ -835,7 +863,7 @@
<accelerator key="r" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image1924">
<widget class="GtkImage" id="image1963">
<property name="visible">True</property>
<property name="pixbuf">menu_rearrange.png</property>
<property name="xalign">0.5</property>
@ -861,7 +889,7 @@
<signal name="activate" handler="on_menu_browse_teams_activate" last_modification_time="Mon, 03 Jan 2005 16:58:58 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1925">
<widget class="GtkImage" id="image1964">
<property name="visible">True</property>
<property name="pixbuf">menu_browse_tms.png</property>
<property name="xalign">0.5</property>
@ -894,7 +922,7 @@
<signal name="activate" handler="on_menu_show_info_activate" last_modification_time="Sun, 02 Jan 2005 15:42:09 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1926">
<widget class="GtkImage" id="image1965">
<property name="visible">True</property>
<property name="pixbuf">menu_player_info.png</property>
<property name="xalign">0.5</property>
@ -914,7 +942,7 @@
<signal name="activate" handler="on_menu_put_on_transfer_list_activate" last_modification_time="Sun, 02 Jan 2005 15:42:09 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1927">
<widget class="GtkImage" id="image1966">
<property name="visible">True</property>
<property name="pixbuf">menu_player_put_transfer.png</property>
<property name="xalign">0.5</property>
@ -934,7 +962,7 @@
<signal name="activate" handler="on_menu_remove_from_transfer_list_activate" last_modification_time="Sun, 02 Jan 2005 15:42:09 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1928">
<widget class="GtkImage" id="image1967">
<property name="visible">True</property>
<property name="pixbuf">menu_player_remove_transfer.png</property>
<property name="xalign">0.5</property>
@ -954,7 +982,7 @@
<signal name="activate" handler="on_menu_offer_new_contract_activate" last_modification_time="Fri, 25 Mar 2005 09:23:28 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1929">
<widget class="GtkImage" id="image1968">
<property name="visible">True</property>
<property name="pixbuf">menu_player_contract.png</property>
<property name="xalign">0.5</property>
@ -974,7 +1002,7 @@
<signal name="activate" handler="on_menu_fire_activate" last_modification_time="Sun, 02 Jan 2005 15:42:09 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1930">
<widget class="GtkImage" id="image1969">
<property name="visible">True</property>
<property name="pixbuf">menu_player_fire.png</property>
<property name="xalign">0.5</property>
@ -994,7 +1022,7 @@
<signal name="activate" handler="on_menu_shoots_penalties_activate" last_modification_time="Sun, 02 Jan 2005 15:42:09 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1931">
<widget class="GtkImage" id="image1970">
<property name="visible">True</property>
<property name="pixbuf">menu_player_shoots.png</property>
<property name="xalign">0.5</property>
@ -1029,7 +1057,7 @@
<signal name="activate" handler="on_menu_browse_players_activate" last_modification_time="Sat, 26 Mar 2005 09:42:31 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1932">
<widget class="GtkImage" id="image1971">
<property name="visible">True</property>
<property name="pixbuf">menu_player_browse.png</property>
<property name="xalign">0.5</property>
@ -1063,7 +1091,7 @@
<accelerator key="v" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image1933">
<widget class="GtkImage" id="image1972">
<property name="visible">True</property>
<property name="pixbuf">menu_last_match.png</property>
<property name="xalign">0.5</property>
@ -1084,7 +1112,7 @@
<accelerator key="F2" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image1934">
<widget class="GtkImage" id="image1973">
<property name="visible">True</property>
<property name="pixbuf">menu_match_stats.png</property>
<property name="xalign">0.5</property>
@ -1105,7 +1133,7 @@
<accelerator key="F1" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image1935">
<widget class="GtkImage" id="image1974">
<property name="visible">True</property>
<property name="stock">gtk-jump-to</property>
<property name="icon_size">1</property>
@ -1125,7 +1153,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="image1936">
<widget class="GtkImage" id="image1975">
<property name="visible">True</property>
<property name="pixbuf">menu_mmatches.png</property>
<property name="xalign">0.5</property>
@ -1148,7 +1176,7 @@
<accelerator key="a" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image1937">
<widget class="GtkImage" id="image1976">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@ -1171,7 +1199,7 @@
<accelerator key="m" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image1938">
<widget class="GtkImage" id="image1977">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@ -1203,7 +1231,7 @@
<accelerator key="h" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image1939">
<widget class="GtkImage" id="image1978">
<property name="visible">True</property>
<property name="pixbuf">menu_history.png</property>
<property name="xalign">0.5</property>
@ -1230,7 +1258,7 @@
<accelerator key="F9" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image1940">
<widget class="GtkImage" id="image1979">
<property name="visible">True</property>
<property name="stock">gtk-media-forward</property>
<property name="icon_size">1</property>
@ -1252,7 +1280,7 @@
<accelerator key="F8" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image1941">
<widget class="GtkImage" id="image1980">
<property name="visible">True</property>
<property name="stock">gtk-go-back</property>
<property name="icon_size">1</property>
@ -1274,7 +1302,7 @@
<accelerator key="F12" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image1942">
<widget class="GtkImage" id="image1981">
<property name="visible">True</property>
<property name="stock">gtk-justify-fill</property>
<property name="icon_size">1</property>
@ -1309,7 +1337,7 @@
<accelerator key="f" modifiers="0" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image1943">
<widget class="GtkImage" id="image1982">
<property name="visible">True</property>
<property name="pixbuf">menu_finances.png</property>
<property name="xalign">0.5</property>
@ -1330,7 +1358,7 @@
<accelerator key="f" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
<widget class="GtkImage" id="image1944">
<widget class="GtkImage" id="image1983">
<property name="visible">True</property>
<property name="pixbuf">menu_stadium.png</property>
<property name="xalign">0.5</property>
@ -1363,7 +1391,7 @@
<signal name="activate" handler="on_menu_about_activate" last_modification_time="Sun, 18 Jan 2004 15:58:22 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1945">
<widget class="GtkImage" id="image1984">
<property name="visible">True</property>
<property name="stock">gtk-dialog-info</property>
<property name="icon_size">1</property>
@ -1384,7 +1412,7 @@
<signal name="activate" handler="on_menu_contributors_activate" last_modification_time="Sun, 22 May 2005 06:42:11 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1946">
<widget class="GtkImage" id="image1985">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@ -1405,7 +1433,7 @@
<signal name="activate" handler="on_menu_help_activate" last_modification_time="Sun, 22 May 2005 06:42:11 GMT"/>
<child internal-child="image">
<widget class="GtkImage" id="image1947">
<widget class="GtkImage" id="image1986">
<property name="visible">True</property>
<property name="stock">gtk-help</property>
<property name="icon_size">1</property>
@ -1730,7 +1758,7 @@
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@ -1772,7 +1800,7 @@
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@ -1814,7 +1842,7 @@
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@ -1961,7 +1989,7 @@
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@ -1994,7 +2022,7 @@
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@ -2058,7 +2086,7 @@
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@ -2126,7 +2154,7 @@
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="wrap">True</property>
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -25,13 +25,13 @@ callback_show_next_live_game(void)
gint i, j;
/*d*/
if(debug > 0)
for(i=0;i<current_user.tm->players->len;i++)
printf("wee %-25s st %d cnt %f pro %.3f\n",
g_array_index(current_user.tm->players, Player, i).name->str,
g_array_index(current_user.tm->players, Player, i).streak,
g_array_index(current_user.tm->players, Player, i).streak_count,
g_array_index(current_user.tm->players, Player, i).streak_prob);
/* if(debug > 0) */
/* for(i=0;i<current_user.tm->players->len;i++) */
/* printf("wee %-25s st %d cnt %f pro %.3f\n", */
/* g_array_index(current_user.tm->players, Player, i).name->str, */
/* g_array_index(current_user.tm->players, Player, i).streak, */
/* g_array_index(current_user.tm->players, Player, i).streak_count, */
/* g_array_index(current_user.tm->players, Player, i).streak_prob); */
for(i=0;i<users->len;i++)
usr(i).counters[COUNT_USER_TOOK_TURN] = 0;

View File

@ -1128,3 +1128,11 @@ on_mm_manage_matches_activate (GtkMenuItem *menuitem,
else
window_show_mmatches();
}
void
on_menu_save_window_geometry_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
window_main_save_geometry();
}

View File

@ -292,7 +292,6 @@ void
on_menu_youth_kick_out_of_academy_activate
(GtkMenuItem *menuitem,
gpointer user_data);
#endif
void
on_mm_add_last_match_activate (GtkMenuItem *menuitem,
@ -301,3 +300,8 @@ on_mm_add_last_match_activate (GtkMenuItem *menuitem,
void
on_mm_manage_matches_activate (GtkMenuItem *menuitem,
gpointer user_data);
void
on_menu_save_window_geometry_activate (GtkMenuItem *menuitem,
gpointer user_data);
#endif

View File

@ -75,8 +75,9 @@ cup_round_new(void)
new.home_away = TRUE;
new.replay = 0;
new.neutral = FALSE;
new.randomise_teams = TRUE;
new.round_robin_number_of_groups = 0;
new.round_robin_number_of_advance = 1;
new.round_robin_number_of_advance = 0;
new.round_robin_number_of_best_advance = 0;
new.tables = g_array_new(FALSE, FALSE, sizeof(Table));
new.choose_teams = g_array_new(FALSE, FALSE, sizeof(CupChooseTeam));
@ -697,12 +698,16 @@ cup_get_matchdays_in_cup_round(const Cup *cup, gint round)
if(cup_round->round_robin_number_of_groups > 0)
{
number_of_teams = (cup_round_get_number_of_teams(cup, round) -
cup_round_get_byes(cup, round)) /
cup_round->round_robin_number_of_groups;
number_of_matchdays = (number_of_teams % 2 == 0) ?
2 * (number_of_teams - 1) :
2 * number_of_teams;
number_of_teams = cup_round_get_number_of_teams(cup, round);
if(number_of_teams % cup_round->round_robin_number_of_groups == 0)
number_of_matchdays =
((number_of_teams / cup_round->round_robin_number_of_groups) - 1) * 2;
else
number_of_matchdays =
((number_of_teams -
(number_of_teams % cup_round->round_robin_number_of_groups)) /
cup_round->round_robin_number_of_groups) * 2;
}
else if(g_array_index(cup->rounds, CupRound, round).home_away)
number_of_matchdays = 2;
@ -756,17 +761,20 @@ cup_round_get_byes(const Cup *cup, gint round)
else
new_teams = cup_round_get_number_of_teams(cup, round);
if(cup_round->round_robin_number_of_groups == 0)
number_of_byes = math_get_bye_len(new_teams);
else
{
while(new_teams % cup_round->round_robin_number_of_groups != 0)
{
new_teams--;
number_of_byes++;
}
}
}
number_of_byes = (cup_round->round_robin_number_of_groups == 0) ?
math_get_bye_len(new_teams) : 0;
/* if(cup_round->round_robin_number_of_groups == 0) */
/* number_of_byes = math_get_bye_len(new_teams); */
/* else */
/* { */
/* while(new_teams % cup_round->round_robin_number_of_groups != 0) */
/* { */
/* new_teams--; */
/* number_of_byes++; */
/* } */
/* } */
}
return number_of_byes;
}
@ -952,10 +960,11 @@ query_cup_begins(const Cup *cup)
CupChooseTeam, i), &league, &cup_temp);
if((cup_temp == NULL &&
g_array_index(league->fixtures, Fixture,
league->fixtures->len - 1).week_number == week &&
g_array_index(league->fixtures, Fixture,
league->fixtures->len - 1).week_round_number == week_round) ||
(!league->active ||
(g_array_index(league->fixtures, Fixture,
league->fixtures->len - 1).week_number == week &&
g_array_index(league->fixtures, Fixture,
league->fixtures->len - 1).week_round_number == week_round))) ||
(league == NULL &&
(cup_temp->fixtures->len > 0 &&
g_array_index(cup_temp->fixtures, Fixture,
@ -975,8 +984,9 @@ query_cup_begins(const Cup *cup)
&g_array_index(cup_round->choose_teams,
CupChooseTeam, i), &league, &cup_temp);
if((cup_temp == NULL &&
g_array_index(league->fixtures, Fixture,
league->fixtures->len - 1).attendance == -1) ||
(league->active &&
g_array_index(league->fixtures, Fixture,
league->fixtures->len - 1).attendance == -1)) ||
(league == NULL &&
(cup_temp->fixtures->len == 0 ||
(cup_temp->fixtures->len > 0 &&

View File

@ -18,6 +18,9 @@ typedef struct
/** Whether the matches are on neutral ground.
Default: FALSE. */
gboolean neutral;
/** Whether the teams array gets randomised before writing the fixtures.
Default: TRUE. FALSE makes only sense in the first cup round. */
gboolean randomise_teams;
/** How many round robin groups there are.
Default: 0 (ie. no round robin). */
gint round_robin_number_of_groups;

View File

@ -276,49 +276,46 @@ fixture_update_write_replays(Cup *cup)
void
fixture_write_cup_round_robin(Cup *cup, gint cup_round, GPtrArray *teams)
{
gint i, j;
gint i, j, cnt;
CupRound *cupround = &g_array_index(cup->rounds, CupRound, cup_round);
gint number_of_groups = cupround->round_robin_number_of_groups;
gint teams_per_group = -1;
GPtrArray *teams_group = NULL;
Table new_table;
gint team_num = (teams->len - (teams->len % number_of_groups)) / number_of_groups;
gint plus_div = teams->len % number_of_groups;
GPtrArray *teams_group[number_of_groups];
Table table_group[number_of_groups];
TableElement new_table_element;
teams = misc_randomise_g_pointer_array(teams);
if(teams->len % number_of_groups != 0)
if(teams->len < number_of_groups)
{
cup->bye = g_ptr_array_new();
while(teams->len % number_of_groups != 0)
{
g_ptr_array_add(cup->bye, g_ptr_array_index(teams, teams->len - 1));
g_ptr_array_remove_index(teams, teams->len - 1);
}
g_warning("fixture_write_cup_round_robin: cup %s round %d: number of teams (%d) less than number of groups (%d)\n", cup->name->str, cup_round, teams->len, number_of_groups);
main_exit_program(EXIT_FIXTURE_WRITE_ERROR, NULL);
}
teams_per_group = teams->len / number_of_groups;
if(cupround->randomise_teams)
teams = misc_randomise_g_pointer_array(teams);
cnt = 0;
for(i=0;i<number_of_groups;i++)
{
new_table.name = g_string_new(cup->name->str);
new_table.clid = cup->id;
new_table.round = cup_round;
new_table.elements = g_array_new(FALSE, FALSE, sizeof(TableElement));
table_group[i].name = g_string_new(cup->name->str);
table_group[i].clid = cup->id;
table_group[i].round = cup_round;
table_group[i].elements = g_array_new(FALSE, FALSE, sizeof(TableElement));
teams_group = g_ptr_array_new();
teams_group[i] = g_ptr_array_new();
for(j=0;j<teams_per_group;j++)
for(j=0;j<team_num + (i < plus_div);j++)
{
g_ptr_array_add(teams_group, g_ptr_array_index(teams, j + i * teams_per_group));
g_ptr_array_add(teams_group[i],
g_ptr_array_index(teams, cnt));
new_table_element =
table_element_new((Team*)g_ptr_array_index(teams, j + i * teams_per_group), j);
g_array_append_val(new_table.elements, new_table_element);
table_element_new((Team*)g_ptr_array_index(teams, cnt), table_group[i].elements->len);
g_array_append_val(table_group[i].elements, new_table_element);
cnt++;
}
g_array_append_val(cupround->tables, new_table);
fixture_write_round_robin((gpointer)cup, cup_round, teams_group, !cupround->home_away);
g_array_append_val(cupround->tables, table_group[i]);
fixture_write_round_robin((gpointer)cup, cup_round, teams_group[i], !cupround->home_away);
}
g_ptr_array_free(teams, TRUE);
@ -486,8 +483,6 @@ fixture_write_knockout_round(Cup *cup, gint cup_round, GPtrArray *teams)
gint bye_len = (round->byes == -1) ?
math_get_bye_len(len) : round->byes;
teams = misc_randomise_g_pointer_array(teams);
if(bye_len != 0)
{
cup->bye = g_ptr_array_new();
@ -503,12 +498,14 @@ fixture_write_knockout_round(Cup *cup, gint cup_round, GPtrArray *teams)
teams = misc_randomise_g_pointer_array(teams);
}
else if(round->randomise_teams)
teams = misc_randomise_g_pointer_array(teams);
week_round_number =
fixture_get_free_round(first_week, teams, -1, -1);
for(i=0; i<teams->len / 2; i++)
fixture_write(cup->fixtures, (Team*)g_ptr_array_index(teams, i),
(Team*)g_ptr_array_index(teams, i + teams->len / 2), first_week,
for(i=0; i<=(teams->len - 2) / 2; i++)
fixture_write(cup->fixtures, (Team*)g_ptr_array_index(teams, 2 * i),
(Team*)g_ptr_array_index(teams, 2 * i + 1), first_week,
week_round_number, cup->id, cup_round, 0,
!round->neutral, FALSE, (!round->home_away && round->replay == 0));
@ -516,9 +513,9 @@ fixture_write_knockout_round(Cup *cup, gint cup_round, GPtrArray *teams)
{
week_round_number =
fixture_get_free_round(first_week + cup->week_gap, teams, -1, -1);
for(i=0; i<teams->len / 2; i++)
fixture_write(cup->fixtures, (Team*)g_ptr_array_index(teams, i + teams->len / 2),
(Team*)g_ptr_array_index(teams, i), first_week + cup->week_gap,
for(i=0; i<=(teams->len - 2) / 2; i++)
fixture_write(cup->fixtures, (Team*)g_ptr_array_index(teams, 2 * i + 1),
(Team*)g_ptr_array_index(teams, 2 * i), first_week + cup->week_gap,
week_round_number, cup->id, cup_round, 0,
!round->neutral, TRUE, TRUE);
}

View File

@ -38,7 +38,7 @@ create_main_window (void)
GtkWidget *menu_new;
GtkWidget *menu_open;
GtkWidget *menu_load_last_save;
GtkWidget *image1909;
GtkWidget *image1947;
GtkWidget *menu_save;
GtkWidget *menu_save_as;
GtkWidget *trennlinie1;
@ -46,30 +46,33 @@ create_main_window (void)
GtkWidget *menu_options;
GtkWidget *menu_options_menu;
GtkWidget *menu_preferences;
GtkWidget *image1910;
GtkWidget *image1948;
GtkWidget *trennlinie7;
GtkWidget *menu_job_offers;
GtkWidget *menu_live_game;
GtkWidget *menu_overwrite;
GtkWidget *trennlinie14;
GtkWidget *menu_save_window_geometry;
GtkWidget *image1949;
GtkWidget *menu_figures;
GtkWidget *menu_figures_menu;
GtkWidget *menu_fixtures_week;
GtkWidget *image1911;
GtkWidget *image1950;
GtkWidget *menu_fixtures;
GtkWidget *image1912;
GtkWidget *image1951;
GtkWidget *menu_tables;
GtkWidget *image1913;
GtkWidget *image1952;
GtkWidget *menu_my_league_results;
GtkWidget *image1914;
GtkWidget *image1953;
GtkWidget *trennlinie13;
GtkWidget *menu_league_stats;
GtkWidget *image1915;
GtkWidget *image1954;
GtkWidget *menu_season_history;
GtkWidget *image1916;
GtkWidget *image1955;
GtkWidget *menu_team;
GtkWidget *menu_team_menu;
GtkWidget *menu_playing_style;
GtkWidget *image1917;
GtkWidget *image1956;
GtkWidget *menu_playing_style_menu;
GSList *menu_all_out_defend_group = NULL;
GtkWidget *menu_all_out_defend;
@ -78,7 +81,7 @@ create_main_window (void)
GtkWidget *menu_attack;
GtkWidget *menu_all_out_attack;
GtkWidget *menu_scout;
GtkWidget *image1918;
GtkWidget *image1957;
GtkWidget *menu_scout_menu;
GSList *menu_scout_best_group = NULL;
GtkWidget *menu_scout_best;
@ -86,7 +89,7 @@ create_main_window (void)
GtkWidget *menu_scout_average;
GtkWidget *menu_scout_bad;
GtkWidget *menu_physio;
GtkWidget *image1919;
GtkWidget *image1958;
GtkWidget *menu_physio_menu;
GSList *menu_physio_best_group = NULL;
GtkWidget *menu_physio_best;
@ -94,7 +97,7 @@ create_main_window (void)
GtkWidget *menu_physio_average;
GtkWidget *menu_physio_bad;
GtkWidget *menu_youth_academy;
GtkWidget *image1920;
GtkWidget *image1959;
GtkWidget *menu_youth_academy_menu;
GtkWidget *menu_show_youth_academy;
GtkWidget *youth_coach1;
@ -114,7 +117,7 @@ create_main_window (void)
GtkWidget *menu_recruit4;
GtkWidget *menu_set_investment;
GtkWidget *menu_boost;
GtkWidget *image1921;
GtkWidget *image1960;
GtkWidget *menu_boost_menu;
GSList *menu_boost_on_group = NULL;
GtkWidget *menu_boost_on;
@ -122,71 +125,71 @@ create_main_window (void)
GtkWidget *menu_boost_anti;
GtkWidget *trennlinie11;
GtkWidget *menu_reset_players;
GtkWidget *image1922;
GtkWidget *image1961;
GtkWidget *menu_custom_structure;
GtkWidget *image1923;
GtkWidget *image1962;
GtkWidget *menu_rearrange_team;
GtkWidget *image1924;
GtkWidget *image1963;
GtkWidget *trennlinie8;
GtkWidget *menu_browse_teams;
GtkWidget *image1925;
GtkWidget *image1964;
GtkWidget *menu_player;
GtkWidget *menu_player_menu;
GtkWidget *menu_show_info;
GtkWidget *image1926;
GtkWidget *image1965;
GtkWidget *menu_put_on_transfer_list;
GtkWidget *image1927;
GtkWidget *image1966;
GtkWidget *menu_remove_from_transfer_list;
GtkWidget *image1928;
GtkWidget *image1967;
GtkWidget *menu_offer_new_contract;
GtkWidget *image1929;
GtkWidget *image1968;
GtkWidget *menu_fire;
GtkWidget *image1930;
GtkWidget *image1969;
GtkWidget *menu_shoots_penalties;
GtkWidget *image1931;
GtkWidget *image1970;
GtkWidget *menu_move_to_youth_academy;
GtkWidget *trennlinie10;
GtkWidget *menu_browse_players;
GtkWidget *image1932;
GtkWidget *image1971;
GtkWidget *menu_user;
GtkWidget *menu_user_menu;
GtkWidget *menu_user_show_last_match;
GtkWidget *image1933;
GtkWidget *image1972;
GtkWidget *menu_user_show_last_stats;
GtkWidget *image1934;
GtkWidget *image1973;
GtkWidget *menu_user_show_coming_matches;
GtkWidget *image1935;
GtkWidget *image1974;
GtkWidget *memorable_matches;
GtkWidget *image1936;
GtkWidget *image1975;
GtkWidget *memorable_matches_menu;
GtkWidget *mm_add_last_match;
GtkWidget *image1937;
GtkWidget *image1976;
GtkWidget *mm_manage_matches;
GtkWidget *image1938;
GtkWidget *image1977;
GtkWidget *trennlinie12;
GtkWidget *menu_user_show_history;
GtkWidget *image1939;
GtkWidget *image1978;
GtkWidget *trennlinie9;
GtkWidget *menu_next_user;
GtkWidget *image1940;
GtkWidget *image1979;
GtkWidget *menu_previous_user;
GtkWidget *image1941;
GtkWidget *image1980;
GtkWidget *menu_manage_users;
GtkWidget *image1942;
GtkWidget *image1981;
GtkWidget *menu_finances_stadium;
GtkWidget *menu_finances_stadium_menu;
GtkWidget *menu_show_finances;
GtkWidget *image1943;
GtkWidget *image1982;
GtkWidget *menu_show_stadium;
GtkWidget *image1944;
GtkWidget *image1983;
GtkWidget *menu_help1;
GtkWidget *menu_help1_menu;
GtkWidget *menu_about;
GtkWidget *image1945;
GtkWidget *image1984;
GtkWidget *menu_contributors;
GtkWidget *image1946;
GtkWidget *image1985;
GtkWidget *menu_help;
GtkWidget *image1947;
GtkWidget *image1986;
GtkWidget *hbox1;
GtkWidget *button_load;
GtkWidget *image11;
@ -307,9 +310,9 @@ create_main_window (void)
GDK_l, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
GTK_ACCEL_VISIBLE);
image1909 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1909);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_load_last_save), image1909);
image1947 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1947);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_load_last_save), image1947);
menu_save = gtk_image_menu_item_new_from_stock ("gtk-save", accel_group);
gtk_widget_show (menu_save);
@ -342,9 +345,9 @@ create_main_window (void)
GDK_p, GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
image1910 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1910);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_preferences), image1910);
image1948 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1948);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_preferences), image1948);
trennlinie7 = gtk_separator_menu_item_new ();
gtk_widget_show (trennlinie7);
@ -365,6 +368,20 @@ create_main_window (void)
gtk_container_add (GTK_CONTAINER (menu_options_menu), menu_overwrite);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_overwrite), TRUE);
trennlinie14 = gtk_separator_menu_item_new ();
gtk_widget_show (trennlinie14);
gtk_container_add (GTK_CONTAINER (menu_options_menu), trennlinie14);
gtk_widget_set_sensitive (trennlinie14, FALSE);
menu_save_window_geometry = gtk_image_menu_item_new_with_mnemonic (_("Save window geometry"));
gtk_widget_show (menu_save_window_geometry);
gtk_container_add (GTK_CONTAINER (menu_options_menu), menu_save_window_geometry);
gtk_tooltips_set_tip (tooltips, menu_save_window_geometry, _("Save window size, position and vertical divider"), NULL);
image1949 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1949);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_window_geometry), image1949);
menu_figures = gtk_menu_item_new_with_mnemonic (_("F_igures"));
gtk_widget_show (menu_figures);
gtk_container_add (GTK_CONTAINER (menubar1), menu_figures);
@ -379,9 +396,9 @@ create_main_window (void)
GDK_F3, 0,
GTK_ACCEL_VISIBLE);
image1911 = create_pixmap (main_window, "menu_fixtures.png");
gtk_widget_show (image1911);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures_week), image1911);
image1950 = create_pixmap (main_window, "menu_fixtures.png");
gtk_widget_show (image1950);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures_week), image1950);
menu_fixtures = gtk_image_menu_item_new_with_mnemonic (_("Fixtures (competitions)"));
gtk_widget_show (menu_fixtures);
@ -390,9 +407,9 @@ create_main_window (void)
GDK_F4, 0,
GTK_ACCEL_VISIBLE);
image1912 = create_pixmap (main_window, "menu_fixtures_comp.png");
gtk_widget_show (image1912);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures), image1912);
image1951 = create_pixmap (main_window, "menu_fixtures_comp.png");
gtk_widget_show (image1951);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures), image1951);
menu_tables = gtk_image_menu_item_new_with_mnemonic (_("Tables"));
gtk_widget_show (menu_tables);
@ -401,9 +418,9 @@ create_main_window (void)
GDK_F5, 0,
GTK_ACCEL_VISIBLE);
image1913 = create_pixmap (main_window, "menu_table.png");
gtk_widget_show (image1913);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_tables), image1913);
image1952 = create_pixmap (main_window, "menu_table.png");
gtk_widget_show (image1952);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_tables), image1952);
menu_my_league_results = gtk_image_menu_item_new_with_mnemonic (_("My league results"));
gtk_widget_show (menu_my_league_results);
@ -412,9 +429,9 @@ create_main_window (void)
GDK_F6, 0,
GTK_ACCEL_VISIBLE);
image1914 = create_pixmap (main_window, "menu_league_results.png");
gtk_widget_show (image1914);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_my_league_results), image1914);
image1953 = create_pixmap (main_window, "menu_league_results.png");
gtk_widget_show (image1953);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_my_league_results), image1953);
trennlinie13 = gtk_separator_menu_item_new ();
gtk_widget_show (trennlinie13);
@ -428,9 +445,9 @@ create_main_window (void)
GDK_s, 0,
GTK_ACCEL_VISIBLE);
image1915 = create_pixmap (main_window, "menu_league_stats.png");
gtk_widget_show (image1915);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_league_stats), image1915);
image1954 = create_pixmap (main_window, "menu_league_stats.png");
gtk_widget_show (image1954);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_league_stats), image1954);
menu_season_history = gtk_image_menu_item_new_with_mnemonic (_("Season history"));
gtk_widget_show (menu_season_history);
@ -439,9 +456,9 @@ create_main_window (void)
GDK_h, 0,
GTK_ACCEL_VISIBLE);
image1916 = create_pixmap (main_window, "menu_history.png");
gtk_widget_show (image1916);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_season_history), image1916);
image1955 = create_pixmap (main_window, "menu_history.png");
gtk_widget_show (image1955);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_season_history), image1955);
menu_team = gtk_menu_item_new_with_mnemonic (_("_Team"));
gtk_widget_show (menu_team);
@ -454,9 +471,9 @@ create_main_window (void)
gtk_widget_show (menu_playing_style);
gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_playing_style);
image1917 = create_pixmap (main_window, "menu_style.png");
gtk_widget_show (image1917);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_playing_style), image1917);
image1956 = create_pixmap (main_window, "menu_style.png");
gtk_widget_show (image1956);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_playing_style), image1956);
menu_playing_style_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_playing_style), menu_playing_style_menu);
@ -495,9 +512,9 @@ create_main_window (void)
gtk_widget_show (menu_scout);
gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_scout);
image1918 = create_pixmap (main_window, "menu_scout.png");
gtk_widget_show (image1918);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_scout), image1918);
image1957 = create_pixmap (main_window, "menu_scout.png");
gtk_widget_show (image1957);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_scout), image1957);
menu_scout_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_scout), menu_scout_menu);
@ -530,9 +547,9 @@ create_main_window (void)
gtk_widget_show (menu_physio);
gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_physio);
image1919 = create_pixmap (main_window, "menu_physio.png");
gtk_widget_show (image1919);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_physio), image1919);
image1958 = create_pixmap (main_window, "menu_physio.png");
gtk_widget_show (image1958);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_physio), image1958);
menu_physio_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_physio), menu_physio_menu);
@ -565,9 +582,9 @@ create_main_window (void)
gtk_widget_show (menu_youth_academy);
gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_youth_academy);
image1920 = create_pixmap (main_window, "menu_youth_academy.png");
gtk_widget_show (image1920);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_youth_academy), image1920);
image1959 = create_pixmap (main_window, "menu_youth_academy.png");
gtk_widget_show (image1959);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_youth_academy), image1959);
menu_youth_academy_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_youth_academy), menu_youth_academy_menu);
@ -656,9 +673,9 @@ create_main_window (void)
gtk_widget_show (menu_boost);
gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_boost);
image1921 = create_pixmap (main_window, "menu_boost.png");
gtk_widget_show (image1921);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_boost), image1921);
image1960 = create_pixmap (main_window, "menu_boost.png");
gtk_widget_show (image1960);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_boost), image1960);
menu_boost_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_boost), menu_boost_menu);
@ -690,17 +707,17 @@ create_main_window (void)
gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_reset_players);
gtk_tooltips_set_tip (tooltips, menu_reset_players, _("Reset player list to the formation at the beginning of the live game pause (right click on player list)"), NULL);
image1922 = gtk_image_new_from_stock ("gtk-undo", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1922);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reset_players), image1922);
image1961 = gtk_image_new_from_stock ("gtk-undo", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1961);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reset_players), image1961);
menu_custom_structure = gtk_image_menu_item_new_with_mnemonic (_("Enter custom structure"));
gtk_widget_show (menu_custom_structure);
gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_custom_structure);
image1923 = create_pixmap (main_window, "menu_structure.png");
gtk_widget_show (image1923);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_custom_structure), image1923);
image1962 = create_pixmap (main_window, "menu_structure.png");
gtk_widget_show (image1962);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_custom_structure), image1962);
menu_rearrange_team = gtk_image_menu_item_new_with_mnemonic (_("Rearrange team"));
gtk_widget_show (menu_rearrange_team);
@ -710,9 +727,9 @@ create_main_window (void)
GDK_r, GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
image1924 = create_pixmap (main_window, "menu_rearrange.png");
gtk_widget_show (image1924);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_rearrange_team), image1924);
image1963 = create_pixmap (main_window, "menu_rearrange.png");
gtk_widget_show (image1963);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_rearrange_team), image1963);
trennlinie8 = gtk_separator_menu_item_new ();
gtk_widget_show (trennlinie8);
@ -723,9 +740,9 @@ create_main_window (void)
gtk_widget_show (menu_browse_teams);
gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_browse_teams);
image1925 = create_pixmap (main_window, "menu_browse_tms.png");
gtk_widget_show (image1925);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_teams), image1925);
image1964 = create_pixmap (main_window, "menu_browse_tms.png");
gtk_widget_show (image1964);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_teams), image1964);
menu_player = gtk_menu_item_new_with_mnemonic (_("_Player"));
gtk_widget_show (menu_player);
@ -738,49 +755,49 @@ create_main_window (void)
gtk_widget_show (menu_show_info);
gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_show_info);
image1926 = create_pixmap (main_window, "menu_player_info.png");
gtk_widget_show (image1926);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_info), image1926);
image1965 = create_pixmap (main_window, "menu_player_info.png");
gtk_widget_show (image1965);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_info), image1965);
menu_put_on_transfer_list = gtk_image_menu_item_new_with_mnemonic (_("Put on transfer list"));
gtk_widget_show (menu_put_on_transfer_list);
gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_put_on_transfer_list);
image1927 = create_pixmap (main_window, "menu_player_put_transfer.png");
gtk_widget_show (image1927);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_put_on_transfer_list), image1927);
image1966 = create_pixmap (main_window, "menu_player_put_transfer.png");
gtk_widget_show (image1966);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_put_on_transfer_list), image1966);
menu_remove_from_transfer_list = gtk_image_menu_item_new_with_mnemonic (_("Remove from transfer list"));
gtk_widget_show (menu_remove_from_transfer_list);
gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_remove_from_transfer_list);
image1928 = create_pixmap (main_window, "menu_player_remove_transfer.png");
gtk_widget_show (image1928);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_remove_from_transfer_list), image1928);
image1967 = create_pixmap (main_window, "menu_player_remove_transfer.png");
gtk_widget_show (image1967);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_remove_from_transfer_list), image1967);
menu_offer_new_contract = gtk_image_menu_item_new_with_mnemonic (_("Offer new contract"));
gtk_widget_show (menu_offer_new_contract);
gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_offer_new_contract);
image1929 = create_pixmap (main_window, "menu_player_contract.png");
gtk_widget_show (image1929);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_offer_new_contract), image1929);
image1968 = create_pixmap (main_window, "menu_player_contract.png");
gtk_widget_show (image1968);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_offer_new_contract), image1968);
menu_fire = gtk_image_menu_item_new_with_mnemonic (_("Fire"));
gtk_widget_show (menu_fire);
gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_fire);
image1930 = create_pixmap (main_window, "menu_player_fire.png");
gtk_widget_show (image1930);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fire), image1930);
image1969 = create_pixmap (main_window, "menu_player_fire.png");
gtk_widget_show (image1969);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fire), image1969);
menu_shoots_penalties = gtk_image_menu_item_new_with_mnemonic (_("Shoots penalties"));
gtk_widget_show (menu_shoots_penalties);
gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_shoots_penalties);
image1931 = create_pixmap (main_window, "menu_player_shoots.png");
gtk_widget_show (image1931);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_shoots_penalties), image1931);
image1970 = create_pixmap (main_window, "menu_player_shoots.png");
gtk_widget_show (image1970);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_shoots_penalties), image1970);
menu_move_to_youth_academy = gtk_menu_item_new_with_mnemonic (_("Move to youth academy"));
gtk_widget_show (menu_move_to_youth_academy);
@ -795,9 +812,9 @@ create_main_window (void)
gtk_widget_show (menu_browse_players);
gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_browse_players);
image1932 = create_pixmap (main_window, "menu_player_browse.png");
gtk_widget_show (image1932);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_players), image1932);
image1971 = create_pixmap (main_window, "menu_player_browse.png");
gtk_widget_show (image1971);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_players), image1971);
menu_user = gtk_menu_item_new_with_mnemonic (_("_User"));
gtk_widget_show (menu_user);
@ -813,9 +830,9 @@ create_main_window (void)
GDK_v, GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
image1933 = create_pixmap (main_window, "menu_last_match.png");
gtk_widget_show (image1933);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_match), image1933);
image1972 = create_pixmap (main_window, "menu_last_match.png");
gtk_widget_show (image1972);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_match), image1972);
menu_user_show_last_stats = gtk_image_menu_item_new_with_mnemonic (_("Show last match stats"));
gtk_widget_show (menu_user_show_last_stats);
@ -824,9 +841,9 @@ create_main_window (void)
GDK_F2, 0,
GTK_ACCEL_VISIBLE);
image1934 = create_pixmap (main_window, "menu_match_stats.png");
gtk_widget_show (image1934);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_stats), image1934);
image1973 = create_pixmap (main_window, "menu_match_stats.png");
gtk_widget_show (image1973);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_stats), image1973);
menu_user_show_coming_matches = gtk_image_menu_item_new_with_mnemonic (_("Show coming matches"));
gtk_widget_show (menu_user_show_coming_matches);
@ -835,17 +852,17 @@ create_main_window (void)
GDK_F1, 0,
GTK_ACCEL_VISIBLE);
image1935 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1935);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_coming_matches), image1935);
image1974 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1974);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_coming_matches), image1974);
memorable_matches = gtk_image_menu_item_new_with_mnemonic (_("Memorable matches"));
gtk_widget_show (memorable_matches);
gtk_container_add (GTK_CONTAINER (menu_user_menu), memorable_matches);
image1936 = create_pixmap (main_window, "menu_mmatches.png");
gtk_widget_show (image1936);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (memorable_matches), image1936);
image1975 = create_pixmap (main_window, "menu_mmatches.png");
gtk_widget_show (image1975);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (memorable_matches), image1975);
memorable_matches_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (memorable_matches), memorable_matches_menu);
@ -858,9 +875,9 @@ create_main_window (void)
GDK_a, GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
image1937 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1937);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mm_add_last_match), image1937);
image1976 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1976);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mm_add_last_match), image1976);
mm_manage_matches = gtk_image_menu_item_new_with_mnemonic (_("Manage matches"));
gtk_widget_show (mm_manage_matches);
@ -870,9 +887,9 @@ create_main_window (void)
GDK_m, GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
image1938 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1938);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mm_manage_matches), image1938);
image1977 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1977);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mm_manage_matches), image1977);
trennlinie12 = gtk_separator_menu_item_new ();
gtk_widget_show (trennlinie12);
@ -886,9 +903,9 @@ create_main_window (void)
GDK_h, GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
image1939 = create_pixmap (main_window, "menu_history.png");
gtk_widget_show (image1939);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_history), image1939);
image1978 = create_pixmap (main_window, "menu_history.png");
gtk_widget_show (image1978);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_history), image1978);
trennlinie9 = gtk_separator_menu_item_new ();
gtk_widget_show (trennlinie9);
@ -902,9 +919,9 @@ create_main_window (void)
GDK_F9, 0,
GTK_ACCEL_VISIBLE);
image1940 = gtk_image_new_from_stock ("gtk-media-forward", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1940);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_next_user), image1940);
image1979 = gtk_image_new_from_stock ("gtk-media-forward", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1979);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_next_user), image1979);
menu_previous_user = gtk_image_menu_item_new_with_mnemonic (_("Previous user"));
gtk_widget_show (menu_previous_user);
@ -913,9 +930,9 @@ create_main_window (void)
GDK_F8, 0,
GTK_ACCEL_VISIBLE);
image1941 = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1941);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_previous_user), image1941);
image1980 = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1980);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_previous_user), image1980);
menu_manage_users = gtk_image_menu_item_new_with_mnemonic (_("Manage users"));
gtk_widget_show (menu_manage_users);
@ -924,9 +941,9 @@ create_main_window (void)
GDK_F12, 0,
GTK_ACCEL_VISIBLE);
image1942 = gtk_image_new_from_stock ("gtk-justify-fill", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1942);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_manage_users), image1942);
image1981 = gtk_image_new_from_stock ("gtk-justify-fill", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1981);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_manage_users), image1981);
menu_finances_stadium = gtk_menu_item_new_with_mnemonic (_("Fin_Stad"));
gtk_widget_show (menu_finances_stadium);
@ -942,9 +959,9 @@ create_main_window (void)
GDK_f, 0,
GTK_ACCEL_VISIBLE);
image1943 = create_pixmap (main_window, "menu_finances.png");
gtk_widget_show (image1943);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_finances), image1943);
image1982 = create_pixmap (main_window, "menu_finances.png");
gtk_widget_show (image1982);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_finances), image1982);
menu_show_stadium = gtk_image_menu_item_new_with_mnemonic (_("Show stadium"));
gtk_widget_show (menu_show_stadium);
@ -953,9 +970,9 @@ create_main_window (void)
GDK_f, GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
image1944 = create_pixmap (main_window, "menu_stadium.png");
gtk_widget_show (image1944);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_stadium), image1944);
image1983 = create_pixmap (main_window, "menu_stadium.png");
gtk_widget_show (image1983);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_stadium), image1983);
menu_help1 = gtk_menu_item_new_with_mnemonic (_("_Help"));
gtk_widget_show (menu_help1);
@ -968,25 +985,25 @@ create_main_window (void)
gtk_widget_show (menu_about);
gtk_container_add (GTK_CONTAINER (menu_help1_menu), menu_about);
image1945 = gtk_image_new_from_stock ("gtk-dialog-info", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1945);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_about), image1945);
image1984 = gtk_image_new_from_stock ("gtk-dialog-info", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1984);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_about), image1984);
menu_contributors = gtk_image_menu_item_new_with_mnemonic (_("Contributors"));
gtk_widget_show (menu_contributors);
gtk_container_add (GTK_CONTAINER (menu_help1_menu), menu_contributors);
image1946 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1946);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_contributors), image1946);
image1985 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1985);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_contributors), image1985);
menu_help = gtk_image_menu_item_new_with_mnemonic (_("Help"));
gtk_widget_show (menu_help);
gtk_container_add (GTK_CONTAINER (menu_help1_menu), menu_help);
image1947 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1947);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_help), image1947);
image1986 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
gtk_widget_show (image1986);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_help), image1986);
hbox1 = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox1);
@ -1101,6 +1118,7 @@ create_main_window (void)
label23 = gtk_label_new (_(" Season "));
gtk_widget_show (label23);
gtk_box_pack_start (GTK_BOX (hbox18), label23, FALSE, FALSE, 0);
gtk_label_set_line_wrap (GTK_LABEL (label23), TRUE);
gtk_misc_set_padding (GTK_MISC (label23), 5, 0);
label_season = gtk_label_new ("");
@ -1110,6 +1128,7 @@ create_main_window (void)
label25 = gtk_label_new (_(" Week "));
gtk_widget_show (label25);
gtk_box_pack_start (GTK_BOX (hbox18), label25, FALSE, FALSE, 0);
gtk_label_set_line_wrap (GTK_LABEL (label25), TRUE);
gtk_misc_set_padding (GTK_MISC (label25), 5, 0);
label_week = gtk_label_new ("");
@ -1119,6 +1138,7 @@ create_main_window (void)
label13114 = gtk_label_new (_(" Round "));
gtk_widget_show (label13114);
gtk_box_pack_start (GTK_BOX (hbox18), label13114, FALSE, FALSE, 0);
gtk_label_set_line_wrap (GTK_LABEL (label13114), TRUE);
label_round = gtk_label_new ("");
gtk_widget_show (label_round);
@ -1165,6 +1185,7 @@ create_main_window (void)
label_league = gtk_label_new ("");
gtk_widget_show (label_league);
gtk_box_pack_start (GTK_BOX (hbox18), label_league, FALSE, FALSE, 0);
gtk_label_set_line_wrap (GTK_LABEL (label_league), TRUE);
gtk_misc_set_padding (GTK_MISC (label_league), 5, 0);
eventbox_rank = gtk_event_box_new ();
@ -1178,6 +1199,7 @@ create_main_window (void)
label29 = gtk_label_new (_("Rank "));
gtk_widget_show (label29);
gtk_box_pack_start (GTK_BOX (hbox49), label29, FALSE, FALSE, 0);
gtk_label_set_line_wrap (GTK_LABEL (label29), TRUE);
gtk_misc_set_padding (GTK_MISC (label29), 5, 0);
label_rank = gtk_label_new ("");
@ -1192,6 +1214,7 @@ create_main_window (void)
label34 = gtk_label_new (_("Money "));
gtk_widget_show (label34);
gtk_box_pack_start (GTK_BOX (hbox18), label34, FALSE, FALSE, 0);
gtk_label_set_line_wrap (GTK_LABEL (label34), TRUE);
gtk_misc_set_padding (GTK_MISC (label34), 5, 0);
label_money = gtk_label_new ("");
@ -1215,6 +1238,7 @@ create_main_window (void)
label69 = gtk_label_new (_("Av. skills: "));
gtk_widget_show (label69);
gtk_box_pack_start (GTK_BOX (hbox50), label69, FALSE, FALSE, 0);
gtk_label_set_line_wrap (GTK_LABEL (label69), TRUE);
label_av_skills = gtk_label_new ("");
gtk_widget_show (label_av_skills);
@ -1379,6 +1403,9 @@ create_main_window (void)
g_signal_connect ((gpointer) menu_overwrite, "button_press_event",
G_CALLBACK (on_menu_check_button_press_event),
NULL);
g_signal_connect ((gpointer) menu_save_window_geometry, "activate",
G_CALLBACK (on_menu_save_window_geometry_activate),
NULL);
g_signal_connect ((gpointer) menu_fixtures_week, "activate",
G_CALLBACK (on_menu_fixtures_week_activate),
NULL);
@ -1617,7 +1644,7 @@ create_main_window (void)
GLADE_HOOKUP_OBJECT (main_window, menu_new, "menu_new");
GLADE_HOOKUP_OBJECT (main_window, menu_open, "menu_open");
GLADE_HOOKUP_OBJECT (main_window, menu_load_last_save, "menu_load_last_save");
GLADE_HOOKUP_OBJECT (main_window, image1909, "image1909");
GLADE_HOOKUP_OBJECT (main_window, image1947, "image1947");
GLADE_HOOKUP_OBJECT (main_window, menu_save, "menu_save");
GLADE_HOOKUP_OBJECT (main_window, menu_save_as, "menu_save_as");
GLADE_HOOKUP_OBJECT (main_window, trennlinie1, "trennlinie1");
@ -1625,30 +1652,33 @@ create_main_window (void)
GLADE_HOOKUP_OBJECT (main_window, menu_options, "menu_options");
GLADE_HOOKUP_OBJECT (main_window, menu_options_menu, "menu_options_menu");
GLADE_HOOKUP_OBJECT (main_window, menu_preferences, "menu_preferences");
GLADE_HOOKUP_OBJECT (main_window, image1910, "image1910");
GLADE_HOOKUP_OBJECT (main_window, image1948, "image1948");
GLADE_HOOKUP_OBJECT (main_window, trennlinie7, "trennlinie7");
GLADE_HOOKUP_OBJECT (main_window, menu_job_offers, "menu_job_offers");
GLADE_HOOKUP_OBJECT (main_window, menu_live_game, "menu_live_game");
GLADE_HOOKUP_OBJECT (main_window, menu_overwrite, "menu_overwrite");
GLADE_HOOKUP_OBJECT (main_window, trennlinie14, "trennlinie14");
GLADE_HOOKUP_OBJECT (main_window, menu_save_window_geometry, "menu_save_window_geometry");
GLADE_HOOKUP_OBJECT (main_window, image1949, "image1949");
GLADE_HOOKUP_OBJECT (main_window, menu_figures, "menu_figures");
GLADE_HOOKUP_OBJECT (main_window, menu_figures_menu, "menu_figures_menu");
GLADE_HOOKUP_OBJECT (main_window, menu_fixtures_week, "menu_fixtures_week");
GLADE_HOOKUP_OBJECT (main_window, image1911, "image1911");
GLADE_HOOKUP_OBJECT (main_window, image1950, "image1950");
GLADE_HOOKUP_OBJECT (main_window, menu_fixtures, "menu_fixtures");
GLADE_HOOKUP_OBJECT (main_window, image1912, "image1912");
GLADE_HOOKUP_OBJECT (main_window, image1951, "image1951");
GLADE_HOOKUP_OBJECT (main_window, menu_tables, "menu_tables");
GLADE_HOOKUP_OBJECT (main_window, image1913, "image1913");
GLADE_HOOKUP_OBJECT (main_window, image1952, "image1952");
GLADE_HOOKUP_OBJECT (main_window, menu_my_league_results, "menu_my_league_results");
GLADE_HOOKUP_OBJECT (main_window, image1914, "image1914");
GLADE_HOOKUP_OBJECT (main_window, image1953, "image1953");
GLADE_HOOKUP_OBJECT (main_window, trennlinie13, "trennlinie13");
GLADE_HOOKUP_OBJECT (main_window, menu_league_stats, "menu_league_stats");
GLADE_HOOKUP_OBJECT (main_window, image1915, "image1915");
GLADE_HOOKUP_OBJECT (main_window, image1954, "image1954");
GLADE_HOOKUP_OBJECT (main_window, menu_season_history, "menu_season_history");
GLADE_HOOKUP_OBJECT (main_window, image1916, "image1916");
GLADE_HOOKUP_OBJECT (main_window, image1955, "image1955");
GLADE_HOOKUP_OBJECT (main_window, menu_team, "menu_team");
GLADE_HOOKUP_OBJECT (main_window, menu_team_menu, "menu_team_menu");
GLADE_HOOKUP_OBJECT (main_window, menu_playing_style, "menu_playing_style");
GLADE_HOOKUP_OBJECT (main_window, image1917, "image1917");
GLADE_HOOKUP_OBJECT (main_window, image1956, "image1956");
GLADE_HOOKUP_OBJECT (main_window, menu_playing_style_menu, "menu_playing_style_menu");
GLADE_HOOKUP_OBJECT (main_window, menu_all_out_defend, "menu_all_out_defend");
GLADE_HOOKUP_OBJECT (main_window, menu_defend, "menu_defend");
@ -1656,21 +1686,21 @@ create_main_window (void)
GLADE_HOOKUP_OBJECT (main_window, menu_attack, "menu_attack");
GLADE_HOOKUP_OBJECT (main_window, menu_all_out_attack, "menu_all_out_attack");
GLADE_HOOKUP_OBJECT (main_window, menu_scout, "menu_scout");
GLADE_HOOKUP_OBJECT (main_window, image1918, "image1918");
GLADE_HOOKUP_OBJECT (main_window, image1957, "image1957");
GLADE_HOOKUP_OBJECT (main_window, menu_scout_menu, "menu_scout_menu");
GLADE_HOOKUP_OBJECT (main_window, menu_scout_best, "menu_scout_best");
GLADE_HOOKUP_OBJECT (main_window, menu_scout_good, "menu_scout_good");
GLADE_HOOKUP_OBJECT (main_window, menu_scout_average, "menu_scout_average");
GLADE_HOOKUP_OBJECT (main_window, menu_scout_bad, "menu_scout_bad");
GLADE_HOOKUP_OBJECT (main_window, menu_physio, "menu_physio");
GLADE_HOOKUP_OBJECT (main_window, image1919, "image1919");
GLADE_HOOKUP_OBJECT (main_window, image1958, "image1958");
GLADE_HOOKUP_OBJECT (main_window, menu_physio_menu, "menu_physio_menu");
GLADE_HOOKUP_OBJECT (main_window, menu_physio_best, "menu_physio_best");
GLADE_HOOKUP_OBJECT (main_window, menu_physio_good, "menu_physio_good");
GLADE_HOOKUP_OBJECT (main_window, menu_physio_average, "menu_physio_average");
GLADE_HOOKUP_OBJECT (main_window, menu_physio_bad, "menu_physio_bad");
GLADE_HOOKUP_OBJECT (main_window, menu_youth_academy, "menu_youth_academy");
GLADE_HOOKUP_OBJECT (main_window, image1920, "image1920");
GLADE_HOOKUP_OBJECT (main_window, image1959, "image1959");
GLADE_HOOKUP_OBJECT (main_window, menu_youth_academy_menu, "menu_youth_academy_menu");
GLADE_HOOKUP_OBJECT (main_window, menu_show_youth_academy, "menu_show_youth_academy");
GLADE_HOOKUP_OBJECT (main_window, youth_coach1, "youth_coach1");
@ -1688,78 +1718,78 @@ create_main_window (void)
GLADE_HOOKUP_OBJECT (main_window, menu_recruit4, "menu_recruit4");
GLADE_HOOKUP_OBJECT (main_window, menu_set_investment, "menu_set_investment");
GLADE_HOOKUP_OBJECT (main_window, menu_boost, "menu_boost");
GLADE_HOOKUP_OBJECT (main_window, image1921, "image1921");
GLADE_HOOKUP_OBJECT (main_window, image1960, "image1960");
GLADE_HOOKUP_OBJECT (main_window, menu_boost_menu, "menu_boost_menu");
GLADE_HOOKUP_OBJECT (main_window, menu_boost_on, "menu_boost_on");
GLADE_HOOKUP_OBJECT (main_window, menu_boost_off, "menu_boost_off");
GLADE_HOOKUP_OBJECT (main_window, menu_boost_anti, "menu_boost_anti");
GLADE_HOOKUP_OBJECT (main_window, trennlinie11, "trennlinie11");
GLADE_HOOKUP_OBJECT (main_window, menu_reset_players, "menu_reset_players");
GLADE_HOOKUP_OBJECT (main_window, image1922, "image1922");
GLADE_HOOKUP_OBJECT (main_window, image1961, "image1961");
GLADE_HOOKUP_OBJECT (main_window, menu_custom_structure, "menu_custom_structure");
GLADE_HOOKUP_OBJECT (main_window, image1923, "image1923");
GLADE_HOOKUP_OBJECT (main_window, image1962, "image1962");
GLADE_HOOKUP_OBJECT (main_window, menu_rearrange_team, "menu_rearrange_team");
GLADE_HOOKUP_OBJECT (main_window, image1924, "image1924");
GLADE_HOOKUP_OBJECT (main_window, image1963, "image1963");
GLADE_HOOKUP_OBJECT (main_window, trennlinie8, "trennlinie8");
GLADE_HOOKUP_OBJECT (main_window, menu_browse_teams, "menu_browse_teams");
GLADE_HOOKUP_OBJECT (main_window, image1925, "image1925");
GLADE_HOOKUP_OBJECT (main_window, image1964, "image1964");
GLADE_HOOKUP_OBJECT (main_window, menu_player, "menu_player");
GLADE_HOOKUP_OBJECT (main_window, menu_player_menu, "menu_player_menu");
GLADE_HOOKUP_OBJECT (main_window, menu_show_info, "menu_show_info");
GLADE_HOOKUP_OBJECT (main_window, image1926, "image1926");
GLADE_HOOKUP_OBJECT (main_window, image1965, "image1965");
GLADE_HOOKUP_OBJECT (main_window, menu_put_on_transfer_list, "menu_put_on_transfer_list");
GLADE_HOOKUP_OBJECT (main_window, image1927, "image1927");
GLADE_HOOKUP_OBJECT (main_window, image1966, "image1966");
GLADE_HOOKUP_OBJECT (main_window, menu_remove_from_transfer_list, "menu_remove_from_transfer_list");
GLADE_HOOKUP_OBJECT (main_window, image1928, "image1928");
GLADE_HOOKUP_OBJECT (main_window, image1967, "image1967");
GLADE_HOOKUP_OBJECT (main_window, menu_offer_new_contract, "menu_offer_new_contract");
GLADE_HOOKUP_OBJECT (main_window, image1929, "image1929");
GLADE_HOOKUP_OBJECT (main_window, image1968, "image1968");
GLADE_HOOKUP_OBJECT (main_window, menu_fire, "menu_fire");
GLADE_HOOKUP_OBJECT (main_window, image1930, "image1930");
GLADE_HOOKUP_OBJECT (main_window, image1969, "image1969");
GLADE_HOOKUP_OBJECT (main_window, menu_shoots_penalties, "menu_shoots_penalties");
GLADE_HOOKUP_OBJECT (main_window, image1931, "image1931");
GLADE_HOOKUP_OBJECT (main_window, image1970, "image1970");
GLADE_HOOKUP_OBJECT (main_window, menu_move_to_youth_academy, "menu_move_to_youth_academy");
GLADE_HOOKUP_OBJECT (main_window, trennlinie10, "trennlinie10");
GLADE_HOOKUP_OBJECT (main_window, menu_browse_players, "menu_browse_players");
GLADE_HOOKUP_OBJECT (main_window, image1932, "image1932");
GLADE_HOOKUP_OBJECT (main_window, image1971, "image1971");
GLADE_HOOKUP_OBJECT (main_window, menu_user, "menu_user");
GLADE_HOOKUP_OBJECT (main_window, menu_user_menu, "menu_user_menu");
GLADE_HOOKUP_OBJECT (main_window, menu_user_show_last_match, "menu_user_show_last_match");
GLADE_HOOKUP_OBJECT (main_window, image1933, "image1933");
GLADE_HOOKUP_OBJECT (main_window, image1972, "image1972");
GLADE_HOOKUP_OBJECT (main_window, menu_user_show_last_stats, "menu_user_show_last_stats");
GLADE_HOOKUP_OBJECT (main_window, image1934, "image1934");
GLADE_HOOKUP_OBJECT (main_window, image1973, "image1973");
GLADE_HOOKUP_OBJECT (main_window, menu_user_show_coming_matches, "menu_user_show_coming_matches");
GLADE_HOOKUP_OBJECT (main_window, image1935, "image1935");
GLADE_HOOKUP_OBJECT (main_window, image1974, "image1974");
GLADE_HOOKUP_OBJECT (main_window, memorable_matches, "memorable_matches");
GLADE_HOOKUP_OBJECT (main_window, image1936, "image1936");
GLADE_HOOKUP_OBJECT (main_window, image1975, "image1975");
GLADE_HOOKUP_OBJECT (main_window, memorable_matches_menu, "memorable_matches_menu");
GLADE_HOOKUP_OBJECT (main_window, mm_add_last_match, "mm_add_last_match");
GLADE_HOOKUP_OBJECT (main_window, image1937, "image1937");
GLADE_HOOKUP_OBJECT (main_window, image1976, "image1976");
GLADE_HOOKUP_OBJECT (main_window, mm_manage_matches, "mm_manage_matches");
GLADE_HOOKUP_OBJECT (main_window, image1938, "image1938");
GLADE_HOOKUP_OBJECT (main_window, image1977, "image1977");
GLADE_HOOKUP_OBJECT (main_window, trennlinie12, "trennlinie12");
GLADE_HOOKUP_OBJECT (main_window, menu_user_show_history, "menu_user_show_history");
GLADE_HOOKUP_OBJECT (main_window, image1939, "image1939");
GLADE_HOOKUP_OBJECT (main_window, image1978, "image1978");
GLADE_HOOKUP_OBJECT (main_window, trennlinie9, "trennlinie9");
GLADE_HOOKUP_OBJECT (main_window, menu_next_user, "menu_next_user");
GLADE_HOOKUP_OBJECT (main_window, image1940, "image1940");
GLADE_HOOKUP_OBJECT (main_window, image1979, "image1979");
GLADE_HOOKUP_OBJECT (main_window, menu_previous_user, "menu_previous_user");
GLADE_HOOKUP_OBJECT (main_window, image1941, "image1941");
GLADE_HOOKUP_OBJECT (main_window, image1980, "image1980");
GLADE_HOOKUP_OBJECT (main_window, menu_manage_users, "menu_manage_users");
GLADE_HOOKUP_OBJECT (main_window, image1942, "image1942");
GLADE_HOOKUP_OBJECT (main_window, image1981, "image1981");
GLADE_HOOKUP_OBJECT (main_window, menu_finances_stadium, "menu_finances_stadium");
GLADE_HOOKUP_OBJECT (main_window, menu_finances_stadium_menu, "menu_finances_stadium_menu");
GLADE_HOOKUP_OBJECT (main_window, menu_show_finances, "menu_show_finances");
GLADE_HOOKUP_OBJECT (main_window, image1943, "image1943");
GLADE_HOOKUP_OBJECT (main_window, image1982, "image1982");
GLADE_HOOKUP_OBJECT (main_window, menu_show_stadium, "menu_show_stadium");
GLADE_HOOKUP_OBJECT (main_window, image1944, "image1944");
GLADE_HOOKUP_OBJECT (main_window, image1983, "image1983");
GLADE_HOOKUP_OBJECT (main_window, menu_help1, "menu_help1");
GLADE_HOOKUP_OBJECT (main_window, menu_help1_menu, "menu_help1_menu");
GLADE_HOOKUP_OBJECT (main_window, menu_about, "menu_about");
GLADE_HOOKUP_OBJECT (main_window, image1945, "image1945");
GLADE_HOOKUP_OBJECT (main_window, image1984, "image1984");
GLADE_HOOKUP_OBJECT (main_window, menu_contributors, "menu_contributors");
GLADE_HOOKUP_OBJECT (main_window, image1946, "image1946");
GLADE_HOOKUP_OBJECT (main_window, image1985, "image1985");
GLADE_HOOKUP_OBJECT (main_window, menu_help, "menu_help");
GLADE_HOOKUP_OBJECT (main_window, image1947, "image1947");
GLADE_HOOKUP_OBJECT (main_window, image1986, "image1986");
GLADE_HOOKUP_OBJECT (main_window, hbox1, "hbox1");
GLADE_HOOKUP_OBJECT (main_window, button_load, "button_load");
GLADE_HOOKUP_OBJECT (main_window, image11, "image11");

View File

@ -162,10 +162,7 @@ void
main_exit_program(gint exit_code, gchar *exit_message)
{
if(gtk_main_level() > 0)
{
window_main_save_geometry();
gtk_main_quit();
}
free_memory();

View File

@ -999,9 +999,9 @@ player_update_streak(Player *pl)
streak_prob_add = const_float("float_player_streak_prob_zero");
/*d*/
if(debug > 0)
printf("upd %-25s streak %d count %.1f prob %.3f\n",
pl->name->str, pl->streak, pl->streak_count, pl->streak_prob);
/* if(debug > 0) */
/* printf("upd %-25s streak %d count %.1f prob %.3f\n", */
/* pl->name->str, pl->streak, pl->streak_count, pl->streak_prob); */
/** Player streak is locked. */
if(pl->streak_count < 0)
@ -1056,9 +1056,9 @@ player_update_streak(Player *pl)
pl->streak_count = streak_length;
/*d*/
if(debug > 0)
printf("**** %s HOT length %.1f prob %.2f\n",
pl->name->str, pl->streak_count, pl->streak_prob);
/* if(debug > 0) */
/* printf("**** %s HOT length %.1f prob %.2f\n", */
/* pl->name->str, pl->streak_count, pl->streak_prob); */
}
else if(streak_type > pl->streak_prob &&
((pl->streak_prob > 0 &&
@ -1070,9 +1070,9 @@ player_update_streak(Player *pl)
pl->streak_count = streak_length;
/*d*/
if(debug > 0)
printf("**** %s COLD length %.1f prob %.2f\n",
pl->name->str, pl->streak_count, pl->streak_prob);
/* if(debug > 0) */
/* printf("**** %s COLD length %.1f prob %.2f\n", */
/* pl->name->str, pl->streak_count, pl->streak_prob); */
}
}
@ -1383,10 +1383,10 @@ player_streak_add_to_prob(Player *pl, gfloat add)
pl->streak_prob += add;
pl->streak_prob = CLAMP(pl->streak_prob, -1, 1);
/*d*/
if(debug > 0)
printf("addto %-25s st %d cnt %.1f pro %.3f\n",
pl->name->str, pl->streak, pl->streak_count,
pl->streak_prob);
/* if(debug > 0) */
/* printf("addto %-25s st %d cnt %.1f pro %.3f\n", */
/* pl->name->str, pl->streak, pl->streak_count, */
/* pl->streak_prob); */
}
/** Find out whether a player is in the youth academy. */

View File

@ -334,6 +334,7 @@ end_week_round_update_fixtures(void)
lig(i).id, -1, "");
for(i=0;i<cps->len;i++)
{
if(cp(i).add_week == 1000 &&
cp(i).fixtures->len == 0 &&
query_cup_begins(&cp(i)))
@ -342,6 +343,7 @@ end_week_round_update_fixtures(void)
fixture_write_cup_fixtures(&cp(i));
g_ptr_array_add(acps, &cp(i));
}
}
}
/** Start a new week round. */

View File

@ -119,6 +119,7 @@ team_generate_players_stadium(Team *tm)
(1 + cup_from_clid(tm->clid)->talent_diff);
average_talent = CLAMP(average_talent, 0, const_float("float_player_max_skill"));
tm->average_talent = average_talent;
if(def_file == NULL)
{

View File

@ -28,6 +28,7 @@
#define TAG_CUP_ROUND_HOME_AWAY "home_away"
#define TAG_CUP_ROUND_REPLAY "replay"
#define TAG_CUP_ROUND_NEUTRAL "neutral"
#define TAG_CUP_ROUND_RANDOMISE_TEAMS "randomise_teams"
#define TAG_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_GROUPS "number_of_groups"
#define TAG_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_ADVANCE "number_of_advance"
#define TAG_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_BEST_ADVANCE "number_of_best_advance"
@ -64,6 +65,7 @@ enum XmlCupStates
STATE_CUP_ROUND_HOME_AWAY,
STATE_CUP_ROUND_REPLAY,
STATE_CUP_ROUND_NEUTRAL,
STATE_CUP_ROUND_RANDOMISE_TEAMS,
STATE_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_GROUPS,
STATE_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_ADVANCE,
STATE_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_BEST_ADVANCE,
@ -146,6 +148,8 @@ xml_cup_read_start_element (GMarkupParseContext *context,
state = STATE_CUP_ROUND_REPLAY;
else if(strcmp(element_name, TAG_CUP_ROUND_NEUTRAL) == 0)
state = STATE_CUP_ROUND_NEUTRAL;
else if(strcmp(element_name, TAG_CUP_ROUND_RANDOMISE_TEAMS) == 0)
state = STATE_CUP_ROUND_RANDOMISE_TEAMS;
else if(strcmp(element_name, TAG_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_GROUPS) == 0)
state = STATE_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_GROUPS;
else if(strcmp(element_name, TAG_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_ADVANCE) == 0)
@ -208,6 +212,7 @@ xml_cup_read_end_element (GMarkupParseContext *context,
else if(strcmp(element_name, TAG_CUP_ROUND_HOME_AWAY) == 0 ||
strcmp(element_name, TAG_CUP_ROUND_REPLAY) == 0 ||
strcmp(element_name, TAG_CUP_ROUND_NEUTRAL) == 0 ||
strcmp(element_name, TAG_CUP_ROUND_RANDOMISE_TEAMS) == 0 ||
strcmp(element_name, TAG_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_GROUPS) == 0 ||
strcmp(element_name, TAG_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_ADVANCE) == 0 ||
strcmp(element_name, TAG_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_BEST_ADVANCE) == 0 ||
@ -292,6 +297,8 @@ xml_cup_read_text (GMarkupParseContext *context,
new_round.replay = int_value;
else if(state == STATE_CUP_ROUND_NEUTRAL)
new_round.neutral = int_value;
else if(state == STATE_CUP_ROUND_RANDOMISE_TEAMS)
new_round.randomise_teams = int_value;
else if(state == STATE_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_GROUPS)
new_round.round_robin_number_of_groups = int_value;
else if(state == STATE_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_ADVANCE)

View File

@ -33,6 +33,7 @@ enum
TAG_CUP_ROUND_HOME_AWAY,
TAG_CUP_ROUND_REPLAY,
TAG_CUP_ROUND_NEUTRAL,
TAG_CUP_ROUND_RANDOMISE_TEAMS,
TAG_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_GROUPS,
TAG_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_ADVANCE,
TAG_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_BEST_ADVANCE,
@ -135,6 +136,7 @@ xml_loadsave_cup_end_element (GMarkupParseContext *context,
tag == TAG_CUP_ROUND_BYES ||
tag == TAG_CUP_ROUND_REPLAY ||
tag == TAG_CUP_ROUND_NEUTRAL ||
tag == TAG_CUP_ROUND_RANDOMISE_TEAMS ||
tag == TAG_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_GROUPS ||
tag == TAG_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_ADVANCE ||
tag == TAG_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_BEST_ADVANCE)
@ -244,6 +246,8 @@ xml_loadsave_cup_text (GMarkupParseContext *context,
new_round.replay = int_value;
else if(state == TAG_CUP_ROUND_NEUTRAL)
new_round.neutral = int_value;
else if(state == TAG_CUP_ROUND_RANDOMISE_TEAMS)
new_round.randomise_teams = int_value;
else if(state == TAG_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_GROUPS)
new_round.round_robin_number_of_groups = int_value;
else if(state == TAG_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_ADVANCE)
@ -374,6 +378,8 @@ xml_loadsave_cup_write_round(FILE *fil, const gchar *prefix, const Cup *cup, gin
TAG_CUP_ROUND_REPLAY, I1);
xml_write_int(fil, cup_round->neutral,
TAG_CUP_ROUND_NEUTRAL, I1);
xml_write_int(fil, cup_round->randomise_teams,
TAG_CUP_ROUND_RANDOMISE_TEAMS, I1);
xml_write_int(fil, cup_round->round_robin_number_of_groups,
TAG_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_GROUPS, I1);
xml_write_int(fil, cup_round->round_robin_number_of_advance,

View File

@ -16,6 +16,7 @@
<number_of_groups>5</number_of_groups>
<number_of_advance>1</number_of_advance>
<new_teams>30</new_teams>
<randomise_teams>0</randomise_teams>
<choose_teams>
<choose_team>

View File

@ -16,6 +16,7 @@
<number_of_groups>8</number_of_groups>
<number_of_advance>1</number_of_advance>
<new_teams>32</new_teams>
<randomise_teams>0</randomise_teams>
<choose_teams>
<choose_team>

View File

@ -5,7 +5,7 @@
<sid>wc06_europe</sid>
<symbol>flag_wc06.png</symbol>
<yellow_red>3</yellow_red>
<last_week>10</last_week>
<last_week>12</last_week>
<add_week>0</add_week>
<week_gap>1</week_gap>
<property>international</property>
@ -15,63 +15,65 @@
<cup_round>
<number_of_groups>8</number_of_groups>
<number_of_advance>1</number_of_advance>
<new_teams>48</new_teams>
<number_of_best_advance>2</number_of_best_advance>
<new_teams>51</new_teams>
<randomise_teams>0</randomise_teams>
<choose_teams>
<choose_team>
<choose_team_sid>wc06_europe_teams</choose_team_sid>
<number_of_teams>6</number_of_teams>
<number_of_teams>7</number_of_teams>
<start_idx>1</start_idx>
<end_idx>6</end_idx>
<end_idx>7</end_idx>
</choose_team>
<choose_team>
<choose_team_sid>wc06_europe_teams</choose_team_sid>
<number_of_teams>7</number_of_teams>
<start_idx>8</start_idx>
<end_idx>14</end_idx>
</choose_team>
<choose_team>
<choose_team_sid>wc06_europe_teams</choose_team_sid>
<number_of_teams>7</number_of_teams>
<start_idx>15</start_idx>
<end_idx>21</end_idx>
</choose_team>
<choose_team>
<choose_team_sid>wc06_europe_teams</choose_team_sid>
<number_of_teams>6</number_of_teams>
<start_idx>7</start_idx>
<end_idx>12</end_idx>
<start_idx>22</start_idx>
<end_idx>27</end_idx>
</choose_team>
<choose_team>
<choose_team_sid>wc06_europe_teams</choose_team_sid>
<number_of_teams>6</number_of_teams>
<start_idx>13</start_idx>
<end_idx>18</end_idx>
<start_idx>28</start_idx>
<end_idx>33</end_idx>
</choose_team>
<choose_team>
<choose_team_sid>wc06_europe_teams</choose_team_sid>
<number_of_teams>6</number_of_teams>
<start_idx>19</start_idx>
<end_idx>24</end_idx>
<start_idx>34</start_idx>
<end_idx>39</end_idx>
</choose_team>
<choose_team>
<choose_team_sid>wc06_europe_teams</choose_team_sid>
<number_of_teams>6</number_of_teams>
<start_idx>25</start_idx>
<end_idx>30</end_idx>
<start_idx>40</start_idx>
<end_idx>45</end_idx>
</choose_team>
<choose_team>
<choose_team_sid>wc06_europe_teams</choose_team_sid>
<number_of_teams>6</number_of_teams>
<start_idx>31</start_idx>
<end_idx>36</end_idx>
</choose_team>
<choose_team>
<choose_team_sid>wc06_europe_teams</choose_team_sid>
<number_of_teams>6</number_of_teams>
<start_idx>37</start_idx>
<end_idx>42</end_idx>
</choose_team>
<choose_team>
<choose_team_sid>wc06_europe_teams</choose_team_sid>
<number_of_teams>6</number_of_teams>
<start_idx>43</start_idx>
<end_idx>48</end_idx>
<start_idx>46</start_idx>
<end_idx>51</end_idx>
</choose_team>
</choose_teams>

View File

@ -13,15 +13,15 @@
<cup_rounds>
<cup_round>
<new_teams>12</new_teams>
<new_teams>6</new_teams>
<byes>0</byes>
<choose_teams>
<choose_team>
<choose_team_sid>wc06_europe</choose_team_sid>
<number_of_teams>12</number_of_teams>
<start_idx>9</start_idx>
<end_idx>20</end_idx>
<number_of_teams>6</number_of_teams>
<start_idx>11</start_idx>
<end_idx>16</end_idx>
</choose_team>
</choose_teams>

View File

@ -45,15 +45,21 @@
</choose_team>
<choose_team>
<choose_team_sid>wc06_europe</choose_team_sid>
<number_of_teams>8</number_of_teams>
<number_of_teams>10</number_of_teams>
<start_idx>1</start_idx>
<end_idx>8</end_idx>
<end_idx>10</end_idx>
</choose_team>
<choose_team>
<choose_team_sid>wc06_europe_playoffs</choose_team_sid>
<number_of_teams>6</number_of_teams>
<number_of_teams>3</number_of_teams>
<start_idx>1</start_idx>
<end_idx>6</end_idx>
<end_idx>3</end_idx>
</choose_team>
<choose_team>
<choose_team_sid>wc06_europe_teams</choose_team_sid>
<number_of_teams>1</number_of_teams>
<start_idx>52</start_idx>
<end_idx>52</end_idx>
</choose_team>
<choose_team>
<choose_team_sid>wc06_oceania_samerica</choose_team_sid>

View File

@ -16,6 +16,7 @@
<number_of_groups>3</number_of_groups>
<number_of_advance>2</number_of_advance>
<new_teams>12</new_teams>
<randomise_teams>0</randomise_teams>
<choose_teams>
<choose_team>

View File

@ -16,6 +16,7 @@
<number_of_groups>1</number_of_groups>
<number_of_advance>2</number_of_advance>
<new_teams>6</new_teams>
<randomise_teams>0</randomise_teams>
<choose_teams>
<choose_team>

View File

@ -16,6 +16,7 @@
<number_of_groups>1</number_of_groups>
<number_of_advance>4</number_of_advance>
<new_teams>10</new_teams>
<randomise_teams>0</randomise_teams>
<choose_teams>
<choose_team>

View File

@ -9,152 +9,152 @@
<team>
<team_name>Togo</team_name>
<team_average_talent>7910</team_average_talent>
<team_average_talent>7880</team_average_talent>
<team_symbol>flag_togo.png</team_symbol>
</team>
<team>
<team_name>Senegal</team_name>
<team_average_talent>8480</team_average_talent>
<team_average_talent>8450</team_average_talent>
<team_symbol>flag_senegal.png</team_symbol>
</team>
<team>
<team_name>Zambia</team_name>
<team_average_talent>7610</team_average_talent>
<team_average_talent>7580</team_average_talent>
<team_symbol>flag_zambia.png</team_symbol>
</team>
<team>
<team_name>Congo</team_name>
<team_average_talent>6200</team_average_talent>
<team_average_talent>6110</team_average_talent>
<team_symbol>flag_congo.png</team_symbol>
</team>
<team>
<team_name>Mali</team_name>
<team_average_talent>7880</team_average_talent>
<team_average_talent>7850</team_average_talent>
<team_symbol>flag_mali.png</team_symbol>
</team>
<team>
<team_name>Liberia</team_name>
<team_average_talent>5870</team_average_talent>
<team_average_talent>5600</team_average_talent>
<team_symbol>flag_liberia.png</team_symbol>
</team>
<team>
<team_name>Ghana</team_name>
<team_average_talent>7670</team_average_talent>
<team_average_talent>7640</team_average_talent>
<team_symbol>flag_ghana.png</team_symbol>
</team>
<team>
<team_name>Congo DR</team_name>
<team_average_talent>7370</team_average_talent>
<team_average_talent>7340</team_average_talent>
<team_symbol>flag_congodr.png</team_symbol>
</team>
<team>
<team_name>South Africa</team_name>
<team_average_talent>8270</team_average_talent>
<team_average_talent>8240</team_average_talent>
<team_symbol>flag_rsa.png</team_symbol>
</team>
<team>
<team_name>Burkina Faso</team_name>
<team_average_talent>6890</team_average_talent>
<team_average_talent>6830</team_average_talent>
<team_symbol>flag_burkina_faso.png</team_symbol>
</team>
<team>
<team_name>Cape Verde Islands</team_name>
<team_average_talent>5990</team_average_talent>
<team_average_talent>5840</team_average_talent>
<team_symbol>flag_cpv.png</team_symbol>
</team>
<team>
<team_name>Uganda</team_name>
<team_average_talent>6290</team_average_talent>
<team_average_talent>6200</team_average_talent>
<team_symbol>flag_uganda.png</team_symbol>
</team>
<team>
<team_name>Cameroon</team_name>
<team_average_talent>8870</team_average_talent>
<team_average_talent>8840</team_average_talent>
<team_symbol>flag_cameroon.png</team_symbol>
</team>
<team>
<team_name>Côte d'Ivoire</team_name>
<team_average_talent>8000</team_average_talent>
<team_average_talent>7970</team_average_talent>
<team_symbol>flag_cdi.png</team_symbol>
</team>
<team>
<team_name>Egypt</team_name>
<team_average_talent>8600</team_average_talent>
<team_average_talent>8570</team_average_talent>
<team_symbol>flag_egypt.png</team_symbol>
</team>
<team>
<team_name>Libya</team_name>
<team_average_talent>7160</team_average_talent>
<team_average_talent>7100</team_average_talent>
<team_symbol>flag_libya.png</team_symbol>
</team>
<team>
<team_name>Sudan</team_name>
<team_average_talent>6800</team_average_talent>
<team_average_talent>6710</team_average_talent>
<team_symbol>flag_sudan.png</team_symbol>
</team>
<team>
<team_name>Benin</team_name>
<team_average_talent>5930</team_average_talent>
<team_average_talent>5720</team_average_talent>
<team_symbol>flag_benin.png</team_symbol>
</team>
<team>
<team_name>Angola</team_name>
<team_average_talent>7580</team_average_talent>
<team_average_talent>7550</team_average_talent>
<team_symbol>flag_angola.png</team_symbol>
</team>
<team>
<team_name>Nigeria</team_name>
<team_average_talent>8660</team_average_talent>
<team_average_talent>8630</team_average_talent>
<team_symbol>flag_nigeria.png</team_symbol>
</team>
<team>
<team_name>Zimbabwe</team_name>
<team_average_talent>8060</team_average_talent>
<team_average_talent>8030</team_average_talent>
<team_symbol>flag_zimbabwe.png</team_symbol>
</team>
<team>
<team_name>Gabon</team_name>
<team_average_talent>6440</team_average_talent>
<team_average_talent>6350</team_average_talent>
<team_symbol>flag_gabon.png</team_symbol>
</team>
<team>
<team_name>Algeria</team_name>
<team_average_talent>7070</team_average_talent>
<team_average_talent>7010</team_average_talent>
<team_symbol>flag_algeria.png</team_symbol>
</team>
<team>
<team_name>Rwanda</team_name>
<team_average_talent>6410</team_average_talent>
<team_average_talent>6320</team_average_talent>
<team_symbol>flag_rwanda.png</team_symbol>
</team>
<team>
<team_name>Tunisia</team_name>
<team_average_talent>8840</team_average_talent>
<team_average_talent>8810</team_average_talent>
<team_symbol>flag_tunisia.png</team_symbol>
</team>
<team>
<team_name>Morocco</team_name>
<team_average_talent>8450</team_average_talent>
<team_average_talent>8420</team_average_talent>
<team_symbol>flag_morocco.png</team_symbol>
</team>
<team>
<team_name>Guinea</team_name>
<team_average_talent>6860</team_average_talent>
<team_average_talent>6800</team_average_talent>
<team_symbol>flag_guinea.png</team_symbol>
</team>
<team>
<team_name>Kenya</team_name>
<team_average_talent>6950</team_average_talent>
<team_average_talent>6890</team_average_talent>
<team_symbol>flag_kenya.png</team_symbol>
</team>
<team>
<team_name>Botswana</team_name>
<team_average_talent>6710</team_average_talent>
<team_average_talent>6620</team_average_talent>
<team_symbol>flag_botswana.png</team_symbol>
</team>
<team>
<team_name>Malawi</team_name>
<team_average_talent>6350</team_average_talent>
<team_average_talent>6260</team_average_talent>
<team_symbol>flag_malawi.png</team_symbol>
</team>
</league>

View File

@ -10,132 +10,132 @@
<teams>
<team>
<team_name>Iran</team_name>
<team_average_talent>8990</team_average_talent>
<team_average_talent>8960</team_average_talent>
<team_symbol>flag_iran.png</team_symbol>
</team>
<team>
<team_name>Jordan</team_name>
<team_average_talent>7460</team_average_talent>
<team_average_talent>7430</team_average_talent>
<team_symbol>flag_jordan.png</team_symbol>
</team>
<team>
<team_name>Qatar</team_name>
<team_average_talent>7310</team_average_talent>
<team_average_talent>7250</team_average_talent>
<team_symbol>flag_qatar.png</team_symbol>
</team>
<team>
<team_name>Laos</team_name>
<team_average_talent>5420</team_average_talent>
<team_average_talent>4940</team_average_talent>
<team_symbol>flag_laos.png</team_symbol>
</team>
<team>
<team_name>Uzbekistan</team_name>
<team_average_talent>7790</team_average_talent>
<team_average_talent>7760</team_average_talent>
<team_symbol>flag_uzbekistan.png</team_symbol>
</team>
<team>
<team_name>Iraq</team_name>
<team_average_talent>7490</team_average_talent>
<team_average_talent>7460</team_average_talent>
<team_symbol>flag_iraq.png</team_symbol>
</team>
<team>
<team_name>Palestine</team_name>
<team_average_talent>5780</team_average_talent>
<team_average_talent>5510</team_average_talent>
<team_symbol>flag_palestine.png</team_symbol>
</team>
<team>
<team_name>Chinese Taipei</team_name>
<team_average_talent>5480</team_average_talent>
<team_average_talent>5120</team_average_talent>
<team_symbol>flag_chtaipei.png</team_symbol>
</team>
<team>
<team_name>Japan</team_name>
<team_average_talent>9050</team_average_talent>
<team_average_talent>9020</team_average_talent>
<team_symbol>flag_japan.png</team_symbol>
</team>
<team>
<team_name>Oman</team_name>
<team_average_talent>7220</team_average_talent>
<team_average_talent>7160</team_average_talent>
<team_symbol>flag_oman.png</team_symbol>
</team>
<team>
<team_name>India</team_name>
<team_average_talent>5810</team_average_talent>
<team_average_talent>5540</team_average_talent>
<team_symbol>flag_india.png</team_symbol>
</team>
<team>
<team_name>Singapore</team_name>
<team_average_talent>6620</team_average_talent>
<team_average_talent>6530</team_average_talent>
<team_symbol>flag_singapore.png</team_symbol>
</team>
<team>
<team_name>Kuwait</team_name>
<team_average_talent>7700</team_average_talent>
<team_average_talent>7670</team_average_talent>
<team_symbol>flag_kuwait.png</team_symbol>
</team>
<team>
<team_name>China PR</team_name>
<team_average_talent>7730</team_average_talent>
<team_average_talent>7700</team_average_talent>
<team_symbol>flag_china.png</team_symbol>
</team>
<team>
<team_name>Hong Kong</team_name>
<team_average_talent>6020</team_average_talent>
<team_average_talent>5900</team_average_talent>
<team_symbol>flag_hongkong.png</team_symbol>
</team>
<team>
<team_name>Malaysia</team_name>
<team_average_talent>6110</team_average_talent>
<team_average_talent>6020</team_average_talent>
<team_symbol>flag_malaysia.png</team_symbol>
</team>
<team>
<team_name>Korea DPR</team_name>
<team_average_talent>7010</team_average_talent>
<team_average_talent>6950</team_average_talent>
<team_symbol>flag_korea_dpr.png</team_symbol>
</team>
<team>
<team_name>United Arab Emirates</team_name>
<team_average_talent>6920</team_average_talent>
<team_average_talent>6860</team_average_talent>
<team_symbol>flag_uae.png</team_symbol>
</team>
<team>
<team_name>Thailand</team_name>
<team_average_talent>6770</team_average_talent>
<team_average_talent>6680</team_average_talent>
<team_symbol>flag_thailand.png</team_symbol>
</team>
<team>
<team_name>Yemen</team_name>
<team_average_talent>5900</team_average_talent>
<team_average_talent>5630</team_average_talent>
<team_symbol>flag_yemen.png</team_symbol>
</team>
<team>
<team_name>Bahrain</team_name>
<team_average_talent>7940</team_average_talent>
<team_average_talent>7910</team_average_talent>
<team_symbol>flag_bahrain.png</team_symbol>
</team>
<team>
<team_name>Syria</team_name>
<team_average_talent>6530</team_average_talent>
<team_average_talent>6440</team_average_talent>
<team_symbol>flag_syria.png</team_symbol>
</team>
<team>
<team_name>Tajikistan</team_name>
<team_average_talent>5660</team_average_talent>
<team_average_talent>5390</team_average_talent>
<team_symbol>flag_tajikistan.png</team_symbol>
</team>
<team>
<team_name>Kyrgyzstan</team_name>
<team_average_talent>5510</team_average_talent>
<team_average_talent>5180</team_average_talent>
<team_symbol>flag_kyrgyzstan.png</team_symbol>
</team>
<team>
<team_name>Korea Republic</team_name>
<team_average_talent>8720</team_average_talent>
<team_average_talent>8690</team_average_talent>
<team_symbol>flag_korea.png</team_symbol>
</team>
<team>
<team_name>Lebanon</team_name>
<team_average_talent>6050</team_average_talent>
<team_average_talent>5930</team_average_talent>
<team_symbol>flag_lebanon.png</team_symbol>
</team>
<team>
@ -144,27 +144,27 @@
</team>
<team>
<team_name>Maldives</team_name>
<team_average_talent>5630</team_average_talent>
<team_average_talent>5360</team_average_talent>
<team_symbol>flag_maldives.png</team_symbol>
</team>
<team>
<team_name>Saudi Arabia</team_name>
<team_average_talent>8690</team_average_talent>
<team_average_talent>8660</team_average_talent>
<team_symbol>flag_saudi_arabia.png</team_symbol>
</team>
<team>
<team_name>Turkmenistan</team_name>
<team_average_talent>6320</team_average_talent>
<team_average_talent>6230</team_average_talent>
<team_symbol>flag_turkmenistan.png</team_symbol>
</team>
<team>
<team_name>Indonesia</team_name>
<team_average_talent>6680</team_average_talent>
<team_average_talent>6590</team_average_talent>
<team_symbol>flag_indonesia.png</team_symbol>
</team>
<team>
<team_name>Sri Lanka</team_name>
<team_average_talent>5600</team_average_talent>
<team_average_talent>5330</team_average_talent>
<team_symbol>flag_sri_lanka.png</team_symbol>
</team>
</teams>

View File

@ -17,257 +17,277 @@
</team>
<team>
<team_name>Czech Republic</team_name>
<team_average_talent>9410</team_average_talent>
<team_average_talent>9380</team_average_talent>
<team_symbol>flag_cz.png</team_symbol>
</team>
<team>
<team_name>Romania</team_name>
<team_average_talent>8570</team_average_talent>
<team_average_talent>8540</team_average_talent>
<team_symbol>flag_romania.png</team_symbol>
<team_names_file>romania</team_names_file>
</team>
<team>
<team_name>Finland</team_name>
<team_average_talent>8330</team_average_talent>
<team_average_talent>8300</team_average_talent>
<team_symbol>flag_finland.png</team_symbol>
</team>
<team>
<team_name>FYR Macedonia</team_name>
<team_average_talent>6650</team_average_talent>
<team_average_talent>6560</team_average_talent>
<team_symbol>flag_macedonia.png</team_symbol>
</team>
<team>
<team_name>Andorra</team_name>
<team_average_talent>5750</team_average_talent>
<team_symbol>flag_andorra.png</team_symbol>
</team>
<team>
<team_name>Armenia</team_name>
<team_average_talent>6140</team_average_talent>
<team_average_talent>6050</team_average_talent>
<team_symbol>flag_armenia.png</team_symbol>
</team>
<team>
<team_name>Ukraine</team_name>
<team_average_talent>8360</team_average_talent>
<team_average_talent>8330</team_average_talent>
<team_symbol>flag_uk.png</team_symbol>
</team>
<team>
<team_name>Turkey</team_name>
<team_average_talent>9170</team_average_talent>
<team_average_talent>9140</team_average_talent>
<team_symbol>flag_tr.png</team_symbol>
</team>
<team>
<team_name>Greece</team_name>
<team_average_talent>8930</team_average_talent>
<team_average_talent>8900</team_average_talent>
<team_symbol>flag_gr.png</team_symbol>
</team>
<team>
<team_name>Denmark</team_name>
<team_average_talent>9110</team_average_talent>
<team_average_talent>9080</team_average_talent>
<team_symbol>flag_dk.png</team_symbol>
</team>
<team>
<team_name>Albania</team_name>
<team_average_talent>6980</team_average_talent>
<team_average_talent>6920</team_average_talent>
<team_symbol>flag_albania.png</team_symbol>
</team>
<team>
<team_name>Georgia</team_name>
<team_average_talent>6470</team_average_talent>
<team_average_talent>6380</team_average_talent>
<team_symbol>flag_georgia.png</team_symbol>
</team>
<team>
<team_name>Kazakhstan</team_name>
<team_average_talent>5570</team_average_talent>
<team_average_talent>5300</team_average_talent>
<team_symbol>flag_kazakhstan.png</team_symbol>
</team>
<team>
<team_name>Portugal</team_name>
<team_average_talent>9260</team_average_talent>
<team_average_talent>9230</team_average_talent>
<team_symbol>flag_pt.png</team_symbol>
<team_names_file>brazil</team_names_file>
</team>
<team>
<team_name>Slovakia</team_name>
<team_average_talent>8150</team_average_talent>
<team_average_talent>8120</team_average_talent>
<team_symbol>flag_slovakia.png</team_symbol>
</team>
<team>
<team_name>Russia</team_name>
<team_average_talent>8630</team_average_talent>
<team_average_talent>8600</team_average_talent>
<team_symbol>flag_ru.png</team_symbol>
</team>
<team>
<team_name>Latvia</team_name>
<team_average_talent>7640</team_average_talent>
<team_average_talent>7610</team_average_talent>
<team_symbol>flag_latvia.png</team_symbol>
</team>
<team>
<team_name>Estonia</team_name>
<team_average_talent>7130</team_average_talent>
<team_average_talent>7070</team_average_talent>
<team_symbol>flag_estonia.png</team_symbol>
</team>
<team>
<team_name>Liechtenstein</team_name>
<team_average_talent>5810</team_average_talent>
<team_symbol>flag_lie.png</team_symbol>
<team_names_file>germany</team_names_file>
</team>
<team>
<team_name>Luxembourg</team_name>
<team_average_talent>5450</team_average_talent>
<team_average_talent>5090</team_average_talent>
<team_symbol>flag_lux.png</team_symbol>
<team_names_file>belgium</team_names_file>
</team>
<team>
<team_name>Switzerland</team_name>
<team_average_talent>8390</team_average_talent>
<team_average_talent>8360</team_average_talent>
<team_symbol>flag_ch.png</team_symbol>
<team_names_file>germany</team_names_file>
</team>
<team>
<team_name>France</team_name>
<team_average_talent>9350</team_average_talent>
<team_average_talent>9320</team_average_talent>
<team_symbol>flag_france.png</team_symbol>
<team_names_file>france</team_names_file>
</team>
<team>
<team_name>Israel</team_name>
<team_average_talent>8210</team_average_talent>
<team_average_talent>8180</team_average_talent>
<team_symbol>flag_israel.png</team_symbol>
</team>
<team>
<team_name>Republic of Ireland</team_name>
<team_average_talent>8900</team_average_talent>
<team_average_talent>8870</team_average_talent>
<team_symbol>flag_ireland.png</team_symbol>
<team_names_file>england</team_names_file>
</team>
<team>
<team_name>Cyprus</team_name>
<team_average_talent>6500</team_average_talent>
<team_average_talent>6410</team_average_talent>
<team_symbol>flag_cyprus.png</team_symbol>
</team>
<team>
<team_name>Faroe Islands</team_name>
<team_average_talent>5840</team_average_talent>
<team_average_talent>5570</team_average_talent>
<team_symbol>flag_fi.png</team_symbol>
</team>
<team>
<team_name>Italy</team_name>
<team_average_talent>9140</team_average_talent>
<team_average_talent>9110</team_average_talent>
<team_symbol>flag_italy.png</team_symbol>
<team_names_file>italy</team_names_file>
</team>
<team>
<team_name>Norway</team_name>
<team_average_talent>8420</team_average_talent>
<team_average_talent>8390</team_average_talent>
<team_symbol>flag_norway.png</team_symbol>
</team>
<team>
<team_name>Slovenia</team_name>
<team_average_talent>7970</team_average_talent>
<team_average_talent>7940</team_average_talent>
<team_symbol>flag_slovenia.png</team_symbol>
</team>
<team>
<team_name>Scotland</team_name>
<team_average_talent>7340</team_average_talent>
<team_average_talent>7280</team_average_talent>
<team_symbol>flag_scotland.png</team_symbol>
<team_names_file>scotland</team_names_file>
</team>
<team>
<team_name>Belarus</team_name>
<team_average_talent>7400</team_average_talent>
<team_average_talent>7370</team_average_talent>
<team_symbol>flag_belarus.png</team_symbol>
</team>
<team>
<team_name>Moldova</team_name>
<team_average_talent>6380</team_average_talent>
<team_average_talent>6290</team_average_talent>
<team_symbol>flag_moldova.png</team_symbol>
</team>
<team>
<team_name>Poland</team_name>
<team_average_talent>9020</team_average_talent>
<team_average_talent>8990</team_average_talent>
<team_symbol>flag_poland.png</team_symbol>
<team_names_file>poland</team_names_file>
</team>
<team>
<team_name>England</team_name>
<team_average_talent>9200</team_average_talent>
<team_average_talent>9170</team_average_talent>
<team_symbol>flag_england.png</team_symbol>
<team_names_file>england</team_names_file>
</team>
<team>
<team_name>Austria</team_name>
<team_average_talent>7190</team_average_talent>
<team_average_talent>7130</team_average_talent>
<team_symbol>flag_austria.png</team_symbol>
<team_names_file>germany</team_names_file>
</team>
<team>
<team_name>Northern Ireland</team_name>
<team_average_talent>6560</team_average_talent>
<team_average_talent>6470</team_average_talent>
<team_symbol>flag_n_ireland.png</team_symbol>
<team_names_file>england</team_names_file>
</team>
<team>
<team_name>Azerbaijan</team_name>
<team_average_talent>6170</team_average_talent>
<team_average_talent>6080</team_average_talent>
<team_symbol>flag_azerbaijan.png</team_symbol>
</team>
<team>
<team_name>Wales</team_name>
<team_average_talent>7100</team_average_talent>
<team_average_talent>7040</team_average_talent>
<team_symbol>flag_wales.png</team_symbol>
<team_names_file>england</team_names_file>
</team>
<team>
<team_name>Serbia and Montenegro</team_name>
<team_average_talent>8090</team_average_talent>
<team_average_talent>8060</team_average_talent>
<team_symbol>flag_scg.png</team_symbol>
<team_names_file>scg</team_names_file>
</team>
<team>
<team_name>Spain</team_name>
<team_average_talent>9290</team_average_talent>
<team_average_talent>9260</team_average_talent>
<team_symbol>flag_spain.png</team_symbol>
<team_names_file>brazil</team_names_file>
</team>
<team>
<team_name>Bosnia-Herzegovina</team_name>
<team_average_talent>7520</team_average_talent>
<team_average_talent>7490</team_average_talent>
<team_symbol>flag_bh.png</team_symbol>
<team_names_file>scg</team_names_file>
</team>
<team>
<team_name>Belgium</team_name>
<team_average_talent>8120</team_average_talent>
<team_average_talent>8090</team_average_talent>
<team_symbol>flag_belgium.png</team_symbol>
<team_names_file>belgium</team_names_file>
</team>
<team>
<team_name>Lithuania</team_name>
<team_average_talent>6740</team_average_talent>
<team_average_talent>6650</team_average_talent>
<team_symbol>flag_lithuania.png</team_symbol>
</team>
<team>
<team_name>San Marino</team_name>
<team_average_talent>5000</team_average_talent>
<team_symbol>flag_sm.png</team_symbol>
</team>
<team>
<team_name>Sweden</team_name>
<team_average_talent>9230</team_average_talent>
<team_average_talent>9200</team_average_talent>
<team_symbol>flag_sweden.png</team_symbol>
</team>
<team>
<team_name>Croatia</team_name>
<team_average_talent>8810</team_average_talent>
<team_average_talent>8780</team_average_talent>
<team_symbol>flag_croatia.png</team_symbol>
</team>
<team>
<team_name>Hungary</team_name>
<team_average_talent>7550</team_average_talent>
<team_average_talent>7520</team_average_talent>
<team_symbol>flag_hu.png</team_symbol>
</team>
<team>
<team_name>Bulgaria</team_name>
<team_average_talent>8180</team_average_talent>
<team_average_talent>8150</team_average_talent>
<team_symbol>flag_bulgaria.png</team_symbol>
<team_names_file>bulgaria</team_names_file>
</team>
<team>
<team_name>Iceland</team_name>
<team_average_talent>6830</team_average_talent>
<team_average_talent>6740</team_average_talent>
<team_symbol>flag_iceland.png</team_symbol>
</team>
<team>
<team_name>Malta</team_name>
<team_average_talent>5690</team_average_talent>
<team_symbol>flag_malta.png</team_symbol>
</team>
<team>
<team_name>Germany</team_name>
<team_average_talent>9080</team_average_talent>
<team_average_talent>9050</team_average_talent>
<team_symbol>flag_germany.png</team_symbol>
<team_names_file>germany</team_names_file>
</team>
</teams>
</league>

View File

@ -9,67 +9,177 @@
<teams>
<team>
<team_name>USA</team_name>
<team_average_talent>9320</team_average_talent>
<team_average_talent>9290</team_average_talent>
<team_symbol>flag_usa.png</team_symbol>
<team_names_file>usa</team_names_file>
</team>
<team>
<team_name>Panama</team_name>
<team_average_talent>7250</team_average_talent>
<team_average_talent>7190</team_average_talent>
<team_symbol>flag_panama.png</team_symbol>
</team>
<team>
<team_name>Jamaica</team_name>
<team_average_talent>8300</team_average_talent>
<team_average_talent>8270</team_average_talent>
<team_symbol>flag_jamaica.png</team_symbol>
</team>
<team>
<team_name>El Salvador</team_name>
<team_average_talent>6080</team_average_talent>
<team_average_talent>5960</team_average_talent>
<team_symbol>flag_el_salvador.png</team_symbol>
<team_names_file>brazil</team_names_file>
</team>
<team>
<team_name>Costa Rica</team_name>
<team_average_talent>8960</team_average_talent>
<team_average_talent>8930</team_average_talent>
<team_symbol>flag_costa_rica.png</team_symbol>
<team_names_file>brazil</team_names_file>
</team>
<team>
<team_name>Guatemala</team_name>
<team_average_talent>7820</team_average_talent>
<team_average_talent>7790</team_average_talent>
<team_symbol>flag_guatemala.png</team_symbol>
</team>
<team>
<team_name>Honduras</team_name>
<team_average_talent>8240</team_average_talent>
<team_average_talent>8210</team_average_talent>
<team_symbol>flag_honduras.png</team_symbol>
</team>
<team>
<team_name>Canada</team_name>
<team_average_talent>7040</team_average_talent>
<team_average_talent>6980</team_average_talent>
<team_symbol>flag_canada.png</team_symbol>
<team_names_file>usa</team_names_file>
</team>
<team>
<team_name>Mexico</team_name>
<team_average_talent>9380</team_average_talent>
<team_average_talent>9350</team_average_talent>
<team_symbol>flag_mexico.png</team_symbol>
<team_names_file>brazil</team_names_file>
</team>
<team>
<team_name>Trinidad and Tobago</team_name>
<team_average_talent>7850</team_average_talent>
<team_average_talent>7820</team_average_talent>
<team_symbol>flag_tritob.png</team_symbol>
</team>
<team>
<team_name>St. Vincent/Grenadines</team_name>
<team_name>St. Vincent and the Grenadines</team_name>
<team_average_talent>5660</team_average_talent>
<team_symbol>flag_vingren.png</team_symbol>
</team>
<team>
<team_name>St. Kitts and Nevis</team_name>
<team_average_talent>5960</team_average_talent>
<team_average_talent>5780</team_average_talent>
<team_symbol>flag_kittsnev.png</team_symbol>
</team>
<!-- <team> -->
<!-- <team_name>Grenada</team_name>
<team_average_talent>5240</team_average_talent>
<!-- <team_symbol>flag_grenada.png</team_symbol> -->
<!-- </team> -->
<!-- <team> -->
<!-- <team_name>Guyana</team_name>
<team_average_talent>4730</team_average_talent>
<!-- <team_symbol>flag_guyana.png</team_symbol> -->
<!-- </team> -->
<!-- <team> -->
<!-- <team_name>Bermuda</team_name>
<team_average_talent>5030</team_average_talent>
<!-- <team_symbol>flag_bermuda.png</team_symbol> -->
<!-- </team> -->
<!-- <team> -->
<!-- <team_name>Monserrat</team_name> -->
<!-- <team_symbol>flag_monserrat.png</team_symbol> -->
<!-- </team> -->
<!-- <team> -->
<!-- <team_name>Turks and Caicos Islands</team_name>
<team_average_talent>4580</team_average_talent>
<!-- <team_symbol>flag_tci.png</team_symbol> -->
<!-- </team> -->
<!-- <team> -->
<!-- <team_name>Haiti</team_name>
<team_average_talent>6770</team_average_talent>
<!-- <team_symbol>flag_haiti.png</team_symbol> -->
<!-- </team> -->
<!-- <team> -->
<!-- <team_name>British Virgin Islands</team_name>
<team_average_talent>4970</team_average_talent>
<!-- <team_symbol>flag_bvi.png</team_symbol> -->
<!-- </team> -->
<!-- <team> -->
<!-- <team_name>St. Lucia</team_name>
<team_average_talent>5990</team_average_talent>
<!-- <team_symbol>flag_stlucia.png</team_symbol> -->
<!-- </team> -->
<!-- <team> -->
<!-- <team_name>Cayman Islands</team_name>
<team_average_talent>4790</team_average_talent>
<!-- <team_symbol>flag_cayman.png</team_symbol> -->
<!-- </team> -->
<!-- <team> -->
<!-- <team_name>Cuba</team_name>
<team_average_talent>7310</team_average_talent>
<!-- <team_symbol>flag_cuba.png</team_symbol> -->
<!-- </team> -->
<!-- <team> -->
<!-- <team_name>Aruba</team_name>
<team_average_talent>4610</team_average_talent>
<!-- <team_symbol>flag_aruba.png</team_symbol> -->
<!-- </team> -->
<!-- <team> -->
<!-- <team_name>Surinam</team_name>
<team_average_talent>5210</team_average_talent>
<!-- <team_symbol>flag_surinam.png</team_symbol> -->
<!-- </team> -->
<!-- <team> -->
<!-- <team_name>Antigua and Barbuda</team_name>
<team_average_talent>5150</team_average_talent>
<!-- <team_symbol>flag_antigua.png</team_symbol> -->
<!-- </team> -->
<!-- <team> -->
<!-- <team_name>Netherlands Antilles</team_name>
<team_average_talent>4910</team_average_talent>
<!-- <team_symbol>flag_antilles.png</team_symbol> -->
<!-- </team> -->
<!-- <team> -->
<!-- <team_name>Belize</team_name>
<team_average_talent>4760</team_average_talent>
<!-- <team_symbol>flag_belize.png</team_symbol> -->
<!-- </team> -->
<!-- <team> -->
<!-- <team_name>Dominica</team_name>
<team_average_talent>4880</team_average_talent>
<!-- <team_symbol>flag_dominica.png</team_symbol> -->
<!-- </team> -->
<!-- <team> -->
<!-- <team_name>Bahamas</team_name>
<team_average_talent>4700</team_average_talent>
<!-- <team_symbol>flag_bahamas.png</team_symbol> -->
<!-- </team> -->
<!-- <team> -->
<!-- <team_name>Barbados</team_name>
<team_average_talent>5870</team_average_talent>
<!-- <team_symbol>flag_barbados.png</team_symbol> -->
<!-- </team> -->
<!-- <team> -->
<!-- <team_name>US Virgin Islands</team_name>
<team_average_talent>4670</team_average_talent>
<!-- <team_symbol>flag_virgin.png</team_symbol> -->
<!-- </team> -->
<!-- <team> -->
<!-- <team_name>Anguilla</team_name>
<team_average_talent>4640</team_average_talent>
<!-- <team_symbol>flag_anguilla.png</team_symbol> -->
<!-- </team> -->
<!-- <team> -->
<!-- <team_name>Dominican Republic</team_name>
<team_average_talent>4850</team_average_talent>
<!-- <team_symbol>flag_dominican.png</team_symbol> -->
<!-- </team> -->
<!-- <team> -->
<!-- <team_name>Nicaragua</team_name>
<team_average_talent>5060</team_average_talent>
<!-- <team_symbol>flag_nicaragua.png</team_symbol> -->
<!-- </team> -->
</teams>
</league>

View File

@ -9,34 +9,34 @@
<teams>
<team>
<team_name>Australia</team_name>
<team_average_talent>8030</team_average_talent>
<team_average_talent>8000</team_average_talent>
<team_symbol>flag_australia.png</team_symbol>
<team_names_file>australia</team_names_file>
</team>
<team>
<team_name>Solomon Islands</team_name>
<team_average_talent>5720</team_average_talent>
<team_average_talent>5450</team_average_talent>
<team_symbol>flag_solomon.png</team_symbol>
</team>
<team>
<team_name>New Zealand</team_name>
<team_average_talent>6260</team_average_talent>
<team_average_talent>6170</team_average_talent>
<team_symbol>flag_nz.png</team_symbol>
<team_names_file>australia</team_names_file>
</team>
<team>
<team_name>Fiji</team_name>
<team_average_talent>5690</team_average_talent>
<team_average_talent>5420</team_average_talent>
<team_symbol>flag_fiji.png</team_symbol>
</team>
<team>
<team_name>Tahiti</team_name>
<team_average_talent>5750</team_average_talent>
<team_average_talent>5480</team_average_talent>
<team_symbol>flag_tahiti.png</team_symbol>
</team>
<team>
<team_name>Vanuatu</team_name>
<team_average_talent>5540</team_average_talent>
<team_average_talent>5270</team_average_talent>
<team_symbol>flag_vanuatu.png</team_symbol>
</team>
</teams>

View File

@ -9,7 +9,7 @@
<teams>
<team>
<team_name>Argentina</team_name>
<team_average_talent>9440</team_average_talent>
<team_average_talent>9410</team_average_talent>
<team_symbol>flag_argentina.png</team_symbol>
<team_names_file>brazil</team_names_file>
</team>
@ -21,49 +21,49 @@
</team>
<team>
<team_name>Ecuador</team_name>
<team_average_talent>8540</team_average_talent>
<team_average_talent>8510</team_average_talent>
<team_symbol>flag_ecuador.png</team_symbol>
<team_names_file>brazil</team_names_file>
</team>
<team>
<team_name>Paraguay</team_name>
<team_average_talent>8510</team_average_talent>
<team_average_talent>8480</team_average_talent>
<team_symbol>flag_paraguay.png</team_symbol>
<team_names_file>brazil</team_names_file>
</team>
<team>
<team_name>Uruguay</team_name>
<team_average_talent>8780</team_average_talent>
<team_average_talent>8750</team_average_talent>
<team_symbol>flag_uruguay.png</team_symbol>
<team_names_file>brazil</team_names_file>
</team>
<team>
<team_name>Colombia</team_name>
<team_average_talent>8750</team_average_talent>
<team_average_talent>8720</team_average_talent>
<team_symbol>flag_colombia.png</team_symbol>
<team_names_file>brazil</team_names_file>
</team>
<team>
<team_name>Chile</team_name>
<team_average_talent>7280</team_average_talent>
<team_average_talent>7220</team_average_talent>
<team_symbol>flag_chile.png</team_symbol>
<team_names_file>brazil</team_names_file>
</team>
<team>
<team_name>Venezuela</team_name>
<team_average_talent>7760</team_average_talent>
<team_average_talent>7730</team_average_talent>
<team_symbol>flag_venezuela.png</team_symbol>
<team_names_file>brazil</team_names_file>
</team>
<team>
<team_name>Peru</team_name>
<team_average_talent>7430</team_average_talent>
<team_average_talent>7400</team_average_talent>
<team_symbol>flag_peru.png</team_symbol>
<team_names_file>brazil</team_names_file>
</team>
<team>
<team_name>Bolivia</team_name>
<team_average_talent>6590</team_average_talent>
<team_average_talent>6500</team_average_talent>
<team_symbol>flag_bolivia.png</team_symbol>
<team_names_file>brazil</team_names_file>
</team>

Binary file not shown.

After

Width:  |  Height:  |  Size: 912 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 225 B