Merge pull request #111 from OpenVic2Project/goods

Added Goods loading + mapmode

4 files changed, 71 insertions, 6 deletions

diff --git a/game/localisation/en_GB/goods.csv b/game/localisation/en_GB/goods.csv
new file mode 100644
index 0000000..7e2c63c
--- /dev/null
+++ b/game/localisation/en_GB/goods.csv
@@ -0,0 +1,59 @@
+
+,, Good Categories
+good_category_military,Military
+good_category_raw,Raw
+good_category_industrial,Industrial
+good_category_consumer,Consumer
+
+,, Goods
+good_ammunition,Ammunition
+good_small_arms,Small Arms
+good_artillery,Artillery
+good_canned_food,Canned Food
+good_tanks,Tanks
+good_aeroplanes,Aeroplanes
+
+good_coal,Coal
+good_cotton,Cotton
+good_dye,Dye
+good_iron,Iron
+good_oil,Oil
+good_precious_metal,Precious Metal
+good_rubber,Rubber
+good_silk,Silk
+good_sulphur,Sulphur
+good_timber,Timber
+good_tropical_wood,Tropical Wood
+good_wool,Wool
+
+good_steel,Steel
+good_cement,Cement
+good_machine_parts,Machine Parts
+good_glass,Glass
+good_fuel,Fuel
+good_fertilizer,Fertilizer
+good_explosives,Explosives
+good_clipper_convoys,Clipper Convoys
+good_steamer_convoys,Steamer Convoys
+good_electric_gears,Electric Gears
+good_fabric,Fabric
+good_lumber,Lumber
+
+good_paper,Paper
+good_cattle,Cattle
+good_fish,Fish
+good_fruit,Fruit
+good_grain,Grain
+good_tobacco,Tobacco
+good_tea,Tea
+good_coffee,Coffee
+good_opium,Opium
+good_automobiles,Automobiles
+good_telephones,Telephones
+good_wine,Wine
+good_liquor,Liquor
+good_regular_clothes,Regular Clothes
+good_luxury_clothes,Luxury Clothes
+good_furniture,Furniture
+good_luxury_furniture,Luxury Furniture
+good_radios,Radio
diff --git a/game/localisation/en_GB/goods.csv.import b/game/localisation/en_GB/goods.csv.import
new file mode 100644
index 0000000..8dd0c09
--- /dev/null
+++ b/game/localisation/en_GB/goods.csv.import
@@ -0,0 +1,3 @@
+[remap]
+
+importer="keep"
diff --git a/game/localisation/en_GB/mapmodes.csv b/game/localisation/en_GB/mapmodes.csv
index 440175f..7c2830d 100644
--- a/game/localisation/en_GB/mapmodes.csv
+++ b/game/localisation/en_GB/mapmodes.csv
@@ -1,6 +1,8 @@
 
 ,, Test Mapmodes
-mapmode_province,Province Mapmode
-mapmode_region,Region Mapmode
-mapmode_terrain,Terrain Mapmode
-mapmode_index,Index Mapmode
+mapmode_province,Province
+mapmode_region,Region
+mapmode_terrain,Terrain
+mapmode_index,Index
+mapmode_rgo,RGO
+mapmode_infrastructure,Infrastructure
diff --git a/game/localisation/en_GB/menus.csv b/game/localisation/en_GB/menus.csv
index 6a44f3a..999483f 100644
--- a/game/localisation/en_GB/menus.csv
+++ b/game/localisation/en_GB/menus.csv
@@ -7,7 +7,7 @@ MAINMENU_MULTIPLAYER,Multiplayer
 MAINMENU_OPTIONS,Options
 MAINMENU_CREDITS,Credits
 MAINMENU_EXIT,Exit
-MAINMENU_CHECKSUM,Checksum %s
+MAINMENU_CHECKSUM,Checksum {checksum}
 
 ,, Options
 OPTIONS_RESET,R
@@ -70,7 +70,8 @@ DIALOG_SAVE_AND_QUIT,Save and Quit
 ,, Province Overview Panel
 province_MISSING,No Province
 region_MISSING,No Region
-LIFE_RATING_TOOLTIP,Liferating: %d
+LIFE_RATING_TOOLTIP,Liferating: {life_rating}
+rgo_MISSING,No RGO
 building_MISSING,No Building
 building_fort,Fort
 building_naval_base,Naval Base