Freeciv

Did a deep dive into this and you are correct, the Upkeep_Factor is sometimes 2. Hard to understand the Upkeep_Factor reqs the way they are written.

But I did find a problem with the help displayed for units - most of them say
"Basic upkeep: 1 Food, 1 Shield, 1 Gold"
which is wrong, or at least very misleading. The actual upkeep is, depending on government, either "1 Shield", "1 Gold", or "2 Gold". I made an improvement by using the Shield2Gold_Factor effect, and, in units.ruleset, the ShieldToGold unit flag plus appropriate changes. With these changes the unit help says "1 Food, 1 Shield" and there's an auto generated help text saying "The 1 shield unit upkeep becomes 1 gold under Despotism and Monarchy, and 2 gold under Fundamentalism, Federation and Democracy.". Unfortunately you can't attach a "helptxt" to a predefined unit flag so I had to make a pseudo duplicate unit flag "ShieldToGold". And that new helptxt string would need translations.

Also wish I could edit the bug title.

Patch for 3.1

Edited the bug subject, renamed patch file.

better 1267.patch file, and added patches for other branches.