mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-12 16:59:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Ballista replaces catapult, not horseman

Browse Source 
When an improvement is under construction, you cannot pick to construct that improvement again
This commit is contained in:
Yair Morgenstern
2018-11-14 19:31:33 +02:00
parent deed7e7767
commit 640a3b873e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,7 @@
name:"Ballista", name:"Ballista",
unitType:"Siege", unitType:"Siege",
uniqueTo:"Rome", uniqueTo:"Rome",
replaces:"Horseman", replaces:"Catapult",
movement:2, movement:2,
strength:8, strength:8,
rangedStrength:10, rangedStrength:10,

5
core/src/com/unciv/ui/pickerscreens/ImprovementPickerScreen.kt
View File

@ -29,7 +29,10 @@ class ImprovementPickerScreen(tileInfo: TileInfo) : PickerScreen() {
val regularImprovements = VerticalGroup() val regularImprovements = VerticalGroup()
regularImprovements.space(10f) regularImprovements.space(10f)
for (improvement in GameBasics.TileImprovements.values) { for (improvement in GameBasics.TileImprovements.values) {
if (!tileInfo.canBuildImprovement(improvement, civInfo) || improvement.name == tileInfo.improvement) continue if (!tileInfo.canBuildImprovement(improvement, civInfo)) continue
if(improvement.name == tileInfo.improvement) continue
if(improvement.name==tileInfo.improvementInProgress) continue
val improvementButton = Button(skin) val improvementButton = Button(skin)
if(improvement.name.startsWith("Remove")) if(improvement.name.startsWith("Remove"))