diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json index d48e70c3f9..4435a34e92 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -27,6 +27,7 @@ description: "A basic fighting unit", unitType:"Melee", movement:2, + strength:2, cost: 40, hurryCostModifier:20 }, diff --git a/core/src/com/unciv/models/gamebasics/Unit.kt b/core/src/com/unciv/models/gamebasics/Unit.kt index d61c7abd6d..6488fbf83c 100644 --- a/core/src/com/unciv/models/gamebasics/Unit.kt +++ b/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 diff --git a/core/src/com/unciv/ui/pickerscreens/ConstructionPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/ConstructionPickerScreen.kt index bd4ae62a62..adc219b06c 100644 --- a/core/src/com/unciv/ui/pickerscreens/ConstructionPickerScreen.kt +++ b/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)) diff --git a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt b/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt index ef1d35432f..b81fcfa226 100644 --- a/core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt +++ b/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()