From c75e7f9407ec26b9be05810b2f6376d3ea1df87e Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Fri, 24 Nov 2023 14:05:51 +0200 Subject: [PATCH] Move city founding effects to the proper function --- core/src/com/unciv/logic/city/managers/CityFounder.kt | 3 +++ .../screens/worldscreen/unit/actions/UnitActionsFromUniques.kt | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/logic/city/managers/CityFounder.kt b/core/src/com/unciv/logic/city/managers/CityFounder.kt index eaa8550082..675c06be6f 100644 --- a/core/src/com/unciv/logic/city/managers/CityFounder.kt +++ b/core/src/com/unciv/logic/city/managers/CityFounder.kt @@ -1,6 +1,7 @@ package com.unciv.logic.city.managers import com.badlogic.gdx.math.Vector2 +import com.unciv.Constants import com.unciv.logic.city.City import com.unciv.logic.civilization.Civilization import com.unciv.logic.civilization.Proximity @@ -13,6 +14,8 @@ import com.unciv.models.ruleset.unique.UniqueType class CityFounder { fun foundCity(civInfo: Civilization, cityLocation: Vector2): City { + if (civInfo.gameInfo.ruleset.tileImprovements.containsKey(Constants.cityCenter)) + civInfo.gameInfo.tileMap[cityLocation].changeImprovement(Constants.cityCenter) val city = City() city.foundingCiv = civInfo.civName diff --git a/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsFromUniques.kt b/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsFromUniques.kt index b866b33e91..518a47b8d6 100644 --- a/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsFromUniques.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsFromUniques.kt @@ -77,9 +77,6 @@ object UnitActionsFromUniques { if (unit.civ.playerType != PlayerType.AI) UncivGame.Current.settings.addCompletedTutorialTask("Found city") unit.civ.addCity(tile.position) - if (tile.ruleset.tileImprovements.containsKey(Constants.cityCenter)) - tile.changeImprovement(Constants.cityCenter) - tile.removeRoad() if (hasActionModifiers) UnitActionModifiers.activateSideEffects(unit, unique) else unit.destroy()