[Freeciv-Dev] (PR#6242) data/civ1/governments.ruleset: Monarchy parameters/description contradiction

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

[jdorje - Mon Sep 22 13:00:30 2003]:

> Egor Vyscrebentsov wrote:
> > In Monarchy parameters: 
> >    martial_law_max = 100   ; unlimited 
> > In Monarchy description: 
> >    You may impose limited martial law under Monarchy: each military\ 
> >  unit in a city, up to a maximum of 3, will keep one unhappy citizen\ 
> >  content.\ 
> >  
> > Thanks, evyscr. 
> > PS Version - S1_14. Don't know about HEAD. 
> 
> Wasn't this fixed in HEAD?

I guess not.  This contradiction exists in both HEAD and 1.14.

Per pointed me to

  http://www.civfanatics.com/civ1/txt/civ1_man.txt

which implies that martial law is unlimited.  Patch attached.  This
should apply to 1.14 and HEAD, but note that it will add a new
translatable string for 1.14.

(The text was taken from the Anarchy entry in the civ1 ruleset.  As a
side note, this text should be automatically generated rather than
stored in the ruleset.)

jason

civ1_monarchy.diff
Description: civ1_monarchy.diff