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

Techs from ancient ruins now added properly

Browse Source
This commit is contained in:
Yair Morgenstern 2019-02-17 00:01:54 +02:00
parent 4c5753c41f
commit dd63491c03
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,6 +92,8 @@ class GameInfo {
tile = viableTiles.getRandom() tile = viableTiles.getRandom()
} }
// if we don't make this into a separate list then the retain() will happen on the Tech keys,
// which effectively removes those techs from the game and causes all sorts of problems
val allResearchedTechs = GameBasics.Technologies.keys.toMutableList() val allResearchedTechs = GameBasics.Technologies.keys.toMutableList()
for (civ in civilizations.filter { !it.isBarbarianCivilization() && !it.isDefeated() }) { for (civ in civilizations.filter { !it.isBarbarianCivilization() && !it.isDefeated() }) {
allResearchedTechs.retainAll(civ.tech.techsResearched) allResearchedTechs.retainAll(civ.tech.techsResearched)

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

@ -70,7 +70,7 @@ class CivilizationInfo {
constructor(civName: String) { constructor(civName: String) {
this.civName = civName this.civName = civName
tech.techsResearched.add("Agriculture") tech.addTechnology("Agriculture")
} }
fun clone(): CivilizationInfo { fun clone(): CivilizationInfo {

3
core/src/com/unciv/logic/map/MapUnit.kt
View File

@ -416,8 +416,7 @@ class MapUnit {
if(researchableAncientEraTechs.isNotEmpty()) if(researchableAncientEraTechs.isNotEmpty())
actions.add { actions.add {
val tech = researchableAncientEraTechs.getRandom().name val tech = researchableAncientEraTechs.getRandom().name
civInfo.tech.techsResearched.add(tech) civInfo.tech.addTechnology(tech)
if(civInfo.tech.techsToResearch.contains(tech)) civInfo.tech.techsToResearch.remove(tech)
civInfo.addNotification("We have discovered the lost technology of [$tech] in the ruins!",currentTile.position, Color.BLUE) civInfo.addNotification("We have discovered the lost technology of [$tech] in the ruins!",currentTile.position, Color.BLUE)
} }

1
core/src/com/unciv/ui/saves/LoadScreen.kt
View File

@ -82,7 +82,6 @@ class LoadScreen : PickerScreen() {
UnCivGame.Current.loadGame(selectedSave) UnCivGame.Current.loadGame(selectedSave)
} }
} }
} }