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

update

Browse Source
This commit is contained in:
YueR 2019-09-19 19:37:36 +08:00
parent 9820a12b0a
commit d106d29b0c
4 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,7 @@ data class LocationAction(var locations: ArrayList<Vector2> = ArrayList()) : Not
class TechAction(val techName: String = "") : NotificationAction { class TechAction(val techName: String = "") : NotificationAction {
override fun execute(worldScreen: WorldScreen) { override fun execute(worldScreen: WorldScreen) {
val tech = GameBasics.Technologies[techName] val tech = GameBasics.Technologies[techName]
worldScreen.game.screen = TechPickerScreen(worldScreen.viewingCiv, tech) worldScreen.game.screen = TechPickerScreen(worldScreen.viewingCiv, true, tech)
} }
} }

6
core/src/com/unciv/ui/VictoryScreen.kt
View File

@ -204,7 +204,8 @@ class VictoryScreen : PickerScreen() {
policyVictoryColumn.add(civToBranchesHaveCompleted).row() policyVictoryColumn.add(civToBranchesHaveCompleted).row()
civToBranchesHaveCompleted.touchable= Touchable.enabled civToBranchesHaveCompleted.touchable= Touchable.enabled
civToBranchesHaveCompleted.onClick { civToBranchesHaveCompleted.onClick {
game.screen = PolicyPickerScreen(UnCivGame.Current.worldScreen,entry.civ) game.screen = PolicyPickerScreen(UnCivGame.Current.worldScreen,entry.civ,false)
dispose()
} }
} }
return policyVictoryColumn return policyVictoryColumn
@ -227,7 +228,8 @@ class VictoryScreen : PickerScreen() {
scientificVictoryColumn.add(civToPartsBeRemaining).row() scientificVictoryColumn.add(civToPartsBeRemaining).row()
civToPartsBeRemaining.touchable= Touchable.enabled civToPartsBeRemaining.touchable= Touchable.enabled
civToPartsBeRemaining.onClick { civToPartsBeRemaining.onClick {
game.screen = TechPickerScreen(entry.civ) game.screen = TechPickerScreen(entry.civ,false)
dispose()
} }
} }
return scientificVictoryColumn return scientificVictoryColumn

8
core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt
View File

@ -13,7 +13,7 @@ import com.unciv.ui.utils.*
import com.unciv.ui.worldscreen.WorldScreen import com.unciv.ui.worldscreen.WorldScreen
class PolicyPickerScreen(val worldScreen: WorldScreen,civInfo: CivilizationInfo = worldScreen.viewingCiv) : PickerScreen() { class PolicyPickerScreen(val worldScreen: WorldScreen, civInfo: CivilizationInfo = worldScreen.viewingCiv, switchfromWorldScreen: Boolean = true) : PickerScreen() {
internal val viewingCiv: CivilizationInfo = civInfo internal val viewingCiv: CivilizationInfo = civInfo
private var pickedPolicy: Policy? = null private var pickedPolicy: Policy? = null
@ -42,6 +42,12 @@ class PolicyPickerScreen(val worldScreen: WorldScreen,civInfo: CivilizationInfo
} }
if(!UnCivGame.Current.worldScreen.isPlayersTurn) if(!UnCivGame.Current.worldScreen.isPlayersTurn)
rightSideButton.disable() rightSideButton.disable()
if (!switchfromWorldScreen){
rightSideButton.apply {
disable()
setText("Policy Tree Of [${viewingCiv.civName}]".tr())
}
}
topTable.row().pad(30f) topTable.row().pad(30f)

18
core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt
View File

@ -16,7 +16,7 @@ import java.util.*
import kotlin.collections.HashSet import kotlin.collections.HashSet
class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Technology? = null) : PickerScreen() { class TechPickerScreen(internal val civInfo: CivilizationInfo, switchfromWorldScreen: Boolean = true, centerOnTech: Technology? = null) : PickerScreen() {
private var techNameToButton = HashMap<String, TechButton>() private var techNameToButton = HashMap<String, TechButton>()
private var isFreeTechPick: Boolean = false private var isFreeTechPick: Boolean = false
@ -93,8 +93,13 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
} }
setButtonsInfo() setButtonsInfo()
if (!switchfromWorldScreen){
rightSideButton.setText("Pick a tech".tr()) rightSideButton.apply {
disable()
setText("Tech Tree Of [${civInfo.civName}]".tr())
}
}
else rightSideButton.setText("Pick a tech".tr())
rightSideButton.onClick("paper") { rightSideButton.onClick("paper") {
if (isFreeTechPick) civTech.getFreeTechnology(selectedTech!!.name) if (isFreeTechPick) civTech.getFreeTechnology(selectedTech!!.name)
else civTech.techsToResearch = tempTechsToResearch else civTech.techsToResearch = tempTechsToResearch
@ -110,7 +115,7 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
// and possibly select it to show description, // and possibly select it to show description,
// which is very helpful when just discovered and clicking the notification // which is very helpful when just discovered and clicking the notification
val tech = if (centerOnTech != null) centerOnTech else civInfo.tech.currentTechnology() val tech = if (centerOnTech != null) centerOnTech else civInfo.tech.currentTechnology()
if (tech != null) { if (tech != null && switchfromWorldScreen) {
// select only if there it doesn't mess up tempTechsToResearch // select only if there it doesn't mess up tempTechsToResearch
if (civInfo.tech.isResearched(tech.name) || civInfo.tech.techsToResearch.size <= 1) if (civInfo.tech.isResearched(tech.name) || civInfo.tech.techsToResearch.size <= 1)
selectTechnology(tech, true) selectTechnology(tech, true)
@ -148,11 +153,14 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
} }
} }
private fun selectTechnology(tech: Technology?, center: Boolean = false) { private fun selectTechnology(tech: Technology?, center: Boolean = false, switchfromWorldScreen: Boolean = true) {
selectedTech = tech selectedTech = tech
descriptionLabel.setText(tech?.description) descriptionLabel.setText(tech?.description)
if (switchfromWorldScreen)
return
if(tech==null) if(tech==null)
return return