AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-24 03:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore(purity) - removed suppressions

Browse Source
This commit is contained in:
yairm210 2025-08-17 14:44:06 +03:00
parent b006673e1c
commit 77d166898f
2 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/com/unciv/logic/automation/civilization/MotivationToAttackAutomation.kt
View File

@ -16,14 +16,13 @@ import com.unciv.models.ruleset.nation.PersonalityValue
import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.ruleset.unit.BaseUnit
import com.unciv.ui.screens.victoryscreen.RankingType
import yairm210.purity.annotations.Pure
import yairm210.purity.annotations.Readonly
object MotivationToAttackAutomation {
/** Will return the motivation to attack, but might short circuit if the value is guaranteed to
* be lower than `atLeast`. So any values below `atLeast` should not be used for comparison. */
@Readonly @Suppress("purity") // requires changing dependents from mutating to readonly
@Readonly
fun hasAtLeastMotivationToAttack(civInfo: Civilization, targetCiv: Civilization, atLeast: Float): Float {
val diplomacyManager = civInfo.getDiplomacyManager(targetCiv)!!
val personality = civInfo.getPersonality()
@ -123,7 +122,7 @@ object MotivationToAttackAutomation {
modifiers.add(Pair("Allied City-state", -20 * personality.modifierFocus(PersonalityValue.Diplomacy, .8f))) // There had better be a DAMN good reason
}
addWonderBasedMotivations(targetCiv, modifiers)
modifiers += getWonderBasedMotivations(targetCiv)
modifiers.add(Pair("War with allies", getAlliedWarMotivation(civInfo, targetCiv)))
@ -157,22 +156,11 @@ object MotivationToAttackAutomation {
if (civInfo.getCapital() != null) ourCombatStrength += CityCombatant(civInfo.getCapital()!!).getCityStrength()
return ourCombatStrength
}
@Pure
fun addHelloWorld(@Pure add: (String) -> Unit){
add("Hello")
add("World")
}
@Pure
fun a(): MutableList<String> {
val myList = mutableListOf<String>()
addHelloWorld{myList.add(it)}
return myList
}
private fun addWonderBasedMotivations(otherCiv: Civilization, modifiers: MutableList<Pair<String, Float>>) {
@Readonly
private fun getWonderBasedMotivations(otherCiv: Civilization): MutableList<Pair<String, Float>> {
var wonderCount = 0
val modifiers = mutableListOf<Pair<String, Float>>()
for (city in otherCiv.cities) {
val construction = city.cityConstructions.getCurrentConstruction()
if (construction is Building && construction.hasUnique(UniqueType.TriggersCulturalVictory))
@ -186,6 +174,7 @@ object MotivationToAttackAutomation {
// Civs need an army to protect thier wonders which give the most score
if (wonderCount > 0)
modifiers.add(Pair("Owned Wonders", wonderCount.toFloat()))
return modifiers
}
/** If they are at war with our allies, then we should join in */
@ -330,12 +319,14 @@ object MotivationToAttackAutomation {
@Readonly
private fun getAttackPathsModifier(civInfo: Civilization, otherCiv: Civilization, targetCitiesWithOurCity: List<Pair<City, City>>): Float {
@Readonly
fun isTileCanMoveThrough(civInfo: Civilization, tile: Tile): Boolean {
val owner = tile.getOwner()
return !tile.isImpassible()
&& (owner == otherCiv || owner == null || civInfo.diplomacyFunctions.canPassThroughTiles(owner))
}
@Readonly
fun isLandTileCanMoveThrough(civInfo: Civilization, tile: Tile): Boolean {
return tile.isLand && isTileCanMoveThrough(civInfo, tile)
}

20
core/src/com/unciv/logic/map/tile/TileStatFunctions.kt
View File

@ -32,7 +32,7 @@ class TileStatFunctions(val tile: Tile) {
localUniqueCache: LocalUniqueCache = LocalUniqueCache(false)
): Stats = getTileStats(tile.getCity(), observingCiv, localUniqueCache)
@Readonly @Suppress("purity") // requires "for @LocalState X"
@Readonly
fun getTileStats(
city: City?, observingCiv: Civilization?,
localUniqueCache: LocalUniqueCache = LocalUniqueCache(false)
@ -43,14 +43,14 @@ class TileStatFunctions(val tile: Tile) {
val road = tile.getUnpillagedRoad()
val percentageStats = getTilePercentageStats(observingCiv, city, localUniqueCache)
for (stats in statsBreakdown) {
val tileType = when (stats.first) {
for ((cause, @LocalState stats) in statsBreakdown) {
val tileType = when (cause) {
improvement -> TilePercentageCategory.Improvement
road.name -> TilePercentageCategory.Road
else -> TilePercentageCategory.Terrain
}
for ((stat, value) in percentageStats[tileType]!!)
stats.second[stat] *= value.toPercent()
stats[stat] *= value.toPercent()
}
return statsBreakdown.toStats()
@ -193,7 +193,7 @@ class TileStatFunctions(val tile: Tile) {
}
// Only gets the tile percentage bonus, not the improvement percentage bonus
@Suppress("MemberVisibilityCanBePrivate", "purity")
@Suppress("MemberVisibilityCanBePrivate")
@Readonly
fun getTilePercentageStats(observingCiv: Civilization?, city: City?, uniqueCache: LocalUniqueCache): EnumMap<TilePercentageCategory, Stats> {
val terrainStats = Stats()
@ -244,11 +244,11 @@ class TileStatFunctions(val tile: Tile) {
}
}
return EnumMap<TilePercentageCategory, Stats>(TilePercentageCategory::class.java).apply {
put(TilePercentageCategory.Terrain, terrainStats)
put(TilePercentageCategory.Improvement, improvementStats)
put(TilePercentageCategory.Road, roadStats)
}
val enumMap = EnumMap<TilePercentageCategory, Stats>(TilePercentageCategory::class.java)
enumMap[TilePercentageCategory.Terrain] = terrainStats
enumMap[TilePercentageCategory.Improvement] = improvementStats
enumMap[TilePercentageCategory.Road] = roadStats
return enumMap
}
fun getTileStartScore(cityCenterMinStats: Stats): Float {