diff --git a/android/assets/UnitIcons/Cannon.png b/android/assets/UnitIcons/Cannon.png new file mode 100644 index 0000000000..7401b30f1c Binary files /dev/null and b/android/assets/UnitIcons/Cannon.png differ diff --git a/android/assets/UnitIcons/Knight.png b/android/assets/UnitIcons/Knight.png new file mode 100644 index 0000000000..f1e70a558b Binary files /dev/null and b/android/assets/UnitIcons/Knight.png differ diff --git a/android/assets/UnitIcons/Lancer.png b/android/assets/UnitIcons/Lancer.png new file mode 100644 index 0000000000..aeb3973ff0 Binary files /dev/null and b/android/assets/UnitIcons/Lancer.png differ diff --git a/android/assets/UnitIcons/Musketman.png b/android/assets/UnitIcons/Musketman.png new file mode 100644 index 0000000000..44afec9a48 Binary files /dev/null and b/android/assets/UnitIcons/Musketman.png differ diff --git a/android/assets/UnitIcons/Trebuchet.png b/android/assets/UnitIcons/Trebuchet.png new file mode 100644 index 0000000000..defa915453 Binary files /dev/null and b/android/assets/UnitIcons/Trebuchet.png differ diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt index c22dd821ab..4f638f25eb 100644 --- a/core/src/com/unciv/logic/map/TileInfo.kt +++ b/core/src/com/unciv/logic/map/TileInfo.kt @@ -158,7 +158,7 @@ class TileInfo { if(unit!!.getBaseUnit().unitType!=UnitType.Civilian) unitString += "(" + unit!!.health + ")" SB.appendln(unitString) } - return SB.toString() + return SB.toString().trim() } fun hasViewableResource(civInfo: CivilizationInfo): Boolean { diff --git a/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt b/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt index 06c3041b74..57c7ad7929 100644 --- a/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt +++ b/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt @@ -26,7 +26,7 @@ open class CameraStageBaseScreen : Screen { private var isTutorialShowing = false init { - stage = Stage(ExtendViewport(1500f, 900f), batch)// FitViewport(1000,600) + stage = Stage(ExtendViewport(1000f, 600f), batch)// FitViewport(1000,600) Gdx.input.inputProcessor = stage } diff --git a/core/src/com/unciv/ui/worldscreen/TileInfoTable.kt b/core/src/com/unciv/ui/worldscreen/TileInfoTable.kt index ba5ab845c7..28a1c40b8e 100644 --- a/core/src/com/unciv/ui/worldscreen/TileInfoTable.kt +++ b/core/src/com/unciv/ui/worldscreen/TileInfoTable.kt @@ -8,31 +8,36 @@ import com.unciv.ui.utils.CameraStageBaseScreen import com.unciv.ui.utils.ImageGetter class TileInfoTable(private val worldScreen: WorldScreen) : Table() { + init{ + skin = CameraStageBaseScreen.skin + } internal fun updateTileTable(tile: TileInfo) { clearChildren() val civInfo = worldScreen.civInfo - val stats = tile.getTileStats(civInfo) pad(20f) columnDefaults(0).padRight(10f) - val skin = CameraStageBaseScreen.skin - if (civInfo.exploredTiles.contains(tile.position)) { + add(getStatsTable(tile)).pad(20f) add(Label(tile.toString(), skin)).colspan(2) - row() - - - for (entry in stats.toHashMap().filterNot { it.value == 0f }) { - add(ImageGetter.getStatIcon(entry.key.toString())).align(Align.right) - add(Label(entry.value.toInt().toString(), skin)).align(Align.left) - row() - } } pack() setPosition(worldScreen.stage.width - 10f - width, 10f) } + + fun getStatsTable(tile: TileInfo):Table{ + val table=Table() + + + for (entry in tile.getTileStats(worldScreen.civInfo).toHashMap().filterNot { it.value == 0f }) { + table.add(ImageGetter.getStatIcon(entry.key.toString())).align(Align.right) + table.add(Label(entry.value.toInt().toString(), skin)).align(Align.left) + table.row() + } + return table + } }