Merge pull request #88 from OpenVic2Project/map-drawing

Further Map Stuff

7 files changed, 259 insertions, 4 deletions

diff --git a/game/localisation/en_GB/mapmodes.csv b/game/localisation/en_GB/mapmodes.csv
index c5b1bb0..440175f 100644
--- a/game/localisation/en_GB/mapmodes.csv
+++ b/game/localisation/en_GB/mapmodes.csv
@@ -2,4 +2,5 @@
 ,, Test Mapmodes
 mapmode_province,Province Mapmode
 mapmode_region,Region Mapmode
+mapmode_terrain,Terrain Mapmode
 mapmode_index,Index Mapmode
diff --git a/game/localisation/en_GB/menus.csv b/game/localisation/en_GB/menus.csv
index b483662..33e5c42 100644
--- a/game/localisation/en_GB/menus.csv
+++ b/game/localisation/en_GB/menus.csv
@@ -49,5 +49,17 @@ GAMELOBBY_START,Start Game
 GAMELOBBY_BACK,Back
 
 ,, Game Session Menu
-GAMESESSIONMENU_RESIGN,Resign
+GAMESESSIONMENU_SAVE,Save Game
+GAMESESSIONMENU_LOAD,Load Game
+GAMESESSIONMENU_OPTIONS,Options
+GAMESESSIONMENU_MAINMENU,Resign
+GAMESESSIONMENU_QUIT,Quit
 GAMESESSIONMENU_CLOSE,Close
+
+GAMESESSIONMENU_MAINMENU_DIALOG_TITLE,Resign Game
+GAMESESSIONMENU_MAINMENU_DIALOG_TEXT,Are you sure you want to resign and return to the main menu?
+GAMESESSIONMENU_QUIT_DIALOG_TITLE,Quit Game
+GAMESESSIONMENU_QUIT_DIALOG_TEXT,Are you sure you want to quit and return to desktop?
+
+DIALOG_OK,OK
+DIALOG_CANCEL,Cancel
diff --git a/game/localisation/en_GB/provinces.csv b/game/localisation/en_GB/provinces.csv
index 3b47955..24248a0 100644
--- a/game/localisation/en_GB/provinces.csv
+++ b/game/localisation/en_GB/provinces.csv
@@ -1,9 +1,230 @@
 
-,, Test Provinces
+,, Europe
 prov_britain_NAME,Britain
 prov_ireland_NAME,Ireland
 prov_iceland_NAME,Iceland
+prov_corsica_NAME,Corsica
+prov_sardinia_NAME,Sardinia
+prov_sicily_NAME,Sicily
+prov_malta_NAME,Malta
+prov_cyprus_NAME,Cyprus
+prov_greenland_NAME,Greenland
+prov_baleares_NAME,Balearic Islands
+prov_gotland_NAME,Gotland
+prov_crete_NAME,Crete
+prov_jan_mayen_NAME,Jan Mayen
+prov_faroes_NAME,Faroe Islands
+prov_mann_NAME,Isle of Mann
+prov_shetlands_NAME,Shetlands
+prov_orkney_NAME,Orkney
+prov_channel_islands_NAME,Channel Islands
+prov_madiera_NAME,Madiera
+prov_canarias_NAME,Canarias
+prov_sjaeland_NAME,Sjaeland
+prov_bornholm_NAME,Bornholm
+prov_bear_island_NAME,Bear Island
+prov_pantelleria_NAME,Pantelleria
+prov_iberia_NAME,Iberia
+prov_scandinavia_NAME,Scandinavia
+prov_jutland_NAME,Jutland
+prov_fyn_NAME,Fyn
+prov_hiiumaa_NAME,Hiiumaa
+prov_saaremaa_NAME,Saaremaa
+prov_italy_NAME,Italy
+prov_elba_NAME,Elba
+prov_france_NAME,France
+prov_netherlands_NAME,Netherlands
+prov_belgium_NAME,Belgium
+prov_luxembourg_NAME,Luxembourg
+prov_switzerland_NAME,Switzerland
+prov_balkans_NAME,Balkans
+prov_crimea_NAME,Crimea
+prov_germany_NAME,Germany
+prov_poland_NAME,Poland
+prov_baltics_NAME,Baltics
+prov_finland_NAME,Finland
+prov_aland_NAME,Åland
+prov_ukraine_NAME,Ukraine
+prov_russia_NAME,Russia
+
+,, North America
+prov_north_america_NAME,North America
 prov_cuba_NAME,Cuba
