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

Move city founding effects to the proper function

Browse Source
This commit is contained in:
Yair Morgenstern
2023-11-24 14:05:51 +02:00
parent b7823e0b39
commit c75e7f9407
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/city/managers/CityFounder.kt
View File

@ -1,6 +1,7 @@
package com.unciv.logic.city.managers package com.unciv.logic.city.managers
import com.badlogic.gdx.math.Vector2 import com.badlogic.gdx.math.Vector2
import com.unciv.Constants
import com.unciv.logic.city.City import com.unciv.logic.city.City
import com.unciv.logic.civilization.Civilization import com.unciv.logic.civilization.Civilization
import com.unciv.logic.civilization.Proximity import com.unciv.logic.civilization.Proximity
@ -13,6 +14,8 @@ import com.unciv.models.ruleset.unique.UniqueType
class CityFounder { class CityFounder {
fun foundCity(civInfo: Civilization, cityLocation: Vector2): City { 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() val city = City()
city.foundingCiv = civInfo.civName city.foundingCiv = civInfo.civName

3
core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsFromUniques.kt
View File

@ -77,9 +77,6 @@ object UnitActionsFromUniques {
if (unit.civ.playerType != PlayerType.AI) if (unit.civ.playerType != PlayerType.AI)
UncivGame.Current.settings.addCompletedTutorialTask("Found city") UncivGame.Current.settings.addCompletedTutorialTask("Found city")
unit.civ.addCity(tile.position) unit.civ.addCity(tile.position)
if (tile.ruleset.tileImprovements.containsKey(Constants.cityCenter))
tile.changeImprovement(Constants.cityCenter)
tile.removeRoad()
if (hasActionModifiers) UnitActionModifiers.activateSideEffects(unit, unique) if (hasActionModifiers) UnitActionModifiers.activateSideEffects(unit, unique)
else unit.destroy() else unit.destroy()