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

Removed the crutches for unit attack bugs - we want to figure them out!

Browse Source
This commit is contained in:
Yair Morgenstern 2020-05-11 20:33:53 +03:00
parent 3a2b8453d5
commit 1adb19787a
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/ui/saves/LoadGameScreen.kt
View File

@ -115,7 +115,7 @@ class LoadGameScreen(previousScreen:CameraStageBaseScreen) : PickerScreen() {
private fun updateLoadableGames(showAutosaves:Boolean) { private fun updateLoadableGames(showAutosaves:Boolean) {
saveTable.clear() saveTable.clear()
for (save in GameSaver.getSaves().sortedByDescending { GameSaver.getSave(it).lastModified() }) { for (save in GameSaver.getSaves().sortedByDescending { GameSaver.getSave(it).lastModified() }) {
if(save.startsWith("Autosave") && !showAutosaves) continue if (save.startsWith("Autosave") && !showAutosaves) continue
val textButton = TextButton(save, skin) val textButton = TextButton(save, skin)
textButton.onClick { textButton.onClick {
selectedSave = save selectedSave = save

23
core/src/com/unciv/ui/worldscreen/bottombar/BattleTable.kt
View File

@ -208,14 +208,9 @@ class BattleTable(val worldScreen: WorldScreen): Table() {
else { else {
attackButton.onClick { attackButton.onClick {
try { Battle.moveAndAttack(attacker, attackableTile)
Battle.moveAndAttack(attacker, attackableTile) worldScreen.mapHolder.unitActionOverlay?.remove() // the overlay was one of attacking
worldScreen.mapHolder.unitActionOverlay?.remove() // the overlay was one of attacking worldScreen.shouldUpdate = true
worldScreen.shouldUpdate = true
}
catch (ex:Exception){
openBugReportPopup()
}
} }
} }
@ -285,15 +280,9 @@ class BattleTable(val worldScreen: WorldScreen): Table() {
} }
else { else {
attackButton.onClick { attackButton.onClick {
try { Battle.nuke(attacker, targetTile)
Battle.nuke(attacker, targetTile) worldScreen.mapHolder.unitActionOverlay?.remove() // the overlay was one of attacking
worldScreen.mapHolder.unitActionOverlay?.remove() // the overlay was one of attacking worldScreen.shouldUpdate = true
worldScreen.shouldUpdate = true
}
catch (ex:Exception){
openBugReportPopup()
}
} }
} }