+prov_nova_scotia_NAME,Nova Scotia
+prov_bermuda_NAME,Bermuda
+prov_jamaica_NAME,Jamaica
+prov_hispaniola_NAME,Hispaniola
+prov_aleutians_name,Aleutian Islands
+prov_bahamas_NAME,Bahamas
+prov_turks_and_caicos_NAME,Turks and Caicos
+prov_puerto_rico_NAME,Puerto Rico
+prov_barbados_NAME,Barbados
+prov_grenada_NAME,Grenada
+prov_st_vincent_NAME,St Vincent
+prov_st_lucia_NAME,St Lucia
+prov_martinique_NAME,Martinique
+prov_dominica_NAME,Dominica
+prov_guadeloupe_NAME,Guadeloupe
+prov_montserrat_NAME,Montserrat
+prov_antigua_NAME,Antigua
+prov_barbuda_NAME,Barbuda
+prov_st_kitts_NAME,St Kitts
+prov_west_virgin_islands_NAME,West Virgin Islands
+prov_east_virgin_islands_NAME,East Virgin Islands
+prov_cayman_islands_NAME,Cayman Islands
+prov_angulia_NAME,Angulia
+prov_central_america_NAME,Central America
+prov_mexico_NAME,Mexico
+
+,, South America
+prov_south_america_NAME,South America
+prov_galapagos_NAME,Galapagos
+prov_falklands_NAME,Falklands
+prov_south_georgia_NAME,South Georgia
+
+,, Africa
+prov_africa_NAME,Africa
 prov_madagascar_NAME,Madagascar
+prov_socotra_NAME,Socotra
+prov_mauritius_NAME,Mauritius
+prov_reunion_NAME,Réunion
+prov_comoros_NAME,Comoros
+prov_sao_tome_NAME,Sao Tome
+prov_fernando_po_NAME,Fernando Po
+prov_cape_verde_NAME,Cape Verde
+prov_ascension_NAME,Ascension
+prov_st_helena_NAME,St Helena
+prov_tristan_da_cunha_NAME,Tristan da Cunha
+prov_seychelles_NAME,Seychelles
+prov_prince_edward_islands_NAME,Prince Edward Islands
+prov_kerguelen_islands_NAME,Kerguelen Islands
+prov_heard_island_NAME,Heard Island
+prov_egypt_NAME,Egypt
+prov_morocco_NAME,Morocco
+
+,, Asia
+prov_middle_east_NAME,Middle East
 prov_ceylon_NAME,Ceylon
 prov_formosa_NAME,Formosa
