City button padding expanded, warrior now has 2 strength as it should

android/assets/jsons/Units.json

@@ -27,6 +27,7 @@
 		description: "A basic fighting unit",
 		unitType:"Melee",
 		movement:2,
+		strength:2,
 		cost: 40,
 		hurryCostModifier:20
 	},

core/src/com/unciv/models/gamebasics/Unit.kt

@@ -17,9 +17,6 @@ class Unit : INamed, IConstruction {
     lateinit var unitType: UnitType
     internal var unbuildable: Boolean = false // for special units like great people
 
-    val isConstructable: Boolean
-        get() = !unbuildable
-
     fun getMapUnit(): MapUnit {
         val unit = MapUnit()
         unit.name = name

core/src/com/unciv/ui/pickerscreens/ConstructionPickerScreen.kt

@@ -57,7 +57,7 @@ class ConstructionPickerScreen(val city: CityInfo) : PickerScreen() {
                 regularBuildings.addActor(productionTextButton)
         }
 
-        for (unit in GameBasics.Units.values.filter { it.isConstructable }) {
+        for (unit in GameBasics.Units.values.filterNot { it.unbuildable }) {
             units.addActor(getProductionButton(unit.name,
                     unit.name + "\r\n" + cityConstructions.turnsToConstruction(unit.name) + " turns",
                     unit.description, "Train " + unit.name))

core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt

@@ -57,7 +57,7 @@ class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) {
 
             cityButton!!.run {
                 clear()
-                add(label).pad(5f)
+                add(label).pad(10f)
                 pack()
                 setOrigin(Align.center)
                 toFront()