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

Tile info now dispays which civ each unit belongs to

Browse source 
Embarked units marked on map with different shaped background
This commit is contained in:
Yair Morgenstern 2018-11-04 13:06:16 +02:00
parent 52e9e35853
commit fb2538524a
6 changed files with 343 additions and 331 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
android/Images/OtherIcons/Banner.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.8 KiB

657
android/assets/game.atlas
View file

File diff suppressed because it is too large Load diff

BIN
android/assets/game.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 761 KiB

After

Width:  |  Height:  |  Size: 769 KiB

3
core/src/com/unciv/logic/map/TileInfo.kt
View file

@ -212,10 +212,11 @@ open class TileInfo {
if (roadStatus !== RoadStatus.None && !isCityCenter()) SB.appendln(roadStatus.toString().tr())
if (improvement != null) SB.appendln(improvement!!.tr())
if (improvementInProgress != null && isViewableToPlayer) SB.appendln("{$improvementInProgress} in ${this.turnsToImprovement} {turns}".tr())
if (civilianUnit != null && isViewableToPlayer) SB.appendln(civilianUnit!!.name.tr())
if (civilianUnit != null && isViewableToPlayer) SB.appendln(civilianUnit!!.name.tr()+" - "+civilianUnit!!.civInfo.civName.tr())
if(militaryUnit!=null && isViewableToPlayer){
var milUnitString = militaryUnit!!.name.tr()
if(militaryUnit!!.health<100) milUnitString += "(" + militaryUnit!!.health + ")"
milUnitString += " - "+militaryUnit!!.civInfo.civName.tr()
SB.appendln(milUnitString)
}
if(getDefensiveBonus()!=0f){

6
core/src/com/unciv/models/gamebasics/tech/Technology.kt
View file

@ -10,12 +10,12 @@ class Technology : ICivilopedia {
override val description: String
get(){
val SB=StringBuilder()
if(baseDescription!=null) SB.appendln(baseDescription)
if(baseDescription!=null) SB.appendln(baseDescription!!.tr())
val improvedImprovements = GameBasics.TileImprovements.values.filter { it.improvingTech==name }.groupBy { it.improvingTechStats.toString() }
improvedImprovements.forEach{
val impimpString = it.value.joinToString { it.name.tr() } +" {provide" + (if(it.value.size==1) "s" else "") +"} "+it.key
for (improvement in improvedImprovements) {
val impimpString = improvement.value.joinToString { it.name.tr() } +" {provide" + (if(improvement.value.size==1) "s" else "") +"} "+improvement.key
SB.appendln(impimpString.tr())
}

8
core/src/com/unciv/ui/tilegroups/TileGroup.kt
View file

@ -337,8 +337,12 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
val unitBaseImage = ImageGetter.getUnitIcon(unit.name, unit.civInfo.getNation().getSecondaryColor())
.apply { setSize(20f, 20f) }
val background = if (unit.isFortified()) ImageGetter.getImage("OtherIcons/Shield.png")
else ImageGetter.getImage("OtherIcons/Circle.png")
val background =
when {
unit.isEmbarked() -> ImageGetter.getImage("OtherIcons/Banner")
unit.isFortified() -> ImageGetter.getImage("OtherIcons/Shield.png")
else -> ImageGetter.getImage("OtherIcons/Circle.png")
}
background.apply {
this.color = unit.civInfo.getNation().getColor()
setSize(size, size)