mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-24 22:59:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

Renamed City.civInfo -> civ

Browse Source
This commit is contained in:
Yair Morgenstern
2023-02-02 19:21:12 +02:00
parent 3066a50020
commit 6414ad95ae
57 changed files with 353 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/src/com/unciv/logic/map/TileImprovementConstructionTests.kt
View File

@ -38,7 +38,7 @@ class TileImprovementConstructionTests {
ruleSet = RulesetCache.getVanillaRuleset()
civInfo.tech.researchedTechnologies.addAll(ruleSet.technologies.values)
civInfo.tech.techsResearched.addAll(ruleSet.technologies.keys)
city.civInfo = civInfo
city.civ = civInfo
}

10
tests/src/com/unciv/logic/map/UnitMovementAlgorithmsTests.kt
View File

@ -83,7 +83,7 @@ class UnitMovementAlgorithmsTests {
val city = City()
city.location = cityTile.position
city.civInfo = civInfo
city.civ = civInfo
cityTile.setOwningCity(city)
for (type in ruleSet.unitTypes)
@ -250,7 +250,7 @@ class UnitMovementAlgorithmsTests {
val city = City()
city.location = tile.position.cpy().add(1f,1f)
city.civInfo = otherCiv
city.civ = otherCiv
tile.setOwningCity(city)
unit.baseUnit = BaseUnit().apply { unitType = ruleSet.unitTypes.keys.first(); ruleset = ruleSet }
@ -307,7 +307,7 @@ class UnitMovementAlgorithmsTests {
val city = City()
city.location = tile.position.cpy().add(5f, 5f) // random shift to avoid of being in city
city.civInfo = otherCiv
city.civ = otherCiv
tile.setOwningCity(city)
}
@ -415,12 +415,12 @@ class UnitMovementAlgorithmsTests {
newTiles[3].setTransients()
// create our city
City().apply {
this.civInfo = this@UnitMovementAlgorithmsTests.civInfo
this.civ = this@UnitMovementAlgorithmsTests.civInfo
location = newTiles.last().position.cpy()
tiles.add(location)
tiles.add(newTiles[5].position)
tileMap = tile.tileMap
civInfo.cities = listOf(this)
civ.cities = listOf(this)
newTiles[5].setOwningCity(this)
newTiles.last().setOwningCity(this)
}