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

Reorder AddTechnology (#10901)

Browse Source
This commit is contained in:
SeventhM 2024-01-09 12:11:11 -08:00 committed by GitHub
parent e34854bf7d
commit bbba24baae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/src/com/unciv/logic/civilization/managers/TechManager.kt
View File

@ -285,6 +285,15 @@ class TechManager : IsPartOfGameInfoSerialization {
researchedTechnologies = researchedTechnologies.withItem(newTech) researchedTechnologies = researchedTechnologies.withItem(newTech)
addTechToTransients(newTech) addTechToTransients(newTech)
moveToNewEra(showNotification)
if (!civInfo.isSpectator() && showNotification)
civInfo.addNotification("Research of [$techName] has completed!", TechAction(techName),
NotificationCategory.General,
NotificationIcon.Science)
if (isNewTech)
civInfo.popupAlerts.add(PopupAlert(AlertType.TechResearched, techName))
val triggerNotificationText = "due to researching [$techName]" val triggerNotificationText = "due to researching [$techName]"
for (unique in newTech.uniqueObjects) for (unique in newTech.uniqueObjects)
if (!unique.hasTriggerConditional()) if (!unique.hasTriggerConditional())
@ -295,29 +304,24 @@ class TechManager : IsPartOfGameInfoSerialization {
UniqueTriggerActivation.triggerCivwideUnique(unique, civInfo, triggerNotificationText = triggerNotificationText) UniqueTriggerActivation.triggerCivwideUnique(unique, civInfo, triggerNotificationText = triggerNotificationText)
updateTransientBooleans()
for (city in civInfo.cities) {
city.reassignPopulationDeferred()
}
if (!civInfo.isSpectator() && showNotification)
civInfo.addNotification("Research of [$techName] has completed!", TechAction(techName),
NotificationCategory.General,
NotificationIcon.Science)
if (isNewTech)
civInfo.popupAlerts.add(PopupAlert(AlertType.TechResearched, techName))
val revealedResources = getRuleset().tileResources.values.filter { techName == it.revealedBy } val revealedResources = getRuleset().tileResources.values.filter { techName == it.revealedBy }
if (civInfo.playerType == PlayerType.Human) { if (civInfo.playerType == PlayerType.Human) {
for (revealedResource in revealedResources) { for (revealedResource in revealedResources) {
civInfo.gameInfo.notifyExploredResources(civInfo, revealedResource.name, 5) civInfo.gameInfo.notifyExploredResources(civInfo, revealedResource.name, 5)
} }
} }
updateTransientBooleans()
// In the case of a player hurrying research, this civ's resource availability may now be out of date // In the case of a player hurrying research, this civ's resource availability may now be out of date
// - e.g. when an owned tile by luck already has an appropriate improvement or when a tech provides a resource. // - e.g. when an owned tile by luck already has an appropriate improvement or when a tech provides a resource.
// That can be seen on WorldScreenTopBar, so better update. // That can be seen on WorldScreenTopBar, so better update.
civInfo.cache.updateCivResources() civInfo.cache.updateCivResources()
for (city in civInfo.cities) {
city.reassignPopulationDeferred()
}
obsoleteOldUnits(techName) obsoleteOldUnits(techName)
for (unique in civInfo.getMatchingUniques(UniqueType.MayanGainGreatPerson)) { for (unique in civInfo.getMatchingUniques(UniqueType.MayanGainGreatPerson)) {
@ -326,7 +330,6 @@ class TechManager : IsPartOfGameInfoSerialization {
MayaLongCountAction(), NotificationCategory.General, MayaCalendar.notificationIcon) MayaLongCountAction(), NotificationCategory.General, MayaCalendar.notificationIcon)
} }
moveToNewEra(showNotification)
updateResearchProgress() updateResearchProgress()
} }