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

Merge pull request #326 from ninjatao/fix_free_tech

Browse Source 
Fix research queue when getting free tech.
This commit is contained in:
yairm210
2018-12-10 12:28:39 +02:00
committed by GitHub
parent 197d698c57 dc314fa315
commit 2dd32b9a2c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/trade/TradeLogic.kt
View File

@ -183,6 +183,9 @@ class TradeLogic(val ourCivilization:CivilizationInfo, val otherCivilization: Ci
}
if (offer.type == TradeType.Technology) {
to.tech.techsResearched.add(offer.name)
if (to.tech.techsToResearch.contains(offer.name)) {
to.tech.techsToResearch.remove(offer.name)
}
}
if(offer.type== TradeType.City){
val city = from.cities.first { it.name==offer.name }

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

@ -79,9 +79,10 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen()
rightSideButton.onClick {
if (isFreeTechPick) {
civTech.techsResearched.add(selectedTech!!.name)
civTech.freeTechs -= 1
if (selectedTech!!.name == civTech.currentTechnology())
if (civTech.techsToResearch.contains(selectedTech!!.name)) {
civTech.techsToResearch.remove(selectedTech!!.name)
}
civTech.freeTechs -= 1
} else
civTech.techsToResearch = techsToResearch
game.setWorldScreen()