Added icons for Medieval and Renaissance era units

This commit is contained in:
Yair Morgenstern 2018-05-17 21:28:41 +03:00
parent 7155bfb927
commit f546a49c49
8 changed files with 18 additions and 13 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

View File

@ -158,7 +158,7 @@ class TileInfo {
if(unit!!.getBaseUnit().unitType!=UnitType.Civilian) unitString += "(" + unit!!.health + ")" if(unit!!.getBaseUnit().unitType!=UnitType.Civilian) unitString += "(" + unit!!.health + ")"
SB.appendln(unitString) SB.appendln(unitString)
} }
return SB.toString() return SB.toString().trim()
} }
fun hasViewableResource(civInfo: CivilizationInfo): Boolean { fun hasViewableResource(civInfo: CivilizationInfo): Boolean {

View File

@ -26,7 +26,7 @@ open class CameraStageBaseScreen : Screen {
private var isTutorialShowing = false private var isTutorialShowing = false
init { init {
stage = Stage(ExtendViewport(1500f, 900f), batch)// FitViewport(1000,600) stage = Stage(ExtendViewport(1000f, 600f), batch)// FitViewport(1000,600)
Gdx.input.inputProcessor = stage Gdx.input.inputProcessor = stage
} }

View File

@ -8,31 +8,36 @@ import com.unciv.ui.utils.CameraStageBaseScreen
import com.unciv.ui.utils.ImageGetter import com.unciv.ui.utils.ImageGetter
class TileInfoTable(private val worldScreen: WorldScreen) : Table() { class TileInfoTable(private val worldScreen: WorldScreen) : Table() {
init{
skin = CameraStageBaseScreen.skin
}
internal fun updateTileTable(tile: TileInfo) { internal fun updateTileTable(tile: TileInfo) {
clearChildren() clearChildren()
val civInfo = worldScreen.civInfo val civInfo = worldScreen.civInfo
val stats = tile.getTileStats(civInfo)
pad(20f) pad(20f)
columnDefaults(0).padRight(10f) columnDefaults(0).padRight(10f)
val skin = CameraStageBaseScreen.skin
if (civInfo.exploredTiles.contains(tile.position)) { if (civInfo.exploredTiles.contains(tile.position)) {
add(getStatsTable(tile)).pad(20f)
add(Label(tile.toString(), skin)).colspan(2) 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() pack()
setPosition(worldScreen.stage.width - 10f - width, 10f) 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
}
} }