From 98991ece9aab6e29f1d3f6b88af3b82463fc55cd Mon Sep 17 00:00:00 2001 From: Joe R Date: Sun, 25 Feb 2024 22:53:05 -0500 Subject: [PATCH 10/20] Add Tuvaluan nation See osdn #48969 --- data/default/nationlist.ruleset | 1 + data/flags/Makefile.am | 5 ++ data/flags/tuvalu-large.png | Bin 0 -> 1374 bytes data/flags/tuvalu-shield-large.png | Bin 0 -> 729 bytes data/flags/tuvalu-shield.png | Bin 0 -> 523 bytes data/flags/tuvalu.png | Bin 0 -> 758 bytes data/flags/tuvalu.svg | 109 +++++++++++++++++++++++++++++ data/misc/flags-large.spec | 1 + data/misc/flags.spec | 1 + data/misc/shields-large.spec | 1 + data/misc/shields.spec | 1 + data/nation/Makefile.am | 1 + data/nation/kiribati.ruleset | 2 +- data/nation/marshallese.ruleset | 2 +- data/nation/tuvaluan.ruleset | 61 ++++++++++++++++ meson.build | 2 + translations/nations/POTFILES.in | 1 + 17 files changed, 186 insertions(+), 2 deletions(-) create mode 100644 data/flags/tuvalu-large.png create mode 100644 data/flags/tuvalu-shield-large.png create mode 100644 data/flags/tuvalu-shield.png create mode 100644 data/flags/tuvalu.png create mode 100644 data/flags/tuvalu.svg create mode 100644 data/nation/tuvaluan.ruleset diff --git a/data/default/nationlist.ruleset b/data/default/nationlist.ruleset index a5ac1b7391..f287d7ee0c 100644 --- a/data/default/nationlist.ruleset +++ b/data/default/nationlist.ruleset @@ -639,6 +639,7 @@ default_nationset = "all" *include "nation/turkmen.ruleset" *include "nation/turk.ruleset" *include "nation/turkishcypriot.ruleset" +*include "nation/tuvaluan.ruleset" *include "nation/tuvan.ruleset" *include "nation/tyrolian.ruleset" *include "nation/ugandan.ruleset" diff --git a/data/flags/Makefile.am b/data/flags/Makefile.am index 181453d1f6..738f1aa7b2 100644 --- a/data/flags/Makefile.am +++ b/data/flags/Makefile.am @@ -531,6 +531,7 @@ flag_files = \ tupi.png \ turkey.png \ turkmenistan.png \ + tuvalu.png \ tyrol.png \ uae.png \ uganda.png \ @@ -1107,6 +1108,7 @@ flag_files = \ tupi-large.png \ turkey-large.png \ turkmenistan-large.png \ + tuvalu-large.png \ tyrol-large.png \ uae-large.png \ uganda-large.png \ @@ -1685,6 +1687,7 @@ shield_files = \ tupi-shield.png \ turkey-shield.png \ turkmenistan-shield.png \ + tuvalu-shield.png \ tyrol-shield.png \ uae-shield.png \ uganda-shield.png \ @@ -2261,6 +2264,7 @@ shield_files = \ tupi-shield-large.png \ turkey-shield-large.png \ turkmenistan-shield-large.png \ + tuvalu-shield-large.png \ tyrol-shield-large.png \ uae-shield-large.png \ uganda-shield-large.png \ @@ -2839,6 +2843,7 @@ svg_files = \ tupi.svg \ turkey.svg \ turkmenistan.svg \ + tuvalu.svg \ tyrol.svg \ uae.svg \ uganda.svg \ diff --git a/data/flags/tuvalu-large.png b/data/flags/tuvalu-large.png new file mode 100644 index 0000000000000000000000000000000000000000..a93e757ab093298b1955530bc3241d8e505a0ede GIT binary patch literal 1374 zcmV-k1)=(hP)Px#1ZP1_K>z@;j|==^1poj7mrzVpMF0Q*+e}RQ<>lVq>p?+{003q{K#b#Za?Ah# zIy#Bekek#fDDJAN0G!?co8H!mk<%q5{r&!skh}^CY?pzk+DS^?RaN`y>f77t0G!_m z32Tmfr`t|W{{H@%nZgVVZ2+F&0G!|ioZizTBkP%&NlB7NN00)X+zg)6Xt0A8pvwfE z+f`MWTU(s7ox0y-W&i*G?(X&I(%Il;WxKo9U0t34o!@)2bN8=PjsTkF0G{Cho8kbQ;|ZSE0h{Cro!AAP+cTxIEu^;>pvwT8;p&)}+C)SK zo!Gg+J?+U5E~U0tSDIa2ow2dd?yRifWMu2r+U)G~?x?8XW@f&r!CzmW44%{=qQW7f z!3Uk#9ihdDwrH`wL^`LeIXQ^f*y#N3?%GF3pNOo8h`7@vB-e$F0Gr?wpv}+2DagVw z4xiEho8%6i*&d@f`|0W3R8-nXNS=tTG^Vk%zd^3OMlYqc+S=*+ z>+9WDSJ_8Mn1ZPb3vH5;zSWA8Afd<{pv%{Zk=;{M8KBGpo8thT-~pW75ueZooZSVT z**>VKtG!82tD1ncZ^FPeHKwrzoZSJO;Ayaf|IYx7w`3Qf%B8zb>&g*gu80es)Mu}S zETp&soZT;_wnM3-Jg2J?pU_LHo?ESt`ppHozdZq);VPrNlDA)Qv3?Mr(Ilh4D5Jau zo!SDM z2A$alo!kPQ+yI>2AxZ_-00009a7bBm000ic000ic0Tn1pfB*mjP)S5VR5(v#APq1w zF|)7&0UJ99I~$0>$;HjX%g2iefQtDAcm#!n;fjStM8(7E#Wy3#ix!27Ebup)4OCxHBZ3oD}{10|K3ZY@p(xprGIo!O*a9 zpa&xiBBP>XfFdvtO2)>;CnP2%r+_pA6|=IYrlm(^WP*b(OOPi!2N*T5pv%q6FDNW3 zE^z>HfQqHEO3S!&%3+aGQCU@81CJE%+PeA%Z%J=32dKEQskx=K4IbTX?Shd49bici zDC+EThB85lLj}6g5>iEF4^$cm6cr&f&~Tt)2pbzvlte^LQE#6lP;q}huL1~|NjgfJ zAt#9m6DJiyR7*-uo-%b>EIyNqrq7sJ1Y#)8n(Z`a?mUpmU4ewKt5z#c08-v-)~?fXF7n3jLCN*t=yu+)aT6%E2`C1F&0Dr6Y}>vAWCL!+ zAh+)9+vSwFdykbOG+E(Ntf;hC(q`ZO0|yTsK5`Ti**FzXIClKR$y2A#oaJ>mcOE&q zp)3^Oec|Gz%e?ci_$}kjg+@0J;85&z_1blBNy!_C=mr5CiY0IM-MS6-B{IO}LEbw+ ghz@{?i3SV|0OTO7kF6%I_5c6?07*qoM6N<$f-#(ih5!Hn literal 0 HcmV?d00001 diff --git a/data/flags/tuvalu-shield-large.png b/data/flags/tuvalu-shield-large.png new file mode 100644 index 0000000000000000000000000000000000000000..492b6c19f32b8dfdb5cf1ffb04e1fb28d89f4c71 GIT binary patch literal 729 zcmV;~0w(>5P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TY^g( z5X7YlT2TukNhU)Bf!3smO^l&7hNwA{^ZmKYT_i~z{J`D4-}}Ayz2EQ4djbH3JpTn% z%#W2zcF2+U@a2XPi+zT}(Tcn0I&i?0#uLv81e85|Mm`u!+|!;sTyY#$xv z83V6(4C1_NM2#9i+GJu89yTO(CIH`&88xa0k(qRHvGq_0`Gr>~Mk8=NdW;|OI8ti` zq~um8ih{QrB5pYP_&x*77)9d8Vamxpo4Aue+1dh8k}wu{iiE8PJ3lR<{lg+IUw?yV zu^e4ii(#2Q1R2{* z-(eMgv6!{F@AN%f=`F(cErX!kk6ivIOS+wQoIKct)sL&V<``siwTO^VL5Wm}sctTY zIlZ#Y(0qbWQm+n|&4?=DZEVnXC;1h(M+{6-fC0$f2qK4)*jGl z$y9~tOK-C&B5brRBC^Z!6?5G)*xwR|g|uwMC|18ZdN|D)-0um%+qTH6+9Px#1ZP1_K>z@;j|==^1poj532;bRa{vGf5C8xR5CN?ty>$Qp0ia1lK~y+Tm66{o zWMLS`KWC1e%(OeiPUA}r!TZB3h+W;c_LG-JnNd@k$7N_MknSJL_|LdppU zRRM1!hkQtU7gK~Qho&Xi*f^nOavNIP*&Is{k7%bd`!gtVs*sEu6U$QCVd zraibJ?Zo-xlzOf_W`L;9a4A(6&cSuO8-uRqwP<76VbpL!s+p^h5lN6CDAGCKgj2-q zOZv;#87T9%=_51xNL53A-tnrh9Hd{f{&84rznbBm(C02eo}j=3ZUOH`iKhi!>hS;o N002ovPDHLkV1h)m=H~za literal 0 HcmV?d00001 diff --git a/data/flags/tuvalu.png b/data/flags/tuvalu.png new file mode 100644 index 0000000000000000000000000000000000000000..9616960ddc95a5fe5dd296b731169e428b5a05ad GIT binary patch literal 758 zcmVPx#1ZP1_K>z@;j|==^1poj6O;Ai!MF0Q*;cIK?*WOiCnE(K0U|^un4-eOVgcTKY zwQ-2yYHFFEzyO@y0G!`mPL0`PX6~x0s;bOiPK?-LWjbi90Gr_joZtYP;I(pzm6gBQ ze}yPoqba1imAG6Tp~dQ#m(B?Z-BneeilzXYjTp~uVs0I*hQ3!c>wpU?!H z-2t290i50eo8(`vi@v})4W82goZy;?ui0W|8KKCKw_zotz8<2)N~)d(o!Yf?iXWoG zp1M>lq_+T@oY)Bq*f2Afm%7q__c`-Ey*eYp{V0p42F#ya}Gy2Atmjo8@h=e`l|R0-NK8wQ2#I z;R~JF7@^4^qQa=WOe&^@&z^=p^yT)Gr|3{Y#88ZRL_XEt%Gq<~U%s+{-9M3n!n|WRkr55xXj6f5uvLg7J zRAr?t5C~~cf$~C!#CFEhq6AI40s`#r=>_eh=^voK!N3sKhK4hsBlQ`r;n?`Zq#k`% z&uUZCGlstvFDSA)8&50pT%tOc%;)k8i%WE8j+I2ZGsni3>CU8Ju4ooUzRGH{c3(v< z`ihKI0;6pVO6$7lSsfk%;kES*&`rm6UB`8{;JXcNcXD|f;oZIcgTwGya%6f0myS

