Units are no longer double-added to construction when clicking the 'add unit' button

This commit is contained in:
Yair Morgenstern
2022-12-27 22:27:05 +02:00
parent fc5b8bc73d
commit c0f0673e2d

View File

@ -22,8 +22,8 @@ import com.unciv.models.stats.Stat
import com.unciv.models.translations.tr
import com.unciv.ui.audio.SoundPlayer
import com.unciv.ui.images.ImageGetter
import com.unciv.ui.popup.Popup
import com.unciv.ui.popup.ConfirmPopup
import com.unciv.ui.popup.Popup
import com.unciv.ui.popup.closeAllPopups
import com.unciv.ui.utils.BaseScreen
import com.unciv.ui.utils.ExpanderTab
@ -367,7 +367,9 @@ class CityConstructionsTable(private val cityScreen: CityScreen) {
if (!cannotAddConstructionToQueue(construction, cityScreen.city, cityScreen.city.cityConstructions)) {
val addToQueueButton = ImageGetter.getImage("OtherIcons/New").apply { color = Color.BLACK }.surroundWithCircle(40f)
addToQueueButton.onClick(UncivSound.Silent) {
addConstructionToQueue(construction, cityScreen.city.cityConstructions)
// Since the pickConstructionButton.onClick adds the construction if it's selected,
// this effectively adds the construction even if it's unselected
cityScreen.selectConstruction(construction)
}
pickConstructionButton.add(addToQueueButton)
}