mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-19 20:28:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

Renamed MapUnit.civInfo -> civ

Browse Source
This commit is contained in:
Yair Morgenstern
2023-02-02 19:31:41 +02:00
parent 6414ad95ae
commit 7d93b24d8c
49 changed files with 364 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ class UnitMovementAlgorithmsTests {
civInfo.gameInfo.speed = ruleSet.speeds[Speed.DEFAULTFORSIMULATION]!!
civInfo.nation = Nation().apply { name = "My nation" }
civInfo.gameInfo.civilizations.add(civInfo)
unit.civInfo = civInfo
unit.civ = civInfo
unit.owner = civInfo.civName
// Needed for convertHillToTerrainFeature to not crash
@ -217,7 +217,7 @@ class UnitMovementAlgorithmsTests {
otherCiv.civName = Constants.barbarians // they are always enemies
otherCiv.nation = Nation().apply { name = Constants.barbarians }
val otherUnit = MapUnit()
otherUnit.civInfo = otherCiv
otherUnit.civ = otherCiv
otherUnit.baseUnit = BaseUnit()
// melee check
otherUnit.baseUnit.strength = 1
@ -368,7 +368,7 @@ class UnitMovementAlgorithmsTests {
// Other unit on the way
val otherUnit = MapUnit()
otherUnit.civInfo = civInfo
otherUnit.civ = civInfo
otherUnit.owner = civInfo.civName
otherUnit.baseUnit = BaseUnit().apply { unitType = "Melee Water"; strength = 1; ruleset = ruleSet }
otherUnit.currentTile = newTiles[0]
@ -473,13 +473,13 @@ class UnitMovementAlgorithmsTests {
otherUnit.currentTile = newTiles.last()
newTiles.last().civilianUnit = otherUnit
otherUnit.name = "Worker"
otherUnit.civInfo = thirdCiv
otherUnit.civ = thirdCiv
otherUnit.owner = thirdCiv.civName
unit.movement.teleportToClosestMoveableTile()
Assert.assertTrue("Civilian unit must be captured by teleported unit",
unit.currentTile == newTiles.last() && otherUnit.civInfo == unit.civInfo)
unit.currentTile == newTiles.last() && otherUnit.civ == unit.civ)
}
@Test
@ -494,7 +494,7 @@ class UnitMovementAlgorithmsTests {
setupMilitaryUnitInTheCurrentTile("Aircraft Carrier")
unit.owner = civInfo.civName
unit.civInfo = civInfo
unit.civ = civInfo
unit.baseUnit.uniques.add("Can carry [2] [Aircraft] units")
unit.updateUniques(ruleSet)
civInfo.units.addUnit(unit, false)
@ -504,7 +504,7 @@ class UnitMovementAlgorithmsTests {
val newFighter = MapUnit()
newFighter.baseUnit = BaseUnit().apply { unitType = "Fighter"; ruleset = ruleSet }
newFighter.owner = civInfo.civName
newFighter.civInfo = civInfo
newFighter.civ = civInfo
newFighter.currentTile = unit.getTile()
tile.airUnits += newFighter
newFighter.name = "Fighter"

4
tests/src/com/unciv/logic/map/VisibilityTests.kt
View File

@ -33,10 +33,10 @@ class VisibilityTests {
civInfo.gameInfo.civilizations.add(civInfo)
civInfo.gameInfo.civilizations.add(enemyCivInfo)
unit.civInfo = civInfo
unit.civ = civInfo
unit.owner = civInfo.civName
enemyUnit.civInfo = enemyCivInfo
enemyUnit.civ = enemyCivInfo
enemyUnit.owner = enemyCivInfo.civName
tileMap.ruleset = ruleSet

2
tests/src/com/unciv/testing/SerializationTests.kt
View File

@ -73,7 +73,7 @@ class SerializationTests {
val civ = game.getCurrentPlayerCivilization()
val unit = civ.units.getCivUnits().first { it.hasUnique(UniqueType.FoundCity) }
val tile = unit.getTile()
unit.civInfo.addCity(tile.position)
unit.civ.addCity(tile.position)
if (tile.ruleset.tileImprovements.containsKey("City center"))
tile.changeImprovement("City center")
unit.destroy()