wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolved #2672 - Difficulties are sorted by ascending difficulty in Civilopedia

Browse source
This commit is contained in:
Yair Morgenstern 2020-05-30 23:40:27 +03:00
parent 84e4e58f23
commit 4a69544c7d
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt
View file

@ -28,7 +28,7 @@ class UnitMovementAlgorithms(val unit:MapUnit) {
(!areConnectedByRoad || !civInfo.tech.roadsConnectAcrossRivers)){
return 100f // Rivers take the entire turn to cross
}
if (areConnectedByRoad)
{
return if (unit.civInfo.tech.movementSpeedOnRoadsImproved) 1 / 3f + extraCost

6
core/src/com/unciv/ui/CivilopediaScreen.kt
View file

@ -27,8 +27,10 @@ class CivilopediaScreen(ruleset: Ruleset) : CameraStageBaseScreen() {
fun select(category: String) {
entrySelectTable.clear()
for (entry in categoryToEntries[category]!!
.sortedBy { it.name.tr() }){ // Alphabetical order of localized names
var entries = categoryToEntries[category]!!
if(category!="Difficulty levels") // this is the only case where we need them in order
entries = entries.sortedBy { it.name.tr() } // Alphabetical order of localized names
for (entry in entries){
val entryButton = Button(skin)
if(entry.image!=null)
if (category=="Terrains")