From e960b5fae6a21e571007bce0f09e0170a4136488 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 29 Sep 2021 02:04:24 +0300 Subject: [PATCH 37/37] Improve coding style of u*.ruleset nation rulesets See osdn #42909 Signed-off-by: Marko Lindqvist --- data/nation/ugandan.ruleset | 149 +++++++++++++++++----------------- data/nation/ukrainian.ruleset | 22 ++--- data/nation/un.ruleset | 18 ++-- data/nation/urartian.ruleset | 25 +++--- data/nation/uruguayan.ruleset | 20 +++-- data/nation/uyghur.ruleset | 17 ++-- data/nation/uzbek.ruleset | 20 ++--- 7 files changed, 138 insertions(+), 133 deletions(-) diff --git a/data/nation/ugandan.ruleset b/data/nation/ugandan.ruleset index 949f3085e1..a03fb2c044 100644 --- a/data/nation/ugandan.ruleset +++ b/data/nation/ugandan.ruleset @@ -1,9 +1,9 @@ [nation_ugandan] -name=_("Ugandan") -plural=_("?plural:Ugandans") -groups="Modern", "African" -legend=_("The Republic of Uganda is located in eastern Africa. The country\ +name = _("Ugandan") +plural = _("?plural:Ugandans") +groups = "Modern", "African" +legend = _("The Republic of Uganda is located in eastern Africa. The country\ contains part of Lake Victoria, which is also in Kenya and Tanzania.\ In the past, the southern part of the country was part of the Buganda\ kingdom. Modern Uganda gained independence in 1962.") @@ -12,7 +12,7 @@ leaders = { "name", "sex" ; Regent for Mukaabya Mutesa I (d. 1882). - "Muganzirwazza", "Female" + "Muganzirwazza", "Female" ; Kabaka 1939 - 1966, President 1963 - 1966 (d. 1966). "Edward Muteesa II", "Male" @@ -31,84 +31,85 @@ ruler_titles = { "government", "male_title", "female_title" "Despotism", _("Dictator %s"), _("?female:Dictator %s") - ; /* TRANS: There are two titles for king, kabaka and - ; mujaguzo. Kabaka is the material king, while - ; mujaguzo is the spiritual king, and is represented - ; by royal drums. These titles come from Buganda, an - ; ancient kingdom which occupied much of present-day + ; /* TRANS: There are two titles for king, kabaka and + ; mujaguzo. Kabaka is the material king, while + ; mujaguzo is the spiritual king, and is represented + ; by royal drums. These titles come from Buganda, an + ; ancient kingdom which occupied much of present-day ; Uganda. */ "Monarchy", _("Kabaka %s"), _("?female:Kabaka %s") } -flag="uganda" +flag = "uganda" flag_alt = "-" style = "tropical" -init_techs="" -init_buildings="" -init_units="" -civilwar_nations="british", "kenyan", "sudanese", "rwandan" +init_techs = "" +init_buildings = "" +init_units = "" + +civilwar_nations = "british", "kenyan", "sudanese", "rwandan" ; "tanzania" when ruleset available cities = - "Kampala", ; Capital (pop. 1,758,500) + "Kampala", ; Capital (pop. 1,758,500) ; Cities, by population (Wikipedia) - "Kira", ;274330 - "Gulu", ;232700 - "Lira", ;157600 - "Mukono", ;150100 - "Jinja", ;132100 - "Entebbe", ;115100 - "Kasese", ;110200 - "Mbarara", ;102900 - "Kitgum", ; 87700 - "Mbale", ; 86600 - "Nansana", ; 83000 - "Njeru", ; 77200 - "Masaka", ; 75400 - "Mubende", ; 64000 - "Iganga", ; 60700 - "Soroti", ; 59500 - "Kabale", ; 54400 - "Tororo", ; 47600 - "Koboko", ; 45300 - "Fort Portal", ; 45100 - "Mityana", ; 45100 - "Hoima", ; 40374 - "Arua", ; 39200 - "Bugembe", ; 35800 - "Lugazi", ; 35100 - "Masindi", ; 32700 - "Adjumani", ; 32500 - "Paidha", ; 32300 - "Kalisizo", ; 32200 - "Nebbi", ; 31600 - "Bushenyi", ; 31000 - "Pallisa", ; 30400 - "Ibanda", ; 29900 - "Wobulenzi", ; 29000 - "Kamuli", ; 28600 - "Buliisa", ; 27100 - "Kayunga", ; 27000 - "Yumbe", ; 26200 - "Busia", ; 24700 - "Apac", ; 24000 - "Bugiri", ; 24000 - "Moyo", ; 22600 - "Kumi", ; 21900 - "Pakwach", ; 21200 - "Rukungiri", ; 21200 - "Budaka", ; 20700 - "Kotido", ; 19800 - "Bundibugyo", ; 19500 - "Wakiso", ; 19300 - "Luweero", ; 18300 - "Bombo", ; 18000 - "Kaabong", ; 18000 - "Buwenge", ; 17300 - "Dokolo", ; 16700 - "Abim", ; 16300 - "Ntungamo", ; 16200 - "Kiboga", ; 15700 - "Mpondwe" ; 15300 + "Kira", ;274330 + "Gulu", ;232700 + "Lira", ;157600 + "Mukono", ;150100 + "Jinja", ;132100 + "Entebbe", ;115100 + "Kasese", ;110200 + "Mbarara", ;102900 + "Kitgum", ; 87700 + "Mbale", ; 86600 + "Nansana", ; 83000 + "Njeru", ; 77200 + "Masaka", ; 75400 + "Mubende", ; 64000 + "Iganga", ; 60700 + "Soroti", ; 59500 + "Kabale", ; 54400 + "Tororo", ; 47600 + "Koboko", ; 45300 + "Fort Portal", ; 45100 + "Mityana", ; 45100 + "Hoima", ; 40374 + "Arua", ; 39200 + "Bugembe", ; 35800 + "Lugazi", ; 35100 + "Masindi", ; 32700 + "Adjumani", ; 32500 + "Paidha", ; 32300 + "Kalisizo", ; 32200 + "Nebbi", ; 31600 + "Bushenyi", ; 31000 + "Pallisa", ; 30400 + "Ibanda", ; 29900 + "Wobulenzi", ; 29000 + "Kamuli", ; 28600 + "Buliisa", ; 27100 + "Kayunga", ; 27000 + "Yumbe", ; 26200 + "Busia", ; 24700 + "Apac", ; 24000 + "Bugiri", ; 24000 + "Moyo", ; 22600 + "Kumi", ; 21900 + "Pakwach", ; 21200 + "Rukungiri", ; 21200 + "Budaka", ; 20700 + "Kotido", ; 19800 + "Bundibugyo", ; 19500 + "Wakiso", ; 19300 + "Luweero", ; 18300 + "Bombo", ; 18000 + "Kaabong", ; 18000 + "Buwenge", ; 17300 + "Dokolo", ; 16700 + "Abim", ; 16300 + "Ntungamo", ; 16200 + "Kiboga", ; 15700 + "Mpondwe" ; 15300 diff --git a/data/nation/ukrainian.ruleset b/data/nation/ukrainian.ruleset index cc7890b421..012d37ce52 100644 --- a/data/nation/ukrainian.ruleset +++ b/data/nation/ukrainian.ruleset @@ -1,9 +1,9 @@ [nation_ukrainian] -name=_("Ukrainian") -plural=_("?plural:Ukrainians") -groups="Modern", "European" -legend=_("Ukraine is a vast region on the westernmost marches of the\ +name = _("Ukrainian") +plural = _("?plural:Ukrainians") +groups = "Modern", "European" +legend = _("Ukraine is a vast region on the westernmost marches of the\ former Soviet Union. It includes some of the most fertile black-soil\ cropland on Earth.") @@ -40,16 +40,16 @@ ruler_titles = { "Fundamentalism", _("Patriarch %s"), _("Matriarch %s") } -flag="ukraine" +flag = "ukraine" flag_alt = "-" style = "Celtic" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -conflicts_with="Cossack", "Ruthenian" -civilwar_nations="Soviet", "Polish", "Russian", "Rusyn", +conflicts_with = "Cossack", "Ruthenian" +civilwar_nations = "Soviet", "Polish", "Russian", "Rusyn", "Crimean Tatar" cities = @@ -75,7 +75,7 @@ cities = "Sevastopol (ocean)", "Chernivtsi (hills)", "Kamyanets", - "Bila Tserkva", + "Bila Tserkva", "Ternopil", "Ivano-Frankivsk", "Uzhhorod", diff --git a/data/nation/un.ruleset b/data/nation/un.ruleset index b635a5c0a9..b940269ca8 100644 --- a/data/nation/un.ruleset +++ b/data/nation/un.ruleset @@ -1,9 +1,9 @@ [nation_un] -name=_("UN") -plural=_("?plural:UN") -groups="Imaginary" -legend=_("The United Nations believe in human rights and the protection of\ +name = _("UN") +plural = _("?plural:UN") +groups = "Imaginary" +legend = _("The United Nations believe in human rights and the protection of\ the weak.") leaders = { @@ -24,15 +24,15 @@ ruler_titles = { "Communism", _("Secretary-General %s"), _("?female:Secretary-General %s") } -flag="united_nations" +flag = "united_nations" flag_alt = "-" style = "Classical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -cities= +cities = "Security Council", "General Assembly", "ECOSOC", diff --git a/data/nation/urartian.ruleset b/data/nation/urartian.ruleset index 0d2a3a80fa..b1cb4f0a2a 100644 --- a/data/nation/urartian.ruleset +++ b/data/nation/urartian.ruleset @@ -1,9 +1,9 @@ [nation_urartian] -name=_("Urartian") -plural=_("?plural:Urartians") -groups="Ancient", "Asian" -legend=_("Urartu was an ancient Hurrian state located around Lake Van in\ +name = _("Urartian") +plural = _("?plural:Urartians") +groups = "Ancient", "Asian" +legend = _("Urartu was an ancient Hurrian state located around Lake Van in\ the eastern part of Anatolia. The earliest historical mention of Urartu\ comes from texts of the Assyrian king Shalmaneser I dating from the 13th\ century BCE. It is thought that Urartu was a multiethnic state in which\ @@ -27,9 +27,6 @@ leaders = { "Sarduri IV", "Male" "Rusa IV", "Male" } -flag="urartu" -flag_alt = "-" -style = "Babylonian" ruler_titles = { "government", "male_title", "female_title" @@ -40,12 +37,16 @@ ruler_titles = { "Democracy", _("Speaker %s"), _("?female:Speaker %s") } -init_techs="" -init_buildings="" -init_units="" +flag = "urartu" +flag_alt = "-" +style = "Babylonian" + +init_techs = "" +init_buildings = "" +init_units = "" -conflicts_with="Mitanni", "Armenian", "Kurdish", "Seleucid", "Turkish", - "Ottoman" +conflicts_with = "Mitanni", "Armenian", "Kurdish", "Seleucid", "Turkish", + "Ottoman" civilwar_nations = "Mitanni", "Assyrian", "Median", "Armenian" cities = diff --git a/data/nation/uruguayan.ruleset b/data/nation/uruguayan.ruleset index fdb84ea911..f5391b8183 100644 --- a/data/nation/uruguayan.ruleset +++ b/data/nation/uruguayan.ruleset @@ -1,9 +1,9 @@ [nation_uruguayan] -name=_("Uruguayan") -plural=_("?plural:Uruguayans") -groups="Modern", "American" -legend=_("Uruguay, a small South American country sometimes referred to as\ +name = _("Uruguayan") +plural = _("?plural:Uruguayans") +groups = "Modern", "American" +legend = _("Uruguay, a small South American country sometimes referred to as\ \"Switzerland of the Americas\" due to its once highly developed social\ welfare system.") @@ -23,14 +23,16 @@ ruler_titles = { "Despotism", _("General %s"), _("?female:General %s") "Fundamentalism", _("Bishop %s"), _("Mother Superior %s") } -flag="uruguay" + +flag = "uruguay" flag_alt = "-" style = "European" -init_techs="" -init_buildings="" -init_units="" -civilwar_nations="argentine", "brazilian" +init_techs = "" +init_buildings = "" +init_units = "" + +civilwar_nations = "argentine", "brazilian" cities = "Montevideo", diff --git a/data/nation/uyghur.ruleset b/data/nation/uyghur.ruleset index ee2351b42c..eb23e8a570 100644 --- a/data/nation/uyghur.ruleset +++ b/data/nation/uyghur.ruleset @@ -1,9 +1,9 @@ [nation_uyghur] -name=_("Uyghur") -plural=_("?plural:Uyghurs") -groups="Medieval", "Early Modern", "Asian" -legend=_("Uyghur was an east Turk empire and civilization. At its height in\ +name = _("Uyghur") +plural = _("?plural:Uyghurs") +groups = "Medieval", "Early Modern", "Asian" +legend = _("Uyghur was an east Turk empire and civilization. At its height in\ 820 CE it controlled most of Central and North Asia. After clashing with\ the Chinese for several centuries, they were finally subdued by the Qing\ dynasty in the 1700s. Today, descendants of the Uyghur form the\ @@ -29,13 +29,14 @@ ruler_titles = { "Monarchy", _("%s Khagan"), _("?female:%s Khagan") } -flag="uyghur" +flag = "uyghur" flag_alt = "-" style = "Classical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" + civilwar_nations = "turkish", "tocharian" cities = diff --git a/data/nation/uzbek.ruleset b/data/nation/uzbek.ruleset index 5d9d9ed58c..d0c814577b 100644 --- a/data/nation/uzbek.ruleset +++ b/data/nation/uzbek.ruleset @@ -1,9 +1,9 @@ [nation_uzbek] -name=_("Uzbek") -plural=_("?plural:Uzbeks") -groups="Modern", "Asian" -legend=_("The Central Asian nation of Uzbekistan has been the site of many\ +name = _("Uzbek") +plural = _("?plural:Uzbeks") +groups = "Modern", "Asian" +legend = _("The Central Asian nation of Uzbekistan has been the site of many\ ancient states such as Khwarezm, the Khanate of Bukhara, and the Khanate of\ Kokand. The Uzbeks regard themselves as descendants of Timur, founder of\ the Timurid dynasty, who ruled from his capital at Samarkand.") @@ -25,16 +25,16 @@ ruler_titles = { "Communism", _("General Secretary %s"), _("?female:General Secretary %s") } -flag="uzbekistan" +flag = "uzbekistan" flag_alt = "-" style = "Classical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -conflicts_with="Timurid" ; Uzbeks considers Timur their founding father -civilwar_nations="Turkmen", "Kazakh", "Kyrgyz", "Uyghur" +conflicts_with = "Timurid" ; Uzbeks considers Timur their founding father +civilwar_nations = "Turkmen", "Kazakh", "Kyrgyz", "Uyghur" cities = "Buxoro", ; Bukhara -- 2.33.0