diff --git a/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt b/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt index 46c5e6f18d..438b848a2f 100644 --- a/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt +++ b/core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt @@ -259,9 +259,8 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre if (construction is PerpetualConstruction) return Table() if (cityConstructions.getWorkDone(constructionName) == 0) return Table() - val constructionPercentage = min(cityConstructions.getWorkDone(constructionName) / - construction.getProductionCost(cityConstructions.cityInfo.civInfo).toFloat(), - 1f) + val constructionPercentage = cityConstructions.getWorkDone(constructionName) / + construction.getProductionCost(cityConstructions.cityInfo.civInfo).toFloat() return ImageGetter.getProgressBarVertical(2f, 30f, constructionPercentage, Color.BROWN.cpy().lerp(Color.WHITE, 0.5f), Color.WHITE) } diff --git a/core/src/com/unciv/ui/pickerscreens/TechButton.kt b/core/src/com/unciv/ui/pickerscreens/TechButton.kt index bd45d31835..735ce6817b 100644 --- a/core/src/com/unciv/ui/pickerscreens/TechButton.kt +++ b/core/src/com/unciv/ui/pickerscreens/TechButton.kt @@ -6,7 +6,6 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.utils.Align import com.unciv.logic.civilization.TechManager import com.unciv.ui.utils.* -import kotlin.math.min class TechButton(techName:String, private val techManager: TechManager, isWorldScreen: Boolean = true) : Table(CameraStageBaseScreen.skin) { val text = "".toLabel().apply { setAlignment(Align.center) } @@ -27,7 +26,7 @@ class TechButton(techName:String, private val techManager: TechManager, isWorldS val techThisTurn = techManager.civInfo.statsForNextTurn.science val percentComplete = (techCost - remainingTech) / techCost.toFloat() - val percentWillBeComplete = min((techCost - (remainingTech-techThisTurn)) / techCost.toFloat(), 1f) + val percentWillBeComplete = (techCost - (remainingTech-techThisTurn)) / techCost.toFloat() val progressBar = ImageGetter.VerticalProgressBar(2f, 50f) .addColor(Color.WHITE, 1f) .addColor(Color.BLUE.cpy().lerp(Color.WHITE, 0.3f), percentWillBeComplete) diff --git a/core/src/com/unciv/ui/tilegroups/CityButton.kt b/core/src/com/unciv/ui/tilegroups/CityButton.kt index 06e0287def..e055902f14 100644 --- a/core/src/com/unciv/ui/tilegroups/CityButton.kt +++ b/core/src/com/unciv/ui/tilegroups/CityButton.kt @@ -366,9 +366,8 @@ class CityButton(val city: CityInfo, private val tileGroup: WorldTileGroup): Tab label.pack() group.addActor(label) - val constructionPercentage = min(cityConstructions.getWorkDone(cityCurrentConstruction.name) / - cityCurrentConstruction.getProductionCost(cityConstructions.cityInfo.civInfo).toFloat(), - 1f) + val constructionPercentage = cityConstructions.getWorkDone(cityCurrentConstruction.name) / + cityCurrentConstruction.getProductionCost(cityConstructions.cityInfo.civInfo).toFloat() val productionBar = ImageGetter.getProgressBarVertical(2f, groupHeight, constructionPercentage, Color.BROWN.cpy().lerp(Color.WHITE, 0.5f), Color.BLACK) productionBar.x = 10f diff --git a/core/src/com/unciv/ui/utils/ImageGetter.kt b/core/src/com/unciv/ui/utils/ImageGetter.kt index 33e3214e7b..b9753edfb0 100644 --- a/core/src/com/unciv/ui/utils/ImageGetter.kt +++ b/core/src/com/unciv/ui/utils/ImageGetter.kt @@ -21,6 +21,7 @@ import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.tile.ResourceType import com.unciv.models.stats.Stats import kotlin.math.atan2 +import kotlin.math.min import kotlin.math.sqrt object ImageGetter { @@ -309,15 +310,15 @@ object ImageGetter { .addColor(progressColor, percentComplete) } - class VerticalProgressBar(width: Float, height: Float):Group(){ + class VerticalProgressBar(width: Float, height: Float):Group() { init { setSize(width, height) } - fun addColor(color: Color, percentage: Float):VerticalProgressBar { + fun addColor(color: Color, percentage: Float): VerticalProgressBar { val bar = getWhiteDot() bar.color = color - bar.setSize(width, height*percentage) + bar.setSize(width, height * min(percentage, 1f)) addActor(bar) return this }