+ + + + + + + + + + + + + + + + + + + + + diff --git a/data/misc/flags-large.spec b/data/misc/flags-large.spec index 07cb84fa16..87d2565cc9 100644 --- a/data/misc/flags-large.spec +++ b/data/misc/flags-large.spec @@ -540,6 +540,7 @@ sprites = "f.tupi", "flags/tupi-large" "f.turkey", "flags/turkey-large" "f.turkmenistan", "flags/turkmenistan-large" + "f.tuvalu", "flags/tuvalu-large" "f.tyrol", "flags/tyrol-large" "f.uae", "flags/uae-large" "f.uganda", "flags/uganda-large" diff --git a/data/misc/flags.spec b/data/misc/flags.spec index 3274c22da5..14e034bdef 100644 --- a/data/misc/flags.spec +++ b/data/misc/flags.spec @@ -1118,6 +1118,7 @@ sprites = "f.tupi", "flags/tupi" "f.turkey", "flags/turkey" "f.turkmenistan", "flags/turkmenistan" + "f.tuvalu", "flags/tuvalu" "f.tyrol", "flags/tyrol" "f.uae", "flags/uae" "f.uganda", "flags/uganda" diff --git a/data/misc/shields-large.spec b/data/misc/shields-large.spec index 494664b58f..37e6f0c090 100644 --- a/data/misc/shields-large.spec +++ b/data/misc/shields-large.spec @@ -540,6 +540,7 @@ sprites = "f.shield.tupi", "flags/tupi-shield-large" "f.shield.turkey", "flags/turkey-shield-large" "f.shield.turkmenistan", "flags/turkmenistan-shield-large" + "f.shield.tuvalu", "flags/tuvalu-shield-large" "f.shield.tyrol", "flags/tyrol-shield-large" "f.shield.uae", "flags/uae-shield-large" "f.shield.uganda", "flags/uganda-shield-large" diff --git a/data/misc/shields.spec b/data/misc/shields.spec index 1479a756b8..52a4dd41bd 100644 --- a/data/misc/shields.spec +++ b/data/misc/shields.spec @@ -539,6 +539,7 @@ sprites = "f.shield.tupi", "flags/tupi-shield" "f.shield.turkey", "flags/turkey-shield" "f.shield.turkmenistan", "flags/turkmenistan-shield" + "f.shield.tuvalu", "flags/tuvalu-shield" "f.shield.tyrol", "flags/tyrol-shield" "f.shield.uae", "flags/uae-shield" "f.shield.uganda", "flags/uganda-shield" diff --git a/data/nation/Makefile.am b/data/nation/Makefile.am index f229db31a3..664c948f6f 100644 --- a/data/nation/Makefile.am +++ b/data/nation/Makefile.am @@ -525,6 +525,7 @@ pkgdata_DATA = \ turkmen.ruleset \ turk.ruleset \ turkishcypriot.ruleset \ + tuvaluan.ruleset \ tuvan.ruleset \ tyrolian.ruleset \ ugandan.ruleset \ diff --git a/data/nation/kiribati.ruleset b/data/nation/kiribati.ruleset index b51e701eb2..46313e5222 100644 --- a/data/nation/kiribati.ruleset +++ b/data/nation/kiribati.ruleset @@ -28,7 +28,7 @@ init_techs = "" init_buildings = "" init_units = "" -civilwar_nations = "Papuan", "Micronesian" +civilwar_nations = "Papuan", "Micronesian", "Tuvaluan" cities = "Tarawa", diff --git a/data/nation/marshallese.ruleset b/data/nation/marshallese.ruleset index d44a2ac3a7..2add0bb4f8 100644 --- a/data/nation/marshallese.ruleset +++ b/data/nation/marshallese.ruleset @@ -32,7 +32,7 @@ init_techs = "" init_buildings = "" init_units = "" -civilwar_nations = "micronesian", "kiribati" +civilwar_nations = "Micronesian", "Kiribati", "Tuvaluan" cities = "Majuro", diff --git a/data/nation/tuvaluan.ruleset b/data/nation/tuvaluan.ruleset new file mode 100644 index 0000000000..fa9efa7e1f --- /dev/null +++ b/data/nation/tuvaluan.ruleset @@ -0,0 +1,61 @@ +[nation_tuvaluan] + +name = _("Tuvaluan") +plural = _("?plural:I-Tuvaluan") +groups = "Oceanian", "Modern" +legend = _("The Ellice Islands are an island chain in the Pacific Ocean.\ + Inhabited by Micronesians since prehistoric times, they were united\ + under a common chiefdom in the late\ + 19th century. Together with the Gilbert Islands they were annexed by the\ + British in 1892 who established the colony of Gilbert and Ellice\ + Islands. The islands became independent in 1978, under the name Tuvalu,\ + which means 'Eight standing together', referencing the eight inhabited\ + islands.") + +leaders = { + "name", "sex" + "Toaripi Lauti", "Male" + "Tomasi Puapua", "Male" + "Fiatau Penitala Teo", "Male" + "Tofiga Vaevalu Falani", "Male" + "Teniku Talesi", "Female" +} + +flag = "tuvalu" +flag_alt = "-" +style = "Tropical" + +init_techs = "" +init_buildings = "" +init_units = "" + +civilwar_nations = "Kiribati", "Papuan", "Micronesian" + +cities = + "Funafuti", + "Fongafale", + "Savave", + "Senala", + "Fakaifou", + "Alapi", + "Tekavatoetoe", + "Vaiaku", + "Lofeagai", + "Teone", + "Motufoua", + "Teava", + "Aulotu", + "Fenua Tapu", + "Tumaseu", + "Pepesala", + "Tokelau", + "Tonga", + "Potufale", + "Tanrake", + "Kulia", + "Asau", + "Haumaefa", + "Angafoulua", + "Lolua", + "Fangaua", + "Niulakita" diff --git a/meson.build b/meson.build index 5a12c416cd..109800f35b 100644 --- a/meson.build +++ b/meson.build @@ -2051,6 +2051,7 @@ nations = [ 'turkishcypriot', 'turkmen', 'turk', + 'tuvaluan', 'tuvan', 'tyrolian', 'ugandan', @@ -2847,6 +2848,7 @@ flags = [ 'tupi', 'turkey', 'turkmenistan', + 'tuvalu', 'tyrol', 'uae', 'uganda', diff --git a/translations/nations/POTFILES.in b/translations/nations/POTFILES.in index a9b00158b2..ac955422da 100644 --- a/translations/nations/POTFILES.in +++ b/translations/nations/POTFILES.in @@ -468,6 +468,7 @@ data/nation/tuareg.ruleset data/nation/tunisian.ruleset data/nation/turkishcypriot.ruleset data/nation/turkmen.ruleset +data/nation/tuvaluan.ruleset data/nation/tuvan.ruleset data/nation/tyrolian.ruleset data/nation/ugandan.ruleset -- 2.43.0