From 8a510977baf1ca11642b8a6323e1f066a75969e0 Mon Sep 17 00:00:00 2001 From: crunchybbb Date: Mon, 8 Jun 2026 10:02:09 -0700 Subject: [PATCH] [Fix] Adds flags to nations on Lemnos, Hormuz, Two Lakes, other minor fixes (#4173) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit > **Before opening a PR:** discuss new features on [Discord](https://discord.gg/K9zernJB5z) first, and file bugs or small improvements as [issues](https://github.com/openfrontio/OpenFrontIO/issues/new/choose). You must be assigned to an `approved` issue — unsolicited PRs will be auto-closed. **Add approved & assigned issue number here:** Resolves #4160 ## Description: Adds missing flags to nations on Strait of Hormuz, Two Lakes, and Lemnos. Also adds a Bahrain npc ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I process any text displayed to the user through translateText() and I've added it to the en.json file - [x] I have added relevant tests to the test directory ## Please put your Discord username so you can be contacted if a bug or regression is found: DISCORD_USERNAME crunchybbbbb --- map-generator/assets/maps/lemnos/info.json | 18 +++---- .../assets/maps/straitofhormuz/info.json | 47 ++++++++++--------- map-generator/assets/maps/twolakes/info.json | 15 ++++-- resources/maps/lemnos/manifest.json | 18 +++---- resources/maps/straitofhormuz/manifest.json | 47 ++++++++++--------- resources/maps/twolakes/manifest.json | 5 ++ 6 files changed, 85 insertions(+), 65 deletions(-) diff --git a/map-generator/assets/maps/lemnos/info.json b/map-generator/assets/maps/lemnos/info.json index 50b4d5171..3aeb17bce 100644 --- a/map-generator/assets/maps/lemnos/info.json +++ b/map-generator/assets/maps/lemnos/info.json @@ -3,47 +3,47 @@ "nations": [ { "coordinates": [550, 317], - "flag": "", + "flag": "gr", "name": "Gomati" }, { "coordinates": [1371, 254], - "flag": "", + "flag": "gr", "name": "Zematas" }, { "coordinates": [1096, 605], - "flag": "", + "flag": "gr", "name": "Kotsinas" }, { "coordinates": [518, 894], - "flag": "", + "flag": "gr", "name": "Evgatis" }, { "coordinates": [250, 879], - "flag": "", + "flag": "gr", "name": "Kavala" }, { "coordinates": [814, 460], - "flag": "", + "flag": "gr", "name": "Atsiki" }, { "coordinates": [474, 542], - "flag": "", + "flag": "gr", "name": "Sardes" }, { "coordinates": [691, 755], - "flag": "", + "flag": "gr", "name": "Portianou" }, { "coordinates": [1177, 975], - "flag": "", + "flag": "gr", "name": "Pyrgos" } ] diff --git a/map-generator/assets/maps/straitofhormuz/info.json b/map-generator/assets/maps/straitofhormuz/info.json index cf3c1757a..27fdbecdc 100644 --- a/map-generator/assets/maps/straitofhormuz/info.json +++ b/map-generator/assets/maps/straitofhormuz/info.json @@ -4,102 +4,107 @@ { "coordinates": [837, 356], "name": "Hormozgan", - "flag": "" + "flag": "ir" }, { "coordinates": [717, 162], "name": "Fars", - "flag": "" + "flag": "ir" }, { "coordinates": [97, 939], "name": "Ash Sharqiyah", - "flag": "" + "flag": "sa" }, { "coordinates": [1725, 360], "name": "Sistan and Baluchestan", - "flag": "" + "flag": "ir" }, { "coordinates": [745, 1003], "name": "Abu Dhabi", - "flag": "" + "flag": "ae" }, { "coordinates": [1513, 289], "name": "Kerman", - "flag": "" + "flag": "ir" }, { "coordinates": [311, 147], "name": "Bushehr", - "flag": "" + "flag": "ir" }, { "coordinates": [1165, 1092], "name": "Al Dhahira", - "flag": "" + "flag": "om" }, { "coordinates": [1219, 959], "name": "Al Batnah North", - "flag": "" + "flag": "om" }, { "coordinates": [1114, 956], "name": "Al Buraymi", - "flag": "" + "flag": "om" }, { "coordinates": [1316, 1141], "name": "Ad Dakhliyah", - "flag": "" + "flag": "om" }, { "coordinates": [1431, 1111], "name": "Al Batnah South", - "flag": "" + "flag": "om" }, { - "coordinates": [979, 807], + "coordinates": [926, 849], "name": "Dubay", - "flag": "" + "flag": "ae" }, { "coordinates": [1615, 1134], "name": "Muscat", - "flag": "" + "flag": "om" }, { "coordinates": [1070, 774], "name": "Sharjah", - "flag": "" + "flag": "ae" }, { "coordinates": [1166, 583], "name": "Musandam", - "flag": "" + "flag": "om" }, { "coordinates": [159, 756], "name": "Ar Rayyān", - "flag": "" + "flag": "qa" }, { "coordinates": [1103, 647], "name": "Ras Al Khaymah", - "flag": "" + "flag": "ae" }, { "coordinates": [1155, 703], "name": "Fujayrah", - "flag": "" + "flag": "ae" }, { "coordinates": [216, 815], "name": "Al Wakrah", - "flag": "" + "flag": "qa" + }, + { + "coordinates": [56, 554], + "name": "Bahrain", + "flag": "bh" } ], "teamGameSpawnAreas": { diff --git a/map-generator/assets/maps/twolakes/info.json b/map-generator/assets/maps/twolakes/info.json index 5900920f5..a390dac12 100644 --- a/map-generator/assets/maps/twolakes/info.json +++ b/map-generator/assets/maps/twolakes/info.json @@ -3,23 +3,28 @@ "nations": [ { "coordinates": [1025, 750], - "name": "Galicica" + "name": "Galicica", + "flag": "mk" }, { "coordinates": [1815, 820], - "name": "Pelister" + "name": "Pelister", + "flag": "mk" }, { "coordinates": [920, 1250], - "name": "Podgorie" + "name": "Podgorie", + "flag": "al" }, { "coordinates": [100, 1410], - "name": "Valamara" + "name": "Valamara", + "flag": "al" }, { "coordinates": [1320, 1485], - "name": "Prespa" + "name": "Prespa", + "flag": "gr" } ] } diff --git a/resources/maps/lemnos/manifest.json b/resources/maps/lemnos/manifest.json index 7f28bf940..793c62d13 100644 --- a/resources/maps/lemnos/manifest.json +++ b/resources/maps/lemnos/manifest.json @@ -18,47 +18,47 @@ "nations": [ { "coordinates": [550, 317], - "flag": "", + "flag": "gr", "name": "Gomati" }, { "coordinates": [1371, 254], - "flag": "", + "flag": "gr", "name": "Zematas" }, { "coordinates": [1096, 605], - "flag": "", + "flag": "gr", "name": "Kotsinas" }, { "coordinates": [518, 894], - "flag": "", + "flag": "gr", "name": "Evgatis" }, { "coordinates": [250, 879], - "flag": "", + "flag": "gr", "name": "Kavala" }, { "coordinates": [814, 460], - "flag": "", + "flag": "gr", "name": "Atsiki" }, { "coordinates": [474, 542], - "flag": "", + "flag": "gr", "name": "Sardes" }, { "coordinates": [691, 755], - "flag": "", + "flag": "gr", "name": "Portianou" }, { "coordinates": [1177, 975], - "flag": "", + "flag": "gr", "name": "Pyrgos" } ] diff --git a/resources/maps/straitofhormuz/manifest.json b/resources/maps/straitofhormuz/manifest.json index ca01c0f65..514aaf22e 100644 --- a/resources/maps/straitofhormuz/manifest.json +++ b/resources/maps/straitofhormuz/manifest.json @@ -18,103 +18,108 @@ "nations": [ { "coordinates": [837, 356], - "flag": "", + "flag": "ir", "name": "Hormozgan" }, { "coordinates": [717, 162], - "flag": "", + "flag": "ir", "name": "Fars" }, { "coordinates": [97, 939], - "flag": "", + "flag": "sa", "name": "Ash Sharqiyah" }, { "coordinates": [1725, 360], - "flag": "", + "flag": "ir", "name": "Sistan and Baluchestan" }, { "coordinates": [745, 1003], - "flag": "", + "flag": "ae", "name": "Abu Dhabi" }, { "coordinates": [1513, 289], - "flag": "", + "flag": "ir", "name": "Kerman" }, { "coordinates": [311, 147], - "flag": "", + "flag": "ir", "name": "Bushehr" }, { "coordinates": [1165, 1092], - "flag": "", + "flag": "om", "name": "Al Dhahira" }, { "coordinates": [1219, 959], - "flag": "", + "flag": "om", "name": "Al Batnah North" }, { "coordinates": [1114, 956], - "flag": "", + "flag": "om", "name": "Al Buraymi" }, { "coordinates": [1316, 1141], - "flag": "", + "flag": "om", "name": "Ad Dakhliyah" }, { "coordinates": [1431, 1111], - "flag": "", + "flag": "om", "name": "Al Batnah South" }, { - "coordinates": [979, 807], - "flag": "", + "coordinates": [926, 849], + "flag": "ae", "name": "Dubay" }, { "coordinates": [1615, 1134], - "flag": "", + "flag": "om", "name": "Muscat" }, { "coordinates": [1070, 774], - "flag": "", + "flag": "ae", "name": "Sharjah" }, { "coordinates": [1166, 583], - "flag": "", + "flag": "om", "name": "Musandam" }, { "coordinates": [159, 756], - "flag": "", + "flag": "qa", "name": "Ar Rayyān" }, { "coordinates": [1103, 647], - "flag": "", + "flag": "ae", "name": "Ras Al Khaymah" }, { "coordinates": [1155, 703], - "flag": "", + "flag": "ae", "name": "Fujayrah" }, { "coordinates": [216, 815], - "flag": "", + "flag": "qa", "name": "Al Wakrah" + }, + { + "coordinates": [56, 554], + "flag": "bh", + "name": "Bahrain" } ], "teamGameSpawnAreas": { diff --git a/resources/maps/twolakes/manifest.json b/resources/maps/twolakes/manifest.json index f3392fc9b..86ab4c670 100644 --- a/resources/maps/twolakes/manifest.json +++ b/resources/maps/twolakes/manifest.json @@ -18,22 +18,27 @@ "nations": [ { "coordinates": [1025, 750], + "flag": "mk", "name": "Galicica" }, { "coordinates": [1815, 820], + "flag": "mk", "name": "Pelister" }, { "coordinates": [920, 1250], + "flag": "al", "name": "Podgorie" }, { "coordinates": [100, 1410], + "flag": "al", "name": "Valamara" }, { "coordinates": [1320, 1485], + "flag": "gr", "name": "Prespa" } ]