From 32efae340b4437613b4030a3cd2279f606f35370 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 9 Apr 2018 19:09:08 +0300 Subject: [PATCH] Unit table now displays ranged strength for ranged units --- android/build.gradle | 4 ++-- .../unciv/ui/worldscreen/unit/UnitTable.kt | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index c917a0dfb3..55c41280ae 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.game" minSdkVersion 14 targetSdkVersion 26 - versionCode 37 - versionName "1.4.4" + versionCode 38 + versionName "1.4.5" } buildTypes { release { diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt index ef216e19ee..8eb7770e4c 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt @@ -40,17 +40,17 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){ if(selectedUnit!=null) { val unit = selectedUnit!! - if (unit.getBaseUnit().unitType == UnitType.Civilian) { - unitLabel.setText(unit.name - + "\r\nMovement: " + unit.getMovementString() - ) - } else { - unitLabel.setText(unit.name - + "\r\nMovement: " + unit.getMovementString() - + "\r\nHealth: " + unit.health - + "\r\nStrength: " + unit.getBaseUnit().strength - ) + var unitLabelText = unit.name + + "\r\nMovement: " + unit.getMovementString() + if (unit.getBaseUnit().unitType != UnitType.Civilian) { + unitLabelText += "\r\nHealth: " + unit.health + + "\r\nStrength: " + unit.getBaseUnit().strength } + if (unit.getBaseUnit().unitType == UnitType.Ranged) + unitLabelText += "\r\nRanged strength: "+unit.getBaseUnit().rangedStrength + + unitLabel.setText(unitLabelText) + for (button in UnitActions().getUnitActions(selectedUnit!!, worldScreen)) unitActionsTable.add(button).colspan(2).pad(5f) .size(button.width * worldScreen.buttonScale, button.height * worldScreen.buttonScale).row()