AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-30 23:41:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Deprecated notification color

Browse Source
This commit is contained in:
Yair Morgenstern 2021-06-08 20:04:32 +03:00
parent e8bbd4bc70
commit b2691eed70
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/com/unciv/logic/GameInfo.kt
View File

@ -290,18 +290,6 @@ class GameInfo {
difficultyObject = ruleSet.difficulties[difficulty]!! 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. // This doesn't HAVE to go here, but why not.

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

@ -27,8 +27,6 @@ open class Notification() {
var text: String = "" var text: String = ""
@Deprecated("As of 3.13.10 - replaced with icons")
var color: Color? = null
var icons: ArrayList<String> = ArrayList() // Must be ArrayList and not List so it can be deserialized var icons: ArrayList<String> = ArrayList() // Must be ArrayList and not List so it can be deserialized
var action: NotificationAction? = null var action: NotificationAction? = null

4
core/src/com/unciv/ui/worldscreen/NotificationsScroll.kt
View File

@ -1,6 +1,5 @@
package com.unciv.ui.worldscreen package com.unciv.ui.worldscreen
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Actor import com.badlogic.gdx.scenes.scene2d.Actor
import com.badlogic.gdx.scenes.scene2d.Touchable 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.onClick
import com.unciv.ui.utils.toLabel import com.unciv.ui.utils.toLabel
import kotlin.math.min import kotlin.math.min
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
class NotificationsScroll(internal val worldScreen: WorldScreen) : ScrollPane(null) { 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) 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.background = ImageGetter.getRoundedEdgeTableBackground()
listItem.add(label) listItem.add(label)