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

chore: Moved diplomacy functions to DiplomacyFunctions

Browse Source
This commit is contained in:
Yair Morgenstern
2023-01-18 18:11:18 +02:00
parent 4488a6fe51
commit e56d53dcd9
22 changed files with 184 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/src/com/unciv/logic/civilization/diplomacy/DiplomacyManagerTests.kt
View File

@ -25,7 +25,7 @@ class DiplomacyManagerTests {
private fun meetByName(civilization: String, civilizationToMeet: String) {
civilizations.getValue(civilization)
.makeCivilizationsMeet(civilizations.getValue(civilizationToMeet))
.diplomacyFunctions.makeCivilizationsMeet(civilizations.getValue(civilizationToMeet))
}
@Before

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

@ -80,7 +80,7 @@ class SerializationTests {
// Ensure some diplomacy objects are instantiated
val otherCiv = game.getCivilization("Greece")
civ.makeCivilizationsMeet(otherCiv)
civ.diplomacyFunctions.makeCivilizationsMeet(otherCiv)
}
@Test

2
tests/src/com/unciv/uniques/GlobalUniquesTests.kt
View File

@ -383,7 +383,7 @@ class GlobalUniquesTests {
val cityStateTile = game.getTile(Vector2(0f, 1f))
@Suppress("UNUSED_VARIABLE")
val cityStateCity = game.addCity(cityState, cityStateTile, true)
civInfo.makeCivilizationsMeet(cityState)
civInfo.diplomacyFunctions.makeCivilizationsMeet(cityState)
cityState.getDiplomacyManager(civInfo).addInfluence(100f)
city.cityStats.update()