AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 05:46:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore(purity): minor

Browse Source
This commit is contained in:
yairm210 2025-08-08 10:21:47 +03:00
parent 8db6383e58
commit 064ba90990
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/automation/civilization/NextTurnAutomation.kt
View File

@ -26,6 +26,7 @@ import com.unciv.models.ruleset.unit.BaseUnit
import com.unciv.models.stats.Stat import com.unciv.models.stats.Stat
import com.unciv.ui.screens.victoryscreen.RankingType import com.unciv.ui.screens.victoryscreen.RankingType
import com.unciv.utils.randomWeighted import com.unciv.utils.randomWeighted
import yairm210.purity.annotations.Readonly
import kotlin.random.Random import kotlin.random.Random
object NextTurnAutomation { object NextTurnAutomation {
@ -582,13 +583,14 @@ object NextTurnAutomation {
diplomacyManager.removeFlag(demand.violationOccurred) diplomacyManager.removeFlag(demand.violationOccurred)
} }
@Readonly
fun getMinDistanceBetweenCities(civ1: Civilization, civ2: Civilization): Int { fun getMinDistanceBetweenCities(civ1: Civilization, civ2: Civilization): Int {
return getClosestCities(civ1, civ2)?.aerialDistance ?: Int.MAX_VALUE return getClosestCities(civ1, civ2)?.aerialDistance ?: Int.MAX_VALUE
} }
data class CityDistance(val city1: City, val city2: City, val aerialDistance: Int) data class CityDistance(val city1: City, val city2: City, val aerialDistance: Int)
@Readonly
fun getClosestCities(civ1: Civilization, civ2: Civilization): CityDistance? { fun getClosestCities(civ1: Civilization, civ2: Civilization): CityDistance? {
if (civ1.cities.isEmpty() || civ2.cities.isEmpty()) if (civ1.cities.isEmpty() || civ2.cities.isEmpty())
return null return null

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

@ -25,6 +25,7 @@ import com.unciv.models.stats.Stats
import com.unciv.ui.screens.worldscreen.unit.actions.UnitActions import com.unciv.ui.screens.worldscreen.unit.actions.UnitActions
import com.unciv.ui.screens.worldscreen.unit.actions.UnitActionsFromUniques import com.unciv.ui.screens.worldscreen.unit.actions.UnitActionsFromUniques
import com.unciv.utils.debug import com.unciv.utils.debug
import yairm210.purity.annotations.Readonly
import kotlin.math.abs import kotlin.math.abs
/** /**
@ -679,6 +680,7 @@ class WorkerAutomation(
* Can return `true` if there is an improvement that does not match the resource (for future modding abilities). * Can return `true` if there is an improvement that does not match the resource (for future modding abilities).
* Does not check tile ownership - caller [automateWorkBoats] already did, other callers need to ensure this explicitly. * Does not check tile ownership - caller [automateWorkBoats] already did, other callers need to ensure this explicitly.
*/ */
@Readonly
fun hasWorkableSeaResource(tile: Tile, civInfo: Civilization) = when { fun hasWorkableSeaResource(tile: Tile, civInfo: Civilization) = when {
!tile.isWater -> false !tile.isWater -> false
tile.resource == null -> false tile.resource == null -> false
@ -695,6 +697,7 @@ class WorkerAutomation(
* Only tests resource type and city range, not any improvement requirements. * Only tests resource type and city range, not any improvement requirements.
* @throws NullPointerException on tiles without a resource * @throws NullPointerException on tiles without a resource
*/ */
@Readonly
fun isNotBonusResourceOrWorkable(tile: Tile, civInfo: Civilization): Boolean = fun isNotBonusResourceOrWorkable(tile: Tile, civInfo: Civilization): Boolean =
tile.tileResource.resourceType != ResourceType.Bonus // Improve Oil even if no City reaps the yields tile.tileResource.resourceType != ResourceType.Bonus // Improve Oil even if no City reaps the yields
|| civInfo.cities.any { it.tilesInRange.contains(tile) } // Improve Fish only if any of our Cities reaps the yields || civInfo.cities.any { it.tilesInRange.contains(tile) } // Improve Fish only if any of our Cities reaps the yields