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

Continuation of d2541e6, to better fit coding standards (everything worked fine)

Browse Source 
I reallly like the way you did this, so I'm making it enabled by default =D
This commit is contained in:
Yair Morgenstern
2019-05-12 19:29:02 +03:00
parent d2541e6c4a
commit 42a0e2e771
5 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/GameSettings.kt
View File

@ -5,7 +5,7 @@ import com.unciv.logic.GameSaver
class GameSettings { class GameSettings {
var showWorkedTiles: Boolean = false var showWorkedTiles: Boolean = false
var showResourcesAndImprovements: Boolean = true var showResourcesAndImprovements: Boolean = true
var checkForDueUnits: Boolean = false var checkForDueUnits: Boolean = true
var language: String = "English" var language: String = "English"
var resolution: String = "1050x700" var resolution: String = "1050x700"
var tutorialsShown = ArrayList<String>() var tutorialsShown = ArrayList<String>()

6
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -300,14 +300,12 @@ class CivilizationInfo {
units=newList units=newList
} }
fun getDueUnits() = getCivUnits().filter { it.due } fun getDueUnits() = getCivUnits().filter { it.due && it.isIdle() }
fun hasDueUnits() = getDueUnits().isNotEmpty()
fun shouldOpenTechPicker() = tech.freeTechs != 0 fun shouldOpenTechPicker() = tech.freeTechs != 0
|| tech.currentTechnology()==null && cities.isNotEmpty() || tech.currentTechnology()==null && cities.isNotEmpty()
fun shouldGoToDueUnit() = UnCivGame.Current.settings.checkForDueUnits && hasDueUnits() fun shouldGoToDueUnit() = UnCivGame.Current.settings.checkForDueUnits && getDueUnits().isNotEmpty()
fun getNextDueUnit(selectedUnit: MapUnit?): MapUnit? { fun getNextDueUnit(selectedUnit: MapUnit?): MapUnit? {
val dueUnits = getDueUnits() val dueUnits = getDueUnits()

1
core/src/com/unciv/logic/map/MapUnit.kt
View File

@ -36,7 +36,6 @@ class MapUnit {
var attacksThisTurn = 0 var attacksThisTurn = 0
var promotions = UnitPromotions() var promotions = UnitPromotions()
var due: Boolean = true var due: Boolean = true
get() = field && isIdle()
//region pure functions //region pure functions
fun clone(): MapUnit { fun clone(): MapUnit {

5
core/src/com/unciv/ui/worldscreen/WorldScreen.kt
View File

@ -228,8 +228,9 @@ class WorldScreen : CameraStageBaseScreen() {
// cycle through units not yet done // cycle through units not yet done
if (currentPlayerCiv.shouldGoToDueUnit()) { if (currentPlayerCiv.shouldGoToDueUnit()) {
currentPlayerCiv.getNextDueUnit(bottomBar.unitTable.selectedUnit)?.let { val nextDueUnit = currentPlayerCiv.getNextDueUnit(bottomBar.unitTable.selectedUnit)
tileMapHolder.setCenterPosition(it.currentTile.position) if(nextDueUnit!=null) {
tileMapHolder.setCenterPosition(nextDueUnit.currentTile.position)
shouldUpdate=true shouldUpdate=true
return@onClick return@onClick
} }

2
core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenOptionsTable.kt
View File

@ -51,7 +51,7 @@ class WorldScreenOptionsTable(screen:WorldScreen) : PopupTable(screen){
else addButton("Show") { settings.showResourcesAndImprovements = true; update() } else addButton("Show") { settings.showResourcesAndImprovements = true; update() }
add("Check for idle units".toLabel()) add("Check for idle units".toLabel())
addButton(if(settings.checkForDueUnits) "Yes" else "No") { addButton(if(settings.checkForDueUnits) "Yes".tr() else "No".tr()) {
settings.checkForDueUnits = !settings.checkForDueUnits settings.checkForDueUnits = !settings.checkForDueUnits
update() update()
} }