[Freeciv-Dev] Re: [FreeCiv-Cvs] thue: The calculation of the empire size penalty was...

["Mike Jing" <miky40@xxxxxxxxxxx>]

> This is an automated notification of a change to freeciv cvs,
> on Tue Feb 20 11:36:34 PST 2001 = Tue Feb 20 19:36:34 2001 (GMT)
> by Thue Janus Kristensen <thue@xxxxxxx>
>
> ---- Files affected:
>
> freeciv/server citytools.c
>
> ---- Log message:
>
> The calculation of the empire size penalty was wrong when 
> empire_size_inc>0. Before first unhappy citizen would come at 
> cityfactor+empire_mod
No.  The first addtional unhappy citizen always appear at 
(cityfactor+empire_size_mod+1) cities, i.e. 1 city over the threshold of 
(cityfactor+empire_size_mod).  This has not changed.
> and the next at (cityfactor+empire_mod+empire_size_inc-1). Now the next 
> comes at (cityfactor+empire_mod+empire_size_inc).
These two numbers are also off by 1.  The second penalty used to come at 
(cityfactor+empire_size_mod+empire_size_inc) cities, while the correct 
behaviour should be at 1 city above that number.  As you can see, in the 
case where empire_size_inc=1, you would be penalized twice for going over 
the threshold for the first time according to the original code, and that 
was clearly wrong.
The patch itself is correct despite of thue's comments.  ;-)

Mike





_________________________________________________________________
Get your FREE download of MSN Explorer at http://explorer.msn.com