From fc2cf8c3f301bfc1eddb5f841921cea1d5d52e3e Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 18 Aug 2022 02:41:29 +0300 Subject: [PATCH 35/35] Make supplied rulesets to always have spaces around '=' See osdn #41767 Signed-off-by: Marko Lindqvist --- data/alien/game.ruleset | 4 ++-- data/alien/nations.ruleset | 10 +++++----- data/civ1/game.ruleset | 4 ++-- data/civ1/governments.ruleset | 2 +- data/civ1/nations.ruleset | 22 ++++++++++++---------- data/civ1/terrain.ruleset | 4 ++-- data/civ2/game.ruleset | 4 ++-- data/civ2/governments.ruleset | 2 +- data/civ2/nations.ruleset | 22 ++++++++++++---------- data/civ2/terrain.ruleset | 4 ++-- data/civ2civ3/game.ruleset | 4 ++-- data/civ2civ3/governments.ruleset | 2 +- data/classic/game.ruleset | 4 ++-- data/classic/governments.ruleset | 2 +- data/goldkeep/game.ruleset | 4 ++-- data/goldkeep/governments.ruleset | 2 +- data/granularity/game.ruleset | 4 ++-- data/multiplayer/game.ruleset | 6 +++--- data/multiplayer/governments.ruleset | 2 +- data/sandbox/game.ruleset | 4 ++-- data/sandbox/governments.ruleset | 2 +- data/stub/game.ruleset | 4 ++-- data/stub/nations.ruleset | 8 ++++---- data/webperimental/game.ruleset | 4 ++-- data/webperimental/governments.ruleset | 2 +- data/webperimental/nations.ruleset | 16 ++++++++-------- 26 files changed, 76 insertions(+), 72 deletions(-) diff --git a/data/alien/game.ruleset b/data/alien/game.ruleset index 24d033d0e9..89a5b294e6 100644 --- a/data/alien/game.ruleset +++ b/data/alien/game.ruleset @@ -55,8 +55,8 @@ description = *alien/README.alien* capabilities = "" [options] -global_init_techs="" -global_init_buildings="Headquarters", "Basic Infrastructure" +global_init_techs = "" +global_init_buildings = "Headquarters", "Basic Infrastructure" popup_tech_help = TRUE [tileset] diff --git a/data/alien/nations.ruleset b/data/alien/nations.ruleset index e693c00d35..997a734f70 100644 --- a/data/alien/nations.ruleset +++ b/data/alien/nations.ruleset @@ -86,8 +86,8 @@ default_government = "Despotism" ; description = Optional short user description of this set. [nset_all] -name=_("All nations") -rule_name="all" +name = _("All nations") +rule_name = "all" ; Descriptions of nation groups ; These are more cosmetic than sets; they affect the "pick nation" dialog, @@ -101,9 +101,9 @@ rule_name="all" ; group [ngroup_barbarian] -name=_("?nationgroup:Barbarian") -match=0 -hidden=true +name = _("?nationgroup:Barbarian") +match = 0 +hidden = true *include "alien/nation/mathclub.ruleset" *include "alien/nation/secretsociety.ruleset" diff --git a/data/civ1/game.ruleset b/data/civ1/game.ruleset index eebb8e619e..04f96a356e 100644 --- a/data/civ1/game.ruleset +++ b/data/civ1/game.ruleset @@ -54,8 +54,8 @@ differences.\ capabilities = "" [options] -global_init_techs="" -global_init_buildings="Palace" +global_init_techs = "" +global_init_buildings = "Palace" [tileset] ; If preferred tileset is set, clients that support the feature will suggest diff --git a/data/civ1/governments.ruleset b/data/civ1/governments.ruleset index 672b280395..6e4df390bb 100644 --- a/data/civ1/governments.ruleset +++ b/data/civ1/governments.ruleset @@ -18,7 +18,7 @@ options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" format_version = 30 [governments] -during_revolution="Anarchy" +during_revolution = "Anarchy" ; /* <-- avoid gettext warnings ; diff --git a/data/civ1/nations.ruleset b/data/civ1/nations.ruleset index 523d3950ac..6f126d4f42 100644 --- a/data/civ1/nations.ruleset +++ b/data/civ1/nations.ruleset @@ -84,8 +84,8 @@ default_government = "Despotism" ; description = Optional short user description of this set. [nset_all] -name=_("All nations") -rule_name="all" +name = _("All nations") +rule_name = "all" ; Descriptions of nation groups ; These are more cosmetic than sets; they affect the "pick nation" dialog, @@ -99,15 +99,17 @@ rule_name="all" ; group [ngroup_ancient] -name=_("?nationgroup:Ancient") -match=0 +name = _("?nationgroup:Ancient") +match = 0 + [ngroup_modern] -name=_("?nationgroup:Modern") -match=0 +name = _("?nationgroup:Modern") +match = 0 + [ngroup_barbarian] -name=_("?nationgroup:Barbarian") -match=0 -hidden=true +name = _("?nationgroup:Barbarian") +match = 0 +hidden = true [nation_american] @@ -416,7 +418,7 @@ ruler_titles = { } flag = "han" -flag_alt="-" +flag_alt = "-" style = "Asian" color.r = 90 diff --git a/data/civ1/terrain.ruleset b/data/civ1/terrain.ruleset index 52a6b00fe5..41adbae7a1 100644 --- a/data/civ1/terrain.ruleset +++ b/data/civ1/terrain.ruleset @@ -40,11 +40,11 @@ flags = ; Percentage of "land" tiles required to be adjacent to a water tile before ; it may be "reclaimed" into a land tile (0-101; 0=anywhere, default 101=nowhere) -ocean_reclaim_requirement=101 +ocean_reclaim_requirement = 101 ; Percentage of "water" tiles required to be adjacent to a land tile before ; it may be "channeled" into a water tile (0-101; 0=anywhere, default 101=nowhere) -land_channel_requirement=101 +land_channel_requirement = 101 ; Percentage of unfrozen tiles (no "Frozen" flag) required to be adjacent ; to a frozen tile before it can thaw (0-101; 0=anywhere, default 101=nowhere) diff --git a/data/civ2/game.ruleset b/data/civ2/game.ruleset index c1d69cecad..613f33ee5d 100644 --- a/data/civ2/game.ruleset +++ b/data/civ2/game.ruleset @@ -50,8 +50,8 @@ You are playing with civ2 style rules. These are somewhat close to classic\ capabilities = "" [options] -global_init_techs="" -global_init_buildings="Palace" +global_init_techs = "" +global_init_buildings = "Palace" [tileset] ; If preferred tileset is set, clients that support the feature will suggest diff --git a/data/civ2/governments.ruleset b/data/civ2/governments.ruleset index db35cde0f4..2b43b53138 100644 --- a/data/civ2/governments.ruleset +++ b/data/civ2/governments.ruleset @@ -16,7 +16,7 @@ options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" format_version = 30 [governments] -during_revolution="Anarchy" +during_revolution = "Anarchy" ; /* <-- avoid gettext warnings ; diff --git a/data/civ2/nations.ruleset b/data/civ2/nations.ruleset index 71458cedec..f3cfd99b1e 100644 --- a/data/civ2/nations.ruleset +++ b/data/civ2/nations.ruleset @@ -86,8 +86,8 @@ default_government = "Despotism" ; description = Optional short user description of this set. [nset_all] -name=_("All nations") -rule_name="all" +name = _("All nations") +rule_name = "all" ; Descriptions of nation groups ; These are more cosmetic than sets; they affect the "pick nation" dialog, @@ -101,15 +101,17 @@ rule_name="all" ; group [ngroup_ancient] -name=_("?nationgroup:Ancient") -match=0 +name = _("?nationgroup:Ancient") +match = 0 + [ngroup_modern] -name=_("?nationgroup:Modern") -match=0 +name = _("?nationgroup:Modern") +match = 0 + [ngroup_barbarian] -name=_("?nationgroup:Barbarian") -match=0 -hidden=true +name = _("?nationgroup:Barbarian") +match = 0 +hidden = true [nation_american] @@ -2196,7 +2198,7 @@ translation_domain = "freeciv-core" name = _("Pirate") plural = _("?plural:Pirates") groups = "Barbarian" -legend=_("As long as honest men have sailed the seas, pirates have been a\ +legend = _("As long as honest men have sailed the seas, pirates have been a\ scourge of them and of all coastal dwelling peoples.") leaders = { diff --git a/data/civ2/terrain.ruleset b/data/civ2/terrain.ruleset index 38a03dec3a..9929d42394 100644 --- a/data/civ2/terrain.ruleset +++ b/data/civ2/terrain.ruleset @@ -40,11 +40,11 @@ flags = ; Percentage of "land" tiles required to be adjacent to a water tile before ; it may be "reclaimed" into a land tile (0-101; 0=anywhere, default 101=nowhere) -ocean_reclaim_requirement=101 +ocean_reclaim_requirement = 101 ; Percentage of "water" tiles required to be adjacent to a land tile before ; it may be "channeled" into a water tile (0-101; 0=anywhere, default 101=nowhere) -land_channel_requirement=101 +land_channel_requirement = 101 ; Percentage of unfrozen tiles (no "Frozen" flag) required to be adjacent ; to a frozen tile before it can thaw (0-101; 0=anywhere, default 101=nowhere) diff --git a/data/civ2civ3/game.ruleset b/data/civ2civ3/game.ruleset index 862ddd817c..d1e1b541d4 100644 --- a/data/civ2civ3/game.ruleset +++ b/data/civ2civ3/game.ruleset @@ -59,8 +59,8 @@ description = *civ2civ3/README.civ2civ3* capabilities = "std-terrains" [options] -global_init_techs="" -global_init_buildings="Palace" +global_init_techs = "" +global_init_buildings = "Palace" [tileset] ; If preferred tileset is set, clients that support the feature will suggest diff --git a/data/civ2civ3/governments.ruleset b/data/civ2civ3/governments.ruleset index 2108a923f7..a6c1893cf3 100644 --- a/data/civ2civ3/governments.ruleset +++ b/data/civ2civ3/governments.ruleset @@ -16,7 +16,7 @@ options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" format_version = 30 [governments] -during_revolution="Anarchy" +during_revolution = "Anarchy" ; /* <-- avoid gettext warnings ; diff --git a/data/classic/game.ruleset b/data/classic/game.ruleset index f890989511..782c29ac20 100644 --- a/data/classic/game.ruleset +++ b/data/classic/game.ruleset @@ -52,8 +52,8 @@ description = *classic/README.classic* capabilities = "std-terrains" [options] -global_init_techs="" -global_init_buildings="Palace" +global_init_techs = "" +global_init_buildings = "Palace" [tileset] ; If preferred tileset is set, clients that support the feature will suggest diff --git a/data/classic/governments.ruleset b/data/classic/governments.ruleset index 80a3574307..a8a65d3c75 100644 --- a/data/classic/governments.ruleset +++ b/data/classic/governments.ruleset @@ -16,7 +16,7 @@ options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" format_version = 30 [governments] -during_revolution="Anarchy" +during_revolution = "Anarchy" ; /* <-- avoid gettext warnings ; diff --git a/data/goldkeep/game.ruleset b/data/goldkeep/game.ruleset index 2128e81baf..8fb2cd7f36 100644 --- a/data/goldkeep/game.ruleset +++ b/data/goldkeep/game.ruleset @@ -57,8 +57,8 @@ description = *goldkeep/README.goldkeep* capabilities = "std-terrains" [options] -global_init_techs="" -global_init_buildings="Palace" +global_init_techs = "" +global_init_buildings = "Palace" [tileset] ; If preferred tileset is set, clients that support the feature will suggest diff --git a/data/goldkeep/governments.ruleset b/data/goldkeep/governments.ruleset index 5c1790e815..5b0ed5c7af 100644 --- a/data/goldkeep/governments.ruleset +++ b/data/goldkeep/governments.ruleset @@ -18,7 +18,7 @@ options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" format_version = 30 [governments] -during_revolution="Anarchy" +during_revolution = "Anarchy" ; /* <-- avoid gettext warnings ; diff --git a/data/granularity/game.ruleset b/data/granularity/game.ruleset index 8b2fdc2db8..57ef67f45a 100644 --- a/data/granularity/game.ruleset +++ b/data/granularity/game.ruleset @@ -48,8 +48,8 @@ description = *granularity/README.granularity* capabilities = "" [options] -global_init_techs="" -global_init_buildings="" +global_init_techs = "" +global_init_buildings = "" [tileset] ; If preferred tileset is set, clients that support the feature will suggest diff --git a/data/multiplayer/game.ruleset b/data/multiplayer/game.ruleset index da23e20949..d11ec2b4da 100644 --- a/data/multiplayer/game.ruleset +++ b/data/multiplayer/game.ruleset @@ -55,8 +55,8 @@ description = *multiplayer/README.multiplayer* capabilities = "std-terrains" [options] -global_init_techs="" -global_init_buildings="Palace" +global_init_techs = "" +global_init_buildings = "Palace" [tileset] ; If preferred tileset is set, clients that support the feature will suggest @@ -1920,7 +1920,7 @@ colorlist = [teams] ; Team names correspond roughly to colors defined above, so that -; plrcolormode=TEAM_ORDER is not gratuitously confusing. +; plrcolormode = TEAM_ORDER is not gratuitously confusing. names = ; /* TRANS: Name of a color; used as unique identifier for a team */ ; /* TRANS: With this and other color team names, uniqueness is more */ diff --git a/data/multiplayer/governments.ruleset b/data/multiplayer/governments.ruleset index 3c179c70b0..fd554b4b3f 100644 --- a/data/multiplayer/governments.ruleset +++ b/data/multiplayer/governments.ruleset @@ -16,7 +16,7 @@ options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" format_version = 30 [governments] -during_revolution="Anarchy" +during_revolution = "Anarchy" ; /* <-- avoid gettext warnings ; diff --git a/data/sandbox/game.ruleset b/data/sandbox/game.ruleset index 6444e1f86c..b0670875e2 100644 --- a/data/sandbox/game.ruleset +++ b/data/sandbox/game.ruleset @@ -57,8 +57,8 @@ description = *sandbox/README.sandbox* capabilities = "std-terrains" [options] -global_init_techs="" -global_init_buildings="Palace" +global_init_techs = "" +global_init_buildings = "Palace" [tileset] ; If preferred tileset is set, clients that support the feature will suggest diff --git a/data/sandbox/governments.ruleset b/data/sandbox/governments.ruleset index 85eb05c8ac..36c239314c 100644 --- a/data/sandbox/governments.ruleset +++ b/data/sandbox/governments.ruleset @@ -16,7 +16,7 @@ options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02" format_version = 30 [governments] -during_revolution="Anarchy" +during_revolution = "Anarchy" ; /* <-- avoid gettext warnings ; diff --git a/data/stub/game.ruleset b/data/stub/game.ruleset index 3f8576b06f..6777db9600 100644 --- a/data/stub/game.ruleset +++ b/data/stub/game.ruleset @@ -40,8 +40,8 @@ real rulesets, not playable ruleset in itself.\ capabilities = "" [options] -global_init_techs="" -global_init_buildings="" +global_init_techs = "" +global_init_buildings = "" [tileset] ; If preferred tileset is set, clients that support the feature will suggest diff --git a/data/stub/nations.ruleset b/data/stub/nations.ruleset index ca9c0d5e9a..051859bfcd 100644 --- a/data/stub/nations.ruleset +++ b/data/stub/nations.ruleset @@ -71,8 +71,8 @@ format_version = 30 ; description = Optional short user description of this set. [nset_full] -name=_("?nationset:Full") -rule_name="all" +name = _("?nationset:Full") +rule_name = "all" ; Descriptions of nation groups ; These are more cosmetic than sets; they affect the "pick nation" dialog, @@ -86,8 +86,8 @@ rule_name="all" ; group [ngroup_generic] -name=_("?nationgroup:Generic") -match=2 +name = _("?nationgroup:Generic") +match = 2 [compatibility] ; Initial government for all the nations that do not diff --git a/data/webperimental/game.ruleset b/data/webperimental/game.ruleset index 4f794c36a8..9b3fe5b077 100644 --- a/data/webperimental/game.ruleset +++ b/data/webperimental/game.ruleset @@ -55,8 +55,8 @@ description = *webperimental/README.webperimental* capabilities = "std-terrains" [options] -global_init_techs="" -global_init_buildings="Palace" +global_init_techs = "" +global_init_buildings = "Palace" [tileset] diff --git a/data/webperimental/governments.ruleset b/data/webperimental/governments.ruleset index 7a7d959ab0..aff04035c7 100644 --- a/data/webperimental/governments.ruleset +++ b/data/webperimental/governments.ruleset @@ -16,7 +16,7 @@ options = "+Freeciv-ruleset-3.2-Devel-2022.Feb.02 web-compatible" format_version = 30 [governments] -during_revolution="Anarchy" +during_revolution = "Anarchy" ; /* <-- avoid gettext warnings ; diff --git a/data/webperimental/nations.ruleset b/data/webperimental/nations.ruleset index dd4bd0e50e..97929aaf1e 100644 --- a/data/webperimental/nations.ruleset +++ b/data/webperimental/nations.ruleset @@ -70,10 +70,10 @@ builder_default = 50 translation_domain = "freeciv-core" -name=_("Barbarian") -plural=_("?plural:Barbarians") -groups="Core", "Barbarian" -legend=_("Since the dawn of civilization, barbarians have been a threat to\ +name = _("Barbarian") +plural = _("?plural:Barbarians") +groups = "Core", "Barbarian" +legend = _("Since the dawn of civilization, barbarians have been a threat to\ cultured peoples everywhere.") leaders = { @@ -86,13 +86,13 @@ leaders = { "Boadicea", "Female" } -flag="barbarian" +flag = "barbarian" flag_alt = "-" style = "European" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" cities = "Barbaricum" -- 2.35.1