From 3a7bde5c0864f4649b9f54626c39eadae7ca1ede Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 19 Oct 2021 18:57:15 +0300 Subject: [PATCH 50/52] Improve coding style of y*.ruleset nation rulesets See osdn #43047 Signed-off-by: Marko Lindqvist --- data/nation/yakut.ruleset | 22 ++++++++++++---------- data/nation/yemeni.ruleset | 23 ++++++++++++----------- data/nation/yucatecan.ruleset | 23 ++++++++++++----------- data/nation/yugoslav.ruleset | 16 ++++++++-------- 4 files changed, 44 insertions(+), 40 deletions(-) diff --git a/data/nation/yakut.ruleset b/data/nation/yakut.ruleset index 9d2be9bd7f..3204d90c10 100644 --- a/data/nation/yakut.ruleset +++ b/data/nation/yakut.ruleset @@ -1,9 +1,9 @@ [nation_yakut] -name=_("Yakut") -plural=_("?plural:Yakuts") -groups="Asian", "Early Modern" -legend=_("Oral tradition indicates that the Yakuts - or Sakha as they call\ +name = _("Yakut") +plural = _("?plural:Yakuts") +groups = "Asian", "Early Modern" +legend = _("Oral tradition indicates that the Yakuts - or Sakha as they call\ themselves - migrated north from the Central Asian steppes to the shores\ of Lake Baikal in the 10th century CE. They intermarried with the native\ population and established a nation along the Lena river, having\ @@ -25,20 +25,22 @@ leaders = { "Tuyaara", "Female" ; Туйаара "Kùnnèy", "Female" ; Күннэй } + ruler_titles = { "government", "male_title", "female_title" "Fundamentalism", _("Shaman %s"), _("?female:Shaman %s") } -flag="sakha" + +flag = "sakha" flag_alt = "-" style = "European" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -conflicts_with="Russian" -civilwar_nations="Siberian", "Tuvan" +conflicts_with = "Russian" +civilwar_nations = "Siberian", "Tuvan" cities = ; Latinized Sakha - Russian-based English name - Cyrillic Sakha diff --git a/data/nation/yemeni.ruleset b/data/nation/yemeni.ruleset index 8f346d5b50..e046690bef 100644 --- a/data/nation/yemeni.ruleset +++ b/data/nation/yemeni.ruleset @@ -1,9 +1,9 @@ [nation_yemeni] -name=_("Yemeni") -plural=_("?plural:Yemenis") -groups="Asian", "Modern" -legend=_("Yemen is the only republic on the Arabian Peninsula. Although\ +name = _("Yemeni") +plural = _("?plural:Yemenis") +groups = "Asian", "Modern" +legend = _("Yemen is the only republic on the Arabian Peninsula. Although\ it was the site of several ancient civilizations, Yemen only exists in\ its current form since North Yemen annexed South Yemen in 1990.") @@ -18,18 +18,19 @@ leaders = { } ruler_titles = { - "government", "male_title", "female_title" - "Communism", _("General Secretary %s"), _("?female:General Secretary %s") - "Fundamentalism", _("Imam %s"), _("Imama %s") + "government", "male_title", "female_title" + "Communism", _("General Secretary %s"), _("?female:General Secretary %s") + "Fundamentalism", _("Imam %s"), _("Imama %s") } -flag="yemen" +flag = "yemen" flag_alt = "-" style = "Babylonian" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" + conflicts_with = "himyarite", "iraqi", "syrian", "south yemeni" ;latter three similar flags civilwar_nations = "south yemeni" diff --git a/data/nation/yucatecan.ruleset b/data/nation/yucatecan.ruleset index 7f1c333332..b23cbfbc2d 100644 --- a/data/nation/yucatecan.ruleset +++ b/data/nation/yucatecan.ruleset @@ -1,9 +1,9 @@ [nation_yucatecan] -name=_("Yucatecan") -plural=_("?plural:Yucatecans") -groups="American" -legend=_("Yucatán is a peninsula of Mexico, famous for its Maya heritage\ +name = _("Yucatecan") +plural = _("?plural:Yucatecans") +groups = "American" +legend = _("Yucatán is a peninsula of Mexico, famous for its Maya heritage\ and its white beaches. Its name is often claimed to mean \"we don't\ understand you\" in Yucatec Maya. On two occasions in the 19th century\ Yucatán declared independence from Mexico. Currently it is divided into\ @@ -22,19 +22,20 @@ leaders = { "Carlos Sansores Pérez", "Male" "Ivonne Ortega", "Female" } + ruler_titles = { "government", "male_title", "female_title" "Despotism", _("Captain General %s"), _("?female:Captain General %s") "Fundamentalism", _("Bishop %s"), _("Mother Superior %s") } -flag="yucatan" +flag = "yucatan" flag_alt = "-" style = "Classical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" civilwar_nations = "mayan" @@ -50,7 +51,7 @@ cities = "Cancún (ocean, jungle)", "Ciudad del Carmen (ocean, swamp)", "Champotón (ocean)", - "San Miguel (ocean)", ;Cozumel + "San Miguel (ocean)", ; Cozumel "Playa del Carmen (ocean)", "Bacalar (lake, jungle)", "Celestún (swamp)", @@ -67,7 +68,7 @@ cities = "Peto (jungle)", "Xpujil (jungle)", "Umán", - "Felipe Carrillo Puerto", ;Chan Santa Cruz + "Felipe Carrillo Puerto", ; Chan Santa Cruz "Candelaria (river, swamp)", "Isla Mujeres (ocean)", "Dzemul", @@ -87,7 +88,7 @@ cities = "Dzitbalché", "Bolonchén", "Zoh Laguna", - "Punta Allen (ocean)", ;Javier Rojo Gómez + "Punta Allen (ocean)", ; Javier Rojo Gómez "Tecoh", "Komchén", "Seybaplaya (ocean)", diff --git a/data/nation/yugoslav.ruleset b/data/nation/yugoslav.ruleset index 8a7f0c91a3..624846d7e9 100644 --- a/data/nation/yugoslav.ruleset +++ b/data/nation/yugoslav.ruleset @@ -1,9 +1,9 @@ [nation_yugoslav] -name=_("Yugoslav") -plural=_("?plural:Yugoslavs") -groups="European" -legend=_("Yugoslavia was a state consisting of the Slavic nations of the\ +name = _("Yugoslav") +plural = _("?plural:Yugoslavs") +groups = "European" +legend = _("Yugoslavia was a state consisting of the Slavic nations of the\ western Balkans. It was a kingdom until 1941, when it was occupied by\ the Axis powers. After a national liberation war the communists threw\ out the occupants and continued to rule until the 1980s. The 1990s saw\ @@ -17,13 +17,13 @@ leaders = { "Josip Broz Tito", "Male" } -flag="yugoslavia" +flag = "yugoslavia" flag_alt = "-" style = "European" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" conflicts_with = "slovenian", "croatian", "bosnian-herzegovinian", "serbian", "montenegrin", "macedonian", "kosovar" -- 2.33.0