Merge branch 'main' into newsfix

Author: iiamlewis

CREDITS.md

@@ -44,6 +44,11 @@ Licensed under [Open Data Commons Open Database License (ODbL)](https://opendata
 Copernicus Global Digital Elevation Models distributed by OpenTopography.
 Copyright © opentopography.org. All Rights Reserved. [Terms of Use](https://opentopography.org/usageterms)
 
+### Hawaii Relief Map
+
+[USA Hawaii relief location map](https://commons.wikimedia.org/wiki/File:USA_Hawaii_relief_location_map.svg) by NordNordWest
+Licensed under [CC BY-SA 3.0 DE](https://creativecommons.org/licenses/by-sa/3.0/de/deed.en)
+
 ## Icons
 
 ### [The Noun Project](https://thenounproject.com/)

index.html

@@ -249,7 +249,7 @@
         <control-panel></control-panel>
       </div>
       <div
-        class="order-1 sm:order-none w-full sm:w-1/2 min-[1200px]:w-auto min-[1200px]:fixed min-[1200px]:right-0 min-[1200px]:bottom-0 flex flex-col sm:items-end pointer-events-none"
+        class="order-1 sm:order-none w-full sm:flex-1 min-[1200px]:w-auto min-[1200px]:fixed min-[1200px]:right-0 min-[1200px]:bottom-0 flex flex-col sm:items-end pointer-events-none"
       >
         <chat-display></chat-display>
         <events-display></events-display>
@@ -262,7 +262,9 @@
     <win-modal></win-modal>
     <game-starting-modal></game-starting-modal>
     <unit-display></unit-display>
-    <div class="flex flex-col items-end fixed top-4 right-4 z-1000 gap-2">
+    <div
+      class="flex flex-col items-end fixed top-0 right-0 min-[1200px]:top-4 min-[1200px]:right-4 z-1000 gap-2"
+    >
       <game-right-sidebar></game-right-sidebar>
       <replay-panel></replay-panel>
     </div>

map-generator/assets/maps/hawaii/image.png

@@ -0,0 +1,50 @@
+{
+  "name": "Hawaii",
+  "nations": [
+    {
+      "coordinates": [283, 281],
+      "name": "Niihau",
+      "flag": "us"
+    },
+    {
+      "coordinates": [613, 189],
+      "name": "Kauai",
+      "flag": "us"
+    },
+    {
+      "coordinates": [1424, 525],
+      "name": "Oahu",
+      "flag": "us"
+    },
+    {
+      "coordinates": [1930, 708],
+      "name": "Molokai",
+      "flag": "us"
+    },
+    {
+      "coordinates": [1977, 874],
+      "name": "Lanai",
+      "flag": "us"
+    },
+    {
+      "coordinates": [2145, 1036],
+      "name": "Kahoolawe",
+      "flag": "us"
+    },
+    {
+      "coordinates": [2287, 900],
+      "name": "Maui",
+      "flag": "us"
+    },
+    {
+      "coordinates": [2550, 1550],
+      "name": "Kona",
+      "flag": "us"
+    },
+    {
+      "coordinates": [2900, 1500],
+      "name": "Hilo",
+      "flag": "us"
+    }
+  ]
+}

map-generator/assets/maps/hawaii/info.json

@@ -69,6 +69,7 @@ var maps = []struct {
 	{Name: "amazonriver"},
 	{Name: "yenisei"},
 	{Name: "tradersdream"},
+	{Name: "hawaii"},
 	{Name: "big_plains", IsTest: true},
 	{Name: "half_land_half_ocean", IsTest: true},
 	{Name: "ocean_and_land", IsTest: true},

map-generator/main.go

@@ -1533,6 +1533,11 @@
     "continent": "Europe",
     "name": "Norway"
   },
+  {
+    "code": "1_Occitania",
+    "continent": "Europe",
+    "name": "Occitania"
+  },
   {
     "code": "Ohio",
     "continent": "North America",

resources/countries.json

@@ -328,7 +328,8 @@
     "didier": "Didier",
     "didierfrance": "Didier (France)",
     "amazonriver": "Amazon River",
-    "tradersdream": "Traders Dream"
+    "tradersdream": "Traders Dream",
+    "hawaii": "Hawaii"
   },
   "map_categories": {
     "featured": "Featured",
@@ -713,6 +714,7 @@
     "show_units": "Show Units"
   },
   "events_display": {
+    "events": "Events",
     "retreating": "retreating",
     "alliance_request_status": "{name} {status} your alliance request",
     "alliance_accepted": "accepted",
@@ -859,6 +861,13 @@
     "pattern": {
       "default": "Default"
     },
+    "try_me": "Try me!",
+    "trial_remaining": "remaining",
+    "trial_granted": "Skin trial granted!",
+    "trial_cooldown": "Only one trial per 24 hours. Please try again later.",
+    "trial_login_required": "Must be logged in to trial a skin",
+    "reward_countdown": "Reward in {seconds} seconds...",
+    "steam_wishlist_prompt": "Support OpenFront by adding it to your Steam wishlist",
     "select_skin": "Select Skin",
     "selected": "selected"
   },

resources/flags/1_Occitania.svg

@@ -0,0 +1,65 @@
+{
+  "map": {
+    "height": 2076,
+    "num_land_tiles": 408264,
+    "width": 3200
+  },
+  "map16x": {
+    "height": 519,
+    "num_land_tiles": 24703,
+    "width": 800
+  },
+  "map4x": {
+    "height": 1038,
+    "num_land_tiles": 100951,
+    "width": 1600
+  },
+  "name": "Hawaii",
+  "nations": [
+    {
+      "coordinates": [283, 281],
+      "flag": "us",
+      "name": "Niihau"
+    },
+    {
+      "coordinates": [613, 189],
+      "flag": "us",
+      "name": "Kauai"
+    },
+    {
+      "coordinates": [1424, 525],
+      "flag": "us",
+      "name": "Oahu"
+    },
+    {
+      "coordinates": [1930, 708],
+      "flag": "us",
+      "name": "Molokai"
+    },
+    {
+      "coordinates": [1977, 874],
+      "flag": "us",
+      "name": "Lanai"
+    },
+    {
+      "coordinates": [2145, 1036],
+      "flag": "us",
+      "name": "Kahoolawe"
+    },
+    {
+      "coordinates": [2287, 900],
+      "flag": "us",
+      "name": "Maui"
+    },
+    {
+      "coordinates": [2550, 1550],
+      "flag": "us",
+      "name": "Kona"
+    },
+    {
+      "coordinates": [2900, 1500],
+      "flag": "us",
+      "name": "Hilo"
+    }
+  ]
+}