[Wesnoth-cvs-commits] wesnoth ./changelog data/help.cfg

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/07/03 12:58:36

Modified files:
        .              : changelog 
        data           : help.cfg 

Log message:
        fix #13565

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/changelog.diff?tr1=1.766&tr2=1.767&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/help.cfg.diff?tr1=1.28&tr2=1.29&r1=text&r2=text

Patches:
Index: wesnoth/changelog
diff -u wesnoth/changelog:1.766 wesnoth/changelog:1.767
--- wesnoth/changelog:1.766     Fri Jul  1 22:32:47 2005
+++ wesnoth/changelog   Sun Jul  3 12:58:36 2005
@@ -1,4 +1,6 @@
 CVS HEAD:
+ * language and i18n:
+   * fix help description of income and upkeep (#13565)
  * unit balancing and modifications:
    * changed Naga Warrior attack from 5-5 to 7-4
 
Index: wesnoth/data/help.cfg
diff -u wesnoth/data/help.cfg:1.28 wesnoth/data/help.cfg:1.29
--- wesnoth/data/help.cfg:1.28  Wed Apr 27 19:54:27 2005
+++ wesnoth/data/help.cfg       Sun Jul  3 12:58:36 2005
@@ -184,12 +184,12 @@
 title= _ "Income and Upkeep"
 text= _ "In Wesnoth, it is not enough simply to recruit units and fight. You 
must watch your gold as well, especially in campaigns, where you can carry 
extra gold over from one scenario to the next. There are two aspects to this; 
Income and Upkeep." + _"
 
-Income is simple. For every village you control, you gain one gold each turn. 
Thus, if you have ten villages, you would normally gain ten gold. Your Upkeep 
costs are subtracted from this income, as detailed below." + _"
+Income is simple. You have a base income of 2 gold per turn. For every village 
you control, you gain one additional gold each turn. Thus, if you have ten 
villages, you would normally gain 12 gold each turn. Your Upkeep costs are 
subtracted from this income, as detailed below." + _"
 
 Upkeep is also fairly simple. Each unit requires an amount of Upkeep equal to 
its level. You can support as many levels <italic>text=worth</italic> of units 
as you have villages, without paying any upkeep. However, for each level of 
unit beyond the number of villages you have, you must pay one gold per turn. 
For example, if you have twelve level one units and ten villages, you would 
have to pay two gold each turn in upkeep." + _"
 
-These costs are subtracted from your Income, so in the case of twelve levels 
of units and ten villages, your resultant Income would be 8 gold per turn." + _"
-There is one important exception to Upkeep: units with the Loyal trait never 
incur upkeep. Units you begin the scenario with (such as Konrad or Delfador), 
or units who join you during a scenario (such as the Horseman in the second 
level of Heir to the Throne) will usually have the Loyal trait."
+Upkeep costs are subtracted from your Income, so in the case of twelve levels 
of units and ten villages, your resultant Income would be 10 gold per turn." + 
_"
+There is one important exception to Upkeep: units with the Loyal trait never 
incur upkeep. Units you begin the scenario with (such as Konrad or Delfador), 
or units who join you during a scenario (such as the Horseman in the second 
scenario of Heir to the Throne) will usually have the Loyal trait."
 [/topic]
 
 [topic]