From bd4347bbd7d016576ec19b6bd72e98a9b4300c82 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 29 Dec 2023 03:25:21 +0200 Subject: [PATCH 11/11] Rulesets: Change harbour sound tag to "b_harbor" See osdn #48649 Signed-off-by: Marko Lindqvist --- data/civ2/buildings.ruleset | 6 +++--- data/civ2civ3/buildings.ruleset | 6 +++--- data/classic/buildings.ruleset | 6 +++--- data/goldkeep/buildings.ruleset | 6 +++--- data/multiplayer/buildings.ruleset | 6 +++--- data/sandbox/buildings.ruleset | 6 +++--- data/stdsounds.soundspec | 3 ++- data/webperimental/buildings.ruleset | 6 +++--- 8 files changed, 23 insertions(+), 22 deletions(-) diff --git a/data/civ2/buildings.ruleset b/data/civ2/buildings.ruleset index 5ea54b5e1c..2c92c39697 100644 --- a/data/civ2/buildings.ruleset +++ b/data/civ2/buildings.ruleset @@ -456,9 +456,9 @@ obsolete_by = build_cost = 60 upkeep = 1 sabotage = 100 -sound = "b_harbour" -sound_alt = "b_generic" -sound_alt2 = "-" +sound = "b_harbor" +sound_alt = "b_harbour" +sound_alt2 = "b_generic" helptext = _("\ Gives one extra food resource on all Oceanic tiles. The city needs\ to be coastal to build this improvement.\ diff --git a/data/civ2civ3/buildings.ruleset b/data/civ2civ3/buildings.ruleset index ee3d860d94..d20250ba9c 100644 --- a/data/civ2civ3/buildings.ruleset +++ b/data/civ2civ3/buildings.ruleset @@ -568,9 +568,9 @@ obsolete_by = build_cost = 40 upkeep = 1 sabotage = 100 -sound = "b_harbour" -sound_alt = "b_generic" -sound_alt2 = "-" +sound = "b_harbor" +sound_alt = "b_harbour" +sound_alt2 = "b_generic" helptext = _("\ Gives one extra food resource on all Ocean or Deep Ocean tiles (but \ not Lakes). The city needs to be coastal (next to one of these tiles) \ diff --git a/data/classic/buildings.ruleset b/data/classic/buildings.ruleset index 69f4fbf65f..1ebcb48892 100644 --- a/data/classic/buildings.ruleset +++ b/data/classic/buildings.ruleset @@ -463,9 +463,9 @@ obsolete_by = build_cost = 40 upkeep = 1 sabotage = 100 -sound = "b_harbour" -sound_alt = "b_generic" -sound_alt2 = "-" +sound = "b_harbor" +sound_alt = "b_harbour" +sound_alt2 = "b_generic" helptext = _("\ Gives one extra food resource on all Oceanic tiles. The city needs\ to be coastal to build this improvement.\ diff --git a/data/goldkeep/buildings.ruleset b/data/goldkeep/buildings.ruleset index a296157edf..4d4ed313ec 100644 --- a/data/goldkeep/buildings.ruleset +++ b/data/goldkeep/buildings.ruleset @@ -469,9 +469,9 @@ obsolete_by = build_cost = 40 upkeep = 1 sabotage = 100 -sound = "b_harbour" -sound_alt = "b_generic" -sound_alt2 = "-" +sound = "b_harbor" +sound_alt = "b_harbour" +sound_alt2 = "b_generic" helptext = _("\ Gives one extra food resource on all Oceanic tiles. The city needs\ to be coastal to build this improvement.\ diff --git a/data/multiplayer/buildings.ruleset b/data/multiplayer/buildings.ruleset index 1f77288609..d0feb0387d 100644 --- a/data/multiplayer/buildings.ruleset +++ b/data/multiplayer/buildings.ruleset @@ -461,9 +461,9 @@ obsolete_by = build_cost = 40 upkeep = 1 sabotage = 100 -sound = "b_harbour" -sound_alt = "b_generic" -sound_alt2 = "-" +sound = "b_harbor" +sound_alt = "b_harbour" +sound_alt2 = "b_generic" helptext = _("\ Gives one extra food resource on all Oceanic tiles. The city needs\ to be coastal to build this improvement.\ diff --git a/data/sandbox/buildings.ruleset b/data/sandbox/buildings.ruleset index 66c91f1b63..858329254d 100644 --- a/data/sandbox/buildings.ruleset +++ b/data/sandbox/buildings.ruleset @@ -571,9 +571,9 @@ obsolete_by = build_cost = 40 upkeep = 1 sabotage = 100 -sound = "b_harbour" -sound_alt = "b_generic" -sound_alt2 = "-" +sound = "b_harbor" +sound_alt = "b_harbour" +sound_alt2 = "b_generic" helptext = _("\ Gives one extra food resource on all Ocean or Deep Ocean tiles (but \ not Lakes). The city needs to be coastal (next to one of these tiles) \ diff --git a/data/stdsounds.soundspec b/data/stdsounds.soundspec index eec0f10801..82db82d6ee 100644 --- a/data/stdsounds.soundspec +++ b/data/stdsounds.soundspec @@ -28,7 +28,8 @@ artists = "\ ;b_courthouse = "" ;b_factory = "" ;b_granary = "" -;b_harbour = "" +;b_harbor = "" +;b_harbour = "" ; Backward compatibility ;b_hydro_plant = "" ;b_library = "" ;b_marketplace = "" diff --git a/data/webperimental/buildings.ruleset b/data/webperimental/buildings.ruleset index 179c03dbc6..4aef232e3e 100644 --- a/data/webperimental/buildings.ruleset +++ b/data/webperimental/buildings.ruleset @@ -470,9 +470,9 @@ obsolete_by = build_cost = 40 upkeep = 1 sabotage = 100 -sound = "b_harbour" -sound_alt = "b_generic" -sound_alt2 = "-" +sound = "b_harbor" +sound_alt = "b_harbour" +sound_alt2 = "b_generic" helptext = _("\ Gives one extra food resource on all Oceanic tiles. The city needs\ to be coastal to build this improvement.\ -- 2.43.0