0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clarify descriptions of income and upkeep.

Browse source
This commit is contained in:
josteph 2019-09-12 05:34:06 +00:00 • committed by jostephd
parent 78db7f2c31
commit 0a0b70c5a9
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/core/help.cfg
View file

@ -219,12 +219,14 @@ Units not only cost gold to Recruit or Recall, they also require money to suppor
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; <italic>text='income'</italic> and <italic>text='upkeep'</italic>." + _ "
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. (In general this is configurable but in campaigns it is almost always one gold per village.) 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." + _ "
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 worth 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." + _ "
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." + _ "
In general, the base income, the amount of gold you get per village per turn, and the number of unit levels each village can support are configurable, but in campaigns they are almost always the values described above. The <italic>text='Scenario Settings'</italic> tab of the <italic>text='Status Table'</italic> dialog shows the values for the current scenario." + _ "
There are two important exceptions to upkeep: units with the loyal trait and leaders never incur upkeep. Units you begin the scenario with (such as Delfador), or units who join you during a scenario (such as the horseman in the second scenario of <italic>text='Heir to the Throne'</italic>) will usually have the <italic>text='loyal'</italic> trait. The unit you are playing (such as Konrad) will almost always be a leader."
[/topic]
# wmllint: markcheck on

4
src/reports.cpp
View file

@ -1442,7 +1442,7 @@ REPORT_GENERATOR(upkeep, rc)
const team &viewing_team = rc.dc().get_team(viewing_side);
team_data td(rc.dc(), viewing_team);
str << td.expenses << " (" << td.upkeep << ")";
return gray_inactive(rc,str.str(), _("Upkeep") + "\n\n" + _("The expenses incurred at the end of every turn to maintain your army. The first number is the amount of gold that will be deducted. The second is the total cost of upkeep, including that covered by villages — in other words, the amount of gold that would be deducted if you lost all villages."));
return gray_inactive(rc,str.str(), _("Upkeep") + "\n\n" + _("The expenses incurred at the end of every turn to maintain your army. The first number is the amount of gold that will be deducted. It is equal to the number of unit-levels not covered by base income, village income and village support. The second is the total cost of upkeep, including that covered by villages — in other words, the amount of gold that would be deducted if you lost all villages."));
}
REPORT_GENERATOR(expenses, rc)
@ -1479,7 +1479,7 @@ REPORT_GENERATOR(income, rc)
end = "";
}
str << td.net_income << end;
return text_report(str.str(), _("Income") + "\n\n" + _("The amount of gold you gain each turn from your controlled villages, or the amount of gold you will lose each turn for unit upkeep."));
return text_report(str.str(), _("Net Income") + "\n\n" + _("The net amount of gold you gain or lose each turn, taking into account income from controlled villages and payment of upkeep."));
}
namespace {