Author: cazfi
Date: Fri Oct 16 19:46:12 2015
New Revision: 30102
URL: http://svn.gna.org/viewcvs/freeciv?rev=30102&view=rev
Log:
Changed culture.migration_pct to culture.migration_pml and overall made
culture's effect on
migration score 1/10 of what it was.
See bug #23937
Modified:
trunk/common/packets.def
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/cityturn.c
trunk/server/ruleset.c
trunk/server/ruleset.h
trunk/tools/ruledit/rulesave.c
Modified: trunk/common/packets.def
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/packets.def?rev=30102&r1=30101&r2=30102&view=diff
==============================================================================
--- trunk/common/packets.def (original)
+++ trunk/common/packets.def Fri Oct 16 19:46:12 2015
@@ -443,7 +443,7 @@
UINT32 base_bribe_cost;
UINT32 culture_vic_points;
UINT16 culture_vic_lead;
- UINT16 culture_migration_pct;
+ UINT16 culture_migration_pml;
BOOL calendar_skip_0;
/* size limit for cities before they can celebrate */
UINT8 celebratesize;
Modified: trunk/data/alien/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/game.ruleset?rev=30102&r1=30101&r2=30102&view=diff
==============================================================================
--- trunk/data/alien/game.ruleset (original)
+++ trunk/data/alien/game.ruleset Fri Oct 16 19:46:12 2015
@@ -498,8 +498,9 @@
victory_lead_pct = 200
; How much each culture point affects the migration
-; from/to the city.
-migration_pct = 50
+; from/to the city. Each culture point count as this many permilles
+; of a migration point.
+migration_pml = 50
[calendar]
; Year in the beginning of the game
Modified: trunk/data/civ1/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/game.ruleset?rev=30102&r1=30101&r2=30102&view=diff
==============================================================================
--- trunk/data/civ1/game.ruleset (original)
+++ trunk/data/civ1/game.ruleset Fri Oct 16 19:46:12 2015
@@ -474,8 +474,9 @@
victory_lead_pct = 200
; How much each culture point affects the migration
-; from/to the city.
-migration_pct = 50
+; from/to the city. Each culture point count as this many permilles
+; of a migration point.
+migration_pml = 50
[calendar]
; Year 1 instead of 0.
Modified: trunk/data/civ2/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/game.ruleset?rev=30102&r1=30101&r2=30102&view=diff
==============================================================================
--- trunk/data/civ2/game.ruleset (original)
+++ trunk/data/civ2/game.ruleset Fri Oct 16 19:46:12 2015
@@ -553,8 +553,9 @@
victory_lead_pct = 200
; How much each culture point affects the migration
-; from/to the city.
-migration_pct = 50
+; from/to the city. Each culture point count as this many permilles
+; of a migration point.
+migration_pml = 50
[calendar]
; Year 1 instead of 0.
Modified: trunk/data/civ2civ3/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/game.ruleset?rev=30102&r1=30101&r2=30102&view=diff
==============================================================================
--- trunk/data/civ2civ3/game.ruleset (original)
+++ trunk/data/civ2civ3/game.ruleset Fri Oct 16 19:46:12 2015
@@ -602,8 +602,9 @@
victory_lead_pct = 200
; How much each culture point affects the migration
-; from/to the city.
-migration_pct = 50
+; from/to the city. Each culture point count as this many permilles
+; of a migration point.
+migration_pml = 50
[calendar]
; Year in the beginning of the game
Modified: trunk/data/classic/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/game.ruleset?rev=30102&r1=30101&r2=30102&view=diff
==============================================================================
--- trunk/data/classic/game.ruleset (original)
+++ trunk/data/classic/game.ruleset Fri Oct 16 19:46:12 2015
@@ -558,8 +558,9 @@
victory_lead_pct = 200
; How much each culture point affects the migration
-; from/to the city.
-migration_pct = 50
+; from/to the city. Each culture point count as this many permilles
+; of a migration point.
+migration_pml = 50
[calendar]
; Year in the beginning of the game
Modified: trunk/data/experimental/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/game.ruleset?rev=30102&r1=30101&r2=30102&view=diff
==============================================================================
--- trunk/data/experimental/game.ruleset (original)
+++ trunk/data/experimental/game.ruleset Fri Oct 16 19:46:12 2015
@@ -576,8 +576,9 @@
victory_lead_pct = 200
; How much each culture point affects the migration
-; from/to the city.
-migration_pct = 50
+; from/to the city. Each culture point count as this many permilles
+; of a migration point.
+migration_pml = 50
[calendar]
; Year in the beginning of the game
Modified: trunk/data/multiplayer/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/game.ruleset?rev=30102&r1=30101&r2=30102&view=diff
==============================================================================
--- trunk/data/multiplayer/game.ruleset (original)
+++ trunk/data/multiplayer/game.ruleset Fri Oct 16 19:46:12 2015
@@ -542,8 +542,9 @@
victory_lead_pct = 200
; How much each culture point affects the migration
-; from/to the city.
-migration_pct = 50
+; from/to the city. Each culture point count as this many permilles
+; of a migration point.
+migration_pml = 50
[calendar]
; Year in the beginning of the game
Modified: trunk/data/stub/game.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/stub/game.ruleset?rev=30102&r1=30101&r2=30102&view=diff
==============================================================================
--- trunk/data/stub/game.ruleset (original)
+++ trunk/data/stub/game.ruleset Fri Oct 16 19:46:12 2015
@@ -291,8 +291,9 @@
victory_lead_pct = 200
; How much each culture point affects the migration
-; from/to the city.
-migration_pct = 50
+; from/to the city. Each culture point count as this many permilles
+; of a migration point.
+migration_pml = 50
[calendar]
; Year in the beginning of the game
Modified: trunk/server/cityturn.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/cityturn.c?rev=30102&r1=30101&r2=30102&view=diff
==============================================================================
--- trunk/server/cityturn.c (original)
+++ trunk/server/cityturn.c Fri Oct 16 19:46:12 2015
@@ -3163,7 +3163,7 @@
score *= (1 + (1 - exp(- (float) MAX(0, pcity->surplus[O_SCIENCE]) / 100))
/ 5);
- score += city_culture(pcity) * game.info.culture_migration_pct / 100;
+ score += city_culture(pcity) * game.info.culture_migration_pml / 1000;
/* Take food into account; the food surplus is clipped to values between
* -10..20 and normalize by 10. Thus, the factor is between 0.9 and 1.2. */
Modified: trunk/server/ruleset.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.c?rev=30102&r1=30101&r2=30102&view=diff
==============================================================================
--- trunk/server/ruleset.c (original)
+++ trunk/server/ruleset.c Fri Oct 16 19:46:12 2015
@@ -5684,9 +5684,9 @@
game.info.culture_vic_lead
= secfile_lookup_int_default(file, RS_DEFAULT_CULTURE_VIC_LEAD,
"culture.victory_lead_pct");
- game.info.culture_migration_pct
- = secfile_lookup_int_default(file, RS_DEFAULT_CULTURE_MIGRATION_PCT,
- "culture.migration_pct");
+ game.info.culture_migration_pml
+ = secfile_lookup_int_default(file, RS_DEFAULT_CULTURE_MIGRATION_PML,
+ "culture.migration_pml");
/* section: calendar */
game.info.calendar_skip_0
Modified: trunk/server/ruleset.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.h?rev=30102&r1=30101&r2=30102&view=diff
==============================================================================
--- trunk/server/ruleset.h (original)
+++ trunk/server/ruleset.h Fri Oct 16 19:46:12 2015
@@ -75,7 +75,7 @@
#define RS_DEFAULT_CULTURE_VIC_POINTS 1000
#define RS_DEFAULT_CULTURE_VIC_LEAD 300
-#define RS_DEFAULT_CULTURE_MIGRATION_PCT 50
+#define RS_DEFAULT_CULTURE_MIGRATION_PML 50
#define RS_DEFAULT_EXTRA_APPEARANCE 15
#define RS_DEFAULT_EXTRA_DISAPPEARANCE 15
Modified: trunk/tools/ruledit/rulesave.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/rulesave.c?rev=30102&r1=30101&r2=30102&view=diff
==============================================================================
--- trunk/tools/ruledit/rulesave.c (original)
+++ trunk/tools/ruledit/rulesave.c Fri Oct 16 19:46:12 2015
@@ -930,9 +930,9 @@
save_default_int(sfile, game.info.culture_vic_lead,
RS_DEFAULT_CULTURE_VIC_LEAD,
"culture.victory_lead_pct", NULL);
- save_default_int(sfile, game.info.culture_migration_pct,
- RS_DEFAULT_CULTURE_MIGRATION_PCT,
- "culture.migration_pct", NULL);
+ save_default_int(sfile, game.info.culture_migration_pml,
+ RS_DEFAULT_CULTURE_MIGRATION_PML,
+ "culture.migration_pml", NULL);
save_default_bool(sfile, game.info.calendar_skip_0,
RS_DEFAULT_CALENDAR_SKIP_0,
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
