From 8eaad331a88cba768497f985cd6b9a79caad7b31 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 19 Jun 2024 00:50:02 +0300 Subject: [PATCH 26/26] game.ruleset: Improve tech_upkeep_style documentation Do not refer to tech_upkeep_free as if it was a game.ruleset field. Reported by 3plus4i See RM #727 Signed-off-by: Marko Lindqvist --- data/alien/game.ruleset | 2 +- data/civ1/game.ruleset | 2 +- data/civ2/game.ruleset | 2 +- data/civ2civ3/game.ruleset | 2 +- data/classic/game.ruleset | 2 +- data/goldkeep/game.ruleset | 2 +- data/granularity/game.ruleset | 2 +- data/multiplayer/game.ruleset | 2 +- data/ruledit/comments-3.3.txt | 2 +- data/sandbox/game.ruleset | 2 +- data/stub/game.ruleset | 2 +- data/webperimental/game.ruleset | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/data/alien/game.ruleset b/data/alien/game.ruleset index d67105d1a0..3b136890f8 100644 --- a/data/alien/game.ruleset +++ b/data/alien/game.ruleset @@ -355,7 +355,7 @@ tech_leakage = "None" ; Method of paying tech upkeep ; "None" - no upkeep ; "Basic" - upkeep is calculated as: -; / tech_upkeep_divider - tech_upkeep_free +; / tech_upkeep_divider - ; "Cities" - upkeep is calculated like "Basic", but multiplied by number of cities tech_upkeep_style = "None" diff --git a/data/civ1/game.ruleset b/data/civ1/game.ruleset index 1138381910..f3cf379f5f 100644 --- a/data/civ1/game.ruleset +++ b/data/civ1/game.ruleset @@ -343,7 +343,7 @@ tech_leakage = "None" ; Method of paying tech upkeep ; "None" - no upkeep ; "Basic" - upkeep is calculated as: -; / tech_upkeep_divider - tech_upkeep_free +; / tech_upkeep_divider - ; "Cities" - upkeep is calculated like "Basic", but multiplied by number of cities tech_upkeep_style = "None" diff --git a/data/civ2/game.ruleset b/data/civ2/game.ruleset index 08ccb027a3..e187acd12d 100644 --- a/data/civ2/game.ruleset +++ b/data/civ2/game.ruleset @@ -339,7 +339,7 @@ tech_leakage = "None" ; Method of paying tech upkeep ; "None" - no upkeep ; "Basic" - upkeep is calculated as: -; / tech_upkeep_divider - tech_upkeep_free +; / tech_upkeep_divider - ; "Cities" - upkeep is calculated like "Basic", but multiplied by number of cities tech_upkeep_style = "None" diff --git a/data/civ2civ3/game.ruleset b/data/civ2civ3/game.ruleset index 07bec6e92a..e171274e69 100644 --- a/data/civ2civ3/game.ruleset +++ b/data/civ2civ3/game.ruleset @@ -361,7 +361,7 @@ tech_leakage = "Embassies" ; Method of paying tech upkeep ; "None" - no upkeep ; "Basic" - upkeep is calculated as: -; / tech_upkeep_divider - tech_upkeep_free +; / tech_upkeep_divider - ; "Cities" - upkeep is calculated like "Basic", but multiplied by number of cities tech_upkeep_style = "Cities" diff --git a/data/classic/game.ruleset b/data/classic/game.ruleset index 21c901daf2..9977629704 100644 --- a/data/classic/game.ruleset +++ b/data/classic/game.ruleset @@ -356,7 +356,7 @@ tech_leakage = "None" ; Method of paying tech upkeep ; "None" - no upkeep ; "Basic" - upkeep is calculated as: -; / tech_upkeep_divider - tech_upkeep_free +; / tech_upkeep_divider - ; "Cities" - upkeep is calculated like "Basic", but multiplied by number of cities tech_upkeep_style = "None" diff --git a/data/goldkeep/game.ruleset b/data/goldkeep/game.ruleset index 16b71331ea..d4df46af74 100644 --- a/data/goldkeep/game.ruleset +++ b/data/goldkeep/game.ruleset @@ -359,7 +359,7 @@ tech_leakage = "None" ; Method of paying tech upkeep ; "None" - no upkeep ; "Basic" - upkeep is calculated as: -; / tech_upkeep_divider - tech_upkeep_free +; / tech_upkeep_divider - ; "Cities" - upkeep is calculated like "Basic", but multiplied by number of cities tech_upkeep_style = "Basic" diff --git a/data/granularity/game.ruleset b/data/granularity/game.ruleset index 46b13cd0cc..f5485da68e 100644 --- a/data/granularity/game.ruleset +++ b/data/granularity/game.ruleset @@ -352,7 +352,7 @@ tech_leakage = "All Players" ; Method of paying tech upkeep ; "None" - no upkeep ; "Basic" - upkeep is calculated as: -; / tech_upkeep_divider - tech_upkeep_free +; / tech_upkeep_divider - ; "Cities" - upkeep is calculated like "Basic", but multiplied by number of cities tech_upkeep_style = "None" diff --git a/data/multiplayer/game.ruleset b/data/multiplayer/game.ruleset index 192f7f0675..1e84e0f6ad 100644 --- a/data/multiplayer/game.ruleset +++ b/data/multiplayer/game.ruleset @@ -359,7 +359,7 @@ tech_leakage = "None" ; Method of paying tech upkeep ; "None" - no upkeep ; "Basic" - upkeep is calculated as: -; / tech_upkeep_divider - tech_upkeep_free +; / tech_upkeep_divider - ; "Cities" - upkeep is calculated like "Basic", but multiplied by number of cities tech_upkeep_style = "None" diff --git a/data/ruledit/comments-3.3.txt b/data/ruledit/comments-3.3.txt index 83c3cc05b0..486075c860 100644 --- a/data/ruledit/comments-3.3.txt +++ b/data/ruledit/comments-3.3.txt @@ -1598,7 +1598,7 @@ tech_upkeep_style = "\n\ ; Method of paying tech upkeep\n\ ; \"None\" - no upkeep\n\ ; \"Basic\" - upkeep is calculated as:\n\ -; / tech_upkeep_divider - tech_upkeep_free\n\ +; / tech_upkeep_divider - \n\ ; \"Cities\" - upkeep is calculated like \"Basic\", but multiplied by number of cities\ " diff --git a/data/sandbox/game.ruleset b/data/sandbox/game.ruleset index def640d676..e4e9cba19f 100644 --- a/data/sandbox/game.ruleset +++ b/data/sandbox/game.ruleset @@ -359,7 +359,7 @@ tech_leakage = "Embassies" ; Method of paying tech upkeep ; "None" - no upkeep ; "Basic" - upkeep is calculated as: -; / tech_upkeep_divider - tech_upkeep_free +; / tech_upkeep_divider - ; "Cities" - upkeep is calculated like "Basic", but multiplied by number of cities tech_upkeep_style = "Cities" diff --git a/data/stub/game.ruleset b/data/stub/game.ruleset index 8357a4c527..f784cf6bdd 100644 --- a/data/stub/game.ruleset +++ b/data/stub/game.ruleset @@ -343,7 +343,7 @@ tech_leakage = "None" ; Method of paying tech upkeep ; "None" - no upkeep ; "Basic" - upkeep is calculated as: -; / tech_upkeep_divider - tech_upkeep_free +; / tech_upkeep_divider - ; "Cities" - upkeep is calculated like "Basic", but multiplied by number of cities tech_upkeep_style = "None" diff --git a/data/webperimental/game.ruleset b/data/webperimental/game.ruleset index 6a68dc0edc..5541a1e2e4 100644 --- a/data/webperimental/game.ruleset +++ b/data/webperimental/game.ruleset @@ -360,7 +360,7 @@ tech_leakage = "None" ; Method of paying tech upkeep ; "None" - no upkeep ; "Basic" - upkeep is calculated as: -; / tech_upkeep_divider - tech_upkeep_free +; / tech_upkeep_divider - ; "Cities" - upkeep is calculated like "Basic", but multiplied by number of cities tech_upkeep_style = "None" -- 2.43.0