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

Default black color for thin circle

Browse Source
This commit is contained in:
Yair Morgenstern
2022-12-18 19:39:12 +02:00
parent 0a3f1c6384
commit 9c50052bc3
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/models/UnitAction.kt
View File

@ -25,7 +25,7 @@ data class UnitAction(
fun getIcon(): Actor { fun getIcon(): Actor {
if (type.imageGetter != null) return type.imageGetter.invoke() if (type.imageGetter != null) return type.imageGetter.invoke()
.surroundWithCircle(20f) .surroundWithCircle(20f)
.surroundWithThinCircle(Color.BLACK) .surroundWithThinCircle()
return when (type) { return when (type) {
UnitActionType.Create -> { UnitActionType.Create -> {
ImageGetter.getImprovementIcon(title.getPlaceholderParameters()[0]) ImageGetter.getImprovementIcon(title.getPlaceholderParameters()[0])
@ -36,7 +36,7 @@ data class UnitAction(
if (ImageGetter.religionIconExists(religionName)) religionName if (ImageGetter.religionIconExists(religionName)) religionName
else "Pantheon" else "Pantheon"
).apply { color = Color.BLACK } ).apply { color = Color.BLACK }
.surroundWithCircle(20f).surroundWithThinCircle(Color.BLACK) .surroundWithCircle(20f).surroundWithThinCircle()
} }
else -> ImageGetter.getImage("UnitActionIcons/Star").apply { color = Color.BLACK } else -> ImageGetter.getImage("UnitActionIcons/Star").apply { color = Color.BLACK }
} }

12
core/src/com/unciv/ui/images/ImageGetter.kt
View File

@ -248,7 +248,7 @@ object ImageGetter {
if (improvement != null) if (improvement != null)
iconGroup.circle.color = getColorFromStats(improvement) iconGroup.circle.color = getColorFromStats(improvement)
return iconGroup.surroundWithThinCircle(Color.BLACK) return iconGroup.surroundWithThinCircle()
} }
fun getPortraitImage(construction: String, size: Float): Group { fun getPortraitImage(construction: String, size: Float): Group {
@ -257,18 +257,18 @@ object ImageGetter {
return if (imageExists(buildingPortraitLocation)) { return if (imageExists(buildingPortraitLocation)) {
getImage(buildingPortraitLocation).toGroup(size) getImage(buildingPortraitLocation).toGroup(size)
} else } else
getImage("BuildingIcons/$construction").surroundWithCircle(size).surroundWithThinCircle(Color.BLACK) getImage("BuildingIcons/$construction").surroundWithCircle(size).surroundWithThinCircle()
} }
if (ruleset.units.containsKey(construction)) { if (ruleset.units.containsKey(construction)) {
val unitPortraitLocation = "UnitPortraits/$construction" val unitPortraitLocation = "UnitPortraits/$construction"
return if (imageExists(unitPortraitLocation)) { return if (imageExists(unitPortraitLocation)) {
getImage(unitPortraitLocation).toGroup(size) getImage(unitPortraitLocation).toGroup(size)
} else } else
getUnitIcon(construction).surroundWithCircle(size).surroundWithThinCircle(Color.BLACK) getUnitIcon(construction).surroundWithCircle(size).surroundWithThinCircle()
} }
if (construction == "Nothing") if (construction == "Nothing")
return getImage("OtherIcons/Sleep").surroundWithCircle(size).surroundWithThinCircle(Color.BLACK) return getImage("OtherIcons/Sleep").surroundWithCircle(size).surroundWithThinCircle()
return getStatIcon(construction).surroundWithCircle(size).surroundWithThinCircle(Color.BLACK) return getStatIcon(construction).surroundWithCircle(size).surroundWithThinCircle()
} }
fun getPromotionIcon(promotionName: String, size: Float = 30f): Actor { fun getPromotionIcon(promotionName: String, size: Float = 30f): Actor {
@ -366,7 +366,7 @@ object ImageGetter {
production.x = iconGroup.width - production.width production.x = iconGroup.width - production.width
iconGroup.addActor(production) iconGroup.addActor(production)
} }
return iconGroup.surroundWithThinCircle(Color.BLACK) return iconGroup.surroundWithThinCircle()
} }
fun getTechIconGroup(techName: String, circleSize: Float): IconCircleGroup { fun getTechIconGroup(techName: String, circleSize: Float): IconCircleGroup {

2
core/src/com/unciv/ui/pickerscreens/TechButton.kt
View File

@ -104,7 +104,7 @@ class TechButton(techName:String, private val techManager: TechManager, isWorldS
ImageGetter.getImage("OtherIcons/Star") ImageGetter.getImage("OtherIcons/Star")
.apply { color = Color.BLACK } .apply { color = Color.BLACK }
.surroundWithCircle(techIconSize) .surroundWithCircle(techIconSize)
.surroundWithThinCircle(Color.BLACK)) .surroundWithThinCircle())
if (isWorldScreen) rightSide.add(techEnabledIcons) if (isWorldScreen) rightSide.add(techEnabledIcons)
else rightSide.add(techEnabledIcons) else rightSide.add(techEnabledIcons)

2
core/src/com/unciv/ui/utils/extensions/Scene2dExtensions.kt
View File

@ -313,7 +313,7 @@ fun Actor.surroundWithCircle(size: Float, resizeActor: Boolean = true, color: Co
return IconCircleGroup(size, this, resizeActor, color) return IconCircleGroup(size, this, resizeActor, color)
} }
fun Actor.surroundWithThinCircle(color: Color): IconCircleGroup = surroundWithCircle(width*1.05f, false, color) fun Actor.surroundWithThinCircle(color: Color=Color.BLACK): IconCircleGroup = surroundWithCircle(width*1.05f, false, color)
fun Actor.addBorder(size:Float, color: Color, expandCell:Boolean = false): Table { fun Actor.addBorder(size:Float, color: Color, expandCell:Boolean = false): Table {