Author: cazfi
Date: Fri Oct 16 19:46:22 2015
New Revision: 30103

URL: http://svn.gna.org/viewcvs/freeciv?rev=30103&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:
    branches/S2_6/common/packets.def
    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/cityturn.c
    branches/S2_6/server/ruleset.c
    branches/S2_6/server/ruleset.h
    branches/S2_6/tools/ruledit/rulesave.c

Modified: branches/S2_6/common/packets.def
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/packets.def?rev=30103&r1=30102&r2=30103&view=diff
==============================================================================
--- branches/S2_6/common/packets.def    (original)
+++ branches/S2_6/common/packets.def    Fri Oct 16 19:46:22 2015
@@ -439,7 +439,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: branches/S2_6/data/alien/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/alien/game.ruleset?rev=30103&r1=30102&r2=30103&view=diff
==============================================================================
--- branches/S2_6/data/alien/game.ruleset       (original)
+++ branches/S2_6/data/alien/game.ruleset       Fri Oct 16 19:46:22 2015
@@ -385,8 +385,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: branches/S2_6/data/civ1/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ1/game.ruleset?rev=30103&r1=30102&r2=30103&view=diff
==============================================================================
--- branches/S2_6/data/civ1/game.ruleset        (original)
+++ branches/S2_6/data/civ1/game.ruleset        Fri Oct 16 19:46:22 2015
@@ -384,8 +384,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: branches/S2_6/data/civ2/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2/game.ruleset?rev=30103&r1=30102&r2=30103&view=diff
==============================================================================
--- branches/S2_6/data/civ2/game.ruleset        (original)
+++ branches/S2_6/data/civ2/game.ruleset        Fri Oct 16 19:46:22 2015
@@ -448,8 +448,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: branches/S2_6/data/civ2civ3/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/game.ruleset?rev=30103&r1=30102&r2=30103&view=diff
==============================================================================
--- branches/S2_6/data/civ2civ3/game.ruleset    (original)
+++ branches/S2_6/data/civ2civ3/game.ruleset    Fri Oct 16 19:46:22 2015
@@ -479,8 +479,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: branches/S2_6/data/classic/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/classic/game.ruleset?rev=30103&r1=30102&r2=30103&view=diff
==============================================================================
--- branches/S2_6/data/classic/game.ruleset     (original)
+++ branches/S2_6/data/classic/game.ruleset     Fri Oct 16 19:46:22 2015
@@ -468,8 +468,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: branches/S2_6/data/experimental/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/experimental/game.ruleset?rev=30103&r1=30102&r2=30103&view=diff
==============================================================================
--- branches/S2_6/data/experimental/game.ruleset        (original)
+++ branches/S2_6/data/experimental/game.ruleset        Fri Oct 16 19:46:22 2015
@@ -486,8 +486,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: branches/S2_6/data/multiplayer/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/multiplayer/game.ruleset?rev=30103&r1=30102&r2=30103&view=diff
==============================================================================
--- branches/S2_6/data/multiplayer/game.ruleset (original)
+++ branches/S2_6/data/multiplayer/game.ruleset Fri Oct 16 19:46:22 2015
@@ -452,8 +452,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: branches/S2_6/data/stub/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/stub/game.ruleset?rev=30103&r1=30102&r2=30103&view=diff
==============================================================================
--- branches/S2_6/data/stub/game.ruleset        (original)
+++ branches/S2_6/data/stub/game.ruleset        Fri Oct 16 19:46:22 2015
@@ -275,8 +275,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: branches/S2_6/server/cityturn.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/cityturn.c?rev=30103&r1=30102&r2=30103&view=diff
==============================================================================
--- branches/S2_6/server/cityturn.c     (original)
+++ branches/S2_6/server/cityturn.c     Fri Oct 16 19:46:22 2015
@@ -3122,7 +3122,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: branches/S2_6/server/ruleset.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/ruleset.c?rev=30103&r1=30102&r2=30103&view=diff
==============================================================================
--- branches/S2_6/server/ruleset.c      (original)
+++ branches/S2_6/server/ruleset.c      Fri Oct 16 19:46:22 2015
@@ -5542,9 +5542,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: branches/S2_6/server/ruleset.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/ruleset.h?rev=30103&r1=30102&r2=30103&view=diff
==============================================================================
--- branches/S2_6/server/ruleset.h      (original)
+++ branches/S2_6/server/ruleset.h      Fri Oct 16 19:46:22 2015
@@ -74,7 +74,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
 
 #ifdef __cplusplus
 }

Modified: branches/S2_6/tools/ruledit/rulesave.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/ruledit/rulesave.c?rev=30103&r1=30102&r2=30103&view=diff
==============================================================================
--- branches/S2_6/tools/ruledit/rulesave.c      (original)
+++ branches/S2_6/tools/ruledit/rulesave.c      Fri Oct 16 19:46:22 2015
@@ -887,9 +887,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

Reply via email to