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

Removed old todos

Browse Source
This commit is contained in:
Yair Morgenstern
2021-05-11 00:28:49 +03:00
parent 482f9ae9e5
commit 1f50f3e97e
5 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,9 +71,6 @@ class PopulationManager {
private fun getStatsOfSpecialist(name: String) = cityInfo.cityStats.getStatsOfSpecialist(name) private fun getStatsOfSpecialist(name: String) = cityInfo.cityStats.getStatsOfSpecialist(name)
// todo - change tile choice according to city!
// if small city, favor production above all, ignore gold!
// if larger city, food should be worth less!
internal fun autoAssignPopulation(foodWeight: Float = 1f) { internal fun autoAssignPopulation(foodWeight: Float = 1f) {
for (i in 1..getFreePopulation()) { for (i in 1..getFreePopulation()) {
//evaluate tiles //evaluate tiles

1
core/src/com/unciv/logic/civilization/CivInfoStats.kt
View File

@ -128,7 +128,6 @@ class CivInfoStats(val civInfo: CivilizationInfo) {
val statMap = HashMap<String, Float>() val statMap = HashMap<String, Float>()
statMap["Base happiness"] = civInfo.getDifficulty().baseHappiness.toFloat() statMap["Base happiness"] = civInfo.getDifficulty().baseHappiness.toFloat()
// TODO - happinessPerUnique should be difficulty-dependent, 5 on Settler and Chieftian and 4 on other difficulties (should be parameter, not in code)
var happinessPerUniqueLuxury = 4f + civInfo.getDifficulty().extraHappinessPerLuxury var happinessPerUniqueLuxury = 4f + civInfo.getDifficulty().extraHappinessPerLuxury
for (unique in civInfo.getMatchingUniques("+1 happiness from each type of luxury resource")) for (unique in civInfo.getMatchingUniques("+1 happiness from each type of luxury resource"))
happinessPerUniqueLuxury += 1 happinessPerUniqueLuxury += 1

2
core/src/com/unciv/ui/trade/TradeTable.kt
View File

@ -34,7 +34,7 @@ class TradeTable(val otherCivilization: CivilizationInfo, stage: DiplomacyScreen
offerColumnsTable.update() offerColumnsTable.update()
} }
if(isTradeOffered()) offerButton.setText("Retract offer".tr()) // todo translation if(isTradeOffered()) offerButton.setText("Retract offer".tr())
else offerButton.setText("Offer trade".tr()) else offerButton.setText("Offer trade".tr())
offerButton.onClick { offerButton.onClick {

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

@ -56,7 +56,7 @@ class VictoryScreen(val worldScreen: WorldScreen) : PickerScreen() {
someoneHasWon = true someoneHasWon = true
when (playerVictoryType) { when (playerVictoryType) {
VictoryType.Cultural -> wonOrLost("You have won a cultural victory!") VictoryType.Cultural -> wonOrLost("You have won a cultural victory!")
VictoryType.Domination -> wonOrLost("You have won a domination victory!") // todo change translation VictoryType.Domination -> wonOrLost("You have won a domination victory!")
VictoryType.Scientific -> wonOrLost("You have won a scientific victory!") VictoryType.Scientific -> wonOrLost("You have won a scientific victory!")
VictoryType.Neutral -> wonOrLost("You have won!") VictoryType.Neutral -> wonOrLost("You have won!")
} }

2
core/src/com/unciv/ui/worldscreen/WorldScreen.kt
View File

@ -49,7 +49,7 @@ import kotlin.concurrent.timer
class WorldScreen(val gameInfo: GameInfo, val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() { class WorldScreen(val gameInfo: GameInfo, val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
var isPlayersTurn = viewingCiv == gameInfo.currentPlayerCiv // todo this should be updated when passing turns var isPlayersTurn = viewingCiv == gameInfo.currentPlayerCiv
var selectedCiv = viewingCiv // Selected civilization, used in spectator and replay mode, equals viewingCiv in ordinary games var selectedCiv = viewingCiv // Selected civilization, used in spectator and replay mode, equals viewingCiv in ordinary games
private var fogOfWar = true private var fogOfWar = true
val canChangeState = isPlayersTurn && !viewingCiv.isSpectator() val canChangeState = isPlayersTurn && !viewingCiv.isSpectator()