mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-28 05:39:10 +07:00
Code Issues Packages Projects Releases Wiki Activity

Load screen displays civ, turns and save time; Save screen now displays random noun-adjective combination as default save name

Browse Source
This commit is contained in:
Yair Morgenstern
2018-05-29 22:37:31 +03:00
parent 1be235d380
commit e1bd1c271e
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/com/unciv/ui/LoadScreen.kt
View File

@ -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() {
}
}
}

10
core/src/com/unciv/ui/SaveScreen.kt
View File

@ -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()