+prov_sakhalin_NAME,Sakhalin
+prov_maldives_NAME,Maldives
+prov_hainan_NAME,Hainan
+prov_hokkaido_NAME,Hokkaido
+prov_diego_garcia_NAME,Diego Garcia
+prov_philippines_NAME,Philippines
+prov_india_NAME,India
+prov_andamans_NAME,Andaman Islands
+prov_nicobar_islands_NAME,Nicobar Islands
+prov_indochina_NAME,Indochina
+prov_korea_NAME,Korea
+prov_okinawa_NAME,Okinawa
+prov_yaeyama_NAME,Yaeyama
+prov_kyushu_NAME,Kyushu
+prov_shikoku_NAME,Shikoku
+prov_japan_NAME,Japan
+prov_kurils_NAME,Kuril Islands
+prov_manchuria_NAME,Manchuria
+prov_china_NAME,China
+prov_central_asia_NAME,Central Asia
+prov_siberia_NAME,Siberia
+prov_iran_NAME,Iran
+prov_anatolia_NAME,Anatolia
+
+,, Oceania
+prov_oceania_NAME,Oceania
+prov_indonesia_NAME,Indonesia
+prov_north_island_NAME,North Island
+prov_south_island_NAME,South Island
+prov_tasmania_NAME,Tasmania
+prov_australia_NAME,Australia
+prov_hawaii_NAME,Hawaii
+
+,, Lakes
+prov_aral_sea_NAME,Aral Sea
+prov_caspian_sea_NAME,Caspian Sea
+prov_lake_ladoga_NAME,Lake Ladoga
+prov_lake_ontario_NAME,Lake Ontario
+prov_lake_erie_NAME,Lake Erie
+prov_lake_huron_NAME,Lake Huron
+prov_lake_michigan_NAME,Lake Michigan
+prov_lake_superior_NAME,Lake Superior
+prov_lake_baikal_NAME,Lake Baikal
+prov_lake_woods_NAME,Lake of the Woods
+prov_lake_manitoba_NAME,Lake Manitoba
+prov_reindeer_lake_NAME,Reindeer Lake
+prov_lake_ronge_NAME,Lac la Ronge
+prov_lake_athabasca_NAME,Lake Athabasca
+prov_great_slave_lake_NAME,Great Slave Lake
+prov_great_bear_lake_NAME,Great Bear Lake
+
+,, Seas and Oceans
+prov_azov_sea_NAME,Sea of Azov
+prov_black_sea_NAME,Black Sea
+prov_marmara_sea_NAME,Sea of Marmara
+prov_agean_sea_NAME,Agean Sea
+prov_ionian_sea_NAME,Ionian Sea
+prov_adriatic_sea_NAME,Adriatic Sea
+prov_tyrrhenian_sea_NAME,Tyrrhenian Sea
+prov_east_mediterranean_NAME,East Mediterranean Sea
+prov_central_mediterranean_NAME,Central Mediterranean Sea
+prov_west_mediterranean_NAME,West Mediterranean Sea
+prov_ligurian_sea_NAME,Ligurian Sea
+prov_balearic_sea_NAME,Balearic Sea
+prov_alboran_sea_NAME,Alboran Sea
+prov_gulf_bothnia_NAME,Gulf of Bothnia
+prov_gulf_finland_NAME,Gulf of Finland
+prov_gulf_riga_NAME,Gulf of Riga
+prov_baltic_sea_NAME,Baltic Sea
+prov_danish_straits_NAME,Danish Straits
+prov_english_channel_NAME,English Channel
+prov_irish_sea_NAME,Irish Sea
+prov_biscay_bay_NAME,Bay of Biscay
+prov_north_sea_NAME,North Sea
+prov_red_sea_NAME,Red Sea
+prov_arabian_sea_NAME,Arabian Sea
+prov_persian_gulf_NAME,Persian Gulf
+prov_andaman_sea_NAME,Andaman Sea
+prov_bay_bengal_NAME,Bay of Bengal
+prov_okhotsk_sea_NAME,Sea of Okhotsk
+prov_japan_sea_NAME,Sea of Japan
+prov_east_china_sea_NAME,East China Sea
+prov_south_china_sea_NAME,South China Sea
+prov_philippine_sea_NAME,Philippine Sea
+prov_celebes_sea_NAME,Celebes Sea
+prov_java_sea_NAME,Java Sea
+prov_banda_sea_NAME,Banda Sea
+prov_arafura_sea_NAME,Arafura Sea
+prov_gulf_mexico_NAME,Gulf of Mexico
+prov_caribbean_sea_NAME,Caribbean Sea
+prov_mozambique_channel_NAME,Mozambique Channel
+prov_zanj_sea_NAME,Sea of Zanj
+prov_kara_sea_NAME,Kara Sea
+prov_barents_sea_NAME,Barents Sea
+prov_norwegian_sea_NAME,Norwegian Sea
+prov_greenland_sea_NAME,Greenland Sea
+prov_labrador_sea_NAME,Labrador Sea
+prov_hudson_bay_NAME,Hudson Bay
+prov_gulf_st_lawrence_NAME,Gulf of St Lawrence
+prov_gulf_alaska_NAME,Gulf of Alaska
+prov_gulf_california_NAME,Gulf of California
+prov_east_siberian_sea_NAME,East Siberian Sea
+prov_sargasso_sea_NAME,Sargasso Sea
+prov_gulf_guinea_NAME,Gulf of Guinea
+prov_celtic_sea_NAME,Celtic Sea
+prov_argentine_sea_NAME,Argentine Sea
+prov_chilean_sea_NAME,Chilean Sea
+prov_north_atlantic_NAME,North Atlantic Ocean
+prov_central_atlantic_NAME,Central Atlantic Ocean
+prov_south_atlantic_NAME,South Atlantic Ocean
+prov_indian_ocean_NAME,Indian Ocean
+prov_great_australian_bight_NAME,Great Australian Bight
+prov_tasman_sea_NAME,Tasman Sea
+prov_coral_sea_NAME,Coral Sea
+prov_melanesia_NAME,Melanesia
+prov_micronesia_NAME,Micronesia
+prov_polynesia_NAME,Polynesia
+prov_north_pacific_NAME,North Pacific Ocean
+prov_south_pacific_NAME,South Pacific Ocean
+prov_bering_sea_NAME,Bering Sea
+prov_chukchi_sea_NAME,Chukchi Sea
+prov_beaufort_sea_NAME,Beaufort Sea
diff --git a/game/localisation/en_GB/regions.csv b/game/localisation/en_GB/regions.csv
new file mode 100644
index 0000000..8fe8943
--- /dev/null
+++ b/game/localisation/en_GB/regions.csv
@@ -0,0 +1,8 @@
+
+,, Regions
+region_europe_NAME,Europe
+region_north_america_NAME,North America
+region_south_america_NAME,South America
+region_africa_NAME,Africa
+region_asia_NAME,Asia
+region_oceania_NAME,Oceania
diff --git a/game/localisation/en_GB/regions.csv.import b/game/localisation/en_GB/regions.csv.import
new file mode 100644
index 0000000..8dd0c09
--- /dev/null
+++ b/game/localisation/en_GB/regions.csv.import
@@ -0,0 +1,3 @@
+[remap]
+
+importer="keep"
diff --git a/game/localisation/en_US/menus.csv b/game/localisation/en_US/menus.csv
index 27a0858..807d1cb 100644
--- a/game/localisation/en_US/menus.csv
+++ b/game/localisation/en_US/menus.csv
@@ -1,3 +1,4 @@
+
 ,, Main Menu
 MAINMENU_TITLE,OpenVic2
 MAINMENU_NEW_GAME,New Game
