Author: cazfi
Date: Wed Aug 12 19:38:22 2015
New Revision: 29478
URL: http://svn.gna.org/viewcvs/freeciv?rev=29478&view=rev
Log:
Made "victory_lead_pct" to be just the lead, not 100% for a draw already
See patch #6205
Modified:
trunk/data/alien/game.ruleset
trunk/data/civ1/game.ruleset
trunk/data/civ2/game.ruleset
trunk/data/civ2civ3/game.ruleset
trunk/data/classic/game.ruleset
trunk/data/experimental/game.ruleset
trunk/data/multiplayer/game.ruleset
trunk/data/stub/game.ruleset
trunk/server/srv_main.c
Modified: trunk/data/alien/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/game.ruleset?rev=29478&r1=29477&r2=29478&view=diff
==============================================================================
--- trunk/data/alien/game.ruleset (original)
+++ trunk/data/alien/game.ruleset Wed Aug 12 19:38:22 2015
@@ -434,8 +434,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: trunk/data/civ1/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/game.ruleset?rev=29478&r1=29477&r2=29478&view=diff
==============================================================================
--- trunk/data/civ1/game.ruleset (original)
+++ trunk/data/civ1/game.ruleset Wed Aug 12 19:38:22 2015
@@ -411,8 +411,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: trunk/data/civ2/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/game.ruleset?rev=29478&r1=29477&r2=29478&view=diff
==============================================================================
--- trunk/data/civ2/game.ruleset (original)
+++ trunk/data/civ2/game.ruleset Wed Aug 12 19:38:22 2015
@@ -468,8 +468,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: trunk/data/civ2civ3/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/game.ruleset?rev=29478&r1=29477&r2=29478&view=diff
==============================================================================
--- trunk/data/civ2civ3/game.ruleset (original)
+++ trunk/data/civ2civ3/game.ruleset Wed Aug 12 19:38:22 2015
@@ -541,8 +541,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: trunk/data/classic/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/game.ruleset?rev=29478&r1=29477&r2=29478&view=diff
==============================================================================
--- trunk/data/classic/game.ruleset (original)
+++ trunk/data/classic/game.ruleset Wed Aug 12 19:38:22 2015
@@ -497,8 +497,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: trunk/data/experimental/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/game.ruleset?rev=29478&r1=29477&r2=29478&view=diff
==============================================================================
--- trunk/data/experimental/game.ruleset (original)
+++ trunk/data/experimental/game.ruleset Wed Aug 12 19:38:22 2015
@@ -515,8 +515,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: trunk/data/multiplayer/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/game.ruleset?rev=29478&r1=29477&r2=29478&view=diff
==============================================================================
--- trunk/data/multiplayer/game.ruleset (original)
+++ trunk/data/multiplayer/game.ruleset Wed Aug 12 19:38:22 2015
@@ -481,8 +481,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: trunk/data/stub/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/stub/game.ruleset?rev=29478&r1=29477&r2=29478&view=diff
==============================================================================
--- trunk/data/stub/game.ruleset (original)
+++ trunk/data/stub/game.ruleset Wed Aug 12 19:38:22 2015
@@ -268,8 +268,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: trunk/server/srv_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/srv_main.c?rev=29478&r1=29477&r2=29478&view=diff
==============================================================================
--- trunk/server/srv_main.c (original)
+++ trunk/server/srv_main.c Wed Aug 12 19:38:22 2015
@@ -520,7 +520,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
