[Freeciv-Dev] Civ II compatibility ruleset issues

[Davide Pagnin <nightmare@xxxxxxxxxx>]

        Hi all!

Civ II compatibility issues strikes back!

I'll present two patches, that will modify the civ2 government.ruleset,
to have it more adherent to civ2 behaviour.

1. emp-size.patch
This patch, modifies empire_size_inc and empire_size_modifier, in the
civ II gov.ruleset, to mimic civ II behaviour as well as possibile with
the actual limitation of the freeciv algorithm that handles unhappiness.

2. corruption-param.patch
After playing a bit with civ II, I've managed to find out that 
corruption modifiers are not set properly to mimic civ II ones.
The corruption formula, although not perfect, can be considered
a good trade off, but the number in the gov.ruleset are wrong.
The most notably things are: anarchy has way more corruption,
despotism is comparable to anarchy, monarchy has less corruption
than despotism but more than republic, instead the number are
equal in civ II. Communism has no corruption in civ II,
and fundamentalism has very little bit.
(This say the manual, but if you play the game, you will find
out that communism has a little bit of corruption and instead
fundamentalism has none, I preferred to implement manual only
because fundamentalism in civII is way too powerful, and a
little bit of corruption, make some balancing).

Playing with ruleset, has made me aware of 2 limitation
of the actual ruleset:

1. The cityfactor threshold cannot be put to unlimited
(So Communism cannot be mimiced in the correct way, I've put
empire_size_modifier to 127 so that the cityfactor threshold is
reached only when you have a very big number of cities)

2. It is not possible to separate corruption from unbribable flag,
this means, democracy has no corruption and unbribable flag,
other government have corruption and are bribable.
Communism, or another potential governament, with no corruption,
cannot be implemented without giving it also unbribable flag.

Are those 2 limitation, possible bugfix before release?
(If so, I may hurry to prepare a patch, otherwise I take my time)

        Ciao, Davide

diff -urN -Xfreeciv/diff_ignore freeciv.orig/data/civ2/governments.ruleset 
freeciv/data/civ2/governments.ruleset
--- freeciv.orig/data/civ2/governments.ruleset  Sat Sep  1 13:25:31 2001
+++ freeciv/data/civ2/governments.ruleset       Sat Sep  1 13:32:24 2001
@@ -111,8 +111,8 @@
 max_single_rate  = 100  ; rates are irrelevant under Anarchy; use 100
                        ; to avoid unnecessary changes during revolution
 civil_war_chance = 90
-empire_size_mod  = -5
-empire_size_inc  = 0
+empire_size_mod  = -6
+empire_size_inc  = 6
 rapture_size     = 3
 
 unit_unhappy_factor = 0
@@ -181,8 +181,8 @@
 martial_law_per  = 1
 max_single_rate  = 60
 civil_war_chance = 80
-empire_size_mod  = -4
-empire_size_inc  = 0
+empire_size_mod  = -6
+empire_size_inc  = 6
 rapture_size     = 3
 
 unit_unhappy_factor = 0 
@@ -253,7 +253,7 @@
 max_single_rate  = 70
 civil_war_chance = 70
 empire_size_mod  = -3
-empire_size_inc  = 0
+empire_size_inc  = 9
 rapture_size     = 3
 
 unit_unhappy_factor = 0
@@ -322,7 +322,7 @@
 martial_law_per  = 2
 max_single_rate  = 80
 civil_war_chance = 50
-empire_size_mod  = -2
+empire_size_mod  = 127 ; unlimited
 empire_size_inc  = 0
 rapture_size     = 3
 
@@ -400,8 +400,8 @@
 martial_law_per  = 0
 max_single_rate  = 80
 civil_war_chance = 60
-empire_size_mod  = -1
-empire_size_inc  = 0
+empire_size_mod  = 0
+empire_size_inc  = 12
 rapture_size     = 3
 
 unit_unhappy_factor = 0
@@ -479,8 +479,8 @@
 martial_law_per  = 0
 max_single_rate  = 80
 civil_war_chance = 40
-empire_size_mod  = -1
-empire_size_inc  = 0
+empire_size_mod  = 0
+empire_size_inc  = 12
 rapture_size     = 3
 
 unit_unhappy_factor = 1
@@ -560,8 +560,8 @@
 martial_law_per  = 0
 max_single_rate  = 100
 civil_war_chance = 30
-empire_size_mod  = 0
-empire_size_inc  = 0
+empire_size_mod  = 3
+empire_size_inc  = 15
 rapture_size     = 3
 
 unit_unhappy_factor = 2

diff -urN -Xfreeciv/diff_ignore freeciv.orig/data/civ2/governments.ruleset 
freeciv/data/civ2/governments.ruleset
--- freeciv.orig/data/civ2/governments.ruleset  Sat Sep  1 13:25:31 2001
+++ freeciv/data/civ2/governments.ruleset       Sat Sep  1 13:32:24 2001
@@ -126,8 +126,8 @@
 unit_free_gold    = 0
 
 corruption_level           = 100
-corruption_modifier        = 40
-corruption_fixed_distance  = 0
+corruption_modifier        = 27
+corruption_fixed_distance  = 5
 corruption_distance_factor = 1 
 corruption_extra_distance  = 0 
 
@@ -196,10 +196,10 @@
 unit_free_gold    = 0
 
 corruption_level           = 100
-corruption_modifier        = 27
+corruption_modifier        = 33
 corruption_fixed_distance  = 0
-corruption_distance_factor = 2 
-corruption_extra_distance  = 3 
+corruption_distance_factor = 1 
+corruption_extra_distance  = 5 
 
 production_trade_bonus    = 0, 0
 production_shield_bonus   = 0, 0
@@ -267,7 +267,7 @@
 unit_free_gold    = 0
 
 corruption_level           = 100
-corruption_modifier        = 67
+corruption_modifier        = 40
 corruption_fixed_distance  = 0
 corruption_distance_factor = 1 
 corruption_extra_distance  = 0 
@@ -336,8 +336,8 @@
 unit_free_food    = 0
 unit_free_gold    = 0
 
-corruption_level           = 50
-corruption_modifier        = 80
+corruption_level           = 1
+corruption_modifier        = 100
 corruption_fixed_distance  = 10
 corruption_distance_factor = 1 
 corruption_extra_distance  = 0 
@@ -414,7 +414,7 @@
 unit_free_gold    = 0
 
 corruption_level           = 100
-corruption_modifier        = 80
+corruption_modifier        = 66
 corruption_fixed_distance  = 0
 corruption_distance_factor = 1 
 corruption_extra_distance  = 0 
@@ -465,7 +465,7 @@
 unit_free_gold    = 0
 
 corruption_level           = 100
-corruption_modifier        = 67
+corruption_modifier        = 53
 corruption_fixed_distance  = 0
 corruption_distance_factor = 1 
 corruption_extra_distance  = 0