From f6cd51dd30e5cc76b697ce4419de26c82dd9bf8c Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 17 Sep 2023 04:55:25 +0300 Subject: [PATCH 23/23] Replace "harbour" with "harbor" where possible Not changed - References to Pearl Harbour rule - Sound tags - Rule names - Alt gfx tags - City names See osdn #48639 Signed-off-by: Marko Lindqvist --- ai/default/daisettler.c | 2 +- common/movement.c | 2 +- data/alien/units.ruleset | 2 +- data/civ1/units.ruleset | 2 +- data/civ2/effects.ruleset | 2 +- data/civ2/units.ruleset | 2 +- data/civ2civ3/README.civ2civ3 | 4 ++-- data/civ2civ3/effects.ruleset | 2 +- data/civ2civ3/units.ruleset | 2 +- data/classic/effects.ruleset | 2 +- data/classic/units.ruleset | 2 +- data/goldkeep/effects.ruleset | 2 +- data/goldkeep/units.ruleset | 2 +- data/granularity/units.ruleset | 2 +- data/multiplayer/effects.ruleset | 2 +- data/multiplayer/units.ruleset | 2 +- data/ruledit/comments-3.3.txt | 2 +- data/sandbox/effects.ruleset | 2 +- data/sandbox/units.ruleset | 2 +- data/stub/units.ruleset | 2 +- data/webperimental/effects.ruleset | 2 +- data/webperimental/units.ruleset | 2 +- 22 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ai/default/daisettler.c b/ai/default/daisettler.c index efa6546fdf..bd77c6f8d7 100644 --- a/ai/default/daisettler.c +++ b/ai/default/daisettler.c @@ -560,7 +560,7 @@ static bool food_starvation(const struct cityresult *result) /* Avoid starvation: We must have enough food to grow. * Note: this does not handle the case of a newly founded city breaking * even but being immediately able to build an improvement increasing its - * yield (such as supermarkets and harbours in the classic ruleset). + * yield (such as supermarkets and harbors in the classic ruleset). * /MSS */ return (result->city_center.tdc->food + (result->best_other.tdc ? result->best_other.tdc->food diff --git a/common/movement.c b/common/movement.c index a952dbe2b9..d7b2c3be00 100644 --- a/common/movement.c +++ b/common/movement.c @@ -222,7 +222,7 @@ bool can_attack_non_native(const struct unit_type *utype) /************************************************************************//** This unit can attack from non-native tiles (Marines can attack from - transport, ships from harbour cities) + transport, ships from harbor cities) ****************************************************************************/ bool can_attack_from_non_native(const struct unit_type *utype) { diff --git a/data/alien/units.ruleset b/data/alien/units.ruleset index d992e8c622..8bd1e95aeb 100644 --- a/data/alien/units.ruleset +++ b/data/alien/units.ruleset @@ -95,7 +95,7 @@ veteran_move_bonus = 0, 0, 0 ; min_speed = Minimum speed after damage and effects (whole movement points) ; hp_loss_pct = Hitpoints lost each turn if unit not in city or native base ; non_native_def_pct = Defense power percentage applying when defending on -; non-native terrain (such as ship in harbour) +; non-native terrain (such as ship in harbor) ; flags = List of unit class flags (from the following list; you ; cannot add custom unit class flags) ; helptext = optional help text string; should escape all raw newlines diff --git a/data/civ1/units.ruleset b/data/civ1/units.ruleset index 387076ed19..4dd2a2419d 100644 --- a/data/civ1/units.ruleset +++ b/data/civ1/units.ruleset @@ -92,7 +92,7 @@ veteran_move_bonus = 0, 0 ; min_speed = Minimum speed after damage and effects (whole movement points) ; hp_loss_pct = Hitpoints lost each turn if unit not in city or native base ; non_native_def_pct = Defense power percentage applying when defending on -; non-native terrain (such as ship in harbour) +; non-native terrain (such as ship in harbor) ; flags = List of unit class flags (from the following list; you ; cannot add custom unit class flags) ; helptext = optional help text string; should escape all raw newlines diff --git a/data/civ2/effects.ruleset b/data/civ2/effects.ruleset index d76ff94498..e95a03ab0a 100644 --- a/data/civ2/effects.ruleset +++ b/data/civ2/effects.ruleset @@ -1241,7 +1241,7 @@ reqs = "Building", "Pyramids", "Player", FALSE } -[effect_harbour] +[effect_harbor] type = "Output_Add_Tile" value = 1 reqs = diff --git a/data/civ2/units.ruleset b/data/civ2/units.ruleset index 66883335b3..269be0ff75 100644 --- a/data/civ2/units.ruleset +++ b/data/civ2/units.ruleset @@ -100,7 +100,7 @@ veteran_move_bonus = 0, 0 ; min_speed = Minimum speed after damage and effects (whole movement points) ; hp_loss_pct = Hitpoints lost each turn if unit not in city or native base ; non_native_def_pct = Defense power percentage applying when defending on -; non-native terrain (such as ship in harbour) +; non-native terrain (such as ship in harbor) ; flags = List of unit class flags (from the following list; you ; cannot add custom unit class flags) ; helptext = optional help text string; should escape all raw newlines diff --git a/data/civ2civ3/README.civ2civ3 b/data/civ2civ3/README.civ2civ3 index 9205bf7d7d..f61e837402 100644 --- a/data/civ2civ3/README.civ2civ3 +++ b/data/civ2civ3/README.civ2civ3 @@ -257,7 +257,7 @@ TERRAIN: - The discovery of Refining allows to upgrade the mines placed on Desert and Glacier to Oil Wells (+2 Production in total). -- Lake tiles receive for free +1 Food (2/0/2), but Harbours do not +- Lake tiles receive for free +1 Food (2/0/2), but Harbors do not affect them. Lakes do not enable wonders that needs a coastal city. - Deep ocean tiles must be mined (resulting in an oil platform) in @@ -315,7 +315,7 @@ Hills *1/1/0 +1(10) *+2(10) +0(4) 1/3/0 1/4/0 Plains(24) Mountains 0/1/0 NO *+2(10) +0(6) 0/3/0 0/4/0 Hills(36) F/P/T = Food/Production/Trade output; (t) = turns -MAX1 = Irrigation/Mine/Road/Harbour; MAX2 = Farmland/Railroad/Oil Well. +MAX1 = Irrigation/Mine/Road/Harbor; MAX2 = Farmland/Railroad/Oil Well. * = Changes compared to civ2 ruleset. Most affected are Jungles, Swamps and Tundras. diff --git a/data/civ2civ3/effects.ruleset b/data/civ2civ3/effects.ruleset index 66963abcba..f0f621d48d 100644 --- a/data/civ2civ3/effects.ruleset +++ b/data/civ2civ3/effects.ruleset @@ -2159,7 +2159,7 @@ reqs = "MinSize", "7", "City" } -[effect_harbour] +[effect_harbor] type = "Output_Add_Tile" value = 1 reqs = diff --git a/data/civ2civ3/units.ruleset b/data/civ2civ3/units.ruleset index cc25c2b895..fa79fd3f8e 100644 --- a/data/civ2civ3/units.ruleset +++ b/data/civ2civ3/units.ruleset @@ -110,7 +110,7 @@ veteran_move_bonus = 0, 0, 0, 0 ; min_speed = Minimum speed after damage and effects (whole movement points) ; hp_loss_pct = Hitpoints lost each turn if unit not in city or native base ; non_native_def_pct = Defense power percentage applying when defending on -; non-native terrain (such as ship in harbour) +; non-native terrain (such as ship in harbor) ; flags = List of unit class flags (from the following list; you ; cannot add custom unit class flags) ; helptext = optional help text string; should escape all raw newlines diff --git a/data/classic/effects.ruleset b/data/classic/effects.ruleset index 1fa2fafe36..1ecbeb83af 100644 --- a/data/classic/effects.ruleset +++ b/data/classic/effects.ruleset @@ -1085,7 +1085,7 @@ reqs = "Building", "Granary", "City" } -[effect_harbour] +[effect_harbor] type = "Output_Add_Tile" value = 1 reqs = diff --git a/data/classic/units.ruleset b/data/classic/units.ruleset index 476615591a..9bbedae406 100644 --- a/data/classic/units.ruleset +++ b/data/classic/units.ruleset @@ -106,7 +106,7 @@ veteran_move_bonus = 0, 0, 0, 0 ; min_speed = Minimum speed after damage and effects (whole movement points) ; hp_loss_pct = Hitpoints lost each turn if unit not in city or native base ; non_native_def_pct = Defense power percentage applying when defending on -; non-native terrain (such as ship in harbour) +; non-native terrain (such as ship in harbor) ; flags = List of unit class flags (from the following list; you ; cannot add custom unit class flags) ; helptext = optional help text string; should escape all raw newlines diff --git a/data/goldkeep/effects.ruleset b/data/goldkeep/effects.ruleset index 1c26439bf3..650a10bfb3 100644 --- a/data/goldkeep/effects.ruleset +++ b/data/goldkeep/effects.ruleset @@ -1218,7 +1218,7 @@ reqs = "Building", "Granary", "City" } -[effect_harbour] +[effect_harbor] type = "Output_Add_Tile" value = 1 reqs = diff --git a/data/goldkeep/units.ruleset b/data/goldkeep/units.ruleset index fdaf4cdc78..8a607efdb4 100644 --- a/data/goldkeep/units.ruleset +++ b/data/goldkeep/units.ruleset @@ -110,7 +110,7 @@ veteran_move_bonus = 0, 0, 0, 0 ; min_speed = Minimum speed after damage and effects (whole movement points) ; hp_loss_pct = Hitpoints lost each turn if unit not in city or native base ; non_native_def_pct = Defense power percentage applying when defending on -; non-native terrain (such as ship in harbour) +; non-native terrain (such as ship in harbor) ; flags = List of unit class flags (from the following list; you ; cannot add custom unit class flags) ; helptext = optional help text string; should escape all raw newlines diff --git a/data/granularity/units.ruleset b/data/granularity/units.ruleset index 3e04bb1266..96c73b4b30 100644 --- a/data/granularity/units.ruleset +++ b/data/granularity/units.ruleset @@ -89,7 +89,7 @@ veteran_move_bonus = 0 ; min_speed = Minimum speed after damage and effects (whole movement points) ; hp_loss_pct = Hitpoints lost each turn if unit not in city or native base ; non_native_def_pct = Defense power percentage applying when defending on -; non-native terrain (such as ship in harbour) +; non-native terrain (such as ship in harbor) ; flags = List of unit class flags (from the following list; you ; cannot add custom unit class flags) ; helptext = optional help text string; should escape all raw newlines diff --git a/data/multiplayer/effects.ruleset b/data/multiplayer/effects.ruleset index 50c712a9b7..f0699ad389 100644 --- a/data/multiplayer/effects.ruleset +++ b/data/multiplayer/effects.ruleset @@ -1091,7 +1091,7 @@ reqs = "Building", "Granary", "City" } -[effect_harbour] +[effect_harbor] type = "Output_Add_Tile" value = 1 reqs = diff --git a/data/multiplayer/units.ruleset b/data/multiplayer/units.ruleset index 731495589f..0b27011070 100644 --- a/data/multiplayer/units.ruleset +++ b/data/multiplayer/units.ruleset @@ -106,7 +106,7 @@ veteran_move_bonus = 0, 0, 0, 0 ; min_speed = Minimum speed after damage and effects (whole movement points) ; hp_loss_pct = Hitpoints lost each turn if unit not in city or native base ; non_native_def_pct = Defense power percentage applying when defending on -; non-native terrain (such as ship in harbour) +; non-native terrain (such as ship in harbor) ; flags = List of unit class flags (from the following list; you ; cannot add custom unit class flags) ; helptext = optional help text string; should escape all raw newlines diff --git a/data/ruledit/comments-3.3.txt b/data/ruledit/comments-3.3.txt index f87a6fc6ec..ae8cf968ba 100644 --- a/data/ruledit/comments-3.3.txt +++ b/data/ruledit/comments-3.3.txt @@ -265,7 +265,7 @@ uclasses = "\ ; min_speed = Minimum speed after damage and effects (whole movement points)\n\ ; hp_loss_pct = Hitpoints lost each turn if unit not in city or native base\n\ ; non_native_def_pct = Defense power percentage applying when defending on\n\ -; non-native terrain (such as ship in harbour)\n\ +; non-native terrain (such as ship in harbor)\n\ ; flags = List of unit class flags (from the following list; you\n\ ; cannot add custom unit class flags)\n\ ; helptext = optional help text string; should escape all raw newlines\n\ diff --git a/data/sandbox/effects.ruleset b/data/sandbox/effects.ruleset index 9a9dbc14d8..3380f7846e 100644 --- a/data/sandbox/effects.ruleset +++ b/data/sandbox/effects.ruleset @@ -2275,7 +2275,7 @@ reqs = "MinSize", "7", "City" } -[effect_harbour] +[effect_harbor] type = "Output_Add_Tile" value = 1 reqs = diff --git a/data/sandbox/units.ruleset b/data/sandbox/units.ruleset index 8b915956c4..9e76cfc115 100644 --- a/data/sandbox/units.ruleset +++ b/data/sandbox/units.ruleset @@ -120,7 +120,7 @@ veteran_move_bonus = 0, 0, 0, 0 ; min_speed = Minimum speed after damage and effects (whole movement points) ; hp_loss_pct = Hitpoints lost each turn if unit not in city or native base ; non_native_def_pct = Defense power percentage applying when defending on -; non-native terrain (such as ship in harbour) +; non-native terrain (such as ship in harbor) ; flags = List of unit class flags (from the following list; you ; cannot add custom unit class flags) ; helptext = optional help text string; should escape all raw newlines diff --git a/data/stub/units.ruleset b/data/stub/units.ruleset index be2568f884..298738912e 100644 --- a/data/stub/units.ruleset +++ b/data/stub/units.ruleset @@ -71,7 +71,7 @@ veteran_move_bonus = 0 ; min_speed = Minimum speed after damage and effects (whole movement points) ; hp_loss_pct = Hitpoints lost each turn if unit not in city or native base ; non_native_def_pct = Defense power percentage applying when defending on -; non-native terrain (such as ship in harbour) +; non-native terrain (such as ship in harbor) ; flags = List of unit class flags (from the following list; you ; cannot add custom unit class flags) ; helptext = optional help text string; should escape all raw newlines diff --git a/data/webperimental/effects.ruleset b/data/webperimental/effects.ruleset index ef2d8e9d23..24689e3c7d 100644 --- a/data/webperimental/effects.ruleset +++ b/data/webperimental/effects.ruleset @@ -1103,7 +1103,7 @@ reqs = "Building", "Granary", "City" } -[effect_harbour] +[effect_harbor] type = "Output_Add_Tile" value = 1 reqs = diff --git a/data/webperimental/units.ruleset b/data/webperimental/units.ruleset index d6b1e2d564..f0dbea587f 100644 --- a/data/webperimental/units.ruleset +++ b/data/webperimental/units.ruleset @@ -113,7 +113,7 @@ veteran_move_bonus = 0, 0, 0, 0 ; min_speed = Minimum speed after damage and effects (whole movement points) ; hp_loss_pct = Hitpoints lost each turn if unit not in city or native base ; non_native_def_pct = Defense power percentage applying when defending on -; non-native terrain (such as ship in harbour) +; non-native terrain (such as ship in harbor) ; flags = List of unit class flags (from the following list; you ; cannot add custom unit class flags) ; helptext = optional help text string; should escape all raw newlines -- 2.40.1