From 439ad71e87d074e6687f35bf22ea5a76dd9bdfe0 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 15 Sep 2023 11:52:44 +0300 Subject: [PATCH 6/6] Change harbor gfx tag to "b.harbor" Was "b.harbour" See osdn #48589 Signed-off-by: Marko Lindqvist --- data/civ2/buildings.ruleset | 8 +-- data/civ2civ3/buildings.ruleset | 6 +- data/classic/buildings.ruleset | 8 +-- data/goldkeep/buildings.ruleset | 8 +-- data/misc/buildings-large.spec | 86 ++++++++++++++-------------- data/misc/buildings.spec | 2 +- data/multiplayer/buildings.ruleset | 8 +-- data/sandbox/buildings.ruleset | 6 +- data/webperimental/buildings.ruleset | 8 +-- 9 files changed, 70 insertions(+), 70 deletions(-) diff --git a/data/civ2/buildings.ruleset b/data/civ2/buildings.ruleset index 7d0b925f32..528ba368b5 100644 --- a/data/civ2/buildings.ruleset +++ b/data/civ2/buildings.ruleset @@ -425,7 +425,7 @@ The amount of stored food will be set to half full whenever a city\ ; In Civ2, city size reduction does not generate food like this. ; Dare I ask where this food comes from?? :-) -[building_harbour] +[building_harbor] name = _("Harbor") rule_name = "Harbour" ; en_GB spelling used originally genus = "Improvement" @@ -434,8 +434,8 @@ reqs = "Tech", "Seafaring", "Player" "TerrainClass", "Oceanic", "Adjacent" } -graphic = "b.harbour" -graphic_alt = "-" +graphic = "b.harbor" +graphic_alt = "b.harbour" graphic_alt2 = "-" obsolete_by = { "type", "name", "range" @@ -446,7 +446,7 @@ sabotage = 100 sound = "b_harbour" sound_alt = "b_generic" helptext = _("\ -Gives one extra food resource on all Oceanic tiles. The city needs\ +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 05d1324f23..f403ef31f5 100644 --- a/data/civ2civ3/buildings.ruleset +++ b/data/civ2civ3/buildings.ruleset @@ -535,7 +535,7 @@ TIP: to maximise the speed with which a city grows, you should build a \ Granary before it grows larger than size 4.\ ") -[building_harbour] +[building_harbor] name = _("Harbor") rule_name = "Harbour" ; en_GB spelling used originally genus = "Improvement" @@ -544,8 +544,8 @@ reqs = "Tech", "Seafaring", "Player" "TerrainFlag", "Sea", "Adjacent" } -graphic = "b.harbour" -graphic_alt = "-" +graphic = "b.harbor" +graphic_alt = "b.harbour" graphic_alt2 = "-" obsolete_by = { "type", "name", "range" diff --git a/data/classic/buildings.ruleset b/data/classic/buildings.ruleset index 73a75c6611..effe10a5ec 100644 --- a/data/classic/buildings.ruleset +++ b/data/classic/buildings.ruleset @@ -432,7 +432,7 @@ The amount of stored food will be set to half full whenever a city\ ; In Civ2, city size reduction does not generate food like this. ; Dare I ask where this food comes from?? :-) -[building_harbour] +[building_harbor] name = _("Harbor") rule_name = "Harbour" ; en_GB spelling used originally genus = "Improvement" @@ -441,8 +441,8 @@ reqs = "Tech", "Seafaring", "Player" "TerrainClass", "Oceanic", "Adjacent" } -graphic = "b.harbour" -graphic_alt = "-" +graphic = "b.harbor" +graphic_alt = "b.harbour" graphic_alt2 = "-" obsolete_by = { "type", "name", "range" @@ -453,7 +453,7 @@ sabotage = 100 sound = "b_harbour" sound_alt = "b_generic" helptext = _("\ -Gives one extra food resource on all Oceanic tiles. The city needs\ +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 bfa274aba2..33983f5cb6 100644 --- a/data/goldkeep/buildings.ruleset +++ b/data/goldkeep/buildings.ruleset @@ -438,7 +438,7 @@ The amount of stored food will be set to half full whenever a city\ ; In Civ2, city size reduction does not generate food like this. ; Dare I ask where this food comes from?? :-) -[building_harbour] +[building_harbor] name = _("Harbor") rule_name = "Harbour" ; en_GB spelling used originally genus = "Improvement" @@ -447,8 +447,8 @@ reqs = "Tech", "Seafaring", "Player" "TerrainClass", "Oceanic", "Adjacent" } -graphic = "b.harbour" -graphic_alt = "-" +graphic = "b.harbor" +graphic_alt = "b.harbour" graphic_alt2 = "-" obsolete_by = { "type", "name", "range" @@ -459,7 +459,7 @@ sabotage = 100 sound = "b_harbour" sound_alt = "b_generic" helptext = _("\ -Gives one extra food resource on all Oceanic tiles. The city needs\ +Gives one extra food resource on all Oceanic tiles. The city needs\ to be coastal to build this improvement.\ ") diff --git a/data/misc/buildings-large.spec b/data/misc/buildings-large.spec index c05264e5ab..6e35c284cd 100644 --- a/data/misc/buildings-large.spec +++ b/data/misc/buildings-large.spec @@ -15,46 +15,46 @@ artists = " [extra] sprites = - { "tag", "file" - "b.airport", "buildings/airport" - "b.aqueduct", "buildings/aqueduct" - "b.bank", "buildings/bank" - "b.barracks_i", "buildings/barracks_i" - "b.barracks_ii", "buildings/barracks_ii" - "b.barracks_iii", "buildings/barracks_iii" - "b.capitalization", "buildings/capitalization" - "b.cathedral", "buildings/cathedral" - "b.city_walls", "buildings/city_walls" - "b.coastal_defense", "buildings/coastal_defense" - "b.colosseum", "buildings/colosseum" - "b.courthouse", "buildings/courthouse" - "b.ecclesiastical_palace", "buildings/ecclesiastical_palace" - "b.factory", "buildings/factory" - "b.granary", "buildings/granary" - "b.harbour", "buildings/harbor" - "b.hydro_plant", "buildings/hydro_plant" - "b.library", "buildings/library" - "b.marketplace", "buildings/marketplace" - "b.mass_transit", "buildings/mass_transit" - "b.mfg_plant", "buildings/mfg_plant" - "b.nuclear_plant", "buildings/nuclear_plant" - "b.offshore_platform", "buildings/offshore_platform" - "b.palace", "buildings/palace" - "b.police_station", "buildings/police_station" - "b.port_facility", "buildings/port_facility" - "b.power_plant", "buildings/power_plant" - "b.recycling_center", "buildings/recycling_center" - "b.research_lab", "buildings/research_lab" - "b.sam_battery", "buildings/sam_battery" - "b.sdi_defense", "buildings/sdi_defense" - "b.sewer_system", "buildings/sewer_system" - "b.solar_plant", "buildings/solar_plant" - "b.space_component", "buildings/space_component" - "b.space_modules", "buildings/space_modules" - "b.space_structural", "buildings/space_structural" - "b.stock_exchange", "buildings/stock_exchange" - "b.super_highways", "buildings/super_highways" - "b.supermarket", "buildings/supermarket" - "b.temple", "buildings/temple" - "b.university", "buildings/university" - } + { "tag", "file" + "b.airport", "buildings/airport" + "b.aqueduct", "buildings/aqueduct" + "b.bank", "buildings/bank" + "b.barracks_i", "buildings/barracks_i" + "b.barracks_ii", "buildings/barracks_ii" + "b.barracks_iii", "buildings/barracks_iii" + "b.capitalization", "buildings/capitalization" + "b.cathedral", "buildings/cathedral" + "b.city_walls", "buildings/city_walls" + "b.coastal_defense", "buildings/coastal_defense" + "b.colosseum", "buildings/colosseum" + "b.courthouse", "buildings/courthouse" + "b.ecclesiastical_palace", "buildings/ecclesiastical_palace" + "b.factory", "buildings/factory" + "b.granary", "buildings/granary" + "b.harbor", "buildings/harbor" + "b.hydro_plant", "buildings/hydro_plant" + "b.library", "buildings/library" + "b.marketplace", "buildings/marketplace" + "b.mass_transit", "buildings/mass_transit" + "b.mfg_plant", "buildings/mfg_plant" + "b.nuclear_plant", "buildings/nuclear_plant" + "b.offshore_platform", "buildings/offshore_platform" + "b.palace", "buildings/palace" + "b.police_station", "buildings/police_station" + "b.port_facility", "buildings/port_facility" + "b.power_plant", "buildings/power_plant" + "b.recycling_center", "buildings/recycling_center" + "b.research_lab", "buildings/research_lab" + "b.sam_battery", "buildings/sam_battery" + "b.sdi_defense", "buildings/sdi_defense" + "b.sewer_system", "buildings/sewer_system" + "b.solar_plant", "buildings/solar_plant" + "b.space_component", "buildings/space_component" + "b.space_modules", "buildings/space_modules" + "b.space_structural", "buildings/space_structural" + "b.stock_exchange", "buildings/stock_exchange" + "b.super_highways", "buildings/super_highways" + "b.supermarket", "buildings/supermarket" + "b.temple", "buildings/temple" + "b.university", "buildings/university" + } diff --git a/data/misc/buildings.spec b/data/misc/buildings.spec index 61154df997..f6c263fd0a 100644 --- a/data/misc/buildings.spec +++ b/data/misc/buildings.spec @@ -59,7 +59,7 @@ tiles = { "row", "column", "tag" 3, 2, "b.sam_battery" 3, 3, "b.coastal_defense" 3, 4, "b.solar_plant" - 3, 5, "b.harbour" + 3, 5, "b.harbor", "b.harbour" 3, 6, "b.offshore_platform" 3, 7, "b.airport" diff --git a/data/multiplayer/buildings.ruleset b/data/multiplayer/buildings.ruleset index a99a2d187f..3936fd35c6 100644 --- a/data/multiplayer/buildings.ruleset +++ b/data/multiplayer/buildings.ruleset @@ -430,7 +430,7 @@ The amount of stored food will be set to half full whenever a city\ and more easily withstand famine.\ ") -[building_harbour] +[building_harbor] name = _("Harbor") rule_name = "Harbour" ; en_GB spelling used originally genus = "Improvement" @@ -439,8 +439,8 @@ reqs = "Tech", "Seafaring", "Player" "TerrainClass", "Oceanic", "Adjacent" } -graphic = "b.harbour" -graphic_alt = "-" +graphic = "b.harbor" +graphic_alt = "b.harbour" graphic_alt2 = "-" obsolete_by = { "type", "name", "range" @@ -451,7 +451,7 @@ sabotage = 100 sound = "b_harbour" sound_alt = "b_generic" helptext = _("\ -Gives one extra food resource on all Oceanic tiles. The city needs\ +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 1483def84f..9840d82c87 100644 --- a/data/sandbox/buildings.ruleset +++ b/data/sandbox/buildings.ruleset @@ -538,7 +538,7 @@ TIP: to maximise the speed with which a city grows, you should build a \ Granary before it grows larger than size 4.\ ") -[building_harbour] +[building_harbor] name = _("Harbor") rule_name = "Harbour" ; en_GB spelling used originally genus = "Improvement" @@ -547,8 +547,8 @@ reqs = "Tech", "Seafaring", "Player" "TerrainFlag", "Sea", "Adjacent" } -graphic = "b.harbour" -graphic_alt = "-" +graphic = "b.harbor" +graphic_alt = "b.harbour" graphic_alt2 = "-" obsolete_by = { "type", "name", "range" diff --git a/data/webperimental/buildings.ruleset b/data/webperimental/buildings.ruleset index 1bbdf6996c..87a0150d2c 100644 --- a/data/webperimental/buildings.ruleset +++ b/data/webperimental/buildings.ruleset @@ -439,7 +439,7 @@ The amount of stored food will be set to half full whenever a city\ ; In Civ2, city size reduction does not generate food like this. ; Dare I ask where this food comes from?? :-) -[building_harbour] +[building_harbor] name = _("Harbor") rule_name = "Harbour" ; en_GB spelling used originally genus = "Improvement" @@ -448,8 +448,8 @@ reqs = "Tech", "Seafaring", "Player" "TerrainClass", "Oceanic", "Adjacent" } -graphic = "b.harbour" -graphic_alt = "-" +graphic = "b.harbor" +graphic_alt = "b.harbour" graphic_alt2 = "-" obsolete_by = { "type", "name", "range" @@ -460,7 +460,7 @@ sabotage = 100 sound = "b_harbour" sound_alt = "b_generic" helptext = _("\ -Gives one extra food resource on all Oceanic tiles. The city needs\ +Gives one extra food resource on all Oceanic tiles. The city needs\ to be coastal to build this improvement.\ ") -- 2.40.1