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

More terrainFeature refactors (#3694)

Browse Source
This commit is contained in:
GGGuenni 2021-03-13 22:38:11 +01:00 committed by GitHub
parent 20f5672337
commit 57f6c99d86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -332,8 +332,8 @@ class GameInfo {
// So we remove them so the game doesn't crash when it tries to access them. // So we remove them so the game doesn't crash when it tries to access them.
private fun removeMissingModReferences() { private fun removeMissingModReferences() {
for (tile in tileMap.values) { for (tile in tileMap.values) {
if (tile.terrainFeature != null && !ruleSet.terrains.containsKey(tile.terrainFeature!!)) for (terrainFeature in tile.terrainFeatures.filter{ !ruleSet.terrains.containsKey(it) })
tile.terrainFeature = null tile.terrainFeatures.remove(terrainFeature)
if (tile.resource != null && !ruleSet.tileResources.containsKey(tile.resource!!)) if (tile.resource != null && !ruleSet.tileResources.containsKey(tile.resource!!))
tile.resource = null tile.resource = null
if (tile.improvement != null && !ruleSet.tileImprovements.containsKey(tile.improvement!!) if (tile.improvement != null && !ruleSet.tileImprovements.containsKey(tile.improvement!!)

2
core/src/com/unciv/logic/battle/Battle.kt
View File

@ -404,7 +404,7 @@ object Battle {
tile.improvementInProgress = null tile.improvementInProgress = null
tile.turnsToImprovement = 0 tile.turnsToImprovement = 0
tile.roadStatus = RoadStatus.None tile.roadStatus = RoadStatus.None
if (tile.isLand && !tile.isImpassible()) tile.terrainFeature = "Fallout" if (tile.isLand && !tile.isImpassible()) tile.terrainFeatures.contains("Fallout")
} }
for (civ in attacker.getCivInfo().getKnownCivs()) { for (civ in attacker.getCivInfo().getKnownCivs()) {

4
core/src/com/unciv/logic/city/CityInfo.kt
View File

@ -116,8 +116,8 @@ class CityInfo {
tryUpdateRoadStatus() tryUpdateRoadStatus()
val tile = getCenterTile() val tile = getCenterTile()
if (getRuleset().tileImprovements.containsKey("Remove " + tile.terrainFeature)) for (terrainFeature in tile.terrainFeatures.filter { getRuleset().tileImprovements.containsKey("Remove $it") })
tile.terrainFeature = null tile.terrainFeatures.remove(terrainFeature)
tile.improvement = null tile.improvement = null
tile.improvementInProgress = null tile.improvementInProgress = null

2
core/src/com/unciv/logic/civilization/CivInfoStats.kt
View File

@ -60,7 +60,7 @@ class CivInfoStats(val civInfo: CivilizationInfo) {
if (tile.isCityCenter()) continue if (tile.isCityCenter()) continue
if (ignoreHillTiles && tile.isHill()) continue if (ignoreHillTiles && tile.isHill()) continue
if (tile.terrainFeature in ignoredTileTypes || tile.baseTerrain in ignoredTileTypes) { if (tile.terrainFeatures.any { it in ignoredTileTypes } || tile.baseTerrain in ignoredTileTypes) {
continue continue
} }

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

@ -260,7 +260,7 @@ class MapGenerator(val ruleset: Ruleset) {
val vegetation = (randomness.getPerlinNoise(tile, vegetationSeed, scale = 3.0, nOctaves = 1) + 1.0) / 2.0 val vegetation = (randomness.getPerlinNoise(tile, vegetationSeed, scale = 3.0, nOctaves = 1) + 1.0) / 2.0
if (vegetation <= tileMap.mapParameters.vegetationRichness) if (vegetation <= tileMap.mapParameters.vegetationRichness)
tile.terrainFeature = Constants.vegetation.filter { ruleset.terrains[it]!!.occursOn.contains(tile.baseTerrain) }.random(randomness.RNG) tile.terrainFeatures.add(Constants.vegetation.filter { ruleset.terrains[it]!!.occursOn.contains(tile.baseTerrain) }.random(randomness.RNG))
} }
} }
/** /**
@ -275,7 +275,7 @@ class MapGenerator(val ruleset: Ruleset) {
val possibleFeatures = rareFeatures.filter { it.occursOn.contains(tile.baseTerrain) val possibleFeatures = rareFeatures.filter { it.occursOn.contains(tile.baseTerrain)
&& (!tile.isHill() || it.occursOn.contains(Constants.hill)) } && (!tile.isHill() || it.occursOn.contains(Constants.hill)) }
if (possibleFeatures.any()) if (possibleFeatures.any())
tile.terrainFeature = possibleFeatures.random(randomness.RNG).name tile.terrainFeatures.add(possibleFeatures.random(randomness.RNG).name)
} }
} }
} }

2
core/src/com/unciv/logic/map/mapgenerator/RiverGenerator.kt
View File

@ -22,7 +22,7 @@ class RiverGenerator(val randomness: MapGenerationRandomness){
for(tile in map.values){ for(tile in map.values){
if(tile.isAdjacentToRiver()){ if(tile.isAdjacentToRiver()){
if(tile.baseTerrain== Constants.desert && !tile.isHill()) tile.terrainFeature= Constants.floodPlains if(tile.baseTerrain== Constants.desert && !tile.isHill()) tile.terrainFeatures.add(Constants.floodPlains)
else if(tile.baseTerrain== Constants.snow) tile.baseTerrain = Constants.tundra else if(tile.baseTerrain== Constants.snow) tile.baseTerrain = Constants.tundra
else if(tile.baseTerrain== Constants.tundra) tile.baseTerrain = Constants.plains else if(tile.baseTerrain== Constants.tundra) tile.baseTerrain = Constants.plains
tile.setTerrainTransients() tile.setTerrainTransients()

5
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View File

@ -367,9 +367,8 @@ object UnitActions {
uncivSound = UncivSound.Chimes, uncivSound = UncivSound.Chimes,
action = { action = {
val unitTile = unit.getTile() val unitTile = unit.getTile()
if (unitTile.terrainFeature != null && for (terrainFeature in tile.terrainFeatures.filter{ unitTile.ruleset.tileImprovements.containsKey("Remove $it") })
unitTile.ruleset.tileImprovements.containsKey("Remove " + unitTile.terrainFeature)) unitTile.terrainFeatures.remove(terrainFeature)// remove forest/jungle/marsh
unitTile.terrainFeature = null // remove forest/jungle/marsh
unitTile.improvement = improvementName unitTile.improvement = improvementName
unitTile.improvementInProgress = null unitTile.improvementInProgress = null
unitTile.turnsToImprovement = 0 unitTile.turnsToImprovement = 0