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

CityStateType overhaul!!!!

Browse Source
This commit is contained in:
Yair Morgenstern
2022-11-21 20:30:52 +02:00
parent 7d9db1e119
commit 2e5e221158
15 changed files with 42 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/src/com/unciv/logic/civilization/CapitalConnectionsFinderTests.kt
View File

@ -243,13 +243,13 @@ class CapitalConnectionsFinderTests {
createCity(ourCiv, Vector2(0f, 4f), "Connected"))
val openCiv = civilizations["Germany"]!!
openCiv.nation.cityStateType = CityStateTypeOld.Cultured
openCiv.nation.cityStateType = "Cultured"
openCiv.cities = listOf( createCity(openCiv, Vector2(0f, 2f), "Berlin", true))
ourCiv.diplomacy["Germany"] = DiplomacyManager(ourCiv, "Germany")
.apply { diplomaticStatus = DiplomaticStatus.Peace }
val closedCiv = civilizations["Greece"]!!
closedCiv.nation.cityStateType = CityStateTypeOld.Cultured
closedCiv.nation.cityStateType = "Cultured"
closedCiv.cities = listOf( createCity(closedCiv, Vector2(0f, -2f), "Athens", true))
ourCiv.diplomacy["Greece"] = DiplomacyManager(ourCiv, "Greece")
.apply { diplomaticStatus = DiplomaticStatus.War }

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

@ -3,7 +3,6 @@ package com.unciv.uniques
import com.badlogic.gdx.math.Vector2
import com.unciv.Constants
import com.unciv.logic.civilization.CityStateTypeOld
import com.unciv.logic.map.RoadStatus
import com.unciv.models.ruleset.BeliefType
import com.unciv.models.stats.Stats
@ -364,7 +363,7 @@ class GlobalUniquesTests {
fun bonusStatsFromCityStates() {
game.makeHexagonalMap(1)
val civInfo = game.addCiv()
val cityState = game.addCiv(cityState = CityStateTypeOld.Maritime)
val cityState = game.addCiv(cityStateType = "Maritime")
val tile = game.getTile(Vector2(0f,0f))
val city = game.addCity(civInfo, tile, true)

7
tests/src/com/unciv/uniques/TestGame.kt
View File

@ -5,7 +5,6 @@ import com.unciv.Constants
import com.unciv.UncivGame
import com.unciv.logic.GameInfo
import com.unciv.logic.city.CityInfo
import com.unciv.logic.civilization.CityStateTypeOld
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.civilization.PlayerType
import com.unciv.logic.map.MapSizeNew
@ -104,10 +103,10 @@ class TestGame {
return tile
}
fun addCiv(vararg uniques: String, isPlayer: Boolean = false, cityState: CityStateTypeOld? = null): CivilizationInfo {
fun addCiv(vararg uniques: String, isPlayer: Boolean = false, cityStateType: String? = null): CivilizationInfo {
fun nationFactory() = Nation().apply {
cities = arrayListOf("The Capital")
cityStateType = cityState
this.cityStateType = cityStateType
}
val nation = createRulesetObject(ruleset.nations, *uniques) {
nationFactory()
@ -121,7 +120,7 @@ class TestGame {
// Add 1 tech to the player so the era is computed correctly
civInfo.tech.addTechnology(ruleset.technologies.values.minBy { it.era() }.name)
if (cityState != null) {
if (cityStateType != null) {
civInfo.cityStateFunctions.initCityState(ruleset, "Ancient era", emptyList())
}
gameInfo.civilizations.add(civInfo)

3
tests/src/com/unciv/uniques/UnitUniquesTests.kt
View File

@ -1,7 +1,6 @@
package com.unciv.uniques
import com.badlogic.gdx.math.Vector2
import com.unciv.logic.civilization.CityStateTypeOld
import com.unciv.testing.GdxTestRunner
import com.unciv.ui.worldscreen.unit.UnitActions
import org.junit.Assert.assertNotNull
@ -22,7 +21,7 @@ class UnitUniquesTests {
fun `Sweden can gift Great Persons to City States`() {
// when
game.makeHexagonalMap(1)
val cityState = game.addCiv(cityState = CityStateTypeOld.Cultured)
val cityState = game.addCiv(cityStateType = "Cultured")
val cityStateCapitalTile = game.getTile(Vector2(0f, 0f))
val cityStateCapital = game.addCity(cityState, cityStateCapitalTile)