AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-24 03:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yair Morgenstern 2018-04-08 16:13:54 +03:00
parent 9978ec5264
commit 4de9ee106f
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/assets/jsons/Units.json
View File

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

3
core/src/com/unciv/models/gamebasics/Unit.kt
View File

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

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

@ -57,7 +57,7 @@ class ConstructionPickerScreen(val city: CityInfo) : PickerScreen() {
regularBuildings.addActor(productionTextButton) 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, units.addActor(getProductionButton(unit.name,
unit.name + "\r\n" + cityConstructions.turnsToConstruction(unit.name) + " turns", unit.name + "\r\n" + cityConstructions.turnsToConstruction(unit.name) + " turns",
unit.description, "Train " + unit.name)) unit.description, "Train " + unit.name))

2
core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt
View File

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