From d429c6585b751869eabaafca29caf337770d7d95 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Fri, 15 Jun 2018 15:04:25 +0300 Subject: [PATCH] Aded terrains, resources improvements and techs to the translation file --- android/assets/jsons/Terrains.json | 4 +- android/assets/jsons/Translations.json | 279 ++++++++++++++++++++++++- core/src/com/unciv/ui/LoadScreen.kt | 2 +- core/src/com/unciv/ui/SaveScreen.kt | 9 +- 4 files changed, 286 insertions(+), 8 deletions(-) diff --git a/android/assets/jsons/Terrains.json b/android/assets/jsons/Terrains.json index fa46852ccb..77d8df252b 100644 --- a/android/assets/jsons/Terrains.json +++ b/android/assets/jsons/Terrains.json @@ -54,7 +54,7 @@ overrideStats:true, unbuildable:true, defenceBonus: 0.25, - occursOn:["Tundra","Plains","Grassland"] + occursOn:["Tundra","Plains","Grassland","Hill"] }, { name:"Jungle", @@ -92,4 +92,4 @@ defenceBonus: -0.1, occursOn:["Desert"] } -] \ No newline at end of file +] \ No newline at end of file diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json index 94a791867e..97102ccfe4 100644 --- a/android/assets/jsons/Translations.json +++ b/android/assets/jsons/Translations.json @@ -80,6 +80,9 @@ French:"Fortifier" Romanian:"Fortifica" } + + "Fortification":{ // as in "+40% Fortification" + } "Set up":{ // For siege units } @@ -274,5 +277,279 @@ } "has been destroyed!":{ } - + + // Save and load game + + "Current saves":{ + } + "Saved game name":{ + } + "Copy game info":{ + } + "Could not load game":{ + } + "Load":{ // as in "Load SaveFile2" + } + "Delete save":{ + } + "Saved at":{ + } + + // Terrains + + "Grassland":{ + } + "Plains":{ + } + "Tundra":{ + } + "Desert":{ + } + "Lakes":{ + } + "Hill":{ + } + "Forest":{ + } + "Jungle":{ + } + "Marsh":{ + } + "Oasis":{ + } + "Food plains":{ + } + + // Bonus Resources + "Cattle":{ + } + "Sheep":{ + } + "Deer":{ + } + "Bananas":{ + } + "Wheat":{ + } + "Stone":{ + } + + // Strategic Resources + "Horses":{ + } + "Iron":{ + } + "Coal":{ + } + "Oil":{ + } + "Aluminum":{ + } + "Uranium":{ + } + + // Luxury Resources + "Furs":{ + } + "Cotton":{ + } + "Dyes":{ + } + "Gems":{ + } + "Gold":{ + } + "Silver":{ + } + "Incense":{ + } + "Silk":{ + } + "Spices":{ + } + "Wine":{ + } + "Sugar":{ + } + "Marble":{ + } + "Pearls":{ + } + "Whales":{ + } + + // Tile improvements + + "Farm":{ + } + "Lumber Mill":{ + } + "Mine":{ + } + "Trading post":{ + } + "Camp":{ + } + "Oil Well":{ + } + "Pasture":{ + } + "Plantation":{ + } + "Quarry":{ + } + "Road":{ + } + "Railroad":{ + } + "Remove":{ // as in "Remove Forest/Jungle/Marsh" + } + "Academy":{ + } + "Landmark":{ + } + "Manufactory":{ + } + "Customs house":{ + } + + // Technologies (Ancient Era) + + "Pottery":{ + } + "Animal Husbandry":{ + } + "Archery":{ + } + "Mining":{ + } + "Sailing":{ + } + "Calendar":{ + } + "Writing":{ + } + "Trapping":{ + } + "The Wheel":{ + } + "Masonry":{ + } + "Bronze Working":{ + } + + + // Technologies (Classical Era) + + "Optics":{ + } + "Horseback Riding":{ + } + "Mathematics":{ + } + "Construction":{ + } + "Philosophy":{ + } + "Currency":{ + } + "Engineering":{ + } + "Iron Working":{ + } + + + // Technologies (Medieval Era) + + "Theology":{ + } + "Civil Service":{ + } + "Physics":{ + } + "Metal Casting":{ + } + "Compass":{ + } + "Education":{ + } + "Chivalry":{ + } + "Machinery":{ + } + + + // Technologies (Renaissance Era) + + "Astronomy":{ + } + "Acoustics":{ + } + "Banking":{ + } + "Printing Press":{ + } + "Navigation":{ + } + "Archaeology":{ + } + "Economics":{ + } + "Chemistry":{ + } + + // Technologies (Industrial Era) - as of now the tech tree itself is incomplete, more will probably be added later + + "Scientific Theory":{ + } + "Fertilizer":{ + } + "Biology":{ + } + "Electricity":{ + } + "Steam Power":{ + } + + + // Technologies (Modern Era) + + "Refrigeration":{ + } + "Radio":{ + } + "Combustion":{ + } + "Plastics":{ + } + "Electronics":{ + } + "Mass Media":{ + } + + // Technologies (Information Era) + + "Pharmaceuticals":{ + } + "Computers":{ + } + "Nuclear Fission":{ + } + "Ecology":{ + } + "Robotics":{ + } + "Rocketry":{ + } + + // Technologies (Future Era) + "Nanotechnology":{ + } + "Satellites":{ + } + "Particle Physics":{ + } + "Future Tech":{ + } + } diff --git a/core/src/com/unciv/ui/LoadScreen.kt b/core/src/com/unciv/ui/LoadScreen.kt index 0d1cb579fd..fde5a4e181 100644 --- a/core/src/com/unciv/ui/LoadScreen.kt +++ b/core/src/com/unciv/ui/LoadScreen.kt @@ -31,7 +31,7 @@ class LoadScreen : PickerScreen() { topTable.add(saveTable) val saves = GameSaver().getSaves() - rightSideButton.setText("Load game") + rightSideButton.setText("Load game".tr()) saves.forEach { val textButton = TextButton(it,skin) textButton.addClickListener { diff --git a/core/src/com/unciv/ui/SaveScreen.kt b/core/src/com/unciv/ui/SaveScreen.kt index 5b944e84a5..44d63188a6 100644 --- a/core/src/com/unciv/ui/SaveScreen.kt +++ b/core/src/com/unciv/ui/SaveScreen.kt @@ -12,6 +12,7 @@ import com.unciv.ui.pickerscreens.PickerScreen import com.unciv.ui.utils.addClickListener import com.unciv.ui.utils.enable import com.unciv.ui.utils.getRandom +import com.unciv.ui.utils.tr class SaveScreen : PickerScreen() { val textField = TextField("", skin) @@ -19,7 +20,7 @@ class SaveScreen : PickerScreen() { init { val currentSaves = Table() - currentSaves.add(Label("Current saves:",skin)).row() + currentSaves.add(Label("Current saves".tr(),skin)).row() val saves = GameSaver().getSaves() saves.forEach { val textButton = TextButton(it, skin) @@ -40,17 +41,17 @@ class SaveScreen : PickerScreen() { val defaultSaveName = adjectives.getRandom()+" "+nouns.getRandom() textField.text = defaultSaveName - newSave.add(Label("Saved game name:",skin)).row() + newSave.add(Label("Saved game name".tr(),skin)).row() newSave.add(textField).width(300f).pad(10f).row() - val copyJsonButton = TextButton("Copy game info",skin) + val copyJsonButton = TextButton("Copy game info".tr(),skin) copyJsonButton.addClickListener { Gdx.app.clipboard.contents = Json().toJson(game.gameInfo)} newSave.add(copyJsonButton) topTable.add(newSave) topTable.pack() - rightSideButton.setText("Save game") + rightSideButton.setText("Save game".tr()) rightSideButton.addClickListener { GameSaver().saveGame(UnCivGame.Current.gameInfo, textField.text) UnCivGame.Current.setWorldScreen()