From cffe43f11ffd24d645c615687598de7a20d4fb63 Mon Sep 17 00:00:00 2001 From: Joe R Date: Wed, 4 Sep 2024 20:30:53 -0400 Subject: [PATCH] Add Conch Republic nation --- data/default/nationlist.ruleset | 1 + data/flags/Makefile.am | 5 + data/flags/conch-large.png | Bin 0 -> 1548 bytes data/flags/conch-shield-large.png | Bin 0 -> 625 bytes data/flags/conch-shield.png | Bin 0 -> 461 bytes data/flags/conch.png | Bin 0 -> 669 bytes data/flags/conch.svg | 1873 +++++++++++++++++++++++++++++ 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/conch.ruleset | 58 + meson.build | 2 + translations/nations/POTFILES.in | 1 + 15 files changed, 1945 insertions(+) create mode 100644 data/flags/conch-large.png create mode 100644 data/flags/conch-shield-large.png create mode 100644 data/flags/conch-shield.png create mode 100644 data/flags/conch.png create mode 100644 data/flags/conch.svg create mode 100644 data/nation/conch.ruleset diff --git a/data/default/nationlist.ruleset b/data/default/nationlist.ruleset index 043f4902ca..c413b4b161 100644 --- a/data/default/nationlist.ruleset +++ b/data/default/nationlist.ruleset @@ -242,6 +242,7 @@ default_nationset = "all" *include "nation/colombian.ruleset" *include "nation/comanche.ruleset" *include "nation/comorian.ruleset" +*include "nation/conch.ruleset" *include "nation/confederate.ruleset" *include "nation/congolese.ruleset" *include "nation/congolesebrazzaville.ruleset" diff --git a/data/flags/Makefile.am b/data/flags/Makefile.am index 5a9e88e0e9..c9abf6b22c 100644 --- a/data/flags/Makefile.am +++ b/data/flags/Makefile.am @@ -121,6 +121,7 @@ flag_files = \ colombia.png \ comanche.png \ comoros.png \ + conch.png \ constantine.png \ cornwall.png \ corsica.png \ @@ -702,6 +703,7 @@ flag_files = \ colombia-large.png \ comanche-large.png \ comoros-large.png \ + conch-large.png \ constantine-large.png \ cornwall-large.png \ corsica-large.png \ @@ -1285,6 +1287,7 @@ shield_files = \ colombia-shield.png \ comanche-shield.png \ comoros-shield.png \ + conch-shield.png \ constantine-shield.png \ cornwall-shield.png \ corsica-shield.png \ @@ -1866,6 +1869,7 @@ shield_files = \ colombia-shield-large.png \ comanche-shield-large.png \ comoros-shield-large.png \ + conch-shield-large.png \ constantine-shield-large.png \ cornwall-shield-large.png \ corsica-shield-large.png \ @@ -2449,6 +2453,7 @@ svg_files = \ colombia.svg \ comanche.svg \ comoros.svg \ + conch.svg \ constantine.svg \ cornwall.svg \ corsica.svg \ diff --git a/data/flags/conch-large.png b/data/flags/conch-large.png new file mode 100644 index 0000000000000000000000000000000000000000..56e3ab38f34c224db38fdb287046f47cbbe7ded4 GIT binary patch literal 1548 zcmV+n2J`ueP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGUHUIzsHUY6(V_^UQ1))hqK~z{r)tA|C z6IT?*KdjEv12E8y!G7cN#g`NCJCyVpEUB^nep6j&Ybg|J0buX+I9_D z!HpkhNB?(TT!&cL-8Jkw!4ld&N7>=*Xp4x&B2-w7SdJyo+E@vXH-sza58=rE8k89| zXsortpjG1JAt%39A{JvMkwPk+7VfY`e2=##m`$oxE4a8*B%<1Gf~8c0j@CLjt1Woc zKaTUK_tEiEDh?4GHX|~b45ShZdhTR1 zre=fq=<*4SyZx9CEaJ->-Ds{a$KZ%Zm}wKJ=!yzHeb|LSD2le`DyWol^gW+K|4TO) z&$jI#mr0>f$1 z!e|u}5Gp zKTr9-z8{%&%fjAz!jTyM8us9R?+{O&VidKtAMf;Gbjl};@>5wFK~qIg7y;uxE$S>` zVFY||bfn-!tcbhLwqoADh{#f$7xuL)Cxx@GvLjnt#kZ(Hhie`N)e0hU85FVm;=FtDz#RAd#w)Bn~x1(Y_~!6K!!QOVVUrA`+~|JQbkRJcpyz zFEKik!uV`bxKkDnS)#XC4i^&4^62upHVjfRFpeFl#S9f7dtIw6C!{=T%zs;}{V=HG zXmKWRwbKJh%7u7n8CNexG32Ja%Or51$`6?|gP)$%BD7Q@+=b3jQ<2boaY~I<*!;P3 z{R;`sTMMi)boUMmBk*=Am9S@9Pb4P8m{*6F9s}egrmMq`pKptxvvr}q=~Mjr`}?@i z9z!xM!V9+%w+9^bx|x%%!MbD4GE12cdoPVv#nWeGf*a)+(CVP;? zrYLGMG}Kd+U2-%x)MIpF6#A4M7FCprFo`r-zC@IPlKeTB2Tz7E@Hf4N9Ik)cjrd9u zwlbY?WQ}d*Fmr+9d**Pa*^R}RoHq)qZV7sI8tn}M+`6Yh|HCm@9OM$ZQQUc~f}R}Y zaIF_ETL@LA2;4z65~R2x5O#5TA7U@!Nwo zl-oMUzP`bC-AeQgsqk>v0)Ipy{9~JJ*6AASY&`jMDU?@xC~B3)2*&0#`0OhOCc{(s zbNVK}xT(XV=Nee(fl?cCce@l6{L8(8SN!n9OYMB&k_&6gOwf%UC!S7}QMF6(Y+Q}I zPj!e=H-0f=M9+{FXZN{rX7Bo3-42^4(FVT$p=Vw3vAk@n@#5}a1v!D3i)96N|G6EL zJ`KNSI-uq*^8KSa1S2IdlKt(3qD9Bnw|29E7U*W45;CcTe@$4ag0&hwB1s2~hEl#3 zVAN7e9+);EyevnhDGHWV0U>u;tBxo0r`2mw$cJ;$Ym_+9=s-iQm4875XvKEvtrqNa z*=hNyLuI*`vuqq_*?k~D7e(Pr%W;mYSVQMi%4|sEZ0~$ zr7Jkj&B#5(Cb}mn-N8B7H#XVv%_+Hc(_a zNkU@PLN?u;z!>+?cvp4Dh>$opLE}V+xL$3aM#msup#NlBdy;{aPf3tp@PFz7hIzeD z&H&BjEbxdd2GXV=%qa8Ni3iBo=jq}Yq7hu$-_Cc)fX5~KR9xy5-^NX+?yY_knD*~~ z{f5h8EKQS>?%N*SsPspq=Cyuthu`$ukH1>g{&TpHv~Yt+=dnjcPJV5{b6hWNGCiW2 zHX*e*<#ULLR_pb?B+t;(0V@}6jo?j;&2|t@k2-S8#rkesy@8AIruUhTPnMX)zc?+* z=9uuT`Bc^ByKhe_I+j^5&FR`zxNnc7SLi_lhIL}ehcp!LzWZ?CsZ8Oqy}FZY9p-&B k_-%fpa*5O2BeKc<8tbJZJ|9^COfC!zp00i_>zopr0BCX;RsaA1 literal 0 HcmV?d00001 diff --git a/data/flags/conch-shield.png b/data/flags/conch-shield.png new file mode 100644 index 0000000000000000000000000000000000000000..39606f7492c321addefe2b525fc3edacd0b67719 GIT binary patch literal 461 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1o4DbnY1=0)}8BAK4d?p1x8B-G~7v{FCEa_SsQ8XvAcy49i1`*2==fnx~ z*BuMan<;5qE@f9PXja6mot4?ROv$xI#56(FES^Ox%|F_M-zX_K*3CbAx?O<3m2W^& zx`T7DZ)~#Tx@i-AB0YVhJiWrb9D@AL?>6^}@DesjNUU1OrkfKO;~pCCs_qyO66fX+ z*Q@Q*$gZ0TbQIIQyY)cIxFpCg_&>>jp>W>bKA?8a0*}aIAZ-f5j53d%cz}#LPZ!4! ziSXDnoqSCO0xTEwTn7*=E?g_l{|G!0gbTZFmvzyob!oE7!3tBZl%y{Fs=jEA# zcly&DC0hS^Ni3f7VA*}6Mb~HRzO7T)YcG)HWmt3OQ*dAy3y0>~^V7BMTDM!Nn{1enFjcTxB|r)G%}d9GWkpjB8uktWK2z{T$tOkvZQNmdi~PK;<>S9^DFx{ zh**|5Cr+5Z?pRRn%;3D4lD6eicIBJ~xq@az%-UJjQQeu1%d8^1#LePE3uY-eR|n?I zP;#viF-?%Ph!Zu77qc$qG0JDrO7oBQ;5SP0i}DDLb&DvTG>;wyh8t&rM`SUOHUnYCjZw*oK*mQ;7sn8d;A8~`i9%+j z)R{9PBW~WXw6KiWv7@p=F^MD6u8z@BF;P%3&@iyDjyjCn3z)9aA{Z7FSedGhvpsuHDga> zDdwAM%hH~SO$)nb*3*;Z;5cK=4Bf@D9xL}YFP^-)TYJLOV<%p`YfRd-Z~64?{p;t~ zJ0u9WG)QVm^E}jQYiVnBcX6^%V7M+VdiI3GVj%%(@q8{p21b?1l2@-tJQjK+At}7D zW=BrYrr9$bytI;~PQ-IGtPvLu(CC&nFkoQFtdZRBy{;w&=y?WDS3j3^P6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/misc/flags-large.spec b/data/misc/flags-large.spec index 38d020e0cc..93de1be616 100644 --- a/data/misc/flags-large.spec +++ b/data/misc/flags-large.spec @@ -130,6 +130,7 @@ sprites = "f.colombia", "flags/colombia-large" "f.comanche", "flags/comanche-large" "f.comoros", "flags/comoros-large" + "f.conch", "flags/conch-large" ; "f.constantine", "flags/constantine-large" ; alt. Byzantine "f.cornwall", "flags/cornwall-large" "f.corsica", "flags/corsica-large" diff --git a/data/misc/flags.spec b/data/misc/flags.spec index 167aa65ddd..a31d1cbf10 100644 --- a/data/misc/flags.spec +++ b/data/misc/flags.spec @@ -712,6 +712,7 @@ sprites = "f.colombia", "flags/colombia" "f.comanche", "flags/comanche" "f.comoros", "flags/comoros" + "f.conch", "flags/conch" ; "f.constantine", "flags/constantine" ; alt. Byzantine "f.cornwall", "flags/cornwall" "f.corsica", "flags/corsica" diff --git a/data/misc/shields-large.spec b/data/misc/shields-large.spec index 2d7f97a4e6..52726901a1 100644 --- a/data/misc/shields-large.spec +++ b/data/misc/shields-large.spec @@ -130,6 +130,7 @@ sprites = "f.shield.colombia", "flags/colombia-shield-large" "f.shield.comanche", "flags/comanche-shield-large" "f.shield.comoros", "flags/comoros-shield-large" + "f.shield.conch", "flags/conch-shield-large" ; "f.shield.constantine", "flags/constantine-shield-large" "f.shield.cornwall", "flags/cornwall-shield-large" "f.shield.corsica", "flags/corsica-shield-large" diff --git a/data/misc/shields.spec b/data/misc/shields.spec index 1688272a5f..7e1dfebf28 100644 --- a/data/misc/shields.spec +++ b/data/misc/shields.spec @@ -129,6 +129,7 @@ sprites = "f.shield.colombia", "flags/colombia-shield" "f.shield.comanche", "flags/comanche-shield" "f.shield.comoros", "flags/comoros-shield" + "f.shield.conch", "flags/conch-shield" ; "f.shield.constantine", "flags/constantine-shield" "f.shield.cornwall", "flags/cornwall-shield" "f.shield.corsica", "flags/corsica-shield" diff --git a/data/nation/Makefile.am b/data/nation/Makefile.am index 078ddce7ba..d32dcc6014 100644 --- a/data/nation/Makefile.am +++ b/data/nation/Makefile.am @@ -126,6 +126,7 @@ pkgdata_DATA = \ colombian.ruleset \ comanche.ruleset \ comorian.ruleset \ + conch.ruleset \ confederate.ruleset \ congolese.ruleset \ congolesebrazzaville.ruleset \ diff --git a/data/nation/conch.ruleset b/data/nation/conch.ruleset new file mode 100644 index 0000000000..f4a2e8afca --- /dev/null +++ b/data/nation/conch.ruleset @@ -0,0 +1,58 @@ +[nation_conch] + +name = _("Conch") +plural = _("?plural:Conch") +groups = "Imaginary" +legend = _("In 1982, as part of a protest to a US Border Patrol station\ + near Monroe County, Florida, the city of Key West declared that they were\ + seceding from the US as the Conch Republic. They then declared war against\ + the US, by breaking a loaf of stale Cuban bread over the head of a man\ + dressed as a sailor. They surrendered after one minute, and then requested\ + one billion dollars of foreign aid. The faux-secession of the Conch Republic\ + helped bring awareness to issues of the Florida Keys, and the border patrol\ + station was quietly removed. To this day, Key West sells Conch Republic\ + memorabilia to tourists, and the Conch Republic has been involved in other\ + protests by Key West and the Florida Keys.") + +leaders = { + "name", "sex" + "Dennis Wardlow", "Male" + "Peter Anderson", "Male" + "Teri Johnston", "Female" +} + +flag = "conch" +flag_alt = "-" +style = "Tropical" + +init_techs = "" +init_buildings = "" +init_units = "" + +civilwar_nations = "Floridian", "American" + +cities = + "Key West", + "Key Colony Beach", + "Marathon", + "Layton", + "Islamorada", + "Florida City", + "Key Largo", + "Big Coppitt Key", + "Big Pine Key", + "Cudjoe Key", + "Tavernier", + "Duck Key", + "North Key Largo", + "Sugarloaf Shores", + "Summerland Key", + "Matecumbe", + "Torch Key", + "Ramrod Key", + "Garden Cove", + "Jewfish", + "Conch Key", + "Sunset Key", + "Pigeon Key" + \ No newline at end of file diff --git a/meson.build b/meson.build index 34176d7ddc..0d9e0e1dd5 100644 --- a/meson.build +++ b/meson.build @@ -1703,6 +1703,7 @@ nations = [ 'colombian', 'comanche', 'comorian', + 'conch', 'confederate', 'congolesebrazzaville', 'congolese', @@ -2502,6 +2503,7 @@ flags = [ 'colombia', 'comanche', 'comoros', + 'conch', 'constantine', 'cornwall', 'corsica', diff --git a/translations/nations/POTFILES.in b/translations/nations/POTFILES.in index 7a347e5a83..66ec47c8f4 100644 --- a/translations/nations/POTFILES.in +++ b/translations/nations/POTFILES.in @@ -107,6 +107,7 @@ data/nation/circassian.ruleset data/nation/colombian.ruleset data/nation/comanche.ruleset data/nation/comorian.ruleset +data/nation/conch.ruleset data/nation/confederate.ruleset data/nation/congolesebrazzaville.ruleset data/nation/congolese.ruleset -- 2.29.2.windows.2