@@ -48,5 +49,9 @@ GAMELOBBY_START,Start Game
 GAMELOBBY_BACK,Back
 
 ,, Game Session Menu
-GAMESESSIONMENU_RESIGN,Resign
+GAMESESSIONMENU_SAVE,Save Game
+GAMESESSIONMENU_LOAD,Load Game
+GAMESESSIONMENU_OPTIONS,Options
+GAMESESSIONMENU_MAINMENU,Resign
+GAMESESSIONMENU_QUIT,Quit
 GAMESESSIONMENU_CLOSE,Close
diff --git a/game/localisation/fr_FR/menus.csv b/game/localisation/fr_FR/menus.csv
index 8e8a7ad..0d84b64 100644
--- a/game/localisation/fr_FR/menus.csv
+++ b/game/localisation/fr_FR/menus.csv
@@ -1,3 +1,4 @@
+
 ,, Main Menu
 MAINMENU_TITLE,OpenVic2
 MAINMENU_NEW_GAME,Nouveau Jeu
@@ -48,5 +49,9 @@ GAMELOBBY_START,Démarrer Jeu
 GAMELOBBY_BACK,Retourner
 
 ,, Game Session Menu
-GAMESESSIONMENU_RESIGN,Démissionner
+GAMESESSIONMENU_SAVE,Sauvegarder la Partie
+GAMESESSIONMENU_LOAD,Charger la Partie
+GAMESESSIONMENU_OPTIONS,Options
+GAMESESSIONMENU_MAINMENU,Démissionner
+GAMESESSIONMENU_QUIT,Quitter
 GAMESESSIONMENU_CLOSE,Fermer