AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-30 07:21:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Enabled loading maps from the map editor

Browse Source
This commit is contained in:
Yair Morgenstern 2019-02-03 19:42:31 +02:00
parent 81d1a79e19
commit d8d2b89e73
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
core/src/com/unciv/ui/MapEditorScreen.kt
View File

@ -3,6 +3,7 @@ package com.unciv.ui
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Actor
import com.badlogic.gdx.scenes.scene2d.ui.*
import com.badlogic.gdx.utils.Array
import com.unciv.GameParameters
import com.unciv.UnCivGame
import com.unciv.logic.GameSaver
@ -20,7 +21,7 @@ import com.unciv.ui.utils.onClick
import com.unciv.ui.worldscreen.TileGroupMap
import com.unciv.ui.worldscreen.optionstable.PopupTable
class MapEditorScreen: CameraStageBaseScreen(){
class MapEditorScreen(var mapToLoad:String?=null): CameraStageBaseScreen(){
var clearTerrainFeature=false
var selectedTerrain : Terrain?=null
var clearResource=false
@ -49,6 +50,11 @@ class MapEditorScreen: CameraStageBaseScreen(){
}
init{
if(mapToLoad!=null){
mapName=mapToLoad!!
tileMap=GameSaver().loadMap(mapName)
tileMap.setTransients()
}
val scrollPane = getMapHolder(tileMap)
stage.addActor(scrollPane)
@ -155,6 +161,32 @@ class mapScreenOptionsTable(mapEditorScreen: MapEditorScreen):PopupTable(mapEdit
}
add(saveMapButton).row()
val loadMapButton = TextButton("Load".tr(),CameraStageBaseScreen.skin)
loadMapButton.onClick { MapScreenLoadTable(mapEditorScreen); remove() }
add(loadMapButton).row()
val closeOptionsButtton = TextButton("Close".tr(), CameraStageBaseScreen.skin)
closeOptionsButtton.onClick { remove() }
add(closeOptionsButtton).row()
open()
}
}
class MapScreenLoadTable(mapEditorScreen: MapEditorScreen):PopupTable(mapEditorScreen){
init{
val mapFileSelectBox = SelectBox<String>(CameraStageBaseScreen.skin)
val mapNames = Array<String>()
for (mapName in GameSaver().getMaps()) mapNames.add(mapName)
mapFileSelectBox.items = mapNames
add(mapFileSelectBox).row()
val loadMapButton = TextButton("Load".tr(),CameraStageBaseScreen.skin)
loadMapButton.onClick {
UnCivGame.Current.screen = MapEditorScreen(mapFileSelectBox.selected)
}
add(loadMapButton).row()
val closeOptionsButtton = TextButton("Close".tr(), CameraStageBaseScreen.skin)
closeOptionsButtton.onClick { remove() }
add(closeOptionsButtton).row()

3
core/src/com/unciv/ui/NewGameScreen.kt
View File

@ -234,5 +234,4 @@ class TranslatedSelectBox(values : Collection<String>, default:String, skin: Ski
val defaultItem = array.firstOrNull { it.value==default }
selected = if(defaultItem!=null) defaultItem else array.first()
}
}
}