[Freeciv-Dev] Re: [PATCH] Generalised calculation of city bonuses (PR#1117)

[Raahul Kumar <raahul_da_man@xxxxxxxxx>]

--- Ben Webb <ben@xxxxxxxxxxxxxxxxxxxxxx> wrote:
>       Yet more generalised improvements code. This patch actually has a 
> definite quantifiable effect on the Freeciv code. It uses prior 
> generalised improvements patches to consider all effects that alter city 
> bonuses (pollution, happiness, luxury/tax/science production) and applies 
> them in a completely general way, eliminating the old code which made 
> fixed tests for improvement types such as B_LIBRARY. This enables the 
> effect of any city improvement towards the above bonuses to be tweaked to 
> your heart's content in the ruleset - so there's now no reason why you 
> couldn't modify the Barracks to double science output in a city if you 
> particuarly wanted to, for example.
> 

Excellent.

>       Unhappiness caused by aggressive units is also dealt with. The 
> existing Make_Content_Mil effect has been supplemented with a 
> Make_Content_Mil_Per effect; the former cancels the _total_ unhappiness 
> caused by military units outside the city by "amount", while the latter 
> reduces the unhappiness by a maximum of "amount" for _each_ unit. The 
> rulesets have also been modified accordingly to reproduce the (alleged) 
> Civ2 behaviour of the Police Station, which differs from the Civ1 and 
> Freeciv behaviour, according to the ruleset comments (having not played 
> Civ1 or Civ2, I have to take this as gospel). I also made the Police 
> Station become deactivated by a Women's Suffrage Wonder (the helptexts are 
> ambiguous, but I suspect that having the Wonder doesn't count as a 
> _second_ Police Station in a city which already has one - and 
> wonder_replacement() reinforces this suspicion - but I can stand 
> corrected).
>

You are right. The Women's Suffrage counts as a police station in every city.
If there already is a police station, it has no effect.
 
>       Playtesting of this patch is required; the happiness, science, 
> tax, luxury and pollution scores of cities with the old hardcoded 
> behaviour and the new generalised improvement code should be identical - 
> if not, let me know (with a savegame that reproduces the problem) so that 
> I can fix the ruleset and/or code.
> 
>       Patch made from CVS as of Mon Dec 10th. Requires effect-init.patch 
> from PR#1104, effect-implement.patch from PR#1114 and 
> effect-iterator.patch from PR#1115 to first be applied in order.

I find that quote from the 6 million rupee man quite good. Was that from
Goodness
Gracious Me?

__________________________________________________
Do You Yahoo!?
Check out Yahoo! Shopping and Yahoo! Auctions for all of
your unique holiday gifts! Buy at http://shopping.yahoo.com
or bid at http://auctions.yahoo.com