From 7d9db1e119b20aa6c593be4a7d133f0fb37bac6b Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 21 Nov 2022 20:03:05 +0200 Subject: [PATCH] CityStateType deprecation p1 --- .../{CityStateType.kt => CityStateTypeOld.kt} | 2 +- .../unciv/logic/civilization/CivilizationInfo.kt | 2 +- core/src/com/unciv/models/ruleset/Era.kt | 14 +++++++------- core/src/com/unciv/models/ruleset/Nation.kt | 4 ++-- .../com/unciv/ui/newgamescreen/GameOptionsTable.kt | 1 - .../civilization/CapitalConnectionsFinderTests.kt | 4 ++-- tests/src/com/unciv/uniques/GlobalUniquesTests.kt | 4 ++-- tests/src/com/unciv/uniques/TestGame.kt | 4 ++-- tests/src/com/unciv/uniques/UnitUniquesTests.kt | 4 ++-- 9 files changed, 19 insertions(+), 20 deletions(-) rename core/src/com/unciv/logic/civilization/{CityStateType.kt => CityStateTypeOld.kt} (82%) diff --git a/core/src/com/unciv/logic/civilization/CityStateType.kt b/core/src/com/unciv/logic/civilization/CityStateTypeOld.kt similarity index 82% rename from core/src/com/unciv/logic/civilization/CityStateType.kt rename to core/src/com/unciv/logic/civilization/CityStateTypeOld.kt index eb5cea7c59..fc92ee92b0 100644 --- a/core/src/com/unciv/logic/civilization/CityStateType.kt +++ b/core/src/com/unciv/logic/civilization/CityStateTypeOld.kt @@ -1,6 +1,6 @@ package com.unciv.logic.civilization -enum class CityStateType(val color: String = "") { +enum class CityStateTypeOld(val color: String = "") { Cultured("#8b60ff"), Maritime("#38ff70"), Mercantile("#ffd800"), diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index 7a807b5fdc..c750fa7d92 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -346,7 +346,7 @@ class CivilizationInfo : IsPartOfGameInfoSerialization { fun isBarbarian() = nation.isBarbarian() fun isSpectator() = nation.isSpectator() fun isCityState(): Boolean = nation.isCityState() - val cityStateType: CityStateType get() = nation.cityStateType!! + val cityStateType: CityStateTypeOld get() = nation.cityStateType!! var cityStatePersonality: CityStatePersonality = CityStatePersonality.Neutral var cityStateResource: String? = null var cityStateUniqueUnit: String? = null // Unique unit for militaristic city state. Might still be null if there are no appropriate units diff --git a/core/src/com/unciv/models/ruleset/Era.kt b/core/src/com/unciv/models/ruleset/Era.kt index 4690ff4eef..209bdc3657 100644 --- a/core/src/com/unciv/models/ruleset/Era.kt +++ b/core/src/com/unciv/models/ruleset/Era.kt @@ -1,7 +1,7 @@ package com.unciv.models.ruleset import com.badlogic.gdx.graphics.Color -import com.unciv.logic.civilization.CityStateType +import com.unciv.logic.civilization.CityStateTypeOld import com.unciv.logic.civilization.diplomacy.RelationshipLevel import com.unciv.models.ruleset.unique.StateForConditionals import com.unciv.models.ruleset.unique.Unique @@ -34,9 +34,9 @@ class Era : RulesetObject() { var friendBonus = HashMap>() var allyBonus = HashMap>() @Suppress("MemberVisibilityCanBePrivate") - val friendBonusObjects: Map by lazy { initBonuses(friendBonus) } + val friendBonusObjects: Map by lazy { initBonuses(friendBonus) } @Suppress("MemberVisibilityCanBePrivate") - val allyBonusObjects: Map by lazy { initBonuses(allyBonus) } + val allyBonusObjects: Map by lazy { initBonuses(allyBonus) } private var iconRGB: List? = null @@ -87,17 +87,17 @@ class Era : RulesetObject() { }.map { it.first }.distinct() } - private fun initBonuses(bonusMap: Map>): Map { - val objectMap = HashMap() + private fun initBonuses(bonusMap: Map>): Map { + val objectMap = HashMap() for ((cityStateType, bonusList) in bonusMap) { val cityStateTypeUniqueMap = UniqueMap() cityStateTypeUniqueMap.addUniques(bonusList.map { Unique(it, UniqueTarget.CityState)}) - objectMap[CityStateType.valueOf(cityStateType)] = cityStateTypeUniqueMap + objectMap[CityStateTypeOld.valueOf(cityStateType)] = cityStateTypeUniqueMap } return objectMap } - fun getCityStateBonuses(cityStateType: CityStateType, relationshipLevel: RelationshipLevel, uniqueType:UniqueType?=null): Sequence { + fun getCityStateBonuses(cityStateType: CityStateTypeOld, relationshipLevel: RelationshipLevel, uniqueType:UniqueType?=null): Sequence { val cityStateUniqueMap = when (relationshipLevel) { RelationshipLevel.Ally -> allyBonusObjects[cityStateType] RelationshipLevel.Friend -> friendBonusObjects[cityStateType] diff --git a/core/src/com/unciv/models/ruleset/Nation.kt b/core/src/com/unciv/models/ruleset/Nation.kt index e8362f9785..d33d0692c3 100644 --- a/core/src/com/unciv/models/ruleset/Nation.kt +++ b/core/src/com/unciv/models/ruleset/Nation.kt @@ -3,7 +3,7 @@ import com.badlogic.gdx.graphics.Color import com.unciv.Constants import com.unciv.UncivGame -import com.unciv.logic.civilization.CityStateType +import com.unciv.logic.civilization.CityStateTypeOld import com.unciv.models.ruleset.unique.Unique import com.unciv.models.ruleset.unique.UniqueFlag import com.unciv.models.ruleset.unique.UniqueTarget @@ -23,7 +23,7 @@ class Nation : RulesetObject() { val style = "" fun getStyleOrCivName() = style.ifEmpty { name } - var cityStateType: CityStateType? = null + var cityStateType: CityStateTypeOld? = null var preferredVictoryType: String = Constants.neutralVictoryType var declaringWar = "" var attacked = "" diff --git a/core/src/com/unciv/ui/newgamescreen/GameOptionsTable.kt b/core/src/com/unciv/ui/newgamescreen/GameOptionsTable.kt index 0dfa505144..a80843640a 100644 --- a/core/src/com/unciv/ui/newgamescreen/GameOptionsTable.kt +++ b/core/src/com/unciv/ui/newgamescreen/GameOptionsTable.kt @@ -2,7 +2,6 @@ package com.unciv.ui.newgamescreen import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.UncivGame -import com.unciv.logic.civilization.CityStateType import com.unciv.models.ruleset.RulesetCache import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.translations.tr diff --git a/tests/src/com/unciv/logic/civilization/CapitalConnectionsFinderTests.kt b/tests/src/com/unciv/logic/civilization/CapitalConnectionsFinderTests.kt index aab0846542..384f34c7df 100644 --- a/tests/src/com/unciv/logic/civilization/CapitalConnectionsFinderTests.kt +++ b/tests/src/com/unciv/logic/civilization/CapitalConnectionsFinderTests.kt @@ -243,13 +243,13 @@ class CapitalConnectionsFinderTests { createCity(ourCiv, Vector2(0f, 4f), "Connected")) val openCiv = civilizations["Germany"]!! - openCiv.nation.cityStateType = CityStateType.Cultured + openCiv.nation.cityStateType = CityStateTypeOld.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 = CityStateType.Cultured + closedCiv.nation.cityStateType = CityStateTypeOld.Cultured closedCiv.cities = listOf( createCity(closedCiv, Vector2(0f, -2f), "Athens", true)) ourCiv.diplomacy["Greece"] = DiplomacyManager(ourCiv, "Greece") .apply { diplomaticStatus = DiplomaticStatus.War } diff --git a/tests/src/com/unciv/uniques/GlobalUniquesTests.kt b/tests/src/com/unciv/uniques/GlobalUniquesTests.kt index 3db8cfc96a..d39d823085 100644 --- a/tests/src/com/unciv/uniques/GlobalUniquesTests.kt +++ b/tests/src/com/unciv/uniques/GlobalUniquesTests.kt @@ -3,7 +3,7 @@ package com.unciv.uniques import com.badlogic.gdx.math.Vector2 import com.unciv.Constants -import com.unciv.logic.civilization.CityStateType +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 +364,7 @@ class GlobalUniquesTests { fun bonusStatsFromCityStates() { game.makeHexagonalMap(1) val civInfo = game.addCiv() - val cityState = game.addCiv(cityState = CityStateType.Maritime) + val cityState = game.addCiv(cityState = CityStateTypeOld.Maritime) val tile = game.getTile(Vector2(0f,0f)) val city = game.addCity(civInfo, tile, true) diff --git a/tests/src/com/unciv/uniques/TestGame.kt b/tests/src/com/unciv/uniques/TestGame.kt index a9a3760da8..43a26b5b18 100644 --- a/tests/src/com/unciv/uniques/TestGame.kt +++ b/tests/src/com/unciv/uniques/TestGame.kt @@ -5,7 +5,7 @@ import com.unciv.Constants import com.unciv.UncivGame import com.unciv.logic.GameInfo import com.unciv.logic.city.CityInfo -import com.unciv.logic.civilization.CityStateType +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,7 +104,7 @@ class TestGame { return tile } - fun addCiv(vararg uniques: String, isPlayer: Boolean = false, cityState: CityStateType? = null): CivilizationInfo { + fun addCiv(vararg uniques: String, isPlayer: Boolean = false, cityState: CityStateTypeOld? = null): CivilizationInfo { fun nationFactory() = Nation().apply { cities = arrayListOf("The Capital") cityStateType = cityState diff --git a/tests/src/com/unciv/uniques/UnitUniquesTests.kt b/tests/src/com/unciv/uniques/UnitUniquesTests.kt index 2742253007..d3c765699c 100644 --- a/tests/src/com/unciv/uniques/UnitUniquesTests.kt +++ b/tests/src/com/unciv/uniques/UnitUniquesTests.kt @@ -1,7 +1,7 @@ package com.unciv.uniques import com.badlogic.gdx.math.Vector2 -import com.unciv.logic.civilization.CityStateType +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 +22,7 @@ class UnitUniquesTests { fun `Sweden can gift Great Persons to City States`() { // when game.makeHexagonalMap(1) - val cityState = game.addCiv(cityState = CityStateType.Cultured) + val cityState = game.addCiv(cityState = CityStateTypeOld.Cultured) val cityStateCapitalTile = game.getTile(Vector2(0f, 0f)) val cityStateCapital = game.addCity(cityState, cityStateCapitalTile)