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

ci: improved detekt configuration and ci (#9380)

Browse Source 
* 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:
alexban011
2023-05-14 21:55:36 +03:00
committed by GitHub
parent ae13f32f72
commit 841a1aa564
9 changed files with 798 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/GameInfo.kt
View File

@ -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
/**

2
core/src/com/unciv/logic/automation/unit/WorkerAutomation.kt
View File

@ -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) })

4
core/src/com/unciv/logic/civilization/managers/TechManager.kt
View File

@ -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()