AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 13:55:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed slider sound playing when opening NewGameScreen and MapEditor (#6932)

Browse Source 
* fixed slider sound playing in some of the tabs

* made "initial" value mandatory to avoid such issues in the future

* initial values now taken from gameParameters

* whitespaces
This commit is contained in:
alexban011 2022-05-24 23:43:00 +03:00 committed by GitHub
parent 93afb26c62
commit 0661bbc31b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/ui/mapeditor/MapEditorEditTab.kt
View File

@ -73,7 +73,7 @@ class MapEditorEditTab(
defaults().pad(10f).left() defaults().pad(10f).left()
add(brushLabel) add(brushLabel)
brushCell = add().padLeft(0f) brushCell = add().padLeft(0f)
brushSlider = UncivSlider(1f,6f,1f, getTipText = { getBrushTip(it).tr() }) { brushSlider = UncivSlider(1f,6f,1f, initial = 1f, getTipText = { getBrushTip(it).tr() }) {
brushSize = if (it > 5f) -1 else it.toInt() brushSize = if (it > 5f) -1 else it.toInt()
brushLabel.setText("Brush ([${getBrushTip(it).take(1)}]):".tr()) brushLabel.setText("Brush ([${getBrushTip(it).take(1)}]):".tr())
} }

6
core/src/com/unciv/ui/newgamescreen/GameOptionsTable.kt
View File

@ -122,13 +122,12 @@ class GameOptionsTable(
if (maxCityStates == 0) return null if (maxCityStates == 0) return null
add("{Number of City-States}:".toLabel()).left().expandX() add("{Number of City-States}:".toLabel()).left().expandX()
val slider = UncivSlider(0f, maxCityStates.toFloat(), 1f) { val slider = UncivSlider(0f, maxCityStates.toFloat(), 1f, initial = gameParameters.numberOfCityStates.toFloat()) {
gameParameters.numberOfCityStates = it.toInt() gameParameters.numberOfCityStates = it.toInt()
} }
slider.permanentTip = true slider.permanentTip = true
slider.isDisabled = locked slider.isDisabled = locked
add(slider).padTop(10f).row() add(slider).padTop(10f).row()
slider.value = gameParameters.numberOfCityStates.toFloat()
return slider return slider
} }
@ -137,14 +136,13 @@ class GameOptionsTable(
return null return null
add("{Max Turns}:".toLabel()).left().expandX() add("{Max Turns}:".toLabel()).left().expandX()
val slider = UncivSlider(250f, 1500f, 50f) { val slider = UncivSlider(250f, 1500f, 50f, initial = gameParameters.maxTurns.toFloat()) {
gameParameters.maxTurns = it.toInt() gameParameters.maxTurns = it.toInt()
} }
slider.permanentTip = true slider.permanentTip = true
slider.isDisabled = locked slider.isDisabled = locked
val snapValues = floatArrayOf(250f,300f,350f,400f,450f,500f,550f,600f,650f,700f,750f,800f,900f,1000f,1250f,1500f) val snapValues = floatArrayOf(250f,300f,350f,400f,450f,500f,550f,600f,650f,700f,750f,800f,900f,1000f,1250f,1500f)
slider.setSnapToValues(snapValues, 250f) slider.setSnapToValues(snapValues, 250f)
slider.value = gameParameters.maxTurns.toFloat()
return slider return slider
} }

11
core/src/com/unciv/ui/newgamescreen/MapParametersTable.kt
View File

@ -253,22 +253,21 @@ class MapParametersTable(
table.add("RNG Seed".toLabel()).left() table.add("RNG Seed".toLabel()).left()
table.add(seedTextField).fillX().padBottom(10f).row() table.add(seedTextField).fillX().padBottom(10f).row()
fun addSlider(text: String, getValue:()->Float, min:Float, max:Float, onChange: (value:Float)->Unit): UncivSlider { fun addSlider(text: String, getValue:()->Float, min: Float, max: Float, onChange: (value: Float)->Unit): UncivSlider {
val slider = UncivSlider(min, max, (max - min) / 20, onChange = onChange) val slider = UncivSlider(min, max, (max - min) / 20, onChange = onChange, initial = getValue())
slider.value = getValue()
table.add(text.toLabel()).left() table.add(text.toLabel()).left()
table.add(slider).fillX().row() table.add(slider).fillX().row()
advancedSliders[slider] = getValue advancedSliders[slider] = getValue
return slider return slider
} }
addSlider("Map Elevation", {mapParameters.elevationExponent}, 0.6f,0.8f) addSlider("Map Elevation", {mapParameters.elevationExponent}, 0.6f, 0.8f)
{ mapParameters.elevationExponent = it } { mapParameters.elevationExponent = it }
addSlider("Temperature extremeness", {mapParameters.temperatureExtremeness}, 0.4f,0.8f) addSlider("Temperature extremeness", {mapParameters.temperatureExtremeness}, 0.4f, 0.8f)
{ mapParameters.temperatureExtremeness = it } { mapParameters.temperatureExtremeness = it }
addSlider("Resource richness", {mapParameters.resourceRichness},0f,0.5f) addSlider("Resource richness", {mapParameters.resourceRichness},0f, 0.5f)
{ mapParameters.resourceRichness = it } { mapParameters.resourceRichness = it }
addSlider("Vegetation richness", {mapParameters.vegetationRichness}, 0f, 1f) addSlider("Vegetation richness", {mapParameters.vegetationRichness}, 0f, 1f)

2
core/src/com/unciv/ui/utils/UncivSlider.kt
View File

@ -41,7 +41,7 @@ class UncivSlider (
step: Float, step: Float,
vertical: Boolean = false, vertical: Boolean = false,
plusMinus: Boolean = true, plusMinus: Boolean = true,
initial: Float = min, initial: Float,
sound: UncivSound = UncivSound.Slider, sound: UncivSound = UncivSound.Slider,
private val getTipText: ((Float) -> String)? = null, private val getTipText: ((Float) -> String)? = null,
onChange: ((Float) -> Unit)? = null onChange: ((Float) -> Unit)? = null