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

Show replay after 50 turns, but only the discovered part of it. (#9172)

Browse Source
This commit is contained in:
WhoIsJohannes
2023-04-13 14:39:26 +02:00
committed by GitHub
parent e0533e994f
commit b0f4e42e99
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/com/unciv/ui/screens/victoryscreen/ReplayMap.kt
View File

@ -3,6 +3,7 @@ package com.unciv.ui.screens.victoryscreen
import com.badlogic.gdx.graphics.g2d.Batch
import com.badlogic.gdx.scenes.scene2d.Group
import com.unciv.UncivGame
import com.unciv.logic.civilization.Civilization
import com.unciv.logic.map.TileMap
import com.unciv.ui.screens.worldscreen.minimap.MinimapTile
import com.unciv.ui.screens.worldscreen.minimap.MinimapTileUtil
@ -59,11 +60,15 @@ class ReplayMap(val tileMap: TileMap) : Group() {
}
fun update(turn: Int) {
fun update(turn: Int, viewingCiv: Civilization) {
val viewingCivIsDefeated = viewingCiv.gameInfo.victoryData != null || !viewingCiv.isAlive()
for (minimapTile in minimapTiles) {
minimapTile.updateColor(false, turn)
minimapTile.updateBorders(turn).updateActorsIn(this)
minimapTile.updateCityCircle(turn).updateActorsIn(this)
val isVisible = viewingCivIsDefeated || viewingCiv.hasExplored(minimapTile.tile)
minimapTile.updateColor(!isVisible, turn)
if (isVisible) {
minimapTile.updateBorders(turn).updateActorsIn(this)
minimapTile.updateCityCircle(turn).updateActorsIn(this)
}
}
}

11
core/src/com/unciv/ui/screens/victoryscreen/VictoryScreen.kt
View File

@ -70,7 +70,16 @@ class VictoryScreen(
Replay('P', "OtherIcons/Load", allowAsSecret = true) {
override fun getContent(worldScreen: WorldScreen) = VictoryScreenReplay(worldScreen)
override fun isHidden(playerCiv: Civilization) =
!playerCiv.isSpectator() && playerCiv.gameInfo.victoryData == null && playerCiv.isAlive()
!playerCiv.isSpectator()
&& playerCiv.gameInfo.victoryData == null
&& playerCiv.isAlive()
// We show the replay after 50 turns. This is quite an arbitrary number, but
// we don't want to leak the starting position right away (assuming we don't
// condense the replay map in a similar way to the minimap (ie. it fills
// to only the discovered area) and probably before 50 turns not much
// interesting would happen anyway in the replay and the slider might feel
// weird, too.
&& playerCiv.gameInfo.turns < 50
};
abstract fun getContent(worldScreen: WorldScreen): Table
open fun isHidden(playerCiv: Civilization) = false

3
core/src/com/unciv/ui/screens/victoryscreen/VictoryScreenReplay.kt
View File

@ -19,6 +19,7 @@ class VictoryScreenReplay(
worldScreen: WorldScreen
) : Table(BaseScreen.skin), TabbedPager.IPageExtensions {
private val gameInfo = worldScreen.gameInfo
private val viewingCiv = worldScreen.viewingCiv
private val finalTurn = gameInfo.turns
private var replayTimer : Timer.Task? = null
@ -110,7 +111,7 @@ class VictoryScreenReplay(
)
)
slider.value = turn.toFloat()
replayMap.update(turn)
replayMap.update(turn, viewingCiv)
if (turn == finalTurn) resetTimer()
}