mirror of
https://github.com/yairm210/Unciv.git
synced 2025-07-11 16:29:48 +07:00
ci: improved detekt configuration and ci (#9380)
* ci: improved detekt configuration it still needs some work but it's getting there * detekt: separated errors from warnings Detekt doesn't currently have a mechanism for failing only on specific issues workaround suggested by the maintainer of Detekt * rebased on master * fix: resolve ExplicitItLambdaParameter * fix: fix last star import
This commit is contained in:
@ -36,7 +36,7 @@ import com.unciv.ui.audio.MusicMood
|
||||
import com.unciv.ui.audio.MusicTrackChooserFlags
|
||||
import com.unciv.utils.DebugUtils
|
||||
import com.unciv.utils.debug
|
||||
import java.util.*
|
||||
import java.util.UUID
|
||||
|
||||
|
||||
/**
|
||||
|
@ -220,7 +220,7 @@ class WorkerAutomation(
|
||||
}
|
||||
if (candidateCities.none()) return false // do nothing.
|
||||
|
||||
val isCandidateTilePredicate = { it: Tile -> it.isLand && unit.movement.canPassThrough(it) }
|
||||
val isCandidateTilePredicate: (Tile) -> Boolean = { it.isLand && unit.movement.canPassThrough(it) }
|
||||
val currentTile = unit.getTile()
|
||||
val cityTilesToSeek = ArrayList(tilesOfConnectedCities.sortedBy { it.aerialDistanceTo(currentTile) })
|
||||
|
||||
|
@ -196,10 +196,10 @@ class TechManager : IsPartOfGameInfoSerialization {
|
||||
private fun addCurrentScienceToScienceOfLast8Turns() {
|
||||
// The Science the Great Scientist generates does not include Science from Policies, Trade routes and City-States.
|
||||
var allCitiesScience = 0f
|
||||
civInfo.cities.forEach { it ->
|
||||
civInfo.cities.forEach {
|
||||
val totalBaseScience = it.cityStats.baseStatTree.totalStats.science
|
||||
val totalBonusPercents = it.cityStats.statPercentBonusTree.children.asSequence()
|
||||
.filter { it.key != "Policies" }.map { it.value.totalStats.science }.sum()
|
||||
.filter { it2 -> it2.key != "Policies" }.map { it2 -> it2.value.totalStats.science }.sum()
|
||||
allCitiesScience += totalBaseScience * totalBonusPercents.toPercent()
|
||||
}
|
||||
scienceOfLast8Turns[civInfo.gameInfo.turns % 8] = allCitiesScience.toInt()
|
||||
|
Reference in New Issue
Block a user