Perhaps the comments in the ruleset civ1 and civ2 should also be updated? See
attached patch. I will also update the following patches ...
Am Friday 29 May 2009 04:11:08 schrieb Madeline Book:
Update of bug #13582 (project freeciv):
Assigned to:None = mbook
___
Follow-up Comment #1:
Patch is fine except for the use of 'true' and 'false'
which should be 'TRUE' and 'FALSE'. I will fix that
and commit it.
本当の誠は何なのだ。
___
Reply to this item at:
http://gna.org/bugs/?13582
___
Message sent via/by Gna!
http://gna.org/
--
Matthias Pfafferodt - http://www.mapfa.de
Matthias.Pfafferodt at mapfa.de
diff -ur '--exclude=*svn*' freeciv-2.1.99svn15687//data/civ1/game.ruleset freeciv-2.1.99svn15687.gold2.1//data/civ1/game.ruleset
--- freeciv-2.1.99svn15687//data/civ1/game.ruleset 2009-05-26 16:23:47.505473635 +0200
+++ freeciv-2.1.99svn15687.gold2.1//data/civ1/game.ruleset 2009-05-29 12:07:54.406185781 +0200
@@ -62,7 +62,13 @@
; is negative, random buildings in the city are sold off. If the gold
; is still negative, then supported units with gold upkeep are
; disbanded.
-; 1 - Gold upkeep for all buildings and units is paid in a lump sum after
+; 1 - In the first step, the player's total gold must be non-negative after
+; paying upkeep for all buildings within a city. If for any city the
+; player's gold is negative, random buildings in the city are sold off.
+; In the second step, gold upkeep for all units is paid in a lump sum.
+; If the player does not have enough gold, random units with gold upkeep
+; are disbanded.
+; 2 - Gold upkeep for all buildings and units is paid in a lump sum after
; all cities have been processed. If the player does not have enough
; gold, random buildings from random cities are sold. If still more
; gold is needed, then random units with gold upkeep are disbanded.
diff -ur '--exclude=*svn*' freeciv-2.1.99svn15687//data/civ2/game.ruleset freeciv-2.1.99svn15687.gold2.1//data/civ2/game.ruleset
--- freeciv-2.1.99svn15687//data/civ2/game.ruleset 2009-05-26 16:23:47.593475294 +0200
+++ freeciv-2.1.99svn15687.gold2.1//data/civ2/game.ruleset 2009-05-29 12:07:41.250549946 +0200
@@ -56,7 +56,13 @@
; is negative, random buildings in the city are sold off. If the gold
; is still negative, then supported units with gold upkeep are
; disbanded.
-; 1 - Gold upkeep for all buildings and units is paid in a lump sum after
+; 1 - In the first step, the player's total gold must be non-negative after
+; paying upkeep for all buildings within a city. If for any city the
+; player's gold is negative, random buildings in the city are sold off.
+; In the second step, gold upkeep for all units is paid in a lump sum.
+; If the player does not have enough gold, random units with gold upkeep
+; are disbanded.
+; 2 - Gold upkeep for all buildings and units is paid in a lump sum after
; all cities have been processed. If the player does not have enough
; gold, random buildings from random cities are sold. If still more
; gold is needed, then random units with gold upkeep are disbanded.
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
