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

CityStateType deprecation p1

Browse Source
This commit is contained in:
Yair Morgenstern
2022-11-21 20:03:05 +02:00
parent 6976360da6
commit 7d9db1e119
9 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/civilization/CityStateType.kt → core/src/com/unciv/logic/civilization/CityStateTypeOld.kt
View File

@ -1,6 +1,6 @@
package com.unciv.logic.civilization package com.unciv.logic.civilization
enum class CityStateType(val color: String = "") { enum class CityStateTypeOld(val color: String = "") {
Cultured("#8b60ff"), Cultured("#8b60ff"),
Maritime("#38ff70"), Maritime("#38ff70"),
Mercantile("#ffd800"), Mercantile("#ffd800"),

2
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -346,7 +346,7 @@ class CivilizationInfo : IsPartOfGameInfoSerialization {
fun isBarbarian() = nation.isBarbarian() fun isBarbarian() = nation.isBarbarian()
fun isSpectator() = nation.isSpectator() fun isSpectator() = nation.isSpectator()
fun isCityState(): Boolean = nation.isCityState() fun isCityState(): Boolean = nation.isCityState()
val cityStateType: CityStateType get() = nation.cityStateType!! val cityStateType: CityStateTypeOld get() = nation.cityStateType!!
var cityStatePersonality: CityStatePersonality = CityStatePersonality.Neutral var cityStatePersonality: CityStatePersonality = CityStatePersonality.Neutral
var cityStateResource: String? = null var cityStateResource: String? = null
var cityStateUniqueUnit: String? = null // Unique unit for militaristic city state. Might still be null if there are no appropriate units var cityStateUniqueUnit: String? = null // Unique unit for militaristic city state. Might still be null if there are no appropriate units

14
core/src/com/unciv/models/ruleset/Era.kt
View File

@ -1,7 +1,7 @@
package com.unciv.models.ruleset package com.unciv.models.ruleset
import com.badlogic.gdx.graphics.Color 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.logic.civilization.diplomacy.RelationshipLevel
import com.unciv.models.ruleset.unique.StateForConditionals import com.unciv.models.ruleset.unique.StateForConditionals
import com.unciv.models.ruleset.unique.Unique import com.unciv.models.ruleset.unique.Unique
@ -34,9 +34,9 @@ class Era : RulesetObject() {
var friendBonus = HashMap<String, List<String>>() var friendBonus = HashMap<String, List<String>>()
var allyBonus = HashMap<String, List<String>>() var allyBonus = HashMap<String, List<String>>()
@Suppress("MemberVisibilityCanBePrivate") @Suppress("MemberVisibilityCanBePrivate")
val friendBonusObjects: Map<CityStateType, UniqueMap> by lazy { initBonuses(friendBonus) } val friendBonusObjects: Map<CityStateTypeOld, UniqueMap> by lazy { initBonuses(friendBonus) }
@Suppress("MemberVisibilityCanBePrivate") @Suppress("MemberVisibilityCanBePrivate")
val allyBonusObjects: Map<CityStateType, UniqueMap> by lazy { initBonuses(allyBonus) } val allyBonusObjects: Map<CityStateTypeOld, UniqueMap> by lazy { initBonuses(allyBonus) }
private var iconRGB: List<Int>? = null private var iconRGB: List<Int>? = null
@ -87,17 +87,17 @@ class Era : RulesetObject() {
}.map { it.first }.distinct() }.map { it.first }.distinct()
} }
private fun initBonuses(bonusMap: Map<String, List<String>>): Map<CityStateType, UniqueMap> { private fun initBonuses(bonusMap: Map<String, List<String>>): Map<CityStateTypeOld, UniqueMap> {
val objectMap = HashMap<CityStateType, UniqueMap>() val objectMap = HashMap<CityStateTypeOld, UniqueMap>()
for ((cityStateType, bonusList) in bonusMap) { for ((cityStateType, bonusList) in bonusMap) {
val cityStateTypeUniqueMap = UniqueMap() val cityStateTypeUniqueMap = UniqueMap()
cityStateTypeUniqueMap.addUniques(bonusList.map { Unique(it, UniqueTarget.CityState)}) cityStateTypeUniqueMap.addUniques(bonusList.map { Unique(it, UniqueTarget.CityState)})
objectMap[CityStateType.valueOf(cityStateType)] = cityStateTypeUniqueMap objectMap[CityStateTypeOld.valueOf(cityStateType)] = cityStateTypeUniqueMap
} }
return objectMap return objectMap
} }
fun getCityStateBonuses(cityStateType: CityStateType, relationshipLevel: RelationshipLevel, uniqueType:UniqueType?=null): Sequence<Unique> { fun getCityStateBonuses(cityStateType: CityStateTypeOld, relationshipLevel: RelationshipLevel, uniqueType:UniqueType?=null): Sequence<Unique> {
val cityStateUniqueMap = when (relationshipLevel) { val cityStateUniqueMap = when (relationshipLevel) {
RelationshipLevel.Ally -> allyBonusObjects[cityStateType] RelationshipLevel.Ally -> allyBonusObjects[cityStateType]
RelationshipLevel.Friend -> friendBonusObjects[cityStateType] RelationshipLevel.Friend -> friendBonusObjects[cityStateType]

4
core/src/com/unciv/models/ruleset/Nation.kt
View File

@ -3,7 +3,7 @@
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import com.unciv.Constants import com.unciv.Constants
import com.unciv.UncivGame 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.Unique
import com.unciv.models.ruleset.unique.UniqueFlag import com.unciv.models.ruleset.unique.UniqueFlag
import com.unciv.models.ruleset.unique.UniqueTarget import com.unciv.models.ruleset.unique.UniqueTarget
@ -23,7 +23,7 @@ class Nation : RulesetObject() {
val style = "" val style = ""
fun getStyleOrCivName() = style.ifEmpty { name } fun getStyleOrCivName() = style.ifEmpty { name }
var cityStateType: CityStateType? = null var cityStateType: CityStateTypeOld? = null
var preferredVictoryType: String = Constants.neutralVictoryType var preferredVictoryType: String = Constants.neutralVictoryType
var declaringWar = "" var declaringWar = ""
var attacked = "" var attacked = ""

1
core/src/com/unciv/ui/newgamescreen/GameOptionsTable.kt
View File

@ -2,7 +2,6 @@ package com.unciv.ui.newgamescreen
import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.unciv.UncivGame import com.unciv.UncivGame
import com.unciv.logic.civilization.CityStateType
import com.unciv.models.ruleset.RulesetCache import com.unciv.models.ruleset.RulesetCache
import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.translations.tr import com.unciv.models.translations.tr

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

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

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

@ -3,7 +3,7 @@ package com.unciv.uniques
import com.badlogic.gdx.math.Vector2 import com.badlogic.gdx.math.Vector2
import com.unciv.Constants 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.logic.map.RoadStatus
import com.unciv.models.ruleset.BeliefType import com.unciv.models.ruleset.BeliefType
import com.unciv.models.stats.Stats import com.unciv.models.stats.Stats
@ -364,7 +364,7 @@ class GlobalUniquesTests {
fun bonusStatsFromCityStates() { fun bonusStatsFromCityStates() {
game.makeHexagonalMap(1) game.makeHexagonalMap(1)
val civInfo = game.addCiv() 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 tile = game.getTile(Vector2(0f,0f))
val city = game.addCity(civInfo, tile, true) val city = game.addCity(civInfo, tile, true)

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

@ -5,7 +5,7 @@ import com.unciv.Constants
import com.unciv.UncivGame import com.unciv.UncivGame
import com.unciv.logic.GameInfo import com.unciv.logic.GameInfo
import com.unciv.logic.city.CityInfo 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.CivilizationInfo
import com.unciv.logic.civilization.PlayerType import com.unciv.logic.civilization.PlayerType
import com.unciv.logic.map.MapSizeNew import com.unciv.logic.map.MapSizeNew
@ -104,7 +104,7 @@ class TestGame {
return tile 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 { fun nationFactory() = Nation().apply {
cities = arrayListOf("The Capital") cities = arrayListOf("The Capital")
cityStateType = cityState cityStateType = cityState

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

@ -1,7 +1,7 @@
package com.unciv.uniques package com.unciv.uniques
import com.badlogic.gdx.math.Vector2 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.testing.GdxTestRunner
import com.unciv.ui.worldscreen.unit.UnitActions import com.unciv.ui.worldscreen.unit.UnitActions
import org.junit.Assert.assertNotNull import org.junit.Assert.assertNotNull
@ -22,7 +22,7 @@ class UnitUniquesTests {
fun `Sweden can gift Great Persons to City States`() { fun `Sweden can gift Great Persons to City States`() {
// when // when
game.makeHexagonalMap(1) 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 cityStateCapitalTile = game.getTile(Vector2(0f, 0f))
val cityStateCapital = game.addCity(cityState, cityStateCapitalTile) val cityStateCapital = game.addCity(cityState, cityStateCapitalTile)