diff --git a/core/src/com/unciv/logic/GameInfo.kt b/core/src/com/unciv/logic/GameInfo.kt index 22d9aa0c6e..abbe48a43e 100644 --- a/core/src/com/unciv/logic/GameInfo.kt +++ b/core/src/com/unciv/logic/GameInfo.kt @@ -290,18 +290,6 @@ class GameInfo { difficultyObject = ruleSet.difficulties[difficulty]!! - // We have to remove all deprecated buildings from all cities BEFORE we update a single one, or run setTransients on the civs, - // because updating leads to getting the building uniques from the civ info, - // which in turn leads to us trying to get info on all the building in all the cities... - // which can fail if there's an "unregistered" building anywhere - for (civInfo in civilizations) { - // As of 3.3.7, Facism -> Fascism - if (civInfo.policies.adoptedPolicies.contains("Facism")) { - civInfo.policies.adoptedPolicies.remove("Facism") - civInfo.policies.adoptedPolicies.add("Fascism") - } - - } // This doesn't HAVE to go here, but why not. diff --git a/core/src/com/unciv/logic/civilization/Notification.kt b/core/src/com/unciv/logic/civilization/Notification.kt index 4b6f680bb8..e1345b696e 100644 --- a/core/src/com/unciv/logic/civilization/Notification.kt +++ b/core/src/com/unciv/logic/civilization/Notification.kt @@ -27,8 +27,6 @@ open class Notification() { var text: String = "" - @Deprecated("As of 3.13.10 - replaced with icons") - var color: Color? = null var icons: ArrayList = ArrayList() // Must be ArrayList and not List so it can be deserialized var action: NotificationAction? = null diff --git a/core/src/com/unciv/ui/worldscreen/NotificationsScroll.kt b/core/src/com/unciv/ui/worldscreen/NotificationsScroll.kt index bda7edf62a..69ee4b506b 100644 --- a/core/src/com/unciv/ui/worldscreen/NotificationsScroll.kt +++ b/core/src/com/unciv/ui/worldscreen/NotificationsScroll.kt @@ -1,6 +1,5 @@ package com.unciv.ui.worldscreen -import com.unciv.ui.utils.AutoScrollPane as ScrollPane import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.Actor import com.badlogic.gdx.scenes.scene2d.Touchable @@ -10,6 +9,7 @@ import com.unciv.ui.utils.ImageGetter import com.unciv.ui.utils.onClick import com.unciv.ui.utils.toLabel import kotlin.math.min +import com.unciv.ui.utils.AutoScrollPane as ScrollPane class NotificationsScroll(internal val worldScreen: WorldScreen) : ScrollPane(null) { @@ -48,8 +48,6 @@ class NotificationsScroll(internal val worldScreen: WorldScreen) : ScrollPane(nu listItem.add(image).size(iconSize).padRight(5f) } } - else if(notification.color!=null) listItem.add(ImageGetter.getCircle() - .apply { color = notification.color }).size(iconSize).padRight(5f) listItem.background = ImageGetter.getRoundedEdgeTableBackground() listItem.add(label)