mirror of
https://github.com/tstellar/bygfoot.git
synced 2025-01-27 22:19:17 +01:00
"Fixes, intercont. cup."
This commit is contained in:
gyboth
parent
0d40e2d455
commit
da1c972577
File diff suppressed because one or more lines are too long
@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2005-06-02 08:59+0200\n"
|
||||
"POT-Creation-Date: 2005-06-02 18:19+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
@ -134,6 +134,10 @@ msgid ""
|
||||
"compensation of %s. Do you accept?"
|
||||
msgstr ""
|
||||
|
||||
#: src/callbacks.c:81
|
||||
msgid "The current game state is unsaved and will be lost. Continue?"
|
||||
msgstr ""
|
||||
|
||||
#: src/callbacks.c:146
|
||||
msgid "Left click to make an offer. Right click to remove offer."
|
||||
msgstr ""
|
||||
@ -196,6 +200,11 @@ msgstr ""
|
||||
msgid "No match stored."
|
||||
msgstr ""
|
||||
|
||||
#: src/callbacks.c:726
|
||||
msgid ""
|
||||
"Left-click: get loan; Right-click: pay back; Middle click: stadium window."
|
||||
msgstr ""
|
||||
|
||||
#: src/cup.c:725
|
||||
msgid " -- Second leg"
|
||||
msgstr ""
|
||||
|
||||
55
po/de.po
55
po/de.po
@ -10,8 +10,8 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: bygfoot 0.1\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2005-06-02 08:59+0200\n"
|
||||
"PO-Revision-Date: 2005-05-28 11:44+0200\n"
|
||||
"POT-Creation-Date: 2005-06-02 09:08+0200\n"
|
||||
"PO-Revision-Date: 2005-06-02 09:03+0200\n"
|
||||
"Last-Translator: Gyz Both <gyboth@bygfoot.com>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@ -64,9 +64,8 @@ msgid " -- First leg"
|
||||
msgstr " -- Hinspiel"
|
||||
|
||||
#: src/cup.c:730
|
||||
#, fuzzy
|
||||
msgid " -- Replay matches"
|
||||
msgstr " -- Wiederholungsspiel"
|
||||
msgstr " -- Wiederholungsspiele"
|
||||
|
||||
#: src/cup.c:725
|
||||
msgid " -- Second leg"
|
||||
@ -109,14 +108,14 @@ msgid " seats"
|
||||
msgstr " Plätze"
|
||||
|
||||
#: src/team.c:1047
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "%s (H) "
|
||||
msgstr " (H) "
|
||||
msgstr "%s (H) "
|
||||
|
||||
#: src/team.c:1061
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "%s (N) "
|
||||
msgstr " (N) "
|
||||
msgstr "%s (N) "
|
||||
|
||||
#: src/treeview.c:1020
|
||||
#, c-format
|
||||
@ -265,9 +264,9 @@ msgid "4 years"
|
||||
msgstr "4 Jahre"
|
||||
|
||||
#: src/team.c:1052
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "<span background='%s' foreground='%s'>%s (A)</span> "
|
||||
msgstr "<span foreground='%s' background='%s'>Woche %d Runde %d</span>"
|
||||
msgstr "<span foreground='%s' background='%s'>%s (A)</span>"
|
||||
|
||||
#: src/treeview.c:726
|
||||
#, c-format
|
||||
@ -416,7 +415,7 @@ msgstr "Anti"
|
||||
|
||||
#: src/callbacks.c:174
|
||||
msgid "At least one user didn't take his turn this week. Continue?"
|
||||
msgstr ""
|
||||
msgstr "Mindestens ein Benutzer ist noch nicht drangewesen. Fortfahren?"
|
||||
|
||||
#: src/game_gui.c:602
|
||||
msgid ""
|
||||
@ -771,7 +770,7 @@ msgstr "Debug"
|
||||
|
||||
#: src/misc2_interface.c:1173
|
||||
msgid "Decide later"
|
||||
msgstr ""
|
||||
msgstr "Später entscheiden"
|
||||
|
||||
#: src/interface.c:388 src/treeview.c:1401
|
||||
msgid "Defend"
|
||||
@ -1181,12 +1180,11 @@ msgid "L"
|
||||
msgstr "V"
|
||||
|
||||
#: src/team.c:1113
|
||||
#, fuzzy
|
||||
msgid "L "
|
||||
msgstr "V "
|
||||
|
||||
#: src/team.c:1034
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "L %d : %d"
|
||||
msgstr "V %d : %d"
|
||||
|
||||
@ -1225,6 +1223,11 @@ msgid "Left click to make an offer. Right click to remove offer."
|
||||
msgstr ""
|
||||
"Linksklick um ein Angebot abzugeben. Rechtsklick um Angebot zu annullieren."
|
||||
|
||||
#: src/callbacks.c:726
|
||||
msgid ""
|
||||
"Left-click: get loan; Right-click: pay back; Middle click: stadium window."
|
||||
msgstr ""
|
||||
|
||||
#: src/options_interface.c:900
|
||||
msgid "List 1 "
|
||||
msgstr "Liste 1"
|
||||
@ -1903,9 +1906,8 @@ msgstr ""
|
||||
"(Rechtsklick auf die Spielerliste)"
|
||||
|
||||
#: src/treeview.c:1606
|
||||
#, fuzzy
|
||||
msgid "Results"
|
||||
msgstr "Deine Ergebnisse"
|
||||
msgstr "Ergebnisse"
|
||||
|
||||
#: src/misc2_interface.c:1144 src/misc_interface.c:411
|
||||
#: src/misc_interface.c:1034
|
||||
@ -2238,6 +2240,10 @@ msgid ""
|
||||
"The crowd roars as the players run out from the tunnel to start the match"
|
||||
msgstr "Die Menge begrüßt die Mannschaften mit rauschendem Applaus"
|
||||
|
||||
#: src/callbacks.c:81
|
||||
msgid "The current game state is unsaved and will be lost. Continue?"
|
||||
msgstr ""
|
||||
|
||||
#: src/lg_commentary.c:185
|
||||
msgid "The dance ignites the fans, P1 celebrates in his own special fashion"
|
||||
msgstr "P1 feiert in der ihm eigenen Art ein exzellentes Tor"
|
||||
@ -2395,13 +2401,14 @@ msgstr ""
|
||||
"Fortfahren?"
|
||||
|
||||
#: src/callback_func.c:336
|
||||
#, fuzzy
|
||||
msgid "There are no offers for the player."
|
||||
msgstr "Du hast kein Angebot für den Spieler abgegeben."
|
||||
msgstr "Es liegen keine Angebote für den Spieler vor."
|
||||
|
||||
#: src/callback_func.c:339
|
||||
msgid "There are some offers for the player which you will see next week."
|
||||
msgstr ""
|
||||
"Es gibt einige Angebote für den Spieler; du wirst sie nächste Woche auf dem "
|
||||
"Tisch haben."
|
||||
|
||||
#: src/lg_commentary.c:114
|
||||
msgid "There are two teams out there and only one of them is playing football"
|
||||
@ -2440,9 +2447,9 @@ msgid "Two teams, equall till now in every respect,face off in penalties"
|
||||
msgstr "Zwei Mannschaften waren gleichwertig, jetzt geht's ins Penaltyschießen"
|
||||
|
||||
#: src/callback_func.c:420
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "User %s didn't consider your offer yet."
|
||||
msgstr "Die Besitzer verhandeln gerade dein Angebot."
|
||||
msgstr "Der Benutzer %s hat dein Angebot noch nicht angesehen."
|
||||
|
||||
#: src/misc2_interface.c:764
|
||||
msgid "Users -- click to remove"
|
||||
@ -2469,12 +2476,11 @@ msgid "W"
|
||||
msgstr "G"
|
||||
|
||||
#: src/team.c:1115
|
||||
#, fuzzy
|
||||
msgid "W "
|
||||
msgstr "G "
|
||||
|
||||
#: src/team.c:1029
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "W %d : %d"
|
||||
msgstr "G %d : %d"
|
||||
|
||||
@ -2800,7 +2806,7 @@ msgstr "Du beginnst das Spiel mit %s in der %s."
|
||||
|
||||
#: src/callbacks.c:170 src/callbacks.c:563 src/callbacks.c:580
|
||||
msgid "You still have some transfer business to manage."
|
||||
msgstr ""
|
||||
msgstr "Du hast noch Transferangelegenheiten zu erledigen."
|
||||
|
||||
#: src/callback_func.c:595
|
||||
#, c-format
|
||||
@ -2846,9 +2852,8 @@ msgid "Your offer will be considered next week."
|
||||
msgstr "Dein Angebot wird nächste Woche verhandelt."
|
||||
|
||||
#: src/misc2_callback_func.c:78
|
||||
#, fuzzy
|
||||
msgid "Your player roster is full or you don't enough money."
|
||||
msgstr "Deine Mannschaft ist voll. Du konntest %s nicht von %s kaufen."
|
||||
msgstr "Deine Mannschaft ist voll oder du hast nicht genügend Geld."
|
||||
|
||||
#: src/treeview.c:1522
|
||||
msgid "Your results"
|
||||
|
||||
@ -78,7 +78,7 @@ on_menu_quit_activate (GtkMenuItem *menuitem,
|
||||
else
|
||||
{
|
||||
stat1 = STATUS_QUERY_QUIT;
|
||||
window_show_yesno("The current game state is unsaved and will be lost. Continue?");
|
||||
window_show_yesno(_("The current game state is unsaved and will be lost. Continue?"));
|
||||
}
|
||||
}
|
||||
|
||||
@ -723,7 +723,7 @@ on_menu_show_finances_activate (GtkMenuItem *menuitem,
|
||||
gpointer user_data)
|
||||
{
|
||||
stat0 = STATUS_SHOW_FINANCES;
|
||||
game_gui_print_message("Left-click: get loan; Right-click: pay back; Middle click: stadium window.");
|
||||
game_gui_print_message(_("Left-click: get loan; Right-click: pay back; Middle click: stadium window."));
|
||||
treeview_show_finances(GTK_TREE_VIEW(lookup_widget(window.main, "treeview_right")),
|
||||
¤t_user);
|
||||
|
||||
|
||||
67
src/cup.c
67
src/cup.c
@ -801,44 +801,47 @@ query_cup_begins(const Cup *cup)
|
||||
const CupRound *cup_round = &g_array_index(cup->rounds, CupRound, 0);
|
||||
|
||||
for(i=0;i<cup_round->choose_teams->len;i++)
|
||||
{
|
||||
cup_get_choose_team_league_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).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,
|
||||
cup_temp->fixtures->len - 1).week_number == week &&
|
||||
g_array_index(cup_temp->fixtures, Fixture,
|
||||
cup_temp->fixtures->len - 1).week_round_number == week_round)))
|
||||
proceed = TRUE;
|
||||
}
|
||||
if(!g_array_index(cup_round->choose_teams,CupChooseTeam, i).generate)
|
||||
{
|
||||
|
||||
cup_get_choose_team_league_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).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,
|
||||
cup_temp->fixtures->len - 1).week_number == week &&
|
||||
g_array_index(cup_temp->fixtures, Fixture,
|
||||
cup_temp->fixtures->len - 1).week_round_number == week_round)))
|
||||
proceed = TRUE;
|
||||
}
|
||||
|
||||
if(!proceed)
|
||||
return FALSE;
|
||||
|
||||
for(i=0;i<cup_round->choose_teams->len;i++)
|
||||
{
|
||||
cup_get_choose_team_league_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 == NULL &&
|
||||
(cup_temp->fixtures->len > 0 &&
|
||||
g_array_index(cup_temp->fixtures, Fixture,
|
||||
cup_temp->fixtures->len - 1).attendance == -1)))
|
||||
return FALSE;
|
||||
}
|
||||
if(!g_array_index(cup_round->choose_teams,CupChooseTeam, i).generate)
|
||||
{
|
||||
cup_get_choose_team_league_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 == NULL &&
|
||||
(cup_temp->fixtures->len > 0 &&
|
||||
g_array_index(cup_temp->fixtures, Fixture,
|
||||
cup_temp->fixtures->len - 1).attendance == -1)))
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/** Return the number of international cups in the country. */
|
||||
|
||||
@ -13,7 +13,6 @@
|
||||
|
||||
#define query_cup_is_international(clid) query_cup_has_property(clid, "international")
|
||||
#define query_cup_is_national(clid) query_cup_has_property(clid, "national")
|
||||
#define query_cup_is_supercup(clid) query_cup_has_property(clid, "supercup")
|
||||
#define query_cup_hide(clid) query_cup_has_property(clid, "hide")
|
||||
|
||||
Cup
|
||||
|
||||
@ -1072,7 +1072,7 @@ fixture_from_id(gint id)
|
||||
return &g_array_index(lig(i).fixtures, Fixture, j);
|
||||
|
||||
for(i=0;i<cps->len;i++)
|
||||
for(j=0;j<lig(i).fixtures->len;j++)
|
||||
for(j=0;j<cp(i).fixtures->len;j++)
|
||||
if(g_array_index(cp(i).fixtures, Fixture, j).id == id)
|
||||
return &g_array_index(cp(i).fixtures, Fixture, j);
|
||||
|
||||
|
||||
@ -25,7 +25,8 @@ player_new(Team *tm, gfloat average_skill, gboolean new_id)
|
||||
1 + const_float("float_player_average_skill_variance"));
|
||||
Player new;
|
||||
|
||||
new.name = name_get(tm->names_file->str);
|
||||
new.name = (new_id) ?
|
||||
name_get(tm->names_file->str) : g_string_new("");
|
||||
|
||||
new.id = (new_id) ? player_id_new : -1;
|
||||
new.pos = player_get_position_from_structure(tm->structure, tm->players->len);
|
||||
|
||||
@ -306,7 +306,9 @@ end_week_round_update_fixtures(void)
|
||||
lig(i).id, -1, "");
|
||||
|
||||
for(i=0;i<cps->len;i++)
|
||||
if(cp(i).add_week == 1000 && query_cup_begins(&cp(i)))
|
||||
if(cp(i).add_week == 1000 &&
|
||||
cp(i).fixtures->len == 0 &&
|
||||
query_cup_begins(&cp(i)))
|
||||
{
|
||||
cp(i).last_week = cup_get_last_week_from_first(&cp(i), week + 1);
|
||||
fixture_write_cup_fixtures(&cp(i));
|
||||
|
||||
@ -16,7 +16,7 @@ enum
|
||||
TAG_CUP_ADD_WEEK,
|
||||
TAG_CUP_PROPERTY,
|
||||
TAG_CUP_GROUP,
|
||||
TAG_CUP_SKILL_DIFF,
|
||||
TAG_CUP_SKILL_DIFF,
|
||||
TAG_CUP_CHOOSE_TEAM,
|
||||
TAG_CUP_CHOOSE_TEAM_SID,
|
||||
TAG_CUP_CHOOSE_TEAM_NUMBER_OF_TEAMS,
|
||||
@ -375,8 +375,6 @@ xml_loadsave_cup_write_round(FILE *fil, const gchar *prefix, const Cup *cup, gin
|
||||
xml_write_int(fil, cup_round->round_robin_number_of_best_advance,
|
||||
TAG_CUP_ROUND_ROUND_ROBIN_NUMBER_OF_BEST_ADVANCE, I1);
|
||||
|
||||
fprintf(fil, "</_%d>\n", TAG_CUP_ROUND);
|
||||
|
||||
for(i=0;i<cup_round->tables->len;i++)
|
||||
{
|
||||
sprintf(buf, "%s___cup_%d_round_%02d_table_%02d.xml", basename, cup->id, round, i);
|
||||
@ -390,6 +388,8 @@ xml_loadsave_cup_write_round(FILE *fil, const gchar *prefix, const Cup *cup, gin
|
||||
xml_loadsave_cup_write_choose_team(
|
||||
fil, &g_array_index(cup_round->choose_teams, CupChooseTeam, i));
|
||||
|
||||
fprintf(fil, "</_%d>\n", TAG_CUP_ROUND);
|
||||
|
||||
g_free(basename);
|
||||
}
|
||||
|
||||
@ -397,19 +397,19 @@ xml_loadsave_cup_write_round(FILE *fil, const gchar *prefix, const Cup *cup, gin
|
||||
void
|
||||
xml_loadsave_cup_write_choose_team(FILE *fil, const CupChooseTeam *choose_team)
|
||||
{
|
||||
fprintf(fil, "<_%d>\n", TAG_CUP_CHOOSE_TEAM);
|
||||
fprintf(fil, "%s<_%d>\n", I1, TAG_CUP_CHOOSE_TEAM);
|
||||
|
||||
xml_write_g_string(fil, choose_team->sid, TAG_CUP_CHOOSE_TEAM_SID, I1);
|
||||
xml_write_g_string(fil, choose_team->sid, TAG_CUP_CHOOSE_TEAM_SID, I2);
|
||||
xml_write_int(fil, choose_team->number_of_teams,
|
||||
TAG_CUP_CHOOSE_TEAM_NUMBER_OF_TEAMS, I1);
|
||||
TAG_CUP_CHOOSE_TEAM_NUMBER_OF_TEAMS, I2);
|
||||
xml_write_int(fil, choose_team->start_idx,
|
||||
TAG_CUP_CHOOSE_TEAM_START_IDX, I1);
|
||||
TAG_CUP_CHOOSE_TEAM_START_IDX, I2);
|
||||
xml_write_int(fil, choose_team->end_idx,
|
||||
TAG_CUP_CHOOSE_TEAM_END_IDX, I1);
|
||||
TAG_CUP_CHOOSE_TEAM_END_IDX, I2);
|
||||
xml_write_int(fil, choose_team->randomly,
|
||||
TAG_CUP_CHOOSE_TEAM_RANDOMLY, I1);
|
||||
TAG_CUP_CHOOSE_TEAM_RANDOMLY, I2);
|
||||
xml_write_int(fil, choose_team->generate,
|
||||
TAG_CUP_CHOOSE_TEAM_GENERATE, I1);
|
||||
TAG_CUP_CHOOSE_TEAM_GENERATE, I2);
|
||||
|
||||
fprintf(fil, "</_%d>\n", TAG_CUP_CHOOSE_TEAM);
|
||||
fprintf(fil, "%s</_%d>\n", I1, TAG_CUP_CHOOSE_TEAM);
|
||||
}
|
||||
|
||||
85
support_files/definitions/argentina/league_argentina1.xml
Normal file
85
support_files/definitions/argentina/league_argentina1.xml
Normal file
@ -0,0 +1,85 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<league>
|
||||
|
||||
<sid>argentina1</sid>
|
||||
<name>Major League</name>
|
||||
<short_name>Major L.</short_name>
|
||||
<symbol>flag_argentina.png</symbol>
|
||||
<first_week>1</first_week>
|
||||
<week_gap>1</week_gap>
|
||||
<average_skill>8000</average_skill>
|
||||
<yellow_red>3</yellow_red>
|
||||
|
||||
<!-- <prom_rel> -->
|
||||
<!-- <prom_rel_element> -->
|
||||
<!-- <rank_start>18</rank_start> -->
|
||||
<!-- <rank_end>22</rank_end> -->
|
||||
<!-- <dest_sid>argentina2</dest_sid> -->
|
||||
<!-- <prom_rel_type>relegation</prom_rel_type> -->
|
||||
<!-- </prom_rel_element> -->
|
||||
<!-- </prom_rel> -->
|
||||
|
||||
<teams>
|
||||
<team>
|
||||
<team_name>E. de La Plata</team_name>
|
||||
</team>
|
||||
<team>
|
||||
<team_name>R. P. Buenos Aires</team_name>
|
||||
</team>
|
||||
<team>
|
||||
<team_name>V.S. Buenos Aires</team_name>
|
||||
</team>
|
||||
<team>
|
||||
<team_name>Rosario</team_name>
|
||||
</team>
|
||||
<team>
|
||||
<team_name>R. C. Avellaneda</team_name>
|
||||
</team>
|
||||
<team>
|
||||
<team_name>C. de Santa Fe</team_name>
|
||||
</team>
|
||||
<team>
|
||||
<team_name>Lanús</team_name>
|
||||
</team>
|
||||
<team>
|
||||
<team_name>B.J. Buenos Aires</team_name>
|
||||
</team>
|
||||
<team>
|
||||
<team_name>Banfield</team_name>
|
||||
</team>
|
||||
<team>
|
||||
<team_name>A.d.S. Avellaneda</team_name>
|
||||
</team>
|
||||
<team>
|
||||
<team_name>N. O. B. Rosario</team_name>
|
||||
</team>
|
||||
<team>
|
||||
<team_name>O. Bahía</team_name>
|
||||
</team>
|
||||
<team>
|
||||
<team_name>Ind. de Avellaneda</team_name>
|
||||
</team>
|
||||
<team>
|
||||
<team_name>A. J. Buenos Aires</team_name>
|
||||
</team>
|
||||
<team>
|
||||
<team_name>Quilmes</team_name>
|
||||
</team>
|
||||
<team>
|
||||
<team_name>Córdoba</team_name>
|
||||
</team>
|
||||
<team>
|
||||
<team_name>G.y.E. La Plata</team_name>
|
||||
</team>
|
||||
<team>
|
||||
<team_name>S. L. Almagro</team_name>
|
||||
</team>
|
||||
<team>
|
||||
<team_name>Almagro</team_name>
|
||||
</team>
|
||||
<team>
|
||||
<team_name>H. Buenos Aires</team_name>
|
||||
</team>
|
||||
</teams>
|
||||
|
||||
</league>
|
||||
Loading…
x
Reference in New Issue
Block a user