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

Fixed tests

Browse Source
This commit is contained in:
Yair Morgenstern
2023-12-31 22:59:33 +02:00
parent ac82d8bcb4
commit 35c19bf9de
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/logic/map/tile/TileStatFunctions.kt
View File

@ -10,7 +10,6 @@ import com.unciv.models.ruleset.unique.StateForConditionals
import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.stats.Stat import com.unciv.models.stats.Stat
import com.unciv.models.stats.Stats import com.unciv.models.stats.Stats
import com.unciv.models.translations.tr
import com.unciv.ui.components.extensions.toPercent import com.unciv.ui.components.extensions.toPercent
fun Iterable<Pair<String, Stats>>.toStats(): Stats { fun Iterable<Pair<String, Stats>>.toStats(): Stats {
@ -59,7 +58,7 @@ class TileStatFunctions(val tile: Tile) {
for (unique in statsFromTilesUniques + statsFromObjectsUniques) { for (unique in statsFromTilesUniques + statsFromObjectsUniques) {
val tileType = unique.params[1] val tileType = unique.params[1]
if (!tile.matchesTerrainFilter(tileType, observingCiv)) continue if (!tile.matchesTerrainFilter(tileType, observingCiv)) continue
listOfStats.add("{${unique.sourceObjectName}} ({${unique.text}})".tr() to unique.stats) listOfStats.add("{${unique.sourceObjectName}} ({${unique.text}})" to unique.stats)
} }
for (unique in localUniqueCache.forCityGetMatchingUniques( for (unique in localUniqueCache.forCityGetMatchingUniques(
@ -69,7 +68,7 @@ class TileStatFunctions(val tile: Tile) {
!tile.matchesTerrainFilter(unique.params[2]) && !tile.matchesTerrainFilter(unique.params[2]) &&
city.matchesFilter(unique.params[3]) city.matchesFilter(unique.params[3])
) )
listOfStats.add("{${unique.sourceObjectName}} ({${unique.text}})".tr() to unique.stats) listOfStats.add("{${unique.sourceObjectName}} ({${unique.text}})" to unique.stats)
} }
} }

3
core/src/com/unciv/ui/screens/worldscreen/bottombar/TileInfoTable.kt
View File

@ -7,6 +7,7 @@ import com.badlogic.gdx.utils.Align
import com.unciv.UncivGame import com.unciv.UncivGame
import com.unciv.logic.map.tile.Tile import com.unciv.logic.map.tile.Tile
import com.unciv.logic.map.tile.TileDescription import com.unciv.logic.map.tile.TileDescription
import com.unciv.models.translations.tr
import com.unciv.ui.components.extensions.addBorderAllowOpacity import com.unciv.ui.components.extensions.addBorderAllowOpacity
import com.unciv.ui.components.extensions.darken import com.unciv.ui.components.extensions.darken
import com.unciv.ui.components.extensions.toLabel import com.unciv.ui.components.extensions.toLabel
@ -64,7 +65,7 @@ class TileInfoTable(private val worldScreen: WorldScreen) : Table(BaseScreen.ski
table.onClick { table.onClick {
Popup(worldScreen).apply { Popup(worldScreen).apply {
for ((name, stats) in tile.stats.getTileStatsBreakdown(tile.getCity(), viewingCiv)) for ((name, stats) in tile.stats.getTileStatsBreakdown(tile.getCity(), viewingCiv))
add("{$name}: {${stats.clone()}}".toLabel()).row() add("${name.tr()}: {${stats.clone()}}".toLabel()).row()
addCloseButton() addCloseButton()
}.open() }.open()
} }

2
tests/src/com/unciv/testing/BasicTests.kt
View File

@ -41,7 +41,7 @@ class BasicTests {
@Test @Test
fun gamePngExists() { fun gamePngExists() {
Assert.assertTrue("This test will only pass when the game.png exists", Assert.assertTrue("This test will only pass when the game.png exists",
Gdx.files.local("game.png").exists()) Gdx.files.local("").list().any { it.name().endsWith(".png") })
} }
@Test @Test