From bc0867e1f319fb25f68f0723de262e1a79d3812b Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 10 Sep 2021 16:29:16 +0300 Subject: [PATCH 30/32] Improve coding style of r*.ruleset nation rulesets See osdn #42845 Signed-off-by: Marko Lindqvist --- data/nation/rapanui.ruleset | 21 +++--- data/nation/raramuri.ruleset | 19 +++-- data/nation/rhenish.ruleset | 33 ++++----- data/nation/riffian.ruleset | 24 +++---- data/nation/riograndense.ruleset | 17 ++--- data/nation/roman.ruleset | 20 +++--- data/nation/romanian.ruleset | 16 ++--- data/nation/romansh.ruleset | 18 ++--- data/nation/russian.ruleset | 22 +++--- data/nation/rusyn.ruleset | 115 ++++++++++++++++--------------- data/nation/ruthenian.ruleset | 18 ++--- data/nation/rwandan.ruleset | 16 ++--- data/nation/ryukyuan.ruleset | 85 ++++++++++++----------- 13 files changed, 213 insertions(+), 211 deletions(-) diff --git a/data/nation/rapanui.ruleset b/data/nation/rapanui.ruleset index 6f94ba022a..d031f780ac 100644 --- a/data/nation/rapanui.ruleset +++ b/data/nation/rapanui.ruleset @@ -1,9 +1,9 @@ [nation_rapanui] -name=_("Rapa Nui") -plural=_("?plural:Rapa Nui") -groups="Oceanian", "Medieval", "Early Modern" -legend=_("The Rapa Nui are the native Polynesian inhabitants of Easter\ +name = _("Rapa Nui") +plural = _("?plural:Rapa Nui") +groups = "Oceanian", "Medieval", "Early Modern" +legend = _("The Rapa Nui are the native Polynesian inhabitants of Easter\ Island. They have inhabited the island since the end of the first\ millennium CE. They are famous for having built large statues called\ moai. This civilization was destroyed due to internal conflicts; in 1888\ @@ -26,18 +26,17 @@ leaders = { "Nga'ara", "Male" "Koreto", "Female" "Rukunga", "Male" - - } -flag="rapa_nui" + +flag = "rapa_nui" flag_alt = "-" style = "Tropical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -conflicts_with="chilean" +conflicts_with = "chilean" civilwar_nations = "tahitian", "chilean" cities = diff --git a/data/nation/raramuri.ruleset b/data/nation/raramuri.ruleset index 1d4809e44c..cdba7452aa 100644 --- a/data/nation/raramuri.ruleset +++ b/data/nation/raramuri.ruleset @@ -1,11 +1,11 @@ [nation_raramuri] -name=_("Rarámuri") +name = _("Rarámuri") ; pre-2.6 had plain ASCII names -rule_name="Raramuri" -plural=_("?plural:Rarámuris") -groups= "American" -legend=_("The Rarámuri or Tarahumara live in the canyons of the Sierra\ +rule_name = "Raramuri" +plural = _("?plural:Rarámuris") +groups = "American" +legend = _("The Rarámuri or Tarahumara live in the canyons of the Sierra\ Madre Occidental in the north of Mexico. They are well known for their\ endurance; their traditions include running long distances while\ kicking wooden balls in races that last up to several days. In 1891 a\ @@ -25,13 +25,13 @@ ruler_titles = { "Fundamentalism", _("Shaman %s"), _("?female:Shaman %s") } -flag="raramuri" +flag = "raramuri" flag_alt = "-" style = "Celtic" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" civilwar_nations = "hopi", "aztec" @@ -76,4 +76,3 @@ cities = "Bakanora", "Tosanachi", "Tabaráopa" - diff --git a/data/nation/rhenish.ruleset b/data/nation/rhenish.ruleset index 9449e69ff4..a492a11cf7 100644 --- a/data/nation/rhenish.ruleset +++ b/data/nation/rhenish.ruleset @@ -1,9 +1,9 @@ [nation_rhenish] -name=_("Rhenish") -plural=_("?plural:Rhenish") -groups="European", "Medieval" -legend=_("The Rhineland was the site of three electorates of the Holy\ +name = _("Rhenish") +plural = _("?plural:Rhenish") +groups = "European", "Medieval" +legend = _("The Rhineland was the site of three electorates of the Holy\ Roman Empire, Cologne, Trier and Mainz, as well as numerous smaller\ territories. The Rhenish statelets were gradually absorbed by Prussia\ from the 17th century onwards. The Prussian Rhine Province was erected\ @@ -28,21 +28,22 @@ leaders = { "Johannes Rau", "Male" } -flag="rhineland" +ruler_titles = { + "government", "male_title", "female_title" + "Democracy", _("Minister-President %s"), _("?female:Minister-President %s") + "Despotism", _("Count %s"), _("Countess %s") + "Fundamentalism", _("Prince-Bishop %s"), _("Princess-Bishop %s") + "Monarchy", _("Grand Duke %s"), _("Grand Duchess %s") + "Republic", _("Burgomaster %s"), _("?female:Burgomaster %s") +} + +flag = "rhineland" flag_alt = "-" style = "European" -ruler_titles = { "government", "male_title", "female_title" - "Democracy", _("Minister-President %s"), _("?female:Minister-President %s") - "Despotism", _("Count %s"), _("Countess %s") - "Fundamentalism", _("Prince-Bishop %s"), _("Princess-Bishop %s") - "Monarchy", _("Grand Duke %s"), _("Grand Duchess %s") - "Republic", _("Burgomaster %s"), _("?female:Burgomaster %s") - } - -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" civilwar_nations = "westphalian", "palatinate", "german belgian" diff --git a/data/nation/riffian.ruleset b/data/nation/riffian.ruleset index bdeef03cfa..3062dd22c6 100644 --- a/data/nation/riffian.ruleset +++ b/data/nation/riffian.ruleset @@ -1,9 +1,9 @@ [nation_riffian] -name=_("Riffian") -plural=_("?plural:Riffians") -groups="African" -legend=_("The Confederal Republic of the Tribes of the Rif was a short-lived\ +name = _("Riffian") +plural = _("?plural:Riffians") +groups = "African" +legend = _("The Confederal Republic of the Tribes of the Rif was a short-lived\ nation founded in September 1921 when Riffians revolted against the Spanish\ and Moroccans. The country was conquered by the Spanish and French in\ 1926. The area is now part of Morocco.") @@ -17,20 +17,20 @@ leaders = { ruler_titles = { "government", "male_title", "female_title" - "Fundamentalism", _("Imam %s"), _("Imama %s") - "Monarchy", _("Emir %s"), _("Emira %s") - "Despotism", _("%s Pasha"), _("?female:%s Pasha") + "Fundamentalism", _("Imam %s"), _("Imama %s") + "Monarchy", _("Emir %s"), _("Emira %s") + "Despotism", _("%s Pasha"), _("?female:%s Pasha") } -flag="rif" +flag = "rif" flag_alt = "-" style = "Classical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -civilwar_nations="Spanish", "French", "Moroccan" +civilwar_nations = "Spanish", "French", "Moroccan" cities = "Ajdir", diff --git a/data/nation/riograndense.ruleset b/data/nation/riograndense.ruleset index 5e50ca1f6d..cc7d6251e2 100644 --- a/data/nation/riograndense.ruleset +++ b/data/nation/riograndense.ruleset @@ -1,9 +1,9 @@ [nation_riograndense] -name=_("Rio-Grandense") -plural=_("?plural:Rio-Grandenses") -groups="American" -legend=_("The Rio-Grandense Republic or Piratini Republic existed in the\ +name = _("Rio-Grandense") +plural = _("?plural:Rio-Grandenses") +groups = "American" +legend = _("The Rio-Grandense Republic or Piratini Republic existed in the\ Brazilian state of Rio Grande do Sul from 1836 to 1845. It fought the\ War of Tatters against the Brazilian Imperial Army and was supported by\ Giuseppe Garibaldi amongst others.") @@ -20,13 +20,15 @@ ruler_titles = { "government", "male_title", "female_title" "Fundamentalism", _("Bishop %s"), _("Mother Superior %s") } + flag = "piratini" flag_alt = "-" style = "European" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" + civilwar_nations = "Brazilian", "Argentine", "Uruguayan", "Tupi" cities = @@ -76,4 +78,3 @@ cities = "Santiago", "Estância Velha", "Venâncio Aires" - diff --git a/data/nation/roman.ruleset b/data/nation/roman.ruleset index 69dc444c4e..2eb9d0516f 100644 --- a/data/nation/roman.ruleset +++ b/data/nation/roman.ruleset @@ -1,11 +1,11 @@ [nation_roman] -translation_domain="freeciv" +translation_domain = "freeciv" -name=_("Roman") -plural=_("?plural:Romans") -groups="Ancient", "European", "Core" -legend=_("Rome was, in legend, founded by Romulus in 753 BCE. At its\ +name = _("Roman") +plural = _("?plural:Romans") +groups = "Ancient", "European", "Core" +legend = _("Rome was, in legend, founded by Romulus in 753 BCE. At its\ height, Rome controlled much of Europe, northern Africa and the Near\ East. Roman culture adopted much of the civilizations it conquered, such\ as the Greeks and Etruscans, and forms one of the bases of the Western\ @@ -57,14 +57,14 @@ flag = "rome" flag_alt = "italy" style = "Classical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -conflicts_with="Western Roman", "Byzantine", "Italian", "Spanish", "French", +conflicts_with = "Western Roman", "Byzantine", "Italian", "Spanish", "French", "Portuguese", "Romanian", "Belgian", "Swiss", "Andorran", "Monegasque", "Sammarinese" -civilwar_nations="Western Roman", "Byzantine", "Palmyrene" +civilwar_nations = "Western Roman", "Byzantine", "Palmyrene" cities = ; Cities in Italia diff --git a/data/nation/romanian.ruleset b/data/nation/romanian.ruleset index 3ef1d9ff33..250206bf4b 100644 --- a/data/nation/romanian.ruleset +++ b/data/nation/romanian.ruleset @@ -1,9 +1,9 @@ [nation_romanian] -name=_("Romanian") -plural=_("?plural:Romanians") -groups="Modern", "Medieval", "European" -legend=_("Romania as a nation was formed at the beginning of the 20th\ +name = _("Romanian") +plural = _("?plural:Romanians") +groups = "Modern", "Medieval", "European" +legend = _("Romania as a nation was formed at the beginning of the 20th\ century, when the states of Transylvania, Wallachia, and Moldavia merged.\ It is a country inhabited by people speaking a language reminiscent from\ the time of ancient Rome. Its history is convoluted as it was always at\ @@ -32,13 +32,13 @@ ruler_titles = { "Fundamentalism", _("Director-President %s"),_("?female:Director-President %s") } -flag="romania" +flag = "romania" flag_alt = "-" style = "Classical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" conflicts_with = "roman" civilwar_nations = "transylvanian", "moldovan" diff --git a/data/nation/romansh.ruleset b/data/nation/romansh.ruleset index 33bc4078ab..e605529f4a 100644 --- a/data/nation/romansh.ruleset +++ b/data/nation/romansh.ruleset @@ -1,9 +1,9 @@ [nation_rumantsch] -name=_("Romansh") -plural=_("?plural:Romansh") -groups= "European", "Medieval" -legend=_("The Rumantsch or Romansh people are inhabitants of the Swiss\ +name = _("Romansh") +plural = _("?plural:Romansh") +groups = "European", "Medieval" +legend = _("The Rumantsch or Romansh people are inhabitants of the Swiss\ canton of Grisons who speak Romansh, a Romance language that retains\ some unique characteristics and with a rich oral tradition. Although\ Romansh is one of the four national languages of Switzerland and\ @@ -29,15 +29,15 @@ ruler_titles = { "Fundamentalism", _("Bishop %s"), _("Mother Superior %s") } -flag="grisons" +flag = "grisons" flag_alt = "-" style = "European" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -civilwar_nations= "liechtensteiner", "friulian" +civilwar_nations = "liechtensteiner", "friulian" cities = "Cuira", diff --git a/data/nation/russian.ruleset b/data/nation/russian.ruleset index 4d6d7e68a9..55df32f6b4 100644 --- a/data/nation/russian.ruleset +++ b/data/nation/russian.ruleset @@ -1,11 +1,11 @@ [nation_russian] -translation_domain="freeciv" +translation_domain = "freeciv" -name=_("Russian") -plural=_("?plural:Russians") -groups="Early Modern", "Modern", "European", "Asian", "Core" -legend=_("Russia is the largest country in the world, occupying a huge\ +name = _("Russian") +plural = _("?plural:Russians") +groups = "Early Modern", "Modern", "European", "Asian", "Core" +legend = _("Russia is the largest country in the world, occupying a huge\ part of both Europe and Asia. According to legend, Slavic tribes of\ Novgorod invited the Varangian (Viking) king Oleg to bring order to\ their land. Oleg established the Kievan Rus' in this realm, the first\ @@ -51,19 +51,19 @@ ruler_titles = { "Fundamentalism", _("Patriarch %s"), _("Matriarch %s") } -flag="russia" +flag = "russia" flag_alt = "-" style = "European" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" ; Chain of similar flags: -conflicts_with="slovenian", "slovakian", +conflicts_with = "slovenian", "slovakian", ; Transitional state "soviet" -civilwar_nations="Soviet", "Siberian", "Tatar", "Cossack" +civilwar_nations = "Soviet", "Siberian", "Tatar", "Cossack" cities = "Moskva", diff --git a/data/nation/rusyn.ruleset b/data/nation/rusyn.ruleset index 63ece9e8ec..7bd0007259 100644 --- a/data/nation/rusyn.ruleset +++ b/data/nation/rusyn.ruleset @@ -1,15 +1,16 @@ [nation_rusyn] -name=_("Rusyn") -plural=_("?plural:Rusyns") -groups="Medieval", "Early Modern", "European" -legend=_("The Rusyns are an ethnic group on the western periphery of\ +name = _("Rusyn") +plural = _("?plural:Rusyns") +groups = "Medieval", "Early Modern", "European" +legend = _("The Rusyns are an ethnic group on the western periphery of\ the East Slavic nations. They live mainly in the Polish-Ukrainian-Slovak\ borderland and in the Vojvodina. In medieval times the Rusyn homeland\ was the site of the Duchy of Galicia-Volhynia and the Kingdom of Rus.\ In later times the lands were under Polish and later Austrian rule.\ Rusyns formed two ephemeral states after World War I: the Lemko-Rusyn\ Republic and the Komancza Republic.") + leaders = { "name", "sex" "Lev Danylovych", "Male" ;Lev I of Galicia @@ -24,9 +25,6 @@ leaders = { "Dmytro Chylak", "Male" "Wasyl Kuryllo", "Male" } -flag="rusyn" -flag_alt = "-" -style = "Celtic" ruler_titles = { "government", "male_title", "female_title" @@ -35,68 +33,71 @@ ruler_titles = { "Communism", _("People's Commissar %s"), _("?female:People's Commissar %s") } -init_techs="" -init_buildings="" -init_units="" +flag = "rusyn" +flag_alt = "-" +style = "Celtic" + +init_techs = "" +init_buildings = "" +init_units = "" civilwar_nations = "Polish", "Ukrainian", "Slovakian", "Lendian", "Chrobatian" cities = - ;Lemko towns and villages in Poland -"Novyi Targ", -"Novyi Sants", -"Komancha", -"Hrybiv", -"Horlytsi", -"Jaslo", -"Korosno", -"Sianik", -"Losia", -"Krynytsia", -"Novytsia", -"Zhdynia", -"Gladyshiv", -"Hanchova", -"Zyndranova", -"Ustia Ruske", -"Bortne", -"Biltsariova", -"Bilianka", -"Mokre", -"Shchavne", -"Kuliashne", -"Repiad", -"Turynske", + "Novyi Targ", + "Novyi Sants", + "Komancha", + "Hrybiv", + "Horlytsi", + "Jaslo", + "Korosno", + "Sianik", + "Losia", + "Krynytsia", + "Novytsia", + "Zhdynia", + "Gladyshiv", + "Hanchova", + "Zyndranova", + "Ustia Ruske", + "Bortne", + "Biltsariova", + "Bilianka", + "Mokre", + "Shchavne", + "Kuliashne", + "Repiad", + "Turynske", ;Boyko -"Dolyna", -"Rozhniativ", -"Broshniv-Osada", -"Bolekhivtsi", -"Skole", -"Turka", -"Perehinske", -"Modrichi", -"Sambir", -"Staryi Sambir", + "Dolyna", + "Rozhniativ", + "Broshniv-Osada", + "Bolekhivtsi", + "Skole", + "Turka", + "Perehinske", + "Modrichi", + "Sambir", + "Staryi Sambir", ;Subcarpathian Rusyns -"Berehove", -"Uzhhorod", -"Maramorosh", -"Sevlush", -"Verkhovyna", -"Velykyi Bereznyi", -"Volovets", -"Mizhhirya", -"Khust", + "Berehove", + "Uzhhorod", + "Maramorosh", + "Sevlush", + "Verkhovyna", + "Velykyi Bereznyi", + "Volovets", + "Mizhhirya", + "Khust", ;Pannonian Rusyns -"Rusky Kerestur", -"Kotsur", -"Bykuts Dol" + "Rusky Kerestur", + "Kotsur", + "Bykuts Dol" diff --git a/data/nation/ruthenian.ruleset b/data/nation/ruthenian.ruleset index 0ed39584a2..a8991ccfcf 100644 --- a/data/nation/ruthenian.ruleset +++ b/data/nation/ruthenian.ruleset @@ -1,10 +1,10 @@ [nation_ruthenian] -name=_("Kievan Rus'") -plural=_("?plural:Kievan Rus'") -rule_name="Ruthenian" -groups="European", "Medieval" -legend=_("The Kievan Rus' were a Medieval Slavic monarchy. It was\ +name = _("Kievan Rus'") +plural = _("?plural:Kievan Rus'") +rule_name = "Ruthenian" +groups = "European", "Medieval" +legend = _("The Kievan Rus' were a Medieval Slavic monarchy. It was\ centered in Kiev after that city was conquered by Oleg of Novgorod.\ In the 13th century the Rus' succumbed to a Mongol invasion. The Rus'\ were the precursors of the modern East Slavic nations.") @@ -35,9 +35,10 @@ flag = "kiev" flag_alt = "russia" style = "celtic" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" + conflicts_with = "russian", "ukrainian", "belarusian", "muscovite", "rusyn" civilwar_nations = "muscovite", "ukrainian", "belarusian", "novgorodian", "rusyn" @@ -81,4 +82,3 @@ cities = "Pereyaslavl", "Berestye", "Toropets" - diff --git a/data/nation/rwandan.ruleset b/data/nation/rwandan.ruleset index d36629059e..65121ec4e2 100644 --- a/data/nation/rwandan.ruleset +++ b/data/nation/rwandan.ruleset @@ -1,9 +1,9 @@ [nation_rwandan] -name=_("Rwandan") -plural=_("?plural:Rwandans") -groups="Modern", "African" -legend=_("Rwanda is a hilly and very fertile country in the Great Lakes\ +name = _("Rwandan") +plural = _("?plural:Rwandans") +groups = "Modern", "African" +legend = _("Rwanda is a hilly and very fertile country in the Great Lakes\ region of eastern Africa. It supports the densest population of\ the continent.") @@ -16,13 +16,13 @@ leaders = { "Yuhi IV", "Male" } -flag="rwanda" +flag = "rwanda" flag_alt = "-" style = "Tropical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" civilwar_nations = "burundian", "congolese" diff --git a/data/nation/ryukyuan.ruleset b/data/nation/ryukyuan.ruleset index 6df1c3efd6..acf3f30fdc 100644 --- a/data/nation/ryukyuan.ruleset +++ b/data/nation/ryukyuan.ruleset @@ -1,9 +1,9 @@ [nation_ryukyuan] -name=_("Ryukyuan") -plural=_("?plural:Ryukyuans") -groups="Medieval", "Early Modern", "Asian" -legend=_("The Ryukyu Kingdom (1372-1879) was the Land of Propriety, a\ +name = _("Ryukyuan") +plural = _("?plural:Ryukyuans") +groups = "Medieval", "Early Modern", "Asian" +legend = _("The Ryukyu Kingdom (1372-1879) was the Land of Propriety, a\ peaceful maritime trading nation eventually invaded, occupied, and annexed\ by Japan.") @@ -17,52 +17,53 @@ leaders = { "Yosoidon", "Female" } -flag="ryukyu" -flag_alt="-" +flag = "ryukyu" +flag_alt = "-" style = "Asian" -init_techs="" -init_buildings="" -init_units="" -civilwar_nations="japanese", "taiwanese" +init_techs = "" +init_buildings = "" +init_units = "" + +civilwar_nations = "japanese", "taiwanese" cities= ; Okinawan name used, Japanese in comment - "Sui", ; Shuri - "Naafa", ; Naha - "Uchinaa", ; Okinawa + "Sui", ; Shuri + "Naafa", ; Naha + "Uchinaa", ; Okinawa "Uruma", - "Urashii", ; Urasoe - "Jinoon", ; Ginowan - "Nagu", ; Nago - "Ichuman", ; Itoman - "Tumigushiku", ; Tomigusuku - "Naaku", ; Miyako - "Ishigachi", ; Ishigaki - "Nanjoo", ; Nanjo - "Yuntan", ; Yomitan - "Nishibaru", ; Nishihara - "Feebaru", ; Haebaru + "Urashii", ; Urasoe + "Jinoon", ; Ginowan + "Nagu", ; Nago + "Ichuman", ; Itoman + "Tumigushiku", ; Tomigusuku + "Naaku", ; Miyako + "Ishigachi", ; Ishigaki + "Nanjoo", ; Nanjo + "Yuntan", ; Yomitan + "Nishibaru", ; Nishihara + "Feebaru", ; Haebaru "Chatan", - "Nakagushiku", ; Nakagusuku - "Yunabaru", ; Yonabaru - "Mutubu", ; Motobu - "Kadina", ; Kadena - "Chi'n", ; Kin - "Nachijin", ; Nakijin - "Unna", ; Onna - "Kumijima (ocean)", ; Kumejima - "Iijima (ocean)", ; Ie - "Jinuza", ; Ginoza - "Dakidun", ; Taketomi - "Ujimi", ; Ogimi - "Agarijima (ocean)", ; Higashi - "Ijina", ; Izena - "Yunaguni", ; Yonaguni - "Ihyaa", ; Iheya + "Nakagushiku", ; Nakagusuku + "Yunabaru", ; Yonabaru + "Mutubu", ; Motobu + "Kadina", ; Kadena + "Chi'n", ; Kin + "Nachijin", ; Nakijin + "Unna", ; Onna + "Kumijima (ocean)", ; Kumejima + "Iijima (ocean)", ; Ie + "Jinuza", ; Ginoza + "Dakidun", ; Taketomi + "Ujimi", ; Ogimi + "Agarijima (ocean)", ; Higashi + "Ijina", ; Izena + "Yunaguni", ; Yonaguni + "Ihyaa", ; Iheya "Tarama", "Aguni", "Zamami", - "Tukashichi", ; Tokashiki + "Tukashichi", ; Tokashiki "Ufuagarijima (ocean)",; Kitadaito - "Tunachi" ; Tonaki + "Tunachi" ; Tonaki -- 2.33.0