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

modding: "Becomes [terrainName] when adjacent to [terrainFilter]" accepts conditionals

Browse Source
This commit is contained in:
yairm210 2024-11-02 18:51:36 +02:00
parent 28c65f2684
commit 66ed5ee5ef
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/map/mapgenerator/MapGenerator.kt
View File

@ -19,6 +19,7 @@ import com.unciv.models.ruleset.unique.Unique
import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.ui.screens.mapeditorscreen.MapGeneratorSteps import com.unciv.ui.screens.mapeditorscreen.MapGeneratorSteps
import com.unciv.logic.map.tile.TileNormalizer import com.unciv.logic.map.tile.TileNormalizer
import com.unciv.models.ruleset.unique.StateForConditionals
import com.unciv.utils.debug import com.unciv.utils.debug
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.isActive import kotlinx.coroutines.isActive
@ -225,7 +226,7 @@ class MapGenerator(val ruleset: Ruleset, private val coroutineScope: CoroutineSc
fun convertTerrains(ruleset: Ruleset, tiles: Iterable<Tile>) { fun convertTerrains(ruleset: Ruleset, tiles: Iterable<Tile>) {
for (tile in tiles) { for (tile in tiles) {
val conversionUnique = val conversionUnique =
tile.getBaseTerrain().getMatchingUniques(UniqueType.ChangesTerrain) tile.getBaseTerrain().getMatchingUniques(UniqueType.ChangesTerrain, StateForConditionals(tile = tile))
.firstOrNull { tile.isAdjacentTo(it.params[1]) } .firstOrNull { tile.isAdjacentTo(it.params[1]) }
?: continue ?: continue
val terrain = ruleset.terrains[conversionUnique.params[0]] ?: continue val terrain = ruleset.terrains[conversionUnique.params[0]] ?: continue