From 1c666a25ecf13ff0e00d12966241f1c8452f1fc7 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 8 May 2021 05:30:40 +0300 Subject: [PATCH 57/57] Improve coding style of d*.ruleset nation rulesets See osdn #42198 Signed-off-by: Marko Lindqvist --- data/nation/dacian.ruleset | 110 +++++++++++++++++---------------- data/nation/dahomean.ruleset | 63 +++++++++---------- data/nation/danish.ruleset | 19 +++--- data/nation/darfuri.ruleset | 21 +++---- data/nation/djiboutian.ruleset | 18 +++--- data/nation/dominican.ruleset | 18 +++--- data/nation/dominicano.ruleset | 18 +++--- data/nation/dryad.ruleset | 58 ++++++++--------- data/nation/dutch.ruleset | 28 ++++----- 9 files changed, 178 insertions(+), 175 deletions(-) diff --git a/data/nation/dacian.ruleset b/data/nation/dacian.ruleset index 48f084cefd..a3187be92d 100644 --- a/data/nation/dacian.ruleset +++ b/data/nation/dacian.ruleset @@ -1,15 +1,16 @@ [nation_dacian] -name=_("Dacian") -plural=_("?plural:Dacians") -groups="Ancient", "European" -legend=_("The Dacians were ancient tribes who lived on the left bank of\ +name = _("Dacian") +plural = _("?plural:Dacians") +groups = "Ancient", "European" +legend = _("The Dacians were ancient tribes who lived on the left bank of\ the Lower Danube in Dacia in what is now Romania. They were probably\ related to the Thracians and other Paleo-Balkanic tribes. The unification\ of Dacian tribes occurred during the reign of king Burebista. After the\ wars with Rome, they were defeated in 106 CE. Dacia became a Roman\ province and succumbed to Roman colonization. The remains of the Dacians\ mingled with East Germanic tribes and later with Slavs.") + leaders = { "name", "sex" "Kothelas", "Male" @@ -25,60 +26,61 @@ leaders = { "Skorillo", "Male" "Dekebalos", "Male" } -flag="dacian" + +flag = "dacian" flag_alt = "-" style = "Celtic" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -conflicts_with="Romanian", "Moldovan", "Transylvanian", "Ukrainian", - "Hungarian", "Bulgarian", "Serbian", "Yugoslav" +conflicts_with = "Romanian", "Moldovan", "Transylvanian", "Ukrainian", + "Hungarian", "Bulgarian", "Serbian", "Yugoslav" civilwar_nations = "Thracian", "Scythian", "Illyrian" cities = -"Sarmizegetusa", -"Argedava", -"Marcodava", -"Desudaba", -"Capidava", -"Carsidava", -"Drobeta", -"Malva", -"Petrodava", -"Napoca", -"Polonda", -"Potaissa", -"Arutela", -"Buteridava", -"Arcobadara", -"Genucla", -"Dausdava", -"Dinogetia", -"Giridava", -"Pulpudeva", -"Kuimedaba", -"Piroboridava", -"Sagadava", -"Ramidava", -"Scaidaba", -"Tapai", -"Tirista", -"Singidava", -"Zeugma", -"Zurobara", -"Utidava", -"Setidava", -"Zaldapa", -"Setidava", -"Klepidava", -"Zurobara", -"Dierna", -"Susudava", -"Nentinava", -"Itadeba", -"Buridava", -"Danedebai", -"Bregedaba", -"Germidava" + "Sarmizegetusa", + "Argedava", + "Marcodava", + "Desudaba", + "Capidava", + "Carsidava", + "Drobeta", + "Malva", + "Petrodava", + "Napoca", + "Polonda", + "Potaissa", + "Arutela", + "Buteridava", + "Arcobadara", + "Genucla", + "Dausdava", + "Dinogetia", + "Giridava", + "Pulpudeva", + "Kuimedaba", + "Piroboridava", + "Sagadava", + "Ramidava", + "Scaidaba", + "Tapai", + "Tirista", + "Singidava", + "Zeugma", + "Zurobara", + "Utidava", + "Setidava", + "Zaldapa", + "Setidava", + "Klepidava", + "Zurobara", + "Dierna", + "Susudava", + "Nentinava", + "Itadeba", + "Buridava", + "Danedebai", + "Bregedaba", + "Germidava" diff --git a/data/nation/dahomean.ruleset b/data/nation/dahomean.ruleset index f83bed1e5e..4e607fc8f1 100644 --- a/data/nation/dahomean.ruleset +++ b/data/nation/dahomean.ruleset @@ -1,16 +1,16 @@ [nation_dahomean] -name=_("Dahomean") -plural=_("?plural:Dahomeans") -groups="Early Modern", "African" -legend=_("The southern third of modern Benin was once a historic kingdom\ +name = _("Dahomean") +plural = _("?plural:Dahomeans") +groups = "Early Modern", "African" +legend = _("The southern third of modern Benin was once a historic kingdom\ known variously as Agbome (c. 1600 - c. 1700), Danhome (c. 1700 - 1730), and\ Dahomey (1730 - 1894). In 1730 the country became a tributary of the\ neighboring kingdom of Oyo. It was conquered by France in the second\ Franco-Dahomean war (1892 - 1894) and was split into Agbome and Alada. In\ the 18th and 19th centuries Dahomey was known for its fierce ahosi (gbeto)\ warriors: an army of women who were the king's official bodyguards and\ - celibate wives.") + celibate wives.") leaders = { "name", "sex" @@ -70,41 +70,42 @@ leaders = { "Hwanjile", "Female" } -flag="dahomey" +flag = "dahomey" flag_alt = "-" style = "tropical" -init_techs="" -init_buildings="" -init_units="" -civilwar_nations="ashanti", "benin" +init_techs = "" +init_buildings = "" +init_units = "" + +civilwar_nations = "ashanti", "benin" ; Oyo and Yoruban if available cities = ; Major cities in Dahomey (mentioned frequently in records) -"Abomey", ; the capital, built by Houegbadja -"Agongointo-Zoungoudo", ; city reportedly built by Dakodonou -"Allada", ; (Arrada) conquered in 1724 -"Hogbonou", ; (Porto-Novo) -"Glēxwé", ; (Ouida/Whydahh) conquered in 1727 -"Cotonou", ; a large city, also the Benin seat of government -"Cové", -"Ezame", ; (Tado) birthplace of the Gangnihessou, origin of Fon + "Abomey", ; the capital, built by Houegbadja + "Agongointo-Zoungoudo", ; city reportedly built by Dakodonou + "Allada", ; (Arrada) conquered in 1724 + "Hogbonou", ; (Porto-Novo) + "Glēxwé", ; (Ouida/Whydahh) conquered in 1727 + "Cotonou", ; a large city, also the Benin seat of government + "Cové", + "Ezame", ; (Tado) birthplace of the Gangnihessou, origin of Fon ; Other cities of pre-colonial Dahomey -"Athiémé", -"Bassila", -"Kétou", ; founded by Ede of Ife in the 12th century -"Pobé", -"Savalou", -"Ganvie", ; established in 16th or 17th centuries -"Grand-Popo", ; grew around the slave trade -"Dassa-Zoumé", ; originally Yoruban, conquered c. 1800 + "Athiémé", + "Bassila", + "Kétou", ; founded by Ede of Ife in the 12th century + "Pobé", + "Savalou", + "Ganvie", ; established in 16th or 17th centuries + "Grand-Popo", ; grew around the slave trade + "Dassa-Zoumé", ; originally Yoruban, conquered c. 1800 ; Cities within the historic borders of Dahomey (may have been part of Dahomey) -"Aplahoué", -"Comé", -"Lokossa", -"Sakété", -"Segboroué" + "Aplahoué", + "Comé", + "Lokossa", + "Sakété", + "Segboroué" diff --git a/data/nation/danish.ruleset b/data/nation/danish.ruleset index 8b0a809785..67e547f964 100644 --- a/data/nation/danish.ruleset +++ b/data/nation/danish.ruleset @@ -1,11 +1,11 @@ [nation_danish] -translation_domain="freeciv" +translation_domain = "freeciv" -name=_("Danish") -plural=_("?plural:Danes") -groups="Modern", "Medieval", "Early Modern", "European", "Core" -legend=_("The founding of the Danish kingdom is generally assigned to the\ +name = _("Danish") +plural = _("?plural:Danes") +groups = "Modern", "Medieval", "Early Modern", "European", "Core" +legend = _("The founding of the Danish kingdom is generally assigned to the\ reign of Harald Blåtand, who unified what is now Denmark between 958 CE\ and 988 CE.") @@ -34,13 +34,14 @@ ruler_titles = { "Despotism", _("Earl %s"), _("?female:Earl %s") } -flag="denmark" +flag = "denmark" flag_alt = "-" style = "European" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" + civilwar_nations = "english", "icelandic", "norwegian", "schleswig-holsteinian", "scanian", "greenlander", "faroese" diff --git a/data/nation/darfuri.ruleset b/data/nation/darfuri.ruleset index 415078a9ee..0bc61e9d24 100644 --- a/data/nation/darfuri.ruleset +++ b/data/nation/darfuri.ruleset @@ -1,10 +1,10 @@ [nation_darfuri] -name=_("Darfuri") -plural=_("?plural:Darfuris") -groups="Early Modern", "African" +name = _("Darfuri") +plural = _("?plural:Darfuris") +groups = "Early Modern", "African" -legend=_("The Sultanate of Darfur was an eastern so-called Sahelian\ +legend = _("The Sultanate of Darfur was an eastern so-called Sahelian\ state that from its location in the region just south of the\ Sahara benefited and prospered from trans-Saharan trade. The region had\ previously been dominated by the Daju and Tunjur ethnic groups, the\ @@ -28,15 +28,15 @@ ruler_titles = { "Monarchy", _("Sultan %s"), _("Sultana %s") } -flag="darfur" -flag_alt="-" +flag = "darfur" +flag_alt = "-" style = "Tropical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -civilwar_nations="Sudanese", "Chadian", "Kanem-Bornu" +civilwar_nations = "Sudanese", "Chadian", "Kanem-Bornu" cities = "Al-Fashir", @@ -62,4 +62,3 @@ cities = "Garsilla", "Habar Banga", "Kas" - diff --git a/data/nation/djiboutian.ruleset b/data/nation/djiboutian.ruleset index 4bbd77b109..0c154ea836 100644 --- a/data/nation/djiboutian.ruleset +++ b/data/nation/djiboutian.ruleset @@ -1,9 +1,9 @@ [nation_djiboutian] -name=_("Djiboutian") -plural=_("?plural:Djiboutians") -groups="Modern", "African" -legend=_("Djibouti is one of the smallest countries of Africa, located on\ +name = _("Djiboutian") +plural = _("?plural:Djiboutians") +groups = "Modern", "African" +legend = _("Djibouti is one of the smallest countries of Africa, located on\ the Gulf of Aden. It has been independent from France since 1977.\ Djibouti's main ethnic groups are the Afar and the Somalis. The country\ has one of the hottest climates in the world.") @@ -21,13 +21,14 @@ ruler_titles = { "Fundamentalism", _("Grand Mufti %s"), _("?female:Grand Mufti %s") } -flag="djibouti" +flag = "djibouti" flag_alt = "-" style = "Babylonian" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" + civilwar_nations = "eritrean", "somali" cities = @@ -60,4 +61,3 @@ cities = "Godoria", "Sagaliou", "Ras Siyyan" - diff --git a/data/nation/dominican.ruleset b/data/nation/dominican.ruleset index d3be76246d..66ec5daa68 100644 --- a/data/nation/dominican.ruleset +++ b/data/nation/dominican.ruleset @@ -1,9 +1,9 @@ [nation_dominican] -name=_("Dominican") -plural=_("?plural:Dominicans") -groups="Modern", "American" -legend=_("The island of Dominica was first sighted by Europeans, including\ +name = _("Dominican") +plural = _("?plural:Dominicans") +groups = "Modern", "American" +legend = _("The island of Dominica was first sighted by Europeans, including\ Christopher Columbus, in 1493. Legend has it that the island was named so\ since the day of its first sighting was a Sunday. Officially the\ \"Commonwealth of Dominica\", the country should not be confused with the\ @@ -22,15 +22,15 @@ ruler_titles = { "Fundamentalism", _("Bishop %s"), _("Mother Superior %s") } -flag="dominica" +flag = "dominica" flag_alt = "-" style = "Classical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -civilwar_nations="cuban" +civilwar_nations = "cuban" cities = "Roseau", diff --git a/data/nation/dominicano.ruleset b/data/nation/dominicano.ruleset index 20f26fbc78..a5207ce378 100644 --- a/data/nation/dominicano.ruleset +++ b/data/nation/dominicano.ruleset @@ -1,9 +1,9 @@ [nation_dominicano] -name=_("Dominicano") -plural=_("?plural:Dominicanos") -groups="Modern", "American" -legend=_("The Dominican Republic is located on the eastern two thirds of\ +name = _("Dominicano") +plural = _("?plural:Dominicanos") +groups = "Modern", "American" +legend = _("The Dominican Republic is located on the eastern two thirds of\ the Caribbean island of Hispaniola. Its capital - Santo Domingo - became\ the first permanent European settlement in the Americas when it was\ founded by Bartholomew Columbus in 1498.") @@ -28,15 +28,15 @@ ruler_titles = { "Monarchy", _("Viceroy %s"), _("Vicereine %s") } -flag="dominican_republic" +flag = "dominican_republic" flag_alt = "-" style = "Tropical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -civilwar_nations="Haitian", "Puerto Rican" +civilwar_nations = "Haitian", "Puerto Rican" cities = "Santo Domingo", diff --git a/data/nation/dryad.ruleset b/data/nation/dryad.ruleset index 9521ce32d4..ffd6b4a84d 100644 --- a/data/nation/dryad.ruleset +++ b/data/nation/dryad.ruleset @@ -1,9 +1,9 @@ [nation_dryad] -name=_("Dryad") -plural=_("?plural:Dryads") -groups="Imaginary" -legend=_("Dryads are creatures of Greek myth; they are a type of nymph\ +name = _("Dryad") +plural = _("?plural:Dryads") +groups = "Imaginary" +legend = _("Dryads are creatures of Greek myth; they are a type of nymph\ associated with trees. Dryads were generally considered to be shy and\ long-lived. They are usually female and are often depicted as beautiful\ young women.") @@ -24,43 +24,43 @@ leaders = { "Syke", "Female" ; Fig } -flag="dryad" +flag = "dryad" flag_alt = "-" style = "Classical" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" cities = - "Artemis's Arboretum", ; Dryads are associated with Artemis + "Artemis's Arboretum", ; Dryads are associated with Artemis ; Types of dryads - "Hamadryad", ; Nymphs bonded with a specific tree - "Napaeae", ; Nymphs who live in wooded valleys + "Hamadryad", ; Nymphs bonded with a specific tree + "Napaeae", ; Nymphs who live in wooded valleys ; Types of nymphs by tree - "Meliae", ; ash - "Empimeliad", ; apple - "Caryatids", ; walnut + "Meliae", ; ash + "Empimeliad", ; apple + "Caryatids", ; walnut ; famous trees in Europe - "Old Tjikko", ; Norway spruce in Sweden - 9,500 years old - "Fortingall Yew", ; Yew in Scotland - between 2,000 and 5,000 years old - "Caesarsboom", ; tree in Belgium - Julius Caesar tied a horse to it - "Granit Oak", ; Oak in Bulgaria - 1,650 years old - "Bartek", ; Oak in Poland - 650 years old - "Gernikako Arbola", ; Oak in Spain - "Queen Elizabeth Oak", ; Oak in England - "Kongeegen", ; Oak in Denmark - 1,200 years old - "Stoke Gabriel", ; Yew in England - "Major Oak", ; Oak in England - 800 years old - "Ivenack Oak", ; Oak in Germany - 800 years old - "Baikushev's Pine", ; Pine in Bulgaria - 1,300 years old - "Stelmužė Oak", ; Oak in Lithuania - 1,500 years old - "One Hundred Horses", ; Chestnut in Italy - 4,000 years old + "Old Tjikko", ; Norway spruce in Sweden - 9,500 years old + "Fortingall Yew", ; Yew in Scotland - between 2,000 and 5,000 years old + "Caesarsboom", ; tree in Belgium - Julius Caesar tied a horse to it + "Granit Oak", ; Oak in Bulgaria - 1,650 years old + "Bartek", ; Oak in Poland - 650 years old + "Gernikako Arbola", ; Oak in Spain + "Queen Elizabeth Oak", ; Oak in England + "Kongeegen", ; Oak in Denmark - 1,200 years old + "Stoke Gabriel", ; Yew in England + "Major Oak", ; Oak in England - 800 years old + "Ivenack Oak", ; Oak in Germany - 800 years old + "Baikushev's Pine", ; Pine in Bulgaria - 1,300 years old + "Stelmužė Oak", ; Oak in Lithuania - 1,500 years old + "One Hundred Horses", ; Chestnut in Italy - 4,000 years old "Merlin's Oak", - "Glastonbury Thorn", ; Hawthorn + "Glastonbury Thorn", ; Hawthorn "Thor's Oak", "Royal Oak", "Hippocrates Plane", diff --git a/data/nation/dutch.ruleset b/data/nation/dutch.ruleset index cdc5bfd95b..b38421851d 100644 --- a/data/nation/dutch.ruleset +++ b/data/nation/dutch.ruleset @@ -1,11 +1,11 @@ [nation_dutch] -translation_domain="freeciv" +translation_domain = "freeciv" -name=_("Dutch") -plural=_("?plural:Dutch") -groups="Early Modern", "Modern", "European", "Core" -legend=_("When the Holy Roman Emperor sentenced the entire population to\ +name = _("Dutch") +plural = _("?plural:Dutch") +groups = "Early Modern", "Modern", "European", "Core" +legend = _("When the Holy Roman Emperor sentenced the entire population to\ death, the people of the Netherlands revolted and declared themselves\ independent, forming the Union of Utrecht in 1579. The Netherlands grew\ to be a dominant maritime and economic power in the 17th century.") @@ -41,22 +41,22 @@ ruler_titles = { "Republic", _("Stadtholder %s"), _("Stadtholdress %s") } -flag="netherlands" +flag = "netherlands" flag_alt = "-" style = "European" -init_techs="" -init_buildings="" -init_units="" +init_techs = "" +init_buildings = "" +init_units = "" -conflicts_with="burgundian" -civilwar_nations= +conflicts_with = "burgundian" +civilwar_nations = ;sub-national -"frisian", + "frisian", ;separated in 1830 -"belgian", + "belgian", ;colonies -"antillean", "indonesian", "moluccan", "surinamese" + "antillean", "indonesian", "moluccan", "surinamese" cities = "Amsterdam (ocean, lake, grassland)", -- 2.30.2