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

Map editor update - concurrency, resource amounts, file double-click (#9461)

Browse Source
This commit is contained in:
SomeTroglodyte
2023-05-27 20:44:23 +02:00
committed by GitHub
parent 1c124c9ddf
commit ef193babee
11 changed files with 141 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/com/unciv/logic/map/tile/Tile.kt
View File

@ -8,9 +8,11 @@ import com.unciv.logic.city.City
import com.unciv.logic.civilization.Civilization
import com.unciv.logic.civilization.PlayerType
import com.unciv.logic.map.HexMath
import com.unciv.logic.map.MapParameters // Kdoc only
import com.unciv.logic.map.MapResources
import com.unciv.logic.map.TileMap
import com.unciv.logic.map.mapunit.MapUnit
import com.unciv.logic.map.mapunit.UnitMovement // Kdoc only
import com.unciv.models.ruleset.Ruleset
import com.unciv.models.ruleset.tile.ResourceType
import com.unciv.models.ruleset.tile.Terrain
@ -676,7 +678,7 @@ open class Tile : IsPartOfGameInfoSerialization {
/**
* @returns whether units of [civInfo] can pass through this tile, considering only civ-wide filters.
* Use [UnitMovementAlgorithms.canPassThrough] to check whether a specific unit can pass through a tile.
* Use [UnitMovement.canPassThrough] to check whether a specific unit can pass through a tile.
*/
fun canCivPassThrough(civInfo: Civilization): Boolean {
val tileOwner = getOwner()
@ -785,7 +787,10 @@ open class Tile : IsPartOfGameInfoSerialization {
fun setTileResource(newResource: TileResource, majorDeposit: Boolean? = null, rng: Random = Random.Default) {
resource = newResource.name
if (newResource.resourceType != ResourceType.Strategic) return
if (newResource.resourceType != ResourceType.Strategic) {
resourceAmount = 0
return
}
for (unique in newResource.getMatchingUniques(UniqueType.ResourceAmountOnTiles, StateForConditionals(tile = this))) {
if (matchesTerrainFilter(unique.params[0])) {