diff --git a/android/build.gradle b/android/build.gradle index c94654ae58..0cb3427125 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.game" minSdkVersion 14 targetSdkVersion 26 - versionCode 67 - versionName "2.2.7" + versionCode 68 + versionName "2.3.0" } buildTypes { release { diff --git a/core/src/com/unciv/ui/LoadScreen.kt b/core/src/com/unciv/ui/LoadScreen.kt index a2942f746b..2e1285bc9b 100644 --- a/core/src/com/unciv/ui/LoadScreen.kt +++ b/core/src/com/unciv/ui/LoadScreen.kt @@ -10,6 +10,8 @@ import com.unciv.ui.pickerscreens.PickerScreen import com.unciv.ui.utils.CameraStageBaseScreen import com.unciv.ui.utils.disable import com.unciv.ui.utils.enable +import java.text.SimpleDateFormat +import java.util.* class LoadScreen : PickerScreen() { lateinit var selectedSave:String @@ -34,7 +36,17 @@ class LoadScreen : PickerScreen() { textButton.addClickListener { selectedSave=it - descriptionLabel.setText(it) + var textToSet = it + + val savedAt = Date(GameSaver().getSave(it).lastModified()) + textToSet+="\nSaved at: "+ SimpleDateFormat("dd-MM-yy HH.mm").format(savedAt) + try{ + val game = GameSaver().loadGame(it) + textToSet+="\n"+game.getPlayerCivilization()+", turn "+game.turns + }catch (ex:Exception){ + textToSet+="\nCould not load game!" + } + descriptionLabel.setText(textToSet) rightSideButton.setText("Load\r\n$it") rightSideButton.enable() deleteSaveButton.enable() @@ -51,5 +63,4 @@ class LoadScreen : PickerScreen() { } -} - +} \ No newline at end of file diff --git a/core/src/com/unciv/ui/SaveScreen.kt b/core/src/com/unciv/ui/SaveScreen.kt index 34305dc001..bd51695d09 100644 --- a/core/src/com/unciv/ui/SaveScreen.kt +++ b/core/src/com/unciv/ui/SaveScreen.kt @@ -9,8 +9,7 @@ import com.unciv.logic.GameSaver import com.unciv.ui.cityscreen.addClickListener import com.unciv.ui.pickerscreens.PickerScreen import com.unciv.ui.utils.enable -import java.text.SimpleDateFormat -import java.util.* +import com.unciv.ui.utils.getRandom class SaveScreen : PickerScreen() { val textField = TextField("", skin) @@ -32,8 +31,11 @@ class SaveScreen : PickerScreen() { val newSave = Table() - val defaultSaveName = SimpleDateFormat("dd-MM-yy HH.mm").format(Date())+ - " Turn "+ UnCivGame.Current.gameInfo.turns + val adjectives = listOf("Prancing","Obese","Junior","Senior","Abstract","Discombobulating","Simple","Awkward","Holy", + "Dangerous","Greasy","Stinky","Purple","Majestic","Incomprehensible","Cardboard","Chocolate","Robot","Ninja") + val nouns = listOf("Moose","Pigeon","Weasel","Ferret","Onion","Marshmellow","Crocodile","Inu Shiba", + "Sandwich","Elephant","Kangaroo","Marmot","Beagle","Dolphin","Fish","Tomato","Duck") + val defaultSaveName = adjectives.getRandom()+" "+nouns.getRandom() textField.text = defaultSaveName newSave.add(Label("Saved game name:",skin)).row()