Author: cazfi
Date: Wed Aug 12 19:38:30 2015
New Revision: 29479

URL: http://svn.gna.org/viewcvs/freeciv?rev=29479&view=rev
Log:
Made "victory_lead_pct" to be just the lead, not 100% for a draw already

See patch #6205

Modified:
    branches/S2_6/data/alien/game.ruleset
    branches/S2_6/data/civ1/game.ruleset
    branches/S2_6/data/civ2/game.ruleset
    branches/S2_6/data/civ2civ3/game.ruleset
    branches/S2_6/data/classic/game.ruleset
    branches/S2_6/data/experimental/game.ruleset
    branches/S2_6/data/multiplayer/game.ruleset
    branches/S2_6/data/stub/game.ruleset
    branches/S2_6/server/srv_main.c

Modified: branches/S2_6/data/alien/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/alien/game.ruleset?rev=29479&r1=29478&r2=29479&view=diff
==============================================================================
--- branches/S2_6/data/alien/game.ruleset       (original)
+++ branches/S2_6/data/alien/game.ruleset       Wed Aug 12 19:38:30 2015
@@ -376,8 +376,8 @@
 ; Minimum culture points for cultural domination victory
 victory_min_points = 1000
 
-; Lead needed relative to second best player
-victory_lead_pct   = 300
+; How big lead relative to second best player is needed for victory
+victory_lead_pct   = 200
 
 ; How much each culture point affects the migration
 ; from/to the city.

Modified: branches/S2_6/data/civ1/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ1/game.ruleset?rev=29479&r1=29478&r2=29479&view=diff
==============================================================================
--- branches/S2_6/data/civ1/game.ruleset        (original)
+++ branches/S2_6/data/civ1/game.ruleset        Wed Aug 12 19:38:30 2015
@@ -376,8 +376,8 @@
 ; Minimum culture points for cultural domination victory
 victory_min_points = 1000
 
-; Lead needed relative to second best player
-victory_lead_pct   = 300
+; How big lead relative to second best player is needed for victory
+victory_lead_pct   = 200
 
 ; How much each culture point affects the migration
 ; from/to the city.

Modified: branches/S2_6/data/civ2/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2/game.ruleset?rev=29479&r1=29478&r2=29479&view=diff
==============================================================================
--- branches/S2_6/data/civ2/game.ruleset        (original)
+++ branches/S2_6/data/civ2/game.ruleset        Wed Aug 12 19:38:30 2015
@@ -418,8 +418,8 @@
 ; Minimum culture points for cultural domination victory
 victory_min_points = 1000
 
-; Lead needed relative to second best player
-victory_lead_pct   = 300
+; How big lead relative to second best player is needed for victory
+victory_lead_pct   = 200
 
 ; How much each culture point affects the migration
 ; from/to the city.

Modified: branches/S2_6/data/civ2civ3/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/game.ruleset?rev=29479&r1=29478&r2=29479&view=diff
==============================================================================
--- branches/S2_6/data/civ2civ3/game.ruleset    (original)
+++ branches/S2_6/data/civ2civ3/game.ruleset    Wed Aug 12 19:38:30 2015
@@ -473,8 +473,8 @@
 ; Minimum culture points for cultural domination victory
 victory_min_points = 1000
 
-; Lead needed relative to second best player
-victory_lead_pct   = 300
+; How big lead relative to second best player is needed for victory
+victory_lead_pct   = 200
 
 ; How much each culture point affects the migration
 ; from/to the city.

Modified: branches/S2_6/data/classic/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/classic/game.ruleset?rev=29479&r1=29478&r2=29479&view=diff
==============================================================================
--- branches/S2_6/data/classic/game.ruleset     (original)
+++ branches/S2_6/data/classic/game.ruleset     Wed Aug 12 19:38:30 2015
@@ -462,8 +462,8 @@
 ; Minimum culture points for cultural domination victory
 victory_min_points = 1000
 
-; Lead needed relative to second best player
-victory_lead_pct   = 300
+; How big lead relative to second best player is needed for victory
+victory_lead_pct   = 200
 
 ; How much each culture point affects the migration
 ; from/to the city.

Modified: branches/S2_6/data/experimental/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/experimental/game.ruleset?rev=29479&r1=29478&r2=29479&view=diff
==============================================================================
--- branches/S2_6/data/experimental/game.ruleset        (original)
+++ branches/S2_6/data/experimental/game.ruleset        Wed Aug 12 19:38:30 2015
@@ -480,8 +480,8 @@
 ; Minimum culture points for cultural domination victory
 victory_min_points = 1000
 
-; Lead needed relative to second best player
-victory_lead_pct   = 300
+; How big lead relative to second best player is needed for victory
+victory_lead_pct   = 200
 
 ; How much each culture point affects the migration
 ; from/to the city.

Modified: branches/S2_6/data/multiplayer/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/multiplayer/game.ruleset?rev=29479&r1=29478&r2=29479&view=diff
==============================================================================
--- branches/S2_6/data/multiplayer/game.ruleset (original)
+++ branches/S2_6/data/multiplayer/game.ruleset Wed Aug 12 19:38:30 2015
@@ -446,8 +446,8 @@
 ; Minimum culture points for cultural domination victory
 victory_min_points = 1000
 
-; Lead needed relative to second best player
-victory_lead_pct   = 300
+; How big lead relative to second best player is needed for victory
+victory_lead_pct   = 200
 
 ; How much each culture point affects the migration
 ; from/to the city.

Modified: branches/S2_6/data/stub/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/stub/game.ruleset?rev=29479&r1=29478&r2=29479&view=diff
==============================================================================
--- branches/S2_6/data/stub/game.ruleset        (original)
+++ branches/S2_6/data/stub/game.ruleset        Wed Aug 12 19:38:30 2015
@@ -267,8 +267,8 @@
 ; Minimum culture points for cultural domination victory
 victory_min_points = 1000
 
-; Lead needed relative to second best player
-victory_lead_pct   = 300
+; How big lead relative to second best player is needed for victory
+victory_lead_pct   = 200
 
 ; How much each culture point affects the migration
 ; from/to the city.

Modified: branches/S2_6/server/srv_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/srv_main.c?rev=29479&r1=29478&r2=29479&view=diff
==============================================================================
--- branches/S2_6/server/srv_main.c     (original)
+++ branches/S2_6/server/srv_main.c     Wed Aug 12 19:38:30 2015
@@ -516,7 +516,7 @@
     } players_iterate_end;
 
     if (best != NULL && best_value >= game.info.culture_vic_points
-        && best_value > second_value * game.info.culture_vic_lead / 100) {
+        && best_value > second_value * (100 + game.info.culture_vic_lead) / 
100) {
       notify_conn(game.est_connections, NULL, E_GAME_END, ftc_server,
                   _("Game ended in cultural domination victory for %s."),
                   player_name(best));


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to