"More goals by forwards."

po/bygfoot.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-01 22:48+0200\n"
+"POT-Creation-Date: 2005-07-02 13:03+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"
@@ -733,38 +733,38 @@ msgstr ""
 msgid "Next (W)"
 msgstr ""
 
-#: src/lg_commentary.c:524 src/team.c:500
+#: src/lg_commentary.c:518 src/team.c:500
 msgid "ALL OUT DEFEND"
 msgstr ""
 
-#: src/lg_commentary.c:527 src/team.c:502
+#: src/lg_commentary.c:521 src/team.c:502
 msgid "DEFEND"
 msgstr ""
 
-#: src/lg_commentary.c:530 src/team.c:504
+#: src/lg_commentary.c:524 src/team.c:504
 msgid "BALANCED"
 msgstr ""
 
-#: src/lg_commentary.c:533 src/team.c:506
+#: src/lg_commentary.c:527 src/team.c:506
 msgid "ATTACK"
 msgstr ""
 
-#: src/lg_commentary.c:536 src/team.c:508
+#: src/lg_commentary.c:530 src/team.c:508
 msgid "ALL OUT ATTACK"
 msgstr ""
 
 #. Boost value.
-#: src/lg_commentary.c:539 src/team.c:516
+#: src/lg_commentary.c:533 src/team.c:516
 msgid "ANTI"
 msgstr ""
 
 #. Boost value.
-#: src/lg_commentary.c:542 src/team.c:519
+#: src/lg_commentary.c:536 src/team.c:519
 msgid "OFF"
 msgstr ""
 
 #. Boost value.
-#: src/lg_commentary.c:545 src/team.c:522
+#: src/lg_commentary.c:539 src/team.c:522
 msgid "ON"
 msgstr ""
 

src/free.c

@@ -452,8 +452,6 @@ free_cup_choose_team(CupChooseTeam *cup_choose_team)
 void
 free_variables(void)
 {
-    gint i, j;
-
     free_option_list(&options, FALSE);
     free_option_list(&settings, FALSE);
     free_option_list(&constants, FALSE);

src/game.c

@@ -111,21 +111,21 @@ game_get_player(const Team *tm, gint player_type,
     /*todo move to constants file?*/
     if(player_type == GAME_PLAYER_TYPE_ATTACK)
     {
-	weights[0] = 0.25;
-	weights[1] = 0.5;
-	weights[2] = 1;
+	weights[0] = const_float("float_game_player_weight_attack_def");
+	weights[1] = const_float("float_game_player_weight_attack_mid");
+	weights[2] = const_float("float_game_player_weight_attack_fwd");
     }
     else if(player_type == GAME_PLAYER_TYPE_MIDFIELD)
     {
-	weights[0] = 0.5;
-	weights[1] = 1;
-	weights[2] = 0.5;
+	weights[0] = const_float("float_game_player_weight_midfield_def");
+	weights[1] = const_float("float_game_player_weight_midfield_mid");
+	weights[2] = const_float("float_game_player_weight_midfield_fwd");
     }
     else if(player_type == GAME_PLAYER_TYPE_DEFEND)
     {
-	weights[0] = 1;
-	weights[1] = 0.5;
-	weights[2] = 0.25;
+	weights[0] = const_float("float_game_player_weight_defend_def");
+	weights[1] = const_float("float_game_player_weight_defend_mid");
+	weights[2] = const_float("float_game_player_weight_defend_fwd");
     }
     else if(player_type == GAME_PLAYER_TYPE_PENALTY)
 	return game_get_penalty_taker(tm, last_penalty);

src/lg_commentary.c

@@ -242,24 +242,18 @@ lg_commentary_replace_tokens(gchar *commentary_text)
 gboolean
 lg_commentary_parse_condition(const gchar *condition)
 {
-    gint i;
     gboolean return_value = FALSE;
     gchar buf[SMALL];
     
     strcpy(buf, condition);
 
-    for(i=0;i<lg_tokens.list->len;i++)
-    {
-	if(query_misc_string_contains(buf, g_array_index(lg_tokens.list, Option, i).string_value->str))
-	{
-	    if(token_rep[i] == NULL)
-		return FALSE;
-	    else
-		misc_string_replace_token(buf, 
-					  g_array_index(lg_tokens.list, Option, i).string_value->str,
-					  token_rep[i]);
-	}
-    }
+    if(!lg_commentary_replace_tokens(buf))
+	return FALSE;
+    
+    lg_commentary_replace_expressions(buf);
+
+    if(!lg_commentary_replace_tokens(buf))
+	return FALSE;
 
     misc_parse(buf, &return_value);
 

support_files/bygfoot_constants

@@ -141,6 +141,21 @@ float_game_stadium_safety_reduce_fire_upper	  1500
 # capacity reduction; the bigger the higher the reduction
 float_game_stadium_capacity_reduce_factor 15000
 
+# position weights determining what kind of player
+# gets picked in the live game for an event (depending
+# on the area the live game is in
+float_game_player_weight_attack_def	2500
+float_game_player_weight_attack_mid	4000
+float_game_player_weight_attack_fwd	12000
+
+float_game_player_weight_midfield_def	5000
+float_game_player_weight_midfield_mid	10000
+float_game_player_weight_midfield_fwd	5000
+
+float_game_player_weight_defend_def	10000
+float_game_player_weight_defend_mid	5000
+float_game_player_weight_defend_fwd	2500
+
 # lsu addition for injured players who are older
 # than their peak age
 float_player_lsu_injured_old 15000